Merge remote-tracking branch 'origin/develop' into develop

src/pages/localTool/standAutoSplit/index.vue

@@ -82,8 +82,11 @@
                 label="拆分状态"
                 align="center">
               <template slot-scope="scope">
-                <div>{{ scope.row.splitStatus == '0' ? '编辑中' : (scope.row.splitStatus == '1' ? '审核中' : '已完成' +
+                <span v-if="scope.row.splitStatus == '0'">编辑中</span>
-                    '') }}</div>
+                <span v-else-if="scope.row.splitStatus == '1'">审核中</span>
+                <span v-else-if="scope.row.splitStatus == '2'">已关联</span>
+                <span v-else-if="scope.row.splitStatus == '3'">解读中</span>
+                <span v-else>已完成</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -831,7 +834,7 @@ export default {
         name: 'OtherStandardDetails',
         params: {
           id: item.standId,
-          pageType: 'INLAND_STAND'
+          pageType: item.standType + '_STAND'
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -842,7 +845,7 @@ export default {
         name: 'OtherStandardDetails',
         params: {
           id: item.standId,
-          pageType: item.sarType + '_STAND'
+          pageType: item.sarType + '_STAND',
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -1378,6 +1381,7 @@ export default {
         query: {
           infoId: row.id,
           result: row.result,
+          splitStatus: row.splitStatus
         }
       })
     },

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -97,7 +97,8 @@
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="''">属性</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-btn-permission="''">编辑</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '编辑',  scope.$index]" v-if="splitStatus === '4'" v-btn-permission="''">编辑</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '编辑',  scope.$index]" v-else :disabled="true" v-btn-permission="''">编辑</el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="''">复制</el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
                     </el-dropdown-menu>
@@ -685,6 +686,7 @@ export default {
   },
   data () {
     return {
+      splitStatus: this.$route.query.splitStatus,
       auditFlag: this.$route.query.auditFlag,
       splitCheckDialog: false,
       submitLoading: false,
@@ -1306,7 +1308,6 @@ export default {
           if (cur[i].pId == null || cur[i].pId === '') {
             this.parentNode = cur[i]
           }
-          console.log(str);
           this.zNodes = str
         }
         // 查完左侧目录后，如果没有选中的，设置最外层选中

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -388,6 +388,7 @@
                 sarType: '',
                 loading: false,
                 standId: '',
+                statusId: '',
                 commentText: '',
                 textarea: '', // 意见
                 title: '', // 新增抽屉标题
@@ -401,6 +402,7 @@
                     itemsNum: '',
                     itemsName: '',
                     standId: '',
+                    statusId: '',
                     itemsNum1: '',
                     itemsName1: '',
                     oldNumber: ''
@@ -622,6 +624,8 @@
                     this.form.standId = bringData[0].standId
                     this.sarType = bringData[0].standType
                     this.standId = bringData[0].standId
+                    this.statusId = bringData[0].id
+                    this.form.statusId = bringData[0].id
                     this.listModel = false;
                     this.listModel2 = true
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {

src/pages/processCenter/pages/creatProcess/bzjd/step1.vue

@@ -388,6 +388,7 @@
                 sarType: '',
                 loading: false,
                 standId: '',
+                statusId: '',
                 commentText: '',
                 textarea: '', // 意见
                 title: '', // 新增抽屉标题
@@ -401,6 +402,7 @@
                     itemsNum: '',
                     itemsName: '',
                     standId: '',
+                    statusId: '',
                     itemsNum1: '',
                     itemsName1: '',
                     oldNumber: ''
@@ -627,6 +629,8 @@
                     this.form.standId = bringData[0].standId
                     this.sarType = bringData[0].standType
                     this.standId = bringData[0].standId
+                    this.statusId = bringData[0].id
+                    this.form.statusId = bringData[0].id
                     this.listModel = false;
                     this.listModel2 = true
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {

src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue

@@ -145,7 +145,8 @@
                 width="160"
                 label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
@@ -181,7 +182,8 @@
                 width="160"
                 label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
@@ -352,13 +354,13 @@ export default {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
           if (item.attrInfoMap === null) {
-            this.$set(item, "ZCCSSRQ", '');
+            this.$set(item, "ZCCSSRQ", "");
-            this.$set(item, "XCXSSRQ", '');
+            this.$set(item, "XCXSSRQ", "");
           } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -410,8 +412,8 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-        this.$message.warning('请填写审批意见')
+        this.$message.warning("请填写审批意见");
       } else {
         this.listForm.bzFlag = "2";
         this.listForm.commentText = this.commentText;
@@ -433,10 +435,11 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.isSubmit = true;
       this.listForm.bzFlag = "1";
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
-        console.log(json)
+      console.log(json);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -448,9 +451,10 @@ export default {
           this.$message.success(res.message);
           this.$router.push("/processCenter");
         }
+        this.isSubmit = false;
       }, e => {
       });
-    },
+    }
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue

@@ -145,7 +145,8 @@
                 width="160"
                 label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
@@ -181,7 +182,8 @@
                 width="160"
                 label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
@@ -350,13 +352,13 @@ export default {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
           if (item.attrInfoMap === null) {
-            this.$set(item, "ZCCSSRQ", '');
+            this.$set(item, "ZCCSSRQ", "");
-            this.$set(item, "XCXSSRQ", '');
+            this.$set(item, "XCXSSRQ", "");
           } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -385,7 +387,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-            console.log(res.mesg)
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -409,6 +411,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.isSubmit = true;
       this.listForm.bzFlag = "1";
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
@@ -423,9 +426,10 @@ export default {
           this.$message.success(res.message);
           this.$router.push("/processCenter");
         }
+        this.isSubmit = false;
       }, e => {
       });
-    },
+    }
   },
 
   computed: {

src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue

@@ -145,7 +145,8 @@
                 width="160"
                 label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
@@ -181,7 +182,8 @@
                 width="160"
                 label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
@@ -352,13 +354,13 @@ export default {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
           if (item.attrInfoMap === null) {
-            this.$set(item, "ZCCSSRQ", '');
+            this.$set(item, "ZCCSSRQ", "");
-            this.$set(item, "XCXSSRQ", '');
+            this.$set(item, "XCXSSRQ", "");
           } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -410,8 +412,8 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-        this.$message.warning('请填写审批意见')
+        this.$message.warning("请填写审批意见");
       } else {
         this.listForm.dlFlag = "2";
         this.listForm.commentText = this.commentText;
@@ -433,6 +435,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.isSubmit = true;
       this.listForm.dlFlag = "1";
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
@@ -447,9 +450,10 @@ export default {
           this.$message.success(res.message);
           this.$router.push("/processCenter");
         }
+        this.isSubmit = false;
       }, e => {
       });
-    },
+    }
   },
   computed: {
     listNoDataText() {
@@ -459,7 +463,7 @@ export default {
   mounted() {
     this.processTable();
     this.getData();
-  },
+  }
 };
 </script>
 

src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue

@@ -44,7 +44,8 @@
         </process-title>
         <div class="tableTitle">
           <div class="tableButton">
-            <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人
+            </el-button>
           </div>
         </div>
         <el-table
@@ -113,7 +114,8 @@
             align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.liablePeopleId" style="display: none;" />
-              <el-input v-model="scope.row.liablePeople" placeholder="请选择分发责任人" @click.native="choiceZRRS(scope.row.liablePeopleId, 1, scope.$index)"/>
+              <el-input v-model="scope.row.liablePeople" placeholder="请选择分发责任人"
+                        @click.native="choiceZRRS(scope.row.liablePeopleId, 1, scope.$index)" />
             </template>
           </el-table-column>
         </el-table>
@@ -247,8 +249,8 @@ export default {
       modalshowflag: false, // drawer开关
       selectList: [],
       treeData: [], // 人员数据
-      zrIndex: '',
+      zrIndex: "",
-      zrType: '',
+      zrType: "",
       roleForm: {
         liablePeople: ""
       },
@@ -270,7 +272,7 @@ export default {
       detailData: [], //流程历史数据
       userId: this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
-      pId: this.$route.query.prcId,
+      pId: this.$route.query.prcId
     };
   },
   methods: {
@@ -298,13 +300,13 @@ export default {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
           if (item.attrInfoMap === null) {
-            this.$set(item, "ZCCSSRQ", '');
+            this.$set(item, "ZCCSSRQ", "");
-            this.$set(item, "XCXSSRQ", '');
+            this.$set(item, "XCXSSRQ", "");
           } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -354,8 +356,8 @@ export default {
           this.dataList = item.dataList;
           this.listForm.breakdownList = item.breakdownList;
         } else {
-          this.listForm = item.form
+          this.listForm = item.form;
-          this.dataList = item.form.dataList
+          this.dataList = item.form.dataList;
         }
 
       });
@@ -383,12 +385,13 @@ export default {
     handleSubmit() {
       this.listForm.dataList.forEach(item => {
         if (item.liablePeople !== undefined) {
-            this.peopleFlag = true
+          this.peopleFlag = true;
         } else {
-          this.peopleFlag = false
+          this.peopleFlag = false;
         }
-      })
+      });
       if (this.peopleFlag === true) {
+        this.isSubmit = true;
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
         this.$http.post("lawss/activiti/completeTask", {
@@ -402,30 +405,31 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false;
         }, e => {
         });
       } else {
-        this.$message.warning('请选择分发负责人')
+        this.$message.warning("请选择分发负责人");
       }
     },
     choiceZRRS(row, type, index) {
-      this.type = type
+      this.type = type;
       if (type === 1) {
-        this.drawerTitle = '选择责任人'
+        this.drawerTitle = "选择责任人";
-        this.nodeList = []
+        this.nodeList = [];
-        this.zrIndex = index
+        this.zrIndex = index;
-        this.zrType = type
+        this.zrType = type;
-        this.nodeList.push(row)
+        this.nodeList.push(row);
-        this.modalshowflag = true
+        this.modalshowflag = true;
       } else if (type === 2) {
         // 批量
         if (this.selectList.length > 0) {
-          this.zrType = type
+          this.zrType = type;
-          this.nodeList = []
+          this.nodeList = [];
-          this.modalshowflag = true
+          this.modalshowflag = true;
-          this.drawerTitle = '批量选择责任人'
+          this.drawerTitle = "批量选择责任人";
         } else {
-          this.$message.warning('请选择要分发的数据')
+          this.$message.warning("请选择要分发的数据");
         }
       }
     },
@@ -449,23 +453,23 @@ export default {
     },
     checkedRole(data) {
       if (this.type === 1) {
-        const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]))
+        const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]));
-        newRow.liablePeopleId = data[0].id
+        newRow.liablePeopleId = data[0].id;
-        newRow.liablePeople = data[0].name
+        newRow.liablePeople = data[0].name;
-        this.$set(this.dataList, this.zrIndex, newRow)
+        this.$set(this.dataList, this.zrIndex, newRow);
       } else if (this.type === 2) {
         this.dataList.forEach((item, index) => {
           this.selectList.forEach(items => {
             if (item.standId === items.standId) {
-              const newRow = JSON.parse(JSON.stringify(item))
+              const newRow = JSON.parse(JSON.stringify(item));
-              newRow.liablePeopleId = data[0].id
+              newRow.liablePeopleId = data[0].id;
-              newRow.liablePeople = data[0].name
+              newRow.liablePeople = data[0].name;
-              this.$set(this.dataList, index, newRow)
+              this.$set(this.dataList, index, newRow);
             }
-          })
+          });
-        })
+        });
       }
-      this.modalshowflag = false
+      this.modalshowflag = false;
     },
     cancleUserInfo() {
       this.modalshowflag = false;

src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue

@@ -96,7 +96,8 @@
           <el-table-column label="责任人" prop="workPeople" align="center">
             <template slot-scope="scope">
               <div :class="{'fileClass': !scope.row.workPeople}">
-                {{ scope.row.workPeople ? scope.row.workPeople: '' }}</div>
+                {{ scope.row.workPeople ? scope.row.workPeople : "" }}
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -280,13 +281,13 @@ export default {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
           if (item.attrInfoMap === null) {
-            this.$set(item, "ZCCSSRQ", '');
+            this.$set(item, "ZCCSSRQ", "");
-            this.$set(item, "XCXSSRQ", '');
+            this.$set(item, "XCXSSRQ", "");
           } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -362,8 +363,8 @@ export default {
           });
           this.listForm.children = children;
         } else {
-          this.listForm = item.form
+          this.listForm = item.form;
-          this.dataList = item.form.dataList
+          this.dataList = item.form.dataList;
         }
 
       });
@@ -389,6 +390,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.isSubmit = true;
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.$http.post("lawss/activiti/completeTask", {
@@ -402,6 +404,7 @@ export default {
           this.$message.success(res.message);
           this.$router.push("/processCenter");
         }
+        this.isSubmit = false;
       }, e => {
       });
     },
@@ -434,7 +437,7 @@ export default {
       }
     },
     checkedRole(data) {
-      console.log(data[0].name)
+      console.log(data[0].name);
       // 选取负责人时的操作
       let deposit = new Map();
       let mis2 = new Map();
@@ -456,19 +459,19 @@ export default {
               i.workPeople = undefined;
             });
           } else {
-            const newItem = JSON.parse(JSON.stringify(item))
+            const newItem = JSON.parse(JSON.stringify(item));
-            newItem.workPeopleId = data[0].id
+            newItem.workPeopleId = data[0].id;
-            newItem.workPeople = data[0].name
+            newItem.workPeople = data[0].name;
-            this.$set(this.dataList, index, newItem)
+            this.$set(this.dataList, index, newItem);
           }
         } else {
           if (item.children) {
             item.children.forEach((items, childIndex) => {
               if (deposit.get(items.standId)) {
-                const childItems = JSON.parse(JSON.stringify(items))
+                const childItems = JSON.parse(JSON.stringify(items));
                 childItems.workPeopleId = deposit.get(items.standId).workPeopleId;
                 childItems.workPeople = deposit.get(items.standId).workPeople;
-                this.$set(this.dataList[index].children, childIndex, childItems)
+                this.$set(this.dataList[index].children, childIndex, childItems);
               }
             });
           }

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -370,24 +370,24 @@ export default {
         children: "children",
         label: "name"
       },
-      complianceReasons:'',
+      complianceReasons: "",
-      zcComplianceReasons:'',
+      zcComplianceReasons: "",
       //表单的数据
       listForm: {
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [
           {
-            complianceReasons:'',
+            complianceReasons: "",
-            zcComplianceReasons:'',
+            zcComplianceReasons: ""
           }
         ], //项目下的标准数据
         children: [] //标准下的分解单数据
       },
       dataList: [
         {
-          complianceReasons:'',
+          complianceReasons: "",
-          zcComplianceReasons:'',
+          zcComplianceReasons: ""
         }
       ], //展示的标准数据
       commentText: "", //审批意见
@@ -422,13 +422,13 @@ export default {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
           if (item.attrInfoMap === null) {
-            this.$set(item, "ZCCSSRQ", '');
+            this.$set(item, "ZCCSSRQ", "");
-            this.$set(item, "XCXSSRQ", '');
+            this.$set(item, "XCXSSRQ", "");
           } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -458,7 +458,7 @@ export default {
           pId: this.pId
         }).then(res => {
           if (res) {
-            console.log(res.mesg)
+            console.log(res.mesg);
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
           }
@@ -477,8 +477,8 @@ export default {
           // this.listForm.dataList = item.dataList;
           this.dataList = this.listForm.dataList;
         } else {
-          this.listForm = item.form
+          this.listForm = item.form;
-          this.dataList = item.form.dataList
+          this.dataList = item.form.dataList;
         }
 
       });
@@ -504,6 +504,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.isSubmit = true;
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.$http.post("lawss/activiti/completeTask", {
@@ -517,6 +518,7 @@ export default {
           this.$message.success(res.message);
           this.$router.push("/processCenter");
         }
+        this.isSubmit = false;
       }, e => {
       });
     },
@@ -537,7 +539,7 @@ export default {
         this.$refs.tree.setCheckedKeys([data.id]);
         this.roleRow = this.$refs.tree.getCheckedNodes()[0];
       }
-    },
+    }
   },
   computed: {
     listNoDataText() {

src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue

@@ -145,7 +145,8 @@
                 width="160"
                 label="完成时间">
                 <template slot-scope="scope">
-                                    <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
@@ -181,7 +182,8 @@
                 width="160"
                 label="完成时间">
                 <template slot-scope="scope">
-                                    <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
@@ -330,7 +332,7 @@
   methods: {
     // 点击查看
     handlePreview(item) {
-            console.log(item)
+      console.log(item);
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
@@ -353,13 +355,13 @@
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
           if (item.attrInfoMap === null) {
-                  this.$set(item, "ZCCSSRQ", '');
+            this.$set(item, "ZCCSSRQ", "");
-                  this.$set(item, "XCXSSRQ", '');
+            this.$set(item, "XCXSSRQ", "");
           } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-              })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -388,7 +390,7 @@
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-                        console.log(res.mesg)
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -412,8 +414,8 @@
     },
     //驳回事件
     beforeBack() {
-                if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-                    this.$message.warning('请填写审批意见')
+        this.$message.warning("请填写审批意见");
       } else {
         this.listForm.ffFlag = "2";
         this.listForm.commentText = this.commentText;
@@ -435,6 +437,7 @@
     },
     //提交事件
     handleSubmit() {
+      this.isSubmit = true;
       this.listForm.ffFlag = "1";
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
@@ -449,8 +452,9 @@
           this.$message.success(res.message);
           this.$router.push("/processCenter");
         }
+        this.isSubmit = false;
       });
-            },
+    }
   },
   computed: {
     listNoDataText() {
@@ -460,7 +464,7 @@
   mounted() {
     this.processTable();
     this.getData();
-        },
+  }
 };
 </script>
 

src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue

@@ -433,6 +433,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.isSubmit = true;
         this.listForm.jgFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -447,6 +448,7 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false;
         }, e => {
         });
     },

src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue

@@ -145,7 +145,8 @@
                 width="160"
                 label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
@@ -181,7 +182,8 @@
                 width="160"
                 label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
@@ -352,13 +354,13 @@ export default {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
           if (item.attrInfoMap === null) {
-            this.$set(item, "ZCCSSRQ", '');
+            this.$set(item, "ZCCSSRQ", "");
-            this.$set(item, "XCXSSRQ", '');
+            this.$set(item, "XCXSSRQ", "");
           } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -410,8 +412,8 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-        this.$message.warning('请填写审批意见')
+        this.$message.warning("请填写审批意见");
       } else {
         this.listForm.gcFlag = "2";
         this.listForm.commentText = this.commentText;
@@ -433,6 +435,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.isSubmit = true;
       this.listForm.gcFlag = "1";
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
@@ -447,9 +450,10 @@ export default {
           this.$message.success(res.message);
           this.$router.push("/processCenter");
         }
+        this.isSubmit = false;
       }, e => {
       });
-    },
+    }
   },
   computed: {
     listNoDataText() {

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -391,8 +391,8 @@
               </el-select>
             </el-form-item>
             <!--            是否纳入标准清单-->
-            <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
+            <el-form-item  label="是否纳入标准清单" class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
+              <el-select v-model="sarStandardsSearch.isRelateAccess"  placeholder="根据是否纳入标准清单查找">
                 <el-option value="yes" label="是"></el-option>
                 <el-option value="no" label="否"></el-option>
               </el-select>
@@ -437,7 +437,7 @@
             <el-form-item label="我司参与深度">
               <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in wscysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
 
@@ -530,6 +530,23 @@
                 </el-option>
               </el-select>
             </el-form-item>
+
+<!--            标记-->
+            <!--            标签-->
+            <el-form-item label="标签">
+              <el-input v-model="sarStandardsSearch.tag" clearable
+                        placeholder="根据被标签查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+
+
+            <!--            体系类别-->
+            <el-form-item label="体系类别">
+              <el-select v-model="sarStandardsSearch.txlbOption" placeholder="根据体系类别查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
           </el-form>
         </div>
         <div class="demo-drawer-footer">
@@ -1428,7 +1445,10 @@ export default {
         replacedStandNum: '',
         synopsis: '', // 内容摘要
         // category: '', // 所属类别
-        standSort: '' // 标准类别
+        standSort: '', // 标准类别
+        txlbOption:'', //标准体系
+        tag:'' //标签
+
       }, // 分页查询过程中用到的对象
       loading: false,
       isCollapse: true,
@@ -1484,6 +1504,8 @@ export default {
       categoryConfigOptions: [], // 所属类别下拉框
       assemClassOptions: [], // 总成分类下拉框
       standAttributeList: [],
+      qcdwOptions:[],//起草单位
+      wscysdOptions:[], //我司参与深度
       // 树形结构
       // tree function
       MoveTest: '',
@@ -4283,6 +4305,7 @@ export default {
       this.categoryConfigOptions = res.data.CATEGORY
       this.standAttributeList = res.data.RULETYPE
       this.qcdwOptions = res.data.QCDW
+      this.wscysdOptions=res.data.WSCYSD;
       this.getGzzOption()
       this.setMap(this.standStateOptions)
     }, e => {

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -1082,7 +1082,6 @@ export default {
       this.localProTableSearch = { ...this.localProTableSearchDefault };
       this.projectLibrarySearch = { ...this.projectLibrarySearchDefault };
       this.localProTableSearch.page = 1;
-      this.isAdvancedSearch = false;
       this.getLocalProductTable();
     },
     resolveTime(data) {