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

src/api/process.js

@@ -170,7 +170,16 @@ export function taskDel (data) {
     params: data
   })
 }
-//模板下载
+//清单模板下载
+export function templateDownload(data) {
+  return axios({
+    url: '/api/sarLawsDetailedList/sar-laws-detailed-list/exportEmpty',
+    method: 'get',
+    responseType: 'blob',
+    params: data
+  })
+}
+//企标立项模板下载
 export function downloadStatus(data) {
   return axios({
     url: '/api/importWkExcel/exportqbzxdjh',

src/pages/home2/components/todoList/index.vue

@@ -11,7 +11,7 @@
       <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
         <div style="min-height: 30px">
           <span @click="dealWith(item)"
-                style="line-height: 30px; font-size: 13px;display: inline-block;width: 400px;">{{ getPrcNameFilter(item) }}</span>
+                style="line-height: 30px; font-size: 13px;display: inline-block;width: 100%;">{{ getPrcNameFilter(item) }}</span>
 <!--          <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>-->
 <!--            <span @click="dealWith(item)"-->
 <!--                  style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span>-->

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -109,7 +109,7 @@
           </el-table>
         </div>
         <loading :loading="loading">正在获取中……</loading>
-        <pagination :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+        <pagination :total="total" :page="itemsPage "  @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
       </div>
     </div>
     <!--              分享           -->
@@ -1528,6 +1528,8 @@ export default {
           confirmButtonClass: 'common-button-primary',
           roundButton: false
         }).then(() => {
+          this.itemsPage = 1
+          this.itemsEo.page = 1
           this.loading = true
           this.deleteItemsModal = false
           this.$http.post('lawss/sarFileSplitItems/batchDeleteItems', {

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

@@ -135,19 +135,19 @@
                     </div>
                 </el-form>
             </div>
-            <el-collapse accordion>
+          <el-collapse accordion>
-                <el-collapse-item title="审批意见">
+            <el-collapse-item title="审批意见">
-                    <div style="margin: 10px 0;">
+              <div style="margin: 10px 0;">
-                        <el-input
+                <el-input
-                                type="textarea"
+                  type="textarea"
-                                :rows="3"
+                  :rows="3"
-                                resize="none"
+                  resize="none"
-                                placeholder="请输入意见"
+                  placeholder="请输入意见"
-                                v-model="commentText4">
+                  v-model="commentText4">
-                        </el-input>
+                </el-input>
-                    </div>
+              </div>
-                </el-collapse-item>
+            </el-collapse-item>
-            </el-collapse>
+          </el-collapse>
         </div>
         <div class="content" v-show="active === '2'">
             <el-table

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

@@ -129,20 +129,20 @@
                         </el-table-column>
                     </el-table>
                 </div>
-                <el-collapse accordion>
-                    <el-collapse-item title="回执说明">
-                        <div style="margin: 10px 0;">
-                            <el-input
-                                    type="textarea"
-                                    :rows="3"
-                                    resize="none"
-                                    placeholder="请输入意见"
-                                    v-model="commentText5">
-                            </el-input>
-                        </div>
-                    </el-collapse-item>
-                </el-collapse>
             </div>
+          <el-collapse accordion>
+            <el-collapse-item title="回执说明">
+              <div style="margin: 10px 0;">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  resize="none"
+                  placeholder="请输入意见"
+                  v-model="commentText5">
+                </el-input>
+              </div>
+            </el-collapse-item>
+          </el-collapse>
         </div>
         <div class="content" v-show="active === '2'">
             <el-table
@@ -275,6 +275,7 @@
                     ]
                 },
                 json: {},
+                jsonData: {},
                 fileUrl: 'api/att/attFile/upload',
                 fileMadel: false,
             }
@@ -401,11 +402,12 @@
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
-                        var json = this.json
+                        let json = this.jsonData
                         json.commentText = this.commentText5
                         json.hzfileId = this.form.hzfileId
                         json.hzfileName = this.form.hzfileName
                         json.docUser = this.newDocUser
+                        json.responUserList = this.tableData
                         this.$http.post('lawss/activiti/completeTask', {
                             json: JSON.stringify(json),
                             taskId: this.taskIds,
@@ -427,6 +429,8 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        let jsonData = JSON.parse(res.mesg)
+                       this.jsonData = jsonData.form ? jsonData.form : jsonData
                        this.commentText5 = data.commentText5 || ''
                         this.form.title = data.title || data.form.title
                         this.form.processName = data.processName || data.form.processName

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

@@ -124,20 +124,20 @@
                         </el-table-column>
                     </el-table>
                 </div>
-                <el-collapse accordion>
-                    <el-collapse-item title="审批意见">
-                        <div style="margin: 10px 0;">
-                            <el-input
-                                    type="textarea"
-                                    :rows="3"
-                                    resize="none"
-                                    placeholder="请输入意见"
-                                    v-model="commentText6">
-                            </el-input>
-                        </div>
-                    </el-collapse-item>
-                </el-collapse>
             </div>
+          <el-collapse accordion>
+            <el-collapse-item title="审批意见">
+              <div style="margin: 10px 0;">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  resize="none"
+                  placeholder="请输入意见"
+                  v-model="commentText6">
+                </el-input>
+              </div>
+            </el-collapse-item>
+          </el-collapse>
         </div>
         <div class="content" v-show="active === '2'">
             <el-table

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

@@ -124,20 +124,20 @@
                         </el-table-column>
                     </el-table>
                 </div>
-                <el-collapse accordion>
-                    <el-collapse-item title="审批意见">
-                        <div style="margin: 10px 0;">
-                            <el-input
-                                    type="textarea"
-                                    :rows="3"
-                                    resize="none"
-                                    placeholder="请输入意见"
-                                    v-model="commentText7">
-                            </el-input>
-                        </div>
-                    </el-collapse-item>
-                </el-collapse>
             </div>
+          <el-collapse accordion>
+            <el-collapse-item title="审批意见">
+              <div style="margin: 10px 0;">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  resize="none"
+                  placeholder="请输入意见"
+                  v-model="commentText7">
+                </el-input>
+              </div>
+            </el-collapse-item>
+          </el-collapse>
         </div>
         <div class="content" v-show="active === '2'">
             <el-table

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

@@ -124,20 +124,20 @@
                         </el-table-column>
                     </el-table>
                 </div>
-                <el-collapse accordion>
-                    <el-collapse-item title="审批意见">
-                        <div style="margin: 10px 0;">
-                            <el-input
-                                    type="textarea"
-                                    :rows="3"
-                                    resize="none"
-                                    placeholder="请输入意见"
-                                    v-model="commentText8">
-                            </el-input>
-                        </div>
-                    </el-collapse-item>
-                </el-collapse>
             </div>
+          <el-collapse accordion>
+            <el-collapse-item title="审批意见">
+              <div style="margin: 10px 0;">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  resize="none"
+                  placeholder="请输入意见"
+                  v-model="commentText8">
+                </el-input>
+              </div>
+            </el-collapse-item>
+          </el-collapse>
         </div>
         <div class="content" v-show="active === '2'">
             <el-table

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

@@ -124,20 +124,20 @@
                         </el-table-column>
                     </el-table>
                 </div>
-                <el-collapse accordion>
-                    <el-collapse-item title="审批意见">
-                        <div style="margin: 10px 0;">
-                            <el-input
-                                    type="textarea"
-                                    :rows="3"
-                                    resize="none"
-                                    placeholder="请输入意见"
-                                    v-model="commentText9">
-                            </el-input>
-                        </div>
-                    </el-collapse-item>
-                </el-collapse>
             </div>
+          <el-collapse accordion>
+            <el-collapse-item title="审批意见">
+              <div style="margin: 10px 0;">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  resize="none"
+                  placeholder="请输入意见"
+                  v-model="commentText9">
+                </el-input>
+              </div>
+            </el-collapse-item>
+          </el-collapse>
         </div>
         <div class="content" v-show="active === '2'">
             <el-table

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

@@ -429,6 +429,7 @@
                                     v-model="plForm.technicalRequir"
                                     placeholder="请输入核心技术要求"
                                     maxlength="500"
+                                    :autosize="{minRows:10,maxRows:10}"
                             ></el-input>
                         </el-form-item>
                         <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
@@ -437,6 +438,7 @@
                                     v-model="plForm.changePoint"
                                     placeholder="请输入国内标准的差异点"
                                     maxlength="500"
+                                    :autosize="{minRows:10,maxRows:10}"
                             ></el-input>
                         </el-form-item>
                         <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
@@ -1181,6 +1183,19 @@
     @import '~@/assets/styles/style';
     @import '~@/assets/styles/mixins';
     .bzjdStep1-1 {
+
+
+      .itemsTextBox {
+        min-height: 300px;
+        max-height: 500px;
+        overflow: auto;
+        line-height: 20px;
+        /deep/ td {
+          border: 1px solid #606266;
+          text-align: center;
+        }
+      }
+
         /deep/.el-drawer__container {
             .prc-content-border {
                 border: none;

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

@@ -446,6 +446,7 @@
                   v-model="plForm.changePoint"
                   placeholder="请输入国内标准的差异点"
                   maxlength="500"
+                  :autosize="{minRows:10,maxRows:10}"
                 ></el-input>
               </el-form-item>
               <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
@@ -1193,6 +1194,17 @@ export default {
 @import '~@/assets/styles/mixins';
 
 .bzjdStep1 {
+
+  .itemsTextBox {
+    min-height: 300px;
+    max-height: 500px;
+    overflow: auto;
+    line-height: 20px;
+    /deep/ td {
+      border: 1px solid #606266;
+      text-align: center;
+    }
+  }
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;

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

@@ -544,6 +544,16 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
     .bzjdStep2 {
+      .itemsTextBox {
+        min-height: 300px;
+        max-height: 500px;
+        overflow: auto;
+        line-height: 20px;
+        /deep/ td {
+          border: 1px solid #606266;
+          text-align: center;
+        }
+      }
         /deep/.el-drawer__container {
             .prc-content-border {
                 border: none;

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

@@ -306,6 +306,7 @@
                                 v-model="plForm.technicalRequir"
                                 placeholder="请输入核心技术要求"
                                 maxlength="500"
+                                :autosize="{minRows:10,maxRows:10}"
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
@@ -314,6 +315,7 @@
                                 v-model="plForm.changePoint"
                                 placeholder="请输入国内标准的差异点"
                                 maxlength="500"
+                                :autosize="{minRows:10,maxRows:10}"
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
@@ -394,6 +396,7 @@
                                 v-model="editForm.technicalRequir"
                                 placeholder="请输入核心技术要求"
                                 maxlength="500"
+                                :autosize="{minRows:10,maxRows:10}"
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
@@ -402,6 +405,7 @@
                                 v-model="editForm.changePoint"
                                 placeholder="请输入国内标准的差异点"
                                 maxlength="500"
+                                :autosize="{minRows:10,maxRows:10}"
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
@@ -964,6 +968,16 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
     .bzjdStep3 {
+      .itemsTextBox {
+        min-height: 300px;
+        max-height: 500px;
+        overflow: auto;
+        line-height: 20px;
+        /deep/ td {
+          border: 1px solid #606266;
+          text-align: center;
+        }
+      }
         /deep/.el-drawer__container {
             .prc-content-border {
                 border: none;

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

@@ -1220,7 +1220,7 @@ export default {
       this.tableLoading = true;
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
         page: this.page,
-        size: this.pageSize,
+        pageSize: this.pageSize,
         ...this.standardSearch
       }, {
         _this: this

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

@@ -49,22 +49,32 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
-                <div class="file-box">
+                <el-input
-                  <el-upload
+                  disabled
-                    :action="uploadFileListPath"
+                  style="display: none;"
-                    show-file-list
+                  v-model="fileInfo"
-                    :file-list="fileInfoList"
+                  clearable
-                    name="file"
+                ></el-input>
-                    accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                <div v-if="fileInfoList.length > 0">
-                    :on-remove="delFileInfo"
+                  <div v-for="(item, index) in fileInfoList" :key="index" style="margin-right: 5px; padding-left: 10px">
-                    :on-success="uploadBackSuccess"
+                    <div class="fileClass" >
-                    :before-upload="beforeUpload"
+                      <span @click="clickButtonToUpload2(item)">{{ item.name }}</span>
-                  >
+                      <el-button
-                    <el-button class="common-button-default" size="mini">
+                        size="small"
-                      点击上传
+                        @click="clickButtonToUpload(item)"
-                    </el-button>
+                        icon="el-icon-download"
-                  </el-upload>
+                        style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
                 </div>
+                <el-button
+                  type="primary"
+                  class="common-button-primary"
+                  @click="fileUpload"
+                  size="mini">
+                  点击上传
+                </el-button>
               </el-form-item>
               <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
                 <el-radio-group v-model="signFlag" @change="selectSign">
@@ -699,17 +709,20 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
-    <el-dialog width="400px" :visible.sync="fileMadel" title="上传文件">
+    <el-dialog width="400px" :visible.sync="fileMadel" title="上传附件">
       <el-upload
+        v-if="fileMadel"
         multiple
+        class="upload-demo"
         drag
-        :action="fileUrl"
+        :action="uploadFileListPath"
         ref="importfile"
         name="file"
-        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+        accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-        :before-upload="beginImportFile"
+        :on-remove="delFileInfo"
-        :on-success="importFileSuccess"
+        :on-success="uploadBackSuccess"
-        :show-file-list="false"
+        :before-upload="beforeUpload"
+        :file-list="fileInfoList"
       >
         <div style="padding: 20px 0">
           <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -793,6 +806,7 @@ export default {
       sarAccessListDatas: [], //国家地区清单表格
       uploadFileListPath: "api/att/attFile/upload", // 上传的地址
       fileInfoList: [], // 上传的附件
+      fileInfo: '', // 展示的附件
       fileIds: [], // 上传的附件
       fileList: [],
       fileListName: [], //上传的附件名称
@@ -1191,6 +1205,16 @@ export default {
           this.fileInfoList.splice(index, 1);
         }
       });
+      let list = ''
+      this.fileInfoList.forEach(item => {
+        if (list.length > 0) {
+          list += ','
+          list += item.name
+        } else {
+          list+= item.name
+        }
+      })
+      this.fileInfo = list
     },
     fileUpload() {
       this.fileMadel = true;
@@ -1204,6 +1228,16 @@ export default {
         this.$message.error(res.message);
         fileList.pop();
       }
+      let list = ''
+      this.fileInfoList.forEach(item => {
+        if (list.length > 0) {
+          list += ','
+          list += item.name
+        } else {
+          list+= item.name
+        }
+      })
+      this.fileInfo = list
     },
     // 相关附件 上传之前钩子
     beforeUpload(file) {
@@ -1243,6 +1277,18 @@ export default {
       });
       window.open(routeUrl.href, "_blank");
     },
+    clickButtonToUpload2(file) {
+      const attId = file.attId
+      this.$preview(attId)
+    },
+    clickButtonToUpload (file) {
+      const attId = file.attId
+      if (attId) {
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
+      } else {
+        this.$message.warning('文件不存在,下载失败')
+      }
+    },
     // 导入标准数据成功后执行
     importFileSuccess(response, file) {
       if (response.ok) {

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

@@ -40,7 +40,7 @@
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
                 <div class="file-box" v-if="fileList.length > 0">
                   <p v-for="item in fileList"
-                     :key="item.id"> {{ item.name }}
+                     :key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }}
                     <i
                       title="下载"
                       @click="downloadFile(item.id)"
@@ -408,6 +408,11 @@ export default {
       }, e => {
       });
     },
+    //点击预览
+    clickButtonToUpload2(file) {
+      const attId = file
+      this.$preview(attId)
+    },
     /**
      * @Description: 点击下载
      */

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

@@ -49,22 +49,32 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
-                <div>
+                <el-input
-                  <el-upload
+                  disabled
-                    :action="uploadFileListPath"
+                  style="display: none;"
-                    show-file-list
+                  v-model="fileInfo"
-                    :file-list="fileInfoList"
+                  clearable
-                    name="file"
+                ></el-input>
-                    accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                <div v-if="fileInfoList.length > 0">
-                    :on-remove="delFileInfo"
+                  <div v-for="(item, index) in fileInfoList" :key="index" style="margin-right: 5px; padding-left: 10px">
-                    :on-success="uploadBackSuccess"
+                    <div class="fileClass" >
-                    :before-upload="beforeUpload"
+                      <span @click="clickButtonToUpload2(item)">{{ item.name }}</span>
-                  >
+                      <el-button
-                    <el-button class="common-button-default" size="mini">
+                        size="small"
-                      点击上传
+                        @click="clickButtonToUpload(item)"
-                    </el-button>
+                        icon="el-icon-download"
-                  </el-upload>
+                        style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
                 </div>
+                <el-button
+                  type="primary"
+                  class="common-button-primary"
+                  @click="fileUpload"
+                  size="mini">
+                  点击上传
+                </el-button>
               </el-form-item>
               <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
                 <el-radio-group v-model="signFlag" @change="selectSign">
@@ -669,17 +679,20 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
-    <el-dialog width="400px" :visible.sync="fileMadel" title="上传文件">
+    <el-dialog width="400px" :visible.sync="fileMadel" title="上传附件">
       <el-upload
+        v-if="fileMadel"
         multiple
+        class="upload-demo"
         drag
-        :action="fileUrl"
+        :action="uploadFileListPath"
         ref="importfile"
         name="file"
-        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+        accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-        :before-upload="beginImportFile"
+        :on-remove="delFileInfo"
-        :on-success="importFileSuccess"
+        :on-success="uploadBackSuccess"
-        :show-file-list="false"
+        :before-upload="beforeUpload"
+        :file-list="fileInfoList"
       >
         <div style="padding: 20px 0">
           <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -762,6 +775,7 @@ export default {
       sarAccessListDatas: [], //国家地区清单表格
       uploadFileListPath: "api/att/attFile/upload", // 上传的地址
       fileInfoList: [], // 上传的附件
+      fileInfo: '', // 展示的附件
       fileIds: [], // 上传的附件
       fileListName: [], //上传的附件名称
       standardData: [], //添加标准数据
@@ -1122,6 +1136,16 @@ export default {
           this.fileInfoList.splice(index,1)
         }
       })
+      let list = ''
+      this.fileInfoList.forEach(item => {
+        if (list.length > 0) {
+          list += ','
+          list += item.name
+        } else {
+          list+= item.name
+        }
+      })
+      this.fileInfo = list
     },
     fileUpload() {
       this.fileMadel = true;
@@ -1135,6 +1159,16 @@ export default {
         this.$message.error(res.message);
         fileList.pop();
       }
+      let list = ''
+      this.fileInfoList.forEach(item => {
+        if (list.length > 0) {
+          list += ','
+          list += item.name
+        } else {
+          list+= item.name
+        }
+      })
+      this.fileInfo = list
     },
     // 相关附件 上传之前钩子
     beforeUpload(file) {
@@ -1174,6 +1208,18 @@ export default {
       });
       window.open(routeUrl.href, "_blank");
     },
+    clickButtonToUpload2(file) {
+      const attId = file.attId
+      this.$preview(attId)
+    },
+    clickButtonToUpload (file) {
+      const attId = file.attId
+      if (attId) {
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
+      } else {
+        this.$message.warning('文件不存在,下载失败')
+      }
+    },
     // 导入标准数据成功后执行
     importFileSuccess(response, file) {
       if (response.ok) {

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

@@ -52,21 +52,32 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
-                <el-upload
+                <el-input
-                  :action="uploadFileListPath"
+                  disabled
-                  show-file-list
+                  style="display: none;"
-                  :file-list="fileInfoList"
+                  v-model="fileInfo"
-                  name="file"
+                  clearable
-                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+                ></el-input>
-                  :on-remove="delFileInfo"
+                <div v-if="fileInfoList.length > 0">
-                  :on-success="uploadBackSuccess"
+                  <div v-for="(item, index) in fileInfoList" :key="index" style="margin-right: 5px; padding-left: 10px">
-                  :before-upload="beforeUpload"
+                    <div class="fileClass" >
-                  :on-preview="handleOnPreview"
+                      <span @click="clickButtonToUpload2(item)">{{ item.name }}</span>
-                >
+                      <el-button
-                  <el-button class="common-button-default" size="mini">
+                        size="small"
-                    点击上传
+                        @click="clickButtonToUpload(item)"
-                  </el-button>
+                        icon="el-icon-download"
-                </el-upload>
+                        style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
+                </div>
+                <el-button
+                  type="primary"
+                  class="common-button-primary"
+                  @click="fileUpload"
+                  size="mini">
+                  点击上传
+                </el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -381,6 +392,27 @@
         @checkedRole="checkedRole"
         :nodeList="nodeList"
     ></Role-tree>
+    <el-dialog width="400px" :visible.sync="fileMadel" title="上传附件">
+      <el-upload
+        v-if="fileMadel"
+        multiple
+        class="upload-demo"
+        drag
+        :action="uploadFileListPath"
+        ref="importfile"
+        name="file"
+        accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
+        :on-remove="delFileInfo"
+        :on-success="uploadBackSuccess"
+        :before-upload="beforeUpload"
+        :file-list="fileInfoList"
+      >
+        <div style="padding: 20px 0">
+          <i class="el-icon-upload" style="color: #3399ff"></i>
+          <p>点击或拖拽上传文件</p>
+        </div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
@@ -404,6 +436,7 @@ export default {
       // 当前流程类型(1待办/2已办)
       processType: 1,
       searching: false,
+      fileMadel: false,
       commentText:'',
       nodeList:[],
       isTransfer: false,
@@ -436,6 +469,7 @@ export default {
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
       fileList:[],
       fileInfoList: [], // 上传的附件
+      fileInfo: '', //展示的附件
       dataList: [],//清单里的标准数据
       standardData: [], //添加标准数据
       standModel: false, // 选择标准抽屉状态
@@ -709,6 +743,19 @@ export default {
           this.fileInfoList.splice(index,1)
         }
       })
+      let list = ''
+      this.fileInfoList.forEach(item => {
+        if (list.length > 0) {
+          list += ','
+          list += item.name
+        } else {
+          list+= item.name
+        }
+      })
+      this.fileInfo = list
+    },
+    fileUpload() {
+      this.fileMadel = true;
     },
     // 上传文件成功回调
     uploadBackSuccess (res, file, fileList) {
@@ -720,6 +767,16 @@ export default {
         this.$message.error(res.message)
         fileList.pop()
       }
+      let list = ''
+      this.fileInfoList.forEach(item => {
+        if (list.length > 0) {
+          list += ','
+          list += item.name
+        } else {
+          list+= item.name
+        }
+      })
+      this.fileInfo = list
     },
     //上传之前的钩子
     beforeUpload (file) {
@@ -748,10 +805,16 @@ export default {
       }
       return true;
     },
-    handleOnPreview(file) {
+    clickButtonToUpload2(file) {
-      let attId = file.id
+      const attId = file.id
-      if (attId != null && attId !== "") {
+      this.$preview(attId)
-        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
+    },
+    clickButtonToUpload (file) {
+      const attId = file.id
+      if (attId) {
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
+      } else {
+        this.$message.warning('文件不存在,下载失败')
       }
     },
     getData() {

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

@@ -122,7 +122,7 @@
                     根据类别、编号、中英文名称查询
                   </el-button>
                 </el-form-item>
-                <el-form-item v-if="verifySarStandard" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
+                <el-form-item style="display: none" v-if="verifySarStandard" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
                   <el-radio-group v-model="form.isRelateAccess">
                     <el-radio label="1">是</el-radio>
                     <el-radio label="2">否</el-radio>
@@ -681,7 +681,7 @@
                 <!--适用认证-->
                 <template>
                   <custom-select-array
-                    style="margin-left: -12px;"
+                    style="margin-left: -12px; display: none"
                     :config="applyAuthOptions"
                     v-model="form['syrz']"
                   ></custom-select-array>

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

@@ -135,7 +135,7 @@
                     value-format="yyyy-MM-dd">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
+                <el-form-item style="display: none" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
                   <el-radio-group v-model="form.isRelateAccess" disabled>
                     <el-radio label="1">是</el-radio>
                     <el-radio label="2">否</el-radio>
@@ -462,7 +462,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
+                <el-form-item style="display: none" label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
                   <el-select v-model="form.syrz" placeholder="请选择适用认证" multiple disabled>
                     <el-option
                       v-for="item in applyAuthOptions"
@@ -707,7 +707,7 @@
       </div>
     </div>
     <div class="content" v-if="active === '3'">
-      <div class="flow-list">
+      <div >
         <el-table
           height="100%"
           ref="selection"
@@ -1247,7 +1247,6 @@ export default {
       this.isSubmit = true;
       this.form.commentText = this.commentText;
       this.form.approvalOpinion = this.formTongGuo.approvalOpinion;
-      console.log(this.form);
       if (this.form.syrz.length === 0) {
         this.form.syrz = "";
       }
@@ -1269,9 +1268,21 @@ export default {
       if (this.form.zrgcs.length === 0) {
         this.form.zrgcs = "";
       }
+      let qcdwName = []
+      if(this.form.qcdw && this.form.qcdw.length > 0){
+      this.form.qcdw.map(item => {
+          this.qcdwOptions.forEach(items => {
+            if(item === items.value){
+              qcdwName.push(items.label)
+            }
+          })
+        })
+      }
       this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
       this.form.menuIds = this.form.treeListId;
       this.form.BBFDTBZ = this.form.bfbdtbzh
+      this.form.qcdw =  qcdwName
+      this.form.qcdw =  qcdwName.splice(',')
       const json = JSON.stringify(this.form);
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,

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

@@ -134,7 +134,7 @@
                       placeholder="请选择标准发布日期">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
+                <el-form-item style="display: none" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
                   <el-radio-group v-model="form.isRelateAccess" disabled>
                     <el-radio label="1">是</el-radio>
                     <el-radio label="2">否</el-radio>
@@ -425,7 +425,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
+                <el-form-item style="display: none" label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
                   <el-select v-model="form.syrz" placeholder="请选择适用认证" multiple disabled>
                     <el-option
                         v-for="item in applyAuthOptions"

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

@@ -121,7 +121,7 @@
                     placeholder="请选择标准发布日期">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
+                <el-form-item style="display: none" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
                   <el-radio-group v-model="form.isRelateAccess">
                     <el-radio label="1">是</el-radio>
                     <el-radio label="2">否</el-radio>
@@ -945,7 +945,7 @@
                 <!--适用认证-->
                 <template>
                   <custom-select-array
-                    style="margin-left: -12px"
+                    style="margin-left: -12px; display: none"
                     :config="applyAuthOptions"
                     v-model="form['syrz']"
                   ></custom-select-array>
@@ -1563,6 +1563,7 @@ export default {
   data() {
     return {
       submitType: '',
+      bpnId: '',
       modalShowRoleFlag: false,
       fileList: [],
       caFileList: [],
@@ -2612,6 +2613,7 @@ export default {
             } else {
               //表单文件处理
               this.getFormFieldList(processForm.form)
+              this.commentText = processForm.form.commentText
             }
           }
         }).catch(e => {
@@ -2623,6 +2625,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
         this.defaultCheckedKeys = [this.form.standSystem];
@@ -2665,7 +2668,6 @@ export default {
     //   })
     // },
     initializeFileList(property, value) {
-      console.log(property);
       switch (property) {
         case 'xgd':
           this.getFileList(value, this.xgdFileList);
@@ -2758,9 +2760,10 @@ export default {
       //表单文件处理
       this.fileInfoHandle();
       this.form.country = this.countryArr;
+      this.form.commentText = this.commentText;
       this.saveLoading = true
       let _formData = new FormData()
-      _formData.append('id', this.bpnId)
+      _formData.append("id", this.bpnId || "");
       // _formData.append('createUser', this.$store.getters.userInfo.userId)
       // _formData.append('createUserName', this.$store.getters.userInfo.uName)
       _formData.append('prcType', '1')
@@ -2924,6 +2927,7 @@ export default {
     this.getData()
   },
   mounted() {
+    this.bpnId = this.$route.query.bpnId
     this.processTable()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this

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

@@ -119,7 +119,7 @@
                     placeholder="请选择标准发布日期">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
+                <el-form-item style="display: none" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
                   <el-radio-group v-model="form.isRelateAccess" disabled>
                     <el-radio label="1">是</el-radio>
                     <el-radio label="2">否</el-radio>
@@ -387,7 +387,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
+                <el-form-item style="display: none" label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
                   <el-select v-model="form.syrz" placeholder="请选择适用认证" multiple disabled>
                     <el-option
                       v-for="item in applyAuthOptions"

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

@@ -1,7 +1,8 @@
 <template>
     <div class="ZQYJAddFileDetails">
         <div class="left">
-            <iframe name = "iframeMap" id="iframeMapViewComponent"  v-bind:src="'/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + $route.query.attId)"
+          <loading :loading="iframeLoading">正在加载文档</loading>
+            <iframe name = "iframeMap" id="iframeMapViewComponent"  v-bind:src="iframeUrl"
                     width="100%" height="100%"
                     frameborder="0" scrolling="no" ref="iframeDom"
             ></iframe>
@@ -48,11 +49,16 @@
 </template>
 
 <script>
+    import { getBusStandFileByAttId } from "api/process";
+    import { kkFileViewUrl } from "@/sysConfig";
+
     export default {
         name: "ZQYJAddFileDetails",
         data () {
             return {
                 options: [],
+                iframeUrl:"",
+               iframeLoading: false,
                 opinionContent: { // 抽屉数据
                     partCode: '',
                     oldText: '',
@@ -79,6 +85,33 @@
             }
         },
         methods: {
+          previewShow(attId) {
+            this.iframeLoading = true
+            return new Promise((resolve, reject) => {
+              getBusStandFileByAttId({
+                attId
+              }).then(res => {
+                if(res){
+                  const history = res;
+                  const editFileInfo = res.data
+                  if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
+                    this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl
+                  }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
+                    this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)
+                  }else {
+                    const nowTime = new Date().getTime()
+                    // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
+                    this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl));
+                  }
+                  this.iframeLoading = false
+                  this.$forceUpdate()
+                  resolve(history)
+                }
+              }).catch(e => {
+              })
+            })
+            console.log(this.iframeUrl);
+          },
             saveUserInfo () {
                 this.$refs['formAdd'].validate((valid) => {
                     if (valid) {
@@ -112,6 +145,8 @@
             },
         },
         mounted() {
+          const attId = this.$route.query.attId
+          this.previewShow(attId)
             this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
                 standId: this.$route.query.standId,
                 fileType: this.$route.query.fileType,

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

@@ -354,54 +354,30 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
-          this.form.fjList = data.fjList || data.form.fjList
-          if (data.fjListId === '') {
-            this.form.fjListId = ''
-          } else {
-            this.form.fjListId =  data.form.fjListId || data.fjListId
-          }
           this.commentText9 = data.commentText9 || ''
+          this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
+          this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+          this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
+          this.form.fjList = data.fjList || data.form.fjList
           this.form.cid = data.cid || data.form.cid;
           this.form.endTime = data.endTime || data.form.endTime;
-          this.form.cname = data.cname || data.form.cname;
-          this.oldData = JSON.parse(JSON.stringify(data.info))
-          var arr = []
-          data.info.forEach(item => {
-            arr.push(item)
-          })
-          this.json = data
           this.form.textType = data.textType || data.form.textType
           this.form.modelList = data.modelList || data.form.modelList
-          this.form.modelNameList = data.modelNameList || data.form.modelNameList
+          let newArr = data.info ? data.info : data.form.data
+          this.oldData = JSON.parse(JSON.stringify(newArr))
+          let arr = []
+          newArr.forEach(item => {
+            if (item.state != '3') {
+              arr.push(item)
+            }
+          })
+          this.json = data
           this.data = arr
+          this.data2 = newArr
         }).catch(e => {
         });
       });
-      // return new Promise((resolve, reject) => {
+    }
-      //   inboundLiaisonDetail({
-      //     taskIds: this.taskIds,
-      //     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
-      //     this.form.fjList = data.fjList
-      //     this.form.fjListId = data.fjListId
-      //     var arr = []
-      //     data.summaryList.forEach( item => {
-      //       if (item.state != '3') {
-      //         arr.push(item)
-      //       }
-      //     })
-      //     this.json = data
-      //     this.data = arr
-      //     this.oldData = data.oldinfo
-      //   }).catch(e => {
-      //   })
-      // })
-    },
   },
   mounted () {
     this.getHistoryData()

src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue

@@ -550,7 +550,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 103px');
+    height: calc(~'100% - 133px');
     overflow: auto;
 
     .tableTitle {

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

@@ -500,8 +500,9 @@ export default {
      */
     getFormFieldList(item) {
       this.$nextTick(() => {
-        this.standardSearch = item.standardSearch
+        this.standardSearch = JSON.parse(JSON.stringify(item))
-        this.roleForm = item.roleForm
+        // this.standardSearch = item.standardSearch
+        this.roleForm = JSON.parse(JSON.stringify(item))
       });
     },
     //tab发生变化
@@ -621,45 +622,69 @@ export default {
           if (valid) {
             this.$refs['roleForm'].validate((valid) => {
               if (valid) {
-                this.isSubmit = true
+                if (this.$route.query.type === 2) {
-                this.standardSearch.commentText = this.commentText
+                  this.isSubmit = true
-                var json = Object.assign(this.standardSearch, this.roleForm)
+                  this.standardSearch.commentText = this.commentText
-                this.$http.post('lawss/activiti/startProcessRollBack', {
+                  var json = Object.assign(this.standardSearch, this.roleForm)
-                  createUser: this.$store.getters.userInfo.userId,
+                  this.$http.post('lawss/activiti/completeTaskNew', {
-                  createUserName: this.$store.getters.userInfo.userName,
+                    taskIds: this.$route.query.taskIds,
-                  type: '24',
+                    userId : this.$store.getters.userInfo.userId,
-                  json: JSON.stringify({
+                    json: JSON.stringify(json),
-                    roleForm: this.roleForm,
+                    specialJson: JSON.stringify({
-                    qbfsForm: this.standardSearch,
+                      roleForm: this.roleForm,
-                    commentText: this.commentText
+                      qbfsForm: this.standardSearch,
-                  })
+                      commentText: this.commentText
-                }, {
-                  _this: this
-                }, res => {
-                  if (res.ok) {
-                    this.$http.post('lawss/activiti/completeTask', {
-                      taskIds: res.data,
-                      userId : this.$store.getters.userInfo.userId,
-                      json: JSON.stringify(json)
-                    }, {
-                      _this: this
-                    }, res => {
-                      if (res.success) {
-                        this.$message.success(res.message)
-                        if (this.bpnId !== '') {
-                          let taskId = {
-                            id: this.bpnId
-                          }
-                          taskDel(taskId).then(res=>{
-                            return res
-                          })
-                        }
-                        this.isSubmit = false
-                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                      }
                     })
-                  }
+                  }, {
-                })
+                    _this: this
+                  }, res => {
+                    if (res.success) {
+                      this.$message.success(res.message)
+                      this.isSubmit = false
+                      this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    }
+                  })
+                } else {
+                  this.isSubmit = true
+                  this.standardSearch.commentText = this.commentText
+                  var json = Object.assign(this.standardSearch, this.roleForm)
+                  this.$http.post('lawss/activiti/startProcessRollBack', {
+                    createUser: this.$store.getters.userInfo.userId,
+                    createUserName: this.$store.getters.userInfo.userName,
+                    type: '24',
+                    json: JSON.stringify({
+                      roleForm: this.roleForm,
+                      qbfsForm: this.standardSearch,
+                      commentText: this.commentText
+                    })
+                  }, {
+                    _this: this
+                  }, res => {
+                    if (res.ok) {
+                      this.$http.post('lawss/activiti/completeTask', {
+                        taskIds: res.data,
+                        userId : this.$store.getters.userInfo.userId,
+                        json: JSON.stringify(json)
+                      }, {
+                        _this: this
+                      }, res => {
+                        if (res.success) {
+                          this.$message.success(res.message)
+                          if (this.bpnId !== '') {
+                            let taskId = {
+                              id: this.bpnId
+                            }
+                            taskDel(taskId).then(res=>{
+                              return res
+                            })
+                          }
+                          this.isSubmit = false
+                          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        }
+                      })
+                    }
+                  })
+                }
               }else {
                 this.$message.warning('请检查人员信息表单是否填写完整')
               }

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

@@ -569,7 +569,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: calc(~'100% - 103px');
+    height: calc(~'100% - 133px');
     overflow: auto;
 
     .tableTitle {

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

@@ -227,6 +227,7 @@
     <!-- 选择项目弹窗-->
     <el-drawer
       title="选择项目"
+      class="drawer-table"
       :visible.sync="projectModel"
       size="900px"
       custom-class="demo-drawer"
@@ -357,6 +358,7 @@
     </el-drawer>
     <!--    添加标准抽屉-->
     <el-drawer
+      class="drawer-table"
       title="添加标准"
       :wrapperClosable="false"
       :visible.sync="standModel"
@@ -439,7 +441,7 @@
         <el-table
           ref="selections"
           tooltip-effect="dark"
-          style="width: 100%;overflow-y: auto;overflow-x: hidden;"
+          style="width: 100%;"
           border
           :loading="lawInfoTableLoading"
           :data="lawInfoTable"
@@ -1543,6 +1545,14 @@ export default {
     height: calc(~'100% - 65px');
     overflow: auto;
   }
+  .drawer-table{
+    /deep/.el-drawer__body{
+      overflow-y: hidden;
+    }
+    /deep/.demo-drawer-content{
+      overflow-y: hidden;
+    }
+  }
 }
 </style>
 <style lang="less">
@@ -1550,6 +1560,14 @@ export default {
     .el-checkbox {
       display: block !important;
     }
+    .drawer-table{
+      /deep/.el-drawer__body{
+        overflow-y: hidden;
+      }
+      /deep/.demo-drawer-content{
+        overflow-y: hidden;
+      }
+    }
   }
 </style>
 

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

@@ -216,6 +216,7 @@
     </div>
     <!--    添加标准抽屉-->
     <el-drawer
+      class="drawer-table"
       title="添加标准"
       :wrapperClosable="false"
       :visible.sync="standModel"
@@ -1233,6 +1234,14 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .drawer-table{
+    /deep/.el-drawer__body{
+      overflow-y: hidden;
+    }
+    /deep/.demo-drawer-content{
+      overflow-y: hidden;
+    }
+  }
 }
 </style>
 

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

@@ -216,6 +216,7 @@
     </div>
     <!--    添加标准抽屉-->
     <el-drawer
+      class="drawer-table"
       title="添加标准"
       :wrapperClosable="false"
       :visible.sync="standModel"
@@ -1233,6 +1234,14 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  .drawer-table{
+    /deep/.el-drawer__body{
+      overflow-y: hidden;
+    }
+    /deep/.demo-drawer-content{
+      overflow-y: hidden;
+    }
+  }
 }
 </style>
 

src/pages/processCenter/pages/phone/bzrk/step2.vue

@@ -103,7 +103,7 @@
                 value-format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
+            <el-form-item style="display: none" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
               <el-radio-group v-model="form.isRelateAccess" disabled>
                 <el-radio label="1">是</el-radio>
                 <el-radio label="2">否</el-radio>
@@ -297,7 +297,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
+            <el-form-item style="display: none" label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
               <el-select v-model="form.syrz" placeholder="请选择适用认证" multiple disabled>
                 <el-option
                   v-for="item in applyAuthOptions"

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -2075,7 +2075,7 @@ export default {
           if (row.taskInfo === '标准法规部部长审核') {
             this.$router.push({
               name: 'qbfzStep2',
-              query:{
+              query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,
@@ -2083,6 +2083,15 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if (row.taskInfo === '重新起草') {
+            this.$router.push({
+              name: 'qbfzStep1',
+              query:{
+                type: 2,
+                taskIds: row.taskIds,
+                prcId: row.prcId
+              }
+            })
           } else if(row.taskInfo === '会签') {
             this.$router.push({
               name: 'qbfzStep3',

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

@@ -230,18 +230,30 @@
     <div class="list-entry">
       <el-divider content-position="left">清单条目</el-divider>
       <div class="action-bar">
+        <el-button
+          class="common-button-default export-button"
+          size="mini" @click="addImport"
+          v-btn-permission="''"
+        >导入
+        </el-button>
         <el-button
           class="common-button-default export-button"
           size="mini" @click="exportAccessInfo('apart')"
           v-btn-permission="''"
-        ><i class="iconfont">&#xe6e9;</i>导出
+        >导出
+        </el-button>
+        <el-button
+          class="common-button-default export-button"
+          size="mini" @click="templateDownload"
+          v-btn-permission="''"
+        >模板下载
         </el-button>
         <el-button
           class="common-button-default delete-button"
           size="mini" @click="deleteSelectSarAccessInfo"
           v-if="!disabledFlag"
           v-btn-permission="''"
-        ><i class="iconfont">&#xe61b;</i>删除
+        >批量删除
         </el-button>
       </div>
       <!--   清单条目的列表页   -->
@@ -309,6 +321,12 @@
           width="180px"
           label="能源类型">
         </el-table-column>
+        <el-table-column
+          prop="syrz"
+          align="center"
+          width="180px"
+          label="适用认证">
+        </el-table-column>
         <el-table-column
           prop="ssrq"
           align="center"
@@ -430,6 +448,16 @@
         <el-form-item label="能源类型" prop="nylx">
           <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
         </el-form-item>
+        <el-form-item label="适用认证" prop="syrz" >
+          <el-select v-model="editRowData.syrz" multiple placeholder="请选择适用认证" style="width: 100%">
+            <el-option
+              v-for="item in applyAuthOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.label">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="标准实施日期" prop="putTime">
           <el-date-picker
             clearable
@@ -697,6 +725,24 @@
         <el-button type="primary" size="mini" @click="okQueryInfo(1)">确认</el-button>
       </div>
     </el-drawer>
+    <!--导入模态窗-->
+    <el-dialog width="400px" :visible.sync="importModalshowflag" title="导入文件" :footer-hide="true">
+      <el-upload
+        drag
+        :show-file-list="showUploadlist"
+        :on-success="importFileStand"
+        :before-upload="beforeUpload"
+        :action="importExcelUrls"
+        :file-list="defaultFileList"
+        accept=".xlsx"
+        name="file"
+        ref="importFileAboutStand">
+        <div style="padding: 20px 0">
+          <i class="el-icon-upload" style="color: #3399ff"></i>
+          <p>点击或拖拽上传文件</p>
+        </div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -722,6 +768,7 @@ import {mapGetters} from "vuex";
 import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess";
 import {interfaceUrl} from "@/sysConfig";
 import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
+import { templateDownload } from "api/process";
 
 export default {
   name: "ListOfStandardsAndRegulationsDetails",
@@ -753,6 +800,9 @@ export default {
       countryAreaMap: {},
       // 编辑抽屉状态
       drawerEdit: false,
+      importModalshowflag: false,
+      defaultFileList: [], // 默认显示
+      showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表
       // 编辑框数据
       editRowData: {
         id: '',
@@ -812,6 +862,7 @@ export default {
       /** ****************************/
       zrbmOptions: [], // 责任部门
       categoryOptions: [], // 能源类型
+      applyAuthOptions: [], // 适用认证
       energyKindOptions: [], // 能源种类list
       CycxOptions: [],
       sycpxOptions: [], // 适用产品线
@@ -896,6 +947,7 @@ export default {
       exportTestItemNameFlag: false, // 导出模态框
       exportName: '', // 导出名称
       importExcelUrl: '/api/lawss/sarSarAccessInfo/importSarAccessInfo?accessId=', // 导入接口
+      importExcelUrls: '/api/sarLawsDetailedList/sar-laws-detailed-list/importData', // 导入接口
       // 新增标准法规 验证
       addEntryFormRules: {
         code: [
@@ -963,6 +1015,87 @@ export default {
     }
   },
   methods: {
+    //模板下载
+    templateDownload(){
+      templateDownload().then(res => {
+        let blob = new Blob([res], { type: 'application/vnd.ms-excel' }); //以xls文件为例
+        //浏览器兼容，Google和火狐支持a标签的download，IE不支持
+        if (window.navigator && window.navigator.msSaveBlob) {
+          //IE浏览器、微软浏览器
+          /* 经过测试，微软浏览器Microsoft Edge下载文件时必须要重命名文件才可以打开，
+            IE可不重命名，以防万一，所以都写上比较好 */
+          window.navigator.msSaveBlob(blob, '清单下载模板.xlsx');
+        } else {
+          //其他浏览器
+          let link = document.createElement('a'); // 创建a标签
+          link.style.display = 'none';
+          let objectUrl = URL.createObjectURL(blob);
+          link.href = objectUrl;
+          link.download = '清单下载模板.xlsx';
+          link.click();
+          URL.revokeObjectURL(objectUrl);
+        }
+      })
+    },
+    //导入
+    addImport(){
+      this.importModalshowflag = true
+    },
+    // 导入标准数据成功后执行
+    importFileStand (res, file, fileList) {
+      let files = {}
+      if (res.ok) {
+        files.attId = res.data.attId
+        files.fileName = res.data.name
+        if (res.data.standNum != null && res.data.standNum !== '') {
+          files.standNumSplit = res.data.standNum
+        }
+        if (res.data.standName != null && res.data.standName !== '') {
+          files.standNameSplit = res.data.standName
+        }
+        this.defaultFileList.push(file)
+        const _formData = new FormData()
+        _formData.append('standNumSplit', files.standNumSplit)
+        _formData.append('standNameSplit', files.standNameSplit)
+        _formData.append('fileType', files.fileType)
+        _formData.append('file', file.raw)
+        this.$http.postData('importWkExcel/importData', _formData,{
+          _this: this
+        }, res => {
+          console.log(res);
+          if(res.ok){
+            if(res.data.length){
+              this.qblx_pageData.qblxData = res.data
+              this.$message.success('文件上传成功')
+            }else{
+              this.$message.warning('请勿上传为空的文件')
+            }
+          }else{
+            const arr = res.data.split('；')
+            let newDatas = [],h = this.$createElement;
+            for (const i in arr) {
+              newDatas.push(h('p', null, arr[i]))
+            }
+            this.$confirm(h('div', null, newDatas), "提示", {
+              confirmButtonText: "确认",
+              confirmButtonClass: "common-button-primary",
+              dangerouslyUseHTMLString: true,
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(() => {
+            }).catch(() => {
+            });
+          }
+        })
+        this.importModalshowflag = false
+        this.$nextTick(() => {
+          this.$refs.importFileAboutStand.clearFiles()
+        })
+      } else {
+        this.defaultFileList = []
+        this.$message.error(res.message)
+      }
+    },
     // 高级检索
     selectMoreBtn() {
       this.sarAccessInfo.standNumber = ''
@@ -1236,6 +1369,19 @@ export default {
               if (item.attrInfoCaseMap !== undefined) {
                 this.$set(item, "typeApplicable", item.attrInfoCaseMap.cllx);
                 this.$set(item, "nylx", item.attrInfoCaseMap.nylx);
+                this.$set(item, "syrz", item.attrInfoCaseMap.syrz);
+              }
+              // 适用认证转换
+              if (item.syrz !== null) {
+                let k = (item.syrz || "").split(",");
+                for (let i in this.applyAuthOptions) {
+                  for (let m = 0; m < k.length; m++) {
+                    if (this.applyAuthOptions[i].value === k[m]) {
+                      k[m] = this.applyAuthOptions[i].label;
+                    }
+                    item.syrz = k.join(",");
+                  }
+                }
               }
               // 能源类型转换
               if (item.nylx !== null) {
@@ -1318,6 +1464,11 @@ export default {
 
       this.rowList = row;
       this.editRowData = this.rowList;
+      if(this.editRowData.syrz === '-'){
+        this.editRowData.ssrq = "";
+      }else if(this.editRowData.syrz){
+        this.editRowData.syrz = this.editRowData.syrz.split(',')
+      }
       if (this.editRowData.ssrq === "-") {
         this.editRowData.ssrq = "";
       } else if (this.editRowData.ssrq !== null && this.editRowData.ssrq !== "-" && this.editRowData.ssrq !== "") {
@@ -1339,12 +1490,16 @@ export default {
     cancelInfo() {
       let Item = JSON.parse(localStorage.getItem('obj'))
       this.editRowData.ssrq = Item.ssrq
+      this.editRowData.syrz = Item.syrz
       this.editRowData.xcxssrqgj = Item.xcxssrqgj
       this.editRowData.zccssrqgj = Item.zccssrqgj
       this.drawerEdit = false
     },
     // 抽屉提交按钮
     saveInfo() {
+      if(this.editRowData.syrz){
+        this.editRowData.syrz = this.editRowData.syrz.join(',')
+      }
       if (this.editRowData.ssrq !== '' && this.editRowData.ssrq !== null) {
         this.editRowData.ssrq = this.editRowData.ssrq.join(',')
       }
@@ -1420,6 +1575,7 @@ export default {
           let rowlist1 = []
           let rowlist2 = []
           let rowlist3 = []
+          let rowlist4 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
             if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
@@ -1437,17 +1593,24 @@ export default {
             } else {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
             }
+            if(this.sarAccessInfoList[i].syrz === null || this.sarAccessInfoList[i].syrz === undefined) {
+              rowlist4.push(this.sarAccessInfoList[i].syrz = '-')
+            }else {
+              rowlist4.push(this.sarAccessInfoList[i].syrz)
+            }
           }
           rowlist = rowlist.join(',')
           rowlist1 = rowlist1.join(';')
           rowlist2 = rowlist2.join(';')
           rowlist3 = rowlist3.join(';')
+          rowlist4 = rowlist4.join(';')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.reNewPeople = this.$store.getters.userInfo.userId
           sarAccessEO.inforlist = rowlist
           sarAccessEO.inforlist1 = rowlist1
           sarAccessEO.inforlist2 = rowlist2
           sarAccessEO.inforlist3 = rowlist3
+          sarAccessEO.inforlist4 = rowlist4
           sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
           // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
@@ -2169,6 +2332,7 @@ export default {
         // 能源类型数据字典
         this.CycxOptions = res.data.CLLX
         this.categoryOptions = res.data.NYLXCLASS // 能源类型
+        this.applyAuthOptions = res.data.SYRZCLASS // 能源类型
         // 适用车型数据字典
         this.applyArcticOptions = res.data.PRODUCTTYPE
         // 适用产品线数据字典
@@ -2184,6 +2348,7 @@ export default {
         this.setMap(this.textStatusOptions)
         this.setMap(this.drawerCountryOptions)
         this.setMap(this.categoryOptions)
+        this.setMap(this.applyAuthOptions)
         this.getGzzOption()
       }
     })

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

@@ -133,7 +133,7 @@
           <el-table-column
             prop="standName"
             label="中文名称"
-            width="180px"
+            min-width="180px"
           >
             <template slot-scope="scope">
               <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
@@ -142,7 +142,7 @@
           <el-table-column
             prop="standEnName"
             align="center"
-            width="180px"
+            min-width="180px"
             label="英文名称">
             <template slot-scope="scope">
               <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
@@ -189,7 +189,7 @@
           <el-table-column
             show-overflow-tooltip
             prop="sycpx"
-            width="180px"
+            min-width="180px"
             align="center"
             label="适用产品线">
           </el-table-column>

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -528,6 +528,7 @@
                 ></custom-date-pick>
                 <!--</el-form-item>-->
                 <el-form-item
+                  style="display: none"
                   prop="isRelateAccess"
                   label-width="150px"
                   class="add-form-item"
@@ -861,7 +862,7 @@
                     </el-form-item>
                   </template>
                   <!--                  全选-->
-                  <template v-else>
+                  <template v-else-if="field.attrField !== 'SYRZ'">
                     <custom-select-array
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
@@ -1709,7 +1710,7 @@
                   <el-form-item label="是否纳入标准清单" class="add-form-item form-item-disabled">
                     <el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
                       <el-option value="1" label="是"></el-option>
-                      <el-option value="0" label="否"></el-option>
+                      <el-option value="2" label="否"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -546,7 +546,7 @@
                   <el-form-item label="是否纳入标准清单" title="是否纳入标准清单" class="add-form-item form-item-disabled">
                     <el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
                       <el-option value="1" label="是"></el-option>
-                      <el-option value="0" label="否"></el-option>
+                      <el-option value="2" label="否"></el-option>
                     </el-select>
                   </el-form-item>
                   <!--            标记-->
@@ -975,6 +975,7 @@
                 ></custom-date-pick>
                 <!--</el-form-item>-->
                 <el-form-item
+                  style="display: none"
                   prop="isRelateAccess"
                   label-width="150px"
                   class="add-form-item"
@@ -1219,7 +1220,7 @@
                                             </el-input>-->
                     </el-form-item>
                   </template>
-                  <template v-else>
+                  <template v-else-if="field.attrField !== 'SYRZ'">
                     <custom-select-array
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"