Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/views/AllPersonnelBase/modules/dcfptxAj.vue

@@ -5,6 +5,7 @@
     width="36.375rem"
     append-to-body
     :before-close="handleClose"
+    :close-on-click-modal='false'
   >
     <el-form
       label-width="6.25rem"
@@ -77,12 +78,20 @@
       slot="footer"
       class="dialog-footer"
     >
+      <!-- <el-button
+        class="confirmBtn"
+        @click="focus"
+        type="primary"
+      >导出</el-button> -->
       <el-button
         class="confirmBtn"
         @click="focus"
+      >导 出</el-button>
+      <el-button
+        @click="dialogVisible = false"
+        class="confirmBtn"
         type="primary"
-      >导出</el-button>
-
+      >取 消</el-button>
     </span>
   </el-dialog>
 </template>

src/views/AllPersonnelBase/modules/dcftpx.vue

@@ -5,6 +5,7 @@
     width="54.6875rem"
     append-to-body
     :before-close="handleClose"
+    :close-on-click-modal='false'
   >
     <div class="head">
       文字:<el-checkbox v-model="wzChecked">基本信息</el-checkbox>
@@ -300,16 +301,20 @@
       slot="footer"
       class="dialog-footer"
     >
-      <!-- <el-button @click="focus">确 定</el-button>
+      <el-button
+        class="confirmBtn"
+        @click="focus"
+      >导 出</el-button>
       <el-button
         @click="dialogVisible = false"
+        class="confirmBtn"
         type="primary"
-      >取 消</el-button> -->
-      <el-button
+      >取 消</el-button>
+      <!-- <el-button
         class="confirmBtn"
         @click="focus"
         type="primary"
-      >导出</el-button>
+      >导出</el-button> -->
 
     </span>
   </el-dialog>

src/views/AllPersonnelBase/modules/fcx.vue

@@ -5,6 +5,7 @@
     width="55.75rem"
     append-to-body
     :before-close="handleClose"
+    :close-on-click-modal='false'
   >
     <div class="top">
       <div class="left">

src/views/AllPersonnelBase/modules/fztm.vue

@@ -5,6 +5,7 @@
     width="26.125rem"
     append-to-body
     :before-close="handleClose"
+    :close-on-click-modal='false'
   >
     <el-form
       :label-position="labelPosition"

src/views/AllPersonnelBase/modules/ggrytm.vue

@@ -5,6 +5,7 @@
     width="26.125rem"
     append-to-body
     :before-close="handleClose"
+    :close-on-click-modal='false'
   >
     <el-form
       :label-position="labelPosition"

src/views/AllPersonnelBase/modules/gz.vue

@@ -5,6 +5,7 @@
     :width="width"
     append-to-body
     :before-close="handleClose"
+    :close-on-click-modal='false'
   >
     <el-table
       v-if="type=='ry'"
@@ -159,9 +160,9 @@ export default {
         reqUrl = '/api/mypsn/mypsnAdd'
         let newReqParams = {
           personDoList: [],
-          comments: ''
+          bz: ''
         }
-        newReqParams.comments = this.comments;
+        newReqParams.bz = this.comments;
         for (let i = 0; i < this.rowData.length; i++) {
           let personDo = {
             ysxtAsjxgrybh: '',

src/views/AllPersonnelBase/modules/tjddl.vue

@@ -5,6 +5,7 @@
     width="26.125rem"
     append-to-body
     :before-close="handleClose"
+    :close-on-click-modal='false'
   >
     <el-form
       :model="ruleForm"

src/views/AllPersonnelBase/modules/xzaj.vue

@@ -6,6 +6,7 @@
     top="1.25rem"
     append-to-body
     :before-close="handleClose"
+    :close-on-click-modal='false'
   >
     <el-form
       :label-position="labelPosition"

src/views/AllPersonnelBase/modules/xzry.vue

@@ -6,6 +6,7 @@
     top="1.25rem"
     append-to-body
     :before-close="handleClose"
+    :close-on-click-modal='false'
   >
     <el-form
       :label-position="labelPosition"

src/views/SystemManage/GroupManage.vue

@@ -340,7 +340,11 @@
       </div>
     </div>
     <!-- 角色设置 -->
-    <el-dialog :title="title.roletitle" :visible.sync="visible.setRoleVisible">
+    <el-dialog
+      class="dialog"
+      :title="title.roletitle"
+      :visible.sync="visible.setRoleVisible"
+    >
       <div slot="title">
         <img class="title-img" :src="src" alt="" />
         <span>{{ title.roletitle }}</span>

src/views/SystemManage/scss/group.scss

@@ -234,6 +234,7 @@
 .dialog{
   width: 823px;
   padding: 0;
+  margin-left: 30%;
   .title-img{
     width: 21px;
     height: 21px;

src/views/drFPTX/Index.vue

@@ -15,7 +15,7 @@
       <div class="wjlx">
         <div class="left">
           <el-radio-group v-model="wjlx">
-            <el-radio :label="3">单个文件</el-radio>
+            <el-radio :label="3">文件</el-radio>
             <el-radio :label="6">文件夹</el-radio>
           </el-radio-group>
         </div>
@@ -522,9 +522,19 @@ export default {
     // 导入成功,跳转详情
     goList () {
       if (this.drlx == 3 || this.drlx == 6) {
-        this.$router.push('/RAList')
+        this.$router.push({
+          path: '/RAList',
+          query: {
+            id: 1
+          }
+        })
       } else if (this.drlx == 9) {
-        this.$router.push('/RAList')
+        this.$router.push({
+          path: '/RAList',
+          query: {
+            id: 2
+          }
+        })
       }
     },
     // 取消上传
@@ -551,10 +561,10 @@ export default {
     },
     // 获取文件列表
     onChange (file, fileList) {
-      console.log(fileList[0], 1111)
+      // console.log(fileList[0], 1111)
 
-      var folder = fileList[0].raw.webkitRelativePath.split("/");
-      console.log('fffff', folder[0])
+      // var folder = fileList[0].raw.webkitRelativePath.split("/");
+      // console.log('fffff', folder[0])
       let that = this;
       let newlist = fileList;
       for (let i = 0; i < fileList.length; i++) {
@@ -563,12 +573,15 @@ export default {
         var reader = new FileReader();
         reader.readAsText(file);
         if (this.drlx == 3) {
+          console.log('333333')
+          that.action = '/api/upload/person'
           reader.onload = function () {
             const reg = /\<ysxt_asjxgrybh\>(.*?)\<\/ysxt_asjxgrybh\>/
             let barcode = this.result.match(reg)
             that.$set(newlist[i], 'barcode', barcode[1])
           }
         } else if (this.drlx == 6) {
+          that.action = '/api/upload/person'
           reader.onload = function () {
             const reg = /\<ysxt_asjbh\>(.*?)\<\/ysxt_asjbh\>/
             let barcode = this.result.match(reg)
@@ -587,7 +600,6 @@ export default {
               console.log('regType', regType)
             }
             console.log('regType', regType)
-
             //查重
             let TT = result.match(regTT)
             console.log('TT', TT)

src/views/drFPTX/RAList.vue

@@ -210,8 +210,8 @@
       :data="tableDate"
       tooltip-effect="dark"
       style="width: 100%"
-      row-key="id"
-      :tree-props="{children: 'secondRecords', hasChildren: 'hasChildren'}"
+      row-key="sequenceNumber"
+      :tree-props="{children: 'pcImportRecordGrandchildren', hasChildren: 'hasChildren'}"
       @selection-change="handleSelectionChange"
     >
       <el-table-column
@@ -424,7 +424,7 @@ export default {
         .then(response => {
           // console.info("查询结果===>", response);
           if (response.data.code === 0) {
-            this.tableDate = response.data.ret.firstRecords;
+            this.tableDate = response.data.ret.pcImportRecordChildren;
             // this.reqParam.page.total = response.data.ret.total;
             console.info("查询结果===>", this.tableDate);
             // this.userInfo = this.getUserInfo(this.tableDate);
@@ -584,6 +584,7 @@ export default {
   },
   mounted () {
     this.search();
+    this.showType = this.$route.query.id || '1'
   }
 }
 </script>