Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -164,7 +164,7 @@
        * @param {*} value
        * @param {*} value
        * @author: renchao
        * @author: renchao
        */
        */
-      handleupdateDetail (value) {
+          handleupdateDetail (value) {
         let arr = this.tableData.map(item => item.zjh)
         let arr = this.tableData.map(item => item.zjh)
         if (this.isaddupdate) {
         if (this.isaddupdate) {
           if (!arr.includes(value.zjh)) {
           if (!arr.includes(value.zjh)) {
@@ -174,7 +174,7 @@
             this.$message.error('证件号不能重复');
             this.$message.error('证件号不能重复');
           }
           }
         } else {
         } else {
-          if (!arr.includes(value.zjh)) {
+          if (!arr.includes(value.zjh)||this.tableData[this.dataIndex].zjh==value.zjh) {
             this.tableDataList[this.dataIndex] = _.cloneDeep(value);
             this.tableDataList[this.dataIndex] = _.cloneDeep(value);
             this.$emit('upDateQlrxxList', this.tableDataList)
             this.$emit('upDateQlrxxList', this.tableDataList)
           } else {
           } else {

@@ -178,7 +178,7 @@
             </el-col>
             </el-col>
             <el-col :span="5" v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
             <el-col :span="5" v-show="ruleForm.sldy.sqfbcz == '0' && ruleForm.sldy.gyfs != '0'">
               <el-form-item label="持证人：">
               <el-form-item label="持证人：">
-                <el-select v-model="ruleForm.czr" placeholder="持证人" :disabled="!viewEdit">
+                <el-select v-model="czr" placeholder="持证人" :disabled="!viewEdit">
                   <el-option
                   <el-option
                     v-for="item in czrOptions"
                     v-for="item in czrOptions"
                     :key="item.zjh"
                     :key="item.zjh"
@@ -255,6 +255,11 @@
             ...res.result,
             ...res.result,
             ...res.result.qlxxdatas,
             ...res.result.qlxxdatas,
           };
           };
+          this.ruleForm.qlrList.forEach((item) => {
+            if(item.sfczr==1){
+              this.czr=item.sqrmc
+            }
+          })
           //初始化发证方式，1：小证，2：大正
           //初始化发证方式，1：小证，2：大正
           this.ruleForm.slsq.fzfs == null
           this.ruleForm.slsq.fzfs == null
             ? (this.ruleForm.slsq.fzfs = "1")
             ? (this.ruleForm.slsq.fzfs = "1")
@@ -272,6 +277,7 @@
         disabled: true,
         disabled: true,
         tdytOption: [],
         tdytOption: [],
         czrOptions: [],
         czrOptions: [],
+        czr:"",
         ruleForm: {
         ruleForm: {
           flow: {
           flow: {
             ywh: "",
             ywh: "",
@@ -387,7 +393,7 @@
               item.sfczr = "1";
               item.sfczr = "1";
             });
             });
           } else {
           } else {
-            if (!that.ruleForm.czr) {
+            if (!that.czr) {
               that.$message({
               that.$message({
                 showClose: true,
                 showClose: true,
                 message: "请选择持证人",
                 message: "请选择持证人",
@@ -396,7 +402,7 @@
               return false;
               return false;
             }
             }
             this.ruleForm.qlrList.forEach((item, index) => {
             this.ruleForm.qlrList.forEach((item, index) => {
-              if (item.zjh == this.ruleForm.czr) {
+              if (item.zjh == this.czr) {
                 item.sfczr = "1";
                 item.sfczr = "1";
               } else {
               } else {
                 item.sfczr = "0";
                 item.sfczr = "0";