Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!330

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,//水印宽度

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({

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 !== '过程稿件'){
+          if((displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件') || !dynamicFormField){
-            const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
+            let childList = []
-            if(childList.length === 0){
+            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)
             }
           }

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

@@ -588,7 +588,7 @@ export default {
           if(this.qbfsForm.standSort && this.qbfsForm.standSort.indexOf("Q/QCBFC") !== -1){
             this.routerBussProStand()
           }
-          if (this.$route.query.bpnId !== '') {
+          if (this.$route.query.bpnId && this.$route.query.bpnId !== '') {
             let taskId = {
               id: this.$route.query.bpnId
             }

src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue

@@ -586,7 +586,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList,taskDel} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -2450,6 +2450,14 @@
                         this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, {
                             _this: this
                         }, res => {
+                            if (this.$route.query.bpnId && this.$route.query.bpnId !== '') {
+                                let taskId = {
+                                    id: this.$route.query.bpnId
+                                }
+                                taskDel(taskId).then(res=>{
+                                    return res
+                                })
+                            }
                             this.submitLoading = false
                             this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                         })

src/pages/processCenter/pages/creatProcess/qbrk/step13.vue

@@ -2408,7 +2408,7 @@
                         this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, {
                             _this: this
                         }, res => {
-                            if (this.$route.query.bpnId !== '') {
+                            if (this.$route.query.bpnId && this.$route.query.bpnId !== '') {
                                 let taskId = {
                                     id: this.$route.query.bpnId
                                 }

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 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 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
+      this.saveLoading = true;
-      let _formData = new FormData()
+      let _formData = new FormData();
-      _formData.append('id', this.bpnId || '')
+      _formData.append("id", this.bpnId || "");
-      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append("createUser", this.$store.getters.userInfo.userId);
-      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append("createUserName", this.$store.getters.userInfo.userName);
-      _formData.append('prcType', '26')
+      _formData.append("prcType", "26");
-      _formData.append('json', JSON.stringify({
+      _formData.append("json", JSON.stringify({
         roleForm: this.roleForm,
         qblx_pageData: this.qblx_pageData,
         commentText: this.commentText
-      }))
+      }));
       saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false
+        this.saveLoading = false;
-        this.$message.success('保存成功')
+        this.$message.success("保存成功");
-        this.bpnId = res.result
+        this.bpnId = res.result;
       }).catch(e => {
-        this.saveLoading = false
+        this.saveLoading = false;
       })
     },
     listSubmit (item) {

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' : ''"