From 62bab81cb2c6b6406969bf71a3dd2800f66d540e Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Sun, 5 Dec 2021 21:46:21 +0800
Subject: [PATCH 1/9] xmqdqr

---
 src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index 26c2a7824..028182e51 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -430,6 +430,7 @@ export default {
 
       },
       qdform: {
+        projectId:"",
         projectNumber: "",
         projectName: "",
         detailedListName: "",
@@ -528,6 +529,7 @@ export default {
       } else {
         this.qdform.projectNumber = this.selectProject[0].projectNumber;
         this.qdform.projectName = this.selectProject[0].projectName;
+        this.qdform.projectId = this.selectProject[0].id;
         this.projectModel = false;
       }
 

From e1208e97acd945a4d43f7ac8d21c352cc6fc3ece Mon Sep 17 00:00:00 2001
From: Superman_Main <396572590@qq.com>
Date: Mon, 6 Dec 2021 06:41:36 +0800
Subject: [PATCH 2/9] feat:FOTON rest

---
 src/components/CustomFormComponents/File.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue
index 674502230..8cda1ed67 100644
--- a/src/components/CustomFormComponents/File.vue
+++ b/src/components/CustomFormComponents/File.vue
@@ -356,6 +356,8 @@ export default {
                     console.log(editFileInfo)
                     if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
                       window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
+                    }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
+                        window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
                     }else {
                       const nowTime = new Date().getTime()
                       // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));

From 6273e81fa06751caa0b6ee79f03425ddd6e50a91 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 6 Dec 2021 09:23:32 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=82=E4=BC=9A=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzhHd-rh/step3.vue            |  2 +-
 .../pages/creatProcess/bzhHd-rh/step4.vue            |  2 +-
 .../pages/creatProcess/bzhHd-rh/step5.vue            |  2 +-
 .../pages/creatProcess/bzhHd-rh/step6-1.vue          |  2 +-
 .../pages/creatProcess/bzhHd-rh/step6.vue            |  2 +-
 .../pages/creatProcess/bzhHy-ch/step1.vue            | 10 ++++++++++
 .../pages/creatProcess/bzhHy-ch/step2.vue            | 12 +-----------
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
index 797572dab..ba81edcbf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
@@ -409,8 +409,8 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
-        this.rh_pageData.fillLeader = ''
         this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
+        this.fillFileList = this.rh_pageData.fillFile
         this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         this.infoSourcesLength = this.rh_pageData.infoSources.length
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
index a14e003f4..593e411dc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
@@ -107,7 +107,7 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
+                <el-table-column prop="fillFile" align="center" label="资料">
                   <template slot-scope="scope">
                     <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
                     <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
index b73c5af0d..57af0852f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
@@ -146,7 +146,7 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
+                <el-table-column prop="fillFile" align="center" label="资料">
                   <template slot-scope="scope">
                     <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
                     <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
index d6ea134a5..4d7896e6d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
@@ -109,7 +109,7 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
+                <el-table-column prop="fillFile" align="center" label="资料">
                   <template slot-scope="scope">
                     <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
                     <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
index 1bcb3f53c..51673820e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
@@ -112,7 +112,7 @@
                 <el-table-column prop="fillPost" align="center" label="身份"/>
                 <el-table-column prop="fillTel" align="center" label="电话"/>
                 <el-table-column prop="fillMail" align="center" label="邮箱"/>
-                <el-table-column prop="fillFile" align="center" label="资料" show-overflow-tooltip>
+                <el-table-column prop="fillFile" align="center" label="资料">
                   <template slot-scope="scope">
                     <span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
                     <span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index edf146d99..0072412dc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
@@ -360,6 +360,16 @@ export default {
         sort: '1',
         meetingTable: [],
         fileTextList: [],
+        fillPeopleId: '',
+        fillPeople: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+        fillLeader: '',
+        fillFile: '',
+
       },
       associaNameOptions: [
         {value: '0', label: '国内法规入库流程'},
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
index 76aa8a5dd..df261c830 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
@@ -214,17 +214,7 @@ export default {
       active: '1',
 
       acceptShow: false,
-      ch_pageData: {
-        fillPeopleId: '',
-        fillPeople: '',
-        fillUnit: '',
-        fillDept: '',
-        fillPost: '',
-        fillTel: '',
-        fillMail: '',
-        fillLeader: '',
-        fillFile: '',
-      },
+      ch_pageData: {},
       ch_rules: {},
       nodeList: [],
       commentText: '',

From 542579d9af24f9a2c209ee93af98fff9abc8c713 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 6 Dec 2021 09:50:19 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzhHd-rh/step1.vue              | 10 ++++++++++
 .../pages/creatProcess/bzhHd-rh/step2.vue              |  9 ---------
 .../pages/creatProcess/bzhHd-rh/step3.vue              |  6 ++++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index cc3354d72..56ab63891 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -419,6 +419,16 @@ export default {
         },
         workPath: '',
         comityTel: [],
+        fillPeople: '',
+        fillPeopleId: '',
+        fillUnit: '',
+        fillDept: '',
+        fillPost: '',
+        fillTel: '',
+        fillMail: '',
+        fillLeader: '',
+        fillLeaderId: '',
+        fillFile: [],
       },
       comityNameOptions: [
         {value: '0', label: '国内法规入库流程'},
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index f4db8da41..cb3106e91 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -241,15 +241,6 @@ export default {
         comityTel: [],
         comityOpRole: '',
         comityInRoleId: '',
-        fillPeople: '',
-        fillPeopleId: '',
-        fillUnit: '',
-        fillDept: '',
-        fillPost: '',
-        fillTel: '',
-        fillMail: '',
-        fillLeader: '',
-        fillLeaderId: '',
       },
       roleForm: {},
       commentText: '',
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
index ba81edcbf..63c49a6c2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
@@ -410,7 +410,9 @@ export default {
       this.$nextTick(() => {
         this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
         this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
-        this.fillFileList = this.rh_pageData.fillFile
+        if (this.rh_pageData.fillFile !== undefined) {
+          this.fillFileList = this.rh_pageData.fillFile
+        }
         this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         this.infoSourcesLength = this.rh_pageData.infoSources.length
@@ -521,7 +523,7 @@ export default {
     // 文件上传成功
     handleOnsuccess(res, file, fileList) {
       if (res.ok) {
-        if (this.fillFileList !== null) {
+        if (this.fillFileList.length !== 0) {
           this.newDataList = this.fillFileList
           this.newDataList.push({
             id: res.data.attId,

From 4067d3f26320840e9894508aa40fecf9827d1553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 6 Dec 2021 09:50:40 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/details.vue                         | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 0854650a0..97ea88dac 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -118,31 +118,31 @@
             sortable
             label="标准实施日期">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{
-                  scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '-'
-                }}</span>
+              <span>
+                {{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}
+              </span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="xcxssrqgj"
+            prop="xcxssrq"
             width="190px"
             sortable
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{
-                  scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '-'
-                }}</span>
+              <span>
+                {{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}
+              </span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="zccssrqgj"
+            prop="zccssrq"
             sortable
             width="190px"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{
-                  scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD') : '-'
-                }}</span>
+              <span>
+                {{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}
+              </span>
             </template>
           </el-table-column>
           <el-table-column
@@ -165,7 +165,8 @@
               <!--                <el-button @click="changeState(scope.row)">符合性状态</el-button>-->
               <div class="table-jump" @click="changeState(scope.row)">
                 <div v-if="scope.row.unCount === 0">符合</div>
-                <div v-else >不符合</div>
+                <div v-if="scope.row.unCount === 1">不符合</div>
+                <div v-else ></div>
               </div>
             </template>
           </el-table-column>

From a752a9880887ad3d52fc69bc7c6f37be7b61e27d Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 6 Dec 2021 10:34:50 +0800
Subject: [PATCH 6/9] commit

---
 .../CustomFormComponents/SelectArray.vue      | 36 ++++++++++++++++---
 .../domesticStandardsAndRegulations/index.vue |  2 ++
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/components/CustomFormComponents/SelectArray.vue b/src/components/CustomFormComponents/SelectArray.vue
index e7be6f10c..df14645b7 100644
--- a/src/components/CustomFormComponents/SelectArray.vue
+++ b/src/components/CustomFormComponents/SelectArray.vue
@@ -16,7 +16,9 @@
         multiple
         @change="handleChange"
       >
-<!--        <el-option value="全选" label="全选" @click.native="clickOption"></el-option>-->
+        <el-option value="全选" @click.native="clickOption" v-if="options.length > 0">
+            {{ checkAll ? '取消全选' : '全选' }}
+        </el-option>
         <el-option
           v-for="opt in options"
           :key="opt.value"
@@ -53,7 +55,8 @@ export default {
   },
   data () {
     return {
-      valueArr: []
+      valueArr: [],
+        checkAll: false,
     }
   },
   computed: {
@@ -71,9 +74,32 @@ export default {
     }
   },
   methods: {
+      clickOption () {
+          this.checkAll = !this.checkAll
+          if (this.checkAll) {
+              let list = []
+              this.config.options.map(item => {
+                  this.valueArr.push(item.value)
+                  list.push(item.value)
+              })
+              this.$emit('input', list)
+          } else {
+              this.valueArr = []
+              this.$emit('input', this.valueArr)
+          }
+      },
     handleChange (event) {
-      // const value = event.target.value
-      this.$emit('input', event)
+          if (event.includes('全选')) {
+              return
+          } else {
+              if (event.length === this.config.options.length) {
+                  this.checkAll = true
+              } else {
+                  this.checkAll = false
+              }
+              this.$emit('input', event)
+          }
+        // const value = event.target.value
 
     }
   },
@@ -91,7 +117,7 @@ export default {
           this.valueArr = []
         }
       }
-    }
+    },
   },
   mounted () {
     if (this.value !== '' && this.value !== null && typeof (this.value) !== 'undefined') {
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 2eeed91c5..1a240c36f 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -4086,6 +4086,8 @@ export default {
     },
     // 保存或修改标准
     saveOrUpdateStands() {
+      console.log(this.sarStandardsInfoEO);
+      return
       this.isSubmit = true
       this.$refs['sarStandardsInfoForm'].validate((valid) => {
         if (valid) {

From 85ed6c6e7ac4511b8f6b29254a671646c06e9c3a Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 6 Dec 2021 10:35:55 +0800
Subject: [PATCH 7/9] commit

---
 .../domesticStandardsAndRegulations/index.vue                   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 1a240c36f..2eeed91c5 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -4086,8 +4086,6 @@ export default {
     },
     // 保存或修改标准
     saveOrUpdateStands() {
-      console.log(this.sarStandardsInfoEO);
-      return
       this.isSubmit = true
       this.$refs['sarStandardsInfoForm'].validate((valid) => {
         if (valid) {

From 068f0efe871c68bd7fca12ab98af643e67351764 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 6 Dec 2021 11:02:53 +0800
Subject: [PATCH 8/9] commit

---
 .../domesticStandardsAndRegulations/index.vue | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 2eeed91c5..aec6aa9e2 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -17,7 +17,7 @@
                 :indent="0"
                 :props="props"
                 :data="treeList"
-                default-expanded-keys="['1']"
+                :default-expanded-keys="['1']"
                 highlight-current
                 @node-click="treeClick"
                 :filter-node-method="filterNode">
@@ -334,7 +334,6 @@
 
                 <div v-else>
                   <div @click.stop style="display: inline-block">
-                    <el-dropdown trigger="click" @command="handleCommand">
                       <!--                                            <i class="iconfont">&#xe61e;</i>-->
                       <el-button title="收藏" class="collection-btn" icon="el-icon-star-off"
                                  v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
@@ -348,28 +347,6 @@
                                  @click="handleCommand([scope.row, '取消收藏'])"
                       >
                       </el-button>
-                      <!--                                            <el-dropdown-menu slot="dropdown">-->
-                      <!--                                                <el-dropdown-item v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"-->
-                      <!--                                                                  v-if="scope.row.collectBtn"-->
-                      <!--                                                                  :command="[scope.row, '收藏']"-->
-                      <!--                                                >-->
-                      <!--                                                    收藏-->
-                      <!--                                                </el-dropdown-item>-->
-                      <!--                                                <el-dropdown-item v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"-->
-                      <!--                                                                  v-else-->
-                      <!--                                                                  :command="[scope.row, '取消收藏']"-->
-                      <!--                                                >-->
-                      <!--                                                    取消收藏-->
-                      <!--                                                </el-dropdown-item>-->
-                      <!--                                                <el-dropdown-item :command="[scope.row, '编辑']"-->
-                      <!--                                                                  v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑-->
-                      <!--                                                </el-dropdown-item>-->
-                      <!--                                                &lt;!&ndash;                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>&ndash;&gt;-->
-                      <!--                                                <el-dropdown-item :command="[scope.row, '删除']"-->
-                      <!--                                                                  v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除-->
-                      <!--                                                </el-dropdown-item>-->
-                      <!--                                            </el-dropdown-menu>-->
-                    </el-dropdown>
                   </div>
                 </div>
               </template>

From 0cb5f08bd643cb608750fec6095ebb20883b9a42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 6 Dec 2021 11:04:41 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbfs/step1-4.vue       | 611 ++++++++++++++++++
 .../pages/creatProcess/qbfs/step4.vue         |   2 +-
 .../pages/creatProcess/qbfz/step1-7.vue       | 589 +++++++++++++++++
 .../pages/creatProcess/qbfz/step7.vue         |   2 +-
 .../pages/creatProcess/qbzxdjhgk/step1-5.vue  | 523 +++++++++++++++
 .../pages/processDetail/index.vue             |   9 +
 src/router/index.js                           |  27 +
 7 files changed, 1761 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue

diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue
new file mode 100644
index 000000000..736bfb5b7
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue
@@ -0,0 +1,611 @@
+<template>
+  <div class="qbfs-step4">
+    <ProcessHeader toggle>
+      <template slot="proName">企标复审流程</template>
+      <template slot="proNode">工作组组长审批</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <process-title>
+      <template slot="title">基础信息</template>
+    </process-title>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <el-form
+          ref="qbfsForm"
+          :model="qbfsForm"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <div v-if="foldFormFlag">
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="企标编号" prop="entNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.entNumber"
+                    placeholder="请输入企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="中文名称" prop="cnName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.cnName"
+                    placeholder="请输入中文名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.enName"
+                    placeholder="请输入英文名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.entCategory"
+                    placeholder="请输入企标类别"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.replaceNumber"
+                    placeholder="请输入代替企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item  label="下一步状态" prop="nextStatus" class="add-form-item ">
+                  <el-select v-model="qbfsForm.nextStatus" placeholder="请选择下一步状态">
+                    <el-option
+                      v-for="item in associationOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.replacedNumber"
+                    placeholder="请输入被代替企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.releaseDate"
+                    placeholder="请输入发布日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.implementDate"
+                    placeholder="请输入实施日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="复审日期" prop="reviewDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.reviewDate"
+                    placeholder="请输入复审日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
+                  <div class="file-box" v-if="fileList.length > 0">
+                    <p v-for="item in fileList"
+                       :key="item.id"> {{ item.name }}
+                      <i
+                        title="下载"
+                        @click="downloadFile(item.id)"
+                        class="icon-download"
+                        v-btn-permission="''"
+                      />
+                      <i
+                        title="下载带水印"
+                        @click="downloadFileByWater(item.id, item.name)"
+                        class="icon-download2"
+                        v-btn-permission="''"
+                      />
+                    </p>
+                  </div>
+                  <div v-else>
+                    暂无数据
+                  </div>
+                </el-form-item>
+                <el-form-item   class="add-form-item ">
+                </el-form-item>
+                <!--              <el-form-item label="工作组成员" prop="jgUser" class="add-form-item form-item-disabled">-->
+                <!--                <el-input-->
+                <!--                  v-model="qbfsForm.jgUser"-->
+                <!--                  placeholder="请选择工作组成员"-->
+                <!--                  clearable-->
+                <!--                ></el-input>-->
+                <!--              </el-form-item>-->
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+        <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
+                   @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
+        </el-button>
+        <process-title>
+          <template slot="title">审核信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          height="52%"
+          style="width: 100%;"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="opinion"
+            align="center"
+            label="审核意见">
+          </el-table-column>
+          <el-table-column
+            prop="people"
+            align="center"
+            label="审核人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <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>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+
+export default {
+  name: "qbfsStep1-4",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: "1",
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      drawerModal: false,
+      drawerTitle: "",
+      nodeList: [],
+      fileList: [],
+      commentText: "",
+      dataList: [],
+      detailData: [],
+      loading: false,
+      foldFormFlag: true,
+      qbfsForm: {
+        entNumber: "",
+        cnName: "",
+        enName: "",
+        entCategory: "",
+        replaceNumber: "",
+        replacedNumber: "",
+        releaseDate: "",
+        implementDate: "",
+        reviewDate: "",
+        nextStatus: ""
+      },
+      formRules: {
+        nextStatus: [
+          { required: true, message: "请选择下一步状态", trigger: "change" }
+        ]
+      },
+      associationOptions: [{
+        value: "修订",
+        label: "修订"
+      }, {
+        value: "废止",
+        label: "废止"
+      }, {
+        value: "有效",
+        label: "有效"
+      }]
+    };
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  },
+  methods: {
+    processTable() {
+      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 => {
+      });
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.qbfsForm = JSON.parse(JSON.stringify(item));
+        let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : "";
+        res = res.split(",");
+        this.dataList = [];
+        res.forEach(item => {
+          this.dataList.push({
+            opinion: item.split("-")[1],
+            people: item.split("-")[0]
+          });
+        });
+        let list = [];
+        this.dataList.forEach(item => {
+          list.push(item.opinion);
+          this.findMost(list);
+        });
+
+      });
+    },
+    findMost(arr) {
+      if (!arr.length) return;
+      if (arr.length === 1) return 1;
+      let res = {};
+      let maxName, maxNum = 0;
+      // 遍历数组
+      arr.forEach((item) => {
+        res[item] ? res[item] += 1 : res[item] = 1;
+        if (res[item] > maxNum) {
+          maxName = item;
+          maxNum = res[item];
+        }
+      });
+      this.qbfsForm.nextStatus = maxName
+      // return "出现次数最多的元素为:" + maxName + ", 出现次数为:" + maxNum;
+    },
+    //流程提交
+    handleSubmit() {
+      this.isSubmit = true;
+      this.qbfsForm.commentText = this.commentText;
+      this.qbfsForm.dataList = this.dataList;
+      let json = JSON.stringify(this.qbfsForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.$route.query.taskIds,
+        userId: this.$store.getters.userInfo.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
+    },
+
+    handleTabs(name) {
+      this.active = name;
+    },
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag;
+    },
+    //转办事件
+    handleTransfer() {
+      this.drawerModal = true;
+      this.drawerTitle = "转办处理人";
+      this.selectPeople = row;
+    },
+    //确认转办
+    checkedRole(data) {
+      this.assigneeNewLoading = true;
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false;
+        if (res.success) {
+          this.drawerModal = false;
+          this.$message.success("调整成功");
+          this.$router.push("/processCenter");
+          this.processNum();
+        } else {
+          this.$message.warning(res.message);
+        }
+      });
+    },
+    // 请求转换流程图
+    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 => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data);
+      });
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbfs-step4 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
index eeee1fbd4..4678b8f00 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
@@ -174,7 +174,7 @@
       </div>
       <div>
         <el-collapse accordion>
-          <el-collapse-item title="回执说明">
+          <el-collapse-item title="审批意见">
             <div style="margin: 10px 0;">
               <el-input
                 type="textarea"
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
new file mode 100644
index 000000000..6873b34a1
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
@@ -0,0 +1,589 @@
+<template>
+  <div class="qbfz-step7">
+    <ProcessHeader toggle>
+      <template slot="proName">企标废止流程</template>
+      <template slot="proNode">标准法规部部长审核</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <process-title>
+      <template slot="title">基础信息</template>
+    </process-title>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <el-form
+          ref="qbfsForm"
+          :model="qbfsForm"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <div v-if="foldFormFlag">
+            <el-row :gutter="24">
+              <el-col :span="12">
+                <el-form-item label="企标编号" prop="standCode" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.standCode"
+                    placeholder="请输入企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.standName"
+                    placeholder="请输入中文名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="企标类别" prop="entCategory" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.entCategory"
+                    placeholder="请输入企标类别"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="代替企标编号" prop="replaceNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.replaceNumber"
+                    placeholder="请输入代替企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item  label="废止理由" prop="abolishCause" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    type="textarea"
+                    v-model="qbfsForm.abolishCause"
+                    placeholder="请输入废止理由"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="英文名称" prop="enName" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.enName"
+                    placeholder="请输入英文名称"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="被代替企标编号" prop="replacedNumber" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.replacedNumber"
+                    placeholder="请输入被代替企标编号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="发布日期" prop="releaseDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.releaseDate"
+                    placeholder="请输入发布日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="实施日期" prop="implementDate" class="add-form-item form-item-disabled">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.implementDate"
+                    placeholder="请输入实施日期"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item  label="下一步状态" prop="nextStatus" class="add-form-item ">
+                  <el-select v-model="qbfsForm.nextStatus"  disabled  placeholder="请选择下一步状态">
+                    <el-option
+                      v-for="item in associationOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+        <el-button style="width: 100%" :icon="foldFormFlag ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
+                   @click="foldForm">{{ foldFormFlag ? "隐藏基础信息" : "展开基础信息" }}
+        </el-button>
+        <process-title>
+          <template slot="title">审核信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          height="52%"
+          style="width: 100%;"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="opinion"
+            align="center"
+            label="审核意见">
+          </el-table-column>
+          <el-table-column
+            prop="people"
+            align="center"
+            label="审核人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <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>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+
+export default {
+  name: "qbfzStep7",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      active: "1",
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      drawerModal: false,
+      drawerTitle: "",
+      nodeList: [],
+      fileList: [],
+      commentText: "",
+      dataList: [],
+      detailData: [],
+      loading: false,
+      foldFormFlag: true,
+      qbfsForm: {
+        entNumber: "",
+        cnName: "",
+        enName: "",
+        entCategory: "",
+        replaceNumber: "",
+        replacedNumber: "",
+        releaseDate: "",
+        implementDate: "",
+        reviewDate: "",
+        nextStatus: ""
+      },
+      formRules: {
+        nextStatus: [
+          { required: true, message: "请选择下一步状态", trigger: "change" }
+        ]
+      },
+      associationOptions: [{
+        value: "修订",
+        label: "修订"
+      }, {
+        value: "废止",
+        label: "废止"
+      }, {
+        value: "有效",
+        label: "有效"
+      }]
+    };
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  },
+  methods: {
+    processTable() {
+      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 => {
+      });
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList(item) {
+      console.log(item);
+      this.$nextTick(() => {
+        this.qbfsForm = JSON.parse(JSON.stringify(item));
+        let res = item.res ? item.res.substring(1, item.res.lastIndexOf("]")) : "";
+        res = res.split(",");
+        this.dataList = [];
+        res.forEach(item => {
+          this.dataList.push({
+            opinion: item.split("-")[1],
+            people: item.split("-")[0]
+          });
+        });
+      });
+    },
+    //流程驳回
+    beforeBack(){
+      this.isSubmit = true;
+      this.qbfsForm.commentText = this.commentText;
+      this.qbfsForm.bafzFlag = '1'
+      this.qbfsForm.dataList = this.dataList;
+      let json = JSON.stringify(this.qbfsForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.$route.query.taskIds,
+        userId: this.$store.getters.userInfo.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
+    },
+    //流程提交
+    handleSubmit() {
+      this.$refs['qbfsForm'].validate((valid) => {
+        if (valid) {
+          this.isSubmit = true;
+          this.qbfsForm.commentText = this.commentText;
+          this.qbfsForm.bafzFlag = '0'
+          this.qbfsForm.dataList = this.dataList;
+          let json = JSON.stringify(this.qbfsForm);
+          this.$http.post("lawss/activiti/completeTask", {
+            taskIds: this.$route.query.taskIds,
+            userId: this.$store.getters.userInfo.userId,
+            json: json
+          }, {
+            _this: this
+          }, res => {
+            if (res.success) {
+              this.$message.success(res.message);
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false;
+          }, e => {
+          });
+        }else{
+          this.$message.warning('请完善基础信息')
+        }
+      })
+    },
+
+    handleTabs(name) {
+      this.active = name;
+    },
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag;
+    },
+    //转办事件
+    handleTransfer() {
+      this.drawerModal = true;
+      this.drawerTitle = "转办处理人";
+      this.selectPeople = row;
+    },
+    //确认转办
+    checkedRole(data) {
+      this.assigneeNewLoading = true;
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false;
+        if (res.success) {
+          this.drawerModal = false;
+          this.$message.success("调整成功");
+          this.$router.push("/processCenter");
+          this.processNum();
+        } else {
+          this.$message.warning(res.message);
+        }
+      });
+    },
+    // 请求转换流程图
+    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 => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data);
+      });
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbfz-step7 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
index 6b17384ce..791ce3969 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
@@ -144,7 +144,7 @@
       </div>
       <div>
         <el-collapse accordion>
-          <el-collapse-item title="回执说明">
+          <el-collapse-item title="审批意见">
             <div style="margin: 10px 0;">
               <el-input
                 type="textarea"
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
new file mode 100644
index 000000000..2a3478193
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
@@ -0,0 +1,523 @@
+<template>
+  <div class="qbzxd-jhgk">
+    <ProcessHeader toggle>
+      <template slot="proName">企标制修订计划管控</template>
+      <template slot="proNode">标准法规部部长批准</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form :model="qbfsForm" class="label-input-form prc-content-border"
+                 label-width="150px">
+          <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.esName"
+              placeholder="请输入企标名称"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select  disabled  v-model="qbfsForm.planStatus"  placeholder="请选择计划状态">
+              <el-option label="制定" value="制定"></el-option>
+              <el-option label="修订" value="修订"></el-option>
+              <el-option label="完成" value="完成"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select disabled  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
+              <el-option label="制定完成" value="制定完成"></el-option>
+              <el-option label="制定中" value="制定中"></el-option>
+              <el-option label="未制定" value="未制定"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafter"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="resPerson" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.resPerson"
+              placeholder="请输入评审责任人"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item prop="wgLeader" label="工作组组长" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.wgLeader"
+              placeholder="请输入工作组组长"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              disabled
+              v-model="qbfsForm.draftTime"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="请选择计划标准初稿完成时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="计划标准发布时间" style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              disabled
+              v-model="qbfsForm.releaseTime"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="请选择计划标准发布时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unit" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.unit"
+              placeholder="请输入起草责任单位"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              disabled
+              v-model="qbfsForm.newReason"
+              placeholder="请输入新增原因"
+              :maxlength="500"/>
+          </el-form-item>
+          <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.mergeReason"
+              placeholder="请输入合并原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              v-model="qbfsForm.yqDraftTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择延期后初稿完成时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
+            <el-date-picker
+              v-model="qbfsForm.yqReleaseTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择延期后标准发布时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item  v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.delayReason"
+              placeholder="请输入延期原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.cancelReason"
+              placeholder="请输入取消原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
+            <el-input
+              type="textarea"
+              v-model="qbfsForm.renameReason"
+              placeholder="请输入更名原因"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <!--                                        <el-form-item label="备注" style="width: 100%; margin-right:10px" class="add-form-item" prop="remarks">-->
+          <!--                                            <el-input-->
+          <!--                                                    v-model="qbfsForm.remarks"-->
+          <!--                                                    placeholder="请输入备注"-->
+          <!--                                                    :maxlength="500"/>-->
+          <!--                                        </el-form-item>-->
+        </el-form>
+      </div>
+      <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>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="流程信息"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst } from "api/process";
+
+
+export default {
+  name: "qbzxdjhgkStep1-5",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data(){
+    return {
+      active: '1',
+      type: '',
+      commentText: '',
+      qbfsForm: {},
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      loading: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      nodeList:[],
+      drawerTitle: '',
+      detailData: [],
+
+    }
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+  },
+  methods:{
+    processTable() {
+      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 => {
+      })
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId,
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      console.log(item);
+      this.$nextTick(() => {
+        this.qbfsForm = JSON.parse(JSON.stringify(item))
+        this.type = item.type
+      })
+    },
+    handleTabs(name){
+      this.active = name
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    //确认转办
+    checkedRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    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 => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    handleSubmit(){
+      this.isSubmit = true
+      this.qbfsForm.bzfgbzFlag = '0'
+      this.qbfsForm.commentText = this.commentText
+      let json = JSON.stringify(this.qbfsForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.$route.query.taskIds,
+        userId: this.$store.getters.userInfo.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      }, e => {
+      });
+    },
+    beforeBack(){
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.isSubmit = true
+        this.qbfsForm.bzfgbzFlag = '1'
+        this.qbfsForm.commentText = this.commentText
+        let json = JSON.stringify(this.qbfsForm);
+        this.$http.post('lawss/activiti/completeTask', {
+          taskIds: this.$route.query.taskIds,
+          userId: this.$store.getters.userInfo.userId,
+          json: json,
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message)
+            this.$router.push('/processCenter')
+          }
+          this.isSubmit = false
+        }, e => {
+        });
+      }
+    },
+
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbzxd-jhgk {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index 12cd6fc57..4169ed788 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -270,6 +270,15 @@ export default {
         } else if(prcType === '21') {
           // 参会流程
           this.toProcessDetail('bzchStep6-1',row)
+        } else if(prcType === '23'){
+          //企标复审
+          this.toProcessDetail('qbzxdjhgkStep1-5',row)
+        }else if(prcType === '24'){
+          //企标废止
+          this.toProcessDetail('qbfzStep1-7',row)
+        }else if(prcType === '25'){
+          //企标制修订计划管控
+          this.toProcessDetail('qbzxdjhgkStep1-5',row)
         }
       } else {
         this.$message.warning('当前流程未全部办理完成，无法查看')
diff --git a/src/router/index.js b/src/router/index.js
index 1ce65e1db..66643815c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1589,6 +1589,15 @@ const routes = [
           title: '企标复审流程'
         }
       },
+      {
+        path: '/qbfsStep1-4',
+        name: 'qbfsStep1-4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标复审流程'
+        }
+      },
       //企标废止流程
       {
         path: '/qbfzStep1',
@@ -1653,6 +1662,15 @@ const routes = [
           title: '企标废止流程'
         }
       },
+      {
+        path: '/qbfzStep1-7',
+        name: 'qbfzStep1-7',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标废止流程'
+        }
+      },
       //企标制修订计划管控流程
       {
         path: '/qbzxdjhgkStep1',
@@ -1699,6 +1717,15 @@ const routes = [
           title: '企标制修订计划管控流程'
         }
       },
+      {
+        path: '/qbzxdjhgkStep1-5',
+        name: 'qbzxdjhgkStep1-5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标制修订计划管控流程'
+        }
+      },
       // 外部标准化协会入会流程
       {
         path: '/bzrhStep1',