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

package-lock.json

@@ -2665,7 +2665,7 @@
     },
     "@popperjs/core": {
       "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@popperjs/core/download/@popperjs/core-2.11.0.tgz",
       "integrity": "sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ=="
     },
     "@probe.gl/stats": {
@@ -6563,6 +6563,11 @@
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true
     },
+    "copy-text-to-clipboard": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz",
+      "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q=="
+    },
     "core-js": {
       "version": "3.8.3",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz",
@@ -10385,6 +10390,11 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
       "dev": true
     },
+    "mutation-observer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",
+      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
+    },
     "mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
@@ -13490,6 +13500,37 @@
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
       "dev": true
     },
+    "vconsole": {
+      "version": "3.14.5",
+      "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.14.5.tgz",
+      "integrity": "sha512-ZfBsaRloRU7eJXH2z2YiNSF5Yb7AblwdPx0c8YcT/RO0ShqfUGrDqRuAmysfLUO+oJ8fC+ZPTgB4r5+rr6msQw==",
+      "requires": {
+        "@babel/runtime": "^7.17.2",
+        "copy-text-to-clipboard": "^3.0.1",
+        "core-js": "^3.11.0",
+        "mutation-observer": "^1.0.3"
+      },
+      "dependencies": {
+        "@babel/runtime": {
+          "version": "7.17.9",
+          "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.17.9.tgz",
+          "integrity": "sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
+        },
+        "core-js": {
+          "version": "3.21.1",
+          "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.21.1.tgz",
+          "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="
+        },
+        "regenerator-runtime": {
+          "version": "0.13.9",
+          "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+          "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+        }
+      }
+    },
     "vendors": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
@@ -13549,8 +13590,8 @@
     },
     "vue-loader-v16": {
       "version": "npm:vue-loader@16.8.3",
-      "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.3.tgz?cache=0&sync_timestamp=1636034706501&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.8.3.tgz",
-      "integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -13561,8 +13602,8 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz",
-          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -13571,8 +13612,8 @@
         },
         "chalk": {
           "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/download/chalk-4.1.2.tgz",
-          "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -13582,8 +13623,8 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -13592,29 +13633,29 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true,
           "optional": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true,
           "optional": true
         },
         "hash-sum": {
           "version": "2.0.0",
-          "resolved": "https://registry.nlark.com/hash-sum/download/hash-sum-2.0.0.tgz",
-          "integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=",
+          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz",
+          "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
           "dev": true,
           "optional": true
         },
         "loader-utils": {
           "version": "2.0.2",
-          "resolved": "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687947060&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz",
-          "integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.2.tgz",
+          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
           "dev": true,
           "optional": true,
           "requires": {
@@ -13625,8 +13666,8 @@
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmmirror.com/supports-color/download/supports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "optional": true,
           "requires": {

package.json

@@ -22,6 +22,7 @@
     "sortablejs": "^1.14.0",
     "v-charts": "^1.19.0",
     "vant": "^2.12.36",
+    "vconsole": "^3.14.5",
     "vue": "^2.6.11",
     "vue-clipboard2": "^0.3.1",
     "vue-contextmenujs": "^1.3.13",

public/index.html

@@ -10,6 +10,11 @@
     <meta http-equiv="expires" content="0">
     <title>标准法规管理系统</title>
     <script src = "https://cdn.jsdelivr.net/npm/proxy-polyfill@0.3.0/proxy.min.js"></script>
+<!--     vconsole调试工具-->
+    <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>
+    <script type="text/javascript">
+      var vConsole = new VConsole();
+    </script>
   </head>
   <body class="el-drawer-body">
     <div id="app"></div>

src/api/login/index.js

@@ -0,0 +1,11 @@
+import axios from '@/common/axiosV2'
+
+// 流程发起
+export function checkPage(params) {
+  return axios({
+    url: '/api/checkPage',
+    method: 'get',
+    params
+  })
+}
+

src/api/process.js

@@ -1024,3 +1024,12 @@ export function importAllZcbs(data) {
     data
   })
 }
+
+// 未符合项重点问题项管控产品规划部查询列表
+export function productDeptIssue(params) {
+  return axios({
+    url: '/api/sarStandUnqualified/productDeptIssue',
+    method: 'get',
+    params
+  })
+}

src/api/unqualProcess.js

@@ -43,6 +43,14 @@ export function StandardsInfoPage(data) {
   });
 }
 
+export function selectHighLawsById(data) {
+  return axios({
+    url: "api/sarStandardsInfo/sar-standards-info/selectHighLawsById",
+    method: "get",
+    params: data
+  });
+}
+
 // 车型库清单的下拉列表
 export function solostarData(data) {
   return axios({

src/assets/languages/cn.js

@@ -260,6 +260,7 @@ export const m = {
   findByTheResponsibilityDepartment: '根据责任部门查找',
   findByNormativeReferenceStandard: '根据规范性引用标准查找',
   lookupByStandardStatus: '根据标准状态查找',
+  lookupByStandardStatusText: '根据文本状态查找',
   findByPrincipalCompiler: '根据主要编制者查找',
   contentInThisPaper: '内容摘要',
   substituteForStandNumber: '代替标准号',

src/components/CustomFormComponents/File.vue

@@ -245,7 +245,7 @@ export default {
       if (this.value != null && this.value !== '') {
         let paramefile = this.value
         if (paramefile.charAt(paramefile.length - 1) === ',') {
-          paramefile = paramefile.substring(0, paramefile.length - 1)
+          paramefile = paramefile.substring(0, paramefile.length - 1).replaceAll(",,",",")
         }
         this.$http.get('att/attFile/getMultiFileInfos', {
           fileIds: paramefile
@@ -272,7 +272,7 @@ export default {
           obj.response.data = file.response.data
           this.showFileList.push(obj)
           // this.value += res.data.id + ','
-        this.$emit('input', this.value ? this.value + ','+ res.data.id + ',' : this.value+ res.data.id + ',')
+        this.$emit('input', this.value ? (this.value + ','+ res.data.id + ',').replaceAll(",,",',') : (this.value+ res.data.id + ',').replaceAll(',,',','))
         this.$emit('success')
         this.$message({
           message: '文件上传成功',

src/components/CustomFormComponents/InputForStandardsForLaws.vue

@@ -61,21 +61,20 @@
                 :maxlength="100"></el-input>
             </el-form-item>
             <el-form-item class="search-item btn-box">
-              <el-button
-                icon="el-icon-search"
-                type="primary"
-                class="common-button-primary"
-                round
-                @click="getReplaceLawsNumRowSearch">
-              </el-button>
-            </el-form-item>
-            <el-form-item class="search-item btn-box">
-              <el-button
-                class="common-button-default"
-                icon="el-icon-refresh-left"
-                round
-                type="default"
-                @click="getResetLawsNumRow"></el-button>
+                  <el-button
+                          type="primary"
+                          class="common-button-primary"
+                          size="small"
+                          @click="getReplaceLawsNumRowSearch">
+                      查询
+                  </el-button>
+             </el-form-item>
+             <el-form-item class="search-item btn-box">
+                  <el-button
+                          class="common-button-default"
+                          size="small"
+                          @click="getResetLawsNumRow">清空
+                  </el-button>
             </el-form-item>
           </el-form>
         </div>

src/components/navMenu/index.vue

@@ -161,11 +161,11 @@
               //   path: '/dataStatisComments',
               //   menuId: ''
               // },
-              {
-                title: '国内外政策',
-                path: '/foreignRegulationsDatabase',
-                menuId: 'ef02a3b0af9a4b3ede460456a9591ebc'
-              },
+              // {
+              //   title: '国内外政策',
+              //   path: '/foreignRegulationsDatabase',
+              //   menuId: 'ef02a3b0af9a4b3ede460456a9591ebc'
+              // },
               // // // {
               // // //   title: '标准制修订管理',
               // // //   path: '/demo2One'
@@ -208,6 +208,34 @@
               // }
             ]
           },
+          {
+            title: '政策法规库',
+            path: '/policyRegulation',
+            'icon-class': 'el-icon-s-management',
+            menuId: 'asdzcfgk',
+            children: [
+              {
+                title: '问题项管控',
+                path: '/problemControl',
+                menuId: '50d7a0c0af4740c486100c257ae6068e'
+              },
+              {
+                title: '国内外政策',
+                path: '/nationalPolicy',
+                menuId: '6557e9c4ce672af71be5807052da126b'
+              },
+              {
+                title: '标准跟踪清单',
+                path: '/standardTrackingList',
+                menuId: 'a26b92e156f68dbfe0d73b0dc068ebe4'
+              },
+              {
+                title: '政策工作组',
+                path: '/policyWorkGroup',
+                menuId: 'f1a4b33a498e58a8a87c954ce5ce6ad6'
+              }
+            ]
+          },
           {
             title: '工作中心',
             path: '/processCenter',

src/components/phoneHistortTable/index.vue

@@ -11,38 +11,40 @@
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
             <el-table-column
                     prop="name"
+                    min-width="100"
                     label="任务步骤"
                     align="center"
-                    sortable="custom"
             >
             </el-table-column>
             <el-table-column
                     prop="assignee"
+                    min-width="100"
                     label="任务受理人"
                     align="center"
-                    sortable="custom"
             >
             </el-table-column>
             <el-table-column
                     prop="createTime"
                     label="创建时间"
-                    sortable="custom"
+                    min-width="100"
                     align="center">
                 <template slot-scope="scope">
-                    <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+                    <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="endTime"
                     label="完成时间"
+                    min-width="100"
                     align="center">
                 <template slot-scope="scope">
-                    <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+                    <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="comment"
                     label="流程信息"
+                    min-width="100"
                     align="center">
                 <template slot-scope="scope">
                     <span>{{ scope.row.commentText }}</span>

src/components/phoneRole/index.vue

@@ -141,6 +141,7 @@ export default {
     async getPhoneData() {
       this.phoneForm.page = 1
       this.roleList = []
+      this.result = []
       phoneUser(this.phoneForm).then(res => {
         if (res.ok) {
           this.roleList = res.data

src/components/roleTree/index.vue

@@ -120,11 +120,16 @@
                 default: () => {
                     return []
                 }
+            },
+            type: {
+              type: Number,
+              default: 0
             }
         },
         data () {
             return {
                 visible: false,
+                selectList: [],
                 nodeList2: [],
                 delList: [],
                 roleList: [],
@@ -300,7 +305,21 @@
                         this.delList = [data]
                     }
                 } else { // 多选
-                    this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
+                  if (this.roleList.length === 0) {
+                    this.roleList.push(data)
+                  } else {
+                    let delFlag = true
+                    this.roleList.forEach((item, index) => {
+                      if (item.id === data.id) {
+                        this.roleList.splice(index, 1)
+                        delFlag = false
+                      }
+                    })
+                    if (delFlag) {
+                      this.roleList.push(data)
+                    }
+                  }
+                  //  this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
                 }
             },
             loadNode(node, resolve) {

src/main.js

@@ -58,6 +58,8 @@ import hwh5  from 'api/hwh5-cloudonline.js';
 import { ssoLoginUrlDev,ssoLoginUrl,webLoginType,devWebUrl } from '@/sysConfig'
 
 import { mapMutations, mapActions } from 'vuex'
+import VConsole from 'vuex'
+
 
 import isMobile from "./store/isMobile";
 // 路由拦截
@@ -113,7 +115,20 @@ router.beforeEach(function (to, from, next) {
   /** 判断是不是在手机端操作 */
   if (isMobile()) {
     if(toName === 'processCenter'){
-      hwh5.close();
+      // hwh5.close();
+      //关闭当前窗口
+      let userAgent = navigator.userAgent;
+      if (userAgent.indexOf("Firefox") !== -1 || userAgent.indexOf("Chrome") !==-1) {
+        window.location.href="about:blank";
+      }else if(userAgent.indexOf('Android') > -1 || userAgent.indexOf('Linux') > -1){
+        window.opener=null;window.open('about:blank','_self','').close();
+      }else {
+        window.opener = null;
+        window.open("about:blank", "_self");
+        window.close();
+      }
+      //如果是微信打开，关闭当前微信窗口
+      weixinClosePage()
     }else {
       if ((token === null || token === '' ) && toName !== 'Login') {
         if(toName !== 'phoneIndex'){
@@ -177,7 +192,21 @@ router.beforeEach(function (to, from, next) {
       extractedVerify(token)
     }
   }
-
+  function weixinClosePage() {
+    if (typeof WeixinJSBridge == "undefined") {
+      if (document.addEventListener) {
+        document.addEventListener('WeixinJSBridgeReady', weixin_ClosePage, false);
+      } else if (document.attachEvent) {
+        document.attachEvent('WeixinJSBridgeReady', weixin_ClosePage);
+        document.attachEvent('onWeixinJSBridgeReady', weixin_ClosePage);
+      }
+    } else {
+      weixin_ClosePage();
+    }
+  }
+  function weixin_ClosePage() {
+    WeixinJSBridge.call('closeWindow');
+  }
   function extractedVerify() {
     if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) {
       get_verify_by_instance({
@@ -187,7 +216,6 @@ router.beforeEach(function (to, from, next) {
         let hisCount = res.hisCount === undefined ? 0 : res.hisCount;
         let commitStatus = res.commitStatus === undefined ? 0 : res.commitStatus;
         let isNotFinished = res.isNotFinished === undefined ? 0 : res.isNotFinished;
-
         if ((hisCount && hisCount > 0)) { // 业务系统 当前节点已完成
             if(isMobile()){
                 next('/processedPage')
@@ -379,6 +407,7 @@ const i18n = new VueI18n({
 })
 /* eslint-disable no-new */
 window.vm = new Vue({
+  VConsole,
   router,
   store,
   i18n,

src/pages/details/otherBussStandardDetails/index.vue

@@ -4,7 +4,7 @@
     <!--title 标题-->
     <div class="details-header">
       <span>{{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>
-      <b style="float:right;font-size: 25px;color: #ff9900">{{ ((qualityCommentScore*2*0.9)+(dynamicCommentScore*2*0.1)).toFixed(3) }}</b>
+      <b style="float:right;font-size: 25px;color: #ff9900">{{ ((qualityCommentScore*2*0.9)+(dynamicCommentScore*2*0.1)).toFixed(1) }}</b>
       <!--      之前的，先注掉-->
       <!--      <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>-->
     </div>
@@ -27,7 +27,7 @@
                 <el-dialog title="企业标准评价" :visible.sync="businessCommentDialog" :width="(commentAverageScoreTag === '1' && commentActiveName !== 'dynamicComment')?'90%':'65%'" :close-on-click-modal="false">
                   <el-tabs v-model="commentActiveName" @tab-click="tabsClickBtn">
                     <el-tab-pane label="动态评价" name="dynamicComment">
-                      <el-table ref="businessCommentTable" :data="businessCommentTable" border style="width: 100%; flex: auto;margin-bottom: 2%"
+                      <el-table ref="businessCommentTable" :data="businessCommentTable.filter((v) => v.code !== '3U9lb')" border style="width: 100%; flex: auto;margin-bottom: 2%"
                                 class="comment-table"
                                 :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
                                    fontWeight: 'bold', height: '48px'}">
@@ -294,7 +294,7 @@
                               </el-table-column>
                               <el-table-column property="reason" label="简述理由">
                                 <template slot-scope="scope">
-                                  <span v-if="scope.row.commentReason">{{scope.row.commentReason}}</span>
+                                  <span v-if="scope.row.commentReason">{{scope.row.commentReason ? (scope.row.commentReason === '-'? '':scope.row.commentReason) : scope.row.commentReason}}</span>
                                   <span v-else style="color: #c0c4cc">该用户没有填写评分理由</span>
                                 </template>
                               </el-table-column>
@@ -352,69 +352,70 @@
                 <div class="details-content-modular basic-information" style="margin-bottom: 0">
                   <div class="basic-information-content">
                     <p class=""><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
-                    <template v-for="(child, childIndex) in item.child1">
-                      <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
-                        <label style="float: left;min-height: 43px;line-height: 43px;">{{ child.attrName }}</label>
+                    <p><template v-for="(child, childIndex) in item.child1" >
+                      <div class="files-title">
+                        <label style="float: left;min-height: 43px;line-height: 43px;" >{{ child.attrName }}</label>
                         <template style="margin-left: 220px;">
-                          <div style="position: relative;margin-left: 214px;">
+                          <div style="position: relative;margin-left: 219px; line-height: 43px">
                             <div v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex">
-                            <!--                          单个文件-->
-                            <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
+                              <!--                          单个文件-->
+                              <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
                             <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis50 }}</a>
                             <i
-                                    title="下载"
-                                    @click="downloadFile(file.id)"
-                                    class="icon-download"
-                                    v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
+                              title="下载"
+                              @click="downloadFile(file.id)"
+                              class="icon-download"
+                              v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
                             />
                             <i
-                                    title="下载带水印"
-                                    v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
-                                    @click="downloadFileByWater(file.id, file.fileSuffix)"
-                                    class="icon-download2"
-                                    v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
+                              title="下载带水印"
+                              v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
+                              @click="downloadFileByWater(file.id, file.fileSuffix)"
+                              class="icon-download2"
+                              v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
                             />
-                              <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                                <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                             </span>
-                            <!--                          多个文件-->
-                            <div v-else-if="child.value && child.value.length > 0" style="line-height: 50px;">
+                              <!--                          多个文件-->
+                              <div v-else-if="child.value && child.value.length > 0" style="line-height: 43px;">
                             <span>
                               <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                                  @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                  :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
                               <i
-                                      title="下载"
-                                      @click="downloadFile(file.id)"
-                                      class="icon-download"
-                                      v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
+                                title="下载"
+                                @click="downloadFile(file.id)"
+                                class="icon-download"
+                                v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
                               />
                               <i
-                                      title="下载带水印"
-                                      @click="downloadFileByWater(file.id, file.fileSuffix)"
-                                      class="icon-download2"
-                                      v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
+                                title="下载带水印"
+                                @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                class="icon-download2"
+                                v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
                               />
                             </span>
-                              <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                                <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                              </div>
+                              <!--                        <el-button-->
+                              <!--                                v-if="child.attrField === itemNam "-->
+                              <!--                                v-for="(itemNam,index) in itemExistList"-->
+                              <!--                                :key="index"-->
+                              <!--                                @click="showItemsModel(child.attrField)"-->
+                              <!--                                class="decomposition-btn"-->
+                              <!--                                style="right:62px"-->
+                              <!--                                icon="icon-separate"-->
+                              <!--                        >标准分解单-->
+                              <!--                        </el-button>-->
+                              <!--                          <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
+                              <!--                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>-->
                             </div>
-                            <!--                        <el-button-->
-                            <!--                                v-if="child.attrField === itemNam "-->
-                            <!--                                v-for="(itemNam,index) in itemExistList"-->
-                            <!--                                :key="index"-->
-                            <!--                                @click="showItemsModel(child.attrField)"-->
-                            <!--                                class="decomposition-btn"-->
-                            <!--                                style="right:62px"-->
-                            <!--                                icon="icon-separate"-->
-                            <!--                        >标准分解单-->
-                            <!--                        </el-button>-->
-                            <!--                          <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
-                            <!--                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>-->
-                          </div>
                           </div>
                         </template>
-                        <template v-if="child.value === null" >-</template>
+                        <template v-if="child.value === null">
+                            <span style="position: relative;margin-left: 174px; line-height: 43px">-</span></template>
                       </div>
-                    </template>
+                    </template></p>
                     <p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
                     <p v-if="activeState" style="border-bottom: none;"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
                     <p class="half">
@@ -1612,7 +1613,7 @@ export default {
           this.dynamicHistoryCommentTable = res.data
 
           this.historyCommentForm.revise = res.data[0].targetScore
-          this.historyCommentForm.reviseReason = res.data[0].commentReason
+          this.historyCommentForm.reviseReason = res.data[0].commentReason ? (res.data[0].commentReason === '-'? '':res.data[0].commentReason) : res.data[0].commentReason
 
           let averageScore = 0
           res.data.forEach(item => {
@@ -1630,90 +1631,92 @@ export default {
 
     },
     tabsClickBtn(tab, event){
-      // if (this.commentActiveName === 'dynamicComment'){
-      //     this.indexType = 'dynamic'
-      //   //查询评分表
-      //   const allData = {
-      //     lawId: this.$route.params.id,
-      //     userId: this.qualityFirstHistoryPeopleId,
-      //     evaluationType: this.indexType,
-      //   }
-      //   this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
-      //     _this: this
-      //   }, res => {
-      //     this.qualityHistoryCommentTable = res.data
-      //     this.historyInfoLoading = false
-      //
-      //   }, e => {
-      //     this.historyInfoLoading = false
-      //   })
-      // }
-      // else if (this.commentActiveName === 'historyComment'){
-      //   this.historyInfoLoading = true
-      //   this.indexType = 'quality'
-      //   //查询评分表
-      //   const allData = {
-      //     lawId: this.$route.params.id,
-      //     userId: this.dynamicFirstHistoryPeopleId,
-      //     evaluationType: this.indexType
-      //   }
-      //   this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
-      //     _this: this
-      //   }, res => {
-      //     this.dynamicHistoryCommentTable = res.data
-      //     this.historyCommentForm.revise = res.data[0].targetScore
-      //     this.historyCommentForm.reviseReason = res.data[0].commentReason
-      //
-      //     let averageScore = 0
-      //     res.data.forEach(item => {
-      //       if (item.valueType === 'number'){
-      //         averageScore += parseInt(item.targetScore)
-      //       }
-      //     })
-      //     averageScore = averageScore / 4
-      //     this.historyCommentForm.averageScore = averageScore
-      //     this.historyInfoLoading = false
-      //   }, e => {
-      //     this.historyInfoLoading = false
-      //   })
-      // }
-      //
-      // //查询动态评价总平均分和质量评价总平均分
-      // let standId = this.$route.params.id
-      // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
-      //   _this: this
-      // }, res => {
-      //   this.qualityCommentScore = res.data.quality.toFixed(3)/2
-      //   this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
-      //
-      // }, e => {
-      // })
-      //
-      // // 刷新质量评价评分人表格和动态评价评分人表格
-      // const qualityRequest = {
-      //   lawId: standId,
-      //   evaluationType: 'quality'
-      // }
-      // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, {
-      //   _this: this
-      // }, res => {
-      //   this.qualityHistoryPeopleTable = res.data.records
-      //   this.qualityFirstHistoryPeopleId = res.data.records[0].userId
-      //
-      // }, e => {
-      // })
-      // const dynamicRequest = {
-      //   lawId: standId,
-      //   evaluationType: 'dynamic'
-      // }
-      // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
-      //   _this: this
-      // }, res => {
-      //   this.dynamicHistoryPeopleTable = res.data.records
-      //   this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
-      //
-      // }, e => {
-      // })
+      if (this.commentActiveName === 'dynamicComment'){
+          this.indexType = 'dynamic'
+        //查询评分表
+        const allData = {
+          lawId: this.$route.params.id,
+          userId: this.qualityFirstHistoryPeopleId,
+          evaluationType: this.indexType,
+        }
+        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+          _this: this
+        }, res => {
+          this.qualityHistoryCommentTable = res.data
+          this.historyInfoLoading = false
+
+        }, e => {
+          this.historyInfoLoading = false
+        })
+      }else if (this.commentActiveName === 'historyComment'){
+        this.commentAverageScoreTag = '1'
+        this.tabsClick()
+        this.dynamicHistoryCommentTable = []
+        this.historyInfoLoading = true
+        this.indexType = 'quality'
+        //查询评分表
+        const allData = {
+          lawId: this.$route.params.id,
+          userId: this.dynamicFirstHistoryPeopleId,
+          evaluationType: this.indexType
+        }
+        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+          _this: this
+        }, res => {
+          this.dynamicHistoryCommentTable = res.data
+          this.historyCommentForm.revise = res.data[0].targetScore
+          this.historyCommentForm.reviseReason = res.data[0].commentReason
+
+          let averageScore = 0
+          res.data.forEach(item => {
+            if (item.valueType === 'number'){
+              averageScore += parseInt(item.targetScore)
+            }
+          })
+          averageScore = averageScore / 4
+          this.historyCommentForm.averageScore = averageScore
+          this.historyInfoLoading = false
+        }, e => {
+          this.historyInfoLoading = false
+        })
+      }
+
+      //查询动态评价总平均分和质量评价总平均分
+      let standId = this.$route.params.id
+      this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
+        _this: this
+      }, res => {
+        this.qualityCommentScore = res.data.quality.toFixed(3)/2
+        this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
+
+      }, e => {
+      })
+
+      // 刷新质量评价评分人表格和动态评价评分人表格
+      const qualityRequest = {
+        lawId: standId,
+        evaluationType: 'quality'
+      }
+      this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, {
+        _this: this
+      }, res => {
+        this.qualityHistoryPeopleTable = res.data.records
+        this.qualityFirstHistoryPeopleId = res.data.records[0].userId
+
+      }, e => {
+      })
+      const dynamicRequest = {
+        lawId: standId,
+        evaluationType: 'dynamic'
+      }
+      this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
+        _this: this
+      }, res => {
+        this.dynamicHistoryPeopleTable = res.data.records
+        this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
+
+      }, e => {
+      })
 
     },
     tabsClick(tab, event){
@@ -1739,6 +1742,7 @@ export default {
       }
       else if (this.commentAverageScoreTag === '2'){
         this.indexType = 'dynamic'
+        this.dynamicHistoryCommentTable = []
         //查询评分表
         const allData = {
           lawId: this.$route.params.id,
@@ -1748,19 +1752,23 @@ export default {
           this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
             _this: this
           }, res => {
-            this.dynamicHistoryCommentTable = res.data
-            this.historyCommentForm.revise = res.data[0].targetScore
-            this.historyCommentForm.reviseReason = res.data[0].commentReason
+            if(res.data && res.data.length > 0){
+              this.dynamicHistoryCommentTable = res.data
+              this.historyCommentForm.revise = res.data[0].targetScore
+              this.historyCommentForm.reviseReason = res.data[0].commentReason
 
-            let averageScore = 0
-            res.data.forEach(item => {
-              if (item.valueType === 'number'){
-                averageScore += parseInt(item.targetScore)
-              }
-            })
-            averageScore = averageScore / 4
-            this.historyCommentForm.averageScore = averageScore
-            this.historyInfoLoading = false
+              let averageScore = 0
+              res.data.forEach(item => {
+                if (item.valueType === 'number'){
+                  averageScore += parseInt(item.targetScore)
+                }
+              })
+              averageScore = averageScore / 4
+              this.historyCommentForm.averageScore = averageScore
+            }else {
+              this.historyCommentForm.averageScore = 0
+            }
+              this.historyInfoLoading = false
           }, e => {
             this.historyInfoLoading = false
           })
@@ -2287,7 +2295,7 @@ export default {
           _this: this
         }, res => {
           this.sarStandardsInfoEO = res.data || {}
-          if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/FT P') !== -1) {
+          if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/QCBFC') !== -1) {
             this.QFTP = true
           }
           // this.textOptions.forEach(item => {
@@ -3029,18 +3037,8 @@ export default {
         this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
           _this: this
         }, res => {
-          if(res.data && res.data.length > 0){
-            let averageScore = 0
-            res.data.forEach(item=>{
-              item.targetScore = Number(item.targetScore)/2
-              averageScore += item.targetScore
-            })
-            this.businessCommentForm.averageScore = averageScore/4
-            this.businessCommentTable = res.data
             this.historyInfoLoading = false
             this.$forceUpdate()
-          }
-
         }, e => {
           this.historyInfoLoading = false
         })
@@ -3141,9 +3139,11 @@ export default {
     this.$http.get('sarEnterpriseStandardEvaluation/evaluation-index/getEvaluationIndex', {indexType:this.indexType}, {
       _this: this
     }, res => {
-      this.businessCommentTable = res.data
-      console.log(this.businessCommentTable)
-      this.$forceUpdate()
+
+      if(res.data){
+        this.businessCommentTable = res.data
+        this.$forceUpdate()
+      }
     }, e => {
     })
     this.sarStandardsInfoEO.id = this.$route.params.id
@@ -3445,8 +3445,8 @@ export default {
             width: calc(~'100% - 225px');
             & > .files-title{
               width: calc(~'100% - 120px');
-              min-height: 50px;
-              line-height: 50px;
+              min-height: 32px;
+              line-height: 32px;
               font-size: 16px;
               color: #409EFF;
               & > a{

src/pages/details/otherLawsStandDetails/index.vue

@@ -3,7 +3,7 @@
   <div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
     <!--title 标题-->
     <div class="details-header">
-      <span>{{sarStandardsInfoEO.lawsNumber}}-{{sarStandardsInfoEO.lawsYear}} 《{{sarStandardsInfoEO.lawsName}}》 企标详情</span>
+      <span>{{sarStandardsInfoEO.lawsNumber}}-{{sarStandardsInfoEO.lawsYear}} 《{{sarStandardsInfoEO.lawsName}}》 政策详情</span>
     </div>
     <!--主体内容-->
     <div class="details-content" style="position: relative">
@@ -40,27 +40,27 @@
               <template v-if = "item.label === '基础信息'">
                 <div class="details-content-modular basic-information" style="margin-bottom: 0;border: none">
                   <div class="basic-information-content">
-                    <p style="color: #C42626;" class="half"><label style=" margin-right: 157px;">政策编号</label><span>{{ sarStandardsInfoEO.lawsNumber }}</span></p>
-                    <p class="half"><label style=" margin-right: 157px;">政策文号</label><span>{{ sarStandardsInfoEO.lawsNo || '-' }}</span></p>
-                    <p><label style=" margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.lawsName || '-' }}</span></p>
+                    <p style="" class="half"><label style=" margin-right: 157px;">政策分类</label><span>{{ sarStandardsInfoEO.lawsType }}</span></p>
+                    <p style="" class="half"><label style=" margin-right: 157px;">政策编号</label><span>{{ sarStandardsInfoEO.lawsNumber }}</span></p>
+                    <p><label style=" margin-right: 157px;">政策名称</label><span>{{ sarStandardsInfoEO.lawsName || '-' }}</span></p>
                     <p v-if="activeState" style=""><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.lawsEnName || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 157px;">发文日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 157px;">发文单位</label><span>{{ sarStandardsInfoEO.issueCompany || '-' }}</span></p>
-                    <p class="half"><label style=" margin-right: 157px;">发文单位</label><span>{{ sarStandardsInfoEO.issueCompany || '-' }}</span></p>
-                    <p class="half"><label style=" margin-right: 120px;">征集意见周期</label><span>{{ sarStandardsInfoEO.commentCycleStart || '' }} - {{sarStandardsInfoEO.commentCycleEnd || ''}}</span></p>
+                    <p class="half"><label style=" margin-right: 125px;">征集意见周期</label><span>{{ formatDateFunc(sarStandardsInfoEO.commentCycleStart) || '' }} - {{formatDateFunc(sarStandardsInfoEO.commentCycleEnd) || ''}}</span></p>
                     <p class="half">
                       <label style=" margin-right: 156px;"
-                             title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
-                      >文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
+                             title=""
+                      >文本状态</label><span style="">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
                     </p>
                     <p class="half"><label style=" margin-right: 157px;">信息简报</label><span>{{ sarStandardsInfoEO.lawsBulletin || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 157px;">适用区域</label><span>{{ sarStandardsInfoEO.lawsSyqy || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 157px;">适用车型</label><span>{{ sarStandardsInfoEO.lawsSycx || '-' }}</span></p>
-                    <p class="half"><label style=" margin-right: 97px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? '是' : (sarStandardsInfoEO.isRelateAccess ? '否':'-')}}</span></p>
-                    <p class="half"><label style=" margin-right: 97px;">福田转发通知文号</label><span>{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}</span></p>
-                    <p class="half"><label style=" margin-right: 192px;">年度</label><span>{{ sarStandardsInfoEO.lawsYear || '-' }}</span></p>
-                    <p class="half"><label style=" margin-right: 192px;">标签</label><span>{{ sarStandardsInfoEO.lawsLabel || '-' }}</span></p>
-                    <p class="half"><label style=" margin-right: 192px;">备注</label><span>{{ sarStandardsInfoEO.lawsRemark || '-' }}</span></p>
+                    <p class="half"><label style=" margin-right: 95px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? '是' : (sarStandardsInfoEO.isRelateAccess ? '否':'-')}}</span></p>
+                    <p class="half"><label style=" margin-right: 95px;">福田转发通知文号</label><span>{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}</span></p>
+                    <p class="half"><label style=" margin-right: 157px;">政策文号</label><span>{{ sarStandardsInfoEO.lawsNo || '-' }}</span></p>
+                    <p class="half"><label style=" margin-right: 190px;">年度</label><span>{{ sarStandardsInfoEO.lawsYear || '-' }}</span></p>
+                    <p class="half"><label style=" margin-right: 190px;">标签</label><span>{{ sarStandardsInfoEO.lawsLabel || '-' }}</span></p>
+                    <p class="half"><label style=" margin-right: 62px;">备注（最终政策发布）</label><span>{{ sarStandardsInfoEO.lawsRemark || '-' }}</span></p>
                     <template v-for="(child, childIndex) in item.child2">
                       <p class="half">
                         <label style=" margin-right: 156px;">{{child.attrName}}</label>
@@ -112,6 +112,15 @@
                   </span>
                     </p>
                   </template>
+                  <template v-else-if="child.attrField === 'DTWJHLAWS'|| child.attrField === 'BDTWJHLAWS'">
+                    <p class="modular-content-p-val" v-if="child.value">
+                      <span v-for="(item, index) in child.value.split(',')" :key="index">
+                        <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
+                           class="span-line" :title="item">{{ item }}</a>
+                      </span>
+                    </p>
+                    <span class="modular-content-p-val" v-else>-</span>
+                  </template>
                   <!--相关计划-->
                   <template v-else-if="child.attrField === 'XGJH' && child.value">
                 <span
@@ -1119,6 +1128,13 @@ export default {
   watch: {
   },
   methods: {
+    formatDateFunc(date){
+      let result = ""
+      if(date){
+        result = this.$moment(date).format('YYYY-MM-DD')
+      }
+      return result
+    },
     handleChange(val) {
       console.log(val)
     },
@@ -1647,29 +1663,14 @@ export default {
     // 请求标准id和类型
     showReplaceStandInfo (item) {
       // this.replaceStandInfoEO.standType = this.sarStandardsInfoEO.standType
-      this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', {
-        standNumber: item
+      this.$http.get('/lawss/sarLawsInfo/queryInfoByStandNum', {
+          lawsNumber: item
       }, {
         _this: this
       }, res => {
-        if (res.ok) {
-          let name = ''
-          let pageType = ''
-          const standType = res.data.standType || 'BUSINESS'
-          switch (standType) {
-            case 'INLAND':
-              name = 'OtherStandardDetails'
-              pageType = 'INLAND_STAND'
-              break
-            case 'FOREIGN':
-              name = 'OtherStandardDetails'
-              pageType = 'FOREIGN_STAND'
-              break
-            case 'BUSINESS':
-              name = 'OtherBussStandardDetails'
-              pageType = 'BUSINESS_STAND'
-              break
-          }
+        if (res.ok && res.data) {
+          let name = 'OtherLawsStandDetails'
+          let pageType = 'FOREIGN_LAWS'
           let routeUrl = this.$router.resolve({
             name: name,
             params: {
@@ -1678,8 +1679,6 @@ export default {
             }
           })
           window.open(routeUrl.href, '_blank')
-        } else {
-          this.$message.error(res.message)
         }
       }, e => {
       })
@@ -2015,7 +2014,7 @@ export default {
     relateEvent () {
       this.$http.get('lawss/sarUpdLog/getLogList', {
         sarId: this.$route.params.id,
-        sarType: 'BUSINESS'
+        sarType: 'FOREIGN_LAWS'
       }, {
         _this: this
       }, res => {
@@ -2392,7 +2391,7 @@ export default {
             min-height: 50px;
             line-height: 50px;
             font-size: 16px;
-            color: #999999;
+            /*color: #999999;*/
             word-break: break-all;
             //overflow: hidden;
             //white-space: nowrap;

src/pages/details/otherStandardDetails/index.vue

@@ -64,15 +64,15 @@
                         sarStandardsInfoEO.standEnName || '-'
                       }}</span></p>
                     <!--发布稿（必读）-->
-                    <template v-for="(child, childIndex) in item.child1">
-                      <div class="files-titles" style="border-bottom: 1px solid #E5E5E5">
+                    <template v-for="(child, childIndex) in item.child1" v-if="child.value && child.value.length > 0">
+                      <p class="files-titles" style="border-bottom: 1px solid #E5E5E5">
                         <label style="float: left">{{ child.attrName }}</label>
                         <template v-if="child.value && child.value.length > 0">
                           <!--                          单个文件时-->
-                          <div style="position: relative;margin-left: 214px;">
+                          <div style="position: relative;margin-left: 214px; line-height: 32px">
                             <div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
                           <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
-                            <a style="font-size: 16px;color: #409EFF;cursor: pointer;"
+                            <a style="font-size: 16px;color: #409EFF;cursor: pointer;display: inline-block"
                                @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
                             <i
@@ -251,7 +251,13 @@
                             <template v-if="child.value === null">-</template>
                           </p>
                         </template>
-                      </div>
+                      </p>
+
+
+
+
+
+
                       <p class="half">
                         <label style=" margin-right: 150px;"
                                title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
@@ -3907,7 +3913,7 @@ export default {
   a {
     overflow: hidden;
     text-overflow: ellipsis;
-    width: calc(~'100% - 40px');
+    max-width: 780px;
     white-space: nowrap;
     display: block;
   }
@@ -4272,6 +4278,7 @@ export default {
           }
 
           .modular-content-p-val {
+            line-height: 32px;
             display: inline-block;
             width: calc(~'100% - 225px');
             //min-height: 50px;
@@ -4285,6 +4292,7 @@ export default {
           }
 
           .modular-content-p-flies {
+            line-height: 32px;
             //position: relative;
             display: inline-block;
             width: calc(~'100% - 225px');
@@ -4363,7 +4371,7 @@ export default {
 
       .basic-information-content {
         & > p {
-          min-height: 42px;
+          min-height: 43px;
           line-height: 43px;
           border-bottom: 1px solid #E5E5E5;
         }

src/pages/home2/components/todoList/index.vue

@@ -105,6 +105,31 @@ export default {
             })
           }
           break
+        case 'laws1':
+          if (row.taskInfo === '政策入库审批') {
+            this.$router.push({
+              name: 'zcrkStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if (row.taskInfo === '重新发起入库流程'){
+            this.$router.push({
+              name: 'zcrkStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
         case 'buss1':
           if (row.taskInfo === '企标编写') {
             this.$router.push({

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -1256,6 +1256,7 @@ export default {
     },
     standSelectChange (data) {
       this.selectedList = []
+      this.selectedList1 = []
       this.selectedAllList = data
       for (let i = 0; i < data.length; i++) {
         this.selectedList.push(data[i].id)
@@ -1431,6 +1432,7 @@ export default {
             this.parentNode = cur[i]
           }
           this.zNodes = str
+          console.log(this.zNodes);
         }
         // 查完左侧目录后，如果没有选中的，设置最外层选中
         if (JSON.stringify(this.selectSarMenu) === '{}') {
@@ -1506,6 +1508,8 @@ export default {
         }, res => {
           if (res.data) {
             this.batchDeleteItem()
+          } else if(this.selectedList != null){
+            this.$message.warning('请选择要删除的数据')
           } else {
             this.deleteItemsModal = true
           }

src/pages/localTool/standCalendar/index.vue

@@ -689,6 +689,10 @@ export default {
       if (data.length > 0) {
         this.editForm.fillPeopleId = data[0].id
         this.editForm.fillPeople = data[0].name
+        this.editForm.fillUnit = data[0].unit
+        this.editForm.fillDept = data[0].institutionName
+        this.editForm.fillTel = data[0].phone
+        this.editForm.fillMail = data[0].email
       }
       this.roleShowflag = false
     },

src/pages/login/checkPage.vue

@@ -0,0 +1,137 @@
+<template>
+  <div class="checkPage">
+
+  </div>
+</template>
+
+<script>
+import { mapMutations, mapActions } from 'vuex'
+import { checkPage } from '@/api/login'
+import { Loading } from 'element-ui';
+export default {
+  name: 'CheckPage',
+  data() {
+    return {
+      loading: ''
+    }
+  },
+  created() {
+    const data = {
+      lock: true,
+      text: 'Loading',
+      spinner: 'el-icon-loading',
+      background: 'rgba(0, 0, 0, 0.7)'
+    }
+    this.loading = Loading.service(data)
+  },
+  mounted() {
+    let Base64 = require('js-base64').Base64
+    const str = Base64.encode(this.$route.query.username)
+    const params = {
+      username: this.$route.query.username
+    }
+    checkPage(params).then(res => {
+      if (res.ok) {
+        this.loginNew(res)
+        this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
+          this.loading.close();
+        });
+      } else if (res.respCode === 'r0012') {
+        this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
+          this.loading.close();
+        });
+        this.$router.go(-1)
+        this.$message.error(res.message)
+      } else {
+        this.$router.go(-1)
+        this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
+          this.loading.close();
+        });
+      }
+    }).catch(err => {
+      this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
+        this.loading.close();
+      });
+    })
+  },
+  methods: {
+    getMenu () {
+      return new Promise((resolve, reject) => {
+        this.$http.get('sarUser/user/menu', {
+          userId: this.$store.getters.userInfo.userId,
+        }, {
+          _this: this,
+        }, res => {
+          if (res.ok) {
+            resolve(res.data)
+          }
+        }, e => {
+          reject(e)
+        })
+      })
+    },
+    loginNew (res) {
+      console.log(res)
+      if (res.data.orgId === null || res.data.orgId === '') {
+        this.$message.warning('未分配组织机构,请联系管理员分配后重新登录')
+        return
+      }
+      let Base64 = require('js-base64').Base64
+      let userInfoStr = Base64.decode(res.data)
+      let userInfo2 = decodeURIComponent(userInfoStr)
+      let userInfoObj = JSON.parse(userInfo2)
+      userInfoObj.userId = userInfoObj.usid
+      console.log(1)
+      window.sessionStorage.setItem('userInfoObj', userInfoObj); // del
+      this.setToken(userInfoObj.token) // vuex存储token
+      let userInfo = {}
+      for (let key in userInfoObj) {
+        if (key !== 'uname') {
+          userInfo[key] = userInfoObj[key]
+        } else {
+          userInfo.uName = userInfoObj[key]
+        }
+      }
+      this.setUserInfo(JSON.stringify((userInfo)))
+      // this.resetTime()
+      // 获取用户菜单
+      console.log(2)
+      window.sessionStorage.setItem('userInfo', userInfo); // del
+      console.log('寄')
+      this.getMenu().then((menuList) => {
+        let hasHomeMenu = false
+        menuList.map((menuItem) => {
+          if (menuItem.id === 'asdfadf') {
+            hasHomeMenu = true
+          }
+        })
+        console.log(3)
+        window.sessionStorage.setItem('hasHomeMenu', hasHomeMenu); // del
+        window.sessionStorage.setItem('menuList', menuList); // del
+        if (hasHomeMenu) {
+          this.setMenu(JSON.stringify(menuList)).then(res => {
+            if (this.showIETips) {//判断是否IE浏览器
+              alert('为了最佳显示效果 请使用google chrome')
+            }
+            console.log(4)
+            this.$router.push('/home2')
+          }, e => {
+            this.$message.warning('未获取到菜单')
+          })
+        } else {
+          alert('无系统权限')
+          // window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code';
+        }
+      })
+    },
+  ...mapMutations(['setToken', 'setUserInfo', 'resetTime', 'rememberPwd', 'setJESSCookie']),
+  ...mapActions(['setMenu'])
+  }
+}
+</script>
+
+<style lang="less" scoped>
+ .checkPage {
+
+ }
+</style>

src/pages/login/index.vue

@@ -148,53 +148,53 @@
                 })
             },
             loginNew (res) {
-                if (res.data.orgId === null || res.data.orgId === '') {
-                    this.$message.warning('未分配组织机构,请联系管理员分配后重新登录')
-                    return
+            if (res.data.orgId === null || res.data.orgId === '') {
+              this.$message.warning('未分配组织机构,请联系管理员分配后重新登录')
+              return
+            }
+            let Base64 = require('js-base64').Base64
+            let userInfoStr = Base64.decode(res.data)
+            let userInfo2 = decodeURIComponent(userInfoStr)
+            let userInfoObj = JSON.parse(userInfo2)
+            userInfoObj.userId = userInfoObj.usid
+            window.sessionStorage.setItem('userInfoObj', userInfoObj); // del
+            this.setToken(userInfoObj.token) // vuex存储token
+            let userInfo = {}
+            for (let key in userInfoObj) {
+              if (key !== 'uname') {
+                userInfo[key] = userInfoObj[key]
+              } else {
+                userInfo.uName = userInfoObj[key]
+              }
+            }
+            this.setUserInfo(JSON.stringify((userInfo)))
+            // this.resetTime()
+            // 获取用户菜单
+            window.sessionStorage.setItem('userInfo', userInfo); // del
+            this.getMenu().then((menuList) => {
+              let hasHomeMenu = false
+              menuList.map((menuItem) => {
+                if (menuItem.id === 'asdfadf') {
+                  hasHomeMenu = true
                 }
-                let Base64 = require('js-base64').Base64
-                let userInfoStr = Base64.decode(res.data)
-                let userInfo2 = decodeURIComponent(userInfoStr)
-                let userInfoObj = JSON.parse(userInfo2)
-                userInfoObj.userId = userInfoObj.usid
-                window.sessionStorage.setItem('userInfoObj', userInfoObj); // del
-                this.setToken(userInfoObj.token) // vuex存储token
-                let userInfo = {}
-                for (let key in userInfoObj) {
-                    if (key !== 'uname') {
-                        userInfo[key] = userInfoObj[key]
-                    } else {
-                        userInfo.uName = userInfoObj[key]
-                    }
-                }
-                this.setUserInfo(JSON.stringify((userInfo)))
-                // this.resetTime()
-                // 获取用户菜单
-                window.sessionStorage.setItem('userInfo', userInfo); // del
-                this.getMenu().then((menuList) => {
-                    let hasHomeMenu = false
-                    menuList.map((menuItem) => {
-                        if (menuItem.id === 'asdfadf') {
-                            hasHomeMenu = true
-                        }
-                    })
-                    window.sessionStorage.setItem('hasHomeMenu', hasHomeMenu); // del
-                    window.sessionStorage.setItem('menuList', menuList); // del
-                    if (hasHomeMenu) {
-                        this.setMenu(JSON.stringify(menuList)).then(res => {
-                            if (this.showIETips) {//判断是否IE浏览器
-                                alert('为了最佳显示效果 请使用google chrome')
-                            }
-                            this.$router.push('/home2')
-                        }, e => {
-                            this.$message.warning('未获取到菜单')
-                        })
-                    } else {
-                        alert('无系统权限')
-                        // window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code';
-                    }
+              })
+              window.sessionStorage.setItem('hasHomeMenu', hasHomeMenu); // del
+              window.sessionStorage.setItem('menuList', menuList); // del
+              if (hasHomeMenu) {
+                this.setMenu(JSON.stringify(menuList)).then(res => {
+                  if (this.showIETips) {//判断是否IE浏览器
+                    alert('为了最佳显示效果 请使用google chrome')
+                  }
+                  this.$router.push('/home2')
+                }, e => {
+                  this.$message.warning('未获取到菜单')
                 })
-            },
+              } else {
+                alert('无系统权限')
+                // window.location.href = 'http://testsso1.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&redirect_uri=http://127.0.0.1:9090&response_type=code';
+              }
+            })
+          },
             ...mapMutations(['setToken', 'setUserInfo', 'resetTime', 'rememberPwd', 'setJESSCookie']),
             ...mapActions(['setMenu'])
         },

src/pages/loginVerify/index.vue

@@ -30,7 +30,7 @@
             getMenu () {
                 return new Promise((resolve, reject) => {
                     this.$http.get('sarUser/user/menu', {
-                      userId: this.$store.getters.userInfo.userId,
+                        userId: this.$store.getters.userInfo.userId,
                     }, {
                         _this: this,
                     }, res => {
@@ -81,7 +81,7 @@
                             let routerUrl = localStorage.getItem("routerUrl");
                             let routerParam = localStorage.getItem("routerParam");
                             // 路由跳转
-                            if(routerParam && routerParam != ''){
+                            if(routerParam && routerParam !== ''){
                                 const UA = navigator.userAgent.toLocaleLowerCase()
                                 if (UA.match(/msie/) != null || UA.match(/trident/) != null) {
                                     alert('为了最佳显示效果 请使用google chrome')
@@ -117,7 +117,7 @@
         mounted () {
             let url = window.location.search
             let code = "";
-            if(url){
+            if(url && url.indexOf("code") !== -1){
                 url = url.substr(1);
                 url = url.split('&');
                 let info = [];
@@ -129,27 +129,32 @@
                 }
                 code = url[0].code
             }
-            let _formData = new FormData()
-            _formData.append('code', code === undefined ? "" : code)
-            loginIdm(_formData).then(res => {
-                if (res.ok) {
-                    this.loginNew(res)
-                } else {
-                    if(res.respCode && res.respCode === 'r0011'){
-                        this.$message.warning('系统无权限访问')
-                        this.$store.dispatch('logout')
-                        this.$alert('您没有系统访问权限，请联系管理员进行授权', '提示', {
-                            confirmButtonText: '确定',
-                            type: 'warning',
-                            showClose: false,
-                            showCancelButton: false,
-                        }).then(() => {
-                            window.location.href = ssoLogoutUrlDev
-                        })
-                        // window.location.href = 'http://sso.foton.com.cn/logout?service='
+            if(code !== undefined && code !== ""){
+                let _formData = new FormData()
+                _formData.append('code', code === undefined ? "" : code)
+                loginIdm(_formData).then(res => {
+                    if (res.ok) {
+                        this.loginNew(res)
+                    } else {
+                        if(res.respCode && res.respCode === 'r0011'){
+                            this.$message.warning('系统无权限访问')
+                            this.$store.dispatch('logout')
+                            this.$alert('您没有系统访问权限，请联系管理员进行授权', '提示', {
+                                confirmButtonText: '确定',
+                                type: 'warning',
+                                showClose: false,
+                                showCancelButton: false,
+                            }).then(() => {
+                                window.location.href = ssoLogoutUrlDev
+                            })
+                            // window.location.href = 'http://sso.foton.com.cn/logout?service='
+                        }
                     }
-                }
-            })
+                })
+            }else {
+                this.$router.push('/home2')
+                // window.location.href = ssoLogoutUrlDev
+            }
 
             if (this.$store.state.laws_urm !== '') {
                 this.isRemember = true

src/pages/personal/pages/my-collection/components/CollectionLaws.vue

@@ -42,7 +42,7 @@
               <div @click="detailsLaws(item)" >
                 <el-col :span="5" :offset="1">
                   <i class="el-icon-collection-tag" style="position: relative; left: -15px" />
-                  所属板块：{{ item.collectType === 'INLAND_LAWS' ? '国内政策' : '国外政策' }}
+                  所属板块：{{ '国内外政策' }}
                 </el-col>
                 <el-col :span="6">
                   <el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top">
@@ -52,8 +52,7 @@
                 <el-col :span="4" :offset="3"> 创建时间：{{getDate(item.creationTime)}}</el-col>
               </div>
               <el-col :span="4">
-                <el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2"  @click="cancelLaws(item.id)" v-btn-permission="'2dee468b4139ac3f26ebe8ac498b9da6'">{{$t('m.cancelCollection')}}</el-button>
-<!--                <el-button size="mini"  style="margin-top: -5px; border: 1px dashed #dcdee2" @click="writeLawsNotes(item,index1)">{{item.seeBtn}}</el-button>-->
+                <el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2"  @click="cancelLaws(item.id)" v-btn-permission="'015f4508c4c5066b90f23d752b43a9df'">取消收藏</el-button>
               </el-col>
             </el-row>
           </div>
@@ -273,7 +272,7 @@ export default {
       this.$http.get('person/personCollect/page', {
         pageNo: this.page,
         pageSize: this.$store.getters.userInfo.configContent,
-        modeType: 'LAWS_STAND',
+        modeType: 'FOREIGN_LAWS',
         collectTitle: this.search.collectionLaws,
         userId: this.$store.getters.userInfo.userId
       }, {

src/pages/personal/pages/my-collection/components/CollectionStandard.vue

@@ -139,7 +139,8 @@ export default {
         pageNo: this.page,
         pageSize: this.$store.getters.userInfo.configContent,
         userId: this.$store.getters.userInfo.userId,
-        collectTitle: this.search.name
+        collectTitle: this.search.name,
+        modeType: 'INLAND_STAND,FOREIGN_STAND,BUSINESS_STAND'
       }, {
         _this: this,
         loading: 'loading'

src/pages/policyRegulation/index.vue

@@ -0,0 +1,23 @@
+<template>
+  <div class="policyRegulation">
+    <router-view />
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'PolicyRegulation',
+  data() {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .policyRegulation{
+    height: 100%;
+  }
+</style>

src/pages/policyRegulation/nationalPolicy/index.vue

@@ -0,0 +1,27 @@
+<template>
+  <div class="nationalPolicy">
+    <foreignRegulationsDatabase></foreignRegulationsDatabase>
+  </div>
+</template>
+
+<script>
+  import foreignRegulationsDatabase from '@/pages/regulatoryRepository/foreignRegulationsDatabase/index'
+export default {
+  name: 'NationalPolicy',
+  components: {
+    foreignRegulationsDatabase
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="less" scoped>
+ .nationalPolicy{
+   height: 100%;
+ }
+</style>

src/pages/policyRegulation/policyWorkGroup/index.vue

@@ -0,0 +1,74 @@
+<template>
+  <div class="policyWorkGroup">
+    <el-tabs
+      v-model="activeName"
+      class="home-tabs"
+    >
+<!--      <el-tab-pane name="workingGroup1">-->
+<!--        <span slot="label"><i class="el-icon-s-order"></i> 标准法规工作组</span>-->
+<!--        <workingGroup1 v-if="activeName === 'workingGroup1'"></workingGroup1>-->
+<!--      </el-tab-pane>-->
+      <el-tab-pane name="workingGroup2">
+        <span slot="label"><i class="el-icon-s-promotion"></i> 政策工作组</span>
+        <workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>
+      </el-tab-pane>
+    </el-tabs>
+    <el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'" class="statistics">工作组统计</el-button>
+  </div>
+</template>
+
+<script>
+import workingGroup1 from '@/pages/regulatoryRepository/workingGroup/components/workingGroup1'
+import workingGroup2 from '@/pages/regulatoryRepository/workingGroup/components/workingGroup2'
+export default {
+  name: 'PolicyWorkGroup',
+  components: {
+    workingGroup1,
+    workingGroup2
+  },
+  data() {
+    return {
+      activeName: 'workingGroup2',
+    }
+  },
+  methods: {
+    statisticsBtn(){
+      this.$router.push({
+        name: 'dataStatisComments'
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+  .policyWorkGroup{
+    position: relative;
+    height: 100%;
+    .statistics{
+      position: absolute;
+      top: 0;
+      right: 0;
+      margin: 5px;
+    }
+    .home-tabs {
+      height: 100%;
+      /deep/.el-tabs__content {
+        height: calc(~'100% - 55px');
+        margin: 0 10px;
+      }
+      ::v-deep.el-tabs__header{
+        margin: 0 10px 15px 10px;
+        border-bottom: 1px solid #F4F4F4;
+      }
+      ::v-deep {
+        .el-tabs__item {
+          font-size: 16px;
+          font-weight: 600;
+        }
+      }
+      .el-tab-pane {
+        height: 100%;
+      }
+    }
+  }
+</style>

src/pages/policyRegulation/problemControl/index.vue

@@ -0,0 +1,100 @@
+<template>
+  <div class="problemControl">
+    <div class="non-content">
+      <el-tabs v-model="tabValue" @tab-click="handleClick" style="height: 100%">
+<!--        <el-tab-pane label="未符合项整改数据库" name="database" v-if="database">-->
+<!--          <rectification-database></rectification-database>-->
+<!--        </el-tab-pane>-->
+        <el-tab-pane label="重点问题项管控" name="keynote" v-if="keynote">
+          <key-issues :keynoteActiveName="keynoteActiveName"></key-issues>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+  </div>
+</template>
+
+<script>
+import keyIssues from "@/pages/regulatoryRepository/nonConfomity/pages/keyIssues";
+import rectificationDatabase from "@/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase";
+export default {
+  name: 'ProblemControl',
+  components: {
+    keyIssues,
+    rectificationDatabase,
+  },
+  data() {
+    return {
+      keynote: false,
+      database: false,
+      menuName: ["未符合项整改数据库", "重点问题项管控"],
+      tabValue: 'keynote',
+      keynoteActiveName: 'cause'
+    }
+  },
+  methods: {
+    handleClick(tab, event) {
+    },
+    // getActiveName() {
+    //   if (this.$route.query.activeName) {
+    //     this.activeName = this.$route.query.activeName
+    //   }
+    //   if (this.$route.query.keynoteActiveName) {
+    //     this.keynoteActiveName = this.$route.query.keynoteActiveName
+    //   }
+    //   console.log('35', this.keynoteActiveName)
+    // }
+  },
+  created() {
+    // this.getActiveName()
+  },
+  mounted () {
+    var list = [];
+    const menuList = this.$store.getters.getMenuList;
+    let menuData = [];
+    let menuID = ["ff7bc984c8115204bba04090f350b19c", "e02897e9ab6b1a72f49c47c07b5be9a5"];
+    this.menuName.forEach(item => {
+      for (let i = 0; i < menuList.length; i++) {
+        let entity = menuList[i];
+        if (item !== entity.menuName) continue;
+        if (menuID.indexOf(entity.id) >= 0 && menuData.indexOf(entity.id) === -1) {
+          menuData.push(entity.id);
+          if (entity.id === "ff7bc984c8115204bba04090f350b19c") {
+            this.database = true
+          } else if (entity.id === "e02897e9ab6b1a72f49c47c07b5be9a5") {
+            this.keynote = true
+          }
+        }
+      }
+    });
+    // this.tabValue = this.database ? 'database' : (this.keynote ? 'keynote' : (this.tracking ? 'listTracking' : (this.other ? 'listOther' : (this.library ? 'localProductsOrProjectLibrary' : ''))))
+  },
+  watch: {},
+}
+</script>
+<style lang="less" scoped>
+  .problemControl {
+    height: inherit;
+    display: flex;
+    flex-direction: column;
+    background-color: #FFFFFF;
+    .non-content {
+      padding: 0 10px;
+      height: 100%;
+      /deep/  .el-tabs {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+        .el-tabs__content {
+          flex: 1;
+          overflow: hidden;
+          .el-tab-pane {
+            height: 100%;
+          }
+        }
+      }
+    }
+    .el-tabs__nav {
+      margin-left:20px;
+    }
+  }
+</style>

src/pages/policyRegulation/standardTrackingList/index.vue

@@ -0,0 +1,27 @@
+<template>
+  <div class="standardTrackingList">
+    <listTracking></listTracking>
+  </div>
+</template>
+
+<script>
+import listTracking from "@/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking";
+export default {
+  name: 'StandardTrackingList',
+  components: {
+    listTracking
+  },
+  data() {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="less" scoped>
+ .standardTrackingList {
+   height: 100%;
+ }
+</style>

src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue

@@ -575,7 +575,14 @@
                             if (valid) {
                                 this.isSubmit = true
                                 this.$http.post('lawss/activiti/startProcessRollBack', {
-                                    type: '2'
+                                  createUser: this.$store.getters.userInfo.userId,
+                                  createUserName: this.$store.getters.userInfo.userName,
+                                  type: '2',
+                                  json: JSON.stringify({
+                                    form: this.form,
+                                    roleForm: this.roleForm,
+                                    commentText1: this.commentText1
+                                  })
                                 }, {}, res => {
                                     if (res.ok) {
                                         var json = Object.assign(this.form, this.roleForm)

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -14,6 +14,7 @@
                 <el-form
                         ref="bzzqyjForm"
                         :model="form"
+                        :rules="formRules"
                         class="label-input-form"
                         label-width="210px"
                 >
@@ -568,14 +569,17 @@
                     itemsName1: '',
                     oldNumber: ''
                 },
-                formRules: {
-                    itemsNum: [
-                        { required: true, message: '请输入标准号/政策号', trigger: 'change' },
-                    ],
-                    itemsName: [
-                        { required: true, message: '请输入标准名称/政策名称', trigger: 'change' },
-                    ],
-                },
+              formRules: {
+                itemsNum: [
+                  {required: true, message: '请输入标准号/政策号', trigger: 'change'},
+                ],
+                itemsName: [
+                  {required: true, message: '请输入标准名称/政策名称', trigger: 'change'},
+                ],
+                endTime: [
+                  {required: true, message: '请输入截止时间', trigger: 'change'},
+                ],
+              },
                 // 标准征求意见数据可库
                 standCommonlySearch: {
                     numOrName: '',
@@ -1103,7 +1107,16 @@
                                 } else {
                                     this.isSubmit = true
                                     this.$http.post('lawss/activiti/startProcessRollBack', {
-                                        type: '9'
+                                      createUser: this.$store.getters.userInfo.userId,
+                                      createUserName: this.$store.getters.userInfo.userName,
+                                      type: '9',
+                                      json: JSON.stringify({
+                                        form: this.form,
+                                        roleForm: this.roleForm,
+                                        commentText1: this.commentText1,
+                                        itemList: this.itemList,
+                                        sarType: this.sarType
+                                      })
                                     }, {}, res => {
                                         if (res.ok) {
                                             var json = Object.assign(this.form, this.roleForm)

src/pages/processCenter/pages/creatProcess/bzjd/step1.vue

@@ -1112,7 +1112,6 @@ export default {
               } else {
                 this.isSubmit = true
                 this.$http.post('lawss/activiti/startProcessRollBack', {
-                  id: this.bpnId || '',
                   createUser: this.$store.getters.userInfo.userId,
                   createUserName: this.$store.getters.userInfo.userName,
                   type: '9',

src/pages/processCenter/pages/creatProcess/bzjd/step2.vue

@@ -500,7 +500,10 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        console.log(data);
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
+                        this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
+                        this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         this.commentText2 = data.commentText2 || ''
                         this.form.endTime = data.endTime || data.form.endTime

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

@@ -905,6 +905,8 @@
                         this.AOLIGEI = data.AOLIGEI
                         this.commentText3 = data.commentText3 || ''
                         this.todoId = res.id
+                        this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
+                        this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         if (data.form) {

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

@@ -486,6 +486,8 @@
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
                         this.form.endTime = data.endTime || data.form.endTime
+                        this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
+                        this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
                         this.commentText4 = data.commentText4 || ''

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

@@ -442,6 +442,8 @@
                 var json = this.json
                 json.zrApplyFlag = 1
                 json.commentText = this.commentText5
+                json.deptUserId = this.form.deptUserId
+                json.deptUserIdName = this.form.deptUserIdName
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: this.taskIds,
@@ -482,9 +484,12 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                      console.log(data);
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
+                        this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
                         this.commentText5 = data.commentText5 || ''
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''

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

@@ -486,6 +486,8 @@
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.form.deptUserId =  data.form ?  data.form.deptUserId : data.deptUserId
+                        this.form.deptUserIdName =  data.form ?  data.form.deptUserIdName : data.deptUserIdName
                         this.commentText6 = data.commentText6 || ''
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''

src/pages/processCenter/pages/creatProcess/bzpg/step1.vue

@@ -533,6 +533,10 @@ export default {
       drawerTitle: "", //drawer标题
       // 查询相关参数
       searching: false,
+      qualityEngineer: '',
+      qualityEngineerName: '',
+      certifiedEngineer: '',
+      certifiedEngineerName: '',
       fileType: "",
       subFlag: 0,
       projectSearch: {
@@ -698,11 +702,16 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      item.commentText = ''
+      console.log(item);
       this.$nextTick(() => {
         if(item.form){
           this.hisListForm = JSON.parse(JSON.stringify(item.form))
           this.listForm = JSON.parse(JSON.stringify(item.form))
+          if(item.taskInfo === '被驳回之后的保存'){
+            this.commentText = item.commentText
+          }else{
+            this.commentText = ''
+          }
           this.listForm.prcNum = this.prcNum
           this.listForm.prcName = this.prcName
           this.listForm['id'] = item.id
@@ -731,6 +740,10 @@ export default {
           this.roleForm.dockUserName = item.dockUserName
           this.roleForm.ministerUser =  item.ministerUser
           this.roleForm.ministerUserName =  item.ministerUserName
+          this.certifiedEngineer = item.certifiedEngineer
+          this.certifiedEngineerName = item.certifiedEngineerName
+          this.qualityEngineerName = item.qualityEngineerName
+          this.qualityEngineer = item.qualityEngineer
           this.submitFlag = '修改节点'
           this.dataList.distributePerson =  this.listForm.dataList[0].distributePerson
           this.$http.get("SarStandItems/sar-stand-items/getFileType", {
@@ -897,6 +910,7 @@ export default {
         this.saveLoading = true;
         this.listForm.dataList = this.dataList
         let _formData = new FormData();
+        _formData.append("id", this.bpnId || "");
         _formData.append("createUser", this.$store.getters.userInfo.userId);
         _formData.append("createUserName", this.$store.getters.userInfo.uName);
         _formData.append("prcType", "5");
@@ -920,7 +934,7 @@ export default {
         _formData.append("taskIds", this.taskIds);
         _formData.append("prcType", "5");
         _formData.append("json", JSON.stringify({
-          taskInfo: "选择已拆分标准",
+          taskInfo: "被驳回之后的保存",
           form: this.listForm,
           roleForm: this.roleForm,
           commentText: this.commentText
@@ -1020,7 +1034,12 @@ export default {
                         commentText: this.commentText
                       }
                     };
-                    let json = this.hisListForm
+                    this.listForm.dataList = this.dataList
+                    this.listForm.qualityEngineer = this.qualityEngineer ?  this.qualityEngineer : this.listForm.qualityEngineer
+                    this.listForm.qualityEngineerName = this.qualityEngineerName ?  this.qualityEngineerName : this.listForm.qualityEngineerName
+                    this.listForm.certifiedEngineer = this.certifiedEngineer ?  this.certifiedEngineer : this.listForm.certifiedEngineer
+                    this.listForm.certifiedEngineerName = this.certifiedEngineerName ?  this.certifiedEngineerName : this.listForm.certifiedEngineerName
+                    let json = this.listForm
                     this.$http.post("lawss/activiti/completeTaskNew", {
                       taskIds: this.$route.query.taskIds,
                       userId: this.$store.getters.userInfo.userId,

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

@@ -262,6 +262,9 @@
               </el-form>
             </div>
             <div style="height: calc(100% - 65px); overflow: auto">
+              <div style="font-size: 16px; color: #FF7F50; padding-bottom: 10px; margin-left: 10px">
+                <p>如果各项目符合法规情况相同,可同时勾选,第一个勾选项目合规排查结果,将代表所有勾选项目合规排查结果。</p>
+              </div>
               <el-table
                 :data="productData"
                 tooltip-effect="dark"

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

@@ -317,6 +317,7 @@ export default {
   data(){
     return {
       active: '1',
+      changePoint: false,
       projectName: '',
       activeName: '',
       fileType: '', //条款文件类型
@@ -383,6 +384,9 @@ export default {
           if(!this.projectTabName.includes(item.projectName)){
             this.projectTabName.push(item.projectName)
           }
+          if(item.changePoint){
+            this.changePoint = true
+          }
         })
         this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
         this.listForm.resDats = []

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

@@ -553,6 +553,7 @@ export default {
     return {
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
+      changePoint: false,
       comFlag: 0,
       nodeList:[],
       drawerTitle:'',
@@ -769,7 +770,11 @@ export default {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
         }
-
+        this.dataList.forEach(item => {
+          if(item.changePoint){
+            this.changePoint = true
+          }
+        })
       });
     },
 
@@ -807,13 +812,22 @@ export default {
         this.isSubmit = false
       })
     },
-    handlePrice(){
-      for (let i = 0; i < this.dataList.length; i++) {
-        if (this.dataList[i].complianceReasons|| (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime) || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
-        }else {
-          this.comFlag ++
+    handlePrice() {
+      this.dataList.forEach(item =>{
+        if(item.complianceReasons){
+          this.comFlag = 0;
+          return
+        }else{
+          for (let i = 0; i < this.dataList.length; i++) {
+            if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
+              this.comFlag = 0;
+              return;
+            } else {
+              this.comFlag++;
+            }
+          }
         }
-      }
+      })
     },
     //提交事件
     handleSubmit() {
@@ -842,8 +856,6 @@ export default {
             this.listForm.dataList = this.dataList;
             const json = JSON.stringify(this.listForm);
             this.isSubmit = true
-            console.log('可以提交');
-            return
             this.$http.post("lawss/activiti/completeTask", {
               taskIds: this.taskIds,
               userId: this.userId,

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

@@ -391,6 +391,7 @@ export default {
     return {
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
+      changePoint: false,
       comFlag: 0,
       nodeList:[],
       drawerTitle:'',
@@ -591,7 +592,11 @@ export default {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
         }
-
+        this.dataList.forEach(item => {
+          if(item.changePoint){
+            this.changePoint = true
+          }
+        })
       });
     },
 

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

@@ -399,6 +399,7 @@ export default {
       //折叠的标志，true为折叠，false为不折叠
       activeName: '',
       foldFormFlag: false,
+      changePoint: false,
       projectTabName: [],
       comFlag: 0,
       nodeList:[],
@@ -610,7 +611,11 @@ export default {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
         }
-
+        this.dataList.forEach(item => {
+          if(item.changePoint){
+            this.changePoint = true
+          }
+        })
       });
     },
 

src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue

@@ -399,6 +399,7 @@ export default {
       //折叠的标志，true为折叠，false为不折叠
       activeName: '',
       foldFormFlag: false,
+      changePoint: false,
       projectTabName: [],
       comFlag: 0,
       nodeList:[],
@@ -610,6 +611,11 @@ export default {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
         }
+        this.dataList.forEach(item => {
+          if(item.changePoint){
+            this.changePoint = true
+          }
+        })
 
       });
     },

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

@@ -399,6 +399,7 @@ export default {
       //折叠的标志，true为折叠，false为不折叠
       activeName: '',
       foldFormFlag: false,
+      changePoint: false,
       projectTabName: [],
       comFlag: 0,
       nodeList:[],
@@ -610,7 +611,11 @@ export default {
           this.listForm = item.form;
           this.dataList = item.form.dataList;
         }
-
+        this.dataList.forEach(item => {
+          if(item.changePoint){
+            this.changePoint = true
+          }
+        })
       });
     },
 

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

@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-show="active == '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -817,7 +817,7 @@ export default {
       this.listForm.commentText = this.commentText
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
-      // this.isSubmit = true
+      this.isSubmit = true
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -43,7 +43,7 @@
                 </el-form-item>
                 <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                   <el-input
-                    v-model="form.standNumber"
+                    v-model.trim="form.standNumber"
                     placeholder="请输入标准编号"
                     clearable
                   ></el-input>
@@ -161,12 +161,12 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item v-if="verifySarStandard" label="归档位置" class="add-form-item form-item-disabled">
-                  <el-input
-                    style="display: none"
-                    v-model="form.treeListId"
-                  ></el-input>
+                <el-form-item v-if="verifySarStandard" label="归档位置" prop="treeListName" class="add-form-item form-item-disabled">
                   <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
+                    <el-input
+                      v-show="false"
+                      v-model="form.treeListId"
+                    ></el-input>
                     <el-input
                       v-model="form.treeListName"
                       clearable
@@ -289,7 +289,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%; line-height: 40px">
                       <div v-for="(item,index) in xgdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -314,7 +314,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in FBGBJBDFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -339,7 +339,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%; line-height: 40px">
                       <div v-for="(item,index) in ssgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -364,7 +364,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in caFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -389,7 +389,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in zbjbdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -416,7 +416,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in xdbFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -441,7 +441,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in kwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -468,7 +468,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in jdwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -493,7 +493,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in bpgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -518,7 +518,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in zqyjgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -1059,6 +1059,8 @@
       <el-upload
         multiple
         drag
+        :limit="8"
+        :on-exceed="handleExceed"
         :file-list="fileList"
         :action="fileUrl"
         ref="importfile"
@@ -1667,6 +1669,12 @@ export default {
         ],
       },
       rules: {
+        standSystem: [
+          {required: true, message: '请选择标准体系', trigger: 'change'}
+        ],
+        treeListName: [
+          {required: true, message: '请选择归档位置', trigger: 'blur'}
+        ],
         standSort: [
           {required: true, message: '请选择标准类别', trigger: 'change'}
         ],
@@ -1748,6 +1756,9 @@ export default {
     }
   },
   watch: {
+    'form.treeListName'(val) {
+      console.log(this.form.treeListName)
+    },
     'form.country': {
       handler(val) {
         if (val !== '' && val !== null && typeof (val) !== 'undefined') {
@@ -1921,6 +1932,10 @@ export default {
     // },
   },
   methods: {
+    //限制上传文件个数
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 8 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
+    },
     // 标准来源改变事件
     standInChange(val) {
       this.verifySarStandard = false
@@ -2195,6 +2210,7 @@ export default {
         glwj: '', // 关联文件
         xglc: '', // 相关流程
         chjl: '', // 参会记录
+        treeListName: ''
       } // 标准信息
     },
     handleProcessStandardNext(status) {
@@ -2366,8 +2382,8 @@ export default {
                   treeList += item.menuName
                   treeListId += item.menuId
                 })
-                this.form.treeListName = treeList
-                this.form.treeListId = treeListId
+                this.$set(this.form, 'treeListName', treeList)
+                this.$set(this.form, 'treeListId', treeListId)
               }
             })
           }else{
@@ -2382,8 +2398,8 @@ export default {
               treeList += item.menuName
               treeListId += item.menuId
             })
-            this.form.treeListName = treeList
-            this.form.treeListId = treeListId
+            this.$set(this.form, 'treeListName', treeList)
+            this.$set(this.form, 'treeListId', treeListId)
           }
         }
       })
@@ -3075,6 +3091,9 @@ export default {
           this.form.treeListName = checkedData.menuName
           this.form.treeListId = checkedData.id
         }
+        this.$nextTick(_ => {
+          this.$refs.form.validateField('treeListName')
+        })
         this.modalShowTree = false
       }
 

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

@@ -128,8 +128,8 @@
                   </el-radio-group>
                   <el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
                 </el-form-item>
-                <el-form-item v-show="form.standInData=='1'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                  <el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
+                <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+                  <el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
                   <tree-select-new
                     :key="key"
                     :multiple=false
@@ -148,9 +148,9 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="归档位置" class="add-form-item form-item-disabled">
+                <el-form-item label="归档位置" prop="treeListName" class="add-form-item form-item-disabled">
                   <el-input
-                    style="display: none"
+                    v-show="false"
                     v-model="form.treeListId"
                   ></el-input>
                   <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
@@ -1375,6 +1375,8 @@
       <el-upload
         multiple
         drag
+        :limit="8"
+        :on-exceed="handleExceed"
         :file-list="fileList"
         :action="fileUrl"
         ref="importfile"
@@ -1660,6 +1662,12 @@ export default {
       replaceLoading: true,
       replacePage: 1,
       rules: {
+        standSystem: [
+          {required: true, message: '请选择标准体系', trigger: 'change'}
+        ],
+        treeListName: [
+          {required: true, message: '请选择归档位置', trigger: 'blur'}
+        ],
         standSort: [
           {required: true, message: '请选择标准类别', trigger: 'change'}
         ],
@@ -1837,6 +1845,10 @@ export default {
     },
   },
   methods: {
+    //限制上传文件个数
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 8 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`)
+    },
     // 标准来源改变事件
     standInChange(val) {
       this.verifySarStandard = false
@@ -2495,6 +2507,9 @@ export default {
           this.form.treeListName = checkedData.menuName
           this.form.treeListId = checkedData.id
         }
+        this.$nextTick(_ => {
+          this.$refs.form.validateField('treeListName')
+        })
         this.modalShowTree = false
       }
 
@@ -2934,7 +2949,9 @@ export default {
     this.modelFunc()
   },
   watch: {
-
+    'form.treeListName'(val) {
+      console.log(this.form.treeListName)
+    },
     'form.country': {
       handler(val) {
         if (val !== '' && val !== null && typeof (val) !== 'undefined') {

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue

@@ -39,7 +39,6 @@
                   <el-date-picker
                           v-model="form.endTime"
                           type="date"
-                          value-format="yyyy-MM-dd"
                           :picker-options="pickerOptions"
                           placeholder="请选择结束日期">
                   </el-date-picker>
@@ -662,13 +661,14 @@ export default {
         bpnId: this.$route.query.bpnId
       }).then(res => {
         let mes = JSON.parse(res.mes)
+        console.log(mes);
         this.bpnId = this.$route.query.bpnId
         if (mes.form.endTime) {
           mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
         } else {
           mes.form.endTime = ''
         }
-        this.addFjList = mes.filesId
+        this.addFjList = mes.filesId || mes.form.filesId || ''
         this.form.fjListName = mes.filesName
         this.form = mes.form
         this.roleForm = mes.roleForm
@@ -879,6 +879,7 @@ export default {
     handleSave () {
       this.saveLoading = true
       let _formData = new FormData()
+      this.form.filesId = this.addFjList
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
       _formData.append('createUserName', this.$store.getters.userInfo.userName)

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue

@@ -169,19 +169,6 @@
           </el-table-column>
         </el-table>
       </div>
-      <el-collapse accordion>
-        <el-collapse-item title="审批意见">
-          <div style="margin: 10px 0;">
-            <el-input
-              type="textarea"
-              :rows="3"
-              resize="none"
-              placeholder="请输入意见"
-              v-model="commentText">
-            </el-input>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
     </div>
     <div class="content" v-show="active === '2'">
       <el-table

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

@@ -38,9 +38,7 @@
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     v-model="form.endTime"
-                    :picker-options="pickerOptions"
                     type="date"
-                    value-format="yyyy-MM-dd"
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>

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

@@ -37,7 +37,6 @@
                     disabled
                     v-model="form.endTime"
                     type="date"
-                    value-format="yyyy-MM-dd"
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
@@ -206,6 +205,7 @@ export default {
   data() {
     return {
       commentText2: '',
+      onlyKey: '',
       drawerModal: false,
       histortData: [],
       commentText: "",
@@ -330,6 +330,7 @@ export default {
     handleSave() {
       this.saveLoading = true;
       let _formData = new FormData();
+      this.form.onlyKey = this.onlyKey
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "3");
       _formData.append("taskIds", this.taskIds);
@@ -350,9 +351,12 @@ export default {
         if (valid) {
           this.isSubmit = true;
           var json = this.json;
+          json.onlyKey = this.onlyKey
           json.commentText = this.commentText2;
           json.responUserList = this.form.responUserList;
           json.responUserListName = this.form.responUserListName;
+          json.presidentUser = this.form.presidentUser
+          json.presidentUserName = this.form.presidentUserName
           json.introduce = false;
           this.$http.post("lawss/activiti/completeTask", {
             json: JSON.stringify(json),
@@ -377,7 +381,12 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
+          this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
           this.commentText2 = data.commentText2 || ''
+          this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+          this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
+          this.form.startUserName = data.form ? data.form.startUserName : data.startUserName
+          this.form.startUser = data.form ? data.form.startUser : data.startUser
           this.form.cid = data.form ? data.form.cid : data.cid
           this.form.endTime = data.form ? data.form.endTime : data.endTime
           this.form.fjList = data.form ? data.form.fjList : data.fjList

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

@@ -35,7 +35,6 @@
                                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             disabled
-                                            value-format="yyyy-MM-dd"
                                             v-model="form.endTime"
                                             type="date"
                                             placeholder="请选择结束日期">
@@ -701,9 +700,13 @@
                             this.submitShow = true
                         }
                         this.commentText3 = data.commentText3 || ''
+                        this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+                        this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
                         this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
                         this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
                         this.form.textType = data.form ? data.form.textType : data.textType
+                        this.form.startUser = data.form ? data.form.startUser : data.startUser
+                        this.form.startUserName = data.form ? data.form.startUserName : data.startUserName
                         this.form.cid = data.form ? data.form.cid : data.cid
                         this.form.endTime = data.form ? data.form.endTime : data.endTime
                         this.todoId = res.id

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

@@ -34,7 +34,6 @@
                                 </el-form-item>
                                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                                     <el-date-picker
-                                      value-format="yyyy-MM-dd"
                                             disabled
                                             v-model="form.endTime"
                                             type="date"
@@ -407,7 +406,8 @@
                 this.$refs['bzzqyjForm'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
-                        var json = this.json
+                        let json = this.json
+                        json.info = this.data
                         json.commentText = this.commentText41
                         json.bzfgId = this.form.bzfgId
                         json.bzfgName = this.form.bzfgName
@@ -455,14 +455,16 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+                        this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
                         this.form.fjList = data.fjList || data.form.fjList
                         this.form.cid = data.cid || data.form.cid
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.textType = data.textType || data.form.textType
                         this.form.modelList = data.modelList || data.form.modelList
                         this.commentText41 = data.commentText41 || ''
-                        this.form.bzfgId = data.startUser
-                        this.form.bzfgName = data.startUserName
+                        this.form.bzfgId = data.startUser  || data.form.startUser
+                        this.form.bzfgName = data.startUserName || data.form.startUserName
                         this.json = data
                         this.data = data.info || data.data
                     }).catch(e => {

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

@@ -37,7 +37,6 @@
                                             disabled
                                             v-model="form.endTime"
                                             type="date"
-                                            value-format="yyyy-MM-dd"
                                             placeholder="请选择结束日期">
                                     </el-date-picker>
                                 </el-form-item>
@@ -397,7 +396,8 @@
             },
             handleSubmit() {
                 this.isSubmit = true
-                var json = this.json
+                let json = this.json
+                json.info = this.data
                 json.commentText = this.commentText42
                 json.bzFlag = '0'
                 this.$http.post('lawss/activiti/completeTask', {
@@ -440,6 +440,8 @@
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
                         this.form.fjList = data.fjList || data.form.fjList
+                        this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+                        this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
                         this.commentText42 = data.commentText42 || ''
                         this.form.cid = data.cid || data.form.cid
                         this.form.endTime = data.endTime || data.form.endTime

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

@@ -35,7 +35,6 @@
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
-                    value-format="yyyy-MM-dd"
                     v-model="form.endTime"
                     type="date"
                     placeholder="请选择结束日期">
@@ -256,9 +255,11 @@
     </div>
       <ProcessFooter
               show-submit
+              show-save
               :submitLoading="isSubmit"
               :saveLoading="saveLoading"
               show-transfer
+              @save="handleSave"
               @transfer="handleTransfer"
               @submit="handleSubmit"
       >
@@ -340,7 +341,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew} from 'api/process'
+import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew, saveTaskForPub } from "api/process";
 import axios from "axios";
 
 export default {
@@ -348,6 +349,7 @@ export default {
   data() {
     return {
       standId: '',
+      onlyKey: '',
       modaltitle2: '',
       addType: '',
       commentText4: '',
@@ -616,14 +618,41 @@ export default {
     handleTabs(name) {
       this.active = name
     },
+    //保存事件
+    handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      let json = this.json
+      json.info = this.data
+      json.onlyKey = this.onlyKey
+      json.spId = this.form.spId
+      json.spName = this.form.spName
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "3");
+      _formData.append("taskIds", this.taskIds);
+      _formData.append("json", JSON.stringify({
+        form: json,
+        commentText4: this.commentText4
+      }));
+      console.log(json);
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
     handleSubmit() {
       this.$refs['bzzqyjForm'].validate((valid) => {
         if (valid) {
           this.isSubmit = true
-          var json = this.json
+          let json = this.json
           json.actionFlag = 0
           json.commentText = this.commentText4
           json.spId = this.form.spId
+          json.info = this.data
+          json.onlyKey = this.onlyKey
           json.spName = this.form.spName
           this.$http.post('lawss/activiti/completeTask', {
             json: JSON.stringify(json),
@@ -668,6 +697,7 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
+          console.log(data);
           let commitStatus = res.commitStatus
           if(commitStatus && commitStatus > 0){
             this.acceptShow = true
@@ -676,18 +706,27 @@ export default {
             this.acceptShow = false
             this.submitShow = true
           }
-          this.commentText4 = data.commentText4 || ''
+          this.commentText4 =  data.commentText4 || ''
+          if(data.onlyKey){
+            this.onlyKey = data.onlyKey
+          }else{
+            this.onlyKey = data.form.onlyKey
+          }
+          this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+          this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.fjList = data.fjList || data.form.fjList
+          this.form.spId = data.form ? data.form.spId :  ''
+          this.form.spName = data.form ? data.form.spName :  ''
+          this.form.startUser = data.form ? data.form.startUser : data.startUser
+          this.form.startUserName = data.form ? data.form.startUserName : data.startUserName
           this.form.cid = data.cid || data.form.cid
           this.form.endTime = data.endTime || data.form.endTime
           this.form.textType = data.textType || data.form.textType
           this.form.modelList = data.modelList || data.form.modelList
-          this.form.spId = data.spId || ''
-          this.form.spName = data.spName || ''
-          this.json = data
+          this.json = data.form ? data.form : data
           this.standId =  data.standId
           this.getItemList(data.standId,data.textType)
-          this.data = data.info || data.data
+          this.data = data.info || data.form.info
         }).catch(e => {
         })
       })

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

@@ -351,6 +351,7 @@
       return {
         clickFlag: false,
         commentText5: '',
+        onlyKey: '',
         options: [],
         itemId: '',
         modalshowflag2: false,
@@ -557,6 +558,7 @@
           let _formData = new FormData();
           let json = this.form;
           json.data = this.data;
+          json.onlyKey = this.onlyKey
           _formData.append("id", this.bpnId || "");
           _formData.append("prcType", "3");
           _formData.append("taskIds", this.taskIds);
@@ -593,6 +595,7 @@
           this.isSubmit = true;
           var json = this.json;
           json.oldinfo = this.oldData;
+          json.onlyKey = this.onlyKey
           json.commentText = this.commentText5;
           json.introduce = true;
           this.$http.post("lawss/activiti/completeTask", {
@@ -617,13 +620,25 @@
             pId: this.pId
           }).then(res => {
             let data = JSON.parse(res.mesg);
-            console.log(data);
             this.commentText5 = data.commentText5 || ''
+            this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
+            this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+            this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
             this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
             this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
             this.form.textType = data.form ? data.form.textType : data.textType
             this.form.cid = data.form ? data.form.cid : data.cid
             this.form.endTime = data.form ? data.form.endTime : data.endTime
+            this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
+              endTime: this.form.endTime
+            }, {}, res => {
+              //返回0 流程未到截止日期 不能进行操作
+              if (res.message === '0') {
+                this.clickFlag = false
+              } else {
+                this.clickFlag = true
+              }
+            })
             let newArr = data.info ? data.info : data.form.data
             newArr.forEach(item => {
               if (!item.source) {
@@ -637,16 +652,6 @@
             this.json = data;
             this.getItemList(data.standId,this.form.textValue)
             this.data = newArr
-            this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
-              endTime: this.form.endTime
-            }, {}, res => {
-              //返回0 流程未到截止日期 不能进行操作
-              if (res.message === '0') {
-                this.clickFlag = false
-              } else {
-                this.clickFlag = true
-              }
-            })
             if (data.introduce) {
             } else {
               this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {

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

@@ -530,6 +530,8 @@
           }).then(res => {
             let data = JSON.parse(res.mesg);
             this.commentText6 = data.commentText6 || ''
+            this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+            this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
             this.form.fjList = data.fjList || data.form.fjList
             this.form.cid = data.cid || data.form.cid;
             this.form.endTime = data.endTime || data.form.endTime;

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

@@ -491,6 +491,8 @@ export default {
         }).then(res => {
           let data = JSON.parse(res.mesg)
           this.commentText7 = data.commentText7 || ''
+          this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+          this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.fjList = data.fjList || data.form.fjList
           this.form.cid = data.cid || data.form.cid;
           this.form.endTime = data.endTime || data.form.endTime;
@@ -500,7 +502,7 @@ export default {
           this.oldData = JSON.parse(JSON.stringify(newArr))
           let arr = []
           newArr.forEach(item => {
-            if (item.state != '3') {
+            if (item.state !== '3') {
               arr.push(item)
             }
           })

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

@@ -491,6 +491,8 @@ export default {
         }).then(res => {
           let data = JSON.parse(res.mesg)
           this.commentText8 = data.commentText8 || ''
+          this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+          this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.fjList = data.fjList || data.form.fjList
           this.form.cid = data.cid || data.form.cid;
           this.form.endTime = data.endTime || data.form.endTime;

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

@@ -491,6 +491,8 @@ export default {
         }).then(res => {
           let data = JSON.parse(res.mesg)
           this.commentText9 = data.commentText9 || ''
+          this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+          this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
           this.form.fjList = data.fjList || data.form.fjList
           this.form.cid = data.cid || data.form.cid;
           this.form.endTime = data.endTime || data.form.endTime;

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

@@ -44,7 +44,7 @@
                 <el-table-column type="selection" min-width="5%"  align="center"/>
                 <el-table-column
                         label="序号"
-                        width="50"
+                        min-width="50"
                         align="center">
                   <template slot-scope="scope">
                     {{scope.$index + 1}}
@@ -52,14 +52,14 @@
                 </el-table-column>
                 <el-table-column
                         label="企标编号"
-                        width="150">
+                        min-width="150">
                   <template slot-scope="scope">
                     <a v-if="scope.row.standCode" class="table-jump" @click="handlePreview(scope.row)" :title="scope.row.standCode">{{ scope.row.standCode | ellipsis }}</a>
                   </template>
                 </el-table-column>
                 <el-table-column
                         label="企标名称"
-                        width="300">
+                        min-width="300">
                   <template slot-scope="scope">
                     <a v-if="scope.row.standName" class="table-jump" @click="handlePreview(scope.row)" :title="scope.row.standName">{{ scope.row.standName | ellipsis }}</a>
                   </template>
@@ -67,7 +67,7 @@
                 <el-table-column
                         prop="qcdw"
                         label="起草单位"
-                        width="120">
+                        min-width="120">
                   <template slot-scope="scope">
                     <span v-if="scope.row.qcdw" :title="scope.row.qcdw">{{ scope.row.qcdw | ellipsis2 }}</span>
                   </template>
@@ -75,7 +75,7 @@
                 <el-table-column
                         prop="qcrbuss"
                         label="起草人"
-                        width="120">
+                        min-width="120">
                   <template slot-scope="scope">
                     <span v-if="scope.row.qcrbuss" :title="scope.row.qcrbuss">{{ scope.row.qcrbuss | ellipsis2 }}</span>
                   </template>
@@ -83,19 +83,19 @@
                 <el-table-column
                         prop="issueTime"
                         label="发布日期"
-                        width="120">
+                        min-width="120">
                   <template slot-scope="scope">{{ formatIssueDate(scope.row.issueTime)}}</template>
                 </el-table-column>
                 <el-table-column
                         prop="reviewTime"
                         label="复审日期"
-                        width="120">
+                        min-width="120">
                   <template slot-scope="scope">{{ formatIssueDate(scope.row.reviewTime) }}</template>
                 </el-table-column>
                 <el-table-column
                         prop="reviewResults"
                         label="复审结果"
-                        width="100">
+                        min-width="100">
                   <template slot-scope="scope">
                     <span>{{ filterOp(scope.row.reviewResults) }}</span>
                   </template>
@@ -103,7 +103,7 @@
                 <el-table-column
                         prop="bussFsSubUser1Name"
                         label="对接人"
-                        width="180"
+                        min-width="180"
                         align="center">
                         <template slot-scope="scope">
                             <el-form-item
@@ -115,7 +115,7 @@
                             </el-form-item>
                         </template>
                 </el-table-column>
-                <el-table-column fixed="right" label="操作" align="center"  width="50">
+                <el-table-column fixed="right" label="操作" align="center"  min-width="50">
                   <template slot-scope="scope">
                     <div @click.stop style="display: inline-block">
                       <el-dropdown trigger="click" @command="handleCommand">

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue

@@ -145,11 +145,11 @@
                     clearable
             ></el-input>
             <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-              <div style="width: 80%;">
+              <div style="width: 80%;margin-top: 13px">
                 <div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name | ellipsis2 }}</span>
-                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                  <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
                 </div>
               </div>
@@ -173,11 +173,11 @@
                     clearable
             ></el-input>
             <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-              <div style="width: 80%;">
+              <div style="width: 80%;margin-top: 13px">
                 <div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name | ellipsis2 }}</span>
-                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                  <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
                 </div>
               </div>
@@ -203,11 +203,11 @@
                     clearable
             ></el-input>
             <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-              <div style="width: 80%;">
+              <div style="width: 80%;margin-top: 13px">
                 <div v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name | ellipsis2 }}</span>
-                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                  <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
                 </div>
               </div>
@@ -231,11 +231,11 @@
                     clearable
             ></el-input>
             <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-              <div style="width: 80%;">
+              <div style="width: 80%;margin-top: 13px">
                 <div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name | ellipsis2 }}</span>
-                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                  <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
                 </div>
               </div>
@@ -372,11 +372,11 @@
                     clearable
             ></el-input>
             <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-              <div style="width: 80%;">
+              <div style="width: 80%;margin-top: 13px">
                 <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name | ellipsis2 }}</span>
-                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                  <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
                 </div>
               </div>
@@ -979,5 +979,7 @@
 </script>
 
 <style scoped>
-
+  /deep/ .fileClass{
+    line-height: 22px !important;
+  }
 </style>

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue

@@ -127,10 +127,10 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -139,10 +139,10 @@
             <!--          </div>-->
           </el-form-item>
           <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -153,10 +153,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
-            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -165,10 +165,10 @@
             <!--          </div>-->
           </el-form-item>
           <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -267,10 +267,10 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -682,5 +682,7 @@
 </script>
 
 <style scoped>
-
+  /deep/ .fileClass{
+    line-height: 22px !important;
+  }
 </style>

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue

@@ -125,10 +125,10 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -137,10 +137,10 @@
             <!--          </div>-->
           </el-form-item>
           <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -151,10 +151,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
-            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -163,10 +163,10 @@
             <!--          </div>-->
           </el-form-item>
           <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -265,10 +265,10 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -685,5 +685,7 @@
 </script>
 
 <style scoped>
-
+  /deep/ .fileClass{
+    line-height: 22px !important;
+  }
 </style>

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

@@ -183,7 +183,7 @@
                                             clearable
                                     ></el-input>
                                   <div style="display: flex;justify-content: space-between">
-                                      <div style="width: 80%;">
+                                      <div style="width: 80%;margin-top: 13px">
                                           <div v-for="(item,index) in FBGBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                       </div>
                                       <div style="width: 20%;">
@@ -207,7 +207,7 @@
                                     clearable
                                 ></el-input>
                                   <div style="display: flex;justify-content: space-between">
-                                      <div style="width: 80%;">
+                                      <div style="width: 80%;margin-top: 13px">
                                           <div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                       </div>
                                       <div style="width: 20%;">
@@ -232,7 +232,7 @@
                                             clearable
                                     ></el-input>
                                     <div style="display: flex;justify-content: space-between">
-                                        <div style="width: 80%;">
+                                        <div style="width: 80%;margin-top: 13px">
                                             <div v-for="(item,index) in XGDFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                         </div>
                                         <div style="width: 20%;">
@@ -255,7 +255,7 @@
                                             clearable
                                     ></el-input>
                                     <div style="display: flex;justify-content: space-between">
-                                        <div style="width: 80%;">
+                                        <div style="width: 80%;margin-top: 13px">
                                             <div v-for="(item,index) in QTWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                         </div>
                                         <div style="width: 20%;">
@@ -395,7 +395,7 @@
                                             clearable
                                     ></el-input>
                                     <div style="display: flex;justify-content: space-between">
-                                        <div style="width: 80%;">
+                                        <div style="width: 80%;margin-top: 13px">
                                             <div v-for="(item,index) in GLWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                         </div>
                                         <div style="width: 20%;">
@@ -801,7 +801,7 @@
                         label="文本状态"
                         width="130">
                   <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
+                      <span>{{ scope.row.standStatusShow }}</span>
                   </template>
                 </el-table-column>
             </el-table>
@@ -902,17 +902,19 @@
                             </el-formItem>
                             <el-form-item>
                                 <el-button
-                                        icon="el-icon-search"
                                         type="primary"
                                         class="common-button-primary"
-                                        @click="handleSearchStandard"
-                                        round>
+                                        size="small"
+                                        @click="handleSearchStandard">
+                                    查询
                                 </el-button>
+                            </el-form-item>
+                            <el-form-item class="search-item btn-box">
                                 <el-button
                                         class="common-button-default"
-                                        icon="el-icon-refresh-left"
-                                        @click="handleResetSearch"
-                                        round></el-button>
+                                        size="small"
+                                        @click="handleResetSearch">清空
+                                </el-button>
                             </el-form-item>
                         </el-form>
                     </div>
@@ -1555,6 +1557,7 @@
                 return data
             },
             getStandInfoByReviseStatus(type) {
+            debugger
                 let date = new Date();
                 let year = date.getFullYear();
                 if(this.form.standStatus === '2'){
@@ -1588,6 +1591,7 @@
                         this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                         this.LSBBBUSSFileList = []
                         if(this.LSBBBUSSFileList && this.LSBBBUSSFileList.length > 0){
+                            console.log(this.form.FBGBUSS)
                             this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
                         }else {
                             this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -1599,6 +1603,7 @@
                         this.FBGBUSSName = ""
                     }
                     this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
+                    console.log(this.LSBBBUSSFileList)
                     this.form.LSBBBUSS = this.form.FBGBUSS
                     this.form.LSBBBUSSName = this.form.FBGBUSSName
                     this.FBGBUSSFileList= []
@@ -1955,10 +1960,13 @@
          assemble(ids,names){
              let list= new Array();
              if(ids && ids !== '' && names && names !== ''){
+                 ids = ids.replaceAll(',,',',')
                  let idArray=ids.split(',');
                  let nameArray=names.split(',');
                  for(let i=0; i<idArray.length; i++){
-                     list.push({id:idArray[i],name:nameArray[i]});
+                    if(idArray[i] && idArray[i] !==undefined && nameArray[i] && nameArray[i] !== undefined){
+                        list.push({id:idArray[i],name:nameArray[i]});
+                    }
                  }
              }
              return list;
@@ -2049,7 +2057,12 @@
                           }, res => {
                             if(res && res.data){
                               const bringData = res.data
-
+                              this.FBGBUSSFileList=[]
+                              this.BZSMBUSSFileList=[]
+                              this.LSBBBUSSFileList=[]
+                              this.QTWJBUSSFileList=[]
+                              this.GLWJBUSSFileList=[]
+                              this.XGDFileList=[]
                               const json = Object.assign(bringData, bringData.attrInfoMap);
                               this.form = JSON.parse(JSON.stringify(json))
                               this.form.prcNum = this.prcNum
@@ -2071,6 +2084,10 @@
                               this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
                               this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
                               this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                              this.form.XCSJBUSS = this.dateFormatter()
+                              this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                              this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                              this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
                               this.standardDrawer = false
                               this.verifySarStandard = true
                               this.getStandInfoByReviseStatus('dr')
@@ -2963,18 +2980,20 @@
                                             _this: this
                                         }, res => {
                                             if (res.success) {
-                                                this.$message.success(res.message)
+                                                this.submitLoading = false
                                                 this.isSubmit = false
-                                                // if (this.$route.query.bpnId !== '') {
-                                                //     let taskId = {
-                                                //         id: this.$route.query.bpnId
-                                                //     }
-                                                //     taskDel(taskId).then(res=>{
-                                                //         return res
-                                                //     })
-                                                // }
+                                                if (this.$route.query.bpnId !== '') {
+                                                    let taskId = {
+                                                        id: this.$route.query.bpnId
+                                                    }
+                                                    taskDel(taskId).then(res=>{
+                                                        return res
+                                                    })
+                                                }
                                                 // 流程提交之后，应该流转至待办任务页面
                                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                                } else {
+                                                this.$message.warning(res.data)
                                             }
                                         })
                                     }
@@ -3059,6 +3078,9 @@
 
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
+    /deep/ .fileClass{
+        line-height: 22px !important;
+    }
     /deep/ #active2 .el-form-item__content{
         margin-left: 0px !important;
     }

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

@@ -138,11 +138,11 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
-                            style="width: 100%"
+                            style="width: 100%;"
                             border
                             row-key="id"
                             :no-data-text="listNoDataText"
@@ -694,6 +694,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2346,33 +2347,16 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
-                    Promise.all([this.getTaskId()]).then((value) => {
-                        if(value[0] &&value.length > 0){
-                            let mes = JSON.parse(value[0].mes)
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                            this.form = mes.form
-                            this.taskIds = mes.taskIds;
-                            this.pId = mes.pId;
-                            this.userId = mes.userId;
-                            this.prcNum = mes.prcNum;
-                            this.prcName = mes.prcName;
-                            this.roleForm = mes.roleForm
-                            this.commentText = mes.commentText
-                        }
-                        this.loading = true
-                        this.$http.get('lawss/activiti/get_list_by_instance', {
-                            prcNum: this.prcNum,
-                            sortWord: this.shunxu ? this.paixu : '',
-                            shunxu: this.shunxu
-                        }, {
-                            loading: 'loading',
-                            _this: this
-                        }, res => {
-                            this.detailData = res
-                            this.loading = false
-                        }, e => {})
-                    })
+                this.$http.get("lawss/activiti/get_list_by_instance", {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : "",
+                    shunxu: this.shunxu
+                }, {
+                    loading: "loading",
+                    _this: this
+                }, res => {
+                    this.detailData = res
+                }, e => {
                 })
             },
         },
@@ -2409,6 +2393,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -138,11 +138,11 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
-                            style="width: 100%"
+                            style="width: 100%;"
                             border
                             row-key="id"
                             :no-data-text="listNoDataText"
@@ -694,6 +694,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2346,33 +2347,16 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
-                    Promise.all([this.getTaskId()]).then((value) => {
-                        if(value[0] &&value.length > 0){
-                            let mes = JSON.parse(value[0].mes)
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                            this.form = mes.form
-                            this.taskIds = mes.taskIds;
-                            this.pId = mes.pId;
-                            this.userId = mes.userId;
-                            this.prcNum = mes.prcNum;
-                            this.prcName = mes.prcName;
-                            this.roleForm = mes.roleForm
-                            this.commentText = mes.commentText
-                        }
-                        this.loading = true
-                        this.$http.get('lawss/activiti/get_list_by_instance', {
-                            prcNum: this.prcNum,
-                            sortWord: this.shunxu ? this.paixu : '',
-                            shunxu: this.shunxu
-                        }, {
-                            loading: 'loading',
-                            _this: this
-                        }, res => {
-                            this.detailData = res
-                            this.loading = false
-                        }, e => {})
-                    })
+                this.$http.get("lawss/activiti/get_list_by_instance", {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : "",
+                    shunxu: this.shunxu
+                }, {
+                    loading: "loading",
+                    _this: this
+                }, res => {
+                    this.detailData = res
+                }, e => {
                 })
             },
         },
@@ -2409,6 +2393,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -138,11 +138,11 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
-                            style="width: 100%"
+                            style="width: 100%;"
                             border
                             row-key="id"
                             :no-data-text="listNoDataText"
@@ -694,6 +694,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2346,33 +2347,16 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
-                    Promise.all([this.getTaskId()]).then((value) => {
-                        if(value[0] &&value.length > 0){
-                            let mes = JSON.parse(value[0].mes)
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                            this.form = mes.form
-                            this.taskIds = mes.taskIds;
-                            this.pId = mes.pId;
-                            this.userId = mes.userId;
-                            this.prcNum = mes.prcNum;
-                            this.prcName = mes.prcName;
-                            this.roleForm = mes.roleForm
-                            this.commentText = mes.commentText
-                        }
-                        this.loading = true
-                        this.$http.get('lawss/activiti/get_list_by_instance', {
-                            prcNum: this.prcNum,
-                            sortWord: this.shunxu ? this.paixu : '',
-                            shunxu: this.shunxu
-                        }, {
-                            loading: 'loading',
-                            _this: this
-                        }, res => {
-                            this.detailData = res
-                            this.loading = false
-                        }, e => {})
-                    })
+                this.$http.get("lawss/activiti/get_list_by_instance", {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : "",
+                    shunxu: this.shunxu
+                }, {
+                    loading: "loading",
+                    _this: this
+                }, res => {
+                    this.detailData = res
+                }, e => {
                 })
             },
         },
@@ -2409,6 +2393,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -158,11 +158,11 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
-                            style="width: 100%"
+                            style="width: 100%;"
                             border
                             row-key="id"
                             :no-data-text="listNoDataText"
@@ -335,7 +335,7 @@
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
+                    <span>{{ scope.row.standStatusShow }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -719,6 +719,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2717,6 +2718,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -138,7 +138,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -703,6 +703,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2525,6 +2526,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -144,11 +144,11 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
-                            style="width: 100%"
+                            style="width: 100%;"
                             border
                             row-key="id"
                             :no-data-text="listNoDataText"
@@ -650,6 +650,7 @@
                     }]
                 },
                 taskInfo:'',
+                tablePHeight:'',
                 loading: false,
                 disabledState: true,
                 dataLoading: true,
@@ -2454,33 +2455,16 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
-                    Promise.all([this.getTaskId()]).then((value) => {
-                        if(value[0] &&value.length > 0){
-                            let mes = JSON.parse(value[0].mes)
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                            this.form = mes.form
-                            this.taskIds = mes.taskIds;
-                            this.pId = mes.pId;
-                            this.userId = mes.userId;
-                            this.prcNum = mes.prcNum;
-                            this.prcName = mes.prcName;
-                            this.roleForm = mes.roleForm
-                            this.commentText = mes.commentText
-                        }
-                        this.loading = true
-                        this.$http.get('lawss/activiti/get_list_by_instance', {
-                            prcNum: this.prcNum,
-                            sortWord: this.shunxu ? this.paixu : '',
-                            shunxu: this.shunxu
-                        }, {
-                            loading: 'loading',
-                            _this: this
-                        }, res => {
-                            this.detailData = res
-                            this.loading = false
-                        }, e => {})
-                    })
+                this.$http.get("lawss/activiti/get_list_by_instance", {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : "",
+                    shunxu: this.shunxu
+                }, {
+                    loading: "loading",
+                    _this: this
+                }, res => {
+                    this.detailData = res
+                }, e => {
                 })
             },
         },
@@ -2518,6 +2502,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -200,7 +200,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -377,7 +377,7 @@
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
+                    <span>{{ scope.row.standStatusShow }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -762,6 +762,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2708,6 +2709,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -136,11 +136,11 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
-                            style="width: 100%"
+                            style="width: 100%;"
                             border
                             row-key="id"
                             :no-data-text="listNoDataText"
@@ -693,6 +693,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2345,33 +2346,16 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
-                    Promise.all([this.getTaskId()]).then((value) => {
-                        if(value[0] &&value.length > 0){
-                            let mes = JSON.parse(value[0].mes)
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                            this.form = mes.form
-                            this.taskIds = mes.taskIds;
-                            this.pId = mes.pId;
-                            this.userId = mes.userId;
-                            this.prcNum = mes.prcNum;
-                            this.prcName = mes.prcName;
-                            this.roleForm = mes.roleForm
-                            this.commentText = mes.commentText
-                        }
-                        this.loading = true
-                        this.$http.get('lawss/activiti/get_list_by_instance', {
-                            prcNum: this.prcNum,
-                            sortWord: this.shunxu ? this.paixu : '',
-                            shunxu: this.shunxu
-                        }, {
-                            loading: 'loading',
-                            _this: this
-                        }, res => {
-                            this.detailData = res
-                            this.loading = false
-                        }, e => {})
-                    })
+                this.$http.get("lawss/activiti/get_list_by_instance", {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : "",
+                    shunxu: this.shunxu
+                }, {
+                    loading: "loading",
+                    _this: this
+                }, res => {
+                    this.detailData = res
+                }, e => {
                 })
             },
         },
@@ -2408,6 +2392,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -221,11 +221,11 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
-                            style="width: 100%"
+                            style="width: 100%;"
                             border
                             row-key="id"
                             :no-data-text="listNoDataText"
@@ -889,6 +889,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2876,6 +2877,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -270,11 +270,11 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
-                            style="width: 100%"
+                            style="width: 100%;"
                             border
                             row-key="id"
                             :no-data-text="listNoDataText"
@@ -447,7 +447,7 @@
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
+                    <span>{{ scope.row.standStatusShow }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -832,6 +832,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2800,6 +2801,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -139,11 +139,11 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
-                            style="width: 100%"
+                            style="width: 100%;"
                             border
                             row-key="id"
                             :no-data-text="listNoDataText"
@@ -714,6 +714,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2471,33 +2472,16 @@
                 return "";
             },
             processTable () {
-                this.$nextTick(() => {
-                    Promise.all([this.getTaskId()]).then((value) => {
-                        if(value[0] &&value.length > 0){
-                            let mes = JSON.parse(value[0].mes)
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                            this.form = mes.form
-                            this.taskIds = mes.taskIds;
-                            this.pId = mes.pId;
-                            this.userId = mes.userId;
-                            this.prcNum = mes.prcNum;
-                            this.prcName = mes.prcName;
-                            this.roleForm = mes.roleForm
-                            this.commentText = mes.commentText
-                        }
-                        this.loading = true
-                        this.$http.get('lawss/activiti/get_list_by_instance', {
-                            prcNum: this.prcNum,
-                            sortWord: this.shunxu ? this.paixu : '',
-                            shunxu: this.shunxu
-                        }, {
-                            loading: 'loading',
-                            _this: this
-                        }, res => {
-                            this.detailData = res
-                            this.loading = false
-                        }, e => {})
-                    })
+                this.$http.get("lawss/activiti/get_list_by_instance", {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : "",
+                    shunxu: this.shunxu
+                }, {
+                    loading: "loading",
+                    _this: this
+                }, res => {
+                    this.detailData = res
+                }, e => {
                 })
             },
         },
@@ -2535,6 +2519,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -138,11 +138,11 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
-                            style="width: 100%"
+                            style="width: 100%;"
                             border
                             row-key="id"
                             :no-data-text="listNoDataText"
@@ -694,6 +694,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2345,33 +2346,16 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
-                    Promise.all([this.getTaskId()]).then((value) => {
-                        if(value[0] &&value.length > 0){
-                            let mes = JSON.parse(value[0].mes)
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                            this.form = mes.form
-                            this.taskIds = mes.taskIds;
-                            this.pId = mes.pId;
-                            this.userId = mes.userId;
-                            this.prcNum = mes.prcNum;
-                            this.prcName = mes.prcName;
-                            this.roleForm = mes.roleForm
-                            this.commentText = mes.commentText
-                        }
-                        this.loading = true
-                        this.$http.get('lawss/activiti/get_list_by_instance', {
-                            prcNum: this.prcNum,
-                            sortWord: this.shunxu ? this.paixu : '',
-                            shunxu: this.shunxu
-                        }, {
-                            loading: 'loading',
-                            _this: this
-                        }, res => {
-                            this.detailData = res
-                            this.loading = false
-                        }, e => {})
-                    })
+                this.$http.get("lawss/activiti/get_list_by_instance", {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : "",
+                    shunxu: this.shunxu
+                }, {
+                    loading: "loading",
+                    _this: this
+                }, res => {
+                    this.detailData = res
+                }, e => {
                 })
             },
         },
@@ -2408,6 +2392,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -138,11 +138,11 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
-                            style="width: 100%"
+                            style="width: 100%;"
                             border
                             row-key="id"
                             :no-data-text="listNoDataText"
@@ -694,6 +694,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2346,33 +2347,16 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
-                    Promise.all([this.getTaskId()]).then((value) => {
-                        if(value[0] &&value.length > 0){
-                            let mes = JSON.parse(value[0].mes)
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                            this.form = mes.form
-                            this.taskIds = mes.taskIds;
-                            this.pId = mes.pId;
-                            this.userId = mes.userId;
-                            this.prcNum = mes.prcNum;
-                            this.prcName = mes.prcName;
-                            this.roleForm = mes.roleForm
-                            this.commentText = mes.commentText
-                        }
-                        this.loading = true
-                        this.$http.get('lawss/activiti/get_list_by_instance', {
-                            prcNum: this.prcNum,
-                            sortWord: this.shunxu ? this.paixu : '',
-                            shunxu: this.shunxu
-                        }, {
-                            loading: 'loading',
-                            _this: this
-                        }, res => {
-                            this.detailData = res
-                            this.loading = false
-                        }, e => {})
-                    })
+                this.$http.get("lawss/activiti/get_list_by_instance", {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : "",
+                    shunxu: this.shunxu
+                }, {
+                    loading: "loading",
+                    _this: this
+                }, res => {
+                    this.detailData = res
+                }, e => {
                 })
             },
         },
@@ -2409,6 +2393,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -200,7 +200,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -377,7 +377,7 @@
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
+                    <span>{{ scope.row.standStatusShow }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -762,6 +762,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2710,6 +2711,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -270,11 +270,11 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
-                            style="width: 100%"
+                            style="width: 100%;"
                             border
                             row-key="id"
                             :no-data-text="listNoDataText"
@@ -448,7 +448,7 @@
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
+                    <span>{{ scope.row.standStatusShow }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -842,6 +842,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2811,6 +2812,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -146,11 +146,11 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
-                            style="width: 100%"
+                            style="width: 100%;min-height: 535px"
                             border
                             row-key="id"
                             :no-data-text="listNoDataText"
@@ -630,6 +630,7 @@
                         }
                     }]
                 },
+                tablePHeight:'',
                 loading: false,
                 dataLoading: true,
                 disabledState: true,
@@ -2276,33 +2277,16 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
-                    Promise.all([this.getTaskId()]).then((value) => {
-                        if(value[0] &&value.length > 0){
-                            let mes = JSON.parse(value[0].mes)
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                            this.form = mes.form
-                            this.taskIds = mes.taskIds;
-                            this.pId = mes.pId;
-                            this.userId = mes.userId;
-                            this.prcNum = mes.prcNum;
-                            this.prcName = mes.prcName;
-                            this.roleForm = mes.roleForm
-                            this.commentText = mes.commentText
-                        }
-                        this.loading = true
-                        this.$http.get('lawss/activiti/get_list_by_instance', {
-                            prcNum: this.prcNum,
-                            sortWord: this.shunxu ? this.paixu : '',
-                            shunxu: this.shunxu
-                        }, {
-                            loading: 'loading',
-                            _this: this
-                        }, res => {
-                            this.detailData = res
-                            this.loading = false
-                        }, e => {})
-                    })
+                this.$http.get("lawss/activiti/get_list_by_instance", {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : "",
+                    shunxu: this.shunxu
+                }, {
+                    loading: "loading",
+                    _this: this
+                }, res => {
+                    this.detailData = res
+                }, e => {
                 })
             },
         },
@@ -2339,6 +2323,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue

@@ -127,12 +127,12 @@
                   clearable
           ></el-input>
           <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-            <div style="width: 80%;">
-              <div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name | ellipsis2 }}</span>
-                <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-                  </span>
+            <div style="width: 80%;margin-top: 13px">
+              <div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;" class="fileClass">
+                <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                </span>
               </div>
             </div>
             <div style="width: 20%;">
@@ -155,12 +155,12 @@
                   clearable
           ></el-input>
           <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-            <div style="width: 80%;">
+            <div style="width: 80%;margin-top: 13px">
               <div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name | ellipsis2 }}</span>
-                <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-                  </span>
+                <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                </span>
               </div>
             </div>
             <div style="width: 20%;">
@@ -185,11 +185,11 @@
                   clearable
           ></el-input>
           <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-            <div style="width: 80%;">
+            <div style="width: 80%;margin-top: 13px">
               <div v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name | ellipsis2 }}</span>
-                <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
               </div>
             </div>
@@ -213,11 +213,11 @@
                   clearable
           ></el-input>
           <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-            <div style="width: 80%;">
+            <div style="width: 80%;margin-top: 13px">
               <div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name | ellipsis2 }}</span>
-                <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
               </div>
             </div>
@@ -427,11 +427,11 @@
                   clearable
           ></el-input>
           <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-            <div style="width: 80%;">
+            <div style="width: 80%;margin-top: 13px">
               <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name | ellipsis2 }}</span>
-                <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
               </div>
             </div>
@@ -582,9 +582,9 @@
       <el-col :span="12">
         <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
           <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
-            <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <span style="" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+            <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
           </div>
         </el-form-item>
@@ -605,12 +605,12 @@
                   clearable
           ></el-input>
           <div style="display: flex;justify-content: left;margin-top: 5px;padding-left: 20px;">
-            <div style="width: 80%;">
+            <div style="width: 80%;margin-top: 13px">
               <div v-for="(item,index) in madelSubList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
-                <span style="width: 20%;margin-left: 15px;">
-                                                    <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-                                                </span>
+                <span style="" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                <span style="margin-left: 7px;">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                </span>
               </div>
             </div>
             <div style="width: 20%;">
@@ -1011,5 +1011,7 @@ export default {
 </script>
 
 <style scoped>
-
+  /deep/ .fileClass{
+    line-height: 22px !important;
+  }
 </style>

src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue

@@ -99,10 +99,10 @@
     <el-row :gutter="24">
       <el-col :span="12">
         <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-          <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis2 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+          <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+            <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
           </div>
 <!--          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -111,10 +111,10 @@
 <!--          </div>-->
         </el-form-item>
         <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-          <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis2 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+          <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+            <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
           </div>
 <!--          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -125,10 +125,10 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-          <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis2 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+          <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+            <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
           </div>
 <!--          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -137,10 +137,10 @@
 <!--          </div>-->
         </el-form-item>
         <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-          <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis2 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+          <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+            <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
           </div>
 <!--          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -283,10 +283,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-          <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis2 }}</span>
-            <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+          <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+            <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+            <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
           </div>
 <!--          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -428,11 +428,11 @@
         <el-row :gutter="24">
             <el-col :span="12">
               <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                  <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;" class="fileClass">
-                      <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
-                      <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-                  </span>
+                  <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+                      <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+                      <span style="margin-left: 7px;" v-if="item.id !== ''">
+                        <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                      </span>
                   </div>
               </el-form-item>
             </el-col>
@@ -671,5 +671,7 @@ export default {
 </script>
 
 <style scoped>
-
+    /deep/ .fileClass{
+        line-height: 22px !important;
+    }
 </style>

src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue

@@ -110,10 +110,10 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis2 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -122,10 +122,10 @@
             <!--          </div>-->
           </el-form-item>
           <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis2 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -136,10 +136,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis2 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -148,10 +148,10 @@
             <!--          </div>-->
           </el-form-item>
           <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis2 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -293,10 +293,10 @@
             </el-select>
           </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis2 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -438,10 +438,10 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+            <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
           </el-form-item>
@@ -681,5 +681,7 @@
 </script>
 
 <style scoped>
-
+  /deep/ .fileClass{
+    line-height: 22px !important;
+  }
 </style>

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

@@ -144,7 +144,7 @@
                                             clearable
                                     ></el-input>
                                   <div style="display: flex;justify-content: space-between">
-                                      <div style="width: 80%;">
+                                      <div style="width: 80%;margin-top: 13px">
                                           <div v-for="(item,index) in FBGBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                       </div>
                                       <div style="width: 20%;">
@@ -168,7 +168,7 @@
                                     clearable
                                 ></el-input>
                                   <div style="display: flex;justify-content: space-between">
-                                      <div style="width: 80%;">
+                                      <div style="width: 80%;margin-top: 13px">
                                           <div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                       </div>
                                       <div style="width: 20%;">
@@ -193,7 +193,7 @@
                                             clearable
                                     ></el-input>
                                     <div style="display: flex;justify-content: space-between">
-                                        <div style="width: 80%;">
+                                        <div style="width: 80%;margin-top: 13px">
                                             <div v-for="(item,index) in BZSMBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                         </div>
                                         <div style="width: 20%;">
@@ -216,7 +216,7 @@
                                             clearable
                                     ></el-input>
                                     <div style="display: flex;justify-content: space-between">
-                                        <div style="width: 80%;">
+                                        <div style="width: 80%;margin-top: 13px">
                                             <div v-for="(item,index) in QTWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                         </div>
                                         <div style="width: 20%;">
@@ -423,7 +423,7 @@
                                             clearable
                                     ></el-input>
                                     <div style="display: flex;justify-content: space-between">
-                                        <div style="width: 80%;">
+                                        <div style="width: 80%;margin-top: 13px">
                                             <div v-for="(item,index) in GLWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                         </div>
                                         <div style="width: 20%;">
@@ -791,7 +791,7 @@
                         label="文本状态"
                         width="130">
                   <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
+                    <span>{{ scope.row.standStatusShow }}</span>
                   </template>
                 </el-table-column>
             </el-table>
@@ -2537,7 +2537,12 @@
             },
             // 文件预览及下载
             handleFilePreview(file) {
-                const attId = file.response.data.id
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 if (this.preview) {
                     if (attId) {
                         window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
@@ -3047,6 +3052,9 @@
 
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
+    /deep/ .fileClass{
+        line-height: 22px !important;
+    }
     /deep/ #active2 .el-form-item__content{
         margin-left: 0px !important;
     }

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

@@ -146,7 +146,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -698,6 +698,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2406,6 +2407,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -146,7 +146,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -698,6 +698,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2405,6 +2406,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -159,7 +159,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -336,7 +336,7 @@
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
+                    <span>{{ scope.row.standStatusShow }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -756,6 +756,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2720,6 +2721,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -160,7 +160,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -337,7 +337,7 @@
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
+                    <span>{{ scope.row.standStatusShow }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -757,6 +757,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2755,6 +2756,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -269,7 +269,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -825,6 +825,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2735,6 +2736,10 @@
             this.getTaskId()
             this.getData()
             this.processTable()
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
         }
 
     }

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

@@ -204,7 +204,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -381,7 +381,7 @@
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
+                    <span>{{ scope.row.standStatusShow }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -802,6 +802,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -1188,6 +1189,18 @@
                     }
                 })
             },
+            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 => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
@@ -2756,6 +2769,10 @@
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
         }
 
     }

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

@@ -144,7 +144,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -696,6 +696,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2416,6 +2417,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -395,7 +395,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '4'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -912,7 +912,7 @@
         data () {
             const numberCodeNot = (rule, value, callback) => {
                 let pattern = /^[1]*$/
-                if (!pattern.test(value)) {
+                if (!pattern.test(value) || value > 1) {
                     return callback(new Error('评分分值只可为1分'))
                 } else {
                     callback()
@@ -1058,6 +1058,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -3040,6 +3041,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -407,7 +407,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -584,7 +584,7 @@
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
+                    <span>{{ scope.row.standStatusShow }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -908,7 +908,7 @@
         data () {
             const numberCodeNot = (rule, value, callback) => {
                 let pattern = /^[1]*$/
-                if (!pattern.test(value)) {
+                if (!pattern.test(value) || value > 1) {
                     return callback(new Error('评分分值只可为1分'))
                 } else {
                     callback()
@@ -1035,6 +1035,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -3121,6 +3122,10 @@
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
         }
 
     }

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

@@ -243,7 +243,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -690,7 +690,7 @@
         data () {
             const numberCodeNot = (rule, value, callback) => {
                 let pattern = /^[1]*$/
-                if (!pattern.test(value)) {
+                if (!pattern.test(value) || value > 1) {
                     return callback(new Error('评分分值只可为1分'))
                 } else {
                     callback()
@@ -816,6 +816,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2665,6 +2666,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -67,7 +67,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -638,6 +638,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2469,6 +2470,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -252,7 +252,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -701,7 +701,7 @@
         data () {
             const numberCodeNot = (rule, value, callback) => {
                 let pattern = /^[1]*$/
-                if (!pattern.test(value)) {
+                if (!pattern.test(value) || value > 1) {
                     return callback(new Error('评分分值只可为1分'))
                 } else {
                     callback()
@@ -829,6 +829,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -2722,6 +2723,10 @@
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.setMap(this.standStateOptions)
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
             this.busVsFunc()
             this.modelFunc()
         }

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

@@ -281,7 +281,7 @@
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
-                            height="100%"
+                            :height="tablePHeight"
                             ref="selection"
                             :data="detailData"
                             tooltip-effect="dark"
@@ -459,7 +459,7 @@
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
+                    <span>{{ scope.row.standStatusShow }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -477,7 +477,7 @@
         </div>
     </el-dialog>
     <Role-tree
-            is-title="选择责任部门对接人"
+            :is-title="drawerTitle"
             :is-visible.sync="modalShowRoleFlag"
             @checkedRole="checkedRole2"
             :nodeList="nodeList2"
@@ -881,6 +881,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tablePHeight:'',
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -1632,6 +1633,12 @@
                 }else if(this.userType === 'hqUserId'){
                     this.roleForm.hqUserId=idList;
                     this.roleForm.hqUserName=nameList;
+                }else if(this.userType === 'QCRBUSS'){
+                    this.form.QCRBUSSID=idList;
+                    this.form.QCRBUSS=nameList;
+                }else if(this.userType === 'bzUserId'){
+                    this.roleForm.bzUserId = idList
+                    this.roleForm.bzUserName = nameList
                 }
             },
             checkedRole (data) {
@@ -2957,6 +2964,10 @@
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
             })
+            this.tablePHeight = $('.content').height()
+            window.onresize = () => {
+                this.tablePHeight = $('.content').height()
+            }
         }
 
     }