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

src/pages/details/complianceDetails/index.vue

@@ -134,7 +134,17 @@ export default {
         }, res => {
           if (res.ok) {
             this.fit = res.data.fit.records
+            this.fit.forEach(item => {
+              if(item.standardItem){
+                  item.standNumber = item.standardItem
+              }
+            })
             this.unfit = res.data.unfit.records
+            this.unfit.forEach(item => {
+              if(item.standardItem){
+                item.standNumber = item.standardItem
+              }
+            })
           } else {
             this.$message.warning(res.message)
           }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -564,12 +564,12 @@ export default {
           this.newDataList = this.fileTextList
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.fileListData.fileText = this.newDataList

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue

@@ -535,12 +535,12 @@ export default {
           this.newDataList = this.fillFileList
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.rh_pageData.fillFile = this.newDataList

src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue

@@ -375,12 +375,12 @@ export default {
           this.newDataList = this.reData
             this.newDataList.push({
               id: res.data.attId,
-              name: res.data.standName
+              name: res.data.name
           })
         } else {
             this.newDataList.push({
               id: res.data.attId,
-              name: res.data.standName
+              name: res.data.name
             })
         }
 
@@ -449,12 +449,12 @@ export default {
           this.newThemeFile = this.themeData
           this.newThemeFile.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.themeDataList.meetingFile = this.newThemeFile
@@ -510,12 +510,12 @@ export default {
           this.newOtherFile = this.hh_pageData.otherFileList
           this.newOtherFile.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newOtherFile.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.hh_pageData.otherFileList = this.newOtherFile

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -487,12 +487,12 @@ export default {
           this.newDataList = this.ch_pageData.fileTextList
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         } else {
           this.newDataList.push({
             id: res.data.attId,
-            name: res.data.standName
+            name: res.data.name
           })
         }
         this.ch_pageData.fileTextList = this.newDataList

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

@@ -593,7 +593,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -796,7 +796,7 @@ export default {
       ListModel: false, //选择清单抽屉状态
       standModel: false, // 选择标准抽屉状态
       active: "1",
-      signFlag: "1",   //是否会签 1为会签 2为不会签
+      signFlag: "",   //是否会签 1为会签 2为不会签
       listType: "country",  //选择的清单类型
       isSubmit: false,
       saveLoading: false,
@@ -818,7 +818,7 @@ export default {
         model: "", // 上传模板
         modelName: "",
         standId: "", //选择的清单的id
-        signFlag: "1",  //是否会签  1为会签 2为不会签
+        signFlag: "",  //是否会签  1为会签 2为不会签
         inforlist: " ", //用来存放标准列表的标准id
         dataList: [{
           code: "", //标准号
@@ -865,6 +865,7 @@ export default {
           this.fileInfoList.push(itemId)
           this.getFileInfo();
         });
+        this.signFlag = mes.form.signFlag
         this.listForm = mes.form;
         this.dataList = mes.form.dataList;
         this.roleForm = mes.roleForm;
@@ -938,9 +939,9 @@ export default {
     //判断当前是否会签
     selectSign(type) {
       if (type === "1") {
-        this.listForm.signFlag = 1;
+        this.listForm.signFlag = '1';
       } else if (type == "2") {
-        this.listForm.signFlag = 2;
+        this.listForm.signFlag = '2';
       }
     },
     queryDetailsData() {
@@ -1595,5 +1596,9 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue

@@ -101,25 +101,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -181,7 +175,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -319,18 +312,12 @@
                 prop="XCXSSRQ"
                 align="center"
                 label="新车型实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
                 prop="ZCCSSRQ"
                 align="center"
                 label="在产车实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
@@ -527,13 +514,8 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
-            this.$set(item, "ZCCSSRQ", '');
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
-            this.$set(item, "XCXSSRQ", '');
-          }else{
-            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-          }
         })
         this.totalNo = res.data.count;
       }, e => {

src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue

@@ -97,25 +97,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -177,7 +171,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

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

@@ -563,7 +563,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="90%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -870,9 +870,9 @@ export default {
     //判断当前是否会签
     selectSign(type) {
       if (type === "1") {
-        this.listForm.signFlag = 1;
+        this.listForm.signFlag = '1';
       } else if (type == "2") {
-        this.listForm.signFlag = 2;
+        this.listForm.signFlag = '2';
       }
     },
     queryDetailsData() {
@@ -1528,5 +1528,9 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>

src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue

@@ -97,25 +97,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -177,7 +171,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue

@@ -116,25 +116,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -196,7 +190,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -293,7 +286,7 @@
               style="width: 100%"
               border
               ref="table"
-              height="100%"
+              class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @selection-change="selectThree"
@@ -338,18 +331,12 @@
                 prop="XCXSSRQ"
                 align="center"
                 label="新车型实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
                 prop="ZCCSSRQ"
                 align="center"
                 label="在产车实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
@@ -595,13 +582,8 @@ export default {
         this.standardData = res.data.list;
         this.loading = false
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
-            this.$set(item, "ZCCSSRQ", '');
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
-            this.$set(item, "XCXSSRQ", '');
-          }else{
-            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-          }
         })
         this.totalNo = res.data.count;
       }, e => {
@@ -994,6 +976,10 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
 

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

@@ -98,25 +98,19 @@
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
             label="发布日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="XCXSSRQ"
-            sortable
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
-            sortable
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -178,7 +172,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue

@@ -365,6 +365,7 @@ export default {
       this.rowDutyPeople = val
       this.nodeList = []
       this.nodeList.push(id)
+      this.drawerTitle = '选择分发责任人'
       this.modalshowflag = true
     },
     // 选择勾选项的集合

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

@@ -116,7 +116,6 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
           </el-table-column>
           <el-table-column
@@ -128,7 +127,6 @@
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
           </el-table-column>

src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue

@@ -93,22 +93,16 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
             <el-table-column
               prop="complianceReasons"
@@ -208,7 +202,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue

@@ -86,7 +86,6 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
@@ -104,7 +103,6 @@
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
             <template slot-scope="scope">
@@ -169,7 +167,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

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

@@ -126,7 +126,6 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
           </el-table-column>
           <el-table-column
@@ -138,7 +137,6 @@
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
           </el-table-column>

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

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -100,18 +99,12 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--            prop="productType"-->

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

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -100,18 +99,12 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--            prop="productType"-->
@@ -456,7 +449,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);

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

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -100,18 +99,12 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--            prop="productType"-->

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

@@ -86,30 +86,19 @@
             prop="ssrq"
             width="190px"
             align="center"
-            sortable
             label="标准实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="xcxssrq"
             width="190px"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             align="center"
-            sortable
             width="190px"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zrbm"
@@ -169,7 +158,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

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

@@ -98,11 +98,19 @@
           <el-table-column
             prop="ssrq"
             align="center"
-            sortable
             label="标准实施日期">
-            <template slot-scope="scope">
+          </el-table-column>
-              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+          <el-table-column
-            </template>
+            prop="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            width="190px"
+            label="在产车实施日期">
           </el-table-column>
           <el-table-column
             prop="zrbm"
@@ -161,7 +169,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

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

@@ -96,11 +96,19 @@
           <el-table-column
             prop="ssrq"
             align="center"
-            sortable
             label="标准实施日期">
-            <template slot-scope="scope">
+          </el-table-column>
-              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+          <el-table-column
-            </template>
+            prop="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            width="190px"
+            label="在产车实施日期">
           </el-table-column>
           <el-table-column
             prop="zrbm"
@@ -169,7 +177,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>

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

@@ -52,7 +52,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -109,18 +108,12 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <!--          <el-table-column-->
           <!--            prop="productType"-->
@@ -804,7 +797,7 @@ 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 ){
+            if(item.workPeopleId === this.$store.getters.userInfo.userId ){
                 this.dataList.push(item)
             }
               item.children.forEach(items=> {

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

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -95,23 +94,18 @@
             align="center"
             label="条款名称">
           </el-table-column>
+
           <el-table-column
             prop="xcxssrq"
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
             <el-table-column
               prop="complianceReasons"

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

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -100,18 +99,12 @@
                   width="200"
                   align="center"
                   label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
                   prop="zccssrq"
                   width="200"
                   align="center"
                   label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--                  prop="productType"-->

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

@@ -45,7 +45,6 @@
         <el-table
           :data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
-          row-key="standId"
           height="70%"
           border
           highlight-current-row
@@ -100,18 +99,12 @@
             width="200"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             prop="zccssrq"
             width="200"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
 <!--          <el-table-column-->
 <!--            prop="productType"-->

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -368,7 +368,7 @@
             align="center"
             label="适用产品线">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
             show-overflow-tooltip
             prop="cycvppsbm"
             width="210px"
@@ -395,7 +395,7 @@
             align="center"
             width="210px"
             label="卡车VPPS中文名称">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column width="240" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
@@ -463,6 +463,7 @@
 
     <el-drawer
         title="编辑清单条目"
+        :before-close='cancelInfo'
         :visible.sync="drawerEdit"
         :wrapperClosable="false"
         size="800px"
@@ -486,7 +487,7 @@
         <el-form-item label="标准实施日期" prop="putTime">
           <el-date-picker
               v-model.trim="editRowData.ssrq"
-              type="date"
+              type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
@@ -494,7 +495,7 @@
         <el-form-item label="在产车实施日期" prop="zccssrqgj">
           <el-date-picker
               v-model.trim="editRowData.zccssrqgj"
-              type="date"
+              type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
@@ -502,7 +503,7 @@
         <el-form-item label="新车型实施日期" prop="xcxssrqgj">
           <el-date-picker
               v-model.trim="editRowData.xcxssrqgj"
-              type="date"
+              type="dates"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
           </el-date-picker>
@@ -513,7 +514,7 @@
         <el-form-item label="适用产品线" prop="sycpx">
           <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
           <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
         </el-form-item>
         <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
@@ -524,7 +525,7 @@
         </el-form-item>
         <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
           <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
@@ -914,6 +915,7 @@ export default {
       allSelectOptions: {},
       dynamicFormField: [], // 动态数据
       uuid: '',
+      rowList: {}
     }
   },
   created() {
@@ -1257,7 +1259,6 @@ 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()
@@ -1294,18 +1295,41 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standNumber
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
+      }
+      if (this.editRowData.zccssrqgj !== null) {
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null) {
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+      }
       this.drawerEdit = true
     },
     // 抽屉取消按钮
     cancelInfo() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editRowData.ssrq = Item.ssrq
+      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
-      this.rowList = this.editRowData
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null){
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+      }
+      if (this.editRowData.zccssrqgj !== null){
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+      }
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
@@ -1377,23 +1401,25 @@ export default {
             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())
+              rowlist1.push(this.sarAccessInfoList[i].ssrq)
             }
             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())
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
             }
             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())
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
             }
           }
+          console.log(rowlist1)
           rowlist = rowlist.join(',')
-          rowlist1 = rowlist1.join(',')
+          rowlist1 = rowlist1.join(';')
-          rowlist2 = rowlist2.join(',')
+          console.log(rowlist1)
-          rowlist3 = rowlist3.join(',')
+          rowlist2 = rowlist2.join(';')
+          rowlist3 = rowlist3.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = rowlist
           sarAccessEO.inforlist1 = rowlist1
@@ -1586,7 +1612,6 @@ export default {
     //   })
     // },
     pageInfo() {
-      console.log('1598',this.sarAccessInfoSearch)
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
           this.sarAccessInfoSearchList = res.data.list
@@ -1629,7 +1654,6 @@ export default {
         this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
           _this: this,
         }, res => {
-          console.log('1640',res)
           this.sarAccessInfoSearchList = res.data.list
           this.drawerTotal = res.data.count
         }, e => {
@@ -2433,6 +2457,9 @@ export default {
     background: #ffffff;
     text-align: right;
   }
+  /deep/.el-date-editor.el-input {
+    width: 100%;
+  }
 }
 
 .labelBox {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -180,12 +180,6 @@
             width="210px"
             align="center"
             label="在产车实施日期">
-            <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>
-            </template>
           </el-table-column>
           <el-table-column
             prop="xcxssrqgj"
@@ -193,12 +187,6 @@
             align="center"
             width="210px"
             label="新车型实施日期">
-            <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>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -214,34 +202,6 @@
             align="center"
             label="适用产品线">
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="cycvppsbm"
-            width="210px"
-            align="center"
-            label="乘用车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="cycvppscn"
-            width="210px"
-            align="center"
-            label="乘用车VPPS中文名称">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppsbm"
-            align="center"
-            width="210px"
-            label="卡车VPPS编码">
-          </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            prop="kccvppscn"
-            align="center"
-            width="210px"
-            label="卡车VPPS中文名称">
-          </el-table-column>
         </el-table>
         <pagination :page="standardForm.page" :total="standardFormTotal" @pageChange="pageChange"
                     @pageSizeChange="pageSizeChange"></pagination>

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -341,7 +341,7 @@
           align="center"
           label="适用产品线">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
           show-overflow-tooltip
           prop="cycvppsbm"
           width="210px"
@@ -368,7 +368,7 @@
           align="center"
           width="210px"
           label="卡车VPPS中文名称">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column width="240" align="center"  fixed="right"  label="操作">
           <template slot-scope="scope">
             <el-button
@@ -430,6 +430,7 @@
       title="编辑清单条目"
       :visible.sync="drawerEdit"
       :wrapperClosable="false"
+      :before-close='cancelInfo'
       size="800px"
     >
       <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
@@ -478,7 +479,7 @@
         <el-form-item label="适用产品线" prop="sycpx">
           <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
           <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
         </el-form-item>
         <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
@@ -489,7 +490,7 @@
         </el-form-item>
         <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
           <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
@@ -1228,18 +1229,41 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standNumber
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
+      }
+      if (this.editRowData.zccssrqgj !== null) {
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null) {
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+      }
       this.drawerEdit = true
     },
     // 抽屉取消按钮
     cancelInfo() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editRowData.ssrq = Item.ssrq
+      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
-      this.rowList = this.editRowData
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null){
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+      }
+      if (this.editRowData.zccssrqgj !== null){
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+      }
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
@@ -1324,9 +1348,9 @@ export default {
             }
           }
           rowlist = rowlist.join(',')
-          rowlist1 = rowlist1.join(',')
+          rowlist1 = rowlist1.join(';')
-          rowlist2 = rowlist2.join(',')
+          rowlist2 = rowlist2.join(';')
-          rowlist3 = rowlist3.join(',')
+          rowlist3 = rowlist3.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = rowlist
           sarAccessEO.inforlist1 = rowlist1

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -399,7 +399,7 @@
             align="center"
             label="适用产品线">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column
             show-overflow-tooltip
             prop="cycvppsbm"
             width="210px"
@@ -426,7 +426,7 @@
             align="center"
             width="210px"
             label="卡车VPPS中文名称">
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column width="240" align="center" fixed="right" label="操作">
           <template slot-scope="scope">
             <el-button
@@ -494,6 +494,7 @@
     <el-drawer
         title="编辑清单条目"
         :visible.sync="drawerEdit"
+        :before-close='cancelInfo'
         :wrapperClosable="false"
         size="800px"
     >
@@ -543,7 +544,7 @@
         <el-form-item label="适用产品线" prop="sycpx">
           <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+<!--        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
           <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
         </el-form-item>
         <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
@@ -554,7 +555,7 @@
         </el-form-item>
         <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
           <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
-        </el-form-item>
+        </el-form-item>-->
       </el-form>
       <div class="demo-drawer-footer">
         <el-button
@@ -1227,18 +1228,40 @@ export default {
     },
     // 编辑按钮
     editTghisRow(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standNumber
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.split(',')
+      }
+      if (this.editRowData.zccssrqgj !== null) {
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null) {
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(',')
+      }
       this.drawerEdit = true
     },
     // 抽屉取消按钮
     cancelInfo() {
+      let Item = JSON.parse(localStorage.getItem('obj'))
+      this.editRowData.ssrq = Item.ssrq
+      this.editRowData.xcxssrqgj = Item.xcxssrqgj
+      this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
-      this.rowList = this.editRowData
+      if (this.editRowData.ssrq !== null) {
+        this.editRowData.ssrq = this.editRowData.ssrq.join(',')
+      }
+      if (this.editRowData.xcxssrqgj !== null){
+        this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.join(',')
+      }
+      if (this.editRowData.zccssrqgj !== null){
+        this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.join(',')
+      }
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
@@ -1324,9 +1347,9 @@ export default {
             }
           }
           rowlist = rowlist.join(',')
-          rowlist1 = rowlist1.join(',')
+          rowlist1 = rowlist1.join(';')
-          rowlist2 = rowlist2.join(',')
+          rowlist2 = rowlist2.join(';')
-          rowlist3 = rowlist3.join(',')
+          rowlist3 = rowlist3.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = rowlist
           sarAccessEO.inforlist1 = rowlist1

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -17,7 +17,7 @@
               :indent="0"
               :props="props"
               :data="treeList"
-              default-expanded-keys="['2']"
+              :default-expanded-keys="['2']"
               highlight-current
               @node-click="treeClick"
               :filter-node-method="filterNode">
@@ -49,7 +49,6 @@
                     </span>
               </span>
             </el-tree>
-
           </el-card>
         </div>
       </div>

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -440,7 +440,7 @@
                       :disabled="true"
                       v-model="addForm.productType"
                       placeholder="请输入产品类型"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -448,7 +448,7 @@
                       :disabled="true"
                       v-model="addForm.productLine"
                       placeholder="请输入产品线"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -472,7 +472,7 @@
                       :disabled="true"
                       v-model="addForm.standName"
                       placeholder="请输入标准名称"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="itemsNum" label="条款号" style="width: 100%; margin-right:10px"
                                 class="add-form-item add-input">
@@ -495,7 +495,7 @@
                       v-model="addForm.responsibleUnit"
                       placeholder="请输入责任部门"
                       @click.native="choiceZRBM"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -510,7 +510,7 @@
                       v-model="addForm.dutyEngineer"
                       placeholder="请输入责任工程师"
                       @click.native="choiceZRR"
-                      />
+                    />
                   </el-form-item>
                   <el-form-item prop="authEngineer" label="认证工程师" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
@@ -518,7 +518,7 @@
                       v-model="addForm.authEngineer"
                       placeholder="请输入认证工程师"
                       @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">
@@ -526,7 +526,7 @@
                       v-model="addForm.qaEngineer"
                       placeholder="请输入质量工程师"
                       @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">