From a3b4d8ee7d1df6c5fca7615418a1103e8588055b Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 1 Mar 2022 10:41:28 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4123=20=E4=BC=81=E6=A0=87=E8=AF=A6=E6=83=85=20?=
 =?UTF-8?q?=E5=8A=A0=E9=80=BB=E8=BE=91=20=E4=BC=81=E6=A0=87=20=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=B1=9E=E6=80=A7=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=20=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherBussStandardDetails/index.vue   | 10 ++++++----
 .../components/EnterpriseStandardDatabase.vue          |  1 -
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 69521ed19..179a6047d 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -3179,12 +3179,14 @@ export default {
             location['child1'] = childList
           }
         }
-
         for (let i = 0; i < displayLocation.length; i++) {
           //  sss11
-          if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
-            const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
-            if(childList.length === 0){
+          if((displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件') || !dynamicFormField){
+            let childList = []
+            if(displayLocation[i].child){
+              childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
+            }
+            if(displayLocation[i].label !== '基础信息' && childList.length === 0){
               displayLocation.splice(i,1)
             }
           }
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 68d4ad82a..00b1a47fa 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -709,7 +709,6 @@
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'DTQBBHBUSS' || field.attrField === 'CYBZ' || field.attrField === 'YYBZ'">
-                    123
                     <custom-input-for-standards
                       :config="field"
                       :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"

From 1c9ae6cc42095524a703ca2d7ac3159966d4e786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 1 Mar 2022 11:08:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/process.js                            |  9 +++
 .../pages/creatProcess/qbzxdlx/step1.vue      | 56 +++++++++++++------
 2 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/src/api/process.js b/src/api/process.js
index 979121fa1..873a4600a 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -170,6 +170,15 @@ export function taskDel (data) {
     params: data
   })
 }
+//模板下载
+export function downloadStatus(data) {
+  return axios({
+    url: '/api/importWkExcel/exportqbzxdjh',
+    method: 'post',
+    responseType: 'blob',
+    params: data
+  })
+}
 // 整改流程 详情查询nonconformity
 export function getNonconformity (data) {
   return axios({
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index 69a911291..e0ba7e6fa 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -54,7 +54,7 @@
           <div class="tableButton">
             <el-button type="primary" size="small" @click="addQblx('add','企标制修订立项计划')">新增</el-button>
             <el-button type="plain" size="small" @click="uploadQblx">导入</el-button>
-            <el-button type="success" size="small" @click="qblxTemplate">模板下载</el-button>
+            <el-button type="success" size="small" @click="downloadStatus">模板下载</el-button>
             <el-button type="danger" size="small" @click="delQblx">批量删除</el-button>
           </div>
         </div>
@@ -342,11 +342,11 @@
 </template>
 
 <script>
-import ProcessHeader from '../../components/ProcessHeader'
-import ProcessFooter from '../../components/ProcessFooter'
-import ProcessTitle from '../../components/ProcessTitle'
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
 import MechanismTree from "@/components/mechanismTree";
-import {completeTask, saveTaskFirst, taskDel, processBack, queryTaskFirst} from '@/api/process.js'
+import { queryTaskFirst, saveTaskFirst, taskDel, downloadStatus } from "@/api/process.js";
 
 export default {
   components: {
@@ -790,27 +790,47 @@ export default {
 
     },
 
+
     /** 模板下载 */
-    qblxTemplate() {},
+    downloadStatus() {
+      downloadStatus().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, '立项.xls');
+        } else {
+          //其他浏览器
+          let link = document.createElement('a'); // 创建a标签
+          link.style.display = 'none';
+          let objectUrl = URL.createObjectURL(blob);
+          link.href = objectUrl;
+          link.click();
+          URL.revokeObjectURL(objectUrl);
+        }
+      })
+    },
     // 保存按钮
     handleSave() {
-      this.saveLoading = true
-      let _formData = new FormData()
-      _formData.append('id', this.bpnId || '')
-      _formData.append('createUser', this.$store.getters.userInfo.userId)
-      _formData.append('createUserName', this.$store.getters.userInfo.userName)
-      _formData.append('prcType', '26')
-      _formData.append('json', JSON.stringify({
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("createUser", this.$store.getters.userInfo.userId);
+      _formData.append("createUserName", this.$store.getters.userInfo.userName);
+      _formData.append("prcType", "26");
+      _formData.append("json", JSON.stringify({
         roleForm: this.roleForm,
         qblx_pageData: this.qblx_pageData,
         commentText: this.commentText
-      }))
+      }));
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
-        this.$message.success('保存成功')
-        this.bpnId = res.result
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
       }).catch(e => {
-        this.saveLoading = false
+        this.saveLoading = false;
       })
     },
     listSubmit (item) {

From e6878e9117b89b9482e883db000791aba880acb3 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 1 Mar 2022 13:29:18 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E6=B7=B10.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/pdf/web/viewer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js
index 4a4b2d41c..ff47ee580 100644
--- a/public/static/pdf/web/viewer.js
+++ b/public/static/pdf/web/viewer.js
@@ -6654,7 +6654,7 @@ var PDFPageView = function () {
           watermark_x_space: 40,//水印x轴间隔
           watermark_y_space: 50,//水印y轴间隔
           watermark_color: 'rgba(232,232,240)',//水印字体颜色
-          watermark_alpha: 0.3,//水印透明度
+          watermark_alpha: 0.4,//水印透明度
           watermark_fontsize: '40px',//水印字体大小
           watermark_font: '微软雅黑',//水印字体
           watermark_width: 120,//水印宽度

From 4c4c7932ca1cf0ce19e8d172e0b8dfe688ab40e2 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 1 Mar 2022 14:08:00 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E4=BC=81=E6=A0=87=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=20?=
 =?UTF-8?q?=E5=A4=87=E6=A1=88=E6=97=A5=E6=9C=9F=20=E5=A4=9A=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 00b1a47fa..691780e93 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -4338,7 +4338,7 @@ export default {
                 type: 'like',
                 value: value
               });
-            }else if (value !== undefined && value !== null && value !== "") {
+            }else if (value !== undefined && value !== null && value !== "" && item.attrField !== 'BARQ') {
               advanceSearchVOList.push({
                 connect: advanceSearchVOList.length > 0 ? "and" : "",
                 field: item.attrField || "",
@@ -4351,7 +4351,7 @@ export default {
             advanceSearchVOList.push({
               connect: "and",
               field: 'BARQ',
-              type: 'equals',
+              type: 'EQUALS',
               value: formData.BARQ
             });
           }