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

# Conflicts:
#	src/pages/details/otherStandardDetails/index.vue

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

@@ -48,6 +48,7 @@
                   <div style="display: flex;">
                     <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       {{ item.fileName }}
+                        <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
                     </div>
                   </div>
                 </el-form-item>
@@ -287,6 +288,9 @@ export default {
     ProcessTitle
   },
   methods: {
+      downloadFile (attId) {
+          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+      },
       handleTransfer() {
           this.drawerModal = true
       },

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

@@ -48,6 +48,7 @@
                   <div style="display: flex;">
                     <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       {{ item.fileName }}
+                      <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
                     </div>
                   </div>
                 </el-form-item>
@@ -266,6 +267,9 @@ export default {
     ProcessTitle
   },
   methods: {
+    downloadFile (attId) {
+      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+    },
       handleTransfer() {
           this.drawerModal = true
       },

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

@@ -48,6 +48,7 @@
                   <div style="display: flex;">
                     <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       {{ item.fileName }}
+                      <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
                     </div>
                   </div>
                 </el-form-item>
@@ -306,6 +307,9 @@ export default {
     ProcessTitle
   },
   methods: {
+    downloadFile (attId) {
+      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+    },
       handleTransfer() {
           this.drawerModal = true
       },

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

@@ -48,6 +48,7 @@
                   <div style="display: flex;">
                     <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       {{ item.fileName }}
+                      <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
                     </div>
                   </div>
                 </el-form-item>
@@ -290,6 +291,9 @@ export default {
     ProcessTitle
   },
   methods: {
+    downloadFile (attId) {
+      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+    },
       handleTransfer() {
           this.drawerModal = true
       },

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

@@ -48,6 +48,7 @@
                   <div style="display: flex;">
                     <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       {{ item.fileName }}
+                      <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
                     </div>
                   </div>
                 </el-form-item>
@@ -287,6 +288,9 @@ export default {
     ProcessTitle
   },
   methods: {
+    downloadFile (attId) {
+      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+    },
       handleTransfer() {
           this.drawerModal = true
       },

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

@@ -48,6 +48,7 @@
                   <div style="display: flex;">
                     <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       {{ item.fileName }}
+                      <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
                     </div>
                   </div>
                 </el-form-item>
@@ -287,6 +288,9 @@ export default {
     ProcessTitle
   },
   methods: {
+    downloadFile (attId) {
+      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+    },
       handleTransfer() {
           this.drawerModal = true
       },

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

@@ -48,6 +48,7 @@
                   <div style="display: flex;">
                     <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       {{ item.fileName }}
+                      <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
                     </div>
                   </div>
                 </el-form-item>
@@ -287,6 +288,9 @@ export default {
     ProcessTitle
   },
   methods: {
+    downloadFile (attId) {
+      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+    },
       handleTransfer() {
           this.drawerModal = true
       },

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

@@ -15,7 +15,7 @@
           <template slot="title">基础信息</template>
         </process-title>
         <el-form
-            v-if="foldFormFlag === false"
+          v-if="foldFormFlag === false"
           :model="listForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -58,42 +58,42 @@
         <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
         <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
         <el-form
-            v-if="foldFormFlag === true"
-            style="display: none"
-            :model="listForm"
-            class="label-input-form prc-content-border"
-            label-width="150px"
+          v-if="foldFormFlag === true"
+          style="display: none"
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
         >
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                 <el-input
-                    v-model="listForm.standNumber"
-                    placeholder="请输入标准编号"
-                    readonly
-                    @click.native="handlePreview(listForm)"
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
-                    v-model="listForm.standName"
-                    placeholder="请输入标准名称"
-                    readonly
-                    @click.native="handlePreview(listForm)"
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                    v-model="listForm.certifiedEngineerName"
-                    placeholder="请选择认证工程师"
-                    readonly
+                  v-model="listForm.certifiedEngineerName"
+                  placeholder="请选择认证工程师"
+                  readonly
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                    v-model="listForm.qualityEngineerName"
-                    placeholder="请选择质量工程师"
-                    readonly
+                  v-model="listForm.qualityEngineerName"
+                  placeholder="请选择质量工程师"
+                  readonly
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -111,9 +111,9 @@
           style="width: 100%"
           border
           @selection-change="selectStandChange"
-          :height="sarProStateTableHeight"
+          height="52%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
           <el-table-column
             type="selection"
             width="55"
@@ -353,6 +353,27 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+
+<!--    <ProcessFooter-->
+<!--      show-submit-->
+<!--      show-transfer-->
+<!--      :submitLoading="isSubmit"-->
+<!--      :transfer-loading="isTransfer"-->
+<!--      :saveLoading="saveLoading"-->
+<!--      :approval="true"-->
+<!--      @back="beforeBack"-->
+<!--      @transfer="handleTransfer"-->
+<!--      @submit="handleSubmit"-->
+<!--    >-->
+<!--    </ProcessFooter>-->
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedTransferRole"
+      :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
@@ -360,7 +381,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
 
 export default {
   name: "xmpgStep1-7",
@@ -373,6 +394,11 @@ export default {
     return {
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
+      nodeList:[],
+      drawerTitle:'',
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
       detailData: [],
       sarProStateTableHeight: null, // 项目列表高度
       // 当前流程类型(1待办/2已办)
@@ -451,6 +477,47 @@ export default {
     foldForm() {
       this.foldFormFlag = !this.foldFormFlag
     },
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,
@@ -517,35 +584,31 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      if(this.commentText === null || this.commentText === undefined  || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      } else {
-        this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-        this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
-        this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-        this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
-        this.listForm.commentText = this.commentText;
-        this.listForm.standId = this.listForm.standId;
-        this.listForm.fenFlag = "1";
-        this.listForm.dataList = this.dataList
-        const json = JSON.stringify(this.listForm);
-        this.isSubmit = true
-        this.$http.post('lawss/activiti/completeTask', {
-          taskIds: this.taskIds,
-          userId: this.userId,
-          json: json,
-        }, {
-          _this: this
-        }, res => {
-          if (res.success) {
-            this.$message.success(res.message)
-            this.$router.push('/processCenter')
-          }
-          this.isSubmit = false
-        }, e => {
+      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.commentText = this.commentText;
+      this.listForm.standId = this.listForm.standId;
+      this.listForm.fenFlag = "1";
+      this.listForm.dataList = this.dataList
+      const json = JSON.stringify(this.listForm);
+      this.isSubmit = true
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      }, e => {
 
-        });
-      }
+      });
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -580,7 +643,6 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
-
 .xmpg-step7 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -651,6 +713,12 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-table th > .cell{
+    font-size: 12px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
 }
 </style>
 

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

@@ -113,7 +113,7 @@
           @selection-change="selectStandChange"
           height="56%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
           <el-table-column
             type="selection"
             width="55"
@@ -781,9 +781,14 @@ export default {
       }
     }
   }
-
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-table th > .cell{
+    font-size: 12px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
 }
 </style>

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

@@ -113,7 +113,7 @@
           @selection-change="selectStandChange"
           height="55%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
           <el-table-column
             type="selection"
             width="55"
@@ -727,5 +727,11 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-table th > .cell{
+    font-size: 12px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
 }
 </style>>

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

@@ -113,7 +113,7 @@
           @selection-change="selectStandChange"
           height="55%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
           <el-table-column
             type="selection"
             width="55"
@@ -717,5 +717,11 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-table th > .cell{
+    font-size: 12px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
 }
 </style>

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

@@ -111,9 +111,9 @@
           style="width: 100%"
           border
           @selection-change="selectStandChange"
-          height="55%"
+          height="52%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
           <el-table-column
             type="selection"
             width="55"
@@ -713,6 +713,12 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-table th > .cell{
+    font-size: 12px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
 }
 </style>
 

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

@@ -49,7 +49,7 @@
           height="70%"
           border
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-          fontWeight: 'bold', height: '48px'}"
+          fontWeight: 'bold'}"
         >
           <el-table-column
             type="selection"
@@ -529,5 +529,11 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-table th > .cell{
+    font-size: 12px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
 }
 </style>

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

@@ -49,7 +49,7 @@
           height="70%"
           border
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-          fontWeight: 'bold', height: '48px'}"
+          fontWeight: 'bold'}"
         >
           <el-table-column
             type="selection"
@@ -598,5 +598,11 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-table th > .cell{
+    font-size: 12px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
 }
 </style>

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

@@ -49,7 +49,7 @@
           height="70%"
           border
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-          fontWeight: 'bold', height: '48px'}"
+          fontWeight: 'bold'}"
         >
           <el-table-column
             type="selection"
@@ -574,5 +574,11 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-table th > .cell{
+    font-size: 12px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
 }
 </style>

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

@@ -49,7 +49,7 @@
           height="70%"
           border
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-          fontWeight: 'bold', height: '48px'}"
+          fontWeight: 'bold'}"
         >
           <el-table-column
             type="selection"
@@ -597,5 +597,11 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-table th > .cell{
+    font-size: 12px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
 }
 </style>

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

@@ -56,7 +56,7 @@
           border
           @selection-change="selectStandChange"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-          fontWeight: 'bold', height: '48px'}"
+          fontWeight: 'bold'}"
         >
           <el-table-column
             type="selection"
@@ -874,6 +874,12 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-table th > .cell{
+    font-size: 12px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
 }
 </style>
 

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

@@ -49,7 +49,7 @@
           height="70%"
           border
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-          fontWeight: 'bold', height: '48px'}"
+          fontWeight: 'bold'}"
         >
           <el-table-column
             type="selection"
@@ -598,5 +598,11 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-table th > .cell{
+    font-size: 12px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
 }
 </style>

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

@@ -49,7 +49,7 @@
                 height="70%"
                 border
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-          fontWeight: 'bold', height: '48px'}"
+          fontWeight: 'bold'}"
         >
           <el-table-column
                   type="selection"
@@ -595,5 +595,11 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-table th > .cell{
+    font-size: 12px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
 }
 </style>

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

@@ -49,7 +49,7 @@
           height="70%"
           border
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-          fontWeight: 'bold', height: '48px'}"
+          fontWeight: 'bold'}"
         >
           <el-table-column
             type="selection"
@@ -597,5 +597,11 @@ export default {
   .demo-drawer-content {
     margin-top: 10px;
   }
+  /deep/.el-table th > .cell{
+    font-size: 12px;
+  }
+  /deep/.el-table thead.is-group th{
+    padding: 0px;
+  }
 }
 </style>

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -28,14 +28,17 @@
         <p class="transition-box-p">
           <label class="transition-box-label">附件：</label>
           <span class="file-box" v-if="fileInfoList.length > 0">
-                     <span v-for="(file,item) in fileInfoList"
-                           target="_blank"
-                           class="transition-box-span table-jump"
-                           @click="handleQueryPdf(file)"
-                           :key="item">
-                       {{ file.name }}
-                     </span>
-                  </span>
+            <div style="display: flex;">
+                <div v-for="(file,item) in fileInfoList"
+                      target="_blank"
+                      class="transition-box-span table-jump"
+                      @click="handleQueryPdf(file)"
+                      :key="item">
+               {{ file.name }}
+                    <el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
+             </div>
+            </div>
+          </span>
           <span class="transition-box-span" v-else>-</span>
         </p>
         <p class="transition-box-p">
@@ -222,6 +225,9 @@ export default {
     }
   },
   methods: {
+    downloadFile (attId) {
+      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+    },
     // 点击查看
     handlePreview(item) {
       let routeUrl = this.$router.resolve({