Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

src/components/navMenu/index.vue

@@ -88,11 +88,11 @@ export default {
               path: '/domesticStandardsAndRegulations',
               menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
             },
-            {
+            // {
-              title: '零部件编号申请',
+            //   title: '零部件编号申请',
-              path: '/partCodeApply',
+            //   path: '/partCodeApply',
-              menuId: ''
+            //   menuId: ''
-            },
+            // },
             {
               title: '标准法规工作组数据统计',
               path: '/dataStatisComments',

src/components/personalCenter/index.vue

@@ -37,7 +37,7 @@ export default {
   },
   methods: {
     toHome () {
-      this.$router.push('/home')
+      this.$router.push('/home1')
     },
     // 获取当前时间
     getTime () {

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 => {
                     })
                 })

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>

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>

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>

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>

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>

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)

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: {
+        responUserList: {
-          info: this.dataList.splice(-1, 1)
+          standardInfoList: this.dataList
         },
         commentText: this.commentText
       }))

src/pages/regulatoryRepository/partCodeApply/index.vue

@@ -1,10 +1,86 @@
 <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-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>