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

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

@@ -84,7 +84,7 @@
                             ref="Form"
                             :model="roleForm"
                             :rules="roleFormRules"
-                            class="label-input-form">
+                            class="label-input-form myForm">
                         <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
                             <el-card>
                                 <el-form-item prop="startUserName" style="margin-bottom: 0">
@@ -430,6 +430,11 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
     .bzdyStep1-1 {
+        .myForm {
+            /deep/.el-form-item__content {
+                line-height: 10px;
+            }
+        }
         /deep/.el-drawer__container {
             .prc-content-border {
                 border: none;

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

@@ -84,7 +84,7 @@
                   ref="Form"
                   :model="roleForm"
                   :rules="roleFormRules"
-                  class="label-input-form">
+                  class="label-input-form myForm">
             <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
@@ -419,6 +419,11 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 .bzdyStep1 {
+  .myForm {
+    /deep/.el-form-item__content {
+      line-height: 10px;
+    }
+  }
   /deep/.el-drawer__container {
     .prc-content-border {
       border: none;

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

@@ -48,27 +48,27 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
-                <el-upload
+                <div class="file-box" v-if="listForm.fileName">
-                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
+                  <p>{{listForm.fileName}}
-                  :action="uploadFileListPath"
+                  </p>
-                  show-file-list
+                </div>
-                  :file-list="fileInfoList"
+                <div v-else>
-                  name="file"
+                  <el-upload
-                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                    :action="uploadFileListPath"
-                  :on-remove="delFileInfo"
+                    show-file-list
-                  :on-success="uploadBackSuccess"
+                    :file-list="fileInfoList"
-                  :before-upload="beforeUpload"
+                    name="file"
-                >
+                    accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-                  <el-button class="common-button-default" size="mini">
+                    :on-remove="delFileInfo"
-                    点击上传
+                    :on-success="uploadBackSuccess"
-                  </el-button>
+                    :before-upload="beforeUpload"
-                </el-upload>
+                  >
-                <el-input
+                    <el-button class="common-button-default" size="mini">
-                  v-else
+                      点击上传
-                  v-model="listForm.fileId"
+                    </el-button>
-                  placeholder=""
+                  </el-upload>
-                ></el-input>
+                </div>
               </el-form-item>
               <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
                 <el-radio-group v-model="signFlag" @change="selectSign">
@@ -128,15 +128,21 @@
             label="发布日期">
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            prop="xcxssrqgj"
             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
             show-overflow-tooltip
-            prop="zccssrq"
+            prop="zccssrqgj"
             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
             show-overflow-tooltip
@@ -318,26 +324,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
@@ -617,17 +610,26 @@
                 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="xcxssrqgj"
                 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
                 show-overflow-tooltip
-                prop="zccssrq"
+                prop="zccssrqgj"
                 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
                 show-overflow-tooltip
@@ -718,7 +720,7 @@ export default {
       // 查询选择清单相关参数
       sarSarAccessEOSearch: {
         countryArea: "",
-        detailedListName: "",
+        detailedListName: ""
       },
       //查询添加标准相关数据
       standardSearch: {
@@ -809,8 +811,8 @@ export default {
           code: "", //标准号
           standName: "", //标准名称
           issueTime: "", //发布日期
-          xcxssrq: "", //新车型实施日期
+          xcxssrqgj: "", //新车型实施日期
-          zccssrq: "", //在产车实施日期
+          zccssrqgj: "", //在产车实施日期
           textStatus: "", //文本状态
           id: ""
         }]
@@ -895,9 +897,9 @@ export default {
         this.listForm.signFlag = 2;
       }
     },
-    queryDetailsData(){
+    queryDetailsData() {
-      this.page = 1
+      this.page = 1;
-      this.selectionList()
+      this.selectionList();
     },
     // //判断当前选中的是哪个清单
     selectionList(type) {
@@ -950,7 +952,7 @@ export default {
       };
       this.selectionList();
     },
-    clearStandSearch(){
+    clearStandSearch() {
       this.standardSearch = {
         standType: "",
         standNumber: ""
@@ -968,6 +970,10 @@ export default {
         _this: this
       }, res => {
         this.standardData = res.data.list;
+        this.standardData.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+        })
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -1002,30 +1008,30 @@ export default {
     },
     //保存事件
     handleSave() {
-      this.saveLoading = true
+      this.saveLoading = true;
-      let _formData = new FormData()
+      let _formData = new FormData();
-      _formData.append('id', this.bpnId || '')
+      _formData.append("id", this.bpnId || "");
-      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append("createUser", this.$store.getters.userInfo.userId);
-      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append("createUserName", this.$store.getters.userInfo.userName);
-      _formData.append('prcType', '4')
+      _formData.append("prcType", "4");
-      _formData.append('json', JSON.stringify({
+      _formData.append("json", JSON.stringify({
         form: this.listForm,
         roleForm: this.roleForm,
         commentText: this.commentText
-      }))
+      }));
-        saveTaskFirst(_formData).then(res => {
+      saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
+        this.saveLoading = false;
-        this.$message.success('保存成功')
+        this.$message.success("保存成功");
-        this.bpnId = res.result
+        this.bpnId = res.result;
       }).catch(e => {
-        this.saveLoading = false
+        this.saveLoading = false;
-      })
+      });
     },
     //提交事件
     handleSubmit() {
-      if(this.dataList.length < 1){
+      if (this.dataList.length < 1) {
-        this.$message.warning('标准不能为空')
+        this.$message.warning("标准不能为空");
-      }else{
+      } else {
         let json = this.listForm;
         this.listForm.fileId = this.fileIds.join(",");
         this.listForm.fileName = this.fileListName.join(",");
@@ -1094,7 +1100,7 @@ export default {
         });
         this.fileListName = middle;
         this.fileIds.push(file.response.data.id);
-        this.$message.success('上传成功')
+        this.$message.success("上传成功");
       } else {
         this.$message.error(res.message);
         fileList.pop();
@@ -1180,33 +1186,6 @@ export default {
       }
       return true;
     },
-    // beginImportFile (file) {
-    //   var filename = file.name
-    //   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'
-    //     || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
-    //     return true
-    //   } else {
-    //     this.spinShow = false
-    //     this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
-    //     return false
-    //   }
-    //   // 判断文件上传大小
-    //   // eslint-disable-next-line no-unreachable
-    //   if (file.size / 1024 / 1024 <= 200) {
-    //     return true
-    //   } else {
-    //     this.$message.error('文件' + file.name + '大小不超过200M')
-    //     return false
-    //   }
-    //   return true
-    // },
     //选择清单取消事件
     closeDrawer() {
       this.ListModel = false;
@@ -1220,26 +1199,25 @@ export default {
     },
     //添加标准确定事件
     okStand() {
-      let _this = this;
       if (this.standList.length < 1) {
-        _this.$message.warning("请选择需要添加进清单的数据");
+        this.$message.warning("请选择需要添加进清单的数据");
       } else {
-        _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);
           }
         });
         this.standardData = [];
-        _this.standModel = false;
+        this.standModel = false;
       }
     },
     //选择清单确定事件
@@ -1257,23 +1235,24 @@ 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;
         this.ListModel = false;
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
-          { id: bringData[0].id, page: this.page, Size:this.pageSize}, {
+          { id: bringData[0].id, page: this.page, Size: this.pageSize }, {
-          _this: this
+            _this: this
-        }, res => {
+          }, res => {
-          if (res.data == null) {
+            if (res.data == null) {
-            res.data = [];
+              res.data = [];
-          }
+            }
-          this.dataList = res.data;
+            this.dataList = res.data;
-          this.listForm.dataList = res.data;
+            this.listForm.dataList = res.data;
-          let formId = [];
+            let formId = [];
-          this.dataList.map(item => {
+            this.dataList.map(item => {
-            formId.push(item.id);
+              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 {
@@ -1365,7 +1344,36 @@ export default {
       padding: 0 20px 0;
     }
   }
+  .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/step3.vue

@@ -104,8 +104,8 @@
             width="180px"
             label="标准号">
             <template slot-scope="scope">
-              <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+              <p v-if="scope.row.standYear" >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
-              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+              <p v-else >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
             </template>
           </el-table-column>
           <el-table-column

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

@@ -77,6 +77,10 @@
                             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>
+                        <p v-else >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
+                      </template>
                     </el-table-column>
                     <el-table-column
                             prop="standName"

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

@@ -78,7 +78,7 @@
             ref="Form"
             :model="roleForm"
             :rules="roleFormRules"
-            class="label-input-form">
+            class="label-input-form myForm">
             <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
@@ -534,6 +534,11 @@ export default {
 @import '~@/assets/styles/style';
 @import '~@/assets/styles/mixins';
 .bzzqyjStep1 {
+  .myForm {
+    /deep/.el-form-item__content {
+      line-height: 10px;
+    }
+  }
   /deep/.el-drawer__container {
     .prc-content-border {
       border: none;

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

@@ -355,7 +355,7 @@
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname
                         this.json = data
-                        this.data = data.info
+                        this.data = data.info || []
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -318,6 +318,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        console.log(data);
                         this.form.cid = data.cid
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname

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

@@ -270,11 +270,21 @@
                         chapterName : '章节名称',
                         commentText: '修改意见内容（包括理由或依据）',
                         department: '提出部门',
-                        responUserName: '提出人'
+                        responUserName: '提出人',
+                        stateText: '处理意见'
                     },
                     dataList: []
                 }
-                params.dataList = row
+                params.dataList = JSON.parse(JSON.stringify(row))
+                params.dataList.forEach(item => {
+                    if (item.state === '1') {
+                        item.stateText = '上报'
+                    } else if (item.state === '2') {
+                        item.stateText = '处理后上报'
+                    } else {
+                        item.stateText = '不上报'
+                    }
+                })
                 this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
                },
             handleTabs(name) {

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

@@ -263,11 +263,21 @@
                         chapterName : '章节名称',
                         commentText: '修改意见内容（包括理由或依据）',
                         department: '提出部门',
-                        responUserName: '提出人'
+                        responUserName: '提出人',
+                        stateText: '处理意见'
                     },
                     dataList: []
                 }
-                params.dataList = row
+                params.dataList = JSON.parse(JSON.stringify(row))
+                params.dataList.forEach(item => {
+                    if (item.state === '1') {
+                        item.stateText = '上报'
+                    } else if (item.state === '2') {
+                        item.stateText = '处理后上报'
+                    } else {
+                        item.stateText = '不上报'
+                    }
+                })
                 this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
             },
             stateText (row) {

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

@@ -263,11 +263,21 @@
                         chapterName : '章节名称',
                         commentText: '修改意见内容（包括理由或依据）',
                         department: '提出部门',
-                        responUserName: '提出人'
+                        responUserName: '提出人',
+                        stateText: '处理意见'
                     },
                     dataList: []
                 }
-                params.dataList = row
+                params.dataList = JSON.parse(JSON.stringify(row))
+                params.dataList.forEach(item => {
+                    if (item.state === '1') {
+                        item.stateText = '上报'
+                    } else if (item.state === '2') {
+                        item.stateText = '处理后上报'
+                    } else {
+                        item.stateText = '不上报'
+                    }
+                })
                 this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
             },
             stateText (row) {

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

@@ -263,11 +263,21 @@
                         chapterName : '章节名称',
                         commentText: '修改意见内容（包括理由或依据）',
                         department: '提出部门',
-                        responUserName: '提出人'
+                        responUserName: '提出人',
+                        stateText: '处理意见'
                     },
                     dataList: []
                 }
-                params.dataList = row
+                params.dataList = JSON.parse(JSON.stringify(row))
+                params.dataList.forEach(item => {
+                    if (item.state === '1') {
+                        item.stateText = '上报'
+                    } else if (item.state === '2') {
+                        item.stateText = '处理后上报'
+                    } else {
+                        item.stateText = '不上报'
+                    }
+                })
                 this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
             },
             stateText (row) {

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

@@ -64,7 +64,7 @@
         </process-title>
         <div class="tableTitle">
           <div class="tableButton">
-            <el-button plain class="common-button-primary" size="mini" @click="addList">新增</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
             <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
           </div>
         </div>
@@ -226,7 +226,6 @@
               </el-table-column>
               <el-table-column
                 prop="code"
-                fixed="left"
                 label="标准号">
                 <template slot-scope="scope">
                   <a v-if="scope.row.standYear" class="table-jump"
@@ -290,7 +289,7 @@
               tooltip-effect="dark"
               style="width: 100%"
               border
-              ref="table"
+              ref="projectTable"
               height="100%"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
@@ -540,9 +539,10 @@ export default {
     leading() {
 
     },
-    //点击新增事件
+    //点击添加事件
     addList() {
       this.standModel = true;
+      this.$refs.projectTable.clearSelection()
     },
     // 点击批量删除事件
     deleteList() {
@@ -575,13 +575,30 @@ export default {
     },
     //确认添加事件
     okStand() {
-      if (this.standList.length >= 1) {
+      let proData = [];
-        this.dataList = this.standList;
+      if(this.dataList.length >= 1){
-        this.roleForm.directorUser = this.dataList[0].uname;
+       this.dataList.forEach(item => {
-        this.listForm.dataList = this.standList;
+         if(proData.length === 0){
+           proData.push(item.productLine)
+         }else if(!proData.includes(item.productLine)){
+           proData.push(item.productLine)
+         }
+       })
+        this.standList.forEach(items => {
+          if(!proData.includes(items.productLine)){
+            this.dataList.push(items)
+          }
+        })
         this.standModel = false;
-      } else {
+      }else{
-        this.$message.warning("请选择一条数据进行添加");
+        if (this.standList.length >= 1) {
+          this.dataList = this.standList;
+          this.roleForm.directorUser = this.dataList[0].uname;
+          this.listForm.dataList = this.standList;
+          this.standModel = false;
+        } else {
+          this.$message.warning("请选择一条数据进行添加");
+        }
       }
     },
     //保存事件
@@ -656,6 +673,17 @@ export default {
     closeDrawer() {
       this.ListModel = false;
     },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
 
     //选择拆分标准确定事件
     OkDrawer() {

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

@@ -51,6 +51,7 @@
           row-key="standId"
           height="70%"
           border
+          ref="myTable"
           @selection-change="selectStandChange"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
@@ -82,12 +83,7 @@
           </el-table-column>
           <el-table-column label="责任人" prop="workPeople" align="center">
             <template slot-scope="scope">
-              <div v-if="scope.row.workPeople == undefined">
+              <div :class="{'fileClass': !scope.row.workPeople}">{{ scope.row.workPeople ? scope.row.workPeople: '请选择责任人' }}</div>
-                {{ "请选择责任人" }}
-              </div>
-              <div v-else class="fileClass">
-                {{ scope.row.workPeople || "-" }}
-              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -358,39 +354,47 @@ export default {
       }
     },
     checkedRole(data) {
+      console.log(data[0].name)
       // 选取负责人时的操作
       let deposit = new Map();
       let mis2 = new Map();
       this.selectList.forEach(item => {
         item.workPeople = data[0].name;
         item.workPeopleId = data[0].id;
-        if (item.children !== undefined) {
+        if (item.children) {
           item.children.forEach(items => {
             deposit.set(items.standId, items);
           });
         }
         mis2.set(item.standId, item);
       });
-
+      this.dataList.forEach((item, index) => {
-      this.dataList.forEach(item => {
+        if (mis2.get(item.standId)) {
-        if (undefined !== mis2.get(item.standId)) {
+          if (item.children) {
-          if (undefined !== item.children) {
             item.children.forEach(i => {
               i.workPeopleId = undefined;
               i.workPeople = undefined;
             });
+          } else {
+            const newItem = JSON.parse(JSON.stringify(item))
+            newItem.workPeopleId = data[0].id
+            newItem.workPeople = data[0].name
+            this.$set(this.dataList, index, newItem)
           }
         } else {
-          if (item.children !== undefined) {
+          if (item.children) {
-            item.children.forEach(items => {
+            item.children.forEach((items, childIndex) => {
-              if (undefined !== deposit.get(items.standId)) {
+              if (deposit.get(items.standId)) {
-                items = deposit.get(items.standId);
+                const childItems = JSON.parse(JSON.stringify(items))
+                childItems.workPeopleId = deposit.get(items.standId).workPeopleId;
+                childItems.workPeople = deposit.get(items.standId).workPeople;
+                this.$set(this.dataList[index].children, childIndex, childItems)
               }
             });
           }
         }
       });
-      this.$refs.selection.clearSelection();
+      this.$refs.myTable.clearSelection();
       this.modalshowflag = false;
     },
     cancleUserInfo() {

src/pages/processCenter/pages/processDetail/index.vue

@@ -200,6 +200,15 @@ export default {
         if (prcType === '1') {
           // 标准入库流程数据
           this.toProcessDetail('bzrkStep5',row)
+        }else if(prcType === '4'){
+          //标准清单发布流程数据
+          this.toProcessDetail('bzqdfbStep4',row)
+        }else if (prcType === '5'){
+          //标准项目合规评估 标准维度
+          this.toProcessDetail('xmpgStep7',row)
+        }else if(prcType === '6'){
+          //标准项目合规评估 项目维度
+          this.toProcessDetail('xmpg2Step12',row)
         }
       } else {
         this.$message.warning('当前流程未全部办理完成，无法查看')

src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue

@@ -88,7 +88,7 @@ export default {
     this.tabValue = this.list[0].name;
   },
   beforeRouteLeave(to, from, next) {
-    const toName = ["ListOfStandardsAndRegulationsDetails", "Details", "ProjectAddEit", "OtherAddEit"];
+    const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "ProjectAddEit", "OtherAddEit"];
     // 离开此页面之前,记录tabName以便返回使用,如果将要访问的页面不是这两个,则清空tabName
     if (toName.includes(to.name)) {
       this.$store.commit("SET_ACCESS_STANDARD_REG_TABS", this.tabValue);

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

@@ -237,7 +237,7 @@
           >
           </el-table-column>
           <el-table-column
-              prop="standNumber"
+              prop="code"
               show-overflow-tooltip
               fixed="left"
               width="180px"
@@ -370,13 +370,13 @@
             align="center">
         </el-table-column>
         <el-table-column
-            prop="standNumber"
+            prop="code"
             show-overflow-tooltip
             width="180px"
             fixed="left"
             label="标准号">
           <template slot-scope="scope">
-            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
+            <a  @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
           </template>
         </el-table-column>
         <el-table-column
@@ -561,6 +561,7 @@
             <el-date-picker
               v-model.trim="editRowData.putTime"
               type="date"
+              value-format="yyyy-MM-dd"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -568,6 +569,7 @@
             <el-date-picker
               v-model.trim="editRowData.zccssrqgj"
               type="date"
+              value-format="yyyy-MM-dd"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -575,6 +577,7 @@
             <el-date-picker
               v-model.trim="editRowData.xcxssrqgj"
               type="date"
+              value-format="yyyy-MM-dd"
               placeholder="选择日期">
             </el-date-picker>
           </el-form-item>
@@ -676,6 +679,7 @@ export default {
       editRowData: {
         id: '',
         standName: '',
+        standSortShow:'',
         standEnName: '',
         typeApplicable: '',
         nylx: '',
@@ -715,7 +719,7 @@ export default {
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
         ]
       },
       disabledFlag: false,
@@ -740,7 +744,7 @@ export default {
       dataSourceOptions: [
         {value: 'INLAND_STAND', label: '国内标准法规'},
         {value: 'FOREIGN_STAND', label: '海外标准法规'},
-        {value: 'FOREIGN_LAWS', label: '国内外政策'},
+        //{value: 'FOREIGN_LAWS', label: '国内外政策'},
         // {value: 'BUSINESS', label: '企业标准 '},
         {value: 'TEMP', label: '标准法规清单 '}
       ],
@@ -877,6 +881,7 @@ export default {
         // country: 'CN', // 适用区域
         standSort: '', // 标准类别
         standNumber: '', // 标准编号
+        standSortShow:'',
         standYear: '', // 标准年份
         standName: '', // 中文名称
         standEnName: '', // 英文名称
@@ -897,6 +902,7 @@ export default {
         // country: 'CN', // 适用区域
         standSort: '', // 标准类别
         standNumber: '', // 标准编号
+        standSortShow:'',
         standYear: '', // 标准年份
         standName: '', // 中文名称
         standEnName: '', // 英文名称
@@ -1322,7 +1328,7 @@ export default {
     editTghisRow(row) {
       this.rowList = row
       this.editRowData = this.rowList
-      this.editRowData.standNumber = this.rowList.standSortShow + this.rowList.standNumber
+      this.editRowData.standNumber = this.rowList.standNumber
       this.drawerEdit = true
     },
     // 抽屉取消按钮
@@ -1452,7 +1458,7 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-                this.$message.success('编辑成功')
+                //this.$message.success('编辑成功')
                 this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
@@ -1908,12 +1914,12 @@ export default {
       })
     },
     // 点击查看
-    handlePreview (item) {
+    handlePreview (data) {
-      let routerName = item.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
+      let routerName = data.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
         params: {
-          id: item.resId,
+          id: data.id,
           pageType: this.sarAccessInfoSearch.dataSource
         }
       })

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

@@ -15,10 +15,9 @@
       <div v-show="heightShow" class="transition-box">
         <p class="transition-box-p"  v-if="sarAccessEO.sortKey === '1'">
           <label class="transition-box-label">国家/地区：</label>
-          <span class="transition-box-span"  v-if="sarAccessEO.countryArea !== null && sarAccessEOInfo  > 0">
+          <span class="transition-box-span">
-              <span>{{ sarAccessEO.countryArea }}</span>
+             {{ sarAccessEO.countryArea }}
             </span>
-          <span class="transition-box-span" v-else>{{ countryAreaMap[sarAccessEO.countryArea] }}</span>
         </p>
         <p v-else></p>
         <p class="transition-box-p">
@@ -71,26 +70,6 @@
                 :label="item.label"
               />
             </el-select>
-<!--            <el-input v-model="standardForm.responseUnit" v-show="false"></el-input>
-            <el-popover placement="bottom" popper-class="user-dept-popper" trigger="click">
-              <el-input
-                v-model="standardForm.responseUnit"
-                placeholder="请选择部门"
-                readonly
-                id="depBtnsAuth"
-                slot="reference"
-              />
-              <div class="api">
-                <laws-tree :zNodes="depNode"
-                           deptSelect
-                           treeDivId="depTreeAuth"
-                           @treeDblClick="(treeId, treeNode) => treeDblAuthDepartClick(treeId, treeNode)"
-                           :editable="false"
-                           ref="depTreeAuth"
-                           class="ztree" style="height: 300px;overflow: auto">
-                </laws-tree>
-              </div>
-            </el-popover>-->
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
             <el-button  v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
@@ -142,7 +121,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="能源类型"  >
+            <el-form-item label="能源类型" label-width="68px" >
               <el-select
                 class="showBox"
                 v-model="standardFormList.nylx"
@@ -158,7 +137,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="责任部门"  >
+            <el-form-item label="责任部门"  label-width="68px" >
               <el-select
                 class="showBox"
                 v-model="standardFormList.zrbm"
@@ -174,7 +153,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="适用产品线"  >
+            <el-form-item label="适用产品线"  label-width="86px" >
               <el-select
                 class="showBox"
                 v-model="standardFormList.sycpx"
@@ -212,14 +191,13 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="standNumber"
+            prop="code"
             fixed="left"
             width="180px"
             align="center"
             label="标准号">
             <template slot-scope="scope">
-              <a v-if="scope.row.resId" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
-              <span v-else>{{ scope.row.standNumber }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -227,12 +205,18 @@
             label="中文名称"
             width="180px"
           >
+            <template slot-scope="scope">
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="standEnName"
             align="center"
             width="180px"
             label="英文名称">
+            <template slot-scope="scope">
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
+            </template>
           </el-table-column>
           <el-table-column
             prop="typeApplicable"
@@ -459,7 +443,7 @@ export default {
       dialogColor: false,
       dialogType: "",
       color: "",
-      isShow: false
+      isShow: false,
     };
   },
   methods: {
@@ -514,25 +498,7 @@ export default {
     },
 
     back() {
-      this.$router.push({
+      this.$router.push({name: 'AccessStandardsAndRegulations'})
-        name: 'AccessStandardsAndRegulations',
-      })
-     /* if (this.sarAccessEO.sortKey === '1') {
-        this.$router.push({
-          name: 'AccessStandardsAndRegulations',
-          menuName: '国家/地区清单'
-        })
-      } else if(this.sarAccessEO.sortKey === '2') {
-        this.$router.push({
-          name: 'AccessStandardsAndRegulations',
-          menuName: '项目类清单'
-        })
-      } else {
-        this.$router.push({
-          name: 'AccessStandardsAndRegulations',
-          menuName: '其他清单'
-        })
-      }*/
       // this.$router.push(this.$store.state.detailMap)
       // this.$store.commit('setDetailMap', '')
     },
@@ -656,12 +622,13 @@ export default {
       window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId
     },
     // 点击查看
-    handlePreview(item) {
+    handlePreview(data) {
+      debugger
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.resId,
+          id: data.id,
-          pageType: item.sarType
+          pageType: data.sarType
         }
       });
       window.open(routeUrl.href, "_blank");
@@ -768,7 +735,6 @@ export default {
       let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
       this.pageId = accessRow.id
       this.sarAccessEO = accessRow;
-      console.log(this.sarAccessEO)
       this.selectInfobyAccid();
       this.getOrgTreeSource();
       this.getFileInfo();

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

@@ -577,11 +577,11 @@ export default {
           {required: true, message: '国内/海外不能为空', trigger: 'change'}
         ],
         detailedList: [
-          {required: true, message: '清单类别不能为空', trigger: 'change'}
+          {required: true, message: '清单类别不能为空', trigger: 'blur'}
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
         ]
       },
       disabledFlag: false,

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

@@ -572,11 +572,11 @@ export default {
         ],
         projectName: [
           {required: true, message: '项目名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '项目名称不能超过100个字符', trigger: 'blur'}
         ],
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
+          {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
         ]
       },
       disabledFlag: false,

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

@@ -585,16 +585,22 @@ export default {
             ids+=',\''+this.selectList[i].standId+'\''
           }
           const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
-              'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName
+              'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
-          console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
           window.open(exportURL)
           this.$message.success('导出信息成功')
         }
       } else if (this.saveExportType === 'all') {
         console.log(this.selectList);
+        let ids = ''
+        if (this.selectList.length === 0) {
+          ids='\''+this.dataList[0].standId+'\''
+          for(let i=1;i<this.dataList.length;i++){
+            ids+=',\''+this.dataList[i].standId+'\''
+          }
+        }
         const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
-            'exportType' + this.saveExportType + '&ids=' + this.selectList.join(',') + '&exportName=' + this.exportName
+            'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
-        console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
+        console.log(exportURL)
         window.open(exportURL)
         this.$message.success('导出信息成功')
       }

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

@@ -116,7 +116,7 @@
               prop="standId"
               fixed="left"
               width="180"
-              label="标准编号">
+              label="标准号">
 <!--              <template slot-scope="scope">-->
 <!--                <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>-->
 <!--&lt;!&ndash;                {{ scope.row.standId }}&ndash;&gt;-->
@@ -229,7 +229,7 @@
                 style="width: 100%;"
                 :model="historySeeForm"
               >
-                <el-form-item class="add-form-item" label="标准编号:">
+                <el-form-item class="add-form-item" label="标准号:">
                   <div class="seeItem">{{historySeeForm.standId}}</div>
                 </el-form-item>
                 <el-form-item class="add-form-item" label="标准名称:">

src/sysConfig/index.js

@@ -7,8 +7,10 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-const devIp = '101.36.227.25'
+// const devIp = '101.36.227.25'
-const devInterfacePORT = '8038'
+// const devInterfacePORT = '8038'
+const devIp = '10.96.170.156'
+const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'