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

src/main.js

@@ -72,8 +72,12 @@ router.beforeEach(function (to, from, next) {
   let prcName = to.query.prcName;
   let prcType = to.query.prcType;
   let routerType = to.query.routerType;
+  let unShowReceipt = to.query.unShowReceipt;
   let param = "taskIds=" + taskId + "&prcId=" + prcId
       + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType;
+  if (unShowReceipt) {
+    param += "&unShowReceipt=" + unShowReceipt
+  }
   let param4 = {
     path: path,
     token: token,

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

@@ -3,11 +3,11 @@
   <div class="bzrhStep1">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会入会流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
     </div>
     <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto;">
@@ -258,13 +258,13 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
-                  <h4>流程发起人</h4>
+                  <h4>标准法规工程师</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.startUser" :disabled="true" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="流程发起人"></el-input>
+                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="标准法规工程师"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -380,7 +380,7 @@
         name="file"
         drag
         :file-list="rh_pageData.infoSources"
-        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF, .pptx"
+        accept=".docx, .DOCX, .xls, .xlsx, .pdf, .PDF, .pptx"
         :http-request="httpRequest"
         :before-upload="handleBeforeUpload"
         :before-remove="handleBeforeRemove"
@@ -426,14 +426,10 @@
 </template>
 
 <script>
-import ProcessHeader from '../../components/ProcessHeader'
+import ProcessHeader from "../../components/ProcessHeader";
-import ProcessFooter from '../../components/ProcessFooter'
+import ProcessFooter from "../../components/ProcessFooter";
-import ProcessTitle from '../../components/ProcessTitle'
+import ProcessTitle from "../../components/ProcessTitle";
-import {
+import { completeTask, processBack, queryTaskFirst, saveTaskFirst, taskDel, upFile, workGroup } from "@/api/process.js";
-  saveTaskFirst,
-  completeTask, queryTaskFirst,
-  taskDel, workGroup, processBack,upFile
-} from '@/api/process.js'
 
 export default {
   components: {
@@ -595,26 +591,26 @@ export default {
     },
     // 文件上传限制条件
     handleBeforeUpload(file) {
-      var filename = file.name
+      var filename = file.name;
-      var index1 = filename.lastIndexOf('.')
+      var index1 = filename.lastIndexOf(".");
-      var index2 = filename.length
+      var index2 = filename.length;
-      var fileSuffix = filename.substring(index1, index2)
+      var fileSuffix = filename.substring(index1, index2);
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
+      if (fileSuffix === ".docx" || fileSuffix === ".DOCX"
-        || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
+        || fileSuffix === ".xls" || fileSuffix === ".xlsx" || fileSuffix === ".pdf" || fileSuffix === ".PDF"
-        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.pptx'
+        || fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG" || fileSuffix === ".pptx"
-        || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp') {
+        || fileSuffix === ".doc" || fileSuffix === ".DOC" || fileSuffix === ".bmp") {
-        return true
+        return true;
       } else {
-        this.spinShow = false
+        this.spinShow = false;
-        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件')
+        this.$message.error("文件" + file.name + "格式不正确，请上传DOCX/PDF或XLS文件");
-        return false
+        return false;
       }
       // 判断文件上传大小
       // eslint-disable-next-line no-unreachable
       if (file.size / 1024 / 1024 <= 200) {
-        return true
+        return true;
       } else {
         this.$message.error('文件' + file.name + '大小不超过200M')
         return false
@@ -641,7 +637,8 @@ export default {
         if (res.ok) {
           this.handleOnsuccess(res)
         } else {
-          this.$message.warning('上传失败')
+          this.$message.warning("上传失败");
+          this.fileMadel = false;
         }
       })
     },

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

@@ -126,7 +126,7 @@
           label="在产车实施日期">
         </el-table-column>
       </el-table>
-      <div>
+      <div v-show="!this.$route.query.unShowReceipt">
         <el-collapse accordion>
           <el-collapse-item title="回执说明">
             <div style="margin: 10px 0;">

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

@@ -261,7 +261,7 @@ export default {
           this.toProcessDetail('bzzqyjStep1-9',row)
         }else if(prcType === '10'){
           //项目清单确认
-          this.toProcessDetail('xmqdqrStep1-4',row)
+          this.toProcessDetail('xmqdqrStep1-4',row, 'unShowReceipt')
         } else if(prcType === '16'){
           //外部署名
           this.toProcessDetail('wbsmStep1-5',row)
@@ -285,8 +285,8 @@ export default {
         this.$message.warning('当前流程未全部办理完成，无法查看')
       }
     },
-    toProcessDetail(componentName,row) {
+    toProcessDetail(componentName,row,unShowReceipt) {
-      this.$router.push({
+      let data = {
         name: componentName,
         query: {
           taskIds: row.id,
@@ -295,7 +295,11 @@ export default {
           prcName: row.prcName,
           prcType: row.prcType
         }
-      })
+      }
+      if (unShowReceipt) {
+        data.query.unShowReceipt = true
+      }
+      this.$router.push(data)
     },
     // table行选择事件
     tableChange (row) {