Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

+/*
+ * @Description: 统计率
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-01 15:37:49
+ */
+/* 引入请求文件 */
 import request from '@/utils/request'
+/* 引入配置文件 */
 import SERVER from './config'
-
 class business {
-  /* 
-    成功率统计
-    startDate:开始日期
-    endDate:结束日期 
+  /**
+   * @description: 成功率统计
+   * @param {*} startDate 
+   * @param {*} endDate
+   * @param {*} qxdm
+   * @author: renchao
    */
-  async getSuucessRate(startDate,endDate,qxdm) {
+  async getSuucessRate (startDate, endDate, qxdm) {
     return request({
       url: SERVER.SERVERAPI + '/rest/statistics/Business/sf',
       method: 'get',
       params: {
-        startDate:startDate,
-        endDate:endDate,
-        qxdm:qxdm
+        startDate: startDate,
+        endDate: endDate,
+        qxdm: qxdm
       }
     })
   }

+/*
+ * @Description: 这个是所有api的前缀配置文件
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-01 15:35:44
+ */
 export default {
   // SERVERAPI: '/service-bdcsjsb-th', //浩浩
   // SERVERAPI: '/service-bdcsjsb-zz',

+/*
+ * @Description: 数据上报模块api文件
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-01 16:33:08
+ */
+/* 引入axios请求文件 */
 import request from '@/utils/request'
+/* 引入配置 */
 import SERVER from './config'
+const urlHeader = SERVER.SERVERAPI + '/rest/sjsb/DataReport/'
 
-// 区县上报分页
+/**
+ * @description: 区县上报根据业务id获取xml
+ * @param {*} bizMsgid
+ * @author: renchao
+ */
 export function getXml (bizMsgid) {
   return request({
-    url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getXml',
+    url: urlHeader + 'getXml',
     method: 'get',
     params: {
       businessId: bizMsgid
@@ -12,58 +24,89 @@ export function getXml (bizMsgid) {
   })
 }
 
-// 区县上报分页
+/**
+ * @description: 区县上报分页
+ * @param {*} data
+ * @author: renchao
+ */
 export function getAreaReportPage (data) {
   return request({
-    url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getAreaReportPage',
+    url: urlHeader + 'getAreaReportPage',
     method: 'post',
     data
   })
 }
 
-
-// 接入数据上报分页
+/**
+ * @description: 接入数据上报分页
+ * @author: renchao
+ */
 export function getReceiveDataReportPage (data) {
   return request({
-    url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getReceiveDataReportPage',
+    url: urlHeader + 'getReceiveDataReportPage',
     method: 'post',
     data
   })
 }
 
-// 数据上报分页
+/**
+ * @description: 数据上报分页
+ * @author: renchao
+ */
 export function getDataReportPage (data) {
   return request({
-    url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getDataReportPage',
+    url: urlHeader + 'getDataReportPage',
     method: 'post',
     data
   })
 }
-
-// 查询数据上报详情tabs选项卡
+/**
+ * @description: 查询数据上报详情tabs选项卡
+ * @author: renchao
+ */
 export function getTabsDetail (params) {
   return request({
-    url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getTabsDetail',
+    url: urlHeader + 'getTabsDetail',
     method: 'get',
     params
   })
 }
-// 查询数据上报详情
+/**
+ * @description: 查询数据上报详情
+ * @author: renchao
+ */
 export function getReportDetail (params) {
   return request({
-    url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getReportDetail',
+    url: urlHeader + 'getReportDetail',
     method: 'get',
     params
   })
 }
 
-// 结果
+/**
+ * @description: 获取数据上报结果
+ * @param {*} bsmReport
+ * @author: renchao
+ */
 export function getReceiveDataReportResult (bsmReport) {
   return request({
-    url: SERVER.SERVERAPI + '/rest/sjsb/DataReport/getReceiveDataReportResult',
+    url: urlHeader + 'getReceiveDataReportResult',
     method: 'get',
     params: {
       bsmReport: bsmReport
     }
   })
 }
+
+/**
+ * @description: 重新上报
+ * @param {*} bsmReport
+ * @author: renchao
+ */
+
+export function restartGenerateXml (bsmReport) {
+  return request({
+    url: urlHeader + 'restartGenerateXml?bsmReport=' + bsmReport,
+    method: 'post'
+  })
+}
\ No newline at end of file

+/*
+ * @Description: 登薄日志
+ * @Autor: renchao
+ * @LastEditTime: 2023-03-01 17:09:38
+ */
+/* 引入请求文件 */
 import request from '@/utils/request'
+/* 引入配置文件 */
 import SERVER from './config'
+const urlHeader = SERVER.SERVERAPI + '/rest/sjsb/RecordLog/'
 
-// 登簿日志分页
+/**
+ * @description: 登簿日志分页
+ * @author: renchao
+ */
 export function getRecordLogPage (data) {
   return request({
-    url: SERVER.SERVERAPI + '/rest/sjsb/RecordLog/getRecordLogPage',
+    url: urlHeader + 'getRecordLogPage',
     method: 'post',
     data
   })
 }
 
+/**
+ * @description: 获取详情明细
+ * @param {*} dbBsm
+ * @author: renchao
+ */
+export function getDetail (dbBsm) {
+  return request({
+    url: urlHeader + 'getDetail',
+    method: 'get',
+    params: {
+      dbBsm: dbBsm
+    }
+  })
+}
 

@@ -2,7 +2,7 @@
   <div class="naturalBuilding itemForm">
     <el-form :model="naturalForm" :rules="rules" ref="formList" label-width="115px" :key="key">
       <div v-for="(item, index) in naturalForm.naturalList" :key="index" class="naturalBuilding-item">
-        <p class="naturalBuilding-name">自然幢{{ index + 1 }}</p>
+        <p class="naturalBuilding-name obligee-item-name">自然幢{{ index + 1 }}</p>
         <div class="naturalBuilding-list">
           <el-row>
             <el-col :span="8">
@@ -330,7 +330,7 @@ export default {
       default: "",
     },
   },
-  data() {
+  data () {
     return {
       naturalForm: {
         naturalList: [
@@ -366,7 +366,7 @@ export default {
     };
   },
   methods: {
-    async featchData() {
+    async featchData () {
       try {
         let { result: res } = await kttFwZrz.getKttFwZrzById(this.bsmSjsb);
         this.naturalForm.naturalList = res;
@@ -375,7 +375,7 @@ export default {
         this.$refs.msg.messageShow();
       }
     },
-    handleUpdateForm() {
+    handleUpdateForm () {
       return new Promise(async (resolve) => {
         try {
           let res = await kttFwZrz.updateKttFwZrz(this.naturalForm.naturalList);

@@ -42,6 +42,7 @@ export default {
 
 .result {
   padding: 15px;
+  height: 100%;
 
   p {
     color: #ffffff;
@@ -50,7 +51,7 @@ export default {
   }
 
   /deep/.el-textarea__inner {
-    min-height: 33vh !important;
+    min-height: 30vh !important;
     background-color: #08346F !important;
     color: #ffffff;
     border: none !important;

@@ -4,6 +4,7 @@
     <div slot="title" class="dialog_title" ref="dialogTitle">
       {{ title || '标题' }}
     </div>
+    <div class="regularHeight">
       <div class="editDialogBox-box">
         <el-tabs v-model="titleName" type="card" @tab-click="handleTitleTab">
           <el-tab-pane label="数据模型" name="sjmx"></el-tab-pane>
@@ -81,8 +82,8 @@
           </el-row>
         </div>
       </div>
-    <div class="editDialogBox-box">
-      <div v-if="titleName == 'sjmx'" class="sjmx">
+      <div class="editDialogBox-box editDialogBox-con" v-if="titleName == 'sjmx'">
+        <div class="sjmx">
           <el-tabs v-model="activeName" ref="elTabs" type="card" @tab-click="changeList">
             <el-tab-pane :name="item.soleurl" v-for="item in headerList" :key="item.soleurl">
               <div slot="label" class="tab-pane-item">
@@ -95,15 +96,21 @@
             <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }"
               :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bsmReport || dataReport.bsmSjsb" />
           </div>
-        <div class="d-center" v-if="!$store.state.business.Edit">
-          <btn nativeType="cz" @click="dialogVisible = false">取 消</btn>
-          <btn nativeType="cx" @click="submitForm">确 定</btn>
         </div>
       </div>
-      <div v-if="titleName == 'xyjg'">
+      <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xml'">
+        <JsonEditor :resultInfo="resultInfo" />
+      </div>
+      <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xyjg'">
         <Xyjg :form-data='dataReport'></Xyjg>
       </div>
-      <JsonEditor :resultInfo="resultInfo" class="JsonEditor" v-if="titleName == 'xml'" />
+    </div>
+    <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'sjmx'">
+      <btn nativeType="cz" @click="dialogVisible = false">取 消</btn>
+      <btn nativeType="cx" @click="submitForm">确 定</btn>
+    </div>
+    <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'">
+      <btn nativeType="cx" @click="handleResubmit">重新上报</btn>
     </div>
   </el-dialog>
 </template>
@@ -112,8 +119,7 @@
 import { mapGetters } from "vuex";
 import JsonEditor from "@/components/JsonEditor.vue";
 import Xyjg from "./Result";
-import { getTabsDetail, getXml, getReportDetail } from "@/api/dataReport.js";
-import { MessageBox } from "element-ui";
+import { getTabsDetail, getXml, getReportDetail, restartGenerateXml } from "@/api/dataReport.js";
 export default {
   components: { JsonEditor, Xyjg },
   props: {
@@ -184,7 +190,6 @@ export default {
       }
     },
     handleTitleTab (val) {
-      console.log(val);
     },
     isShow (item) {
       this.dataReport = item;
@@ -235,11 +240,11 @@ export default {
       this.editItem = "";
       this.headerList = [];
     },
-    submitForm () {
-      // this.$store.dispatch(
-      //   "business/setRules",
-      //   this.$store.state.business.subRules
-      // );
+    /**
+     * @description: 提交
+     * @author: renchao
+     */
+    submitForm: _.debounce(function () {
       this.$refs["editItem"].handleUpdateForm()
         .then((res) => {
           if (res == 200) {
@@ -255,7 +260,22 @@ export default {
             type: "error"
           })
         })
+    }, 500),
+    /**
+     * @description: 重新上报
+     * @author: renchao
+     */
+    handleResubmit: _.debounce(function () {
+      restartGenerateXml(this.dataReport.bsmSjsb || this.dataReport.bsmReport).then((res) => {
+        if (res.code == 200) {
+          this.resultInfo = res.message
+          this.$message({
+            message: '生成成功',
+            type: 'success'
+          })
         }
+      })
+    }, 500)
   }
 }
 </script>
@@ -266,6 +286,7 @@ export default {
 /deep/.el-dialog__body {
   display: flex;
   flex-direction: column;
+  padding-bottom: 25px;
 }
 
 /deep/ .el-tabs {
@@ -273,8 +294,6 @@ export default {
 }
 
 .sjmx {
-  padding-bottom: 25px;
-
   /deep/.el-tabs__item {
     height: 50px;
     padding-top: 6px;
@@ -350,21 +369,18 @@ export default {
 }
 
 .edit-content {
-  height: 420px;
   overflow-y: auto;
   overflow-x: hidden;
   padding-right: 1px;
   margin-bottom: 10px;
   border-top: none;
+  height: 45vh;
 }
 
 /deep/.editDialogBox {
   border-radius: 8px;
   overflow: hidden;
   min-width: 1228px;
-  height: 825px !important;
-
- 
 
   .el-dialog__header {
     display: flex;

 <template>
-  <div>
-    <el-input type="textarea" :rows="6" :disabled="$store.state.business.Edit" placeholder="配置参数" v-model="resultInfo">
+  <el-input type="textarea" :rows="6" disabled placeholder="配置参数" v-model="resultInfo">
   </el-input>
-    <div class="d-center" v-if="!$store.state.business.Edit">
-      <btn nativeType="cx" @click="submitForm">重新上报</btn>
-    </div>
-  </div>
 </template>
 <script>
 // 引入json编译器
@@ -15,26 +10,15 @@ export default {
       type: String,
       default: ''
     }
-  },
-  data () {
-    return {
-      myValue: this.value,
-    }
-  },
-  methods: {
-    onJsonChange (value) {
-    },
-    onJsonSave (value) {
-    }
   }
 }
 
 </script>
 
 <style scoped lang="scss">
-/* jsoneditor右上角默认有一个链接,加css去掉了 */
 /deep/.el-textarea__inner {
-  min-height: 70vh !important;
+  height: 67vh !important;
+  border: none !important;
   background-color: #08346F !important;
   color: #ffffff;
   border: none !important;

@@ -18,6 +18,9 @@ const actions = {
   getUserInfo ({ commit }) {
     return new Promise(async (resolve) => {
       let { result: res } = await getUserInfo();
+      // require.ensure([], function (require) {
+      //   require("@/assets/sass/smart-lift/index.scss");
+      // });
       commit("SET_USERINFO", res);
       resolve(true);
     });

@@ -2,7 +2,7 @@
   overflow: hidden;
   background: url("~@/image/dialogBg.png") no-repeat !important;
   background-size: 100% 100% !important;
-  min-height: 89vh;
+  min-height: 90vh;
 
   .dialog_title {
     display: flex;
@@ -56,7 +56,19 @@
     box-shadow: inset 0px 0px 12px 0px #02D9FD;
     border-radius: 2px;
     border: 1px solid #6BC1FC;
-    margin: 0 18px 15px 18px;
+    margin: 0 18px 10px 18px;
+  }
+}
+
+.regularHeight {
+  height: 80vh;
+  display: flex;
+  flex-direction: column;
+
+  .editDialogBox-con,
+  .JsonEditor {
+    flex: 1;
+    height: 100%;
   }
 }
 
@@ -105,7 +117,7 @@
 }
 
 /deep/.el-textarea__inner {
-  border: 1px solid #224C7C !important;
+  border: 1px solid #224C7C;
   margin: 0 0 10px 0 !important;
   width: 100% !important;
   color: #dadde3 !important;

@@ -199,11 +199,13 @@
   box-sizing: border-box;
   text-align: right;
 }
+
 // 修改弹框样式
-.modifydialog{
+.modifydialog {
   /deep/.el-dialog__header {
     text-align: center;
     margin-bottom: 10px;
+
     .el-dialog__title {
       color: white;
     }
@@ -212,29 +214,36 @@
   /deep/.el-form-item__label {
     color: white;
   }
+
   /deep/.el-input__inner {
     background-color: #07388b;
   }
+
   /deep/.el-input__inner {
     background: #07388b;
     border-radius: 2px;
     border: 1px solid #6bc1fc;
   }
+
   /deep/.el-textarea__inner {
     background: #07388b;
     color: #fff;
   }
+
   /deep/.el-form-item__label {
     color: #fff;
   }
+
   /deep/.el-dialog__headerbtn {
     position: absolute;
     top: 22px;
     right: 30px;
   }
+
   /deep/.el-dialog__header {
     text-align: center;
     margin-bottom: 10px;
+
     .el-dialog__title {
       color: white;
     }
@@ -242,7 +251,7 @@
 }
 
 // 角色配置
-.roleconfiguration{
+.roleconfiguration {
   /deep/.el-dialog__body {
     display: flex;
     flex-direction: column;
@@ -328,7 +337,6 @@
   }
 
   .edit-content {
-    height: 450px;
     overflow-y: auto;
     overflow-x: hidden;
     padding-right: 1px;
@@ -401,6 +409,7 @@
       display: flex;
       margin-bottom: 15px;
     }
+
     .el-dialog__footer {
       padding-right: 40px;
     }
@@ -414,12 +423,15 @@
   .el-dialog__wrapper {
     overflow: hidden;
   }
+
   /deep/.el-table {
     background: none;
+
     th.el-table__cell {
       background-color: #073781;
       color: #02d9fd;
     }
+
     tr {
       background: none;
 
@@ -430,4 +442,3 @@
   }
 
 }
\ No newline at end of file
-

@@ -118,6 +118,7 @@
     },
     data () {
       return {
+        
         pickerOptionsStart: {
           disabledDate: (time) => {
             let endDateVal = this.form.receiveEndTime;

@@ -4,38 +4,16 @@
       <h2>{{ productName }}</h2>
       <div class="user_style">
         <h3>欢迎登录</h3>
-        <el-form
-          :model="user"
-          :rules="rules"
-          ref="user"
-          id="loginform"
-          class="demo-ruleForm"
-        >
+        <el-form :model="user" :rules="rules" ref="user" id="loginform" class="demo-ruleForm">
           <el-form-item prop="account">
-            <el-input
-              class="username"
-              v-model="user.account"
-              placeholder="请输入用户名"
-            ></el-input>
+            <el-input class="username" v-model="user.account" placeholder="请输入用户名"></el-input>
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              type="password"
-              class="password"
-              v-model="user.password"
-              placeholder="请输入密码"
-            ></el-input>
+            <el-input type="password" class="password" @keyup.native="login('user')" v-model="user.password"
+              placeholder="请输入密码"></el-input>
           </el-form-item>
-          <!-- <el-form-item>
-            <el-checkbox
-              label="记住用户名"
-              @change="checkUserName"
-            ></el-checkbox>
-          </el-form-item> -->
           <el-form-item class="login-btn">
-            <el-button type="primary" style="width: 100%" @click="login('user')"
-              >登录</el-button
-            >
+            <el-button type="primary" style="width: 100%" @click="login('user')">登录</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -48,7 +26,7 @@ import { loginIn } from "@/api/login.js";
 import { api, getAction } from "@/api/manageApi";
 export default {
   name: "Login",
-  data() {
+  data () {
     return {
       user: {
         account: "",
@@ -62,7 +40,7 @@ export default {
       },
     };
   },
-  created() {
+  created () {
     const params = {};
     const queryOptions = {
       conditionGroup: {
@@ -87,7 +65,7 @@ export default {
       }
     });
   },
-  mounted() {
+  mounted () {
     // this.checkUserName();
   },
   methods: {
@@ -106,7 +84,7 @@ export default {
         this.user.account = localStorage.getItem("accountId");
       }
     },
-    login(user) {
+    login (user) {
       var self = this;
       this.$refs[user].validate((valid) => {
         if (valid) {
@@ -135,6 +113,7 @@ export default {
 .username,
 .password {
   position: relative;
+
   &:before {
     content: "";
     display: block;
@@ -145,18 +124,22 @@ export default {
     top: 7px;
     background-size: 100% 100%;
   }
+
   /deep/ .el-input__inner {
     text-indent: 24px;
     border: 1px solid rgba(11, 161, 248, 0.4);
     background-color: rgba(6, 135, 205, 0.3) !important;
   }
 }
+
 .username::before {
   background-image: url(../../image/username.png);
 }
+
 .password::before {
   background-image: url(../../image/password.png);
 }
+
 .bg {
   width: 100%;
   height: 100%;
@@ -180,6 +163,7 @@ export default {
   background-size: 100% 100%;
   box-sizing: border-box;
   padding: 56px;
+
   h2 {
     width: 100%;
     font-size: 36px;
@@ -190,14 +174,12 @@ export default {
     position: absolute;
     right: 0;
     top: -70px;
-    background-image: linear-gradient(
-      180deg,
+    background-image: linear-gradient(180deg,
         rgba(99, 163, 255, 1) 0,
         rgba(99, 163, 255, 1) 0,
         rgba(182, 220, 255, 1) 49.731445%,
         rgba(114, 190, 255, 1) 100%,
-      rgba(114, 190, 255, 1) 100%
-    );
+        rgba(114, 190, 255, 1) 100%);
     overflow-wrap: break-word;
     color: rgba(255, 255, 255, 1);
     font-size: 36px;
@@ -206,6 +188,7 @@ export default {
     -webkit-text-fill-color: transparent;
   }
 }
+
 .login {
   .user_style {
     h3 {
@@ -217,6 +200,7 @@ export default {
       font-weight: 400;
     }
   }
+
   .btn {
     width: 100%;
     height: 6vh;
@@ -225,6 +209,7 @@ export default {
     font-size: 1.4vw;
     color: #ffffff;
   }
+
   .btn:hover {
     cursor: pointer;
     background-color: #2d8cf0;
@@ -235,18 +220,22 @@ export default {
   .el-form-item {
     margin-bottom: 24px !important;
   }
+
   .login-btn {
     margin-top: 40px !important;
   }
+
   .el-button {
     font-size: 18px;
     background: #0d8cc0 !important;
     color: #ffffff !important;
     cursor: pointer !important;
   }
+
   .el-input__inner {
     width: 100% !important;
   }
+
   .el-checkbox__label {
     color: #fff;
   }

@@ -51,7 +51,7 @@ import data from "./data";
 // 引入table混入方法
 import tableMixin from "@/mixins/tableMixin.js";
 // 导出excel表格
-import downLbTable from '@/components/downLbTable'
+import downLbTable from '@/components/DownLbTable'
 // 获取时间
 import { getCurrentDate, setExport2Excel } from "@/utils/tools";
 export default {

@@ -51,7 +51,7 @@ import data from "./data";
 // 引入table混入方法
 import tableMixin from "@/mixins/tableMixin.js";
 // 导出excel表格
-import downLbTable from '@/components/downLbTable'
+import downLbTable from '@/components/DownLbTable'
 // 获取时间
 import { getCurrentDate, setExport2Excel } from "@/utils/tools";
 export default {

@@ -49,7 +49,7 @@ import data from "./data";
 // 引入table混入方法
 import tableMixin from "@/mixins/tableMixin.js";
 // 导出excel表格
-import downLbTable from '@/components/downLbTable'
+import downLbTable from '@/components/DownLbTable'
 // 获取时间
 import { getCurrentDate, setExport2Excel } from "@/utils/tools";
 export default {

@@ -50,7 +50,7 @@ export default {
   }
 
   /deep/.el-textarea__inner {
-    min-height: 33vh !important;
+    min-height: 27vh !important;
     background-color: #08346F !important;
     color: #ffffff;
     border: none !important;

@@ -6,6 +6,31 @@ class data {
   columns () {
     return [
       {
+        width: "70",
+        renderHeader: (h, scope) => {
+          return (
+            <div>
+              <i
+                class="el-icon-plus"
+                onClick={() => {
+                  vm.handleSBAdd();
+                }}
+                style="cursor:pointer;color:#409EFF"
+              ></i>
+            </div>
+          );
+        },
+        render: (h, scope) => {
+          return <i
+            class="el-icon-minus"
+            onClick={() => {
+              vm.handleSBMinus(scope.row);
+            }}
+            style="cursor:pointer;color:#409EFF"
+          ></i>
+        },
+      },
+      {
         prop: 'ywh',
         label: '业务号',
         render: (h, scope) => {

@@ -4,6 +4,7 @@
     <div slot="title" class="dialog_title" ref="dialogTitle">
       {{ title || '标题' }}
     </div>
+    <div class="regularHeight">
       <div class="editDialogBox-box">
         <el-tabs v-model="titleName" type="card">
           <el-tab-pane label="登薄详情" name="sjmx"></el-tab-pane>
@@ -14,22 +15,22 @@
           <el-row class="dialog-from_header item-content-input">
             <el-col :span="8">
               <span>行政编码：</span>
-            <el-input v-model="titleForm.xzbm" maxlength="10"></el-input>
+              <el-input v-model="accessLog.AREACODE" maxlength="10"></el-input>
             </el-col>
             <el-col :span="8">
               <span>行政名称：</span>
-            <el-input v-model="titleForm.mc" maxlength="20"></el-input>
+              <el-input v-model="accessLog.AREANAME" maxlength="20"></el-input>
             </el-col>
             <el-col :span="8">
               <span>日期：</span>
-            <el-date-picker v-model="titleForm.date" type="date">
+              <el-date-picker v-model="accessLog.CREATEDATE" type="date">
               </el-date-picker>
             </el-col>
           </el-row>
           <el-row class="dialog-from_header item-content-input">
             <el-col :span="24">
               <span class="bz">备注：</span>
-            <el-input placeholder="请输入内容" maxlength="1000" v-model="titleForm.bz">
+              <el-input placeholder="请输入内容" maxlength="1000" v-model="accessLog.REMARK">
               </el-input>
             </el-col>
           </el-row>
@@ -109,7 +110,7 @@
           <div>
             <el-row class="dialog-from_header item-content-input">
               <el-col :span="4">
-              <span>总数量1：</span>
+                <span>总数量：</span>
                 <el-input v-model="titleForm.totalNum" oninput="if(value.length > 6) value=value.slice(0, 6)"
                   type="number"></el-input>
               </el-col>
@@ -181,12 +182,12 @@
             <el-tab-pane label="当日上报详单" name="sbslxd"></el-tab-pane>
           </el-tabs>
           <div class="from-clues-content" v-show="titleName2 == 'drdbxd'" :key="key">
-          <lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="165"
+            <lb-table :column="tableDBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200"
               :data="tableDBData.data">
             </lb-table>
           </div>
           <div class="from-clues-content" v-show="titleName2 == 'sbslxd'">
-          <lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="165"
+            <lb-table :column="tableSBData.column" :pagination="false" :heightNumSetting="true" :heightNum="200"
               :data="tableSBData.data">
             </lb-table>
           </div>
@@ -194,21 +195,26 @@
         </div>
       </div>
       <div class="editDialogBox-box" v-if="titleName == 'xml'">
-      <JsonEditor :resultInfo="resultInfo" class="JsonEditor" />
+        <JsonEditor :resultInfo="resultInfo" />
       </div>
-    <div class="editDialogBox-box" v-if="titleName == 'xyjg'">
+      <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xyjg'">
         <Xyjg :form-data='dataReport'></Xyjg>
       </div>
+    </div>
     <div class="d-center" v-if="titleName == 'sjmx'">
       <btn nativeType="cz" @click="dialogVisible = false">取 消</btn>
       <btn nativeType="cx" @click="submitForm">确 定</btn>
     </div>
+    <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'">
+      <btn nativeType="cx" @click="handleResubmit">重新上报</btn>
+    </div>
   </el-dialog>
 </template>
 
 <script>
 import { sbdata, sendThis } from './data/sbdata'
 import { dbdata, sendThis1 } from './data/dbdata'
+import { getDetail } from "@/api/recordLog.js"
 import JsonEditor from "@/components/JsonEditor.vue";
 import Xyjg from "./Result";
 export default {
@@ -225,11 +231,15 @@ export default {
       dialogVisible: false,
       titleName: 'sjmx',
       titleName2: 'drdbxd',
+      // 头部信息
+      accessLog: {
+        AREACODE: '',
+        AREANAME: '',
+        CREATEDATE: '',
+        REMARK: ''
+      },
+
       titleForm: {
-        xzbm: '',
-        mc: '',
-        date: '',
-        bz: '',
         totalNum: '',
         firstReg: '',
         transferReg: '',
@@ -252,6 +262,8 @@ export default {
         data: [],
         column: sbdata.columns()
       },
+      // XML详情
+      resultInfo: '',
       dataReport: {}
     }
   },
@@ -264,9 +276,14 @@ export default {
       this.dialogVisible = false;
     },
     isShow (item) {
-      this.titleName = 'sjmx';
-      this.dialogVisible = true;
+      this.titleName = 'sjmx'
+      this.dialogVisible = true
+      console.log(item, 'itemitemitem')
+      getDetail(item.dbBsm).then(res => {
+        console.log(res, 'eeeeeeeeeeeeeeeee');
+      })
     },
+    // 当日登薄详单
     handleDBAdd () {
       this.tableDBData.data.push({
         ywh: '',
@@ -285,6 +302,25 @@ export default {
     handleDBMinus (row) {
       this.tableDBData.data.splice(row.index, 1)
     },
+    // 当日上报详单
+    handleSBAdd () {
+      this.tableSBData.data.push({
+        ywh: '',
+        djlx: '',
+        qllx: '',
+        bdcdyh: '',
+        zszmh: '',
+        sfsb: '',
+        bwid: ''
+      })
+      this.tableSBData.data.forEach((item, indx) => {
+        this.$set(item, 'index', index)
+      })
+      this.key++
+    },
+    handleSBMinus (row) {
+      this.tableSBData.data.splice(row.index, 1)
+    },
     submitForm () { }
   }
 }
@@ -294,6 +330,22 @@ export default {
 @import "~@/styles/public.scss";
 @import "~@/styles/dialogBox.scss";
 
+
+/deep/.el-tabs__header {
+  margin: 0;
+}
+
+.regularHeight {
+  height: 77vh;
+  display: flex;
+  flex-direction: column;
+
+  .editDialogBox-con,
+  .JsonEditor {
+    flex: 1;
+  }
+}
+
 /deep/.el-tabs__item {
   color: #CEF8FF !important;
 

@@ -147,6 +147,9 @@ export default {
       this.$refs.editLog.isShow(row);
       this.$store.dispatch('business/setReportLogEdit')
     }
+  },
+  destroyed () {
+    this.$store.dispatch('business/setEdit')
   }
 }
 </script>