From 112cd844acb89b29293a1010f784c8162bf9fc6a Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 10 Jan 2022 11:47:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E4=B8=8B=E8=BD=BD=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=85=A5=E5=BA=93=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzhHd-rh/step3.vue     |  4 +++-
 .../pages/creatProcess/bzhHd-rh/step4.vue     | 20 ++++++++++++++-----
 .../pages/creatProcess/bzhHd-rh/step5.vue     | 10 +++++++++-
 .../pages/creatProcess/bzhHd-rh/step6-1.vue   |  2 +-
 .../pages/creatProcess/bzhHd-rh/step6.vue     |  2 +-
 .../pages/creatProcess/bzrk/step1.vue         | 17 ++++++++++++----
 .../pages/creatProcess/bzrk/step4.vue         | 15 ++++++++++----
 7 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
index 1ef79891d..dfa40f025 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
@@ -142,7 +142,7 @@
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item class="add-form-item" label="身份:">
+                <el-form-item class="add-form-item" label="职务/名称:">
                   <el-input
                     style="width: 100%"
                     placeholder="请填写身份"
@@ -181,6 +181,8 @@
                   />
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item class="add-form-item" label="资料:">
                   <el-upload
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
index 88159ba87..7a77d843e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
@@ -81,7 +81,7 @@
                     </a>
                     <el-button
                       size="mini"
-                      @click="previews(item.id)"
+                      @click="previews(item.id, 'down')"
                       icon="el-icon-download"
                       style="height: 25px; margin-left: 5px;"
                     ></el-button>
@@ -120,14 +120,20 @@
                 <el-table-column prop="fillPeople" align="center" label="参与人"/>
                 <el-table-column prop="fillUnit" align="center" label="单位"/>
                 <el-table-column prop="fillDept" align="center" label="部门"/>
-                <el-table-column prop="fillPost" align="center" label="身份"/>
+                <el-table-column prop="fillPost" align="center" label="职务/名称"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
                 <el-table-column prop="fillFile" align="center" label="资料">
                   <template slot-scope="scope">
                     <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
-                    <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
+                    <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id, 'onLine')">
                     {{ item.name }} {{ ';' }}
+                      <el-button
+                        size="mini"
+                        @click="previews(item.id, 'down')"
+                        icon="el-icon-download"
+                        style="height: 25px; margin-left: 5px;"
+                      ></el-button>
                    </span>
                   </template>
                 </el-table-column>
@@ -417,10 +423,14 @@ export default {
       this.$preview(attId)
     },
     /** 点击对应附件进行下载*/
-    previews(val) {
+    previews(val,type) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        if (type === 'down') {
+          window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        } else {
+          this.$preview(attId)
+        }
       }
     },
   }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
index d7556c1ce..d2312e5d0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
@@ -176,7 +176,7 @@
                     {{ scope.row.fillDept || '' }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="fillPost" align="center" label="身份">
+                <el-table-column prop="fillPost" align="center" label="职务/名称">
                   <template slot-scope="scope">
                     {{ scope.row.fillPost || '' }}
                   </template>
@@ -368,6 +368,7 @@
         accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
         :http-request="httpRequest"
         :before-upload="handleBeforeUpload"
+        :on-preview="handlePreview"
         :before-remove="handleBeforeRemove"
         :on-success="handleOnsuccess"
       >
@@ -625,6 +626,13 @@ export default {
       this.fileListData.fillFile = this.reData
     },
 
+    handlePreview(file) {
+      let attId = file.id
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      }
+    },
+
     handleClose() {
       this.upDialog = false
     },
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
index db367a6a7..2c1e42f4f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
@@ -114,7 +114,7 @@
                 <el-table-column prop="fillPeople" align="center" label="参与人"/>
                 <el-table-column prop="fillUnit" align="center" label="单位"/>
                 <el-table-column prop="fillDept" align="center" label="部门"/>
-                <el-table-column prop="fillPost" align="center" label="身份"/>
+                <el-table-column prop="fillPost" align="center" label="职务/名称"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
                 <el-table-column prop="fillFile" align="center" label="资料">
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
index dcbfb6485..ebdccd1f1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
@@ -125,7 +125,7 @@
                 <el-table-column prop="fillPeople" align="center" label="参与人"/>
                 <el-table-column prop="fillUnit" align="center" label="单位"/>
                 <el-table-column prop="fillDept" align="center" label="部门"/>
-                <el-table-column prop="fillPost" align="center" label="身份"/>
+                <el-table-column prop="fillPost" align="center" label="职务/名称"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
                 <el-table-column prop="fillFile" align="center" label="资料">
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index b0b5fd664..4540d8489 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -1695,6 +1695,17 @@ export default {
     filterText(val) {
       this.$refs.tree.filter(val);
     },
+    'form.standInData' : {
+      handler: function () {
+        if(this.form.standInData === '1') {
+          this.rules.standYear[0].required = false;
+          this.rules.standName[0].required = false
+        } else {
+          this.rules.standYear[0].required = true;
+          this.rules.standName[0].required = true
+        }
+      }
+    },
     /*'form.standInData': {
       handler: function (val) {
         this.verifySarStandard = false
@@ -1840,14 +1851,10 @@ export default {
         this.rules.standName[0].required = false
         this.rules.standEnName[0].required = true;
         this.rules.standNature[0].required = false
-        this.rules.standYear[0].required = false;
-        this.rules.standName[0].required = false
       } else {
         this.rules.standName[0].required = true
         this.rules.standNature[0].required = true
         this.rules.standEnName[0].required = false;
-        this.rules.standYear[0].required = true;
-        this.rules.standName[0].required = true
       }
       this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
       //切换清空表单
@@ -3054,6 +3061,8 @@ export default {
                       this.isSubmit = false
                     }
                   })
+                } else {
+                  this.isSubmit = false
                 }
               })
             } else {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 025968104..fcb217efe 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1688,14 +1688,10 @@ export default {
         this.rules.standName[0].required = false
         this.rules.standEnName[0].required = true;
         this.rules.standNature[0].required = false
-        this.rules.standYear[0].required = false;
-        this.rules.standName[0].required = false
       } else {
         this.rules.standName[0].required = true
         this.rules.standNature[0].required = true
         this.rules.standEnName[0].required = false;
-        this.rules.standYear[0].required = true;
-        this.rules.standName[0].required = true
       }
       this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
     },
@@ -2662,6 +2658,17 @@ export default {
         }
       }
     },
+    'form.standInData' : {
+      handler: function () {
+        if(this.form.standInData === '1') {
+          this.rules.standYear[0].required = false;
+          this.rules.standName[0].required = false
+        } else {
+          this.rules.standYear[0].required = true;
+          this.rules.standName[0].required = true
+        }
+      }
+    },
     form(val){
       if(this.form){