From 5cbd9fb306de87690a3c2e50536c30009f1861f5 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Thu, 12 Aug 2021 14:16:43 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E5=AE=9E=E6=96=BD=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/addEdit.vue                         |  6 +++---
 .../pages/details.vue                         | 19 +++++++------------
 .../pages/otherAddEit.vue                     |  6 +++---
 .../pages/projectAddEit.vue                   |  6 +++---
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 1a786bd70..0b3225713 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1248,10 +1248,10 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
+            if (this.sarAccessInfoList[i].ssrq === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             }else {
-              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
            if (this.sarAccessInfoList[i].xcxssrqgj === null) {
              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index bb19c111f..6ee8ff256 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -150,11 +150,17 @@
             label="能源类型">
           </el-table-column>
           <el-table-column
-            prop="putTime"
+            prop="ssrq"
             sortable
             align="center"
             width="210px"
             label="标准实施日期">
+            <template slot-scope="scope">
+              <span v-if="scope.row.ssrq === null">
+                {{ scope.row.ssrq }}
+              </span>
+              <span v-else>{{ scope.row.ssrq.slice(0, 10) }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -757,11 +763,6 @@ export default {
     setMap(data){
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
-        this.$set(this.typeApplicableMap, item.value, item.label)
-        this.$set(this.nylxMap, item.value, item.label)
-        this.$set(this.zrbmMap, item.value, item.label)
-        this.$set(this.sycpxMap, item.value, item.label)
-        this.$set(this.countryAreaMap, item.value, item.label)
       })
     }
   },
@@ -797,12 +798,6 @@ export default {
       this.textStatusOptions = res.data.WBZTCLASS
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.setMap(this.textStatusOptions)
-      this.setMap(this.zrbmOptions)
-      this.setMap(this.categoryOptions)
-      this.setMap(this.sycpxOptions)
-      this.setMap(this.energyKindOptions)
-      this.setMap(this.drawerCountryOptions)
-      this.setMap(this.applyArcticOptions)
       this.getGzzOption();
     }, e => {
     });
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 0dfdedf9f..ce62849a4 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1217,10 +1217,10 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
+            if (this.sarAccessInfoList[i].ssrq === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             }else {
-              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 2e73c4f2c..31fa260f8 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1216,10 +1216,10 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
+            if (this.sarAccessInfoList[i].ssrq === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             }else {
-              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')

From 030341d5c36d708fbab2d4be81298f7251ff9a9c Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 12 Aug 2021 14:35:24 +0800
Subject: [PATCH 02/10] feat: There is no way the #bug issueTime 11

---
 src/pages/searchCenter/pages/standardSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index b179d70d1..f960e38f1 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -233,7 +233,7 @@
                                     </div>
                                     <div class="AllBoxContent" v-html="item.textContent"></div>
                                     <div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">
-                                        <div style="margin-right: 15px;">发布日期11:  {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time)  : '--' }} </div>
+                                        <div style="margin-right: 15px;">发布日期:  {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time)  : '--' }} </div>
                                         <!--              <div>{{$t('m.putTime')}}:  {{ item.issue_time !== null && item.issue_time !== '' ? $dateFormat(new Date(item.put_time), 'yyyy-MM-dd') : '&#45;&#45;' }} </div>-->
                                     </div>
                                 </div>

From 6c2ed1093e5ad5f952665c9741abb6f5fd670163 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 12 Aug 2021 14:45:06 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84--=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2=E7=BC=BA=E5=95=A5=E6=A0=87=E7=AD=BE=E5=92=8C?=
 =?UTF-8?q?=E4=BD=93=E7=B3=BB=E7=B1=BB=E5=88=AB=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue  | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 28376ae89..a12332f08 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -530,6 +530,23 @@
                 </el-option>
               </el-select>
             </el-form-item>
+
+<!--            标记-->
+            <!--            标签-->
+            <el-form-item label="标签">
+              <el-input v-model="sarStandardsSearch.tag" clearable
+                        placeholder="根据被标签查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+
+
+            <!--            体系类别-->
+            <el-form-item label="体系类别">
+              <el-select v-model="sarStandardsSearch.txlbOption" placeholder="根据体系类别查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
           </el-form>
         </div>
         <div class="demo-drawer-footer">
@@ -1428,7 +1445,10 @@ export default {
         replacedStandNum: '',
         synopsis: '', // 内容摘要
         // category: '', // 所属类别
-        standSort: '' // 标准类别
+        standSort: '', // 标准类别
+        txlbOption:'', //标准体系
+        tag:'' //标签
+
       }, // 分页查询过程中用到的对象
       loading: false,
       isCollapse: true,

From bb440da53d15714672a46ee15bc1a7a9f5075b6c Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 12 Aug 2021 15:00:31 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E6=90=9C=E7=B4=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue             | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index a12332f08..c191cc4b6 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -391,8 +391,8 @@
               </el-select>
             </el-form-item>
             <!--            是否纳入标准清单-->
-            <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
-              <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
+            <el-form-item  label="是否纳入标准清单" class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.isRelateAccess"  placeholder="根据是否纳入标准清单查找">
                 <el-option value="yes" label="是"></el-option>
                 <el-option value="no" label="否"></el-option>
               </el-select>
@@ -437,7 +437,7 @@
             <el-form-item label="我司参与深度">
               <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in wscysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
 
@@ -1504,6 +1504,8 @@ export default {
       categoryConfigOptions: [], // 所属类别下拉框
       assemClassOptions: [], // 总成分类下拉框
       standAttributeList: [],
+      qcdwOptions:[],//起草单位
+      wscysdOptions:[], //我司参与深度
       // 树形结构
       // tree function
       MoveTest: '',
@@ -4303,6 +4305,7 @@ export default {
       this.categoryConfigOptions = res.data.CATEGORY
       this.standAttributeList = res.data.RULETYPE
       this.qcdwOptions = res.data.QCDW
+      this.wscysdOptions=res.data.WSCYSD;
       this.getGzzOption()
       this.setMap(this.standStateOptions)
     }, e => {

From 7f7e59144ee69be1e70da70d1c58084682536a88 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 12 Aug 2021 15:12:02 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=9B=BD=E5=A4=96=E6=A0=87=E5=87=86,?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2,=E6=88=91=E5=8F=B8?=
 =?UTF-8?q?=E5=8F=82=E4=B8=8E=E6=B7=B1=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue                 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index c191cc4b6..24b3fa028 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -435,7 +435,7 @@
             </el-form-item>
             <!--            我司参与深度-->
             <el-form-item label="我司参与深度">
-              <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
+              <el-select v-model="sarStandardsSearch.wscysd" placeholder="请选择我司参与深度" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in wscysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
@@ -1447,7 +1447,8 @@ export default {
         // category: '', // 所属类别
         standSort: '', // 标准类别
         txlbOption:'', //标准体系
-        tag:'' //标签
+        tag:'', //标签
+        wscysd:'' //我司参与深度
 
       }, // 分页查询过程中用到的对象
       loading: false,

From c2ff22256c2b848f9dce6431462d65126466f367 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Thu, 12 Aug 2021 15:43:47 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=EF=BC=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standAutoSplit/index.vue         | 12 ++++++++----
 .../localTool/standAutoSplit/pages/itemSplitInfo.vue |  5 +++--
 .../pages/creatProcess/bzjd/step1-1.vue              |  4 ++++
 .../processCenter/pages/creatProcess/bzjd/step1.vue  |  4 ++++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index b22f830da..9846d1ba6 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -82,8 +82,11 @@
                 label="拆分状态"
                 align="center">
               <template slot-scope="scope">
-                <div>{{ scope.row.splitStatus == '0' ? '编辑中' : (scope.row.splitStatus == '1' ? '审核中' : '已完成' +
-                    '') }}</div>
+                <span v-if="scope.row.splitStatus == '0'">编辑中</span>
+                <span v-else-if="scope.row.splitStatus == '1'">审核中</span>
+                <span v-else-if="scope.row.splitStatus == '2'">已关联</span>
+                <span v-else-if="scope.row.splitStatus == '3'">解读中</span>
+                <span v-else>已完成</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -831,7 +834,7 @@ export default {
         name: 'OtherStandardDetails',
         params: {
           id: item.standId,
-          pageType: 'INLAND_STAND'
+          pageType: item.standType + '_STAND'
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -842,7 +845,7 @@ export default {
         name: 'OtherStandardDetails',
         params: {
           id: item.standId,
-          pageType: item.sarType + '_STAND'
+          pageType: item.sarType + '_STAND',
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -1378,6 +1381,7 @@ export default {
         query: {
           infoId: row.id,
           result: row.result,
+          splitStatus: row.splitStatus
         }
       })
     },
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index 8db39fdaf..bfec5d439 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -97,7 +97,8 @@
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="''">属性</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-btn-permission="''">编辑</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '编辑',  scope.$index]" v-if="splitStatus === '4'" v-btn-permission="''">编辑</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '编辑',  scope.$index]" v-else :disabled="true" v-btn-permission="''">编辑</el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="''">复制</el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
                     </el-dropdown-menu>
@@ -685,6 +686,7 @@ export default {
   },
   data () {
     return {
+      splitStatus: this.$route.query.splitStatus,
       auditFlag: this.$route.query.auditFlag,
       splitCheckDialog: false,
       submitLoading: false,
@@ -1306,7 +1308,6 @@ export default {
           if (cur[i].pId == null || cur[i].pId === '') {
             this.parentNode = cur[i]
           }
-          console.log(str);
           this.zNodes = str
         }
         // 查完左侧目录后，如果没有选中的，设置最外层选中
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index a59cea2ed..406528121 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -388,6 +388,7 @@
                 sarType: '',
                 loading: false,
                 standId: '',
+                statusId: '',
                 commentText: '',
                 textarea: '', // 意见
                 title: '', // 新增抽屉标题
@@ -401,6 +402,7 @@
                     itemsNum: '',
                     itemsName: '',
                     standId: '',
+                    statusId: '',
                     itemsNum1: '',
                     itemsName1: '',
                     oldNumber: ''
@@ -622,6 +624,8 @@
                     this.form.standId = bringData[0].standId
                     this.sarType = bringData[0].standType
                     this.standId = bringData[0].standId
+                    this.statusId = bringData[0].id
+                    this.form.statusId = bringData[0].id
                     this.listModel = false;
                     this.listModel2 = true
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index f5f4d3930..9339d3260 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -388,6 +388,7 @@
                 sarType: '',
                 loading: false,
                 standId: '',
+                statusId: '',
                 commentText: '',
                 textarea: '', // 意见
                 title: '', // 新增抽屉标题
@@ -401,6 +402,7 @@
                     itemsNum: '',
                     itemsName: '',
                     standId: '',
+                    statusId: '',
                     itemsNum1: '',
                     itemsName1: '',
                     oldNumber: ''
@@ -627,6 +629,8 @@
                     this.form.standId = bringData[0].standId
                     this.sarType = bringData[0].standType
                     this.standId = bringData[0].standId
+                    this.statusId = bringData[0].id
+                    this.form.statusId = bringData[0].id
                     this.listModel = false;
                     this.listModel2 = true
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {

From 338408823cd24e235d80cc27f36e2d4424d335c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 12 Aug 2021 15:49:05 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg2/step10.vue       |  230 ++--
 .../pages/creatProcess/xmpg2/step11.vue       |  224 ++--
 .../pages/creatProcess/xmpg2/step12.vue       |  230 ++--
 .../pages/creatProcess/xmpg2/step4.vue        |  104 +-
 .../pages/creatProcess/xmpg2/step5.vue        |   65 +-
 .../pages/creatProcess/xmpg2/step6.vue        |   86 +-
 .../pages/creatProcess/xmpg2/step7.vue        | 1060 +++++++++--------
 .../pages/creatProcess/xmpg2/step8.vue        |    2 +
 .../pages/creatProcess/xmpg2/step9.vue        |  228 ++--
 9 files changed, 1130 insertions(+), 1099 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
index 53a1f75ad..ff73ee5f0 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
@@ -43,25 +43,25 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-                :data="dataList"
-                style="width: 100%; border: 1px solid #cccccc"
-                row-key="standId"
-                height="70%"
-                border
-                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          :data="dataList"
+          style="width: 100%; border: 1px solid #cccccc"
+          row-key="standId"
+          height="70%"
+          border
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
           <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
+            type="selection"
+            width="55"
+            align="center">
           </el-table-column>
           <el-table-column
-                  prop="standEnName"
-                  label="标准编号"
-                  width="180"
-                  fixed="left"
-                  align="center"
+            prop="standEnName"
+            label="标准编号"
+            width="180"
+            fixed="left"
+            align="center"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standYear" class="table-jump"
@@ -72,126 +72,128 @@
             </template>
           </el-table-column>
           <el-table-column
-                  prop="standName"
-                  fixed="left"
-                  width="180"
-                  align="center"
-                  label="标准名称"
+            prop="standName"
+            fixed="left"
+            width="180"
+            align="center"
+            label="标准名称"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="itemsNum"
-                  align="center"
-                  width="200"
-                  label="条款号">
+            prop="itemsNum"
+            align="center"
+            width="200"
+            label="条款号">
           </el-table-column>
           <el-table-column
-                  prop="itemsName"
-                  width="200"
-                  align="center"
-                  label="条款名称">
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
           </el-table-column>
           <el-table-column
-                  prop="xcxssrqgj"
-                  width="200"
-                  align="center"
-                  label="新车型实施日期">
+            prop="xcxssrqgj"
+            width="200"
+            align="center"
+            label="新车型实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="zccssrqgj"
-                  width="200"
-                  align="center"
-                  label="在产车实施日期">
+            prop="zccssrqgj"
+            width="200"
+            align="center"
+            label="在产车实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="productType"
-                  align="center"
-                  label="在研产品">
+            prop="productType"
+            align="center"
+            label="在研产品">
             <el-table-column
-                    prop="complianceReasons"
-                    align="center"
-                    width="160"
-                    label="合规">
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
             </el-table-column>
             <el-table-column
-                    align="center"
-                    width="160"
-                    prop="researchNonCompliance"
-                    label="不合规">
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
               <el-table-column
-                      prop="noCompliance"
-                      align="center"
-                      width="160"
-                      label="不合规项目">
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
               </el-table-column>
               <el-table-column
-                      prop="countermeasures"
-                      align="center"
-                      width="160"
-                      label="应对措施">
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
               </el-table-column>
               <el-table-column
-                      prop="completionTime"
-                      align="center"
-                      width="160"
-                      label="完成时间">
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
           <el-table-column
-                  align="center"
-                  label="在产产品">
+            align="center"
+            label="在产产品">
             <el-table-column
-                    prop="zcComplianceReasons"
-                    align="center"
-                    width="160"
-                    label="合规(具体情况)">
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-                    align="center"
-                    width="160"
-                    label="不合规">
+              align="center"
+              width="160"
+              label="不合规">
               <el-table-column
-                      prop="zcNoCompliance"
-                      align="center"
-                      width="160"
-                      label="不合规项目">
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
               </el-table-column>
               <el-table-column
-                      prop="zcCountermeasures"
-                      align="center"
-                      width="160"
-                      label="应对措施">
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
               </el-table-column>
               <el-table-column
-                      prop="zcCompletionTime"
-                      align="center"
-                      width="160"
-                      label="完成时间">
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-            <el-table-column
-                    prop="workPeople"
-                    align="center"
-                    width="200"
-                    label="责任人">
-            </el-table-column>
+          <el-table-column
+            prop="workPeople"
+            align="center"
+            width="200"
+            label="责任人">
+          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -351,14 +353,14 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
-            this.$set(item, "ZCCSSRQ", '');
-            this.$set(item, "XCXSSRQ", '');
-          }else{
+          if (item.attrInfoMap === null) {
+            this.$set(item, "ZCCSSRQ", "");
+            this.$set(item, "XCXSSRQ", "");
+          } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -410,9 +412,9 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
+        this.$message.warning("请填写审批意见");
+      } else {
         this.listForm.bzFlag = "2";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -433,24 +435,26 @@ export default {
     },
     //提交事件
     handleSubmit() {
-        this.listForm.bzFlag = "1";
-        this.listForm.commentText = this.commentText;
-        const json = JSON.stringify(this.listForm);
-        console.log(json)
-        this.$http.post("lawss/activiti/completeTask", {
-          taskIds: this.taskIds,
-          userId: this.userId,
-          json: json
-        }, {
-          _this: this
-        }, res => {
-          if (res.success) {
-            this.$message.success(res.message);
-            this.$router.push("/processCenter");
-          }
-        }, e => {
-        });
-    },
+      this.isSubmit = true;
+      this.listForm.bzFlag = "1";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      console.log(json);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
+    }
   },
   computed: {
     listNoDataText() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
index 2ffd9a28e..f9d78447f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
@@ -43,25 +43,25 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-                :data="dataList"
-                style="width: 100%; border: 1px solid #cccccc"
-                row-key="standId"
-                height="70%"
-                border
-                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          :data="dataList"
+          style="width: 100%; border: 1px solid #cccccc"
+          row-key="standId"
+          height="70%"
+          border
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
           <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
+            type="selection"
+            width="55"
+            align="center">
           </el-table-column>
           <el-table-column
-                  prop="standEnName"
-                  label="标准编号"
-                  width="180"
-                  fixed="left"
-                  align="center"
+            prop="standEnName"
+            label="标准编号"
+            width="180"
+            fixed="left"
+            align="center"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standYear" class="table-jump"
@@ -72,126 +72,128 @@
             </template>
           </el-table-column>
           <el-table-column
-                  prop="standName"
-                  fixed="left"
-                  width="180"
-                  align="center"
-                  label="标准名称"
+            prop="standName"
+            fixed="left"
+            width="180"
+            align="center"
+            label="标准名称"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="itemsNum"
-                  align="center"
-                  width="200"
-                  label="条款号">
+            prop="itemsNum"
+            align="center"
+            width="200"
+            label="条款号">
           </el-table-column>
           <el-table-column
-                  prop="itemsName"
-                  width="200"
-                  align="center"
-                  label="条款名称">
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
           </el-table-column>
           <el-table-column
-                  prop="xcxssrqgj"
-                  width="200"
-                  align="center"
-                  label="新车型实施日期">
+            prop="xcxssrqgj"
+            width="200"
+            align="center"
+            label="新车型实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="zccssrqgj"
-                  width="200"
-                  align="center"
-                  label="在产车实施日期">
+            prop="zccssrqgj"
+            width="200"
+            align="center"
+            label="在产车实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="productType"
-                  align="center"
-                  label="在研产品">
+            prop="productType"
+            align="center"
+            label="在研产品">
             <el-table-column
-                    prop="complianceReasons"
-                    align="center"
-                    width="160"
-                    label="合规">
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
             </el-table-column>
             <el-table-column
-                    align="center"
-                    width="160"
-                    prop="researchNonCompliance"
-                    label="不合规">
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
               <el-table-column
-                      prop="noCompliance"
-                      align="center"
-                      width="160"
-                      label="不合规项目">
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
               </el-table-column>
               <el-table-column
-                      prop="countermeasures"
-                      align="center"
-                      width="160"
-                      label="应对措施">
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
               </el-table-column>
               <el-table-column
-                      prop="completionTime"
-                      align="center"
-                      width="160"
-                      label="完成时间">
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
           <el-table-column
-                  align="center"
-                  label="在产产品">
+            align="center"
+            label="在产产品">
             <el-table-column
-                    prop="zcComplianceReasons"
-                    align="center"
-                    width="160"
-                    label="合规(具体情况)">
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-                    align="center"
-                    width="160"
-                    label="不合规">
+              align="center"
+              width="160"
+              label="不合规">
               <el-table-column
-                      prop="zcNoCompliance"
-                      align="center"
-                      width="160"
-                      label="不合规项目">
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
               </el-table-column>
               <el-table-column
-                      prop="zcCountermeasures"
-                      align="center"
-                      width="160"
-                      label="应对措施">
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
               </el-table-column>
               <el-table-column
-                      prop="zcCompletionTime"
-                      align="center"
-                      width="160"
-                      label="完成时间">
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-            <el-table-column
-                    prop="workPeople"
-                    align="center"
-                    width="200"
-                    label="责任人">
-            </el-table-column>
+          <el-table-column
+            prop="workPeople"
+            align="center"
+            width="200"
+            label="责任人">
+          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -349,14 +351,14 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
-            this.$set(item, "ZCCSSRQ", '');
-            this.$set(item, "XCXSSRQ", '');
-          }else{
+          if (item.attrInfoMap === null) {
+            this.$set(item, "ZCCSSRQ", "");
+            this.$set(item, "XCXSSRQ", "");
+          } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -385,7 +387,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-            console.log(res.mesg)
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -409,23 +411,25 @@ export default {
     },
     //提交事件
     handleSubmit() {
-        this.listForm.bzFlag = "1";
-        this.listForm.commentText = this.commentText;
-        const json = JSON.stringify(this.listForm);
-        this.$http.post("lawss/activiti/completeTask", {
-          taskIds: this.taskIds,
-          userId: this.userId,
-          json: json
-        }, {
-          _this: this
-        }, res => {
-          if (res.success) {
-            this.$message.success(res.message);
-            this.$router.push("/processCenter");
-          }
-        }, e => {
-        });
-    },
+      this.isSubmit = true;
+      this.listForm.bzFlag = "1";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
+    }
   },
 
   computed: {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
index 81f5faa37..d43b5367c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
@@ -43,25 +43,25 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-                :data="dataList"
-                style="width: 100%; border: 1px solid #cccccc"
-                row-key="standId"
-                height="70%"
-                border
-                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          :data="dataList"
+          style="width: 100%; border: 1px solid #cccccc"
+          row-key="standId"
+          height="70%"
+          border
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
           <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
+            type="selection"
+            width="55"
+            align="center">
           </el-table-column>
           <el-table-column
-                  prop="standEnName"
-                  label="标准编号"
-                  width="180"
-                  fixed="left"
-                  align="center"
+            prop="standEnName"
+            label="标准编号"
+            width="180"
+            fixed="left"
+            align="center"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standYear" class="table-jump"
@@ -72,126 +72,128 @@
             </template>
           </el-table-column>
           <el-table-column
-                  prop="standName"
-                  fixed="left"
-                  width="180"
-                  align="center"
-                  label="标准名称"
+            prop="standName"
+            fixed="left"
+            width="180"
+            align="center"
+            label="标准名称"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="itemsNum"
-                  align="center"
-                  width="200"
-                  label="条款号">
+            prop="itemsNum"
+            align="center"
+            width="200"
+            label="条款号">
           </el-table-column>
           <el-table-column
-                  prop="itemsName"
-                  width="200"
-                  align="center"
-                  label="条款名称">
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
           </el-table-column>
           <el-table-column
-                  prop="xcxssrqgj"
-                  width="200"
-                  align="center"
-                  label="新车型实施日期">
+            prop="xcxssrqgj"
+            width="200"
+            align="center"
+            label="新车型实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="zccssrqgj"
-                  width="200"
-                  align="center"
-                  label="在产车实施日期">
+            prop="zccssrqgj"
+            width="200"
+            align="center"
+            label="在产车实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="productType"
-                  align="center"
-                  label="在研产品">
+            prop="productType"
+            align="center"
+            label="在研产品">
             <el-table-column
-                    prop="complianceReasons"
-                    align="center"
-                    width="160"
-                    label="合规">
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
             </el-table-column>
             <el-table-column
-                    align="center"
-                    width="160"
-                    prop="researchNonCompliance"
-                    label="不合规">
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
               <el-table-column
-                      prop="noCompliance"
-                      align="center"
-                      width="160"
-                      label="不合规项目">
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
               </el-table-column>
               <el-table-column
-                      prop="countermeasures"
-                      align="center"
-                      width="160"
-                      label="应对措施">
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
               </el-table-column>
               <el-table-column
-                      prop="completionTime"
-                      align="center"
-                      width="160"
-                      label="完成时间">
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
           <el-table-column
-                  align="center"
-                  label="在产产品">
+            align="center"
+            label="在产产品">
             <el-table-column
-                    prop="zcComplianceReasons"
-                    align="center"
-                    width="160"
-                    label="合规(具体情况)">
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-                    align="center"
-                    width="160"
-                    label="不合规">
+              align="center"
+              width="160"
+              label="不合规">
               <el-table-column
-                      prop="zcNoCompliance"
-                      align="center"
-                      width="160"
-                      label="不合规项目">
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
               </el-table-column>
               <el-table-column
-                      prop="zcCountermeasures"
-                      align="center"
-                      width="160"
-                      label="应对措施">
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
               </el-table-column>
               <el-table-column
-                      prop="zcCompletionTime"
-                      align="center"
-                      width="160"
-                      label="完成时间">
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-            <el-table-column
-                    prop="workPeople"
-                    align="center"
-                    width="200"
-                    label="责任人">
-            </el-table-column>
+          <el-table-column
+            prop="workPeople"
+            align="center"
+            width="200"
+            label="责任人">
+          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -351,14 +353,14 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
-            this.$set(item, "ZCCSSRQ", '');
-            this.$set(item, "XCXSSRQ", '');
-          }else{
+          if (item.attrInfoMap === null) {
+            this.$set(item, "ZCCSSRQ", "");
+            this.$set(item, "XCXSSRQ", "");
+          } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -410,9 +412,9 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
+        this.$message.warning("请填写审批意见");
+      } else {
         this.listForm.dlFlag = "2";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -433,23 +435,25 @@ export default {
     },
     //提交事件
     handleSubmit() {
-        this.listForm.dlFlag = "1";
-        this.listForm.commentText = this.commentText;
-        const json = JSON.stringify(this.listForm);
-        this.$http.post("lawss/activiti/completeTask", {
-          taskIds: this.taskIds,
-          userId: this.userId,
-          json: json
-        }, {
-          _this: this
-        }, res => {
-          if (res.success) {
-            this.$message.success(res.message);
-            this.$router.push("/processCenter");
-          }
-        }, e => {
-        });
-    },
+      this.isSubmit = true;
+      this.listForm.dlFlag = "1";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
+    }
   },
   computed: {
     listNoDataText() {
@@ -459,7 +463,7 @@ export default {
   mounted() {
     this.processTable();
     this.getData();
-  },
+  }
 };
 </script>
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index a00511c26..cefaecdc1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -44,7 +44,8 @@
         </process-title>
         <div class="tableTitle">
           <div class="tableButton">
-            <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人
+            </el-button>
           </div>
         </div>
         <el-table
@@ -112,8 +113,9 @@
             width="170"
             align="center">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.liablePeopleId" style="display: none;"/>
-              <el-input v-model="scope.row.liablePeople" placeholder="请选择分发责任人" @click.native="choiceZRRS(scope.row.liablePeopleId, 1, scope.$index)"/>
+              <el-input v-model="scope.row.liablePeopleId" style="display: none;" />
+              <el-input v-model="scope.row.liablePeople" placeholder="请选择分发责任人"
+                        @click.native="choiceZRRS(scope.row.liablePeopleId, 1, scope.$index)" />
             </template>
           </el-table-column>
         </el-table>
@@ -225,7 +227,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail,  saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
 
 export default {
   name: "xmpg2Step4",
@@ -247,8 +249,8 @@ export default {
       modalshowflag: false, // drawer开关
       selectList: [],
       treeData: [], // 人员数据
-      zrIndex: '',
-      zrType: '',
+      zrIndex: "",
+      zrType: "",
       roleForm: {
         liablePeople: ""
       },
@@ -270,7 +272,7 @@ export default {
       detailData: [], //流程历史数据
       userId: this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
-      pId: this.$route.query.prcId,
+      pId: this.$route.query.prcId
     };
   },
   methods: {
@@ -297,14 +299,14 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
-            this.$set(item, "ZCCSSRQ", '');
-            this.$set(item, "XCXSSRQ", '');
-          }else{
+          if (item.attrInfoMap === null) {
+            this.$set(item, "ZCCSSRQ", "");
+            this.$set(item, "XCXSSRQ", "");
+          } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -346,7 +348,7 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        if(item.form === undefined){
+        if (item.form === undefined) {
           this.listForm.prcNum = this.prcNum;
           this.listForm.prcName = this.prcName;
           this.listForm["id"] = item.id;
@@ -354,8 +356,8 @@ export default {
           this.dataList = item.dataList;
           this.listForm.breakdownList = item.breakdownList;
         } else {
-          this.listForm = item.form
-          this.dataList = item.form.dataList
+          this.listForm = item.form;
+          this.dataList = item.form.dataList;
         }
 
       });
@@ -382,13 +384,14 @@ export default {
     //提交事件
     handleSubmit() {
       this.listForm.dataList.forEach(item => {
-        if(item.liablePeople !== undefined){
-            this.peopleFlag = true
-        }else{
-          this.peopleFlag = false
+        if (item.liablePeople !== undefined) {
+          this.peopleFlag = true;
+        } else {
+          this.peopleFlag = false;
         }
-      })
-      if(this.peopleFlag === true){
+      });
+      if (this.peopleFlag === true) {
+        this.isSubmit = true;
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
         this.$http.post("lawss/activiti/completeTask", {
@@ -402,30 +405,31 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false;
         }, e => {
         });
-      }else{
-        this.$message.warning('请选择分发负责人')
+      } else {
+        this.$message.warning("请选择分发负责人");
       }
     },
-    choiceZRRS (row, type, index) {
-      this.type = type
+    choiceZRRS(row, type, index) {
+      this.type = type;
       if (type === 1) {
-        this.drawerTitle = '选择责任人'
-        this.nodeList = []
-        this.zrIndex = index
-        this.zrType = type
-        this.nodeList.push(row)
-        this.modalshowflag = true
+        this.drawerTitle = "选择责任人";
+        this.nodeList = [];
+        this.zrIndex = index;
+        this.zrType = type;
+        this.nodeList.push(row);
+        this.modalshowflag = true;
       } else if (type === 2) {
         // 批量
         if (this.selectList.length > 0) {
-          this.zrType = type
-          this.nodeList = []
-          this.modalshowflag = true
-          this.drawerTitle = '批量选择责任人'
+          this.zrType = type;
+          this.nodeList = [];
+          this.modalshowflag = true;
+          this.drawerTitle = "批量选择责任人";
         } else {
-          this.$message.warning('请选择要分发的数据')
+          this.$message.warning("请选择要分发的数据");
         }
       }
     },
@@ -447,25 +451,25 @@ export default {
         this.roleRow = this.$refs.tree.getCheckedNodes()[0];
       }
     },
-    checkedRole (data) {
+    checkedRole(data) {
       if (this.type === 1) {
-        const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]))
-        newRow.liablePeopleId = data[0].id
-        newRow.liablePeople = data[0].name
-        this.$set(this.dataList, this.zrIndex, newRow)
-      } else if(this.type === 2) {
+        const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]));
+        newRow.liablePeopleId = data[0].id;
+        newRow.liablePeople = data[0].name;
+        this.$set(this.dataList, this.zrIndex, newRow);
+      } else if (this.type === 2) {
         this.dataList.forEach((item, index) => {
-          this.selectList.forEach( items => {
+          this.selectList.forEach(items => {
             if (item.standId === items.standId) {
-              const newRow = JSON.parse(JSON.stringify(item))
-              newRow.liablePeopleId = data[0].id
-              newRow.liablePeople = data[0].name
-              this.$set(this.dataList, index, newRow)
+              const newRow = JSON.parse(JSON.stringify(item));
+              newRow.liablePeopleId = data[0].id;
+              newRow.liablePeople = data[0].name;
+              this.$set(this.dataList, index, newRow);
             }
-          })
-        })
+          });
+        });
       }
-      this.modalshowflag = false
+      this.modalshowflag = false;
     },
     cancleUserInfo() {
       this.modalshowflag = false;
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index e051dc45f..d53cb2820 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -96,7 +96,8 @@
           <el-table-column label="责任人" prop="workPeople" align="center">
             <template slot-scope="scope">
               <div :class="{'fileClass': !scope.row.workPeople}">
-                {{ scope.row.workPeople ? scope.row.workPeople: '' }}</div>
+                {{ scope.row.workPeople ? scope.row.workPeople : "" }}
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -279,14 +280,14 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
-            this.$set(item, "ZCCSSRQ", '');
-            this.$set(item, "XCXSSRQ", '');
-          }else{
+          if (item.attrInfoMap === null) {
+            this.$set(item, "ZCCSSRQ", "");
+            this.$set(item, "XCXSSRQ", "");
+          } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -328,7 +329,7 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        if(item.form === undefined){
+        if (item.form === undefined) {
           this.listForm.prcNum = this.prcNum;
           this.listForm.prcName = this.prcName;
           this.listForm["id"] = item.id;
@@ -362,8 +363,8 @@ export default {
           });
           this.listForm.children = children;
         } else {
-          this.listForm = item.form
-          this.dataList = item.form.dataList
+          this.listForm = item.form;
+          this.dataList = item.form.dataList;
         }
 
       });
@@ -389,21 +390,23 @@ export default {
     },
     //提交事件
     handleSubmit() {
-          this.listForm.commentText = this.commentText;
-          const json = JSON.stringify(this.listForm);
-          this.$http.post("lawss/activiti/completeTask", {
-            taskIds: this.taskIds,
-            userId: this.userId,
-            json: json
-          }, {
-            _this: this
-          }, res => {
-            if (res.success) {
-              this.$message.success(res.message);
-              this.$router.push("/processCenter");
-            }
-          }, e => {
-          });
+      this.isSubmit = true;
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
     },
     //批量分发按钮
     batchOperation(id) {
@@ -434,7 +437,7 @@ export default {
       }
     },
     checkedRole(data) {
-      console.log(data[0].name)
+      console.log(data[0].name);
       // 选取负责人时的操作
       let deposit = new Map();
       let mis2 = new Map();
@@ -456,19 +459,19 @@ export default {
               i.workPeople = undefined;
             });
           } else {
-            const newItem = JSON.parse(JSON.stringify(item))
-            newItem.workPeopleId = data[0].id
-            newItem.workPeople = data[0].name
-            this.$set(this.dataList, index, newItem)
+            const newItem = JSON.parse(JSON.stringify(item));
+            newItem.workPeopleId = data[0].id;
+            newItem.workPeople = data[0].name;
+            this.$set(this.dataList, index, newItem);
           }
         } else {
           if (item.children) {
             item.children.forEach((items, childIndex) => {
               if (deposit.get(items.standId)) {
-                const childItems = JSON.parse(JSON.stringify(items))
+                const childItems = JSON.parse(JSON.stringify(items));
                 childItems.workPeopleId = deposit.get(items.standId).workPeopleId;
                 childItems.workPeople = deposit.get(items.standId).workPeople;
-                this.$set(this.dataList[index].children, childIndex, childItems)
+                this.$set(this.dataList[index].children, childIndex, childItems);
               }
             });
           }
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 7b2faee4d..90ede1ec5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -124,7 +124,7 @@
               label="合规">
               <template slot-scope="scope">
                 <el-input
-                        v-model="scope.row.complianceReasons"
+                  v-model="scope.row.complianceReasons"
                   placeholder="请输入合规原因"
                 >
                 </el-input>
@@ -142,7 +142,7 @@
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
-                          v-model="scope.row.noCompliance"
+                    v-model="scope.row.noCompliance"
                     placeholder="请输入不合规项目"
                   >
                   </el-input>
@@ -155,7 +155,7 @@
                 label="应对措施">
                 <template slot-scope="scope">
                   <el-input
-                          v-model="scope.row.countermeasures"
+                    v-model="scope.row.countermeasures"
                     placeholder="请输入应对措施"
                   >
                   </el-input>
@@ -168,7 +168,7 @@
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
-                          v-model="scope.row.completionTime"
+                    v-model="scope.row.completionTime"
                     type="date"
                     placeholder="选择日期">
                   </el-date-picker>
@@ -186,7 +186,7 @@
               label="合规(具体情况)">
               <template slot-scope="scope">
                 <el-input
-                        v-model="scope.row.zcComplianceReasons"
+                  v-model="scope.row.zcComplianceReasons"
                   placeholder="请输入合规原因"
                 >
                 </el-input>
@@ -203,7 +203,7 @@
                 label="不合规项目">
                 <template slot-scope="scope">
                   <el-input
-                          v-model="scope.row.zcNoCompliance"
+                    v-model="scope.row.zcNoCompliance"
                     placeholder="请输入不合规项目"
                   >
                   </el-input>
@@ -216,7 +216,7 @@
                 label="应对措施">
                 <template slot-scope="scope">
                   <el-input
-                          v-model="scope.row.zcCountermeasures"
+                    v-model="scope.row.zcCountermeasures"
                     placeholder="请输入应对措施"
                   >
                   </el-input>
@@ -229,7 +229,7 @@
                 label="完成时间">
                 <template slot-scope="scope">
                   <el-date-picker
-                          v-model="scope.row.zcCompletionTime"
+                    v-model="scope.row.zcCompletionTime"
                     type="date"
                     placeholder="选择日期">
                   </el-date-picker>
@@ -370,24 +370,24 @@ export default {
         children: "children",
         label: "name"
       },
-      complianceReasons:'',
-      zcComplianceReasons:'',
+      complianceReasons: "",
+      zcComplianceReasons: "",
       //表单的数据
       listForm: {
         projectNumber: "",  //项目编号
         projectName: "",  //项目名称
         dataList: [
           {
-            complianceReasons:'',
-            zcComplianceReasons:'',
+            complianceReasons: "",
+            zcComplianceReasons: ""
           }
         ], //项目下的标准数据
         children: [] //标准下的分解单数据
       },
       dataList: [
         {
-          complianceReasons:'',
-          zcComplianceReasons:'',
+          complianceReasons: "",
+          zcComplianceReasons: ""
         }
       ], //展示的标准数据
       commentText: "", //审批意见
@@ -421,14 +421,14 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
-            this.$set(item, "ZCCSSRQ", '');
-            this.$set(item, "XCXSSRQ", '');
-          }else{
+          if (item.attrInfoMap === null) {
+            this.$set(item, "ZCCSSRQ", "");
+            this.$set(item, "XCXSSRQ", "");
+          } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -458,7 +458,7 @@ export default {
           pId: this.pId
         }).then(res => {
           if (res) {
-            console.log(res.mesg)
+            console.log(res.mesg);
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
           }
@@ -470,15 +470,15 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        if(item.form === undefined){
+        if (item.form === undefined) {
           this.listForm.prcNum = this.prcNum;
           this.listForm.prcName = this.prcName;
           this.listForm["id"] = item.id;
           // this.listForm.dataList = item.dataList;
           this.dataList = this.listForm.dataList;
         } else {
-          this.listForm = item.form
-          this.dataList = item.form.dataList
+          this.listForm = item.form;
+          this.dataList = item.form.dataList;
         }
 
       });
@@ -504,21 +504,23 @@ export default {
     },
     //提交事件
     handleSubmit() {
-          this.listForm.commentText = this.commentText;
-          const json = JSON.stringify(this.listForm);
-          this.$http.post("lawss/activiti/completeTask", {
-            taskIds: this.taskIds,
-            userId: this.userId,
-            json: json
-          }, {
-            _this: this
-          }, res => {
-            if (res.success) {
-              this.$message.success(res.message);
-              this.$router.push("/processCenter");
-            }
-          }, e => {
-          });
+      this.isSubmit = true;
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -537,7 +539,7 @@ export default {
         this.$refs.tree.setCheckedKeys([data.id]);
         this.roleRow = this.$refs.tree.getCheckedNodes()[0];
       }
-    },
+    }
   },
   computed: {
     listNoDataText() {
@@ -602,9 +604,9 @@ export default {
     height: calc(~'100% - 103px');
     overflow: auto;
 
-      .accessStandardsAndRegulations {
-        height: 100%;
-      }
+    .accessStandardsAndRegulations {
+      height: 100%;
+    }
   }
 
   .demo-drawer-content {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
index 36f43302f..29d7b0396 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
@@ -1,541 +1,545 @@
 <template>
-    <div class="xmpg2-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>
-        <div class="content" v-show="active === '1'">
-            <div style="flex: auto; overflow: auto">
-                <process-title>
-                    <template slot="title">基础信息</template>
-                </process-title>
-                <el-form
-                        :model="listForm"
-                        class="label-input-form prc-content-border"
-                        label-width="150px"
-                >
-                    <el-row :gutter="24">
-                        <el-col :span="24">
-                            <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="listForm.projectNumber"
-                                        placeholder="请输入项目编号"
-                                        disabled
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="listForm.projectName"
-                                        placeholder="请输入项目名称"
-                                        disabled
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-form>
-                <process-title style="margin-top:5px; margin-bottom: 5px">
-                    <template slot="title">填写信息</template>
-                </process-title>
-                <el-table
-                        :data="dataList"
-                        style="width: 100%; border: 1px solid #cccccc"
-                        row-key="standId"
-                        height="70%"
-                        border
-                        :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="standEnName"
-                            label="标准编号"
-                            width="180"
-                            fixed="left"
-                            align="center"
-                    >
-                      <template slot-scope="scope">
-                        <a v-if="scope.row.standYear" class="table-jump"
-                           @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber
-                          }}-{{ scope.row.standYear }}</a>
-                        <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
-                          {{ scope.row.standNumber }}</a>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                            prop="standName"
-                            fixed="left"
-                            width="180"
-                            align="center"
-                            label="标准名称"
-                    >
-                      <template slot-scope="scope">
-                        <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                            prop="itemsNum"
-                            align="center"
-                            width="200"
-                            label="条款号">
-                    </el-table-column>
-                    <el-table-column
-                            prop="itemsName"
-                            width="200"
-                            align="center"
-                            label="条款名称">
-                    </el-table-column>
-                    <el-table-column
-                            prop="xcxssrqgj"
-                            width="200"
-                            align="center"
-                            label="新车型实施日期">
-                        <template slot-scope="scope">
-                            <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                            prop="zccssrqgj"
-                            width="200"
-                            align="center"
-                            label="在产车实施日期">
-                        <template slot-scope="scope">
-                            <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                            prop="productType"
-                            align="center"
-                            label="在研产品">
-                        <el-table-column
-                                prop="complianceReasons"
-                                align="center"
-                                width="160"
-                                label="合规">
-                        </el-table-column>
-                        <el-table-column
-                                align="center"
-                                width="160"
-                                prop="researchNonCompliance"
-                                label="不合规">
-                            <el-table-column
-                                    prop="noCompliance"
-                                    align="center"
-                                    width="160"
-                                    label="不合规项目">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="countermeasures"
-                                    align="center"
-                                    width="160"
-                                    label="应对措施">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="completionTime"
-                                    align="center"
-                                    width="160"
-                                    label="完成时间">
-                                <template slot-scope="scope">
-                                    <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
-                                </template>
-                            </el-table-column>
-                        </el-table-column>
-                    </el-table-column>
-                    <el-table-column
-                            align="center"
-                            label="在产产品">
-                        <el-table-column
-                                prop="zcComplianceReasons"
-                                align="center"
-                                width="160"
-                                label="合规(具体情况)">
-                        </el-table-column>
-                        <el-table-column
-                                align="center"
-                                width="160"
-                                label="不合规">
-                            <el-table-column
-                                    prop="zcNoCompliance"
-                                    align="center"
-                                    width="160"
-                                    label="不合规项目">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="zcCountermeasures"
-                                    align="center"
-                                    width="160"
-                                    label="应对措施">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="zcCompletionTime"
-                                    align="center"
-                                    width="160"
-                                    label="完成时间">
-                                <template slot-scope="scope">
-                                    <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
-                                </template>
-                            </el-table-column>
-                        </el-table-column>
-                    </el-table-column>
-                    <el-table-column
-                            prop="workPeople"
-                            align="center"
-                            width="200"
-                            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" style="height: 100%">
-                <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>
-        <ProcessFooter
-                show-back
-                show-submit
-                :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
-                :approval="true"
-                @back="beforeBack"
-                @submit="handleSubmit"
-        >
-        </ProcessFooter>
+  <div class="xmpg2-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>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectNumber"
+                  placeholder="请输入项目编号"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectName"
+                  placeholder="请输入项目名称"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          style="width: 100%; border: 1px solid #cccccc"
+          row-key="standId"
+          height="70%"
+          border
+          :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="standEnName"
+            label="标准编号"
+            width="180"
+            fixed="left"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <a v-if="scope.row.standYear" class="table-jump"
+                 @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber
+                }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
+                {{ scope.row.standNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            fixed="left"
+            width="180"
+            align="center"
+            label="标准名称"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="itemsNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrqgj"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zccssrqgj"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            prop="workPeople"
+            align="center"
+            width="200"
+            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" style="height: 100%">
+        <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>
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
-    import ProcessHeader from "../../components/ProcessHeader";
-    import ProcessFooter from "../../components/ProcessFooter";
-    import ProcessTitle from "../../components/ProcessTitle";
-    import {inboundLiaisonDetail, queryDetail} from "api/process";
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
 
-    export default {
-        name: "xmpg2Step7",
-        components: {
-            ProcessTitle,
-            ProcessHeader,
-            ProcessFooter
-        },
-        data() {
-            return {
-                active: "1",
-                loading: false,
-                // 当前流程类型(1待办/2已办)
-                processType: 1,
-                isSubmit: false,
-                saveLoading: false,
-                //表单的数据
-                listForm: {
-                    ffFlag: " ", //1审批通过 其他为驳回
-                    projectNumber: "",  //项目编号
-                    projectName: "",  //项目名称
-                    dataList: [], //项目下的标准数据
-                    breakdownList: [] //标准下的分解单数据
-                },
-                dataList: [], //展示的标准数据
-                commentText: "", //审批意见
-                detailData: [],//流程历史数据
-                userId: this.$store.getters.userInfo.userId,
-                taskIds: this.$route.query.taskIds,
-                pId: this.$route.query.prcId
-            };
-        },
-        methods: {
-          // 点击查看
-          handlePreview(item) {
-            console.log(item)
-            let routeUrl = this.$router.resolve({
-              name: "OtherStandardDetails",
-              params: {
-                id: item.standId,
-                pageType: "INLAND_STAND"
-              }
-            });
-            window.open(routeUrl.href, "_blank");
-          },
-          //查询项目下的标准
-          getStandData() {
-            this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
-              standType: this.standardSearch.standType,
-              standNumber: this.standardSearch.standNumber,
-              page: this.pageNo,
-              pageSize: this.pageSizeNo
-            }, {
-              _this: this
-            }, res => {
-              this.standardData = res.data.list;
-              this.standardData.forEach(item => {
-                if(item.attrInfoMap === null){
-                  this.$set(item, "ZCCSSRQ", '');
-                  this.$set(item, "XCXSSRQ", '');
-                }else{
-                  this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-                  this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-                }
-              })
-              this.totalNo = res.data.count;
-            }, e => {
-            });
-          },
-            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 => {
-                });
-            },
-            //tab改变
-            handleTabs(type) {
-                this.active = type;
-            },
-            //获取数据
-            getData() {
-                return new Promise((resolve, reject) => {
-                    inboundLiaisonDetail({
-                        taskIds: this.taskIds,
-                        pId: this.pId
-                    }).then(res => {
-                        console.log(res.mesg)
-                        if (res) {
-                            const processForm = JSON.parse(res.mesg);
-                            this.getFormFieldList(processForm);
-                        }
-                    }).catch(e => {
-                    });
-                });
-            },
-            //动态表单读取
-            getFormFieldList(item) {
-                this.$nextTick(() => {
-                    this.listForm = JSON.parse(JSON.stringify(item));
-                    this.listForm.prcNum = this.prcNum;
-                    this.listForm.prcName = this.prcName;
-                    this.listForm["id"] = item.id;
-                    this.listForm.dataList = item.dataList;
-                    this.dataList = item.dataList;
-                    this.dataList.distributePerson = item.dataList[0].distributePerson;
-                    this.listForm.breakdownList = item.breakdownList;
-                });
-            },
-            //驳回事件
-            beforeBack() {
-                if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
-                    this.$message.warning('请填写审批意见')
-                } else {
-                    this.listForm.ffFlag = "2";
-                    this.listForm.commentText = this.commentText;
-                    const json = JSON.stringify(this.listForm);
-                    this.$http.post("lawss/activiti/completeTask", {
-                        taskIds: this.taskIds,
-                        userId: this.userId,
-                        json: json
-                    }, {
-                        _this: this
-                    }, res => {
-                        if (res.success) {
-                            this.$message.success(res.message);
-                            this.$router.push("/processCenter");
-                        }
-                    }, e => {
-                    });
-                }
-            },
-            //提交事件
-            handleSubmit() {
-                    this.listForm.ffFlag = "1";
-                    this.listForm.commentText = this.commentText;
-                    const json = JSON.stringify(this.listForm);
-                    this.$http.post("lawss/activiti/completeTask", {
-                        taskIds: this.taskIds,
-                        userId: this.userId,
-                        json: json
-                    }, {
-                        _this: this
-                    }, res => {
-                        if (res.success) {
-                            this.$message.success(res.message);
-                            this.$router.push("/processCenter");
-                        }
-                    });
-            },
-        },
-        computed: {
-            listNoDataText() {
-                return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
-            }
-        },
-        mounted() {
-            this.processTable();
-            this.getData();
-        },
+export default {
+  name: "xmpg2Step7",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      //表单的数据
+      listForm: {
+        ffFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId
     };
+  },
+  methods: {
+    // 点击查看
+    handlePreview(item) {
+      console.log(item);
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.standId,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    //查询项目下的标准
+    getStandData() {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
+        page: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
+        _this: this
+      }, res => {
+        this.standardData = res.data.list;
+        this.standardData.forEach(item => {
+          if (item.attrInfoMap === null) {
+            this.$set(item, "ZCCSSRQ", "");
+            this.$set(item, "XCXSSRQ", "");
+          } else {
+            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
+            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
+          }
+        });
+        this.totalNo = res.data.count;
+      }, e => {
+      });
+    },
+    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 => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          console.log(res.mesg);
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        this.listForm.prcNum = this.prcNum;
+        this.listForm.prcName = this.prcName;
+        this.listForm["id"] = item.id;
+        this.listForm.dataList = item.dataList;
+        this.dataList = item.dataList;
+        this.dataList.distributePerson = item.dataList[0].distributePerson;
+        this.listForm.breakdownList = item.breakdownList;
+      });
+    },
+    //驳回事件
+    beforeBack() {
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
+        this.$message.warning("请填写审批意见");
+      } else {
+        this.listForm.ffFlag = "2";
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
+    },
+    //提交事件
+    handleSubmit() {
+      this.isSubmit = true;
+      this.listForm.ffFlag = "1";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      });
+    }
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  }
+};
 </script>
 
 <style lang="less" scoped>
-    @import '~@/assets/styles/style';
+@import '~@/assets/styles/style';
 
-    .xmpg2-step7 {
-        /deep/ .el-drawer__container {
-            .prc-content-border {
-                border: none;
-                padding: 0 20px 0;
-            }
-        }
-
-        .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%;
-                }
-            }
-        }
-
-        .demo-drawer-content {
-            margin-top: 10px;
-        }
+.xmpg2-step7 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
     }
+  }
+
+  .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%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
index ac0b3d801..e3bdd9493 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
@@ -433,6 +433,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.isSubmit = true;
         this.listForm.jgFlag = "1";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -447,6 +448,7 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
+          this.isSubmit = false;
         }, e => {
         });
     },
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
index a4f75f956..605a15c74 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
@@ -43,25 +43,25 @@
           <template slot="title">填写信息</template>
         </process-title>
         <el-table
-                :data="dataList"
-                style="width: 100%; border: 1px solid #cccccc"
-                row-key="standId"
-                height="70%"
-                border
-                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          :data="dataList"
+          style="width: 100%; border: 1px solid #cccccc"
+          row-key="standId"
+          height="70%"
+          border
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
           fontWeight: 'bold', height: '48px'}"
         >
           <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
+            type="selection"
+            width="55"
+            align="center">
           </el-table-column>
           <el-table-column
-                  prop="standEnName"
-                  label="标准编号"
-                  width="180"
-                  fixed="left"
-                  align="center"
+            prop="standEnName"
+            label="标准编号"
+            width="180"
+            fixed="left"
+            align="center"
           >
             <template slot-scope="scope">
               <a v-if="scope.row.standYear" class="table-jump"
@@ -72,126 +72,128 @@
             </template>
           </el-table-column>
           <el-table-column
-                  prop="standName"
-                  fixed="left"
-                  width="180"
-                  align="center"
-                  label="标准名称"
+            prop="standName"
+            fixed="left"
+            width="180"
+            align="center"
+            label="标准名称"
           >
             <template slot-scope="scope">
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="itemsNum"
-                  align="center"
-                  width="200"
-                  label="条款号">
+            prop="itemsNum"
+            align="center"
+            width="200"
+            label="条款号">
           </el-table-column>
           <el-table-column
-                  prop="itemsName"
-                  width="200"
-                  align="center"
-                  label="条款名称">
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
           </el-table-column>
           <el-table-column
-                  prop="xcxssrqgj"
-                  width="200"
-                  align="center"
-                  label="新车型实施日期">
+            prop="xcxssrqgj"
+            width="200"
+            align="center"
+            label="新车型实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="zccssrqgj"
-                  width="200"
-                  align="center"
-                  label="在产车实施日期">
+            prop="zccssrqgj"
+            width="200"
+            align="center"
+            label="在产车实施日期">
             <template slot-scope="scope">
               <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
-                  prop="productType"
-                  align="center"
-                  label="在研产品">
+            prop="productType"
+            align="center"
+            label="在研产品">
             <el-table-column
-                    prop="complianceReasons"
-                    align="center"
-                    width="160"
-                    label="合规">
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
             </el-table-column>
             <el-table-column
-                    align="center"
-                    width="160"
-                    prop="researchNonCompliance"
-                    label="不合规">
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
               <el-table-column
-                      prop="noCompliance"
-                      align="center"
-                      width="160"
-                      label="不合规项目">
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
               </el-table-column>
               <el-table-column
-                      prop="countermeasures"
-                      align="center"
-                      width="160"
-                      label="应对措施">
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
               </el-table-column>
               <el-table-column
-                      prop="completionTime"
-                      align="center"
-                      width="160"
-                      label="完成时间">
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
           <el-table-column
-                  align="center"
-                  label="在产产品">
+            align="center"
+            label="在产产品">
             <el-table-column
-                    prop="zcComplianceReasons"
-                    align="center"
-                    width="160"
-                    label="合规(具体情况)">
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
             </el-table-column>
             <el-table-column
-                    align="center"
-                    width="160"
-                    label="不合规">
+              align="center"
+              width="160"
+              label="不合规">
               <el-table-column
-                      prop="zcNoCompliance"
-                      align="center"
-                      width="160"
-                      label="不合规项目">
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
               </el-table-column>
               <el-table-column
-                      prop="zcCountermeasures"
-                      align="center"
-                      width="160"
-                      label="应对措施">
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
               </el-table-column>
               <el-table-column
-                      prop="zcCompletionTime"
-                      align="center"
-                      width="160"
-                      label="完成时间">
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
                 <template slot-scope="scope">
-                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
+                    }}</span>
                 </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
-            <el-table-column
-                    prop="workPeople"
-                    align="center"
-                    width="200"
-                    label="责任人">
-            </el-table-column>
+          <el-table-column
+            prop="workPeople"
+            align="center"
+            width="200"
+            label="责任人">
+          </el-table-column>
         </el-table>
       </div>
       <div>
@@ -351,14 +353,14 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if(item.attrInfoMap === null){
-            this.$set(item, "ZCCSSRQ", '');
-            this.$set(item, "XCXSSRQ", '');
-          }else{
+          if (item.attrInfoMap === null) {
+            this.$set(item, "ZCCSSRQ", "");
+            this.$set(item, "XCXSSRQ", "");
+          } else {
             this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
             this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
           }
-        })
+        });
         this.totalNo = res.data.count;
       }, e => {
       });
@@ -410,9 +412,9 @@ export default {
     },
     //驳回事件
     beforeBack() {
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
-        this.$message.warning('请填写审批意见')
-      }else{
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
+        this.$message.warning("请填写审批意见");
+      } else {
         this.listForm.gcFlag = "2";
         this.listForm.commentText = this.commentText;
         const json = JSON.stringify(this.listForm);
@@ -433,23 +435,25 @@ export default {
     },
     //提交事件
     handleSubmit() {
-        this.listForm.gcFlag = "1";
-        this.listForm.commentText = this.commentText;
-        const json = JSON.stringify(this.listForm);
-        this.$http.post("lawss/activiti/completeTask", {
-          taskIds: this.taskIds,
-          userId: this.userId,
-          json: json
-        }, {
-          _this: this
-        }, res => {
-          if (res.success) {
-            this.$message.success(res.message);
-            this.$router.push("/processCenter");
-          }
-        }, e => {
-        });
-    },
+      this.isSubmit = true;
+      this.listForm.gcFlag = "1";
+      this.listForm.commentText = this.commentText;
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
+    }
   },
   computed: {
     listNoDataText() {

From 35a65d706e30a6c8117c9a77d174f6ab6548e99d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 12 Aug 2021 16:22:36 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regulatoryRepository/localProductsOrProjectLibrary/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 03ea3ab2f..1552eadb4 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -1082,7 +1082,6 @@ export default {
       this.localProTableSearch = { ...this.localProTableSearchDefault };
       this.projectLibrarySearch = { ...this.projectLibrarySearchDefault };
       this.localProTableSearch.page = 1;
-      this.isAdvancedSearch = false;
       this.getLocalProductTable();
     },
     resolveTime(data) {

From a1ed68234339fcf5e960954c1e5c851b6305682b Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 12 Aug 2021 16:37:32 +0800
Subject: [PATCH 09/10] feat: There is no way the buss!!

---
 .../pages/attributeCustom/components/buss.vue |   4 +-
 .../components/EnterpriseStandardDatabase.vue | 106 +++++++++++++++++-
 2 files changed, 105 insertions(+), 5 deletions(-)

diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue
index 1f2288f06..2e544ce8b 100644
--- a/src/pages/config/pages/attributeCustom/components/buss.vue
+++ b/src/pages/config/pages/attributeCustom/components/buss.vue
@@ -2,8 +2,8 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="'7UARYUBX8J8BX3ELZDH2'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
-      <el-button class="common-button-default" size="mini" v-btn-permission="'8QSDDR8R7UMDS9S6M2HU'" @click="showDisplayLocationDialog" >展示区域管理</el-button>
+      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
+      <el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog" >展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 2cdf2e30f..d7bcc80e6 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -4,18 +4,25 @@
 <!--左侧树-->
     <div class="tree-content" :class="{ 'tree-closed': sideClose }" >
       <div class="tree">
+          <el-input
+                  placeholder="输入树状图体系"
+                  v-model="filterText">
+          </el-input>
           <el-tree
                   ref="tree"
                   node-key="id"
-                  class="filter-tree"
+                  class="tree-line"
+                  icon-class="icon-tree"
+                  :indent="0"
                   :props="props"
                   :data="treeList"
                   highlight-current
                   @node-click="treeClick"
+                  :filter-node-method="filterNode"
                   default-expand-all
                   :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
-                        <span> {{ node.label}} </span>
+                        <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label}} </span>
                         <span>
                           <el-button
                                   type="text"
@@ -1021,6 +1028,7 @@ export default {
             // 唯一辨识
             dicId: ""
         },
+      filterText: '', // 企业标准库过滤
       treeList: [],
       standId: '',
       visibleOrgTable: false,
@@ -3434,7 +3442,11 @@ export default {
       }
     }
   },
-  watch: {},
+  watch: {
+      filterText(val) {
+          this.$refs.tree.filter(val);
+      }
+  },
   computed: {
     // 是否拥有拖拽权限
     hasPermissionDrag () {
@@ -3491,6 +3503,94 @@ export default {
 }
 </script>
 
+<style lang="less" scoped>
+    /deep/ .icon-tree {
+        margin:0  5px 0 10px;
+        position:relative;
+        background:url('~@/assets/images/shangqi/img/tree-add.png');
+        background-size:100% 100%;
+    }
+    /deep/ .expanded{
+        background:url('~@/assets/images/shangqi/img/tree-sub.png');
+        background-size:100% 100%;
+    }
+    /deep/ .is-leaf{
+        background-image:none;
+        background-size:100% 100%;
+    }
+    /deep/ .is-leaf-none{
+        position: relative;
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background:url('~@/assets/images/shangqi/img/none-file.png');
+        background-size:100% 100%;
+    }
+    /deep/ .is-show{
+        position: relative;
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background:url('~@/assets/images/shangqi/img/tree.png');
+        background-size:100% 100%;
+    }
+    /deep/.tree-line{
+        .el-tree-node {
+            position: relative;
+            padding-left: 0px; // 缩进量
+            line-height: 30px;
+        }
+        .el-tree-node__children {
+            padding-left: 16px; // 缩进量
+        }
+
+        // 竖线
+        .el-tree-node::before {
+            content: "";
+            height: 100%;
+            width: 1px;
+            position: absolute;
+            left: -3px;
+            top: -26px;
+            border-width: 1px;
+            border-left: 1px dashed #858990e0;
+        }
+        // 当前层最后一个节点的竖线高度固定
+        .el-tree-node:last-child::before {
+            height: 38px; // 可以自己调节到合适数值
+        }
+
+        // 横线
+        .el-tree-node::after {
+            content: "";
+            width: 11px;
+            height: 20px;
+            position: absolute;
+            left: -3px;
+            top: 12px;
+            border-width: 1px;
+            border-top: 1px dashed #858990e0;
+        }
+
+        // 去掉最顶层的虚线，放最下面样式才不会被上面的覆盖了
+        & > .el-tree-node::after {
+            border-top: none;
+        }
+        & > .el-tree-node::before {
+            border-left: none;
+        }
+
+        // 展开关闭的icon
+        .el-tree-node__expand-icon{
+            font-size: 16px;
+            // 叶子节点（无子节点）
+            &.is-leaf{
+                color: transparent;
+                // display: none; // 也可以去掉
+            }
+        }
+    }
+</style>
 <style  lang="less" scoped>
   @import '~@/assets/styles/mixins';
   @import '~@/assets/styles/style';

From b6aed9adf46774119cea7bab39ddeba25d7d8e75 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 12 Aug 2021 17:49:50 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86,=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2,=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=85=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 110 ++++++++++--------
 .../foreignStandardsAndRegulations/index.vue  |  75 +++++++-----
 2 files changed, 111 insertions(+), 74 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 0201692f1..ae3f5ce8c 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1324,8 +1324,8 @@
               </el-select>
             </el-form-item>
             <!--            是否纳入标准清单-->
-            <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
-              <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
+            <el-form-item  label="是否纳入标准清单" class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.isRelateAccess"  placeholder="根据是否纳入标准清单查找">
                 <el-option value="yes" label="是"></el-option>
                 <el-option value="no" label="否"></el-option>
               </el-select>
@@ -1333,7 +1333,7 @@
             <!--            实施日期-->
             <el-form-item label="实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.putTime"
+                  v-model="sarStandardsSearch.ssrq"
                   type="date"
                   placeholder="根据实施日期查找">
               </el-date-picker>
@@ -1341,7 +1341,7 @@
             <!--            新车型实施日期-->
             <el-form-item title="新车型实施日期" label="新车型实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.XCXTime"
+                  v-model="sarStandardsSearch.xcxssrq"
                   type="date"
                   placeholder="根据新车型实施日期查找">
               </el-date-picker>
@@ -1349,14 +1349,14 @@
             <!--            在产车实施日期-->
             <el-form-item title="在产车实施日期" label="在产车实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.ZCCTime"
+                  v-model="sarStandardsSearch.zccssrq"
                   type="date"
                   placeholder="根据在产车实施日期查找">
               </el-date-picker>
             </el-form-item>
             <!--            归口管理部门-->
             <el-form-item label="归口管理部门">
-              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"
+              <el-input v-model="sarStandardsSearch.gkglbm" clearable placeholder="根据归口管理部门查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            起草单位-->
@@ -1368,7 +1368,7 @@
             </el-form-item>
             <!--            我司参与深度-->
             <el-form-item label="我司参与深度">
-              <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
+              <el-select v-model="sarStandardsSearch.wscysd" placeholder="请选择我司参与深度" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
@@ -1376,14 +1376,14 @@
 
             <!--            能源类型-->
             <el-form-item label="能源类型">
-              <el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable
+              <el-select v-model="sarStandardsSearch.nylx" placeholder="请选择能源类型" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
             <!--            适用车型-->
             <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+              <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
@@ -1397,9 +1397,9 @@
             </el-form-item>
             <!--            适用认证-->
             <el-form-item label="适用认证">
-              <el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable
+              <el-select v-model="sarStandardsSearch.syrz" placeholder="根据适用认证查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
             <!--            责任部门-->
@@ -1411,7 +1411,7 @@
             </el-form-item>
             <!--            责任工程师-->
             <el-form-item label="责任工程师">
-              <el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable
+              <el-select v-model="sarStandardsSearch.zrgcs" placeholder="根据责任工程师查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
@@ -1424,7 +1424,7 @@
             </el-form-item>
             <!--            代替标准号-->
             <el-form-item label="代替标准号">
-              <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"
+              <el-input v-model="sarStandardsSearch.dtbjh" clearable placeholder="根据代替标准号查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            关联模块-中文名称-->
@@ -1435,23 +1435,23 @@
             </el-form-item>
             <!--            采标编号-->
             <el-form-item label="采标编号" prop="nameShow">
-              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"
+              <el-input v-model="sarStandardsSearch.cbbh" clearable placeholder="根据采标编号查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            采标程度-->
             <el-form-item label="采标程度" prop="standNumber">
-              <el-input v-model="sarStandardsSearch.standNumber" clearable
+              <el-input v-model="sarStandardsSearch.cbcd" clearable
                         placeholder="根据采标程度查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            引用标准-->
             <el-form-item label="引用标准">
-              <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"
+              <el-input v-model="sarStandardsSearch.yybj" clearable placeholder="根据引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            被引用标准-->
             <el-form-item label="被引用标准">
-              <el-input v-model="sarStandardsSearch.citedStand" clearable
+              <el-input v-model="sarStandardsSearch.byybj" clearable
                         placeholder="根据被引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
@@ -1463,6 +1463,23 @@
                 </el-option>
               </el-select>
             </el-form-item>
+
+            <!--            标记-->
+            <!--            标签-->
+            <el-form-item label="标签">
+              <el-input v-model="sarStandardsSearch.gxhbq" clearable
+                        placeholder="根据被标签查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+
+
+            <!--            体系类别-->
+            <el-form-item label="体系类别">
+              <el-select v-model="sarStandardsSearch.txlb" placeholder="根据体系类别查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
           </el-form>
         </div>
         <div class="demo-drawer-footer">
@@ -1704,35 +1721,36 @@ export default {
         validFlag: '0',
         menuId: '',
         country: '',
-        standNumber: '', // 标准编号
-        standName: '', // 标准名称
-        standState: '', // 标准状态
-        issueTime: '', // 标准发布日期
-        svpps: '', // 关联模块-VPPS编码
-        replaceStandNum: '', // 代替标准号
-        replacedStandNum: '',  // 	被代替标准号
-        replacePartStandNum: '', // 代替标准号
-        replacedPartStandNum: '',  // 	被代替标准号
-        citeStand: '',  // 	引用标准
-        citedStand: '',  // 	被引用标准
+        standNumber: '',//标准编号
+        standName: '',//标准名称
+        standState: '',
+        standNature: '',//标准性质
+        issueTime: '',//标准发布时间
+        // applyArctic: '',
+        dtbjh: '',//代替标准号
+        // replaceStandNumCope: '',
+        // replaceStandNumList: [],
+        replacedStandNum: '',
         synopsis: '', // 内容摘要
-        applyArctic: '', // 适用车型
-        sycpx: '', // 适用产品线
-        syzr: '', // 适用认证
-        zrbm: '', // 责任部门
-        dutyEngineer: '', // 责任工程师
+        // category: '', // 所属类别
         standSort: '', // 标准类别
-        standYear: '', // 标准年份
-        standEnName: '', // 标准英文名称
-        standNature: '', // 标准性质
-        putTime: '', // 实施日期
-        isRelateAccess: '', // 是否纳入标准清单
-        // nameShow: '', // 我司参与深度
-        qcdw: '', // 起草单位
-        nameShow: '', // 归口管理部门
-        ZCCTime: '', // 在产车实施日期
-        XCXTime: '', // 新车型实施日期
-        energyKind: '', // 能源类型
+        txlbOption:'', //标准体系
+        gxhbq:'', //标签
+        wscysd:'', //我司参与深度
+        gkglbm:'', //归口管理部门
+        ssrq:'',//实施日期
+        scxssrq:''//新车型实施日期
+        ,zccssrq:''//在产车实施日期
+        ,qcdw:''//起草单位
+        ,nylx:''//能源类型
+        ,cllx:''//适用车型
+        ,syrz:''//适用认证
+        ,zrgcs:''//责任工程师
+        ,cbbh:''//采标编号
+        ,cbcd:''//采标程度
+        ,yybj:''//引用标准
+        ,byybj:''//被引用标准
+        ,txlb:''//体系类别
       }, // 分页查询过程中用到的对象
       // 树形结构
       // tree function
@@ -4720,7 +4738,7 @@ export default {
         this.standNatureOptions = res.data.SARPROPERTY // 标准性质
         this.standStateOptions = res.data.WBZTCLASS // 文本状态
         this.standSystemOptions = res.data.BZTXCLASS // 标准体系
-        this.applyArcticOptions = res.data.SYCXCLASS // 适用车型
+        this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
         this.categoryOptions = res.data.NYLXCLASS // 能源类型
         this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
         this.cysdOptions = res.data.WSCYSD // 我司参与深度
@@ -4733,7 +4751,7 @@ export default {
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.syzrOptions = res.data.SYRZCLASS // 适用认证
+      this.syrzOptions = res.data.SYRZCLASS // 适用认证
       this.getGzzOption()
       this.setMap(this.standStateOptions)
     }, e => {
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 24b3fa028..dd6c766d3 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -400,7 +400,7 @@
             <!--            实施日期-->
             <el-form-item label="实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.putTime"
+                  v-model="sarStandardsSearch.ssrq"
                   type="date"
                   placeholder="根据实施日期查找">
               </el-date-picker>
@@ -408,7 +408,7 @@
             <!--            新车型实施日期-->
             <el-form-item title="新车型实施日期" label="新车型实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.XCXTime"
+                  v-model="sarStandardsSearch.xcxssrq"
                   type="date"
                   placeholder="根据新车型实施日期查找">
               </el-date-picker>
@@ -416,14 +416,14 @@
             <!--            在产车实施日期-->
             <el-form-item title="在产车实施日期" label="在产车实施日期">
               <el-date-picker
-                  v-model="sarStandardsSearch.ZCCTime"
+                  v-model="sarStandardsSearch.zccssrq"
                   type="date"
                   placeholder="根据在产车实施日期查找">
               </el-date-picker>
             </el-form-item>
             <!--            归口管理部门-->
             <el-form-item label="归口管理部门">
-              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"
+              <el-input v-model="sarStandardsSearch.gkglbm" clearable placeholder="根据归口管理部门查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            起草单位-->
@@ -437,20 +437,20 @@
             <el-form-item label="我司参与深度">
               <el-select v-model="sarStandardsSearch.wscysd" placeholder="请选择我司参与深度" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in wscysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
 
             <!--            能源类型-->
             <el-form-item label="能源类型">
-              <el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable
+              <el-select v-model="sarStandardsSearch.nylx" placeholder="请选择能源类型" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
             <!--            适用车型-->
             <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+              <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
@@ -464,9 +464,9 @@
             </el-form-item>
             <!--            适用认证-->
             <el-form-item label="适用认证">
-              <el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable
+              <el-select v-model="sarStandardsSearch.syrz" placeholder="根据适用认证查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
             <!--            责任部门-->
@@ -478,7 +478,7 @@
             </el-form-item>
             <!--            责任工程师-->
             <el-form-item label="责任工程师">
-              <el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable
+              <el-select v-model="sarStandardsSearch.zrgcs" placeholder="根据责任工程师查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
@@ -491,7 +491,7 @@
             </el-form-item>
             <!--            代替标准号-->
             <el-form-item label="代替标准号">
-              <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"
+              <el-input v-model="sarStandardsSearch.dtbjh" clearable placeholder="根据代替标准号查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            关联模块-中文名称-->
@@ -502,23 +502,23 @@
             </el-form-item>
             <!--            采标编号-->
             <el-form-item label="采标编号" prop="nameShow">
-              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"
+              <el-input v-model="sarStandardsSearch.cbbh" clearable placeholder="根据采标编号查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            采标程度-->
             <el-form-item label="采标程度" prop="standNumber">
-              <el-input v-model="sarStandardsSearch.standNumber" clearable
+              <el-input v-model="sarStandardsSearch.cbcd" clearable
                         placeholder="根据采标程度查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            引用标准-->
             <el-form-item label="引用标准">
-              <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"
+              <el-input v-model="sarStandardsSearch.yybj" clearable placeholder="根据引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
             <!--            被引用标准-->
             <el-form-item label="被引用标准">
-              <el-input v-model="sarStandardsSearch.citedStand" clearable
+              <el-input v-model="sarStandardsSearch.byybj" clearable
                         placeholder="根据被引用标准查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
@@ -534,7 +534,7 @@
 <!--            标记-->
             <!--            标签-->
             <el-form-item label="标签">
-              <el-input v-model="sarStandardsSearch.tag" clearable
+              <el-input v-model="sarStandardsSearch.gxhbq" clearable
                         placeholder="根据被标签查找"
                         @keyup.enter.native="btnSearch"></el-input>
             </el-form-item>
@@ -542,7 +542,7 @@
 
             <!--            体系类别-->
             <el-form-item label="体系类别">
-              <el-select v-model="sarStandardsSearch.txlbOption" placeholder="根据体系类别查找" clearable
+              <el-select v-model="sarStandardsSearch.txlb" placeholder="根据体系类别查找" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
@@ -1433,13 +1433,13 @@ export default {
         validFlag: '0',
         menuId: '',
         country: '',
-        standNumber: '',
-        standName: '',
+        standNumber: '',//标准编号
+        standName: '',//标准名称
         standState: '',
-        standNature: '',
-        issueTime: '',
+        standNature: '',//标准性质
+        issueTime: '',//标准发布时间
         // applyArctic: '',
-        replaceStandNum: '',
+        dtbjh: '',//代替标准号
         // replaceStandNumCope: '',
         // replaceStandNumList: [],
         replacedStandNum: '',
@@ -1447,8 +1447,22 @@ export default {
         // category: '', // 所属类别
         standSort: '', // 标准类别
         txlbOption:'', //标准体系
-        tag:'', //标签
-        wscysd:'' //我司参与深度
+        gxhbq:'', //标签
+        wscysd:'', //我司参与深度
+        gkglbm:'', //归口管理部门
+        ssrq:'',//实施日期
+        scxssrq:''//新车型实施日期
+        ,zccssrq:''//在产车实施日期
+        ,qcdw:''//起草单位
+        ,nylx:''//能源类型
+        ,cllx:''//适用车型
+        ,syrz:''//适用认证
+        ,zrgcs:''//责任工程师
+        ,cbbh:''//采标编号
+        ,cbcd:''//采标程度
+        ,yybj:''//引用标准
+        ,byybj:''//被引用标准
+        ,txlb:''//体系类别
 
       }, // 分页查询过程中用到的对象
       loading: false,
@@ -1505,8 +1519,10 @@ export default {
       categoryConfigOptions: [], // 所属类别下拉框
       assemClassOptions: [], // 总成分类下拉框
       standAttributeList: [],
-      qcdwOptions:[],//起草单位
-      wscysdOptions:[], //我司参与深度
+      qcdwOptions:[],//起草单位下拉框
+      cysdOptions:[], //我司参与深度下拉框
+      nylxOptions:[],//能源类型下拉框
+      syrzOptions:[],//适用认证下拉框
       // 树形结构
       // tree function
       MoveTest: '',
@@ -4299,14 +4315,17 @@ export default {
       this.txlbOptions = res.data.TXLBCLASS // 体系类别
       this.countryOptions = res.data.COUNTRY
       this.regionOptions = res.data.REGION // 区域
-      this.applyArcticOptions = res.data.PRODUCTTYPE // 根据需求文档，产品类别对应标准属性中的“适用车型”
+      this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型”
       this.adoptExtentOptions = res.data.DEGREESTANDARD
       this.emergyKindOptions = res.data.ENERGYTYPES
       this.assemClassOptions = res.data.ASSEMCLASSIFY // 总成分类
       this.categoryConfigOptions = res.data.CATEGORY
       this.standAttributeList = res.data.RULETYPE
       this.qcdwOptions = res.data.QCDW
-      this.wscysdOptions=res.data.WSCYSD;
+      this.cysdOptions=res.data.WSCYSD;
+      this.nylxOptions=res.data.NYLXCLASS;//能源类型
+      this.syrzOptions=res.data.SYRZCLASS;//适用认证
+
       this.getGzzOption()
       this.setMap(this.standStateOptions)
     }, e => {