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 1/4] =?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 2/4] =?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 3/4] 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 4/4] =?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>