From 9f4768eb28d50f8e770dda28a3ce54ae5056e1c8 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Fri, 6 Aug 2021 17:13:24 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BA=93--=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=20=E9=99=A4?=
 =?UTF-8?q?=E4=BA=86=E6=97=B6=E9=97=B4=20=E5=85=B6=E4=BB=96=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=9B=9E=E6=98=BE=E7=9A=84=E5=86=85=E5=AE=B9=E5=81=9A?=
 =?UTF-8?q?=E6=88=90=E6=82=AC=E6=B5=AE=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localProductsOrProjectLibrary/pages/details.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 5e825cfc8..377f873c3 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -12,8 +12,14 @@
           <el-row style="margin-top: 10px">
             <el-col :span="5">产品平台: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
             <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
-            <el-col :span="5" :push="2">项目名称: <span class="valueColor">{{ localProEO.projectName }}</span></el-col>
-            <!--          <el-col :span="5" :push="2">车型系列:<span class="valueColor">{{ localProEO.productSet }}</span></el-col>-->
+            <el-col :span="5" :push="2">
+              <el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
+                <div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">{{ localProEO.projectName }}</div>
+                <div v-else></div>
+                <div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">项目名称: <span class="valueColor">{{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}</span></div>
+                <div class="check-item-value" v-else>项目名称: <span class="valueColor">{{localProEO.projectName}}</span></div>
+              </el-tooltip>
+            </el-col>
             <el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
             </el-col>
           </el-row>
@@ -449,7 +455,7 @@ export default {
           let deleteTagList = []
           this.selectList1.forEach(item => {
             //项目id-标准id,项目id-标准id
-            deleteTagList.push( this.proId + '-' + item )
+            deleteTagList.push(this.proId + '-' + item)
           })
           this.id = deleteTagList.join(',')
           this.$http.post('sarStandProjectLibrary/deleteByIds', {
@@ -726,6 +732,7 @@ export default {
         this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
         this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
         this.setMap(this.textStatusMap, res.data.WBZTCLASS)
+        console.log(this.getLocalPro)
         this.showLocalProductData(this.getLocalPro)
       }, e => {
       })

From 600c5f6d62ccd8ef60537c9d2f428c4890157ab2 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Sun, 8 Aug 2021 15:20:31 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index 22836fdde..8db39fdaf 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -39,7 +39,7 @@
           <div class="action-bar">
             <el-button v-btn-permission="'SRE2ZRX3MJSSH5YYLRGH'"  size="mini" @click="importItemInfo" ><i class="iconfont">&#xe6de;</i>导入</el-button>
             <el-button v-btn-permission="''"   size="mini" @click="exportItemInfo"><i class="iconfont">&#xe6e9;</i>导出</el-button>
-            <el-button v-btn-permission="''"   size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>
+<!--            <el-button v-btn-permission="''"   size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>-->
             <el-button v-btn-permission="'QULWGFSB3NMP84REU7BP'"   size="mini" @click="uploadImportModal"><i class="iconfont">&#xe825;</i>模板下载</el-button>
             <el-button v-btn-permission="''"   size="mini" @click="batchCopy">批量复制</el-button>
             <el-button v-btn-permission="'TE39XUT4KRTPZGQH5KLF'"   size="mini" @click="combineItems">合并条款</el-button>

From 3ee0a71810467fcbea979521f49caf2d365876cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 8 Aug 2021 15:43:14 +0800
Subject: [PATCH 03/14] commit

---
 src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue | 1 -
 src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue | 4 +++-
 src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue | 3 ---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
index c5656481f..8f1fdd0e5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
@@ -370,7 +370,6 @@ export default {
       if(this.peopleFlag === true){
         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,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index 39e39eeb9..dce551cfb 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -64,7 +64,7 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="standEnName"
+            prop="standNumber"
             label="标准号"
           >
             <template slot-scope="scope">
@@ -333,6 +333,8 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.dataList = item.dataList;
+        console.log(this.dataList);
+        // this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear
         let children = [];
         item.breakdownList.forEach(
           item => {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 77e823203..603619f15 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -400,7 +400,6 @@ export default {
   methods: {
     // 点击查看
     handlePreview(item) {
-      console.log(item)
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
@@ -471,13 +470,11 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        console.log(this.listForm)
         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;
-        console.log(this.dataList)
       });
     },
     //保存事件

From 059ce00b8b29708f752bf70df1003ebf9122987f Mon Sep 17 00:00:00 2001
From: song2048 <2639528268@qq.com>
Date: Sun, 8 Aug 2021 16:07:32 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomFormComponents/File.vue        |  1 +
 src/components/navMenu/index.vue                    |  5 +++++
 src/pages/regulatoryRepository/dataStatis/index.vue | 13 +++++++++++++
 src/router/index.js                                 | 12 ++++++++++++
 4 files changed, 31 insertions(+)
 create mode 100644 src/pages/regulatoryRepository/dataStatis/index.vue

diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue
index 611f46333..f21179876 100644
--- a/src/components/CustomFormComponents/File.vue
+++ b/src/components/CustomFormComponents/File.vue
@@ -43,6 +43,7 @@
             :class="{'disabled': disabled}"
             multiple
             drag
+
             :show-file-list="showUploadlist"
             :on-success="uploadSuccess"
             :before-upload="beforeUpload"
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 5f429c122..1feddb37c 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -88,6 +88,11 @@ export default {
               path: '/domesticStandardsAndRegulations',
               menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
             },
+            {
+              title: '标准法规工作组数据统计',
+              path: '/dataStatisComments',
+              menuId: ''
+            },
             {
               title: '海外标准法规',
               path: '/foreignStandardsAndRegulations',
diff --git a/src/pages/regulatoryRepository/dataStatis/index.vue b/src/pages/regulatoryRepository/dataStatis/index.vue
new file mode 100644
index 000000000..3ada7755b
--- /dev/null
+++ b/src/pages/regulatoryRepository/dataStatis/index.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "dataStatisComments"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 590a4b6f0..95ce6e580 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1097,6 +1097,18 @@ const routes = [
           menuId: 'A59EFAQ7AC'
         }
       },
+      //标准法规工作组数据统计
+      {
+        path: '/dataStatisComments',
+        name: 'dataStatisComments',
+        component: () =>
+            import('@/pages/regulatoryRepository/dataStatis/index'),
+        meta: {
+          requireAuth: true,
+          title: '标准法规工作组数据统计',
+          menuId: ''
+        }
+      },
       // 标准征求意见
       {
         path: '/standardForComments',

From 7c914758c03fba80f837ce61d9ffd4405eda9d6a Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sun, 8 Aug 2021 16:20:35 +0800
Subject: [PATCH 05/14] feat: There is no way the

---
 .../searchCenter/pages/standardSearch.vue     | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 445de500b..4f964875a 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -973,7 +973,7 @@
                                     option.title = '监管类型'
                                     option.index = 12
                                     break
-                                case 'CYSDXX':
+                                case 'WSCYSD':
                                     option.title = '我司参与深度'
                                     option.index = 13
                                     break
@@ -1003,6 +1003,7 @@
                             })
                         }
                         this.searchOriginOptions = this.searchOptions
+                        console.log(this.searchOriginOptions)
                         this.saveAllSortOptions = res.data.STANDCLASSIFY
                         this.saveAllFineOptions = res.data.BUSSFINECLASSSHOW
                         this.lawssStateOptions = res.data.LAWSSTATE // 文本状态数组
@@ -1027,20 +1028,20 @@
                             filterOptions.standSort = originOptions.standSort
                             filterOptions.standSort.index = 1
                             //  标准状态
-                            filterOptions.standState = originOptions.standState
-                            filterOptions.standState.title = '标准状态'
-                            filterOptions.standState.index = 2
+                            // filterOptions.standState = originOptions.standState
+                            // filterOptions.standState.title = '标准状态'
+                            // filterOptions.standState.index = 2
                             // 我司参与状态
                             filterOptions.CYSD = originOptions.CYSD
                             filterOptions.CYSD.title = '我司参与深度'
-                            filterOptions.CYSD.index = 3
+                            filterOptions.CYSD.index = 2
                             //  监管类型
-                            filterOptions.ZRLX = originOptions.ZRLX
-                            filterOptions.ZRLX.title = '监管类型'
-                            filterOptions.ZRLX.index = 4
+                            // filterOptions.ZRLX = originOptions.ZRLX
+                            // filterOptions.ZRLX.title = '监管类型'
+                            // filterOptions.ZRLX.index = 4
                             //  适用车辆类型
                             filterOptions.CLLX = originOptions.CLLX
-                            filterOptions.CLLX.index = 5
+                            filterOptions.CLLX.index = 3
                             //  采标程度
                             // filterOptions.CBCD = originOptions.CBCD
                             // filterOptions.CBCD.index = 6
@@ -1322,7 +1323,7 @@
                         return 'bussBigClass'
                     case 'ACCESSTYPE':
                         return 'ZRLX'
-                    case 'CYSDXX':
+                    case 'WSCYSD':
                         return 'CYSD'
                     default:
                         return key

From 6770fad07b49ccd02f5d4e19931f4b54337c4d87 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 8 Aug 2021 16:29:59 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9B=B6=E9=83=A8?=
 =?UTF-8?q?=E4=BB=B6=E7=BC=96=E5=8F=B7=E7=94=B3=E8=AF=B7=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue                    |  5 +++++
 .../regulatoryRepository/partCodeApply/index.vue    | 13 +++++++++++++
 src/router/index.js                                 | 12 ++++++++++++
 src/sysConfig/index.js                              |  4 ++--
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/regulatoryRepository/partCodeApply/index.vue

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index b68a266c5..ba0dfdad9 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -88,6 +88,11 @@ export default {
               path: '/domesticStandardsAndRegulations',
               menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
             },
+            {
+              title: '零部件编号申请',
+              path: '/partCodeApply',
+              menuId: ''
+            },
             {
               title: '标准法规工作组数据统计',
               path: '/dataStatisComments',
diff --git a/src/pages/regulatoryRepository/partCodeApply/index.vue b/src/pages/regulatoryRepository/partCodeApply/index.vue
new file mode 100644
index 000000000..4fb363ee1
--- /dev/null
+++ b/src/pages/regulatoryRepository/partCodeApply/index.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+name: "partCodeApply"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 95ce6e580..010ac773b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1097,6 +1097,18 @@ const routes = [
           menuId: 'A59EFAQ7AC'
         }
       },
+      //零部件编号申请
+      {
+        path: '/partCodeApply',
+        name: 'partCodeApply',
+        component: () =>
+            import('@/pages/regulatoryRepository/partCodeApply/index'),
+        meta: {
+          requireAuth: true,
+          title: '零部件编号申请',
+          menuId: ''
+        }
+      },
       //标准法规工作组数据统计
       {
         path: '/dataStatisComments',
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index d2960cf5d..8571d2d34 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -6,7 +6,7 @@
 // 服务器地址
 // const devIp = '10.96.10.171'
 // const devInterfacePORT = '9999'
-const devIp = '10.96.170.156'
+const devIp = 'localhost'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -31,7 +31,7 @@ const processPort = '17210'
  *****************************************************************/
 // 生产环境配置
 const prodIp = '62.234.136.153'
-const prodInterfacePORT = '8038'
+const prodInterfacePORT = '8033'
 
 
 // 判断环境

From 398e64f545bd35536fb994e30dc89d012094dc85 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sun, 8 Aug 2021 16:56:15 +0800
Subject: [PATCH 07/14] feat: issueTime

---
 src/pages/searchCenter/pages/standardSearch.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 4f964875a..3b70f1a4a 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -103,8 +103,8 @@
                                                 align="center"
                                                 :label="$t('m.issueTime')">
                                             <template slot-scope="scope">
-                                                <div v-if="scope.row.issue_time !== null && scope.row.issue_time !== undefined">
-                                                    {{ dateFormat2(scope.row.issue_time) }}
+                                                <div v-if="scope.row.issueTime !== null && scope.row.issueTime !== undefined">
+                                                    {{ dateFormat2(scope.row.issueTime) }}
                                                 </div>
                                                 <div v-else></div>
                                             </template>

From eba187ac8171472e53d7953002fb2319122f8c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 8 Aug 2021 17:06:37 +0800
Subject: [PATCH 08/14] commit

---
 .../pages/creatProcess/xmpg2/step1-12.vue     |   1 +
 .../pages/creatProcess/xmpg2/step1-2.vue      | 456 +++++++++++++++++-
 .../pages/processDetail/index.vue             |   5 +-
 .../pages/details.vue                         |   2 +-
 4 files changed, 458 insertions(+), 6 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
index 90f130c65..f90bc40ff 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
@@ -375,6 +375,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
index 83bf7cf4c..2bd14237f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
@@ -1,13 +1,463 @@
 <template>
-
+  <div class="xmpg2-step2">
+    <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"
+          border
+          ref="selection"
+          height="70%"
+          style="width: 100%; border:1px solid #ccc"
+          :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
+            align="center"
+            width="200px"
+            label="标准号"
+          >
+            <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"
+            align="center"
+            label="中文名称"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="英文名称"
+            align="center"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="190px"
+            align="center"
+            sortable
+            label="标准实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            sortable
+            width="190px"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zrbm"
+            label="责任部门"
+            align="center"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppsbm"
+            width="180px"
+            align="center"
+            label="卡车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppscn"
+            width="180px"
+            align="center"
+            label="卡车vpps中文名称">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppsbm"
+            width="180px"
+            align="center"
+            label="乘用车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppscn"
+            width="180px"
+            align="center"
+            label="乘用车vpps中文名称">
+          </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>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
 export default {
-  name: "step1-2"
+  name: "xmpg2Step1-2",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      //表单的数据
+      listForm: {
+        BZFlag: " ", //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: {
+    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;
+    },
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.standId,
+          pageType: 'INLAND_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          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.BZFlag = "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.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: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.xmpg2-step2 {
+  /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/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
index a5b265b96..f7be9ed8a 100644
--- a/src/pages/processCenter/pages/processDetail/index.vue
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -178,9 +178,10 @@ export default {
       let row = {...this.detailData[index]}
       row.taskIds = row.id
       row.taskInfo = row.name
-      console.log(row.name)
       row.tabsName = this.$route.query.tabsName
       let prcType = this.detailData[index].prcType // 流程类型
+      console.log(prcType)
+      console.log(row.taskInfo);
       // 判断当前流程是否已全部办理完成
       this.detailData.map(item => {
         if (!item.endTime) {
@@ -213,7 +214,7 @@ export default {
           }
         }else if(prcType === '6'){
           //标准项目合规评估 项目维度
-          if(row.taskInfo === '标准法规部领导审核'){
+          if(row.taskInfo === '标准法规部部长审批'){
             this.toProcessDetail('xmpg2Step1-12',row)
           }else{
             this.toProcessDetail('xmpg2Step1-2',row)
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 5e825cfc8..5c3888699 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -10,7 +10,7 @@
       <el-card class="contaiinerCard" style="margin: 5px">
         <div style="padding: 20px">
           <el-row style="margin-top: 10px">
-            <el-col :span="5">产品平台: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
+            <el-col :span="5">产品平台1: <span class="valueColor">{{ localProEO.projectPlatfor }}</span></el-col>
             <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
             <el-col :span="5" :push="2">项目名称: <span class="valueColor">{{ localProEO.projectName }}</span></el-col>
             <!--          <el-col :span="5" :push="2">车型系列:<span class="valueColor">{{ localProEO.productSet }}</span></el-col>-->

From e47a0e1c93d2c982b06473d4f8e9b8f821caf8a2 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Sun, 8 Aug 2021 17:29:30 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/wfhxzg/step3.vue |  1 -
 .../processCenter/pages/creatProcess/wfhxzg/step4.vue | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index 5716eb580..039a1e43d 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -406,7 +406,6 @@ export default {
     },
     // 保存按钮
     handleSave() {
-      this.isSubmit = true
       let zqa = new Map();
       for (let lastDataListElement of this.dataList) {
         let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index 71d89ca6a..6ef3f73c2 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -232,6 +232,7 @@ import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {uploadFile} from '@/api/unqualProcess.js';
 import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process"
+import listOfCountries from "@/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries";
 
 export default {
   name: "wfhxzgStep4",
@@ -307,11 +308,11 @@ export default {
     },
     getFormFieldList (item) {
       this.$nextTick(() => {
-        let listJSON = JSON.parse(JSON.stringify(item.responUserInfo.info))
+        let listJSON = JSON.parse(JSON.stringify(item.responUserList))
         if (listJSON.length !== undefined) {
-          this.dataList = listJSON
+          this.dataList = listJSON[0].standardInfoList
         } else {
-          this.dataList = [listJSON]
+          this.dataList = [listJSON][0].standardInfoList
         }
         this.dataList.forEach(item => {
           if (item.fileText.length !== 0) {
@@ -427,8 +428,8 @@ export default {
       _formData.append('taskIds', this.taskIds)
       _formData.append('json', JSON.stringify({
         // roleForm: this.roleForm,
-        responUserInfo: {
-          info: this.dataList.splice(-1, 1)
+        responUserList: {
+          standardInfoList: this.dataList
         },
         commentText: this.commentText
       }))

From f9595373dd4b1811773833ea294458575f3265b7 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 8 Aug 2021 17:39:01 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E9=9B=B6=E9=83=A8=E4=BB=B6=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E7=94=B3=E8=AF=B7=E6=A8=A1=E5=9D=97=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=8D=89=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partCodeApply/index.vue                   | 75 ++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/partCodeApply/index.vue b/src/pages/regulatoryRepository/partCodeApply/index.vue
index 4fb363ee1..99f1834be 100644
--- a/src/pages/regulatoryRepository/partCodeApply/index.vue
+++ b/src/pages/regulatoryRepository/partCodeApply/index.vue
@@ -1,10 +1,83 @@
 <template>
+  <!--零部件编号申请 总体区域-->
+  <div class="partCodeApply" id="partCodeApply">
+    <!--搜索区域-->
+    <div class="search-area">
+      <div class="content-top">
+        <el-form inline class="label-input-form">
+          <el-form-item label="子组号" class="search-item">
+            <el-input placeholder="根据子组号查询" clearable :maxlength="100">
 
+            </el-input>
+          </el-form-item>
+          <el-form-item label="分组号" class="search-item">
+            <el-input placeholder="根据分组号查询" clearable :maxlength="100">
+
+            </el-input>
+          </el-form-item>
+          <el-form-item label="零件分类号" class="search-item">
+            <el-input placeholder="根据零件分类号查询" clearable :maxlength="100">
+
+            </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="mini" class="common-button-primary">
+              查询
+            </el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button size="mini" class="common-button-default">
+              清空
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <!--操作区域-->
+    <div class="operation_area">
+      <div class="content-center">
+        <el-button type="primary" size="mini" class="common-button-primary">
+          <i class="iconfont">&#xe6e9;</i>
+          导出
+        </el-button>
+        <el-button type="primary" size="mini" class="common-button-primary">
+          <i class="iconfont">&#xe611;</i>
+          删除
+        </el-button>
+      </div>
+    </div>
+    <!--表格区域-->
+    <div class="table_area">
+      <div class="container">
+        <loading :loading="loading"></loading>
+        <div class="table-wrap">
+          <div class="inner-wrap">
+            <el-table>
+              <el-table-column type="selection" align="center"></el-table-column>
+              <el-table-column label="序号"></el-table-column>
+              <el-table-column label="子组号"></el-table-column>
+              <el-table-column label="子组结构号"></el-table-column>
+              <el-table-column label="子组结构名称"></el-table-column>
+              <el-table-column label="分组代号"></el-table-column>
+              <el-table-column label="零部件分类名称"></el-table-column>
+              <el-table-column label="零部件分类代号"></el-table-column>
+              <el-table-column label="备注"></el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
 export default {
-name: "partCodeApply"
+  name: "partCodeApply",
+  data() {
+    return {
+      loading: false
+    }
+  }
 }
 </script>
 

From a140d18d9bb097a6be6cdaf932c3a5e17660ec16 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Sun, 8 Aug 2021 17:43:13 +0800
Subject: [PATCH 11/14] commit

---
 src/components/personalCenter/index.vue                   | 2 +-
 src/pages/processCenter/pages/creatProcess/bzdy/step3.vue | 5 ++++-
 src/pages/processCenter/pages/creatProcess/bzdy/step5.vue | 5 +++--
 src/pages/processCenter/pages/creatProcess/bzdy/step6.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/bzdy/step7.vue | 4 ++--
 src/pages/processCenter/pages/creatProcess/bzdy/step8.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/bzdy/step9.vue | 4 ++--
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/components/personalCenter/index.vue b/src/components/personalCenter/index.vue
index 7dbe3eecf..92b82bc75 100644
--- a/src/components/personalCenter/index.vue
+++ b/src/components/personalCenter/index.vue
@@ -37,7 +37,7 @@ export default {
   },
   methods: {
     toHome () {
-      this.$router.push('/home')
+      this.$router.push('/home1')
     },
     // 获取当前时间
     getTime () {
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
index 2166ae91f..e4b8d0b87 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
@@ -156,6 +156,7 @@
         </ProcessFooter>
         <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
             <el-upload
+                    class="upload-demo"
                     multiple
                     drag
                     :action="fileUrl"
@@ -164,7 +165,7 @@
                     accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
                     :before-upload="beginImportFile"
                     :on-success="importFileSuccess"
-                    :show-file-list="false"
+                    :show-file-list="true"
             >
                 <div style="padding: 20px 0">
                     <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -309,6 +310,8 @@
                         this.json = data
                         this.form.model = data.model
                         this.form.modelName = data.modelName
+                        this.form.fileName = data.fileName || ''
+                        this.form.fileId = data.fileId || ''
                     }).catch(e => {
                     })
                 })
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
index 1c962674b..a590d8ece 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
@@ -92,7 +92,7 @@
                                 label="文件"
                                 align="center">
                             <template slot-scope="scope">
-                                <div @click="updateFile(scope.row.id)" class="fileClass">
+                                <div @click="updateFile(scope.row.fileId)" class="fileClass">
                                     {{scope.row.fileName}}
                                 </div>
                             </template>
@@ -183,6 +183,7 @@
         </ProcessFooter>
         <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
             <el-upload
+                    class="upload-demo"
                     multiple
                     drag
                     :action="fileUrl"
@@ -191,7 +192,7 @@
                     accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
                     :before-upload="beginImportFile"
                     :on-success="importFileSuccess"
-                    :show-file-list="false"
+                    :show-file-list="true"
             >
                 <div style="padding: 20px 0">
                     <i class="el-icon-upload" style="color: #3399ff"></i>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
index 529ac6782..b55d1e585 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
@@ -87,7 +87,7 @@
                                 label="文件"
                                 align="center">
                             <template slot-scope="scope">
-                                <div @click="updateFile(scope.row.id)" class="fileClass">
+                                <div @click="updateFile(scope.row.fileId)" class="fileClass">
                                     {{scope.row.fileName}}
                                 </div>
                             </template>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
index 6bbd01b4f..953b1085a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">标准法规部部长审核</template>
+            <template slot="proNode">责任部门对接人及标准法规部部长审核</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -87,7 +87,7 @@
                                 label="文件"
                                 align="center">
                             <template slot-scope="scope">
-                                <div @click="updateFile(scope.row.id)" class="fileClass">
+                                <div @click="updateFile(scope.row.fileId)" class="fileClass">
                                     {{scope.row.fileName}}
                                 </div>
                             </template>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
index af250d1cb..2efa1dc5c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
@@ -87,7 +87,7 @@
                                 label="文件"
                                 align="center">
                             <template slot-scope="scope">
-                                <div @click="updateFile(scope.row.id)" class="fileClass">
+                                <div @click="updateFile(scope.row.fileId)" class="fileClass">
                                     {{scope.row.fileName}}
                                 </div>
                             </template>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
index 889c9514d..7339115b3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">责任对接人审批</template>
+            <template slot="proNode">工程研究总院院长审批</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -87,7 +87,7 @@
                                 label="文件"
                                 align="center">
                             <template slot-scope="scope">
-                                <div @click="updateFile(scope.row.id)" class="fileClass">
+                                <div @click="updateFile(scope.row.fileId)" class="fileClass">
                                     {{scope.row.fileName}}
                                 </div>
                             </template>

From 9a9b3204607ecca17715736e72d5e75e610ff4c7 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Sun, 8 Aug 2021 17:58:46 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E6=B2=A1=E5=86=99=E5=AE=8C=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=85=88=E6=B3=A8=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue                       | 10 +++++-----
 src/pages/regulatoryRepository/partCodeApply/index.vue |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index ba0dfdad9..73450e5bc 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -88,11 +88,11 @@ export default {
               path: '/domesticStandardsAndRegulations',
               menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
             },
-            {
-              title: '零部件编号申请',
-              path: '/partCodeApply',
-              menuId: ''
-            },
+            // {
+            //   title: '零部件编号申请',
+            //   path: '/partCodeApply',
+            //   menuId: ''
+            // },
             {
               title: '标准法规工作组数据统计',
               path: '/dataStatisComments',
diff --git a/src/pages/regulatoryRepository/partCodeApply/index.vue b/src/pages/regulatoryRepository/partCodeApply/index.vue
index 99f1834be..191afc273 100644
--- a/src/pages/regulatoryRepository/partCodeApply/index.vue
+++ b/src/pages/regulatoryRepository/partCodeApply/index.vue
@@ -50,6 +50,7 @@
     <div class="table_area">
       <div class="container">
         <loading :loading="loading"></loading>
+        <!--表头-->
         <div class="table-wrap">
           <div class="inner-wrap">
             <el-table>
@@ -62,9 +63,11 @@
               <el-table-column label="零部件分类名称"></el-table-column>
               <el-table-column label="零部件分类代号"></el-table-column>
               <el-table-column label="备注"></el-table-column>
+              <el-table-column label="操作"></el-table-column>
             </el-table>
           </div>
         </div>
+        <!--表头-->
       </div>
     </div>
   </div>

From 2236491bcdd5703e5c2b9486a4465c51b27be9db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 8 Aug 2021 18:01:03 +0800
Subject: [PATCH 13/14] commit

---
 src/pages/processCenter/pages/creatProcess/xmpg/step3.vue  | 2 +-
 src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index aafe0469e..d1cd30610 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -117,7 +117,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="责任人"
+            label="落实人"
             width="170"
             align="center">
             <template slot-scope="scope">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index dce551cfb..2911fb832 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -333,7 +333,6 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm.dataList = item.dataList;
         this.dataList = item.dataList;
-        console.log(this.dataList);
         // this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear
         let children = [];
         item.breakdownList.forEach(

From 7ff76fe4bcc7a2512ef1582c61d28d0291e22044 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Sun, 8 Aug 2021 18:08:03 +0800
Subject: [PATCH 14/14] commit

---
 .../pages/creatProcess/bzjd/step1-1.vue       | 15 +++++++++++-
 .../pages/creatProcess/bzjd/step1.vue         | 24 ++++++++++++++++++-
 .../pages/creatProcess/bzjd/step2.vue         | 15 +++++++++++-
 .../pages/creatProcess/bzjd/step3.vue         | 17 +++++++++++--
 .../pages/creatProcess/bzjd/step4.vue         | 17 +++++++++++--
 .../pages/creatProcess/bzjd/step5.vue         | 17 +++++++++++--
 .../pages/creatProcess/bzjd/step6.vue         | 17 +++++++++++--
 7 files changed, 111 insertions(+), 11 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index edcdc36b2..719b13749 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -103,14 +103,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         label="责任人"
@@ -367,6 +371,8 @@
         name: "bzjdStep1-1",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 textStatusMap: {},
                 listModel2: false,
                 standInfoList2: [],
@@ -457,6 +463,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             getData () {
                 queryTaskFirst({
                     bpnId: this.$route.query.bpnId
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index a4a4a67cf..f5f4d3930 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -104,14 +104,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         label="责任人"
@@ -347,6 +351,15 @@
                 </div>
             </div>
         </el-drawer>
+        <el-dialog
+                title="查看条款内容"
+                :visible.sync="itermsConditionsFlag"
+                size="800px">
+            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div slot="footer">
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
+            </div>
+        </el-dialog>
         <Role-tree
                 check-box
                 :is-title="drawerTitle"
@@ -367,6 +380,8 @@
         name: "bzjdStep1",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 textStatusMap: {},
                 listModel2: false,
                 standInfoList2: [],
@@ -457,6 +472,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             showUser (row) {
                 let routeUrl = this.$router.resolve({
                     name: 'ItemSplitInfo',
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 2dc293708..69682b390 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -98,14 +98,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         label="责任人"
@@ -227,6 +231,8 @@
         name: "bzjdStep2",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 type: '',
                 drawerTitle: '',
                 histortData: [],
@@ -262,6 +268,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 214893b7a..e5d7f7e21 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -99,14 +99,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        prop="itemsTitle"
+                        prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="technicalRequir"
@@ -370,6 +374,8 @@
         name: "bzjdStep3",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 fhList: [
                     {
                         value: '1',
@@ -418,6 +424,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 7ee51700c..f646d40d7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -94,14 +94,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        prop="itemsTitle"
+                        prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="technicalRequir"
@@ -274,6 +278,8 @@
         name: "bzjdStep4",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 histortData: [],
                 sarType: '',
                 itemList: [],
@@ -300,6 +306,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index f28d59a08..2b6f9324c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -94,14 +94,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        prop="itemsTitle"
+                        prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="technicalRequir"
@@ -274,6 +278,8 @@
         name: "bzjdStep5",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 histortData: [],
                 sarType: '',
                 itemList: [],
@@ -300,6 +306,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index f0b635020..414ab7eb8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -95,14 +95,18 @@
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="230"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        prop="itemsTitle"
+                        prop="itermsConditions"
                         label="条款内容"
+                        width="200"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
+                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="technicalRequir"
@@ -273,6 +277,8 @@
         name: "bzjdStep6",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 histortData: [],
                 sarType: '',
                 itemList: [],
@@ -299,6 +305,13 @@
             ProcessTitle
         },
         methods: {
+            itermsConditionsClose () {
+                this.itermsConditionsFlag = false
+            },
+            itermsConditionsOpen (row) {
+                this.itermsConditionsFlag = true
+                this.itermsConditionsTitle = row
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,