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

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

@@ -241,6 +241,15 @@ export default {
         comityTel: [],
         comityOpRole: '',
         comityInRoleId: '',
+        fillPeople: '',
+        fillPeopleId: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+        fillLeader: '',
+        fillLeaderId: '',
       },
       roleForm: {},
       commentText: '',

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

@@ -153,7 +153,7 @@
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item class="add-form-item" prop="rh_pageData.fillLeader" label="参与人部门领导:">
+                <el-form-item class="add-form-item" prop="fillLeader" label="参与人部门领导:">
                   <el-input
                     style="width: 100%"
                     readonly
@@ -165,11 +165,27 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="资料:">
-                  <el-input
+                  <el-upload
                     style="width: 100%"
-                    placeholder="请填写"
+                    class="upload_style"
-                    v-model="rh_pageData.fillFile"
+                    :disabled="acceptShow"
-                  />
+                    multiple
+                    ref="uploadFile"
+                    :action="uploadPath"
+                    name="file"
+                    :file-list="fillFileList"
+                    accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                    :before-upload="handleBeforeUpload"
+                    :before-remove="handleBeforeRemove"
+                    :on-success="handleOnsuccess"
+                  >
+                    <el-button
+                      type="primary"
+                      class="common-button-primary"
+                      size="mini">
+                      点击上传
+                    </el-button>
+                  </el-upload>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -323,7 +339,7 @@ export default {
         fillMail: '',
         fillLeader: '',
         fillLeaderId: '',
-        fillFile: '',
+        fillFile: [],
       },
       rh_rules: {
         fillLeader: [
@@ -345,7 +361,15 @@ export default {
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       commentText: '',
-      infoSourcesLength: ''
+      infoSourcesLength: '',
+
+      /** 上传相关   */
+      acceptShow: false,
+      // 上传路径
+      uploadPath: 'api/att/attFile/upload',
+      // 上传所储存文件数组
+      fillFileList: [],
+      newDataList: [],
     }
   },
   computed: {
@@ -385,11 +409,12 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
+        this.rh_pageData.fillLeader = ''
         this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
         this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         this.infoSourcesLength = this.rh_pageData.infoSources.length
-        // this.rh_pageData.comityFileNum = this.fileTextList
+        // this.rh_pageData.comityFileNum = this.fillFileList
       })
     },
     // 右上标签页面切换
@@ -458,6 +483,65 @@ export default {
       })
 
     },
+    // 文件上传限制条件
+    handleBeforeUpload(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 === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+        return true
+      } else {
+        this.spinShow = false
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+        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
+    },
+    // 移除上传的文件
+    handleBeforeRemove(file, fileList) {
+      this.fileData = fileList
+      this.fillFileList.forEach((item, index) => {
+        if (item.name === file.name || item.id === file.id) {
+          this.fillFileList.splice(index, 1)
+        }
+      })
+      this.rh_pageData.fillFile = this.fillFileList
+    },
+    // 文件上传成功
+    handleOnsuccess(res, file, fileList) {
+      if (res.ok) {
+        if (this.fillFileList !== null) {
+          this.newDataList = this.fillFileList
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.standName
+          })
+        } else {
+          this.newDataList.push({
+            id: res.data.attId,
+            name: res.data.standName
+          })
+        }
+        this.rh_pageData.fillFile = this.newDataList
+        this.$message({
+          showClose: true,
+          message: res.message,
+          type: 'success'
+        })
+        this.fileMadel = false
+      }
+    },
     /** 点击对应附件进行下载*/
     previews(val) {
       let attId = val

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

@@ -107,7 +107,14 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料"/>
+                <el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
+                    <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
+                    {{ item.name }} {{ ';' }}
+                   </span>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>

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

@@ -146,7 +146,14 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料"/>
+                <el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
+                    <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
+                    {{ item.name }} {{ ';' }}
+                   </span>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue

@@ -109,7 +109,14 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料"/>
+                <el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
+                    <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
+                    {{ item.name }} {{ ';' }}
+                   </span>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>

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

@@ -112,7 +112,14 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料"/>
+                <el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
+                    <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
+                    {{ item.name }} {{ ';' }}
+                   </span>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-form-item>
           </el-form>

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

@@ -79,7 +79,8 @@
                 </el-table-column>
                 <el-table-column prop="material" label="资料" align="center">
                   <template slot-scope="scope">
-                    <el-button type="primary" size="mini" @click="uploadTable(scope.row)">点击上传</el-button>
+                    <el-button v-if="scope.row.material.length === 0" type="primary" size="mini" @click="uploadTable(scope.row)">点击上传</el-button>
+                    <el-button v-else type="primary" size="mini" @click="uploadTable(scope.row)">查看附件</el-button>
                   </template>
                 </el-table-column>
               </el-table>

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

@@ -214,7 +214,17 @@ export default {
       active: '1',
 
       acceptShow: false,
-      ch_pageData: {},
+      ch_pageData: {
+        fillPeopleId: '',
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+        fillLeader: '',
+        fillFile: '',
+      },
       ch_rules: {},
       nodeList: [],
       commentText: '',
@@ -335,7 +345,14 @@ export default {
         }
       })
 
-    }
+    },
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
   }
 }
 </script>

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

@@ -123,7 +123,7 @@
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item class="add-form-item" prop="ch_pageData.fillLeader" label="参与人部门领导:">
+                <el-form-item class="add-form-item" prop="fillLeader" label="参与人部门领导:">
                   <el-input
                     style="width: 100%"
                     readonly
@@ -418,7 +418,14 @@ export default {
         }
       })
 
-    }
+    },
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
   }
 }
 </script>

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

@@ -349,7 +349,14 @@ export default {
           });
         }
       })
-    }
+    },
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
   }
 }
 </script>

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

@@ -318,7 +318,7 @@ export default {
           this.deleteDataList.map(item => {
             let index;
             index = this.ch_pageData.myPartRole.findIndex(items => {
-              return items.id === item;
+              return items === item;
             });
             if (index > -1) {
               this.ch_pageData.myPartRole.splice(index, 1);
@@ -377,7 +377,14 @@ export default {
         }
       })
 
-    }
+    },
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
   }
 }
 </script>

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

@@ -414,7 +414,14 @@ export default {
         }
       })
 
-    }
+    },
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
   }
 }
 </script>

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

@@ -375,27 +375,20 @@
                       v-model="form.xgdName"
                       clearable
                   ></el-input>
-                  <div v-if="xgdFileList.length>0">
+                  <div style="display: flex;justify-content: space-between">
-                    <!--                                        {{ form.xgdName }}-->
+                    <div style="width: 80%;">
-                    <el-button
+                      <div v-for="(item,index) in xgdFileList" :key="index" class="fileClass">{{ item.name }}</div>
-                        type="primary"
+                    </div>
-                        class="common-button-primary"
+                    <div style="width: 20%;">
-                        size="mini"
+                      <el-button
-                        style="margin-left: 10px"
+                          type="primary"
-                        @click="fileUpload('xgd')">
+                          class="common-button-primary"
-                      <i class="el-icon-upload el-icon--right"></i>
+                          size="mini"
-                      查看已上传的文件
+                          style="margin-left: 10px; margin-top: 11px; float: right;"
-                    </el-button>
+                          @click="fileUpload('xgd')">
-                  </div>
+                        <i class="el-icon-upload el-icon--right"></i>
-                  <div v-else>
+                      </el-button>
-                    <el-button
+                    </div>
-                        type="primary"
-                        class="common-button-primary"
-                        size="mini"
-                        @click="fileUpload('xgd')">
-                      <i class="el-icon-upload el-icon--right"></i>
-                      点击上传
-                    </el-button>
                   </div>
                 </el-form-item>
                 <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
@@ -405,27 +398,20 @@
                       v-model="form.fbgbjbdName"
                       clearable
                   ></el-input>
-                  <div v-if="FBGBJBDFileList.length>0">
+                  <div style="display: flex;justify-content: space-between">
-                    <!--                                        {{ form.fbgbjbdName }}-->
+                    <div style="width: 80%;">
-                    <el-button
+                      <div v-for="(item,index) in FBGBJBDFileList" :key="index" class="fileClass">{{ item.name }}</div>
-                        type="primary"
+                    </div>
-                        class="common-button-primary"
+                    <div style="width: 20%;">
-                        size="mini"
+                      <el-button
-                        style="margin-left: 10px"
+                          type="primary"
-                        @click="fileUpload('fbgbjbd')">
+                          class="common-button-primary"
-                      <i class="el-icon-upload el-icon--right"></i>
+                          size="mini"
-                      查看已上传的文件
+                          style="margin-left: 10px; margin-top: 11px; float: right;"
-                    </el-button>
+                          @click="fileUpload('fbgbjbd')">
-                  </div>
+                        <i class="el-icon-upload el-icon--right"></i>
-                  <div v-else>
+                      </el-button>
-                    <el-button
+                    </div>
-                        type="primary"
-                        class="common-button-primary"
-                        size="mini"
-                        @click="fileUpload('fbgbjbd')">
-                      <i class="el-icon-upload el-icon--right"></i>
-                      点击上传
-                    </el-button>
                   </div>
                 </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
@@ -435,27 +421,20 @@
                       v-model="form.ssgName"
                       clearable
                   ></el-input>
-                  <div v-if="ssgFileList.length>0">
+                  <div style="display: flex;justify-content: space-between">
-                    <!--                                        {{ form.ssgName }}-->
+                    <div style="width: 80%;">
-                    <el-button
+                      <div v-for="(item,index) in ssgFileList" :key="index" class="fileClass">{{ item.name }}</div>
-                        type="primary"
+                    </div>
-                        class="common-button-primary"
+                    <div style="width: 20%;">
-                        size="mini"
+                      <el-button
-                        style="margin-left: 10px"
+                          type="primary"
-                        @click="fileUpload('ssg')">
+                          class="common-button-primary"
-                      <i class="el-icon-upload el-icon--right"></i>
+                          size="mini"
-                      查看已上传的文件
+                          style="margin-left: 10px; margin-top: 11px; float: right;"
-                    </el-button>
+                          @click="fileUpload('ssg')">
-                  </div>
+                        <i class="el-icon-upload el-icon--right"></i>
-                  <div v-else>
+                      </el-button>
-                    <el-button
+                    </div>
-                        type="primary"
-                        class="common-button-primary"
-                        size="mini"
-                        @click="fileUpload('ssg')">
-                      <i class="el-icon-upload el-icon--right"></i>
-                      点击上传
-                    </el-button>
                   </div>
                 </el-form-item>
                 <el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
@@ -465,27 +444,20 @@
                       v-model="form.caName"
                       clearable
                   ></el-input>
-                  <div v-if="caFileList.length>0">
+                  <div style="display: flex;justify-content: space-between">
-                    <!--                                        {{ form.caName }}-->
+                    <div style="width: 80%;">
-                    <el-button
+                      <div v-for="(item,index) in caFileList" :key="index" class="fileClass">{{ item.name }}</div>
-                        type="primary"
+                    </div>
-                        class="common-button-primary"
+                    <div style="width: 20%;">
-                        size="mini"
+                      <el-button
-                        style="margin-left: 10px"
+                          type="primary"
-                        @click="fileUpload('ca')">
+                          class="common-button-primary"
-                      <i class="el-icon-upload el-icon--right"></i>
+                          size="mini"
-                      查看已上传的文件
+                          style="margin-left: 10px; margin-top: 11px; float: right;"
-                    </el-button>
+                          @click="fileUpload('ca')">
-                  </div>
+                        <i class="el-icon-upload el-icon--right"></i>
-                  <div v-else>
+                      </el-button>
-                    <el-button
+                    </div>
-                        type="primary"
-                        class="common-button-primary"
-                        size="mini"
-                        @click="fileUpload('ca')">
-                      <i class="el-icon-upload el-icon--right"></i>
-                      点击上传
-                    </el-button>
                   </div>
                 </el-form-item>
                 <el-form-item v-show="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
@@ -495,27 +467,20 @@
                       v-model="form.zbjbdName"
                       clearable
                   ></el-input>
-                  <div v-if="zbjbdFileList.length>0">
+                  <div style="display: flex;justify-content: space-between">
-                    <!--                                        {{ form.zbjbdName }}-->
+                    <div style="width: 80%;">
-                    <el-button
+                      <div v-for="(item,index) in zbjbdFileList" :key="index" class="fileClass">{{ item.name }}</div>
-                        type="primary"
+                    </div>
-                        class="common-button-primary"
+                    <div style="width: 20%;">
-                        size="mini"
+                      <el-button
-                        style="margin-left: 10px"
+                          type="primary"
-                        @click="fileUpload('zbjbd')">
+                          class="common-button-primary"
-                      <i class="el-icon-upload el-icon--right"></i>
+                          size="mini"
-                      查看已上传的文件
+                          style="margin-left: 10px; margin-top: 11px; float: right;"
-                    </el-button>
+                          @click="fileUpload('zbjbd')">
-                  </div>
+                        <i class="el-icon-upload el-icon--right"></i>
-                  <div v-else>
+                      </el-button>
-                    <el-button
+                    </div>
-                        type="primary"
-                        class="common-button-primary"
-                        size="mini"
-                        @click="fileUpload('zbjbd')">
-                      <i class="el-icon-upload el-icon--right"></i>
-                      点击上传
-                    </el-button>
                   </div>
                 </el-form-item>
               </el-col>
@@ -643,27 +608,20 @@
                       v-model="form.kwjName"
                       clearable
                   ></el-input>
-                  <div v-if="kwjFileList.length>0">
+                  <div style="display: flex;justify-content: space-between">
-                    <!--                                        {{ form.kwjName }}-->
+                    <div style="width: 80%;">
-                    <el-button
+                      <div v-for="(item,index) in kwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
-                        type="primary"
+                    </div>
-                        class="common-button-primary"
+                    <div style="width: 20%;">
-                        size="mini"
+                      <el-button
-                        style="margin-left: 10px"
+                          type="primary"
-                        @click="fileUpload('kwj')">
+                          class="common-button-primary"
-                      <i class="el-icon-upload el-icon--right"></i>
+                          size="mini"
-                      查看已上传的文件
+                          style="margin-left: 10px; margin-top: 11px; float: right;"
-                    </el-button>
+                          @click="fileUpload('kwj')">
-                  </div>
+                        <i class="el-icon-upload el-icon--right"></i>
-                  <div v-else>
+                      </el-button>
-                    <el-button
+                    </div>
-                        type="primary"
-                        class="common-button-primary"
-                        size="mini"
-                        @click="fileUpload('kwj')">
-                      <i class="el-icon-upload el-icon--right"></i>
-                      点击上传
-                    </el-button>
                   </div>
                 </el-form-item>
                 <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
@@ -675,27 +633,20 @@
                       v-model="form.jdwjName"
                       clearable
                   ></el-input>
-                  <div v-if="jdwjFileList.length>0">
+                  <div style="display: flex;justify-content: space-between">
-                    <!--                                        {{ form.jdwjName }}-->
+                    <div style="width: 80%;">
-                    <el-button
+                      <div v-for="(item,index) in jdwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
-                        type="primary"
+                    </div>
-                        class="common-button-primary"
+                    <div style="width: 20%;">
-                        size="mini"
+                      <el-button
-                        style="margin-left: 10px"
+                          type="primary"
-                        @click="fileUpload('jdwj')">
+                          class="common-button-primary"
-                      <i class="el-icon-upload el-icon--right"></i>
+                          size="mini"
-                      查看已上传的文件
+                          style="margin-left: 10px; margin-top: 11px; float: right;"
-                    </el-button>
+                          @click="fileUpload('jdwj')">
-                  </div>
+                        <i class="el-icon-upload el-icon--right"></i>
-                  <div v-else>
+                      </el-button>
-                    <el-button
+                    </div>
-                        type="primary"
-                        class="common-button-primary"
-                        size="mini"
-                        @click="fileUpload('jdwj')">
-                      <i class="el-icon-upload el-icon--right"></i>
-                      点击上传
-                    </el-button>
                   </div>
                 </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
@@ -705,27 +656,20 @@
                       v-model="form.bpgName"
                       clearable
                   ></el-input>
-                  <div v-if="bpgFileList.length>0">
+                  <div style="display: flex;justify-content: space-between">
-                    <!--                                        {{ form.bpgName }}-->
+                    <div style="width: 80%;">
-                    <el-button
+                      <div v-for="(item,index) in bpgFileList" :key="index" class="fileClass">{{ item.name }}</div>
-                        type="primary"
+                    </div>
-                        class="common-button-primary"
+                    <div style="width: 20%;">
-                        size="mini"
+                      <el-button
-                        style="margin-left: 10px"
+                          type="primary"
-                        @click="fileUpload('bpg')">
+                          class="common-button-primary"
-                      <i class="el-icon-upload el-icon--right"></i>
+                          size="mini"
-                      查看已上传的文件
+                          style="margin-left: 10px; margin-top: 11px; float: right;"
-                    </el-button>
+                          @click="fileUpload('bpg')">
-                  </div>
+                        <i class="el-icon-upload el-icon--right"></i>
-                  <div v-else>
+                      </el-button>
-                    <el-button
+                    </div>
-                        type="primary"
-                        class="common-button-primary"
-                        size="mini"
-                        @click="fileUpload('bpg')">
-                      <i class="el-icon-upload el-icon--right"></i>
-                      点击上传
-                    </el-button>
                   </div>
                 </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
@@ -735,27 +679,20 @@
                       v-model="form.zqyjgName"
                       clearable
                   ></el-input>
-                  <div v-if="zqyjgFileList.length>0">
+                  <div style="display: flex;justify-content: space-between">
-                    <!--                                        {{ form.zqyjgName }}-->
+                    <div style="width: 80%;">
-                    <el-button
+                      <div v-for="(item,index) in zqyjgFileList" :key="index" class="fileClass">{{ item.name }}</div>
-                        type="primary"
+                    </div>
-                        class="common-button-primary"
+                    <div style="width: 20%;">
-                        size="mini"
+                      <el-button
-                        style="margin-left: 10px"
+                          type="primary"
-                        @click="fileUpload('zqyjg')">
+                          class="common-button-primary"
-                      <i class="el-icon-upload el-icon--right"></i>
+                          size="mini"
-                      查看已上传的文件
+                          style="margin-left: 10px; margin-top: 11px; float: right;"
-                    </el-button>
+                          @click="fileUpload('zqyjg')">
-                  </div>
+                        <i class="el-icon-upload el-icon--right"></i>
-                  <div v-else>
+                      </el-button>
-                    <el-button
+                    </div>
-                        type="primary"
-                        class="common-button-primary"
-                        size="mini"
-                        @click="fileUpload('zqyjg')">
-                      <i class="el-icon-upload el-icon--right"></i>
-                      点击上传
-                    </el-button>
                   </div>
                 </el-form-item>
               </el-col>
@@ -999,26 +936,20 @@
                           v-model="form.glwjName"
                           clearable
                   ></el-input>
-                  <div v-if="glwjFileList.length>0">
+                  <div style="display: flex;justify-content: space-between">
-                    <!--                                        {{ form.fbgbjbdName }}-->
+                    <div style="width: 80%;">
-                    <el-button
+                      <div v-for="(item,index) in glwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
-                        type="primary"
+                    </div>
-                        class="common-button-primary"
+                    <div style="width: 20%;">
-                        size="mini"
+                      <el-button
-                        style="margin-left: 10px"
+                          type="primary"
-                        @click="fileUpload('glwj')">
+                          class="common-button-primary"
-                      <i class="el-icon-upload el-icon--right"></i>
+                          size="mini"
-                      查看已上传的文件
+                          style="margin-left: 10px; margin-top: 11px; float: right;"
-                    </el-button>
+                          @click="fileUpload('glwj')">
-                  </div>
+                        <i class="el-icon-upload el-icon--right"></i>
-                  <div v-else>
+                      </el-button>
-                    <el-button
+                    </div>
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            @click="fileUpload('glwj')">
-                      点击上传
-                    </el-button>
                   </div>
                 </el-form-item>
               </el-col>

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

@@ -96,15 +96,15 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择产品经理" placement="top"
+            <el-timeline-item timestamp="选择产品工程经理" placement="top"
                               :color="roleForm.confirmId ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="confirmName" style="margin-bottom: 0">
-                  <h4>产品经理</h4>
+                  <h4>产品工程经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.confirmId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.confirmName" placeholder="选择产品经理"
+                    <el-input v-model="roleForm.confirmName" placeholder="选择产品工程经理"
-                              @click.native="choiceZRR('confirmId', '选择产品经理', roleForm.confirmId)"></el-input>
+                              @click.native="choiceZRR('confirmId', '选择产品工程经理', roleForm.confirmId)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -449,7 +449,7 @@ export default {
       // 角色验证
       roleFormRules: {
         confirmName: [
-          { required: true, message: "请选择产品经理", trigger: "change" }
+          { required: true, message: "请选择产品工程经理", trigger: "change" }
         ]
       }
     };

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

@@ -103,15 +103,15 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择产品经理" placement="top"
+            <el-timeline-item timestamp="选择产品工程经理" placement="top"
                               :color="roleForm.confirmId ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="confirmName" style="margin-bottom: 0">
-                  <h4>产品经理</h4>
+                  <h4>产品工程经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.confirmId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.confirmName" placeholder="选择产品经理"
+                    <el-input v-model="roleForm.confirmName" placeholder="选择产品工程经理"
-                              @click.native="choiceZRR('confirmId', '选择产品经理', roleForm.confirmId)"></el-input>
+                              @click.native="choiceZRR('confirmId', '选择产品工程经理', roleForm.confirmId)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -461,7 +461,7 @@ export default {
       // 角色验证
       roleFormRules: {
         confirmName: [
-          { required: true, message: "请选择产品经理", trigger: "change" }
+          { required: true, message: "请选择产品工程经理", trigger: "change" }
         ],
         approveName: [
           { required: true, message: "请选择审批人", trigger: "change" }

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

@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">产品经理分发任务</template>
+      <template slot="proNode">产品工程经理分发任务</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">产品经理汇总</template>
+      <template slot="proNode">产品工程经理汇总</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <ProcessHeader toggle>
       <template slot="proName">项目清单确认流程</template>
-      <template slot="proNode">产品经理汇总</template>
+      <template slot="proNode">法规部经理审批</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue

@@ -213,7 +213,17 @@ export default {
       active: '1',
 
       acceptShow: false,
-      ch_pageData: {},
+      ch_pageData: {
+        fillPeopleId: '',
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+        fillLeader: '',
+        fillFile: '',
+      },
       ch_rules: {},
       nodeList: [],
       commentText: '',
@@ -334,7 +344,14 @@ export default {
         }
       })
 
-    }
+    },
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
   }
 }
 </script>

src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue

@@ -348,7 +348,14 @@ export default {
           });
         }
       })
-    }
+    },
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
   }
 }
 </script>

src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue

@@ -276,6 +276,10 @@ export default {
     },
 
     getData() {
+      if (this.taskInfo === '标准法规工程师修订完毕') {
+        this.passTitle = '回执说明',
+          this.passHolder = '请输入回执说明'
+      }
       const params = {
         taskIds: this.taskIds,
         pId: this.pId,
@@ -343,6 +347,12 @@ export default {
           json.president = this.roleForm.engineerUserId
         } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
           json.engineerSumDone = this.roleForm.startUser
+        } else {
+          json = {
+            ch_pageData: this.ch_pageData,
+            commentText: this.textarea,
+            roleList: this.roleForm
+          }
         }
         this.$refs['ch_pageData'].validate((valid) => {
           if (valid) {
@@ -377,6 +387,12 @@ export default {
         json.president = this.roleForm.engineerUserId
       } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') {
         json.engineerSumDone = this.roleForm.startUser
+      } else {
+        json = {
+          ch_pageData: this.ch_pageData,
+          commentText: this.textarea,
+          roleList: this.roleForm
+        }
       }
       this.$refs['ch_pageData'].validate((valid) => {
         if (valid) {
@@ -395,7 +411,14 @@ export default {
         }
       })
 
-    }
+    },
+    /** 点击对应附件进行下载*/
+    previews(val) {
+      let attId = val
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
   }
 }
 </script>

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

@@ -177,7 +177,6 @@
               type="selection"
               width="55"
               align="center"
-              :selectable="selectable"
           >
           </el-table-column>
           <el-table-column
@@ -188,8 +187,9 @@
               width="150px"
               label="标准号">
             <template slot-scope="scope">
-              <span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode }}</span>
+              <a v-if="sarAccessInfoSearch.dataSource === 'INLAND_STAND' || sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber}}</a>
-            </template>
+              <a v-else-if="sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber}}</a>
+              <a v-else-if="sarAccessInfoSearch.dataSource === 'BUSINESS'" @click="handlePreview(scope.row)" class="table-jump">{{scope.row.standCode}}</a>            </template>
           </el-table-column>
           <el-table-column
               prop="standName"
@@ -1730,10 +1730,10 @@ export default {
       }
     },
     // 数据搜索table判断checked状态
-    selectable(row) {
+    // selectable(row) {
-      console.log('1723',row)
+    //   console.log('1723',row)
-      return row.isRelateAccess === '1' || row.isRelateAccess === undefined
+    //   return row.isRelateAccess === '1' || row.isRelateAccess === undefined
-    },
+    // },
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect(val) {
       this.selectedAccInfoSearchList = val

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

@@ -155,7 +155,6 @@
             type="selection"
             width="55"
             align="center"
-            :selectable="selectable"
           >
           </el-table-column>
           <el-table-column
@@ -166,7 +165,9 @@
             align="center"
             label="标准号">
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
+              <a v-if="sarAccessInfoSearch.dataSource === 'INLAND_STAND' || sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber}}</a>
+              <a v-else-if="sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber}}</a>
+              <a v-else-if="sarAccessInfoSearch.dataSource === 'BUSINESS'" @click="handlePreview(scope.row)" class="table-jump">{{scope.row.standCode}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -1623,10 +1624,10 @@ export default {
         this.pageInfo()
       }
     },
-    // 数据搜索table判断checked状态
+    // // 数据搜索table判断checked状态
-    selectable (row) {
+    // selectable (row) {
-      return row.isRelateAccess === '1' || row.isRelateAccess === undefined
+    //   return row.isRelateAccess === '1' || row.isRelateAccess === undefined
-    },
+    // },
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val

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

@@ -200,7 +200,6 @@
               type="selection"
               width="55"
               align="center"
-              :selectable="selectable"
           >
           </el-table-column>
           <el-table-column
@@ -211,7 +210,9 @@
               width="180px"
               label="标准号">
             <template slot-scope="scope">
-              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
+              <a v-if="sarAccessInfoSearch.dataSource === 'INLAND_STAND' || sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber}}</a>
+              <a v-else-if="sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber}}</a>
+              <a v-else-if="sarAccessInfoSearch.dataSource === 'BUSINESS'" @click="handlePreview(scope.row)" class="table-jump">{{scope.row.standCode}}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -1700,9 +1701,9 @@ export default {
       }
     },
     // 数据搜索table判断checked状态
-    selectable(row) {
+    // selectable(row) {
-      return row.isRelateAccess === '1' || row.isRelateAccess === undefined
+    //   return row.isRelateAccess === '1' || row.isRelateAccess === undefined
-    },
+    // },
     // 数据搜索 table select事件
     sarAccessInfoSearchSelect(val) {
       this.selectedAccInfoSearchList = val

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

@@ -10,7 +10,7 @@
       <el-card class="contaiinerCard" style="margin: 5px">
         <div style="padding: 20px">
           <el-row style="margin-top: 10px">
-            <el-col :span="5">产品平台1: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
+            <el-col :span="5">产品平台: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
             <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
             <el-col :span="5" :push="2">
               <el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
@@ -36,6 +36,7 @@
             <el-col :span="4" :push="3">项目级别: <span class="valueColor">{{ localProEO.projectLevel }} </span></el-col>
           </el-row>
           <el-row style="margin-top: 10px">
+            <el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>
             <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
             <el-col :span="5" :push="1"> 项目计划开始时间: <span
               class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
@@ -168,6 +169,15 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="endTimes"
+            sortable
+            width="190px"
+            label="整改完成时间">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTimes ? scope.row.endTimes.substring(0,10) : '' }}</span>
+            </template>
+          </el-table-column>
         </el-table>
         <pagination
           style="position: relative;"