commit

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

@@ -480,6 +480,7 @@ export default {
         this.projectId = this.selectedList[0].id;
         this.listForm.projectNumber = this.selectedList[0].projectNumber;
         this.listForm.projectName = this.selectedList[0].projectName;
+        this.listForm.productLine = this.selectedList[0].productLine;
         this.getStandData();
         this.projectModel = false;
       }

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

@@ -478,6 +478,7 @@ export default {
         this.projectId = this.selectedList[0].id;
         this.listForm.projectNumber = this.selectedList[0].projectNumber;
         this.listForm.projectName = this.selectedList[0].projectName;
+        this.listForm.productLine = this.selectedList[0].productLine;
         this.getStandData();
         this.projectModel = false;
       }

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

@@ -335,7 +335,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);
@@ -394,6 +393,7 @@ export default {
         this.isSubmit = true;
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
+        console.log(json);
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -76,10 +76,14 @@
               width="260px"
           >
             <template slot-scope="scope">
-              <span
+              <span v-if="scope.row.standSortShow === undefined"
                   style="margin-left: 10px">{{
                   scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear
                 }}</span>
+              <span v-else
+                    style="margin-left: 10px">{{
+                  scope.row.standSortShow + ' ' + scope.row.standNumber + '-' + scope.row.standYear
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -222,7 +226,7 @@
             <el-table
               :data="sarAccessListDatas"
               tooltip-effect="dark"
-              style="width: 100%"
+              style="width: 100%; padding: 0 3px"
               border
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
@@ -230,11 +234,6 @@
               @selection-change="selectOne"
               ref="selection"
             >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center">
-              </el-table-column>
               <el-table-column
                 prop="carType"
                 label="车型类别"
@@ -701,50 +700,67 @@ export default {
       this.standModel = false;
     },
     //添加标准确定事件
-    okStand() {
+    okStand(){
-      let _this = this;
+     if(this.standList.length > 0){
-      if (this.standList.length < 1) {
+       this.standList.forEach(item => {
-        _this.$message.warning("请选择标准");
+         let addIndex
-      } else {
+         addIndex = this.dataList.findIndex(items => {
-        for (let i = 0; i < this.dataList.length; i++) {
+           return items.standId === item.id
-          let newStand = false;
+         })
-          for (let j = 0; j < this.standList.length; j++) {
+         if(addIndex > -1){
-            if (this.standList[j].id == this.dataList[i].standId) {
+           this.$message.warning('请勿重复添加数据')
-              newStand = true;
+         }else{
-              this.standList.splice(j, 1)
+           this.dataList.push(item)
-              j--
+         }
-            }
+       })
-          }
+     }else{
-          if (newStand) {
+       this.$message.warning('请至少选择一条数据进行添加')
-            _this.$message.warning("请勿重复添加数据");
+     }
-          } else {
-            // _this.dataList.push(item);
-          }
-        }
-        this.standardData = []
-        _this.standModel = false;
-        for (var i = 0; i < this.standList.length; i++) {
-          this.standList1.push({
-            standId: this.standList[i].id,
-            projectId: this.localProEO.id
-          })
-        }
-        if (this.standList1 != '') {
-          this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
-            _this: this
-          }, res => {
-            if (res.ok) {
-              // this.$message.success(res.message)
-              this.getDataList()
-            }
-          }, e => {
-          });
-        }
-        this.standList = []
-        this.standList1 = []
-        _this.standModel = false;
-      }
     },
+    // okStand() {
+    //   let _this = this;
+    //   if (this.standList.length < 1) {
+    //     _this.$message.warning("请选择标准");
+    //   } else {
+    //     for (let i = 0; i < this.dataList.length; i++) {
+    //       let newStand = false;
+    //       for (let j = 0; j < this.standList.length; j++) {
+    //         if (this.standList[j].id == this.dataList[i].standId) {
+    //           newStand = true;
+    //           this.standList.splice(j, 1)
+    //           j--
+    //         }
+    //       }
+    //       if (newStand) {
+    //         _this.$message.warning("请勿重复添加数据");
+    //       } else {
+    //         // _this.dataList.push(item);
+    //       }
+    //     }
+    //     this.standardData = []
+    //     _this.standModel = false;
+    //     for (var i = 0; i < this.standList.length; i++) {
+    //       this.standList1.push({
+    //         standId: this.standList[i].id,
+    //         projectId: this.localProEO.id
+    //       })
+    //     }
+    //     if (this.standList1 != '') {
+    //       this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
+    //         _this: this
+    //       }, res => {
+    //         if (res.ok) {
+    //           // this.$message.success(res.message)
+    //           this.getDataList()
+    //         }
+    //       }, e => {
+    //       });
+    //     }
+    //     this.standList = []
+    //     this.standList1 = []
+    //     _this.standModel = false;
+    //   }
+    // },
     //获取标准
     getStandrd(data){
       this.detailedId = data.id
@@ -763,6 +779,14 @@ export default {
           this.standModel = true;
         }
         this.standardData = res.data.records
+        this.standardData.forEach(item => {
+          if(item.zccssrqgj === '-'){
+            item.zccssrqgj = ''
+          }
+          if(item.xcxssrqgj === '-'){
+            item.xcxssrq = ''
+          }
+        })
         this.totalDo = res.data.total
         this.standModel = true;
       })