From 75621949aae6075e7076901b3b151631c4ccbf8f Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 29 Nov 2021 23:23:57 +0800
Subject: [PATCH 01/38] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E5=88=97=E5=AE=BD50px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 23c1e6870..cd6263266 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -308,7 +308,7 @@
             </el-table-column>
             <el-table-column fixed="right"
                              v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
-                             label="收藏" align="center" width="200"
+                             label="收藏" align="center" width="50px"
             >
               <template slot-scope="scope">
                 <div

From 6b5c1340259d92f36d76a16ba6c0a3b091cab5b2 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 29 Nov 2021 23:53:41 +0800
Subject: [PATCH 02/38] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=20"=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85"=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=91=E5=B8=83=E7=A8=BF=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=E6=88=AA=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index f000f5e31..e3641c239 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -5,7 +5,7 @@
     <div class="details-header">
       <span>{{ sarStandardsInfoEO.standSortShow || '' }} {{
           sarStandardsInfoEO.standNumber
-        }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》 标准详情</span>
+        }}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》</span>
     </div>
     <!--主体内容-->
     <div class="details-content" style="position: relative">
@@ -62,7 +62,7 @@
                           <span>
                           <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                              @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                             :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
+                             :title="file.oldFileName">{{ file.oldFileName }}</a>
                           <i
                               title="下载"
                               @click="downloadFile(file.id)"

From 55e7ccce8529fa5c704710c0e746d98be5e355e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 30 Nov 2021 09:38:13 +0800
Subject: [PATCH 03/38] commit

---
 src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
index c8efc8d8c..8408f31f0 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
@@ -601,7 +601,7 @@ export default {
     },
     //流程提交事件
     handleSubmit() {
-      let fileFlag
+      let fileFlag = true
       this.dataList.forEach(item => {
         if(!item.fileType){
           fileFlag = false
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
index 3c0aa652a..559c3da5d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
@@ -618,7 +618,7 @@ export default {
     },
     //流程提交事件
     handleSubmit() {
-      let fileFlag
+      let fileFlag = true
         this.dataList.forEach(item => {
           if(!item.fileType){
             fileFlag = false

From c31ce50bf3d3f68f1717028a1ae0ca75d92acbf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 30 Nov 2021 09:59:30 +0800
Subject: [PATCH 04/38] commit

---
 src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index a66f721c1..90edd8a9d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -404,8 +404,6 @@ export default {
       this.listForm.children = dataListChildren;
       this.listForm.dataList = this.dataList;
       const json = JSON.stringify(this.listForm);
-      console.log(json);
-      return;
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,

From a2c4aa930951db59308699d170ebcaeddf0fab47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 30 Nov 2021 10:33:26 +0800
Subject: [PATCH 05/38] commit

---
 .../pages/creatProcess/xmpg2/step5.vue        | 147 +++++++++---------
 1 file changed, 77 insertions(+), 70 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index 90edd8a9d..ff2a30683 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -421,7 +421,6 @@ export default {
     },
     //批量分发按钮
     choiceZRRS(row, type, index) {
-      console.log(row);
       this.selectedId = row.id || row.standId;
       this.type = type;
       if (type === 1) {
@@ -429,13 +428,20 @@ export default {
         this.nodeList = [];
         this.zrIndex = index;
         this.zrType = type;
-        this.nodeList.push(row);
+        if (row.workPeopleId) {
+          this.nodeList = row.workPeopleId.split(",");
+        }else{
+          this.nodeList.push(row);
+        }
         this.modalshowflag = true;
       } else if (type === 2) {
         // 批量
         if (this.selectList.length > 0) {
           this.zrType = type;
           this.nodeList = [];
+          if (row.workPeopleId) {
+            this.nodeList = row.workPeopleId.split(",");
+          }
           this.modalshowflag = true;
           this.drawerTitle = "批量选择责任人";
         } else {
@@ -461,6 +467,75 @@ export default {
 
       }
     },
+    checkedRole(data) {
+      console.log(data);
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      //单选操作
+      if (this.type === 1) {
+        this.dataList.forEach(item => {
+          if(item.standId === this.selectedId){
+            item.workPeople = nameList || '请选择责任人'
+            item.workPeopleId = idList;
+          }
+          if (item.children) {
+            item.children.forEach(items => {
+              if (items.id === this.selectedId) {
+                items.workPeople = nameList;
+                items.workPeopleId = idList;
+                // this.$set(items,'workPeople',data[0].name)
+                //this.$set(items,'workPeopleId',data[0].id)
+              }
+            });
+          }
+        });
+        this.dataList = JSON.parse(JSON.stringify(this.dataList));
+      } else if (this.type === 2) {
+        this.selectList.forEach(item => {
+          this.dataList.map(items => {
+            if (item.standId === items.standId) {
+              items.workPeople = nameList  || '请选择责任人'
+              items.workPeopleId = idList;
+              // this.$message.warning('您只能针对条款进行分发')
+            }
+            if (items.children) {
+              items.children.map(childrenItem => {
+                if (childrenItem.id === item.id) {
+                  childrenItem.workPeople = nameList;
+                  childrenItem.workPeopleId = idList;
+                }
+              });
+            }
+          });
+        });
+        this.dataList = JSON.parse(JSON.stringify(this.dataList));
+      } else if (this.type === 3) {
+        // console.log("529",this.workPeopleList)
+        for (let i = 0; i < this.workPeopleList.children.length; i++) {
+
+          this.workPeopleList.children[i].workPeople = data[0].name;
+          this.workPeopleList.children[i].workPeopleId = data[0].id;
+          // console.log(row.children[i].id)
+          // console.log(row.children[i].workPeople)
+        }
+
+        // items.children.map(childrenItem => {
+        //
+        //     childrenItem.workPeople = data[0].name;
+        //     childrenItem.workPeopleId = data[0].id;
+        //   })
+
+      }
+      this.modalshowflag = false;
+    },
     setChildren(children, type) {
       // 编辑多个子层级
       children.map(j => {
@@ -541,74 +616,6 @@ export default {
         this.roleRow = this.$refs.tree.getCheckedNodes()[0];
       }
     },
-    checkedRole(data) {
-      var idList = "";
-      var nameList = "";
-      data.forEach(item => {
-        if (nameList.length > 0) {
-          nameList += ",";
-          idList += ",";
-        }
-        idList += item.id;
-        nameList += item.name;
-      });
-      //单选操作
-      if (this.type === 1) {
-        this.dataList.forEach(item => {
-          if(item.standId === this.selectedId){
-            item.workPeople = nameList;
-            item.workPeopleId = idList;
-          }
-          if (item.children) {
-            item.children.forEach(items => {
-              if (items.id === this.selectedId) {
-                items.workPeople = nameList;
-                items.workPeopleId = idList;
-                // this.$set(items,'workPeople',data[0].name)
-                //this.$set(items,'workPeopleId',data[0].id)
-              }
-            });
-          }
-        });
-        this.dataList = JSON.parse(JSON.stringify(this.dataList));
-      } else if (this.type === 2) {
-        this.selectList.forEach(item => {
-          this.dataList.map(items => {
-            if (item.standId === items.standId) {
-              items.workPeople = nameList;
-              items.workPeopleId = idList;
-              // this.$message.warning('您只能针对条款进行分发')
-            }
-            if (items.children) {
-              items.children.map(childrenItem => {
-                if (childrenItem.id === item.id) {
-                  childrenItem.workPeople = nameList;
-                  childrenItem.workPeopleId = idList;
-                }
-              });
-            }
-          });
-        });
-        this.dataList = JSON.parse(JSON.stringify(this.dataList));
-      } else if (this.type === 3) {
-        // console.log("529",this.workPeopleList)
-        for (let i = 0; i < this.workPeopleList.children.length; i++) {
-
-          this.workPeopleList.children[i].workPeople = data[0].name;
-          this.workPeopleList.children[i].workPeopleId = data[0].id;
-          // console.log(row.children[i].id)
-          // console.log(row.children[i].workPeople)
-        }
-
-        // items.children.map(childrenItem => {
-        //
-        //     childrenItem.workPeople = data[0].name;
-        //     childrenItem.workPeopleId = data[0].id;
-        //   })
-
-      }
-      this.modalshowflag = false;
-    },
     cancleUserInfo() {
       this.modalshowflag = false;
     }

From 652ad0bc3d0404a4013f117ea151d0f2d1edbb09 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Tue, 30 Nov 2021 10:39:47 +0800
Subject: [PATCH 06/38] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/unqualProcess.js                      |   6 +-
 .../pages/rectificationDatabase.vue           | 283 ++++++++----------
 2 files changed, 137 insertions(+), 152 deletions(-)

diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js
index 61866c15e..c51fad700 100644
--- a/src/api/unqualProcess.js
+++ b/src/api/unqualProcess.js
@@ -63,12 +63,13 @@ export function meetingByMonth(params) {
 
 //未符合项模块新增
 export function addUn(
-  closeState, standSerialNumber, standName,
+  closeState,standId, standSerialNumber, standName,
   itemsNum, itemsName, productType,
   productLine, productName, reason, responsibleUnit,
   dutyEngineer, authEngineer, qaEngineer, planCloseTime) {
   const data = {
     closeState,
+    standId,
     standSerialNumber, //标准号
     standName, //标准名称
     itemsNum, //条款号
@@ -92,12 +93,13 @@ export function addUn(
 
 //未符合项模块编辑
 export function editUn(
-  closeState, standSerialNumber, standName,
+  closeState, standId, standSerialNumber, standName,
   itemsNum, itemsName, productType,
   productLine, productName, reason, responsibleUnit,
   dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) {
   const data = {
     closeState,
+    standId,
     standSerialNumber, //标准号
     standName, //标准名称
     itemsNum, //条款号
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index a2096a542..5e800966d 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -116,6 +116,7 @@
               prop="standName"
               fixed="left"
               width="180"
+              show-overflow-tooltip
               label="标准名称">
               <template slot-scope="scope">
                 <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -129,16 +130,17 @@
             <el-table-column
               prop="itemsName"
               width="180"
+              show-overflow-tooltip
               label="条款名称">
             </el-table-column>
             <el-table-column
               prop="productType"
               width="180"
               label="产品类型">
-              <template slot-scope="scope">
+<!--              <template slot-scope="scope">
                 <div v-if="scope.row.productType === 'research'">在研</div>
                 <div v-if="scope.row.productType === 'product'">在产</div>
-              </template>
+              </template>-->
             </el-table-column>
             <el-table-column
               prop="productLine"
@@ -148,6 +150,7 @@
             <el-table-column
               prop="productName"
               width="180"
+              show-overflow-tooltip
               label="项目名称">
             </el-table-column>
             <el-table-column
@@ -168,11 +171,13 @@
             <el-table-column
               prop="authEngineer"
               width="150"
+              show-overflow-tooltip
               label="认证工程师">
             </el-table-column>
             <el-table-column
               prop="qaEngineer"
               width="150"
+              show-overflow-tooltip
               label="质量工程师">
             </el-table-column>
             <el-table-column
@@ -414,7 +419,7 @@
                          ref="addForm">
                   <el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
-                    <el-select v-model="addForm.productName"@change="handleChange" placeholder="请选择项目名称">
+                    <el-select v-model="addForm.productName" filterable  @change="handleChange" placeholder="请选择项目名称">
                       <el-option
                         v-for="item in ProjectDatas"
                         :key="item.id"
@@ -443,6 +448,7 @@
                                 class="add-form-item">
                     <el-select
                       v-model="addForm.standSerialNumber"
+                      filterable
                       :disabled="serialNumber"
                       @change="standChange"
                       placeholder="请选择标准号">
@@ -497,21 +503,24 @@
                     <el-input
                       v-model="addForm.dutyEngineer"
                       placeholder="请输入责任工程师"
-                      :maxlength="500" />
+                      @click.native="choiceZRR"
+                      />
                   </el-form-item>
                   <el-form-item prop="authEngineer" label="认证工程师" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
                       v-model="addForm.authEngineer"
                       placeholder="请输入认证工程师"
-                      :maxlength="500" />
+                      @click.native="choiceMore('authEngineer','选择认证工程师',addForm.authEngineer)"
+                      />
                   </el-form-item>
                   <el-form-item prop="qaEngineer" label="质量工程师" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
                       v-model="addForm.qaEngineer"
                       placeholder="请输入质量工程师"
-                      :maxlength="500" />
+                      @click.native="choiceMore('qaEngineer','选择质量工程师',addForm.qaEngineer)"
+                      />
                   </el-form-item>
                   <el-form-item prop="planCloseTime" label="计划关闭时间" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -544,6 +553,19 @@
         </el-button>
       </div>
     </el-drawer>
+    <Role-tree
+      check-box
+      is-title="选择责任工程师"
+      :is-visible.sync="roleShowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
+    <Role-tree
+      :is-title="titleMore"
+      :is-visible.sync="roleShowMore"
+      :nodeList="nodeListMore"
+      @checkedRole="drawerMore"
+    />
   </div>
 </template>
 
@@ -557,32 +579,16 @@ export default {
     return {
       loading: false,
       nonList: [], //未符合项表格数据
-      projectModel: false, //项目弹窗
-      listModel: false, //标准弹窗
-      itemModel: false, //条款弹窗
       replaceLoading: false,
-      //项目检索条件
-      projectSearch: {
-        projectNumber: "",
-        projectName: ""
-      },
       //项目数据
       ProjectDatas: [],
       itemsData: [],
-      standList: [],
       selectItems: [],
       dataList: [],
-      standPage: 1,
-      standPageSize: this.$store.getters.userInfo.configContent,
-      standTotal: 0,
-      replacePage: 1,
-      replacePageSize: this.$store.getters.userInfo.configContent,
-      replaceTotal: 0,
       page: 1,
       pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
       drawerTitle: "",
-      breakId: "",
       //存放被勾选的项目的数据
       selectList: [],
       addForm: {
@@ -664,10 +670,26 @@ export default {
       historySeeForm: {},
       // 新增编辑框的disabled
       serialNumber: true,
-      addFormEdit: {}
+
+      roleShowflag: false,
+      nodeList: [],
+
+      titleMore: '',
+      nodeListMore: [],
+      roleShowMore: false,
     };
   },
   methods: {
+    getData() {
+      // 从数据库中查询各下拉框数据
+      this.$http.get("sys/dictype/getDicTypeListCode", "", {
+        _this: this
+      }, res => {
+        this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
+        this.getTableByPage();
+      }, e => {
+      })
+    },
     // 查询未符合项table列表
     getTableByPage() {
       this.myLoading.loadData = true;
@@ -843,35 +865,33 @@ export default {
       });
 
     },
-    //点击清空按钮事件
-    clearSearch() {
-      this.projectSearch = {
-        projectName: "",
-        projectNumber: ""
-      };
-      this.getProjectData();
-    },
     //提交
     submit() {
+      const id = this.addForm.id;
+      const closeState = this.addForm.closeState;
+      const standId = this.addForm.productId // 此处standId储存项目下的标准的id
+      const standSerialNumber = this.addForm.standSerialNumber;
+      const standName = this.addForm.standName;
+      const itemsNum = this.addForm.itemsNum;
+      const itemsName = this.addForm.itemsName;
+      const productType = this.addForm.productType;
+      const productLine = this.addForm.productLine;
+      const productName = this.addForm.productName;
+      const reason = this.addForm.reason;
+      const responsibleUnit = this.addForm.responsibleUnit;
+      const dutyEngineer = this.addForm.dutyEngineer;
+      const authEngineer = this.addForm.authEngineer;
+      const qaEngineer = this.addForm.qaEngineer;
+      const planCloseTime = this.addForm.planCloseTime;
       if (this.drawerTitle === "新增") {
-        const closeState = this.addForm.closeState;
-        const standSerialNumber = this.addForm.standSerialNumber;
-        const standName = this.addForm.standName;
-        const itemsNum = this.addForm.itemsNum;
-        const itemsName = this.addForm.itemsName;
-        const productType = this.addForm.productType;
-        const productLine = this.addForm.productLine;
-        const productName = this.addForm.productName;
-        const reason = this.addForm.reason;
-        const responsibleUnit = this.addForm.responsibleUnit;
-        const dutyEngineer = this.addForm.dutyEngineer;
-        const authEngineer = this.addForm.authEngineer;
-        const qaEngineer = this.addForm.qaEngineer;
-        const planCloseTime = this.addForm.planCloseTime;
         this.$refs["addForm"].validate((valid) => {
           if (valid) {
-            addUn(closeState, standSerialNumber, standName, itemsNum, itemsName, productType,
-              productLine, productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime).then(res => {
+            addUn(
+              closeState, standId, standSerialNumber,
+              standName, itemsNum, itemsName, productType,
+              productLine, productName, reason,
+              responsibleUnit, dutyEngineer,
+              authEngineer, qaEngineer, planCloseTime).then(res => {
               if (res.ok) {
                 this.$message.success("新增成功");
                 this.drawerTable = false;
@@ -883,25 +903,14 @@ export default {
           }
         });
       } else {
-        const id = this.addForm.id;
-        const closeState = this.addForm.closeState;
-        const standSerialNumber = this.addForm.standSerialNumber;
-        const standName = this.addForm.standName;
-        const itemsNum = this.addForm.itemsNum;
-        const itemsName = this.addForm.itemsName;
-        const productType = this.addForm.productType;
-        const productLine = this.addForm.productLine;
-        const productName = this.addForm.productName;
-        const reason = this.addForm.reason;
-        const responsibleUnit = this.addForm.responsibleUnit;
-        const dutyEngineer = this.addForm.dutyEngineer;
-        const authEngineer = this.addForm.authEngineer;
-        const qaEngineer = this.addForm.qaEngineer;
-        const planCloseTime = this.addForm.planCloseTime;
         this.$refs["addForm"].validate((valid) => {
           if (valid) {
-            editUn(closeState, standSerialNumber, standName, itemsNum, itemsName, productType,
-              productLine, productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime, id).then(res => {
+            editUn(
+              closeState, standId, standSerialNumber,
+              standName, itemsNum, itemsName, productType,
+              productLine, productName, reason, responsibleUnit,
+              dutyEngineer, authEngineer, qaEngineer,
+              planCloseTime, id).then(res => {
               if (res.ok) {
                 this.$message.success("编辑成功");
                 this.drawerTable = false;
@@ -915,7 +924,10 @@ export default {
       }
     },
     addDrawerClose() {
-      this.addForm = {};
+      this.addForm = {}
+      if (this.drawerTitle === '编辑') {
+        this.getData()
+      }
       this.drawerTable = false;
     }, // 关闭新增drawer
     //带入条款确定事件
@@ -931,68 +943,9 @@ export default {
       }
 
     },
-    //带入标准取消事件
-    closeStand() {
-      this.listModel = false;
-    },
-    //带入标准确定事件
-    OkStand() {
-      if (this.standList.length > 1) {
-        this.$message.warning("您只能选择一条标准进行带入");
-      } else if (this.standList.length <= 0) {
-        this.$message.warning("请至少选择一条数据进行带入");
-      } else {
-        this.breakId = this.standList[0].standId;
-        this.addForm.standName = this.standList[0].standName;
-        this.addForm.standSerialNumber = this.standList[0].standSort + "-" + this.standList[0].standNumber + "-" + this.standList[0].standYear || this.standList[0].standSort + "-" + this.standList[0].standNumber;
-        this.addForm.responsibleUnit = this.standList[0].zrbm || "--";
-        this.addForm.standId = this.standList[0].standId;
-        this.drawerTitle = "新增";
-        this.drawerTable = true;
-        this.listModel = false;
-      }
-    },
-    getItem() {
-      this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
-        ids: this.breakId,
-        type: "FBGBJBD"
-      }, {
-        _this: this
-      }, res => {
-        this.itemsData = res.data;
-        this.replaceTotal = res.data.length;
-      }, e => {
-        this.$message.error("添加失败");
-      });
-    },
-    //手动查找
-    handSeek() {
-      this.itemModel = true;
-      this.getItem();
-    },
-    //带入项目取消事件
-    closeDrawer() {
-      this.projectModel = false;
-    },
-    //带入项目确定事件
-    OkDrawer() {
-      if (this.selectList.length > 1) {
-        this.$message.warning("您只能选择一条数据进行带入");
-      } else if (this.selectList.length === 0) {
-        this.$message.warning("请选择一条数据进行带入");
-      } else {
-        this.projectId = this.selectList[0].id;
-        this.addForm.productLine = this.selectList[0].productLine;
-        this.addForm.productType = this.selectList[0].projectPlatfor;
-        this.addForm.productName = this.selectList[0].projectName;
-        this.getStandData();
-        this.projectModel = false;
-        this.listModel = true;
-      }
-    },
     //查询项目下的标准
-    getStandData(val) {
-      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: val.id }, {
+    getStandData(productId) {
+      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: productId }, {
         _this: this
       }, res => {
         res.data.records.forEach(item => {
@@ -1028,9 +981,11 @@ export default {
     //编辑事件
     projectEdit(row) {
       this.drawerTitle = "编辑";
-      this.addForm = row;
-      this.addFormEdit = row
+      this.addForm = row
+      let productId = row.standId
       this.getProjectData()
+      this.getStandData(productId)
+      this.serialNumber = false
       this.drawerTable = true;
     },
     //点击查看按钮事件
@@ -1113,32 +1068,63 @@ export default {
         this.addForm.standSerialNumber = ''
         this.addForm.responsibleUnit = ''
       }
-        this.addForm.productLine = val.productLine
-        this.addForm.productName = val.projectName
-        this.addForm.productType = val.projectPlatfor
-        this.serialNumber = false
-        this.getStandData(val)
-
+      this.addForm.productId = val.id
+      this.addForm.productLine = val.productLine
+      this.addForm.productName = val.projectName
+      this.addForm.productType = val.projectPlatfor
+      this.serialNumber = false
+      let productId = val.id
+      this.getStandData(productId)
     },
     /** 标准号change事件 */
     standChange(item) {
       this.addForm.standName = item.standName
       this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
       this.addForm.responsibleUnit = item.zrbm || "--";
-    }
+    },
+    /** 责任工程师选择 */
+    choiceZRR(type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.roleShowflag = true
+    },
+    drawerCheck(data) {
+      this.addForm.dutyEngineer = data[0].name.slice(0,data[0].name.indexOf('('))
+      this.roleShowflag = false
+    },
+    /** 选择认证工程师和质量工程师 */
+    choiceMore(type, title, id) {
+      this.nodeListMore = []
+      this.nodeListMore.push(id)
+      this.type = type
+      this.titleMore = title
+      this.roleShowMore = true
+    },
+    drawerMore(data) {
+      var idList = ''
+      var nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name.slice(0,item.name.indexOf('('))
+      })
+      if (this.type === 'authEngineer') {
+        this.addForm.authEngineer = nameList
+      } else {
+        this.addForm.qaEngineer = nameList
+      }
+      this.roleShowMore = true
+    },
 
   },
   mounted() {
     //查询已维护的项目
     this.getProjectData();
-    // 从数据库中查询各下拉框数据
-    this.$http.get("sys/dictype/getDicTypeListCode", "", {
-      _this: this
-    }, res => {
-      this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
-      this.getTableByPage();
-    }, e => {
-    });
+    this.getData()
     // 加载所有的部门
     this.getOrgTreeSource();
   }
@@ -1146,7 +1132,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
-
+.el-select-dropdown__item.selected {
+  color: #606266 !important;
+}
 #rectification-dataBase {
   /deep/ .table-wrap {
     .el-table__fixed {
@@ -1214,14 +1202,9 @@ export default {
           background-color: #fff;
           color: #7e8083;
         }
-        /deep/.el-select-dropdown__item.selected {
-          color: #8d8e91;
-        }
       }
     }
   }
-  /deep/.el-select-dropdown__item.selected {
-    color: #8d8e91 !important;
-  }
+
 }
 </style>

From 00141479002d34f983f996106827c4fd7338d2af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 30 Nov 2021 11:02:14 +0800
Subject: [PATCH 07/38] commit

---
 src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
index d4d2818c9..a802ef400 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
@@ -676,6 +676,7 @@ export default {
         this.roleForm = mes.roleForm;
         this.commentText = mes.commentText;
         this.dataList = mes.form.dataList;
+        this.fileType = mes.form.fileType
         this.dataList.forEach(item => {
          if(!item.productLine){
            this.dataList = null

From c42d407bc6625135af04b5d3372f381c5ad888c1 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Tue, 30 Nov 2021 11:18:03 +0800
Subject: [PATCH 08/38] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nonConfomity/pages/rectificationDatabase.vue    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 5e800966d..cb7767e23 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -434,7 +434,7 @@
                       :disabled="true"
                       v-model="addForm.productType"
                       placeholder="请输入产品类型"
-                      :maxlength="500" />
+                      />
                   </el-form-item>
                   <el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -442,7 +442,7 @@
                       :disabled="true"
                       v-model="addForm.productLine"
                       placeholder="请输入产品线"
-                      :maxlength="500" />
+                      />
                   </el-form-item>
                   <el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -466,7 +466,7 @@
                       :disabled="true"
                       v-model="addForm.standName"
                       placeholder="请输入标准名称"
-                      :maxlength="500" />
+                      />
                   </el-form-item>
                   <el-form-item prop="itemsNum" label="条款号" style="width: 100%; margin-right:10px"
                                 class="add-form-item add-input">
@@ -489,7 +489,7 @@
                       :disabled="true"
                       v-model="addForm.responsibleUnit"
                       placeholder="请输入责任部门"
-                      :maxlength="500" />
+                      />
                   </el-form-item>
                   <el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -1180,9 +1180,12 @@ export default {
 
   .add-form-item {
     /deep/ .el-input__inner {
-      width: 300px;
+      width: 370px;
     }
   }
+  /deep/.label-input-form .add-form-item .el-input--suffix {
+    padding-right: 0px;
+  }
 
   .add-input {
     /deep/ .el-input__inner {

From 87d13856c9953e00ce0c8a1bcd694b41912f891a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 30 Nov 2021 11:26:52 +0800
Subject: [PATCH 09/38] commit

---
 .../pages/components/ProcessMixin.vue              | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue
index b624620b9..808fcac93 100644
--- a/src/pages/processCenter/pages/components/ProcessMixin.vue
+++ b/src/pages/processCenter/pages/components/ProcessMixin.vue
@@ -80,7 +80,19 @@ export default {
         {
           label: '外部标准化会后管理流程',
           value: "22"
-        }
+        },
+        {
+          label: "企标复审流程",
+          value: "23"
+        },
+        {
+          label: '企标废止流程',
+          value: "24"
+        },
+        {
+          label: '企标制修订计划管控',
+          value: "25"
+        },
       ],
       formDisableFlag: false,
       pickerOptions: {

From b26784d6d53b1c3a63152198874a567e32221c87 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 30 Nov 2021 14:51:26 +0800
Subject: [PATCH 10/38] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=83=BD=E5=B8=A6=E5=85=A5=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=92=8C=E6=94=BF=E7=AD=96=E4=BA=86=EF=BC=88?=
 =?UTF-8?q?=E5=8F=AA=E6=98=AF=E8=83=BD=E5=B8=A6=E8=83=BD=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B6=E4=BB=96=E7=9A=84=E9=9C=80=E6=B1=82=E6=88=91?=
 =?UTF-8?q?=E4=B8=8D=E7=9F=A5=E9=81=93=EF=BC=8C=E5=8F=91=E7=8E=B0=E4=BA=86?=
 =?UTF-8?q?=E5=86=8D=E5=8A=A0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                          | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 708dc7532..8c06b1097 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -295,7 +295,7 @@
             align="center"
             label="标准号">
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
+            <a @click="handlePreview(scope.row)">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -305,7 +305,7 @@
             width="260px"
         >
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+            <a @click="handlePreview(scope.row)">{{ scope.row.standName || scope.row.lawsName }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -349,7 +349,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
+<!--            <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>-->
           </template>
         </el-table-column>
         <el-table-column
@@ -361,7 +361,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
+<!--            <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>-->
           </template>
         </el-table-column>
         <el-table-column
@@ -1267,6 +1267,7 @@ export default {
             this.$message.warning('请勿添加重复数据')
           } else {
             this.sarAccessInfoList.push(item)
+            console.log('1270',this.sarAccessInfoList)
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
@@ -1383,17 +1384,17 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].ssrq === null) {
+            if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
               rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             } else {
               rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
-            if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+            if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
             } else {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
-            if (this.sarAccessInfoList[i].zccssrqgj === null) {
+            if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
             } else {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
@@ -1719,7 +1720,8 @@ export default {
     },
     // 数据搜索table判断checked状态
     selectable(row) {
-      return row.isRelateAccess === '1'
+      console.log('1723',row)
+      return row.isRelateAccess === '1' || row.isRelateAccess === undefined
     },
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect(val) {

From fc9a331ab3eaabbb52b019707cf2eaa262c140bc Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 30 Nov 2021 15:05:09 +0800
Subject: [PATCH 11/38] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E8=83=BD=E5=B8=A6=E5=85=A5=E6=8F=90=E4=BA=A4=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=92=8C=E6=94=BF=E7=AD=96=E4=BA=86=EF=BC=88=E8=83=BD=E6=9F=A5?=
 =?UTF-8?q?=E8=83=BD=E6=8F=90=EF=BC=8C=E7=BC=96=E8=BE=91=E5=B7=AE=E7=82=B9?=
 =?UTF-8?q?=E6=84=8F=E6=80=9D=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B9=9F=E4=B8=8D=E5=A4=AA=E5=85=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/projectAddEit.vue                   | 161 +++++++++++++-----
 1 file changed, 123 insertions(+), 38 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 30f61579a..caaf87e51 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -211,7 +211,7 @@
               width="180px"
               label="标准号">
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -220,7 +220,7 @@
               label="标准名称"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -250,7 +250,8 @@
               align="center"
               label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span v-else-if="scope.row.putTime">{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -270,7 +271,7 @@
               align="center"
               label="文本状态">
             <template slot-scope="scope">
-              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+              <span>{{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow}}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -327,7 +328,7 @@
             align="center"
             label="标准号">
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -337,7 +338,7 @@
             width="260px"
         >
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -381,7 +382,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
+<!--            <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>-->
           </template>
         </el-table-column>
         <el-table-column
@@ -393,7 +394,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
+<!--            <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>-->
           </template>
         </el-table-column>
         <el-table-column
@@ -719,8 +720,8 @@ export default {
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
         {value: 'FOREIGN_STAND', label: '海外标准法规'},
-        // {value: 'FOREIGN_LAWS', label: '国内外政策'},
-        // {value: 'BUSINESS', label: '企业标准 '},
+        {value: 'FOREIGN_LAWS', label: '国内外政策'},
+        {value: 'BUSINESS', label: '企业标准 '},
         // {value: 'TEMP', label: '标准法规清单 '}
       ],
       // 新增、编辑 数据搜索字段
@@ -1096,6 +1097,66 @@ export default {
       } else if (val === 'FOREIGN_STAND') {
         this.selectLawsStands()
         // 国内外政策可查字段
+      }else if (val === 'FOREIGN_LAWS'){
+        this.twoOptions=[
+          {
+            label: '适用车辆类型',
+            value: 'SYCLLX',
+            type: 'SEL_OPTION',
+            disabled: false
+          }, {
+            label: '政策编号',
+            value: 'LAWS_NUMBER',
+            type: 'INPUT',
+            disabled: false
+          }, {
+            label: '中文名称',
+            value: 'LAWS_NAME',
+            type: 'INPUT',
+            disabled: false
+          }, {
+            label: '英文名称',
+            value: 'LAWS_EN_NAME',
+            type: 'INPUT',
+            disabled: false
+          }, {
+            label: '个性化标签',
+            value: 'GXHBQXX',
+            type: 'SEL_OPTION',
+            disabled: false
+          }, {
+            label: '新车型实施日期(文本)',
+            value: 'XCXSSRQ',
+            type: 'DATE_PIC_OPTS',
+            disabled: false
+          }, {
+            label: '在产车实施日期(文本)',
+            value: 'ZCCSSRQ',
+            type: 'DATE_PIC_OPTS',
+            disabled: false
+          }, {
+            label: '维护工程师',
+            value: 'ZCGCS',
+            type: 'SEL_OPTION',
+            selVal: "USERLIST",
+            disabled: false
+          }
+        ]
+        // 标准法规清单可查字段
+      }else {
+        this.twoOptions=[
+          {
+            label: '清单名称',
+            value: 'ACCESS_CONTENT',
+            type: 'INPUT',
+            disabled: false
+          }, {
+            label: '国家地区',
+            value: 'COUNTRY',
+            type: 'SEL_OPTION',
+            disabled: false
+          }
+        ]
       }
     },
     /**
@@ -1258,17 +1319,17 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].ssrq === null) {
+            if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
               rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             } else {
               rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
-            if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+            if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
             } else {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
-            if (this.sarAccessInfoList[i].zccssrqgj === null) {
+            if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
             } else {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
@@ -1542,41 +1603,65 @@ export default {
     },
     // 查询数据搜索 table 数据
     pageInfo() {
-      StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
-        this.sarAccessInfoSearchList = res.data.list
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
+        StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
+          this.sarAccessInfoSearchList = res.data.list
 
-        //为空转换
-        for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
-          //适用车型为空
-          if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){
-            this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null
+          //为空转换
+          for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
+            //适用车型为空
+            if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){
+              this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null
+            }
+            //适用认证为空
+            if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){
+              this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null
+            }
           }
-          //适用认证为空
-          if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){
-            this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null
-          }
-        }
-        this.sarAccessInfoSearchList.forEach(item => {
-          if (item.standYear === null) {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber
-          } else {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
-          }
-          this.addWord(item)
+          this.sarAccessInfoSearchList.forEach(item => {
+            if (item.standYear === null) {
+              item.standNumber = item.standSortShow + ' ' + item.standNumber
+            } else {
+              item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+            }
+            this.addWord(item)
+          })
+          this.changeText(this.sarAccessInfoSearchList)
+          this.drawerTotal = res.data.count
+        }, e => {
         })
-        this.changeText(this.sarAccessInfoSearchList)
-        this.drawerTotal = res.data.count
-      }, e => {
-      })
+      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){
+        this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
+          _this: this,
+        }, res => {
+          console.log('1640',res)
+          this.sarAccessInfoSearchList = res.data.list
+        }, e => {
+        })
+      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
+          _this: this,
+        }, res => {
+          console.log('1648',res)
+          this.sarAccessInfoSearchList = res.data.list
+        }, e => {
+        })
+      }
     },
     //  查询按钮
     selectLawsStands() {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.pageInfo()
-      } else {
+      } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
         this.pageInfo()
+      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
+        this.sarAccessInfoSearch.standType = 'LAWS'
+        this.pageInfo()
+      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
+        this.sarAccessInfoSearch.standType = 'BUSINESS'
+        this.pageInfo()
       }
     },
     /** 高级查询查询按钮*/
@@ -1608,7 +1693,7 @@ export default {
     },
     // 数据搜索table判断checked状态
     selectable(row) {
-      return row.isRelateAccess === '1'
+      return row.isRelateAccess === '1' || row.isRelateAccess === undefined
     },
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect(val) {

From e7c41ca5a8309a99f3f3afb656ae7cbee3f9510d Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 30 Nov 2021 15:15:16 +0800
Subject: [PATCH 12/38] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E8=83=BD=E5=B8=A6=E5=85=A5=E6=8F=90=E4=BA=A4=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=92=8C=E6=94=BF=E7=AD=96=E4=BA=86=EF=BC=88=E8=83=BD=E6=9F=A5?=
 =?UTF-8?q?=E8=83=BD=E6=8F=90=EF=BC=8C=E7=BC=96=E8=BE=91=E5=B7=AE=E7=82=B9?=
 =?UTF-8?q?=E6=84=8F=E6=80=9D=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B9=9F=E4=B8=8D=E5=A4=AA=E5=85=A8=EF=BC=8C=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E6=9F=A5=E8=AF=A2=E4=B9=9F=E4=B8=8D=E8=A1=8C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/otherAddEit.vue                     | 193 +++++++++++++-----
 1 file changed, 139 insertions(+), 54 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 02abd1b61..9e06b7c04 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -166,7 +166,7 @@
             align="center"
             label="标准号">
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -175,7 +175,7 @@
             label="标准名称"
           >
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -193,7 +193,8 @@
             align="center"
             label="新车型实施日期">
               <template slot-scope="scope">
-                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                <span v-else-if="scope.row.putTime">{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
               </template>
           </el-table-column>
           <el-table-column
@@ -213,7 +214,7 @@
             width="120px"
             label="文本状态">
             <template slot-scope="scope">
-              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+              <span>{{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow}}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -269,7 +270,7 @@
           fixed="left"
           label="标准号">
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -279,7 +280,7 @@
           width="260px"
         >
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName}}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -323,7 +324,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>
+<!--            <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>-->
           </template>
         </el-table-column>
         <el-table-column
@@ -335,7 +336,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>
+<!--            <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>-->
           </template>
         </el-table-column>
         <el-table-column
@@ -647,8 +648,8 @@ export default {
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
         {value: 'FOREIGN_STAND', label: '海外标准法规'},
-        // {value: 'FOREIGN_LAWS', label: '国内外政策'},
-        // {value: 'BUSINESS', label: '企业标准 '},
+        {value: 'FOREIGN_LAWS', label: '国内外政策'},
+        {value: 'BUSINESS', label: '企业标准 '},
         // {value: 'TEMP', label: '标准法规清单 '}
       ],
       // 新增、编辑 数据搜索字段
@@ -1096,6 +1097,66 @@ export default {
           }
         ]
         // 国内外政策可查字段
+      }else if (val === 'FOREIGN_LAWS'){
+        this.twoOptions=[
+          {
+            label: '适用车辆类型',
+            value: 'SYCLLX',
+            type: 'SEL_OPTION',
+            disabled: false
+          }, {
+            label: '政策编号',
+            value: 'LAWS_NUMBER',
+            type: 'INPUT',
+            disabled: false
+          }, {
+            label: '中文名称',
+            value: 'LAWS_NAME',
+            type: 'INPUT',
+            disabled: false
+          }, {
+            label: '英文名称',
+            value: 'LAWS_EN_NAME',
+            type: 'INPUT',
+            disabled: false
+          }, {
+            label: '个性化标签',
+            value: 'GXHBQXX',
+            type: 'SEL_OPTION',
+            disabled: false
+          }, {
+            label: '新车型实施日期(文本)',
+            value: 'XCXSSRQ',
+            type: 'DATE_PIC_OPTS',
+            disabled: false
+          }, {
+            label: '在产车实施日期(文本)',
+            value: 'ZCCSSRQ',
+            type: 'DATE_PIC_OPTS',
+            disabled: false
+          }, {
+            label: '维护工程师',
+            value: 'ZCGCS',
+            type: 'SEL_OPTION',
+            selVal: "USERLIST",
+            disabled: false
+          }
+        ]
+        // 标准法规清单可查字段
+      }else {
+        this.twoOptions=[
+          {
+            label: '清单名称',
+            value: 'ACCESS_CONTENT',
+            type: 'INPUT',
+            disabled: false
+          }, {
+            label: '国家地区',
+            value: 'COUNTRY',
+            type: 'SEL_OPTION',
+            disabled: false
+          }
+        ]
       }
     },
     /**
@@ -1258,19 +1319,19 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].ssrq === null)  {
+            if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
               rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
-            }else {
+            } else {
               rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
-            if (this.sarAccessInfoList[i].xcxssrqgj === null) {
+            if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
-            }else {
+            } else {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
-            if (this.sarAccessInfoList[i].zccssrqgj === null) {
+            if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
-            }else {
+            } else {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
             }
           }
@@ -1433,52 +1494,76 @@ export default {
     //   })
     // },
     pageInfo() {
-      StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
-        this.sarAccessInfoSearchList = res.data.list
-        this.sarAccessInfoSearchList.forEach(item => {
-          if (item.standYear === null) {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber
-          } else {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
-          }
-          if (item.attrInfoMap === null) {
-            this.$set(item, 'zccssrqgj', '')
-            this.$set(item, 'xcxssrqgj', '')
-            this.$set(item, 'ssrq', '')
-            this.$set(item, 'sycpx', '')
-            this.$set(item, 'typeApplicable', '')
-            this.$set(item, 'nylx', '')
-            this.$set(item, 'zrbm', '')
-            this.$set(item, 'cycvppsbm', '')
-            this.$set(item, 'cycvppscn', '')
-            this.$set(item, 'kccvppsbm', '')
-            this.$set(item, 'kccvppscn', '')
-          }else {
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
-            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
-            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
-          }
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
+        StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
+          this.sarAccessInfoSearchList = res.data.list
+          this.sarAccessInfoSearchList.forEach(item => {
+            if (item.standYear === null) {
+              item.standNumber = item.standSortShow + ' ' + item.standNumber
+            } else {
+              item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+            }
+            if (item.attrInfoMap === null) {
+              this.$set(item, 'zccssrqgj', '')
+              this.$set(item, 'xcxssrqgj', '')
+              this.$set(item, 'ssrq', '')
+              this.$set(item, 'sycpx', '')
+              this.$set(item, 'typeApplicable', '')
+              this.$set(item, 'nylx', '')
+              this.$set(item, 'zrbm', '')
+              this.$set(item, 'cycvppsbm', '')
+              this.$set(item, 'cycvppscn', '')
+              this.$set(item, 'kccvppsbm', '')
+              this.$set(item, 'kccvppscn', '')
+            } else {
+              this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+              this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+              this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
+              this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+              this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+              this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+              this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+              this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+              this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+              this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+              this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+            }
+          })
+          this.drawerTotal = res.data.count
+        }, e => {
         })
-        this.drawerTotal = res.data.count
-      }, e => {
-      })
+      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){
+        this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
+          _this: this,
+        }, res => {
+          console.log('1640',res)
+          this.sarAccessInfoSearchList = res.data.list
+        }, e => {
+        })
+      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
+          _this: this,
+        }, res => {
+          console.log('1648',res)
+          this.sarAccessInfoSearchList = res.data.list
+        }, e => {
+        })
+      }
     },
     // 查询数据搜索 table 数据
     selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.pageInfo()
-      } else {
+      } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
         this.pageInfo()
+      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
+        this.sarAccessInfoSearch.standType = 'LAWS'
+        this.pageInfo()
+      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
+        this.sarAccessInfoSearch.standType = 'BUSINESS'
+        this.pageInfo()
       }
     },
     selectPage() {
@@ -1532,7 +1617,7 @@ export default {
     },
     // 数据搜索table判断checked状态
     selectable (row) {
-      return row.isRelateAccess === '1'
+      return row.isRelateAccess === '1' || row.isRelateAccess === undefined
     },
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect (val) {

From 4b43026ea6e6edf52f720a81f89496c2ecafa0b5 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 30 Nov 2021 15:19:00 +0800
Subject: [PATCH 13/38] =?UTF-8?q?=E4=B8=89=E4=B8=AA=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/pages/addEdit.vue  | 10 ++++++++--
 .../pages/otherAddEit.vue                            | 10 ++++++++--
 .../pages/projectAddEit.vue                          | 12 +++++++++---
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 8c06b1097..8d4c98fe5 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1713,9 +1713,15 @@ export default {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.selectPage()
-      } else {
+      } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
-        this.selectPage()
+        this.pageInfo()
+      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
+        this.sarAccessInfoSearch.standType = 'LAWS'
+        this.pageInfo()
+      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
+        this.sarAccessInfoSearch.standType = 'BUSINESS'
+        this.pageInfo()
       }
     },
     // 数据搜索table判断checked状态
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 9e06b7c04..0356caf9e 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1610,9 +1610,15 @@ export default {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.selectPage()
-      } else {
+      } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
-        this.selectPage()
+        this.pageInfo()
+      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
+        this.sarAccessInfoSearch.standType = 'LAWS'
+        this.pageInfo()
+      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
+        this.sarAccessInfoSearch.standType = 'BUSINESS'
+        this.pageInfo()
       }
     },
     // 数据搜索table判断checked状态
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index caaf87e51..8d325ec78 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1686,9 +1686,15 @@ export default {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfo.standType = 'INLAND'
         this.selectPage()
-      } else {
-        this.sarAccessInfo.standType = 'FOREIGN'
-        this.selectPage()
+      } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.pageInfo()
+      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
+        this.sarAccessInfoSearch.standType = 'LAWS'
+        this.pageInfo()
+      }else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
+        this.sarAccessInfoSearch.standType = 'BUSINESS'
+        this.pageInfo()
       }
     },
     // 数据搜索table判断checked状态

From 96c1e226f90bd7b0cc6a15dfd8af7455f0c7b04a Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 30 Nov 2021 15:20:43 +0800
Subject: [PATCH 14/38] commit

---
 .../domesticStandardsAndRegulations/index.vue        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index cd6263266..d5870ed0a 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -409,7 +409,7 @@
         <!-- 新增样式 -->
         <div class="demo-drawer-content">
           <el-form
-              v-if="reloadAddForm"
+              v-if="reloadAddForm && modalshowflag"
               ref="sarStandardsInfoForm"
               :model="sarStandardsInfoEO"
               :rules="sarStandardsInfoRules"
@@ -1887,7 +1887,7 @@
         <loading :loading="OCRLoading">数据加载中……</loading>
         <div class="demo-drawer-footer">
           <el-button size="mini" @click="OCRclose">取消</el-button>
-          <el-button type="primary" size="mini" @click="OCRsubmit">转换</el-button>
+          <el-button type="primary" :loading="OCRSubmitLoading" size="mini" @click="OCRsubmit">{{ OCRSubmitButton }}</el-button>
         </div>
       </div>
     </el-drawer>
@@ -1947,6 +1947,8 @@ export default {
   },
   data() {
     return {
+      OCRSubmitLoading: false,
+      OCRSubmitButton: '',
       OCRType: '',
       OCRoptions: [],
       OCRDatas: [],
@@ -2671,6 +2673,7 @@ export default {
       } else if (this.OCRDatas.length === 0) {
         this.$message.warning('请选择一个文件')
       } else {
+        this.OCRSubmitLoading = true
         if (this.OCRType === '0') {
           let json = {
             standNumber: this.ocrList[0].standYear ? this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber + '-' + this.ocrList[0].standYear : this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber,
@@ -2687,6 +2690,7 @@ export default {
               },
               (res) => {
                 this.OCRModel = false
+                this.OCRSubmitLoading = false
                 if (res.ok) {
                   this.$message.success('OCR实别成功')
                 } else {
@@ -2705,6 +2709,7 @@ export default {
             _this: this
           }, res => {
             this.OCRModel = false
+            this.OCRSubmitLoading = false
             if (res.ok) {
               this.$message.success('拆分成功')
             } else {
@@ -2720,12 +2725,15 @@ export default {
       if (type === '0') {
         text = 'OCR识别'
         this.OCRTitle = '选择OCR识别文件'
+        this.OCRSubmitButton = '转换'
       } else if (type === '1') {
         text = '拆分'
         this.OCRTitle = '选择拆分文件'
+        this.OCRSubmitButton = '拆分'
       } else if (type === '2') {
         text = '编辑'
         this.OCRTitle = '选择编辑文件'
+
       }
       if (this.ocrList.length > 1 && (type === '0' || type === '1' || type === '2')) {
         this.$message.warning('仅能选择一条数据进行' + text)

From fe515ee5f7485e79ba2fe617f26fe24e0836e143 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 30 Nov 2021 15:47:54 +0800
Subject: [PATCH 15/38] commit

---
 .../domesticStandardsAndRegulations/index.vue                  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index d5870ed0a..344e5e8cb 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -2702,7 +2702,8 @@ export default {
         } else if (this.OCRType === '1') {
           let splitEo = {}
           splitEo.standId = this.OCRDatas[0].standId
-          splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify)
+          splitEo.fileType = this.OCRDatas[0].standFileClassify
+          // splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify)
           splitEo.attId = this.OCRDatas[0].attId
           splitEo.fileName = this.OCRDatas[0].fileName
           this.$http.postData('lawss/sarFileSplitInfo/fileSplit', splitEo, {

From 03c60eaf298f4657e458b0d05e5da11a7025a1b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 30 Nov 2021 16:04:54 +0800
Subject: [PATCH 16/38] commit

---
 .../pages/creatProcess/xmpg2/step6.vue        | 132 ++++++++----------
 1 file changed, 57 insertions(+), 75 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index a098e5bef..7e4958433 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -142,6 +142,7 @@
               >
               </el-input>
               <el-input
+                @click.native="handlePrice(scope.row)"
                 v-else
                 :disabled="acceptShow"
                 v-model="scope.row.complianceReasons"
@@ -171,6 +172,7 @@
                 <el-input
                   v-else
                   :disabled="acceptShow"
+                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.noCompliance"
                   placeholder="请输入不合规项目"
                 >
@@ -193,6 +195,7 @@
                 <el-input
                   v-else
                   :disabled="acceptShow"
+                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.countermeasures"
                   placeholder="请输入应对措施"
                 >
@@ -217,6 +220,7 @@
                   :disabled="acceptShow"
                   class="datePickLen"
                   clearable
+                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.completionTime"
                   type="date"
                   placeholder="请选择日期">
@@ -582,6 +586,7 @@ export default {
   },
   data() {
     return {
+      comFlag: true,
       total: 0,
       currentPage: 1,
       pageSize: 20,
@@ -640,20 +645,10 @@ export default {
       listForm: {
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
-        dataList: [
-          {
-            complianceReasons: "",
-            zcComplianceReasons: ""
-          }
-        ], //项目下的标准数据
+        dataList: [], //项目下的标准数据
         children: [] //标准下的分解单数据
       },
-      dataList: [
-        {
-          complianceReasons: "",
-          zcComplianceReasons: ""
-        }
-      ], //展示的标准数据
+      dataList: [], //展示的标准数据
       commentText: "", //审批意见
       detailData: [], //流程历史数据
       userId: this.$store.getters.userInfo.userId,
@@ -716,54 +711,17 @@ export default {
             item.countermeasures = this.batchEditForm.countermeasures;
             //完成时间
             item.completionTime = this.batchEditForm.completionTime;
+          }else if(item.standId === items){
+            item.complianceReasons = this.batchEditForm.complianceReasons;
+            //不合规
+            item.noCompliance = this.batchEditForm.noCompliance;
+            //应对措施
+            item.countermeasures = this.batchEditForm.countermeasures;
+            //完成时间
+            item.completionTime = this.batchEditForm.completionTime;
           }
         });
       });
-      // for (let a = 0; a < this.dataList.length; a++) {
-      //   for (let b = 0; b < this.selectList.length; b++) {
-      //     if (this.dataList[a].id === this.selectList[b]) {
-      //       console.log('11');
-      //       //合规
-      //       this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
-      //       //不合规
-      //       this.dataList[a].noCompliance = this.batchEditForm.noCompliance
-      //       //应对措施
-      //       this.dataList[a].countermeasures = this.batchEditForm.countermeasures
-      //       //完成时间
-      //       this.dataList[a].completionTime = this.batchEditForm.completionTime
-      //       //合规
-      //       this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
-      //       //不合规
-      //       this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance
-      //       //应对措施
-      //       this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
-      //       //完成时间
-      //       this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
-      //     } else {
-      //       for (let i = 0; i < this.dataList[a].children.length; i++) {
-      //         if (this.dataList[a].children[i].id === this.selectList[b]) {
-      //           //合规
-      //           this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
-      //           //不合规
-      //           this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance
-      //           //应对措施
-      //           this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures
-      //           //完成时间
-      //           this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime
-      //           //合规
-      //           this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
-      //           //不合规
-      //           this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance
-      //           //应对措施
-      //           this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures
-      //           //完成时间
-      //           this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime
-      //         }
-      //       }
-      //     }
-      //
-      //   }
-      // }
       this.modalshowflag = false;
     },
     cancelBatchEditForm() {
@@ -871,6 +829,7 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
         if (item.form === undefined) {
@@ -881,6 +840,9 @@ export default {
           this.listForm["id"] = item.id;
           this.listForm.dataList = item.dataList;
           this.listForm.dataList.forEach(item => {
+            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+                this.dataList.push(item)
+            }
               item.children.forEach(items=> {
                 if(items.key === item.standId){
                   this.$set(items, "standName", item.standName);
@@ -897,6 +859,7 @@ export default {
           dataChildren.forEach((item,index) => {
             dataListChildren = dataListChildren.concat(item)
           })
+          dataListChildren = this.dataList.concat(dataListChildren)
           this.dataList = dataListChildren
           this.total = this.dataList.length;
         } else {
@@ -904,6 +867,9 @@ export default {
           let dataChildren = []
           let dataListChildren = []
           this.listForm.dataList.forEach(item => {
+            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+              this.dataList.push(item)
+            }
             item.children.forEach(items=> {
               if(items.key === item.standId){
                 this.$set(items, "standName", item.standName);
@@ -920,6 +886,7 @@ export default {
           dataChildren.forEach((item,index) => {
             dataListChildren = dataListChildren.concat(item)
           })
+          dataListChildren = this.dataList.concat(dataListChildren)
           this.dataList = dataListChildren
           this.total = this.dataList.length;
           // this.dataList = item.form.dataList[0].children;
@@ -964,31 +931,46 @@ export default {
         this.isSubmit = false;
       });
     },
+    handlePrice(row){
+      if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
+        this.comFlag = true
+      }else{
+        this.comFlag = false
+      }
+    },
     //提交事件
     handleSubmit() {
-      this.isSubmit = true;
-      this.listForm.commentText = this.commentText;
-      const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-        this.isSubmit = false;
-      }, e => {
-      });
+      // complianceReasons  合规原因
+      // noCompliance  不合规项
+      // countermeasures 应对措施
+      //completionTime  完成时间
+      if(!this.comFlag){
+        this.$message.warning('请填写完整的不符合项信息')
+      }else{
+        this.isSubmit = true;
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false;
+        }, e => {
+        });
+      }
     },
     //标准表格选择框改变
     selectStandChange(data) {
       this.selectList = [];
       for (let i = 0; i < data.length; i++) {
-        this.selectList.push(data[i].id);
+        this.selectList.push(data[i].id || data[i].standId);
         localStorage.setItem("selectList", JSON.stringify(this.selectList));
       }
     },

From f1db3eb9d1754020a1884ed741ddd5205fc5e354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 30 Nov 2021 16:30:13 +0800
Subject: [PATCH 17/38] commit

---
 .../pages/creatProcess/xmpg2/step6.vue        |  5 +-
 .../pages/creatProcess/xmpg2/step7.vue        | 86 +++++++++++++------
 2 files changed, 61 insertions(+), 30 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 7e4958433..16cfd87e2 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -223,6 +223,7 @@
                   @click.native="handlePrice(scope.row)"
                   v-model="scope.row.completionTime"
                   type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="请选择日期">
                 </el-date-picker>
               </template>
@@ -940,10 +941,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      // complianceReasons  合规原因
-      // noCompliance  不合规项
-      // countermeasures 应对措施
-      //completionTime  完成时间
       if(!this.comFlag){
         this.$message.warning('请填写完整的不符合项信息')
       }else{
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 9a1d4bcef..806cb6bc4 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -468,36 +468,70 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        this.listForm.prcNum = this.prcNum;
-        this.listForm.prcName = this.prcName;
-        this.listForm["id"] = item.id;
-        this.listForm.dataList = item.dataList;
-        let dataChildren = []
-        let dataListChildren = []
-        this.listForm.dataList.forEach(item => {
-          item.children.forEach(items=> {
-            if(items.key === item.standId){
-              this.$set(items, "standName", item.standName);
-              this.$set(items, "standEnName", item.standEnName);
-              this.$set(items, "standYear", item.standYear);
-              this.$set(items, "standSort", item.standSort);
-              this.$set(items, "standNumber", item.standNumber);
+        if (item.form === undefined) {
+          let dataChildren = []
+          let dataListChildren = []
+          this.listForm.prcNum = this.prcNum;
+          this.listForm.prcName = this.prcName;
+          this.listForm["id"] = item.id;
+          this.listForm.dataList = item.dataList;
+          this.listForm.dataList.forEach(item => {
+            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+              this.dataList.push(item)
             }
+            item.children.forEach(items=> {
+              if(items.key === item.standId){
+                this.$set(items, "standName", item.standName);
+                this.$set(items, "standEnName", item.standEnName);
+                this.$set(items, "standYear", item.standYear);
+                this.$set(items, "standSort", item.standSort);
+                this.$set(items, "standNumber", item.standNumber);
+              }
+            })
           })
-        })
-        this.listForm.dataList.forEach(item => {
-          dataChildren.push(item.children)
-        })
-        dataChildren.forEach((item,index) => {
-          dataListChildren = dataListChildren.concat(item)
-        })
-        this.dataList = dataListChildren
-        this.total = this.dataList.length;
-        // this.dataList = item.dataList;
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
-        // this.listForm.breakdownList = item.breakdownList;
+          this.listForm.dataList.forEach(item => {
+            dataChildren.push(item.children)
+          })
+          dataChildren.forEach((item,index) => {
+            dataListChildren = dataListChildren.concat(item)
+          })
+          dataListChildren = this.dataList.concat(dataListChildren)
+          this.dataList = dataListChildren
+          this.total = this.dataList.length;
+        } else {
+          this.listForm = item.form;
+          let dataChildren = []
+          let dataListChildren = []
+          this.listForm.dataList.forEach(item => {
+            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+              this.dataList.push(item)
+            }
+            item.children.forEach(items=> {
+              if(items.key === item.standId){
+                this.$set(items, "standName", item.standName);
+                this.$set(items, "standEnName", item.standEnName);
+                this.$set(items, "standYear", item.standYear);
+                this.$set(items, "standSort", item.standSort);
+                this.$set(items, "standNumber", item.standNumber);
+              }
+            })
+          })
+          this.listForm.dataList.forEach(item => {
+            dataChildren.push(item.children)
+          })
+          dataChildren.forEach((item,index) => {
+            dataListChildren = dataListChildren.concat(item)
+          })
+          dataListChildren = this.dataList.concat(dataListChildren)
+          this.dataList = dataListChildren
+          this.total = this.dataList.length;
+          // this.dataList = item.form.dataList[0].children;
+          // this.total = item.form.dataList[0].children.length;
+        }
+
       });
     },
     //驳回事件

From 2453adb36f089f417d8948a9b6a9ee4b9d710bb3 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 30 Nov 2021 17:40:49 +0800
Subject: [PATCH 18/38] commit

---
 src/components/CustomFormComponents/File.vue        | 13 ++++++++++++-
 src/pages/details/otherStandardDetails/index.vue    |  9 +++++----
 .../components/EnterpriseStandardDatabase.vue       |  4 ++--
 .../foreignRegulationsDatabase/index.vue            |  2 +-
 .../foreignStandardsAndRegulations/index.vue        |  3 +--
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue
index 5a64f5188..371d7977e 100644
--- a/src/components/CustomFormComponents/File.vue
+++ b/src/components/CustomFormComponents/File.vue
@@ -22,13 +22,23 @@
           v-if="reUpload || showUploadBtn">{{ uploadText || '重新上传' }}</el-button>
       </ul>
       <template style="margin-left: 105px;" v-else>
+        <ul class="file-file__wrap">
+          <li class="file-item"
+              v-for="(file, index) in showFileList"
+              :key="index"
+              :title="file.name"
+              @click="handlePreview(file)">
+            {{ file.name }}
+          </li>
+        </ul>
         <el-button
             size="small"
             @click="clickButtonToUpload('opinionFileList')"
             icon="el-icon-upload"
             class="form-upload-btn"
         >
-          {{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}
+<!--          {{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}-->
+          上传
         </el-button>
       </template>
       <el-dialog
@@ -152,6 +162,7 @@ export default {
     }
   },
   mounted() {
+    this.getShowFileList()
     if (this.showFileModel) {
       this.getShowFileList()
     }
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index e3641c239..ebfc39406 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -126,7 +126,7 @@
                     </p>
                     <template v-for="(child, childIndex) in item.child2">
                       <p class="half">
-                        <label style=" margin-right: 143px;">{{ child.attrName }}</label>
+                        <label style=" margin-right: 150px;">{{ child.attrName }}</label>
                         <span>{{ child.value || '-' }}</span>
                       </p>
                     </template>
@@ -3282,7 +3282,9 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
-
+/deep/.el-collapse-item__header {
+  border-bottom: none !important;
+}
 /deep/ .decomposition-btn {
   position: absolute;
   top: 6px;
@@ -3294,7 +3296,6 @@ export default {
   color: #07C160;
   border: 1px solid #07C160;
   background: rgba(1, 193, 96, 0.1);
-
   /deep/ .icon-separate {
     display: inline-block;
     margin-right: 3px;
@@ -3598,7 +3599,7 @@ export default {
         }
 
         & > div:not(.modular-item-more) {
-          border-bottom: 1px solid #E5E5E5;
+          /*border-bottom: 1px solid #E5E5E5;*/
           min-height: 43px;
           line-height: 43px;
 
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 4af25a6c3..193910268 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -477,13 +477,12 @@
         <!--    新增样式     -->
         <div class="demo-drawer-content">
           <el-form
-            v-if="reloadAddForm"
+            v-if="reloadAddForm && modalshowflag"
             ref="sarBussionessStandForm"
             :model="sarBussionessStandEO"
             :rules="sarBussionessStandRules"
             class="label-input-form"
           >
-
 <!--            <custom-input-for-standards-->
 <!--              :config="{-->
 <!--                attrName: '代替企标编号',-->
@@ -1212,6 +1211,7 @@
       >
           <div class="demo-drawer-content">
               <el-form :model="productModelAdd"
+                       v-if="productModal"
                        ref="productModelAdd"
                        :rules="productRules"
                        class="label-input-form"
diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
index 266d15605..3eb4b26f4 100644
--- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
@@ -355,7 +355,7 @@
         <!--    新增样式     -->
         <div class="demo-drawer-content">
           <el-form
-                  v-if="reloadAddForm"
+                  v-if="reloadAddForm && modalshowflag"
                   ref="sarLawsStandEO"
                   :model="sarLawsStandEO"
                   :rules="sarLawsStandRules"
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index b6a04f46e..abfba54fd 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -770,7 +770,7 @@
         <!-- 新增样式 -->
         <div class="demo-drawer-content">
           <el-form
-            v-if="reloadAddForm"
+            v-if="reloadAddForm && modalshowflag"
             ref="sarStandardsInfoForm"
             :model="sarStandardsInfoEO"
             :rules="sarStandardsInfoRules"
@@ -4272,7 +4272,6 @@ export default {
           }
         })
       } else if (this.ocrList.length === 1 && type === '2'){
-        console.log('4228',this.ocrList)
         this.selectStandardPro(this.ocrList[0], 'edit')
       }
     },

From 202755113d52c26930ce9bcb8a1ba5d7f8919b28 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Tue, 30 Nov 2021 17:52:15 +0800
Subject: [PATCH 19/38] =?UTF-8?q?=E4=B8=89=E4=B8=AA=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=BE=91=E5=92=8C=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/pages/addEdit.vue           | 4 ++--
 .../accessStandardsAndRegulations/pages/otherAddEit.vue       | 4 ++--
 .../accessStandardsAndRegulations/pages/projectAddEit.vue     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 8d4c98fe5..8297e2464 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -2265,9 +2265,9 @@ export default {
       }, res => {
         this.sarAccessInfoList = res.data.records
         this.sarAccessInfoList.forEach(item => {
-          if (item.standYear === null) {
+          if (item.standYear === null && item.standType !== null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
-          } else {
+          } else if (item.standYear !== null && item.standType !== null){
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
           if (item.attrInfoMap === null) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 0356caf9e..70ec69b73 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -2162,9 +2162,9 @@ export default {
       }, res => {
         this.sarAccessInfoList = res.data.records
         this.sarAccessInfoList.forEach(item => {
-          if (item.standYear === null) {
+          if (item.standYear === null && item.standType !== null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
-          } else {
+          } else if (item.standYear !== null && item.standType !== null){
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
           if (item.attrInfoMap === null) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 8d325ec78..360907b0e 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -2149,9 +2149,9 @@ export default {
         }
 
         this.sarAccessInfoList.forEach(item => {
-          if (item.standYear === null) {
+          if (item.standYear === null && item.standType !== null) {
             item.standNumber = item.standSortShow + ' ' + item.standNumber
-          } else {
+          } else if (item.standYear !== null && item.standType !== null){
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
         })

From e3b238db173c14437669e810e42294be760144fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 30 Nov 2021 20:53:40 +0800
Subject: [PATCH 20/38] commit

---
 .../pages/creatProcess/xmpg2/step10.vue       | 12 +++----
 .../pages/creatProcess/xmpg2/step11.vue       | 12 +++----
 .../pages/creatProcess/xmpg2/step12.vue       | 11 ++++---
 .../pages/creatProcess/xmpg2/step7.vue        | 32 -------------------
 .../pages/creatProcess/xmpg2/step8.vue        | 11 ++++---
 .../pages/creatProcess/xmpg2/step9.vue        | 11 ++++---
 .../pages/details.vue                         |  2 +-
 7 files changed, 31 insertions(+), 60 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index 041a1f3a3..4bc687e09 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -470,13 +470,16 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        let dataChildren = []
+        let dataListChildren = []
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        let dataChildren = []
-        let dataListChildren = []
         this.listForm.dataList.forEach(item => {
+          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            this.dataList.push(item)
+          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -493,11 +496,9 @@ export default {
         dataChildren.forEach((item,index) => {
           dataListChildren = dataListChildren.concat(item)
         })
+        dataListChildren = this.dataList.concat(dataListChildren)
         this.dataList = dataListChildren
         this.total = this.dataList.length;
-        // this.dataList = item.dataList;
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
-        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //驳回事件
@@ -529,7 +530,6 @@ export default {
       this.listForm.bzFlag = "1";
       this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
-      console.log(json);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index bbfdd69d1..ff5c3e3f0 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -467,16 +467,18 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
-      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        let dataChildren = []
+        let dataListChildren = []
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        let dataChildren = []
-        let dataListChildren = []
         this.listForm.dataList.forEach(item => {
+          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            this.dataList.push(item)
+          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -493,11 +495,9 @@ export default {
         dataChildren.forEach((item,index) => {
           dataListChildren = dataListChildren.concat(item)
         })
+        dataListChildren = this.dataList.concat(dataListChildren)
         this.dataList = dataListChildren
         this.total = this.dataList.length;
-        // this.dataList = item.dataList;
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
-        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //提交事件
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 0efc5a1d9..87f80fe44 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -470,13 +470,16 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        let dataChildren = []
+        let dataListChildren = []
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        let dataChildren = []
-        let dataListChildren = []
         this.listForm.dataList.forEach(item => {
+          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            this.dataList.push(item)
+          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -493,11 +496,9 @@ export default {
         dataChildren.forEach((item,index) => {
           dataListChildren = dataListChildren.concat(item)
         })
+        dataListChildren = this.dataList.concat(dataListChildren)
         this.dataList = dataListChildren
         this.total = this.dataList.length;
-        // this.dataList = item.dataList;
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
-        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //驳回事件
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 806cb6bc4..9d55151cc 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -471,7 +471,6 @@ export default {
       console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        if (item.form === undefined) {
           let dataChildren = []
           let dataListChildren = []
           this.listForm.prcNum = this.prcNum;
@@ -501,37 +500,6 @@ export default {
           dataListChildren = this.dataList.concat(dataListChildren)
           this.dataList = dataListChildren
           this.total = this.dataList.length;
-        } else {
-          this.listForm = item.form;
-          let dataChildren = []
-          let dataListChildren = []
-          this.listForm.dataList.forEach(item => {
-            if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
-              this.dataList.push(item)
-            }
-            item.children.forEach(items=> {
-              if(items.key === item.standId){
-                this.$set(items, "standName", item.standName);
-                this.$set(items, "standEnName", item.standEnName);
-                this.$set(items, "standYear", item.standYear);
-                this.$set(items, "standSort", item.standSort);
-                this.$set(items, "standNumber", item.standNumber);
-              }
-            })
-          })
-          this.listForm.dataList.forEach(item => {
-            dataChildren.push(item.children)
-          })
-          dataChildren.forEach((item,index) => {
-            dataListChildren = dataListChildren.concat(item)
-          })
-          dataListChildren = this.dataList.concat(dataListChildren)
-          this.dataList = dataListChildren
-          this.total = this.dataList.length;
-          // this.dataList = item.form.dataList[0].children;
-          // this.total = item.form.dataList[0].children.length;
-        }
-
       });
     },
     //驳回事件
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index 604607676..ecd61f622 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -468,13 +468,16 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        let dataChildren = []
+        let dataListChildren = []
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        let dataChildren = []
-        let dataListChildren = []
         this.listForm.dataList.forEach(item => {
+          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            this.dataList.push(item)
+          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -491,11 +494,9 @@ export default {
         dataChildren.forEach((item,index) => {
           dataListChildren = dataListChildren.concat(item)
         })
+        dataListChildren = this.dataList.concat(dataListChildren)
         this.dataList = dataListChildren
         this.total = this.dataList.length;
-        // this.dataList = item.dataList;
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
-        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //驳回事件
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index 647699719..96e427c4b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -470,13 +470,16 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        let dataChildren = []
+        let dataListChildren = []
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
-        let dataChildren = []
-        let dataListChildren = []
         this.listForm.dataList.forEach(item => {
+          if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
+            this.dataList.push(item)
+          }
           item.children.forEach(items=> {
             if(items.key === item.standId){
               this.$set(items, "standName", item.standName);
@@ -493,11 +496,9 @@ export default {
         dataChildren.forEach((item,index) => {
           dataListChildren = dataListChildren.concat(item)
         })
+        dataListChildren = this.dataList.concat(dataListChildren)
         this.dataList = dataListChildren
         this.total = this.dataList.length;
-        // this.dataList = item.dataList;
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
-        // this.listForm.breakdownList = item.breakdownList;
       });
     },
     //驳回事件
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 9c475ba22..3c9121860 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -161,7 +161,7 @@
             <template slot-scope="scope">
               <!--                <el-button @click="changeState(scope.row)">符合性状态</el-button>-->
               <div class="table-jump" @click="changeState(scope.row)">
-                <div v-if="scope.row.sarState === 0">符合</div>
+                <div v-if="scope.row.unCount === 0">符合</div>
                 <div v-else >不符合</div>
               </div>
             </template>

From e8417e25f0d7d21f92d2d1b5e3a536920f59d141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 30 Nov 2021 21:31:03 +0800
Subject: [PATCH 21/38] commit

---
 .../pages/creatProcess/xmpg/step3.vue         | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 6dacbf0df..8b6ad145e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -208,19 +208,18 @@
           </el-table-column>
           <el-table-column
             label="落实人"
-            width="170"
+            width="210"
             align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.implementerId" style="display: none;" />
               <el-input v-model="scope.row.implementer" placeholder="请选择落实人"
-                        @click.native="choiceZRRS(scope.row.implementerId, 1, scope.$index)" />
+                        @click.native="choiceZRRS(scope.row, 1, scope.$index)" />
             </template>
           </el-table-column>
         </el-table>
 
         <!--    选择责任人-->
         <Role-tree
-          check-box
           is-title="选择落实人"
           :is-visible.sync="modalshowflag"
           @checkedRole="checkedRole"
@@ -571,15 +570,25 @@ export default {
 
     },
     checkedRole(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
       if (this.type === 1) {
-        this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id;
-        this.listForm.breakdownList[this.lsIndex].implementer = data[0].name;
+        this.listForm.breakdownList[this.lsIndex].implementerId = idList;
+        this.listForm.breakdownList[this.lsIndex].implementer = nameList;
       } else if (this.type === 2) {
         this.listForm.breakdownList.forEach(item => {
           this.selectList.forEach(items => {
             if (item === items) {
-              item.implementerId = data[0].id;
-              item.implementer = data[0].name;
+              item.implementerId = idList;
+              item.implementer = nameList;
             }
           });
         });
@@ -596,13 +605,20 @@ export default {
         this.nodeList = [];
         this.lsIndex = index;
         this.lsType = type;
-        this.nodeList.push(row);
+        if(row.implementerId){
+          this.nodeList = row.implementerId.split(",");
+        }else{
+          this.nodeList.push(row);
+        }
         this.modalshowflag = true;
       } else if (type === 2) {
         // 批量
         if (this.selectList.length > 0) {
           this.lsType = type;
           this.nodeList = [];
+          if(row.implementerId){
+            this.nodeList = row.implementerId.split(",");
+          }
           this.modalshowflag = true;
           this.drawerTitle = "批量选择责任人";
         } else {

From 2183ab22da60cee8b557f1af997b800d1b6e07a1 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Wed, 1 Dec 2021 10:45:29 +0800
Subject: [PATCH 22/38] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/rectificationDatabase.vue           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index cb7767e23..2a9d53cf0 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -115,7 +115,7 @@
             <el-table-column
               prop="standName"
               fixed="left"
-              width="180"
+              width="200"
               show-overflow-tooltip
               label="标准名称">
               <template slot-scope="scope">
@@ -124,7 +124,7 @@
             </el-table-column>
             <el-table-column
               prop="itemsNum"
-              width="180"
+              width="75"
               label="条款号">
             </el-table-column>
             <el-table-column
@@ -135,7 +135,7 @@
             </el-table-column>
             <el-table-column
               prop="productType"
-              width="180"
+              width="100"
               label="产品类型">
 <!--              <template slot-scope="scope">
                 <div v-if="scope.row.productType === 'research'">在研</div>
@@ -165,7 +165,7 @@
             </el-table-column>
             <el-table-column
               prop="dutyEngineer"
-              width="150"
+              width="100"
               label="责任工程师">
             </el-table-column>
             <el-table-column
@@ -615,12 +615,12 @@ export default {
         standName: [
           { required: true, message: "请输入标准名称", trigger: "blur" }
         ],
-        itemsNum: [
-          { required: true, message: "请输入条款号", trigger: "blur" }
-        ],
-        itemsName: [
-          { required: true, message: "请输入条款名称", trigger: "blur" }
-        ],
+        // itemsNum: [
+        //   { required: true, message: "请输入条款号", trigger: "blur" }
+        // ],
+        // itemsName: [
+        //   { required: true, message: "请输入条款名称", trigger: "blur" }
+        // ],
         productType: [
           { required: true, message: "请输入产品类型", trigger: "blur" }
         ],

From e9ef24c38f1c7ab08cd91004f8cad580b5ed5344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 1 Dec 2021 11:12:03 +0800
Subject: [PATCH 23/38] commit

---
 .../pages/creatProcess/xmpg/step3.vue         | 12 +++-
 .../pages/creatProcess/xmpg/step4.vue         | 59 ++++++++++++-------
 2 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 8b6ad145e..3288047f5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -592,6 +592,7 @@ export default {
             }
           });
         });
+        this.$refs.multipleTable.clearSelection();
       }
       this.modalshowflag = false;
     },
@@ -616,11 +617,16 @@ export default {
         if (this.selectList.length > 0) {
           this.lsType = type;
           this.nodeList = [];
-          if(row.implementerId){
-            this.nodeList = row.implementerId.split(",");
-          }
           this.modalshowflag = true;
           this.drawerTitle = "批量选择责任人";
+          this.selectList.forEach(item =>{
+           if(item.implementerId){
+             this.nodeList = item.implementerId.split(",");
+           }
+          })
+          // if(row.implementerId){
+          //   this.nodeList = row.implementerId.split(",");
+          // }
         } else {
           this.$message.warning("请选择要分发的数据");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index b90337067..877f1f555 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -233,6 +233,7 @@
                 <el-input
                    v-else
                    :disabled="acceptShow"
+                   @click.native="handlePrice(scope.row)"
                     v-model="dataList[scope.$index].complianceReasons"
                     placeholder="请输入合规原因"
                 >
@@ -260,6 +261,7 @@
                   <el-input
                       v-else
                       :disabled="acceptShow"
+                      @click.native="handlePrice(scope.row)"
                       v-model="dataList[scope.$index].noCompliance"
                       placeholder="请输入不合规项目"
                   >
@@ -281,6 +283,7 @@
                   </el-input>
                   <el-input
                       v-else
+                      @click.native="handlePrice(scope.row)"
                       :disabled="acceptShow"
                       v-model="dataList[scope.$index].countermeasures"
                       placeholder="请输入应对措施"
@@ -306,6 +309,7 @@
                       :disabled="acceptShow"
                       class="datePickLen"
                       clearable
+                      @click.native="handlePrice(scope.row)"
                       v-model="dataList[scope.$index].completionTime"
                       type="date"
                       placeholder="请选择日期">
@@ -542,6 +546,7 @@ export default {
     return {
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
+      comFlag: true,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
@@ -720,6 +725,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
         if (item.form === undefined) {
@@ -792,30 +798,41 @@ export default {
         this.isSubmit = false
       })
     },
+    handlePrice(row){
+      if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
+        this.comFlag = true
+      }else{
+        this.comFlag = false
+      }
+    },
     //提交事件
     handleSubmit() {
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.commentText = this.commentText;
-      this.listForm.approvalOpinion = "";
-      this.listForm.signFlag = "";
-      this.listForm.dataList = this.dataList;
-      const json = JSON.stringify(this.listForm);
-      this.isSubmit = true;
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-        this.isSubmit = false;
-      }, e => {
+      if(!this.comFlag) {
+        this.$message.warning('请填写完整的不符合项信息')
+      }else{
+        this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+        this.listForm.commentText = this.commentText;
+        this.listForm.approvalOpinion = "";
+        this.listForm.signFlag = "";
+        this.listForm.dataList = this.dataList;
+        const json = JSON.stringify(this.listForm);
+        this.isSubmit = true;
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false;
+        }, e => {
 
-      });
+        });
+      }
     },
     //标准表格选择框改变
     selectStandChange(data) {

From 79ac8a5e9c1a867e66f711cd8758692bd4c749e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 1 Dec 2021 11:14:58 +0800
Subject: [PATCH 24/38] commit

---
 .../processCenter/pages/creatProcess/xmpg2/step5.vue      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index ff2a30683..974494ce0 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -439,11 +439,13 @@ export default {
         if (this.selectList.length > 0) {
           this.zrType = type;
           this.nodeList = [];
-          if (row.workPeopleId) {
-            this.nodeList = row.workPeopleId.split(",");
-          }
           this.modalshowflag = true;
           this.drawerTitle = "批量选择责任人";
+          this.selectList.forEach(item =>{
+            if(item.workPeopleId){
+              this.nodeList = item.workPeopleId.split(",");
+            }
+          })
         } else {
           this.$message.warning("请选择要分发的数据");
         }

From 90e00f157cd6272e95f73cf947fc294046187c37 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Wed, 1 Dec 2021 14:06:06 +0800
Subject: [PATCH 25/38] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E8=B4=A3=E4=BB=BB=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/rectificationDatabase.vue           | 56 +++++++++++++++----
 1 file changed, 46 insertions(+), 10 deletions(-)

diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 2a9d53cf0..910c210c9 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -137,10 +137,6 @@
               prop="productType"
               width="100"
               label="产品类型">
-<!--              <template slot-scope="scope">
-                <div v-if="scope.row.productType === 'research'">在研</div>
-                <div v-if="scope.row.productType === 'product'">在产</div>
-              </template>-->
             </el-table-column>
             <el-table-column
               prop="productLine"
@@ -161,6 +157,7 @@
             <el-table-column
               prop="responsibleUnit"
               width="180"
+              show-overflow-tooltip
               label="责任部门">
             </el-table-column>
             <el-table-column
@@ -486,9 +483,9 @@
                   <el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
-                      :disabled="true"
                       v-model="addForm.responsibleUnit"
                       placeholder="请输入责任部门"
+                      @click.native="choiceZRBM"
                       />
                   </el-form-item>
                   <el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
@@ -543,6 +540,7 @@
           class="common-button-primary"
           icon="el-icon-check"
           type="primary"
+          :loading="submiting"
           @click="submit">提交
         </el-button>
         <el-button
@@ -566,6 +564,12 @@
       :nodeList="nodeListMore"
       @checkedRole="drawerMore"
     />
+    <MechanismTree
+      is-title="选择部门信息"
+      :is-visible.sync="modalshowflagZRBM"
+      :nodeList="nodeListZRBM"
+      @checkedRole="drawerCheckZRBM"
+    />
   </div>
 </template>
 
@@ -671,12 +675,19 @@ export default {
       // 新增编辑框的disabled
       serialNumber: true,
 
+      // 提交按钮loading
+      submiting: false,
+      // 选择人（单选）
       roleShowflag: false,
       nodeList: [],
-
+      // 选择人（多选）
       titleMore: '',
       nodeListMore: [],
       roleShowMore: false,
+
+      // 选择责任部门
+      nodeListZRBM: [],
+      modalshowflagZRBM: false
     };
   },
   methods: {
@@ -886,6 +897,7 @@ export default {
       if (this.drawerTitle === "新增") {
         this.$refs["addForm"].validate((valid) => {
           if (valid) {
+            this.submiting = true
             addUn(
               closeState, standId, standSerialNumber,
               standName, itemsNum, itemsName, productType,
@@ -893,6 +905,7 @@ export default {
               responsibleUnit, dutyEngineer,
               authEngineer, qaEngineer, planCloseTime).then(res => {
               if (res.ok) {
+                this.submiting = false
                 this.$message.success("新增成功");
                 this.drawerTable = false;
                 this.getTableByPage();
@@ -900,11 +913,13 @@ export default {
             });
           } else {
             this.$message.warning("请完善基础信息");
+            this.submiting = false
           }
         });
       } else {
         this.$refs["addForm"].validate((valid) => {
           if (valid) {
+            this.submiting = true
             editUn(
               closeState, standId, standSerialNumber,
               standName, itemsNum, itemsName, productType,
@@ -912,6 +927,7 @@ export default {
               dutyEngineer, authEngineer, qaEngineer,
               planCloseTime, id).then(res => {
               if (res.ok) {
+                this.submiting = false
                 this.$message.success("编辑成功");
                 this.drawerTable = false;
                 this.getTableByPage();
@@ -919,6 +935,7 @@ export default {
             });
           } else {
             this.$message.warning("请完善基础信息");
+            this.submiting = false
           }
         });
       }
@@ -954,7 +971,7 @@ export default {
           }
         });
         this.dataList = res.data.records;
-        this.dataList.forEach(item => {
+        /*this.dataList.forEach(item => {
           // 责任部门转换
           if (item.zrbm !== null || item.zrbm !== "") {
             let k = (item.zrbm || "").split(",");
@@ -967,7 +984,7 @@ export default {
               }
             }
           }
-        });
+        });*/
       });
     },
     //新增事件
@@ -1066,7 +1083,6 @@ export default {
       if (this.drawerTitle === '编辑') {
         this.addForm.standName = ''
         this.addForm.standSerialNumber = ''
-        this.addForm.responsibleUnit = ''
       }
       this.addForm.productId = val.id
       this.addForm.productLine = val.productLine
@@ -1080,7 +1096,6 @@ export default {
     standChange(item) {
       this.addForm.standName = item.standName
       this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
-      this.addForm.responsibleUnit = item.zrbm || "--";
     },
     /** 责任工程师选择 */
     choiceZRR(type, title, id) {
@@ -1120,6 +1135,27 @@ export default {
       this.roleShowMore = true
     },
 
+    /** 选择责任部门 */
+    choiceZRBM(type, title, id) {
+      this.nodeListZRBM = []
+      this.nodeListZRBM.push(id)
+      this.modalshowflagZRBM = true
+    },
+    drawerCheckZRBM(data) {
+      let idList = ''
+      let nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.addForm.responsibleUnit = nameList;
+
+    },
+
   },
   mounted() {
     //查询已维护的项目

From 59b85836e08ec63db7196e2baef31b95e75c1273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 1 Dec 2021 14:27:10 +0800
Subject: [PATCH 26/38] commit

---
 src/api/unqualProcess.js                      |  3 +-
 src/pages/details/complianceDetails/index.vue |  4 +-
 .../pages/creatProcess/xmpg2/step6.vue        | 44 +++----------------
 .../pages/rectificationDatabase.vue           | 17 ++++++-
 4 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js
index c51fad700..229f11353 100644
--- a/src/api/unqualProcess.js
+++ b/src/api/unqualProcess.js
@@ -65,7 +65,7 @@ export function meetingByMonth(params) {
 export function addUn(
   closeState,standId, standSerialNumber, standName,
   itemsNum, itemsName, productType,
-  productLine, productName, reason, responsibleUnit,
+  productLine, productName,productId,reason, responsibleUnit,
   dutyEngineer, authEngineer, qaEngineer, planCloseTime) {
   const data = {
     closeState,
@@ -77,6 +77,7 @@ export function addUn(
     productType,
     productLine, //产品线
     productName, //项目名称
+    productId, //项目编号
     reason, //不合规项目
     responsibleUnit, //责任部门
     dutyEngineer, //责任工程师
diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue
index 30cb0f9ab..8c64e0cd7 100644
--- a/src/pages/details/complianceDetails/index.vue
+++ b/src/pages/details/complianceDetails/index.vue
@@ -54,8 +54,8 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination :page="page" :total="total" @pageChange="pageChange"
-                  @pageSizeChange="pageSizeChange"></pagination>
+<!--      <pagination :page="page" :total="total" @pageChange="pageChange"-->
+<!--                  @pageSizeChange="pageSizeChange"></pagination>-->
     </div>
 
     <!--满足-->
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 16cfd87e2..f0d287889 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -456,7 +456,7 @@
     ></Role-tree>
     <el-drawer
       title="批量填写"
-      :visible.sync="modalshowflag"
+      :visible.sync="modalShowFlag"
       :wrapperClosable="false"
       size="800px">
       <div class="demo-drawer-content">
@@ -531,32 +531,6 @@
             </el-date-picker>
           </el-form-item>
           <br>
-<!--          <el-divider><span><b>在产产品</b></span></el-divider>-->
-<!--          <el-formItem label="合规原因" class="add-form-item">-->
-<!--            <el-input-->
-<!--              v-model="batchEditForm.zcComplianceReasons"-->
-<!--              placeholder="请输入合规原因"-->
-<!--            ></el-input>-->
-<!--          </el-formItem>-->
-<!--          <el-form-item label="不合规项目" class="add-form-item">-->
-<!--            <el-input-->
-<!--              v-model="batchEditForm.zcNoCompliance"-->
-<!--              placeholder="请输入不合规项目"-->
-<!--            ></el-input>-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="不合规应对措施" class="add-form-item">-->
-<!--            <el-input-->
-<!--              v-model="batchEditForm.zcCountermeasures"-->
-<!--              placeholder="请输入不合规应对措施"-->
-<!--            ></el-input>-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="完成时间" class="add-form-item">-->
-<!--            <el-date-picker-->
-<!--              v-model="batchEditForm.zcCompletionTime"-->
-<!--              type="date"-->
-<!--              placeholder="选择日期">-->
-<!--            </el-date-picker>-->
-<!--          </el-form-item>-->
         </el-form>
       </div>
       <div class="demo-drawer-footer">
@@ -628,7 +602,7 @@ export default {
       todoId: "",
       showColumn: true,
       drawerTitle: "", //drawer标题
-      modalshowflag: false, // drawer开关
+      modalShowFlag: false, // drawer开关
       selectList: [],
       treeData: [], // 人员数据
       roleForm: {
@@ -723,10 +697,10 @@ export default {
           }
         });
       });
-      this.modalshowflag = false;
+      this.modalShowFlag = false;
     },
     cancelBatchEditForm() {
-      this.modalshowflag = false;
+      this.modalShowFlag = false;
     },
     //批量编辑
     batchEdit() {
@@ -739,15 +713,7 @@ export default {
         this.batchEditForm.countermeasures = "";
         //完成时间
         this.batchEditForm.completionTime = "";
-        //合规
-        this.batchEditForm.zcComplianceReasons = "";
-        //不合规
-        this.batchEditForm.zcNoCompliance = "";
-        //应对措施
-        this.batchEditForm.zcCountermeasures = "";
-        //完成时间
-        this.batchEditForm.zcCompletionTime = "";
-        this.modalshowflag = true;
+        this.modalShowFlag = true;
       } else {
         this.$message.warning("请选择要编辑的数据");
       }
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 910c210c9..64976940d 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -425,6 +425,14 @@
                       ></el-option>
                     </el-select>
                   </el-form-item>
+                  <el-form-item prop="projectNumber" label="项目编号" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <el-input
+                      :disabled="true"
+                      v-model="addForm.projectNumber"
+                      placeholder="请输入项目编号"
+                    />
+                  </el-form-item>
                   <el-form-item prop="productType" label="产品类型" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
@@ -603,6 +611,7 @@ export default {
         itemsNum: "", //条款号
         itemsName: "", //条款名称
         productType: "",
+        projectNumber: "",
         productLine: "", //产品线
         productName: "", //项目名称
         reason: "", //不合规项目
@@ -634,6 +643,9 @@ export default {
         productName: [
           { required: true, message: "请输入项目名称", trigger: "change" }
         ],
+        projectNumber: [
+          { required: true, message: "请输入项目编号", trigger: "change" }
+        ],
         reason: [
           { required: true, message: "请输入不合规项目", trigger: "blur" }
         ],
@@ -888,6 +900,7 @@ export default {
       const productType = this.addForm.productType;
       const productLine = this.addForm.productLine;
       const productName = this.addForm.productName;
+      const productId = this.addForm.projectNumber;
       const reason = this.addForm.reason;
       const responsibleUnit = this.addForm.responsibleUnit;
       const dutyEngineer = this.addForm.dutyEngineer;
@@ -901,7 +914,7 @@ export default {
             addUn(
               closeState, standId, standSerialNumber,
               standName, itemsNum, itemsName, productType,
-              productLine, productName, reason,
+              productLine, productName, productId,reason,
               responsibleUnit, dutyEngineer,
               authEngineer, qaEngineer, planCloseTime).then(res => {
               if (res.ok) {
@@ -1080,11 +1093,13 @@ export default {
 
     /** 项目名称change事件 */
     handleChange(val) {
+      console.log(val);
       if (this.drawerTitle === '编辑') {
         this.addForm.standName = ''
         this.addForm.standSerialNumber = ''
       }
       this.addForm.productId = val.id
+      this.addForm.projectNumber = val.projectNumber
       this.addForm.productLine = val.productLine
       this.addForm.productName = val.projectName
       this.addForm.productType = val.projectPlatfor

From 79b446ce5938cc688364e4f47e478c8fdb44c3ce Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 1 Dec 2021 14:53:26 +0800
Subject: [PATCH 27/38] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index abfba54fd..ba33d303e 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -932,14 +932,14 @@
                     :disabled="formdisableflag"
                   ></custom-SVPPS>
                 </template>
-                <template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'">
-                  <custom-date-pick
+                <template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ' || field.attrField === 'SSRQ'">
+                  <custom-date-pick-group
                     v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
                     :key="field.attrField"
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
-                  ></custom-date-pick>
+                  ></custom-date-pick-group>
                 </template>
                 <template v-else-if="field.attrType === 'DATE_PIC_OPTS'">
                   <custom-date-pick-group

From 7f22a313a03e5a85651ffeec9fa5db8abec97c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 1 Dec 2021 15:14:15 +0800
Subject: [PATCH 28/38] =?UTF-8?q?=E5=90=88=E8=A7=84=E9=A1=B9=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E6=A0=A1=E9=AA=8C=EF=BC=88z)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg/step4.vue         | 307 ++++++++++--------
 1 file changed, 178 insertions(+), 129 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 877f1f555..3ab32b9d8 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -135,6 +135,11 @@
           <template slot="title">填写信息</template>
         </process-title>
         <div class="tableTitle">
+          <div class="tableButton">
+            <el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini"
+                       @click="batchEdit">批量编辑
+            </el-button>
+          </div>
         </div>
         <el-table
           ref="multipleTable"
@@ -143,7 +148,7 @@
           style="width: 100%"
           border
           @selection-change="selectStandChange"
-          height="56%"
+          height="48%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
           <el-table-column
@@ -211,10 +216,6 @@
               <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
-<!--          <el-table-column-->
-<!--            prop="productType"-->
-<!--            align="center"-->
-<!--            label="在研产品">-->
             <el-table-column
               prop="researchCompliance"
               align="center"
@@ -233,6 +234,7 @@
                 <el-input
                    v-else
                    :disabled="acceptShow"
+                   clearable
                    @click.native="handlePrice(scope.row)"
                     v-model="dataList[scope.$index].complianceReasons"
                     placeholder="请输入合规原因"
@@ -309,6 +311,7 @@
                       :disabled="acceptShow"
                       class="datePickLen"
                       clearable
+                      value-format="yyyy-MM-dd HH:mm:ss"
                       @click.native="handlePrice(scope.row)"
                       v-model="dataList[scope.$index].completionTime"
                       type="date"
@@ -317,104 +320,6 @@
                 </template>
               </el-table-column>
             </el-table-column>
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            align="center"-->
-<!--            label="在产产品">-->
-<!--            <el-table-column-->
-<!--              prop="productionCompliance"-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="合规(具体情况)">-->
-<!--              <template slot-scope="scope">-->
-<!--                <el-input-->
-<!--                    v-if="dataList[scope.$index].zcNoCompliance && dataList[scope.$index].zcNoCompliance.length>0-->
-<!--                    || dataList[scope.$index].zcCountermeasures && dataList[scope.$index].zcCountermeasures>0-->
-<!--                    || dataList[scope.$index].zcCompletionTime && dataList[scope.$index].zcCompletionTime !== null"-->
-<!--                    disabled-->
-<!--                  v-model="dataList[scope.$index].zcComplianceReasons"-->
-<!--                  placeholder="请输入合规原因"-->
-<!--                >-->
-<!--                </el-input>-->
-<!--                <el-input-->
-<!--                    v-else-->
-<!--                    v-model="dataList[scope.$index].zcComplianceReasons"-->
-<!--                    placeholder="请输入合规原因"-->
-<!--                >-->
-<!--                </el-input>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              align="center"-->
-<!--              width="160"-->
-<!--              label="不合规">-->
-<!--              <el-table-column-->
-<!--                prop="productionNonCompliance"-->
-<!--                align="center"-->
-<!--                width="170"-->
-<!--                label="不合规项目">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-input-->
-<!--                      v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"-->
-<!--                      disabled-->
-<!--                    v-model="dataList[scope.$index].zcNoCompliance"-->
-<!--                    placeholder="请输入不合规项目"-->
-<!--                  >-->
-<!--                  </el-input>-->
-<!--                  <el-input-->
-<!--                      v-else-->
-<!--                      v-model="dataList[scope.$index].zcNoCompliance"-->
-<!--                      placeholder="请输入不合规项目"-->
-<!--                  >-->
-<!--                  </el-input>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="productionCountermeasures"-->
-<!--                align="center"-->
-<!--                width="160"-->
-<!--                label="应对措施">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-input-->
-<!--                      v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"-->
-<!--                      disabled-->
-<!--                    v-model="dataList[scope.$index].zcCountermeasures"-->
-<!--                    placeholder="请输入应对措施"-->
-<!--                  >-->
-<!--                  </el-input>-->
-<!--                  <el-input-->
-<!--                      v-else-->
-<!--                      v-model="dataList[scope.$index].zcCountermeasures"-->
-<!--                      placeholder="请输入应对措施"-->
-<!--                  >-->
-<!--                  </el-input>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column-->
-<!--                prop="productionCompletionTime"-->
-<!--                align="center"-->
-<!--                width="140"-->
-<!--                label="完成时间">-->
-<!--                <template slot-scope="scope">-->
-<!--                  <el-date-picker-->
-<!--                      v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"-->
-<!--                      disabled-->
-<!--                    v-model="dataList[scope.$index].zcCompletionTime"-->
-<!--                    type="date"-->
-<!--                    placeholder="请选择日期">-->
-<!--                  </el-date-picker>-->
-<!--                  <el-date-picker-->
-<!--                      v-else-->
-<!--                      class="datePickLen"-->
-<!--                      clearable-->
-<!--                      v-model="dataList[scope.$index].zcCompletionTime"-->
-<!--                      type="date"-->
-<!--                      placeholder="请选择日期">-->
-<!--                  </el-date-picker>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--            </el-table-column>-->
-<!--          </el-table-column>-->
         </el-table>
       </div>
       <div>
@@ -525,6 +430,96 @@
         @checkedRole="checkedTransferRole"
         :nodeList="nodeList"
     ></Role-tree>
+<!--    批量编辑弹窗-->
+    <el-drawer
+      title="批量填写"
+      :visible.sync="modalShowFlag"
+      :wrapperClosable="false"
+      size="800px">
+      <div class="demo-drawer-content">
+        <el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150">
+          <!--          <el-divider><span><b>在研产品</b></span></el-divider>-->
+          <el-formItem label="合规原因" class="add-form-item">
+            <el-input
+              v-if="batchEditForm.noCompliance && batchEditForm.noCompliance.length>0
+                    || batchEditForm.countermeasures && batchEditForm.countermeasures.length>0
+                    || batchEditForm.completionTime && batchEditForm.completionTime !== null"
+              disabled
+              v-model="batchEditForm.complianceReasons"
+              placeholder="请输入合规原因"
+            >
+            </el-input>
+            <el-input
+              v-else
+              :disabled="acceptShow"
+              v-model="batchEditForm.complianceReasons"
+              placeholder="请输入合规原因"
+            >
+            </el-input>
+          </el-formItem>
+          <el-form-item label="不合规项目" class="add-form-item">
+            <el-input
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              disabled
+              v-model="batchEditForm.noCompliance"
+              placeholder="请输入不合规项目"
+            >
+            </el-input>
+            <el-input
+              v-else
+              :disabled="acceptShow"
+              v-model="batchEditForm.noCompliance"
+              placeholder="请输入不合规项目"
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item label="不合规应对措施" class="add-form-item">
+            <el-input
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              disabled
+              v-model="batchEditForm.countermeasures"
+              placeholder="请输入不合规应对措施"
+            >
+            </el-input>
+            <el-input
+              v-else
+              :disabled="acceptShow"
+              v-model="batchEditForm.countermeasures"
+              placeholder="请输入不合规应对措施"
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item label="完成时间" class="add-form-item">
+            <el-date-picker
+              v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
+              disabled
+              v-model="batchEditForm.completionTime"
+              type="date"
+              placeholder="请选择日期">
+            </el-date-picker>
+            <el-date-picker
+              v-else
+              :disabled="acceptShow"
+              class="datePickLen"
+              clearable
+              value-format="yyyy-MM-dd HH:mm:ss"
+              v-model="batchEditForm.completionTime"
+              type="date"
+              placeholder="请选择日期">
+            </el-date-picker>
+          </el-form-item>
+          <br>
+        </el-form>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
+                   @click="saveBatchEditForm">
+          确定
+        </el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消
+        </el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -546,12 +541,24 @@ export default {
     return {
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
-      comFlag: true,
+      comFlag: 0,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
+      modalShowFlag: false, // 批量编辑开关
+      batchEditForm: {
+        // 在研产品
+        // 合规
+        complianceReasons: "",
+        // 不合规
+        noCompliance: "",
+        // 应对措施
+        countermeasures: "",
+        // 完成时间
+        completionTime: "",
+      },
       detailData: [],
       sarProStateTableHeight: null, // 项目列表高度
       // 当前流程类型(1待办/2已办)
@@ -735,6 +742,12 @@ export default {
               item.implementer = this.$store.getters.userInfo.userName;
             });
             this.dataList = item.step3DTOS;
+            this.dataList.forEach(item => {
+              this.$set(item,'complianceReasons', '')
+              this.$set(item,'noCompliance', '')
+              this.$set(item,'countermeasures', '')
+              this.$set(item,'completionTime', '')
+            })
 
           } else {
             this.dataList = item.dataList;
@@ -800,40 +813,76 @@ export default {
     },
     handlePrice(row){
       if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
-        this.comFlag = true
+        this.comFlag = 0
       }else{
-        this.comFlag = false
+        this.comFlag = this.comFlag + 1
       }
     },
     //提交事件
     handleSubmit() {
-      if(!this.comFlag) {
+      if(this.comFlag > 0) {
         this.$message.warning('请填写完整的不符合项信息')
       }else{
-        this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-        this.listForm.commentText = this.commentText;
-        this.listForm.approvalOpinion = "";
-        this.listForm.signFlag = "";
-        this.listForm.dataList = this.dataList;
-        const json = JSON.stringify(this.listForm);
-        this.isSubmit = true;
-        this.$http.post("lawss/activiti/completeTask", {
-          taskIds: this.taskIds,
-          userId: this.userId,
-          json: json
-        }, {
-          _this: this
-        }, res => {
-          if (res.success) {
-            this.$message.success(res.message);
-            this.$router.push("/processCenter");
-          }
-          this.isSubmit = false;
-        }, e => {
-
-        });
+        // this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+        // this.listForm.commentText = this.commentText;
+        // this.listForm.approvalOpinion = "";
+        // this.listForm.signFlag = "";
+        // this.listForm.dataList = this.dataList;
+        // const json = JSON.stringify(this.listForm);
+        // this.isSubmit = true;
+        // this.$http.post("lawss/activiti/completeTask", {
+        //   taskIds: this.taskIds,
+        //   userId: this.userId,
+        //   json: json
+        // }, {
+        //   _this: this
+        // }, res => {
+        //   if (res.success) {
+        //     this.$message.success(res.message);
+        //     this.$router.push("/processCenter");
+        //   }
+        //   this.isSubmit = false;
+        // }, e => {
+        //
+        // });
       }
     },
+    //批量编辑
+    batchEdit() {
+      if (this.selectList.length > 0) {
+        //合规
+        this.batchEditForm.complianceReasons = "";
+        //不合规
+        this.batchEditForm.noCompliance = "";
+        //应对措施
+        this.batchEditForm.countermeasures = "";
+        //完成时间
+        this.batchEditForm.completionTime = "";
+        this.modalShowFlag = true;
+      } else {
+        this.$message.warning("请选择要编辑的数据");
+      }
+    },
+    //批量编辑确定按钮事件
+    saveBatchEditForm() {
+      this.dataList.forEach(item => {
+        this.selectList.forEach(items => {
+          if (item.id === items) {
+            item.complianceReasons = this.batchEditForm.complianceReasons;
+            //不合规
+            item.noCompliance = this.batchEditForm.noCompliance;
+            //应对措施
+            item.countermeasures = this.batchEditForm.countermeasures;
+            //完成时间
+            item.completionTime = this.batchEditForm.completionTime;
+          }
+        });
+      });
+      this.modalShowFlag = false;
+    },
+    cancelBatchEditForm() {
+      this.modalShowFlag = false;
+    },
     //标准表格选择框改变
     selectStandChange(data) {
       this.selectList = [];

From 09f2f1a6e01957206f76acdbc14c276bfd4dc031 Mon Sep 17 00:00:00 2001
From: Superman_Main <396572590@qq.com>
Date: Wed, 1 Dec 2021 15:37:33 +0800
Subject: [PATCH 29/38]                                                        
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                                                                              
                             feat: There is no way the, add stand_number

---
 .../components/EnterpriseStandardDatabase.vue                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 193910268..d17405e5b 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -510,12 +510,12 @@
                     </el-form-item>
                     <el-form-item
                             label="企标编号"
-                            prop="standCode"
+                            prop="standNumber"
                             label-width="150px"
                             class="add-form-item"
                     >
                         <el-input
-                                v-model="sarBussionessStandEO.standCode"
+                                v-model="sarBussionessStandEO.standNumber"
                                 :maxlength="100"
                                 placeholder="请输入企标编号"
                                 clearable
@@ -2993,6 +2993,7 @@ export default {
                 if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') {
                   nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss')
                 }
+                nowstandinfo.standCode = nowstandinfo.standSort + ' ' + nowstandinfo.standNumber + ( nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
                 this.$http.postData('lawss/sarBussionessStand/updateSarBussionessStand', nowstandinfo, {
                   _this: this,
                   loading: 'isSubmit'

From 5245971931f5709e352019341ece9887032b8ab2 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 1 Dec 2021 15:39:48 +0800
Subject: [PATCH 30/38] =?UTF-8?q?=E5=90=88=E8=A7=84=E9=A1=B9=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E6=A0=A1=E9=AA=8C(+)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg/step4.vue         | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 3ab32b9d8..f8c3ee931 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -235,7 +235,6 @@
                    v-else
                    :disabled="acceptShow"
                    clearable
-                   @click.native="handlePrice(scope.row)"
                     v-model="dataList[scope.$index].complianceReasons"
                     placeholder="请输入合规原因"
                 >
@@ -263,7 +262,6 @@
                   <el-input
                       v-else
                       :disabled="acceptShow"
-                      @click.native="handlePrice(scope.row)"
                       v-model="dataList[scope.$index].noCompliance"
                       placeholder="请输入不合规项目"
                   >
@@ -285,7 +283,6 @@
                   </el-input>
                   <el-input
                       v-else
-                      @click.native="handlePrice(scope.row)"
                       :disabled="acceptShow"
                       v-model="dataList[scope.$index].countermeasures"
                       placeholder="请输入应对措施"
@@ -312,7 +309,6 @@
                       class="datePickLen"
                       clearable
                       value-format="yyyy-MM-dd HH:mm:ss"
-                      @click.native="handlePrice(scope.row)"
                       v-model="dataList[scope.$index].completionTime"
                       type="date"
                       placeholder="请选择日期">
@@ -811,18 +807,31 @@ export default {
         this.isSubmit = false
       })
     },
-    handlePrice(row){
-      if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
-        this.comFlag = 0
-      }else{
-        this.comFlag = this.comFlag + 1
+    handlePrice(){
+      for (let i = 0; i < this.dataList.length; i++) {
+        console.log('815',this.dataList[i])
+        if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
+          console.log('目前可以通过')
+        }else {
+          this.comFlag ++
+          console.log('有没有输全的，不能通过',this.comFlag)
+        }
       }
+
+      // if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
+      //   this.comFlag = 0
+      // }else{
+      //   this.comFlag = this.comFlag + 1
+      // }
     },
     //提交事件
     handleSubmit() {
+      this.handlePrice()
       if(this.comFlag > 0) {
         this.$message.warning('请填写完整的不符合项信息')
+        this.comFlag = 0
       }else{
+        this.$message.success('通过')
         // this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
         // this.listForm.commentText = this.commentText;
         // this.listForm.approvalOpinion = "";

From 77699b40fc0b4fb609e67ae17f52846388bcc6af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 1 Dec 2021 15:44:06 +0800
Subject: [PATCH 31/38] =?UTF-8?q?=E7=AC=A6=E5=90=88=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/complianceDetails/index.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue
index 8c64e0cd7..9a33fbf29 100644
--- a/src/pages/details/complianceDetails/index.vue
+++ b/src/pages/details/complianceDetails/index.vue
@@ -1,6 +1,7 @@
 <!--符合性详情-->
 <template>
   <div id="complianceDetails">
+    <el-divider content-position="left" v-if="unfit.length < 1 && fit.length < 1"  >暂无评估结果</el-divider>
     <!-- 不满足-->
     <el-divider content-position="left" v-if="unfit.length"  >不满足</el-divider>
     <div class="content">
@@ -21,25 +22,28 @@
         >
         </el-table-column>
         <el-table-column
-          prop="noCompliance"
+          prop="researchNonCompliance"
           label="不合规项目"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="countermeasures "
+          prop="researchCountermeasures"
           label="应对措施"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="completionTime "
+          prop="researchImplementationTime"
           label="完成时间"
           align="center"
         >
+          <template slot-scope="scope">
+            <span>{{ scope.row.researchImplementationTime ? $moment(scope.row.researchImplementationTime).format('YYYY-MM-DD') : '' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
-          prop="assessor"
+          prop="evaluationPeople"
           label="评估人"
           align="center"
         >
@@ -78,13 +82,13 @@
          >
          </el-table-column>
          <el-table-column
-           prop="complianceReasons"
+           prop="researchCompliance"
            label="合规"
            align="center"
          >
          </el-table-column>
          <el-table-column
-           prop="assessor"
+           prop="evaluationPeople"
            label="评估人"
            align="center"
          >

From 607ccb3fe056a7f6fc65db91b31400b4e5120345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 1 Dec 2021 15:51:02 +0800
Subject: [PATCH 32/38] commit

---
 .../pages/creatProcess/xmpg/step4.vue         | 10 ----------
 .../pages/creatProcess/xmpg2/step6.vue        | 20 +++++++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index f8c3ee931..cb0d4e798 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -809,20 +809,11 @@ export default {
     },
     handlePrice(){
       for (let i = 0; i < this.dataList.length; i++) {
-        console.log('815',this.dataList[i])
         if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
-          console.log('目前可以通过')
         }else {
           this.comFlag ++
-          console.log('有没有输全的，不能通过',this.comFlag)
         }
       }
-
-      // if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
-      //   this.comFlag = 0
-      // }else{
-      //   this.comFlag = this.comFlag + 1
-      // }
     },
     //提交事件
     handleSubmit() {
@@ -831,7 +822,6 @@ export default {
         this.$message.warning('请填写完整的不符合项信息')
         this.comFlag = 0
       }else{
-        this.$message.success('通过')
         // this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
         // this.listForm.commentText = this.commentText;
         // this.listForm.approvalOpinion = "";
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index f0d287889..f5922415f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -142,7 +142,6 @@
               >
               </el-input>
               <el-input
-                @click.native="handlePrice(scope.row)"
                 v-else
                 :disabled="acceptShow"
                 v-model="scope.row.complianceReasons"
@@ -172,7 +171,6 @@
                 <el-input
                   v-else
                   :disabled="acceptShow"
-                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.noCompliance"
                   placeholder="请输入不合规项目"
                 >
@@ -195,7 +193,6 @@
                 <el-input
                   v-else
                   :disabled="acceptShow"
-                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.countermeasures"
                   placeholder="请输入应对措施"
                 >
@@ -220,7 +217,6 @@
                   :disabled="acceptShow"
                   class="datePickLen"
                   clearable
-                  @click.native="handlePrice(scope.row)"
                   v-model="scope.row.completionTime"
                   type="date"
                   value-format="yyyy-MM-dd HH:mm:ss"
@@ -527,6 +523,7 @@
               clearable
               v-model="batchEditForm.completionTime"
               type="date"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="请选择日期">
             </el-date-picker>
           </el-form-item>
@@ -561,7 +558,7 @@ export default {
   },
   data() {
     return {
-      comFlag: true,
+      comFlag: 0,
       total: 0,
       currentPage: 1,
       pageSize: 20,
@@ -899,16 +896,19 @@ export default {
       });
     },
     handlePrice(row){
-      if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
-        this.comFlag = true
-      }else{
-        this.comFlag = false
+      for (let i = 0; i < this.dataList.length; i++) {
+        if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
+        }else {
+          this.comFlag ++
+        }
       }
     },
     //提交事件
     handleSubmit() {
-      if(!this.comFlag){
+      this.handlePrice()
+      if(this.comFlag > 0) {
         this.$message.warning('请填写完整的不符合项信息')
+        this.comFlag = 0
       }else{
         this.isSubmit = true;
         this.listForm.commentText = this.commentText;

From 3ab63ee9e03f3c9f31da814e9549ce4b7ab73ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 1 Dec 2021 15:51:36 +0800
Subject: [PATCH 33/38] commit

---
 .../pages/creatProcess/xmpg/step4.vue         | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index cb0d4e798..76572cf45 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -822,28 +822,28 @@ export default {
         this.$message.warning('请填写完整的不符合项信息')
         this.comFlag = 0
       }else{
-        // this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-        // this.listForm.commentText = this.commentText;
-        // this.listForm.approvalOpinion = "";
-        // this.listForm.signFlag = "";
-        // this.listForm.dataList = this.dataList;
-        // const json = JSON.stringify(this.listForm);
-        // this.isSubmit = true;
-        // this.$http.post("lawss/activiti/completeTask", {
-        //   taskIds: this.taskIds,
-        //   userId: this.userId,
-        //   json: json
-        // }, {
-        //   _this: this
-        // }, res => {
-        //   if (res.success) {
-        //     this.$message.success(res.message);
-        //     this.$router.push("/processCenter");
-        //   }
-        //   this.isSubmit = false;
-        // }, e => {
-        //
-        // });
+        this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+        this.listForm.commentText = this.commentText;
+        this.listForm.approvalOpinion = "";
+        this.listForm.signFlag = "";
+        this.listForm.dataList = this.dataList;
+        const json = JSON.stringify(this.listForm);
+        this.isSubmit = true;
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false;
+        }, e => {
+
+        });
       }
     },
     //批量编辑

From 4b65d04b20e2b71a7737a5a2869e25e4a9bca01c Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 1 Dec 2021 15:54:27 +0800
Subject: [PATCH 34/38] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E8=83=BD=E9=99=84=E4=B8=8A?=
 =?UTF-8?q?=E5=80=BC=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index ba33d303e..4f10273ac 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -4894,14 +4894,14 @@ export default {
       let idList = ''
       let nameList = ''
       data.forEach(item => {
-        if (item.hasChild === '0' && item.children === null) {
+        // if (item.hasChild === '0' && item.children === null) {
           if (nameList.length > 0) {
             nameList += ','
             idList += ','
           }
           idList += item.id
           nameList += item.name
-        }
+        // }
       })
       this.sarStandardsInfoEO.ZRBMId = idList;
       this.sarStandardsInfoEO['ZRBM'] = nameList;

From bddc169f3717a4d14d81c70114fd90d06fc9d80b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 1 Dec 2021 17:13:12 +0800
Subject: [PATCH 35/38] commit

---
 .../pages/creatProcess/bzrk/step1.vue         |  2 +-
 .../pages/creatProcess/xmpg2/step1-12.vue     | 41 -------------------
 2 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index e3548e6a7..1b480bd50 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1905,7 +1905,6 @@
 
                               const json = Object.assign(bringData, bringData.attrInfoCaseMap);
                               this.form = JSON.parse(JSON.stringify(json))
-
                               this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : []
                               this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : []
                               this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
@@ -1924,6 +1923,7 @@
                               this.key3++
                               this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
                               this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
+                              this.form.ssrq =  this.$moment(this.form.ssrq).format("YYYY-MM-DD")
                               this.form.prcNum = this.prcNum
                               this.form.prcName = this.prcName
                               this.form['id'] = bringData.id
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
index 4a2f6a388..f48224c89 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
@@ -110,10 +110,6 @@
               <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="productType"
-            align="center"
-            label="在研产品">
             <el-table-column
               prop="complianceReasons"
               align="center"
@@ -147,43 +143,6 @@
                 </template>
               </el-table-column>
             </el-table-column>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            label="在产产品">
-            <el-table-column
-              prop="zcComplianceReasons"
-              align="center"
-              width="160"
-              label="合规(具体情况)">
-            </el-table-column>
-            <el-table-column
-              align="center"
-              width="160"
-              label="不合规">
-              <el-table-column
-                prop="zcNoCompliance"
-                align="center"
-                width="170"
-                label="不合规项目">
-              </el-table-column>
-              <el-table-column
-                prop="zcCountermeasures"
-                align="center"
-                width="160"
-                label="应对措施">
-              </el-table-column>
-              <el-table-column
-                prop="zcCompletionTime"
-                align="center"
-                width="120"
-                label="完成时间">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
-                </template>
-              </el-table-column>
-            </el-table-column>
-          </el-table-column>
           <el-table-column
             prop="workPeople"
             align="center"

From c27e24137b6976bef227a2b767140ac24b09323b Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Wed, 1 Dec 2021 17:27:53 +0800
Subject: [PATCH 36/38] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B02?=
 =?UTF-8?q?=E7=9A=84=E7=AC=AC=E5=85=AD=E6=AD=A5=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index f5922415f..90222f38a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -895,9 +895,9 @@ export default {
         this.isSubmit = false;
       });
     },
-    handlePrice(row){
+    handlePrice(){
       for (let i = 0; i < this.dataList.length; i++) {
-        if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
+        if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === undefined)){
         }else {
           this.comFlag ++
         }

From f2e520ae0e9098f009f743b3b366537a8736d72a Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 1 Dec 2021 17:57:58 +0800
Subject: [PATCH 37/38] commit

---
 .../CustomFormComponents/SelectArray.vue      |   1 +
 .../pages/creatProcess/bzrk/step1.vue         | 374 ++++++++----------
 .../domesticStandardsAndRegulations/index.vue |  70 +++-
 3 files changed, 224 insertions(+), 221 deletions(-)

diff --git a/src/components/CustomFormComponents/SelectArray.vue b/src/components/CustomFormComponents/SelectArray.vue
index 7090d5e0b..d7ffd381a 100644
--- a/src/components/CustomFormComponents/SelectArray.vue
+++ b/src/components/CustomFormComponents/SelectArray.vue
@@ -10,6 +10,7 @@
       <el-select
         v-model="valueArr"
         :placeholder="placeholder"
+        filterable
         :disabled="disabled"
         clearable
         multiple
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index e3548e6a7..035149198 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -262,28 +262,21 @@
                                             v-model="form.xgdName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="xgdFileList.length>0">
-<!--                                        {{ form.xgdName }}-->
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                style="margin-left: 10px"
-                                                @click="fileUpload('xgd')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                           查看已上传的文件
-                                        </el-button>
-                                    </div>
-                                    <div v-else>
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('xgd')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                              点击上传
-                                        </el-button>
-                                    </div>
+                                  <div style="display: flex;justify-content: space-between">
+                                      <div style="width: 80%;">
+                                          <div v-for="(item,index) in xgdFileList" :key="index" class="fileClass">{{ item.name }}</div>
+                                      </div>
+                                      <div style="width: 20%;">
+                                          <el-button
+                                                  type="primary"
+                                                  class="common-button-primary"
+                                                  size="mini"
+                                                  style="margin-left: 10px; margin-top: 11px; float: right;"
+                                                  @click="fileUpload('xgd')">
+                                              <i class="el-icon-upload el-icon--right"></i>
+                                          </el-button>
+                                      </div>
+                                  </div>
                                 </el-form-item>
                               <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
                                     <el-input
@@ -292,28 +285,21 @@
                                             v-model="form.fbgbjbdName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="FBGBJBDFileList.length>0">
-<!--                                        {{ form.fbgbjbdName }}-->
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                style="margin-left: 10px"
-                                                @click="fileUpload('fbgbjbd')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                         查看已上传的文件
-                                        </el-button>
-                                    </div>
-                                    <div v-else>
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('fbgbjbd')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
-                                    </div>
+                                  <div style="display: flex;justify-content: space-between">
+                                      <div style="width: 80%;">
+                                          <div v-for="(item,index) in FBGBJBDFileList" :key="index" class="fileClass">{{ item.name }}</div>
+                                      </div>
+                                      <div style="width: 20%;">
+                                          <el-button
+                                                  type="primary"
+                                                  class="common-button-primary"
+                                                  size="mini"
+                                                  style="margin-left: 10px; margin-top: 11px; float: right;"
+                                                  @click="fileUpload('fbgbjbd')">
+                                              <i class="el-icon-upload el-icon--right"></i>
+                                          </el-button>
+                                      </div>
+                                  </div>
                                 </el-form-item>
                               <el-form-item v-show="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
                                 <el-input
@@ -322,28 +308,21 @@
                                     v-model="form.ssgName"
                                     clearable
                                 ></el-input>
-                                <div v-if="ssgFileList.length>0">
-                                  <!--                                        {{ form.ssgName }}-->
-                                  <el-button
-                                      type="primary"
-                                      class="common-button-primary"
-                                      size="mini"
-                                      style="margin-left: 10px"
-                                      @click="fileUpload('ssg')">
-                                    <i class="el-icon-upload el-icon--right"></i>
-                                    查看已上传的文件
-                                  </el-button>
-                                </div>
-                                <div v-else>
-                                  <el-button
-                                      type="primary"
-                                      class="common-button-primary"
-                                      size="mini"
-                                      @click="fileUpload('ssg')">
-                                    <i class="el-icon-upload el-icon--right"></i>
-                                    点击上传
-                                  </el-button>
-                                </div>
+                                  <div style="display: flex;justify-content: space-between">
+                                      <div style="width: 80%;">
+                                          <div v-for="(item,index) in ssgFileList" :key="index" class="fileClass">{{ item.name }}</div>
+                                      </div>
+                                      <div style="width: 20%;">
+                                          <el-button
+                                                  type="primary"
+                                                  class="common-button-primary"
+                                                  size="mini"
+                                                  style="margin-left: 10px; margin-top: 11px; float: right;"
+                                                  @click="fileUpload('ssg')">
+                                              <i class="el-icon-upload el-icon--right"></i>
+                                          </el-button>
+                                      </div>
+                                  </div>
                               </el-form-item>
                               <el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
                                 <el-input
@@ -352,28 +331,21 @@
                                     v-model="form.caName"
                                     clearable
                                 ></el-input>
-                                <div v-if="caFileList.length>0">
-                                  <!--                                        {{ form.caName }}-->
-                                  <el-button
-                                      type="primary"
-                                      class="common-button-primary"
-                                      size="mini"
-                                      style="margin-left: 10px"
-                                      @click="fileUpload('ca')">
-                                    <i class="el-icon-upload el-icon--right"></i>
-                                    查看已上传的文件
-                                  </el-button>
-                                </div>
-                                <div v-else>
-                                  <el-button
-                                      type="primary"
-                                      class="common-button-primary"
-                                      size="mini"
-                                      @click="fileUpload('ca')">
-                                    <i class="el-icon-upload el-icon--right"></i>
-                                    点击上传
-                                  </el-button>
-                                </div>
+                                  <div style="display: flex;justify-content: space-between">
+                                      <div style="width: 80%;">
+                                          <div v-for="(item,index) in caFileList" :key="index" class="fileClass">{{ item.name }}</div>
+                                      </div>
+                                      <div style="width: 20%;">
+                                          <el-button
+                                                  type="primary"
+                                                  class="common-button-primary"
+                                                  size="mini"
+                                                  style="margin-left: 10px; margin-top: 11px; float: right;"
+                                                  @click="fileUpload('ca')">
+                                              <i class="el-icon-upload el-icon--right"></i>
+                                          </el-button>
+                                      </div>
+                                  </div>
                               </el-form-item>
                               <el-form-item v-show="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
                                     <el-input
@@ -382,28 +354,21 @@
                                             v-model="form.zbjbdName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="zbjbdFileList.length>0">
-<!--                                        {{ form.zbjbdName }}-->
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                style="margin-left: 10px"
-                                                @click="fileUpload('zbjbd')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                         查看已上传的文件
-                                        </el-button>
-                                    </div>
-                                    <div v-else>
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('zbjbd')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
-                                    </div>
+                                  <div style="display: flex;justify-content: space-between">
+                                      <div style="width: 80%;">
+                                          <div v-for="(item,index) in zbjbdFileList" :key="index" class="fileClass">{{ item.name }}</div>
+                                      </div>
+                                      <div style="width: 20%;">
+                                          <el-button
+                                                  type="primary"
+                                                  class="common-button-primary"
+                                                  size="mini"
+                                                  style="margin-left: 10px; margin-top: 11px; float: right;"
+                                                  @click="fileUpload('zbjbd')">
+                                              <i class="el-icon-upload el-icon--right"></i>
+                                          </el-button>
+                                      </div>
+                                  </div>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
@@ -414,28 +379,21 @@
                                             v-model="form.kwjName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="kwjFileList.length>0">
-<!--                                        {{ form.kwjName }}-->
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                style="margin-left: 10px"
-                                                @click="fileUpload('kwj')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                         查看已上传的文件
-                                        </el-button>
-                                    </div>
-                                    <div v-else>
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('kwj')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
-                                    </div>
+                                  <div style="display: flex;justify-content: space-between">
+                                      <div style="width: 80%;">
+                                          <div v-for="(item,index) in kwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
+                                      </div>
+                                      <div style="width: 20%;">
+                                          <el-button
+                                                  type="primary"
+                                                  class="common-button-primary"
+                                                  size="mini"
+                                                  style="margin-left: 10px; margin-top: 11px; float: right;"
+                                                  @click="fileUpload('kwj')">
+                                              <i class="el-icon-upload el-icon--right"></i>
+                                          </el-button>
+                                      </div>
+                                  </div>
                                 </el-form-item>
 <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
                               <el-form-item v-show="form.standInData === '0'" label="相关文件" prop="jdwj" class="add-form-item form-item-disabled">
@@ -446,28 +404,21 @@
                                     v-model="form.jdwjName"
                                     clearable
                                 ></el-input>
-                                <div v-if="jdwjFileList.length>0">
-                                  <!--                                        {{ form.jdwjName }}-->
-                                  <el-button
-                                      type="primary"
-                                      class="common-button-primary"
-                                      size="mini"
-                                      style="margin-left: 10px"
-                                      @click="fileUpload('jdwj')">
-                                    <i class="el-icon-upload el-icon--right"></i>
-                                    查看已上传的文件
-                                  </el-button>
-                                </div>
-                                <div v-else>
-                                  <el-button
-                                      type="primary"
-                                      class="common-button-primary"
-                                      size="mini"
-                                      @click="fileUpload('jdwj')">
-                                    <i class="el-icon-upload el-icon--right"></i>
-                                    点击上传
-                                  </el-button>
-                                </div>
+                                  <div style="display: flex;justify-content: space-between">
+                                      <div style="width: 80%;">
+                                          <div v-for="(item,index) in jdwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
+                                      </div>
+                                      <div style="width: 20%;">
+                                          <el-button
+                                                  type="primary"
+                                                  class="common-button-primary"
+                                                  size="mini"
+                                                  style="margin-left: 10px; margin-top: 11px; float: right;"
+                                                  @click="fileUpload('jdwj')">
+                                              <i class="el-icon-upload el-icon--right"></i>
+                                          </el-button>
+                                      </div>
+                                  </div>
                               </el-form-item>
                               <el-form-item v-show="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
                                 <el-input
@@ -476,28 +427,21 @@
                                     v-model="form.bpgName"
                                     clearable
                                 ></el-input>
-                                <div v-if="bpgFileList.length>0">
-                                  <!--                                        {{ form.bpgName }}-->
-                                  <el-button
-                                      type="primary"
-                                      class="common-button-primary"
-                                      size="mini"
-                                      style="margin-left: 10px"
-                                      @click="fileUpload('bpg')">
-                                    <i class="el-icon-upload el-icon--right"></i>
-                                    查看已上传的文件
-                                  </el-button>
-                                </div>
-                                <div v-else>
-                                  <el-button
-                                      type="primary"
-                                      class="common-button-primary"
-                                      size="mini"
-                                      @click="fileUpload('bpg')">
-                                    <i class="el-icon-upload el-icon--right"></i>
-                                    点击上传
-                                  </el-button>
-                                </div>
+                                  <div style="display: flex;justify-content: space-between">
+                                      <div style="width: 80%;">
+                                          <div v-for="(item,index) in bpgFileList" :key="index" class="fileClass">{{ item.name }}</div>
+                                      </div>
+                                      <div style="width: 20%;">
+                                          <el-button
+                                                  type="primary"
+                                                  class="common-button-primary"
+                                                  size="mini"
+                                                  style="margin-left: 10px; margin-top: 11px; float: right;"
+                                                  @click="fileUpload('bpg')">
+                                              <i class="el-icon-upload el-icon--right"></i>
+                                          </el-button>
+                                      </div>
+                                  </div>
                               </el-form-item>
                               <el-form-item v-show="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
                                 <el-input
@@ -506,28 +450,21 @@
                                     v-model="form.zqyjgName"
                                     clearable
                                 ></el-input>
-                                <div v-if="zqyjgFileList.length>0">
-                                  <!--                                        {{ form.zqyjgName }}-->
-                                  <el-button
-                                      type="primary"
-                                      class="common-button-primary"
-                                      size="mini"
-                                      style="margin-left: 10px"
-                                      @click="fileUpload('zqyjg')">
-                                    <i class="el-icon-upload el-icon--right"></i>
-                                    查看已上传的文件
-                                  </el-button>
-                                </div>
-                                <div v-else>
-                                  <el-button
-                                      type="primary"
-                                      class="common-button-primary"
-                                      size="mini"
-                                      @click="fileUpload('zqyjg')">
-                                    <i class="el-icon-upload el-icon--right"></i>
-                                    点击上传
-                                  </el-button>
-                                </div>
+                                  <div style="display: flex;justify-content: space-between">
+                                      <div style="width: 80%;">
+                                          <div v-for="(item,index) in zqyjgFileList" :key="index" class="fileClass">{{ item.name }}</div>
+                                      </div>
+                                      <div style="width: 20%;">
+                                          <el-button
+                                                  type="primary"
+                                                  class="common-button-primary"
+                                                  size="mini"
+                                                  style="margin-left: 10px; margin-top: 11px; float: right;"
+                                                  @click="fileUpload('zqyjg')">
+                                              <i class="el-icon-upload el-icon--right"></i>
+                                          </el-button>
+                                      </div>
+                                  </div>
                               </el-form-item>
                             </el-col>
                         </el-row>
@@ -771,27 +708,20 @@
                                             v-model="form.glwjName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="glwjFileList.length>0">
-
-                                      <el-button
-                                          type="primary"
-                                          class="common-button-primary"
-                                          size="mini"
-                                          @click="fileUpload('glwj')">
-                                        <i class="el-icon-upload el-icon--right"></i>
-                                        查看已上传文件
-                                      </el-button>
-<!--                                        {{ form.glwjName }}-->
-                                    </div>
-                                    <div v-else>
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('glwj')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
+                                    <div style="display: flex;justify-content: space-between">
+                                        <div style="width: 80%;">
+                                            <div v-for="(item,index) in glwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
+                                        </div>
+                                        <div style="width: 20%;">
+                                            <el-button
+                                                    type="primary"
+                                                    class="common-button-primary"
+                                                    size="mini"
+                                                    style="margin-left: 10px; margin-top: 11px; float: right;"
+                                                    @click="fileUpload('glwj')">
+                                                <i class="el-icon-upload el-icon--right"></i>
+                                            </el-button>
+                                        </div>
                                     </div>
                                 </el-form-item>
                             </el-col>
@@ -2868,6 +2798,12 @@
         position: relative;
         overflow: hidden;
       }
+        .fileClass {
+            width: 100%;
+            overflow: hidden;
+            text-overflow:ellipsis;
+            white-space: nowrap;
+        }
       .prc-content-border {
         /deep/ .el-input__inner {
           padding-left: 30px;
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 344e5e8cb..9c9355a48 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -698,7 +698,6 @@
                       :disabled="formdisableflag"
                   ></custom-textarea>
                 </template>
-                <!--                起草单位-->
                 <template v-else-if="field.attrType === 'SEL_OPTION'">
                   <template>
                     <custom-select
@@ -717,7 +716,6 @@
                         class="add-form-item"
                     >
                       <template slot="label">责任部门</template>
-
                       <el-input
                           :key="field.attrField"
                           :config="field"
@@ -766,6 +764,34 @@
 <!--                      </el-input>-->
                     </el-form-item>
                   </template>
+                  <template v-else-if="field.attrField === 'QCDW'">
+                    <el-form-item
+                            prop="QCDW"
+                            label-width="150px"
+                            class="add-form-item"
+                    >
+                      <template slot="label">起草单位</template>
+                      <div style="display: flex;justify-content: space-between;align-items: center;">
+                        <el-tooltip class="item" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start">
+                          <el-input
+                                  :key="field.attrField"
+                                  :config="field"
+                                  clearable
+                                  v-model="sarStandardsInfoEO['QCDW']"
+                                  :disabled="formdisableflag" placeholder="选择或输入起草单位">
+                          </el-input>
+                        </el-tooltip>
+                        <div>
+                          <el-button
+                                  size="mini"
+                                  type="primary"
+                                  @click="QCDWClick(field.options)"
+                                  class="common-button-primary">手动查找</el-button>
+                        </div>
+                      </div>
+<!--                      @click.native="choiceZRBM('QCDWId', '起草单位', sarStandardsInfoEO.QCDWId)">-->
+                    </el-form-item>
+                  </template>
                   <template v-else>
                     <custom-select-array
                         :key="field.attrField"
@@ -1891,6 +1917,27 @@
         </div>
       </div>
     </el-drawer>
+    <el-dialog
+            :visible.sync="QCDWmodal"
+            width="500px"
+            title="选择起草部门"
+            destroy-on-close
+            :close-on-click-modal="false"
+            @closed="QCDWmodal = false">
+      <el-select v-model="QCDWValue" multiple filterable placeholder="请选择" style="width: 100%;">
+        <el-option
+                v-for="item in QCDWList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.label">
+        </el-option>
+      </el-select>
+      <div slot="footer" class="demo-drawer-footer">
+        <el-button size="mini" type="primary" class="common-button-default" icon="el-icon-check"
+                   @click="QCDWOK">确认
+        </el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -1947,6 +1994,9 @@ export default {
   },
   data() {
     return {
+      QCDWValue: [],
+      QCDWmodal: false,
+      QCDWList: [],
       OCRSubmitLoading: false,
       OCRSubmitButton: '',
       OCRType: '',
@@ -2651,6 +2701,21 @@ export default {
     }
   },
   methods: {
+    QCDWOK() {
+      let arr1 = []
+      if (this.sarStandardsInfoEO['QCDW']) {
+        let str = this.sarStandardsInfoEO['QCDW'].replace(/，/g, ',')
+        arr1 = str.split(',')
+      }
+      let arr2 = arr1.concat(this.QCDWValue)
+      this.sarStandardsInfoEO['QCDW'] = Array.from(new Set(arr2)).join(',')
+      this.QCDWmodal = false
+    },
+    QCDWClick(row) {
+      this.QCDWValue = []
+      this.QCDWmodal = true
+      this.QCDWList = row
+    },
     setWBType(type) {
       let text = ''
       for (let a = 0; a < this.OCRoptions.length; a++) {
@@ -3248,6 +3313,7 @@ export default {
               })
             })
             this.dynamicFormField = displayLocation
+            console.log(this.dynamicFormField);
             this.loading = false
           })
         })

From e3a5616fbdf947943b8750975d20c46b091be943 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 1 Dec 2021 19:01:28 +0800
Subject: [PATCH 38/38] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=AD=BB=E5=BE=AA=E7=8E=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/treeSelect/treeSelectModule.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/treeSelect/treeSelectModule.vue b/src/components/treeSelect/treeSelectModule.vue
index 4f5a0142d..30e0c8a03 100644
--- a/src/components/treeSelect/treeSelectModule.vue
+++ b/src/components/treeSelect/treeSelectModule.vue
@@ -177,7 +177,7 @@
 
                 if (node.level >= 1) {
                     setTimeout(() => {
-                        this.getChildByList(node.data.level,node.data.id, resolve);
+                        this.getChildByList(node.data.level,node.data.id,node.data.model, resolve);
                     }, 500);
                     return resolve([]); // 加上这个，防止在该节点没有子节点时一直转圈的问题发生。
                 }
@@ -194,8 +194,8 @@
                     }
                 })
             },
-            getChildByList( level,id,resolve) {     // 获取子节点请求
-                let params = {level : level,id :id,type : this.type};
+            getChildByList( level,id,model,resolve) {     // 获取子节点请求
+                let params = {level : level,id :id,type : this.type,model :model};
                 this.$http.get(this.urlChild, params, {
                     _this: this
                 }, res => {