修复bug

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

@@ -103,7 +103,6 @@
           </el-table-column>
           <el-table-column
             prop="code"
-            fixed="left"
             width="180px"
             align="center"
             label="标准号">
@@ -128,20 +127,20 @@
             label="发布日期">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="XCXSSRQ"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrqgj"
+            prop="ZCCSSRQ"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -150,6 +149,9 @@
             align="center"
             width="120px"
             label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -324,26 +326,13 @@
               }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="applicationScope"
-                label="适用领域"
-                align="center">
-                <template slot-scope="scope">
-            <span
-              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-                </template>
-              </el-table-column>
               <el-table-column
                 prop="updateTime"
                 label="更新时间"
                 sortable
                 align="center">
                 <template slot-scope="scope">
-                  <div>
+                  <span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
-                    }}
-                  </div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -569,7 +558,7 @@
                     class="common-button-primary"
                     size="small"
                     v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
-                    @click="addList">
+                    @click="getStandData">
                     查询
                   </el-button>
                 </el-form-item>
@@ -601,7 +590,6 @@
               </el-table-column>
               <el-table-column
                 prop="code"
-                fixed="left"
                 align="center"
                 label="标准号">
                 <template slot-scope="scope">
@@ -624,22 +612,25 @@
                 prop="issueTime"
                 align="center"
                 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="xcxssrqgj"
+                prop="XCXSSRQ"
                 align="center"
                 label="新车型实施日期">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
                 </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
-                prop="zccssrqgj"
+                prop="ZCCSSRQ"
                 align="center"
                 label="在产车实施日期">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -647,6 +638,9 @@
                 prop="textStatus"
                 align="center"
                 label="文本状态">
+                <template slot-scope="scope">
+                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -758,7 +752,7 @@ export default {
         directorUser: "",
         dockUserName: "",
         ministerUserName: "",
-        directorUserName: "",
+        directorUserName: ""
       },
       formRules: {
         listType: [
@@ -807,26 +801,26 @@ export default {
       listForm: {
         listType: "", //区分是哪个清单
         listName: "", //清单名称
-        // applyRegion: "", //适用区域
         descriptionList: "", //清单说明
         fileId: "",
         model: "", // 上传模板
         modelName: "",
         standId: "", //选择的清单的id
         signFlag: "1",  //是否会签  1为会签 2为不会签
-        inforlist: "", //用来存放标准列表的标准id
+        inforlist: " ", //用来存放标准列表的标准id
         dataList: [{
           code: "", //标准号
           standName: "", //标准名称
           issueTime: "", //发布日期
-          xcxssrqgj: "", //新车型实施日期
+          XCXSSRQ: "", //新车型实施日期
-          zccssrqgj: "", //在产车实施日期
+          ZCCSSRQ: "", //在产车实施日期
           textStatus: "", //文本状态
           id: ""
         }]
       },
       choiceForm: {}, //选择标准清单列表
       // countryOptions: [], //适用区域下拉框数据
+      standStateOptions: [],
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -844,7 +838,8 @@ export default {
       user3: "",
       user4: "",
       user5: "",
-      standMap: new Map()
+      standMap: new Map(),
+      textStatusMap: {}// 文本状态id与name对应
     };
   },
   methods: {
@@ -974,10 +969,9 @@ export default {
         standType: "",
         standNumber: ""
       };
-      this.addList();
+      this.getStandData();
     },
-    //点击添加事件
+    getStandData() {
-    addList() {
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
         standType: this.standardSearch.standType,
         standNumber: this.standardSearch.standNumber,
@@ -988,12 +982,21 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
+    //点击添加事件
+    addList() {
       this.standModel = true;
     },
     // 点击批量删除事件
@@ -1032,7 +1035,7 @@ export default {
       _formData.append("createUserName", this.$store.getters.userInfo.userName);
       _formData.append("prcType", "4");
       _formData.append("json", JSON.stringify({
-        form: this.form,
+        form: this.listForm,
         roleForm: this.roleForm,
         commentText: this.commentText
       }));
@@ -1049,38 +1052,37 @@ export default {
       if (this.dataList.length < 1) {
         this.$message.warning("标准不能为空");
       } else {
-        var json = Object.assign(this.listForm, this.roleForm)
+        var json = Object.assign(this.listForm, this.roleForm);
-        console.log(json);
+        this.$refs["qdfbForm"].validate((valid) => {
-        // this.$refs["qdfbForm"].validate((valid) => {
+          if (valid) {
-        //   if (valid) {
+            this.$refs["Form"].validate((valid) => {
-        //     this.$refs["Form"].validate((valid) => {
+              if (valid) {
-        //       if (valid) {
+                this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
-        //         this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
+                  _this: this
-        //           _this: this
+                }, res => {
-        //         }, res => {
+                  if (res.ok) {
-        //           if (res.ok) {
+                    this.$http.post("lawss/activiti/completeTask", {
-        //             this.$http.post("lawss/activiti/completeTask", {
+                      taskIds: res.data,
-        //               taskIds: res.data,
+                      userId: this.$store.getters.userInfo.userId,
-        //               userId: this.$store.getters.userInfo.userId,
+                      json: JSON.stringify(json)
-        //               json: JSON.stringify(json)
+                    }, {
-        //             }, {
+                      _this: this
-        //               _this: this
+                    }, res => {
-        //             }, res => {
+                      if (res.success) {
-        //               if (res.success) {
+                        this.$message.success(res.message);
-        //                 this.$message.success(res.message);
+                        this.$router.push("/processCenter");
-        //                 this.$router.push("/processCenter");
+                      }
-        //               }
+                    });
-        //             });
+                  }
-        //           }
+                });
-        //         });
+              } else {
-        //       } else {
+                return this.$message.warning("请完善人员信息");
-        //         return this.$message.warning("请完善人员信息");
+              }
-        //       }
+            });
-        //     });
+          } else {
-        //   } else {
+            return this.$message.warning("请完善基础信息");
-        //     return this.$message.warning("请完善基础信息");
+          }
-        //   }
+        });
-        // });
       }
     },
     // 删除上传的文件
@@ -1101,16 +1103,24 @@ export default {
     uploadBackSuccess(res, file, fileList) {
       if (res.ok) {
         let middle = [];
-        // let fids = [];
         fileList.forEach(item => {
           middle.push(item.name);
-          // fids.push(item.response.data.attId)
         });
         this.fileListName = middle;
         this.fileIds.push(file.response.data.id);
-        // this.listForm.fileId = this.listForm.fileId + ',' + fids.join(',')
+        // this.listForm.fileName =  this.fileListName.join(',');
-        // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
+        // this.listForm.fileId = this.fileIds.join(',');
-        // this.$message.success('上传成功')
+        // if (this.listForm.fileName === null || this.listForm.fileName === undefined) {
+        //   this.listForm.fileName = this.fileListName.join(",");
+        // } else {
+        //   this.listForm.fileName = this.listForm.fileName + "," + this.fileListName.join(",");
+        // }
+        // if (this.listForm.fileId === null || this.listForm.fileId === undefined) {
+        //   this.listForm.fileId = this.fileIds.join(",");
+        // } else {
+        //   this.listForm.fileId = this.listForm.fileId + "," + this.fileIds.join(",");
+        // }
+        this.$message.success("上传成功");
       } else {
         this.$message.error(res.message);
         fileList.pop();
@@ -1173,6 +1183,7 @@ export default {
       var index1 = filename.lastIndexOf(".");
       var index2 = filename.length;
       var fileSuffix = filename.substring(index1, index2);
+      // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
       if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
         || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
@@ -1209,29 +1220,32 @@ export default {
     },
     //添加标准确定事件
     okStand() {
-      let _this = this;
       if (this.standList.length < 1) {
-        _this.$message.warning("请选择需要添加进清单的数据");
+        this.$message.warning("请选择需要添加进清单的数据");
       } else {
-        let exits = []
+        let exits = [];
-        _this.standList.map(item => {
+        this.standList.map(item => {
           let newStand = false;
-          for (let itemKey of _this.dataList) {
+          for (let itemKey of this.dataList) {
             if (item.id == itemKey.id) {
               newStand = true;
               break;
             }
           }
           if (newStand) {
-            _this.$message.warning("请勿重复添加数据");
+            this.$message.warning("请勿重复添加数据");
           } else {
-            _this.dataList.push(item);
+            this.dataList.push(item);
-            exits.push(item.id)
+            exits.push(item.id);
           }
         });
-        this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
+        if (this.listForm.inforlist === null || this.listForm.inforlist === undefined || this.listForm.inforlist === "") {
+          this.listForm.inforlist = exits.join(",");
+        } else {
+          this.listForm.inforlist = this.listForm.inforlist + "," + exits.join(",");
+        }
         this.standardData = [];
-        _this.standModel = false;
+        this.standModel = false;
       }
     },
     //选择清单确定事件
@@ -1247,25 +1261,26 @@ export default {
         }
         this.listForm.standId = bringData[0].id;
         this.listForm.listName = bringData[0].detailedListName;
-        this.listForm.applyRegion = bringData[0].applicationScope;
         this.listForm.descriptionList = bringData[0].remark;
-        this.listForm.fileId = bringData[0].fileId;
+        this.listForm.fileId = bringData[0].fileIds;
+        this.listForm.fileName = bringData[0].fileName;
         this.ListModel = false;
-        this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: bringData[0].id }, {
+        this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
-          _this: this
+          { id: bringData[0].id, page: this.page, Size: this.pageSize }, {
-        }, res => {
+            _this: this
-          if (res.data == null) {
+          }, res => {
-            res.data = [];
+            if (res.data == null) {
-          }
+              res.data = [];
-          this.dataList = res.data;
+            }
-          this.listForm.dataList = res.data;
+            this.dataList = res.data;
-          let formId = [];
+            this.listForm.dataList = res.data;
-          this.dataList.map(item => {
+            let formId = [];
-            formId.push(item.id);
+            this.dataList.map(item => {
+              formId.push(item.id);
+            });
+            this.listForm.inforlist = formId.join(",");
+          }, e => {
           });
-          this.listForm.inforlist = formId.join(",");
-        }, e => {
-        });
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");
       } else {
@@ -1320,11 +1335,11 @@ export default {
     },
     pageChangeNo(page) {
       this.pageNo = page;
-      this.addList();
+      this.getStandData();
     },
     pageSizeChangeNo(pageSize) {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
-      this.addList();
+      this.getStandData();
 
     }
   },
@@ -1336,10 +1351,13 @@ export default {
       _this: this
     }, res => {
       this.countryOptions = res.data.COUNTRY;
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.standStateOptions);
     });
     this.selectionList();
     this.selectSign();
     this.getTree();
+    this.getStandData();
     for (let i = 0; i < this.dataList.length; i++) {
       this.standMap.set(this.dataList[i].id, this.dataList[i]);
     }
@@ -1359,6 +1377,40 @@ export default {
     }
   }
 
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+
   .choiceBtn {
     .el-button--primary {
       width: 150px;

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

@@ -127,20 +127,20 @@
             label="发布日期">
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="XCXSSRQ"
             align="center"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrqgj"
+            prop="ZCCSSRQ"
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -149,6 +149,9 @@
             align="center"
             width="120px"
             label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -329,7 +332,7 @@
                 sortable
                 align="center">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -555,7 +558,7 @@
                     class="common-button-primary"
                     size="small"
                     v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
-                    @click="addList">
+                    @click="getStandData">
                     查询
                   </el-button>
                 </el-form-item>
@@ -610,24 +613,24 @@
                 align="center"
                 label="发布日期">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
                 </template>
               </el-table-column>
               <el-table-column
-                prop="xcxssrqgj"
+                prop="XCXSSRQ"
                 align="center"
                 label="新车型实施日期">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
                 </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
-                prop="zccssrqgj"
+                prop="ZCCSSRQ"
                 align="center"
                 label="在产车实施日期">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -635,6 +638,9 @@
                 prop="textStatus"
                 align="center"
                 label="文本状态">
+                <template slot-scope="scope">
+                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -746,7 +752,7 @@ export default {
         directorUser: "",
         dockUserName: "",
         ministerUserName: "",
-        directorUserName: "",
+        directorUserName: ""
       },
       formRules: {
         listType: [
@@ -806,14 +812,15 @@ export default {
           code: "", //标准号
           standName: "", //标准名称
           issueTime: "", //发布日期
-          xcxssrqgj: "", //新车型实施日期
+          XCXSSRQ: "", //新车型实施日期
-          zccssrqgj: "", //在产车实施日期
+          ZCCSSRQ: "", //在产车实施日期
           textStatus: "", //文本状态
           id: ""
         }]
       },
       choiceForm: {}, //选择标准清单列表
       // countryOptions: [], //适用区域下拉框数据
+      standStateOptions: [],
       standardTypeOptions: [
         {
           value: "INLAND",
@@ -831,7 +838,8 @@ export default {
       user3: "",
       user4: "",
       user5: "",
-      standMap: new Map()
+      standMap: new Map(),
+      textStatusMap: {}// 文本状态id与name对应
     };
   },
   methods: {
@@ -949,10 +957,9 @@ export default {
         standType: "",
         standNumber: ""
       };
-      this.addList();
+      this.getStandData();
     },
-    //点击添加事件
+    getStandData() {
-    addList() {
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
         standType: this.standardSearch.standType,
         standNumber: this.standardSearch.standNumber,
@@ -963,12 +970,26 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          if(item.attrInfoMap === null){
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+              this.$set(item, "ZCCSSRQ", '');
+              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 => {
       });
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
+    //点击添加事件
+    addList() {
       this.standModel = true;
     },
     // 点击批量删除事件
@@ -1024,8 +1045,7 @@ export default {
       if (this.dataList.length < 1) {
         this.$message.warning("标准不能为空");
       } else {
-        var json = Object.assign(this.listForm, this.roleForm)
+        var json = Object.assign(this.listForm, this.roleForm);
-        console.log(json);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
             this.$refs["Form"].validate((valid) => {
@@ -1066,10 +1086,8 @@ export default {
         middle.push(item.name);
         files.push(item.response.data.id);
       });
-      this.listForm.fileName = middle.join(',');
+      this.fileListName = middle;
-      this.listForm.fileId = files.join(',');
+      this.fileIds = files;
-      // this.fileListName = middle;
-      // this.fileIds = files;
     },
     fileUpload() {
       this.fileMadel = true;
@@ -1083,17 +1101,18 @@ export default {
         });
         this.fileListName = middle;
         this.fileIds.push(file.response.data.id);
-        if(this.listForm.fileName === null || this.listForm.fileName === undefined){
+        // this.listForm.fileName =  this.fileListName.join(',');
-          this.listForm.fileName = this.fileListName.join(',')
+        // this.listForm.fileId = this.fileIds.join(',');
+        if (this.listForm.fileName === null || this.listForm.fileName === undefined) {
+          this.listForm.fileName = this.fileListName.join(",");
         } else {
-          this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(',');
+          this.listForm.fileName = this.listForm.fileName + "," + this.fileListName.join(",");
         }
-        if(this.listForm.fileId === null || this.listForm.fileId === undefined){
+        if (this.listForm.fileId === null || this.listForm.fileId === undefined) {
-          this.listForm.fileId = this.fileIds.join(',')
+          this.listForm.fileId = this.fileIds.join(",");
-        }else {
+        } else {
-          this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
+          this.listForm.fileId = this.listForm.fileId + "," + this.fileIds.join(",");
         }
-        console.log(this.listForm);
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.message);
@@ -1103,6 +1122,7 @@ export default {
     // 相关附件 上传之前钩子
     beforeUpload(file) {
       var filename = file.name;
+      // this.listForm.fileName = this.listForm.fileName + ',' + file.name
       var index1 = filename.lastIndexOf(".");
       var index2 = filename.length;
       var fileSuffix = filename.substring(index1, index2);
@@ -1196,7 +1216,7 @@ export default {
       if (this.standList.length < 1) {
         this.$message.warning("请选择需要添加进清单的数据");
       } else {
-        let exits = []
+        let exits = [];
         this.standList.map(item => {
           let newStand = false;
           for (let itemKey of this.dataList) {
@@ -1209,13 +1229,13 @@ export default {
             this.$message.warning("请勿重复添加数据");
           } else {
             this.dataList.push(item);
-            exits.push(item.id)
+            exits.push(item.id);
           }
         });
-        if(this.listForm.inforlist === null || this.listForm.inforlist === undefined){
+        if (this.listForm.inforlist === null || this.listForm.inforlist === undefined || this.listForm.inforlist === "") {
-          this.listForm.inforlist = exits.join(',')
+          this.listForm.inforlist = exits.join(",");
         } else {
-          this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
+          this.listForm.inforlist = this.listForm.inforlist + "," + exits.join(",");
         }
         this.standardData = [];
         this.standModel = false;
@@ -1236,7 +1256,11 @@ export default {
         this.listForm.listName = bringData[0].detailedListName;
         this.listForm.descriptionList = bringData[0].remark;
         this.listForm.fileId = bringData[0].fileIds;
-        this.listForm.fileName = bringData[0].fileName;
+        if(bringData[0].fileName === null ){
+          this.listForm.fileName = ''
+        } else {
+          this.listForm.fileName = bringData[0].fileName;
+        }
         this.ListModel = false;
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
           { id: bringData[0].id, page: this.page, Size: this.pageSize }, {
@@ -1308,11 +1332,11 @@ export default {
     },
     pageChangeNo(page) {
       this.pageNo = page;
-      this.addList();
+      this.getStandData();
     },
     pageSizeChangeNo(pageSize) {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
-      this.addList();
+      this.getStandData();
 
     }
   },
@@ -1323,10 +1347,13 @@ export default {
       _this: this
     }, res => {
       this.countryOptions = res.data.COUNTRY;
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.standStateOptions);
     });
     this.selectionList();
     this.selectSign();
     this.getTree();
+    this.getStandData();
     for (let i = 0; i < this.dataList.length; i++) {
       this.standMap.set(this.dataList[i].id, this.dataList[i]);
     }
@@ -1345,12 +1372,15 @@ export default {
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
-  .fileClass:hover{
+
+  .fileClass:hover {
     color: #0c91e5;
   }
+
   p {
     & > a {
       cursor: pointer;
@@ -1367,6 +1397,7 @@ export default {
       vertical-align: sub;
       cursor: pointer;
     }
+
     .icon-download {
       background-image: url("~assets/images/shangqi/img/download.png");
     }
@@ -1375,6 +1406,7 @@ export default {
       background-image: url("~assets/images/shangqi/img/download2.png");
     }
   }
+
   .choiceBtn {
     .el-button--primary {
       width: 150px;

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

@@ -37,18 +37,19 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
-                <div class="file-box" v-if="listForm.model">
+                <div class="file-box" v-if="fileList.length > 0">
-                  <p> {{ listForm.modelName }}
+                  <p v-for="item in fileList"
+                  :key="item.id"> {{ item.name }}
                     <i
                       title="下载"
-                      @click="downloadFile(listForm.model)"
+                      @click="downloadFile(item.id)"
                       class="icon-download"
                       v-btn-permission="''"
                     />
                     <i
                       title="下载带水印"
-                      @click="downloadFileByWater(listForm.model,listForm.modelName)"
+                      @click="downloadFileByWater(item.id, item.name)"
                       class="icon-download2"
                       v-btn-permission="''"
                     />
@@ -78,8 +79,11 @@
             width="180px"
             label="标准号">
             <template slot-scope="scope">
-              <p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
+              <a v-if="scope.row.standYear" class="table-jump"
-              <p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
+                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                {{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -94,21 +98,30 @@
             label="发布日期">
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            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"
+            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
             prop="textStatus"
             width="120px"
             label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -236,6 +249,7 @@ export default {
       selectedList: [],  //选择清单的选择框
       selectList: [], //选择标准的选择框
       bringData: [],
+      fileList:[],
       fileIds: "",
       commentText: "", //填写会签意见
       page: 1,
@@ -267,7 +281,8 @@ export default {
       user3: "",
       user4: "",
       user5: "",
-      standMap: new Map()
+      standMap: new Map(),
+      textStatusMap: {}// 文本状态id与name对应
     };
   },
   methods: {
@@ -312,15 +327,14 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
+        console.log(this.listForm.fileName);
         this.listForm.prcNum = this.prcNum;
         this.listForm.prcName = this.prcName;
         this.listForm["id"] = item.id;
-        this.listForm.dataList = item.dataList;
         this.dataList = item.dataList;
-        this.listForm.applyUpdUserId = item.applyUpdUserId;
         this.listForm.jlUserId = item.jlUserId;
         this.listForm.zrUserId = item.zrUserId;
-        this.fileIds = item.fileId
+        this.fileIds = item.fileId;
         this.getFileInfo();
       });
     },
@@ -331,11 +345,15 @@ export default {
       }, {
         _this: this
       }, res => {
-        console.log(res);
         this.$nextTick(() => {
           res.data.map(item => {
-           this.listForm.modelName = item.oldFileName
+            // 赋值要回显的上传文件内容
-            this.listForm.model = item.id
+            this.fileList.push({
+              name: item.oldFileName,
+              uid: item.uid,
+              status: item.status,
+              id: item.id
+            });
           });
         });
       }, e => {
@@ -369,8 +387,8 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
-        this.$message.warning('请填写会签意见')
+        this.$message.warning("请填写会签意见");
       }
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
@@ -412,7 +430,24 @@ export default {
     pageSizeChange(pageSize) {
       this.pageSize = this.$store.getters.userInfo.configContent;
       this.searchData();
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
+// 点击查看
+handlePreview(item) {
+  let routeUrl = this.$router.resolve({
+    name: "OtherStandardDetails",
+    params: {
+      id: item.id,
+      pageType: "INLAND_STAND"
     }
+  });
+  window.open(routeUrl.href, "_blank");
+},
   },
   computed: {
     listNoDataText() {
@@ -421,9 +456,17 @@ export default {
   },
   watch: {},
   mounted() {
+//从数据库中查询下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY;
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.standStateOptions);
+    });
     this.processTable();
     this.getData();
-  }
+  },
 };
 </script>
 
@@ -437,12 +480,15 @@ export default {
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
-  .fileClass:hover{
+
+  .fileClass:hover {
     color: #0c91e5;
   }
+
   p {
     & > a {
       cursor: pointer;
@@ -459,6 +505,7 @@ export default {
       vertical-align: sub;
       cursor: pointer;
     }
+
     .icon-download {
       background-image: url("~assets/images/shangqi/img/download.png");
     }

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

@@ -100,12 +100,14 @@
           </el-table-column>
           <el-table-column
             prop="code"
-            fixed="left"
             width="180px"
             label="标准号">
             <template slot-scope="scope">
-              <p v-if="scope.row.standYear" >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
+              <a v-if="scope.row.standYear" class="table-jump"
-              <p v-else >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
+                 @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                {{ scope.row.standNumber }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -120,21 +122,30 @@
             label="发布日期">
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            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"
+            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
             prop="textStatus"
             width="120px"
             label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -216,6 +227,52 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="standardSearch" :inline="true" class="label-input-form"
+                       style="margin-left:10px">
+                <el-form-item label="类型" class="search-item search-item-last">
+                  <el-select
+                    @change="typeChange"
+                    v-model="standardSearch.standType"
+                    placeholder="请选择"
+                    filterable
+                  >
+                    <el-option
+                      v-for="item in standardTypeOptions"
+                      :value="item.value"
+                      :key="item.value"
+                      :label="item.label"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="standardSearch.standNumber"
+                    placeholder="请输入标准号或标准名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                    @click="getStandData">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                    @click="clearStandSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               :data="standardData"
               tooltip-effect="dark"
@@ -234,38 +291,57 @@
               </el-table-column>
               <el-table-column
                 prop="code"
-                fixed="left"
+                align="center"
                 label="标准号">
                 <template slot-scope="scope">
                   <a v-if="scope.row.standYear" class="table-jump"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                      scope.row.standNumber
                     }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                      scope.row.standSortShow }}
                     {{ scope.row.standNumber }}</a>
                 </template>
               </el-table-column>
               <el-table-column
                 prop="standName"
+                align="center"
                 label="标准名称"
               >
               </el-table-column>
               <el-table-column
                 prop="issueTime"
+                align="center"
                 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"
+                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"
+                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
                 prop="textStatus"
+                align="center"
                 label="文本状态">
+                <template slot-scope="scope">
+                  <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -315,6 +391,26 @@ export default {
       standList: [], //新添加的标准
       // 当前流程类型(1待办/2已办)
       processType: 1,
+      searching: false,
+      standardTypeOptions: [
+        {
+          value: "INLAND",
+          label: "国内标准法规",
+          item: "INLAND"
+        },
+        {
+          value: "FOREIGN",
+          label: "海外标准法规",
+          item: "FOREIGN"
+        }
+      ],
+      //查询添加标准相关数据
+      standardSearch: {
+        standType: "",
+        standNumber: "",
+        pageNo: 1,
+        pageSizeNo: this.$store.getters.userInfo.configContent
+      },
       loading: false,
       userId:this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
@@ -363,7 +459,8 @@ export default {
       user3: "",
       user4: "",
       user5: "",
-      standMap: new Map()
+      standMap: new Map(),
+      textStatusMap: {}// 文本状态id与name对应
     };
   },
   methods: {
@@ -383,6 +480,9 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    typeChange(type) {
+      this.standardSearch.standType = type;
+    },
     // 点击查看
     handlePreview(item) {
       let routeUrl = this.$router.resolve({
@@ -394,15 +494,38 @@ export default {
       });
       window.open(routeUrl.href, "_blank");
     },
-    //点击添加事件
+    clearStandSearch() {
-    addList() {
+      this.standardSearch = {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
+        standType: "",
+        standNumber: ""
+      };
+      this.getStandData();
+    },
+    getStandData() {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
+        page: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
         _this: this
       }, res => {
         this.standardData = res.data.list;
-        this.totalNo = res.data.pageCount
+        this.standardData.forEach(item => {
+          if(item.attrInfoMap === null){
+            this.$set(item, "ZCCSSRQ", '');
+            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 => {
       });
+    },
+    //点击添加事件
+    addList() {
       this.standModel = true;
     },
     //添加标准select的改变
@@ -565,6 +688,12 @@ export default {
       this.addList()
 
     },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
   },
   computed: {
     listNoDataText () {
@@ -572,8 +701,17 @@ export default {
     }
   },
   mounted() {
-    this.getData()
+    //从数据库中查询下拉框数据
-    this.processTable()
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY;
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.standStateOptions);
+    });
+    this.getData();
+    this.processTable();
+    this.getStandData();
   },
 };
 </script>

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

@@ -74,12 +74,16 @@
               fontWeight: 'bold', height: '48px'}">
                     <el-table-column
                             prop="code"
-                            fixed="left"
                             width="180px"
                             label="标准号">
                       <template slot-scope="scope">
-                        <p v-if="scope.row.standYear" >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
+                        <a v-if="scope.row.standYear" class="table-jump"
-                        <p v-else >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
+                           @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                            scope.row.standNumber
+                          }}-{{ scope.row.standYear }}</a>
+                        <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                            scope.row.standSortShow }}
+                          {{ scope.row.standNumber }}</a>
                       </template>
                     </el-table-column>
                     <el-table-column
@@ -94,21 +98,30 @@
                             label="发布日期">
                     </el-table-column>
                     <el-table-column
-                            prop="xcxssrq"
+                            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"
+                            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
                             prop="textStatus"
                             width="120px"
                             label="文本状态">
+                      <template slot-scope="scope">
+                        <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                      </template>
                     </el-table-column>
                 </el-table>
             </div>
@@ -272,7 +285,8 @@
                 user3: "",
                 user4: "",
                 user5: "",
-                standMap: new Map()
+                standMap: new Map(),
+              textStatusMap: {}// 文本状态id与name对应
             };
         },
         methods: {
@@ -296,6 +310,17 @@
             choiceShow() {
                 this.ListModel = true;
             },
+          // 点击查看
+          handlePreview(item) {
+            let routeUrl = this.$router.resolve({
+              name: "OtherStandardDetails",
+              params: {
+                id: item.id,
+                pageType: "INLAND_STAND"
+              }
+            });
+            window.open(routeUrl.href, "_blank");
+          },
             //保存事件
             handleSave() {
 
@@ -415,7 +440,13 @@
             pageSizeChange(pageSize) {
                 this.pageSize = this.$store.getters.userInfo.configContent;
                 this.searchData();
-            }
+            },
+          // 将文本状态的id与name对应
+          setMap(data) {
+            data.forEach(item => {
+              this.$set(this.textStatusMap, item.value, item.label);
+            });
+          },
         },
         computed: {
             listNoDataText() {
@@ -423,6 +454,14 @@
             }
         },
         mounted() {
+          //从数据库中查询下拉框数据
+          this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+            _this: this
+          }, res => {
+            this.countryOptions = res.data.COUNTRY;
+            this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+            this.setMap(this.standStateOptions);
+          });
             this.getData()
             this.processTable()
         },

src/sysConfig/index.js

@@ -6,7 +6,7 @@
 // 服务器地址
 // const devIp = '10.96.10.171'
 // const devInterfacePORT = '9999'
-const devIp = '192.168.1.145'
+const devIp = '10.96.170.156'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'