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

@@ -256,15 +256,7 @@
        * @author: renchao
        */
       deleClick (index, row) {
-        this.$confirm("确定要删除吗, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
             this.tableData.splice(index, 1);
-          })
-          .catch(() => { });
       },
 
       // 身份证读取

@@ -255,15 +255,7 @@
        * @author: renchao
        */
       deleClick (index, row) {
-        this.$confirm("确定要删除吗, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
             this.tableData.splice(index, 1);
-          })
-          .catch(() => { });
       },
 
       // 身份证读取

@@ -42,8 +42,8 @@
           </el-form-item>
         </el-col>
           <el-col :span="8">
-          <el-form-item label="份数" prop="qlbl">
-            <el-input v-model="ruleForm.qlbl" :disabled="!showButton" maxlength="8" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+          <el-form-item label="权利比例" prop="qlbl">
+            <el-input v-model="ruleForm.qlbl" :disabled="!showButton||this.ruleForm.gyfs==1"></el-input>
           </el-form-item>
         </el-col>
 
@@ -67,16 +67,12 @@
       </el-row>
 
       <el-row>
-        <el-col :span="16">
+        <el-col :span="24">
           <el-form-item label="地址" prop="txdz">
             <el-input v-model="ruleForm.txdz" :disabled="!showButton"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="邮编" prop="yb">
-            <el-input v-model="ruleForm.yb" :disabled="!showButton"></el-input>
-          </el-form-item>
-        </el-col>
+
       </el-row>
 
       <el-row>
@@ -91,10 +87,11 @@
           </el-form-item>
         </el-col>
            <el-col :span="8">
-          <el-form-item label="权利比例" prop="qlbl">
-            <el-input v-model="ruleForm.qlbl" :disabled="!showButton"></el-input>
+          <el-form-item label="邮编" prop="yb">
+            <el-input v-model="ruleForm.yb" :disabled="!showButton"></el-input>
           </el-form-item>
         </el-col>
+
       </el-row>
 
       <el-row>

@@ -145,7 +145,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="环节名称"
+          label="环节状态"
           prop="name"
           minWidth="100"
           align="center" />
@@ -440,6 +440,9 @@
             item.comments[item.comments.length - 1].message;
           // 操作方式
           let controls = "";
+          // 正在办理
+          // 已完结
+          // 已退回
           switch (type) {
             case "COMPLETE":
               controls = "完成";

@@ -124,12 +124,12 @@
           let that = this
           this.$nextTick(() => {
             if (val.length == 0 || !val) {
-              // that.tableDataList = _.cloneDeep([{
-              //   sqrmc: '',
-              //   dlrzjlx: '',
-              //   dlrzjh: '',
-              //   fr: ''
-              // }])
+              that.tableDataList = _.cloneDeep([{
+                sqrmc: '',
+                dlrzjlx: '',
+                dlrzjh: '',
+                fr: ''
+              }])
             } else {
               that.tableDataList = _.cloneDeep(val)
             }
@@ -205,14 +205,7 @@
        * @author: renchao
        */
       deleClick (index, row) {
-        this.$confirm('确定要删除吗, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
           this.tableData.splice(index, 1)
-        }).catch(() => {
-        });
       },
 
       /**
@@ -250,9 +243,12 @@
        * @author: renchao
        */
       editClick (index, row) {
+        this.details = row
+        this.details.gyfs=this.gyfs
         this.dataIndex = index
         this.dialog = true
-        this.details = row
+
+
         this.isaddupdate = false
       },
       /**
@@ -262,8 +258,10 @@
        * @author: renchao
        */
       queryViewClick (index, row) {
-        this.dialog = true
+        // this.details.gyfs=this.gyfs
         this.details = row
+        this.dialog = true
+
       }
     }
   }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-24 15:38:52
+ * @LastEditTime: 2023-08-29 09:31:15
 -->
 <template>
   <div class="szxx">
@@ -294,14 +294,18 @@
       justify-content: flex-end;
     }
   }
-  .box-card {
-    .szxx_header {
+  .box-card{
+   .szxx_header{
     color: #303133; 
    }
+    // 证书背景色
+    /deep/.el-card__header {
+      background-color: #e2dfe0;
     }
-  .bg-red {
-    .szxx_header {
-      color: #fff;
+  }
+  .bg-red{
+   .szxx_header{
+    color: #FFF; 
    }
     /deep/.el-card__header {
       background-color: rgb(198, 67, 83);

-import { log } from "bpmn-js-token-simulation"
 
 /*
  * @Description:
@@ -13,7 +12,6 @@ export default {
   watch: {
     'ruleForm.sldy.gyfs': {
       handler: function (val, oldVal) {
-        console.log("单独所有",val,oldVal);
         if (val == '0' && this.ruleForm.qlrList.length > 1 && oldVal) {
           this.ruleForm.sldy.gyfs = oldVal
           this.$message({