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

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, //条款号

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: {

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

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

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

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,
@@ -423,7 +421,6 @@ export default {
     },
     //批量分发按钮
     choiceZRRS(row, type, index) {
-      console.log(row);
       this.selectedId = row.id || row.standId;
       this.type = type;
       if (type === 1) {
@@ -431,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 {
@@ -463,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 => {
@@ -543,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;
     }

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())
@@ -1712,14 +1713,21 @@ 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状态
     selectable(row) {
-      return row.isRelateAccess === '1'
+      console.log('1723',row)
+      return row.isRelateAccess === '1' || row.isRelateAccess === undefined
     },
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect(val) {

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: 'FOREIGN_LAWS', label: '国内外政策'},
-        // {value: 'BUSINESS', 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 =>{
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
-        this.sarAccessInfoSearchList = res.data.list
+        StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
-        this.sarAccessInfoSearchList.forEach(item => {
+          this.sarAccessInfoSearchList = res.data.list
-          if (item.standYear === null) {
+          this.sarAccessInfoSearchList.forEach(item => {
-            item.standNumber = item.standSortShow + ' ' + item.standNumber
+            if (item.standYear === null) {
-          } else {
+              item.standNumber = item.standSortShow + ' ' + item.standNumber
-            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+            } else {
-          }
+              item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
-          if (item.attrInfoMap === null) {
+            }
-            this.$set(item, 'zccssrqgj', '')
+            if (item.attrInfoMap === null) {
-            this.$set(item, 'xcxssrqgj', '')
+              this.$set(item, 'zccssrqgj', '')
-            this.$set(item, 'ssrq', '')
+              this.$set(item, 'xcxssrqgj', '')
-            this.$set(item, 'sycpx', '')
+              this.$set(item, 'ssrq', '')
-            this.$set(item, 'typeApplicable', '')
+              this.$set(item, 'sycpx', '')
-            this.$set(item, 'nylx', '')
+              this.$set(item, 'typeApplicable', '')
-            this.$set(item, 'zrbm', '')
+              this.$set(item, 'nylx', '')
-            this.$set(item, 'cycvppsbm', '')
+              this.$set(item, 'zrbm', '')
-            this.$set(item, 'cycvppscn', '')
+              this.$set(item, 'cycvppsbm', '')
-            this.$set(item, 'kccvppsbm', '')
+              this.$set(item, 'cycvppscn', '')
-            this.$set(item, 'kccvppscn', '')
+              this.$set(item, 'kccvppsbm', '')
-          }else {
+              this.$set(item, 'kccvppscn', '')
-            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
+            } else {
-            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+              this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
-            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
+              this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
-            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+              this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
-            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+              this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+              this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+              this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+              this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+              this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+              this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+              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
+      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){
-      }, e => {
+        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() {
@@ -1525,14 +1610,20 @@ 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状态
     selectable (row) {
-      return row.isRelateAccess === '1'
+      return row.isRelateAccess === '1' || row.isRelateAccess === undefined
     },
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect (val) {

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: 'FOREIGN_LAWS', label: '国内外政策'},
-        // {value: 'BUSINESS', 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 => {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
-        this.sarAccessInfoSearchList = res.data.list
+        StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
+          this.sarAccessInfoSearchList = res.data.list
 
-        //为空转换
+          //为空转换
-        for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
+          for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
-          //适用车型为空
+            //适用车型为空
-          if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){
+            if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){
-            this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null
+              this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null
+            }
+            //适用认证为空
+            if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){
+              this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null
+            }
           }
-          //适用认证为空
+          this.sarAccessInfoSearchList.forEach(item => {
-          if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){
+            if (item.standYear === null) {
-            this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null
+              item.standNumber = item.standSortShow + ' ' + item.standNumber
-          }
+            } else {
-        }
+              item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
-        this.sarAccessInfoSearchList.forEach(item => {
+            }
-          if (item.standYear === null) {
+            this.addWord(item)
-            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          })
-          } else {
+          this.changeText(this.sarAccessInfoSearchList)
-            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          this.drawerTotal = res.data.count
-          }
+        }, e => {
-          this.addWord(item)
         })
-        this.changeText(this.sarAccessInfoSearchList)
+      }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){
-        this.drawerTotal = res.data.count
+        this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
-      }, e => {
+          _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()
       }
     },
     /** 高级查询查询按钮*/
@@ -1601,14 +1686,20 @@ export default {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfo.standType = 'INLAND'
         this.selectPage()
-      } else {
+      } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
-        this.sarAccessInfo.standType = 'FOREIGN'
+        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状态
     selectable(row) {
-      return row.isRelateAccess === '1'
+      return row.isRelateAccess === '1' || row.isRelateAccess === undefined
     },
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect(val) {

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"
@@ -429,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">
@@ -437,12 +442,13 @@
                       :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">
                     <el-select
                       v-model="addForm.standSerialNumber"
+                      filterable
                       :disabled="serialNumber"
                       @change="standChange"
                       placeholder="请选择标准号">
@@ -460,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">
@@ -483,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">
@@ -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,
+            addUn(
-              productLine, productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime).then(res => {
+              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,
+            editUn(
-              productLine, productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime, id).then(res => {
+              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) {
+    getStandData(productId) {
-      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: val.id }, {
+      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.addForm = row
-      this.addFormEdit = 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.productId = val.id
-        this.addForm.productName = val.projectName
+      this.addForm.productLine = val.productLine
-        this.addForm.productType = val.projectPlatfor
+      this.addForm.productName = val.projectName
-        this.serialNumber = false
+      this.addForm.productType = val.projectPlatfor
-        this.getStandData(val)
+      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.getData()
-    this.$http.get("sys/dictype/getDicTypeListCode", "", {
-      _this: this
-    }, res => {
-      this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
-      this.getTableByPage();
-    }, e => {
-    });
     // 加载所有的部门
     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 {
@@ -1192,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 {
@@ -1214,14 +1205,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>