完善

src/views/baxz/addZhrxx.vue

@@ -259,8 +259,7 @@ export default {
         }
       },
       downLoadingXyr: false,
-      tableDataXyr: [{
-      }],
+      tableDataXyr: [],
       columObjXyr: {
         visble: false,
         loading: false,

src/views/baxz/baxzDetail.vue

@@ -130,8 +130,7 @@ export default {
         }
       },
       downLoadingMj: false,
-      tableDataMj: [{
-      }],
+      tableDataMj: [],
       columObjMj: {
         visble: false,
         loading: false,
@@ -192,9 +191,7 @@ export default {
         }
       },
       downLoadingXyr: false,
-      tableDataXyr: [{
-
-      }],
+      tableDataXyr: [],
       columObjXyr: {
         visble: false,
         loading: false,
@@ -327,23 +324,27 @@ export default {
       }
     },
     async getMjList () {
+      this.columObjMj.loading = true
       const paramas = new FormData()
       paramas.append('glxxzjbh', this.$route.query.id)
       paramas.append('page', this.pageObjMj.pageData.page)
       paramas.append('limit', this.pageObjMj.pageData.size)
       let res = await selectAllMj(paramas)
       if (res && res.code == 200) {
+        this.columObjMj.loading = false
         this.tableDataMj = res.data.rows
         this.pageObjMj.total = res.data.total
       }
     },
     async getXyrList () {
+      this.columObjXyr.loading = true
       const paramas = new FormData()
       paramas.append('glxxzjbh', this.$route.query.id)
       paramas.append('page', this.pageObjMj.pageData.page)
       paramas.append('limit', this.pageObjMj.pageData.size)
       let res = await selectAllXyr(paramas)
       if (res && res.code == 200) {
+        this.columObjXyr.loading = false
         this.tableDataXyr = res.data.rows
         this.pageObjXyr.total = res.data.total
       }

src/views/baxz/components/addXyrInfo.vue

@@ -113,8 +113,8 @@
           <el-form-item label="性别"
                         prop="xyrxb">
             <el-radio-group v-model="ruleForm.xyrxb">
-              <el-radio :label="0">{{'男'}}</el-radio>
-              <el-radio :label="1">{{'女'}}</el-radio>
+              <el-radio :label="'1'">{{'男'}}</el-radio>
+              <el-radio :label="'2'">{{'女'}}</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="户籍地"
@@ -333,7 +333,7 @@ export default {
             label: "性别",
             width: "",
             align: "center",
-            ownDefinedReturn: (row, index) => { return row.xyrxb == 0 ? '男' : '女' }
+            ownDefinedReturn: (row, index) => { return row.xyrxb == '1' ? '男' : row.xyrxb == '2' ? '女' : '--' }
           },
           {
             text: true,
@@ -527,18 +527,35 @@ export default {
         rwbh: this.ruleForm.rwbh,
         imageUrlZmcl: this.ruleForm.imageUrlZmcl,
         lxdh: this.ruleForm.lxdh,
-        xyrxm: this.ruleForm.xyrxm,
-        xyrsfzh: this.ruleForm.xyrsfzh,
-        xyrhjd: this.ruleForm.xyrhjd,
-        xyrxb: this.ruleForm.xyrxb,
-        xyrsxzm: this.ruleForm.xyrsxzm,
-        xyrszwz: this.ruleForm.xyrszwz,
-        xyrjqhdgj: this.ruleForm.xyrjqhdgj,
-        wzxxmq: this.ruleForm.wzxxmq,
-        xnsfmq: this.ruleForm.xnsfmq,
-        dwgsmq: this.ruleForm.dwgsmq,
-        qtmq: this.ruleForm.qtmq,
-        lyzmcl: this.ruleForm.lyzmcl
+        lyzmcl: this.ruleForm.lyzmcl,
+        xyrxm: '',
+        xyrxb: '',
+        xyrsxzm: '',
+        xyrsfzh: '',
+        xyrhjd: '',
+        xyrszwz: '',
+        xyrjqhdgj: '',
+        wzxxmq: '',
+        xnsfmq: '',
+        dwgsmq: '',
+        qtmq: '',
+      }
+      if (this.ruleForm.rylx == '0') {
+        params.xyrxm = this.ruleForm.xyrxm
+        params.xyrxb = this.ruleForm.xyrxb
+        params.xyrsxzm = this.ruleForm.xyrsxzm
+        params.xyrsfzh = this.ruleForm.xyrsfzh
+        params.xyrhjd = this.ruleForm.xyrhjd
+        params.xyrszwz = this.ruleForm.xyrszwz
+        params.xyrjqhdgj = this.ruleForm.xyrjqhdgj
+      } else if (this.ruleForm.rylx == '1') {
+        params.wzxxmq = this.ruleForm.wzxxmq
+      } else if (this.ruleForm.rylx == '2') {
+        params.xnsfmq = this.ruleForm.xnsfmq
+      } else if (this.ruleForm.rylx == '3') {
+        params.dwgsmq = this.ruleForm.dwgsmq
+      } else if (this.ruleForm.rylx == '4') {
+        params.qtmq = this.ruleForm.qtmq
       }
       this.$refs[ruleForm].validate(async (valid) => {
         if (valid) {
@@ -546,6 +563,59 @@ export default {
             this.tableData.push(params)
           } else if (this.editType == 1) {
             this.tableData[this.tableData.indexOf(this.rowItem)] = this.ruleForm;
+            // 根据人员类型判断展示
+            this.tableData.forEach(item => {
+              if (item.rylx == '0') {
+                item.wzxxmq = ''
+                item.xnsfmq = ''
+                item.dwgsmq = ''
+                item.qtmq = ''
+              } else if (item.rylx == '1') {
+                item.xyrxm = ''
+                item.xyrxb = ''
+                item.xyrsxzm = ''
+                item.xyrsfzh = ''
+                item.xyrhjd = ''
+                item.xyrszwz = ''
+                item.xyrjqhdgj = ''
+                item.xnsfmq = ''
+                item.dwgsmq = ''
+                item.qtmq = ''
+              } else if (item.rylx == '2') {
+                item.xyrxm = ''
+                item.xyrxb = ''
+                item.xyrsxzm = ''
+                item.xyrsfzh = ''
+                item.xyrhjd = ''
+                item.xyrszwz = ''
+                item.xyrjqhdgj = ''
+                item.wzxxmq = ''
+                item.dwgsmq = ''
+                item.qtmq = ''
+              } else if (item.rylx == '3') {
+                item.xyrxm = ''
+                item.xyrxb = ''
+                item.xyrsxzm = ''
+                item.xyrsfzh = ''
+                item.xyrhjd = ''
+                item.xyrszwz = ''
+                item.xyrjqhdgj = ''
+                item.wzxxmq = ''
+                item.xnsfmq = ''
+                item.qtmq = ''
+              } else if (item.rylx == '4') {
+                item.xyrxm = ''
+                item.xyrxb = ''
+                item.xyrsxzm = ''
+                item.xyrsfzh = ''
+                item.xyrhjd = ''
+                item.xyrszwz = ''
+                item.xyrjqhdgj = ''
+                item.wzxxmq = ''
+                item.xnsfmq = ''
+                item.dwgsmq = ''
+              }
+            })
             this.tableData = [...this.tableData]
           }
           this.$emit('getXyrData', this.tableData)

src/views/baxz/components/editXyrInfo.vue

@@ -112,8 +112,8 @@
           <el-form-item label="性别"
                         prop="xyrxb">
             <el-radio-group v-model="ruleForm.xyrxb">
-              <el-radio :label="0">{{'男'}}</el-radio>
-              <el-radio :label="1">{{'女'}}</el-radio>
+              <el-radio :label="'1'">{{'男'}}</el-radio>
+              <el-radio :label="'2'">{{'女'}}</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="户籍地"
@@ -276,8 +276,7 @@ export default {
         }
       },
       downLoading: false,
-      tableData: [{
-      }],
+      tableData: [],
       columObj: {
         visble: false,
         loading: false,
@@ -338,7 +337,7 @@ export default {
             label: "性别",
             width: "",
             align: "center",
-            ownDefinedReturn: (row, index) => { return row.xyrxb == 0 ? '男' : '女' }
+            ownDefinedReturn: (row, index) => { return row.xyrxb == '1' ? '男' : row.xyrxb == '2' ? '女' : '--' }
           },
           {
             text: true,
@@ -519,6 +518,8 @@ export default {
         this.ruleForm.xyrxm = row.xyrxm
         this.ruleForm.xyrsfzh = row.xyrsfzh
         this.ruleForm.xyrhjd = row.xyrhjd
+        this.ruleForm.xyrsxzm = row.xyrsxzm
+        this.ruleForm.xyrxb = row.xyrxb
         this.ruleForm.xyrszwz = row.xyrszwz
         this.ruleForm.xyrhjd = row.xyrhjd
         this.ruleForm.xyrjqhdgj = row.xyrjqhdgj
@@ -565,24 +566,32 @@ export default {
             paramas.append('lyzmcl', this.ruleForm.lyzmcl.raw)
           }
           paramas.append('xyrxm', '')
+          paramas.append('xyrxb', '')
+          paramas.append('xyrsxzm', '')
           paramas.append('xyrsfzh', '')
           paramas.append('xyrhjd', '')
           paramas.append('xyrszwz', '')
           paramas.append('xyrjqhdgj', '')
+          paramas.append('wzxxmq', '')
+          paramas.append('xnsfmq', '')
+          paramas.append('dwgsmq', '')
+          paramas.append('qtmq', '')
           if (this.ruleForm.rylx == '0') {
             paramas.set('xyrxm', this.ruleForm.xyrxm)
+            paramas.set('xyrxb', this.ruleForm.xyrxb)
+            paramas.set('xyrsxzm', this.ruleForm.xyrsxzm)
             paramas.set('xyrsfzh', this.ruleForm.xyrsfzh)
             paramas.set('xyrhjd', this.ruleForm.xyrhjd)
             paramas.set('xyrszwz', this.ruleForm.xyrszwz)
             paramas.set('xyrjqhdgj', this.ruleForm.xyrjqhdgj)
           } else if (this.ruleForm.rylx == '1') {
-            paramas.append('wzxxmq', this.ruleForm.wzxxmq)
+            paramas.set('wzxxmq', this.ruleForm.wzxxmq)
           } else if (this.ruleForm.rylx == '2') {
-            paramas.append('xnsfmq', this.ruleForm.xnsfmq)
+            paramas.set('xnsfmq', this.ruleForm.xnsfmq)
           } else if (this.ruleForm.rylx == '3') {
-            paramas.append('dwgsmq', this.ruleForm.dwgsmq)
+            paramas.set('dwgsmq', this.ruleForm.dwgsmq)
           } else if (this.ruleForm.rylx == '4') {
-            paramas.append('qtmq', this.ruleForm.qtmq)
+            paramas.set('qtmq', this.ruleForm.qtmq)
           }
           if (this.editType == 0) {
             let res = await insertXyrxx(paramas)

src/views/ddLogin.vue

@@ -36,9 +36,8 @@ export default {
           sessionStorage.setItem("userInfo", JSON.stringify(res.data.data));
           const roles = res.data.data.permission.split(",");
           this.$store.commit("user/SET_ROLES", roles);
-
-
-
+          this.$store.commit("user/SET_USERINFO", res.data.data);
+          this.$store.commit("user/SET_TOKEN", "bearer " + res.data.data.accessToken);
           this.Loading.close();
           // this.$router.push('apply');
           this.$router.push({