Merge remote-tracking branch 'origin/develop' into develop

src/components/navMenu/index.vue

@@ -88,16 +88,16 @@ export default {
               path: '/domesticStandardsAndRegulations',
               menuId: '3e3657498664beaa0dc1de1ecb3ae0da'
             },
-            {
+            // {
-              title: '零部件编号申请',
+            //   title: '零部件编号申请',
-              path: '/partCodeApply',
+            //   path: '/partCodeApply',
-              menuId: ''
+            //   menuId: ''
-            },
+            // },
-            {
+            // {
-              title: '标准法规工作组数据统计',
+            //   title: '标准法规工作组数据统计',
-              path: '/dataStatisComments',
+            //   path: '/dataStatisComments',
-              menuId: ''
+            //   menuId: ''
-            },
+            // },
             {
               title: '海外标准法规',
               path: '/foreignStandardsAndRegulations',
@@ -135,11 +135,11 @@ export default {
             // // //   title: '本地产品/项目库',
             // // //   path: '/localProductsOrProjectLibrary'
             // // // },
-            {
+            /*{
               title: '企业标准库',
               path: '/enterpriseStandardDatabase',
               menuId: '01ed8f752748227777b3572d56ee9ab5'
-            },
+            },*/
             // {
             //   title: '企标制修订计划',
             //   path: '/enterBSysRevPlanManaLib',

src/components/personalCenter/index.vue

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

src/pages/details/otherStandardDetails/index.vue

@@ -418,28 +418,52 @@
                 trigger="click"
                 :value="false"
               >
-                <el-input
+<!--                <el-input-->
-                  v-model="standItemSearch.orgName"
+<!--                  v-model="standItemSearch.orgName"-->
-                  slot="reference"
+<!--                  slot="reference"-->
-                  placeholder="请选择部门"
+<!--                  placeholder="请选择部门"-->
-                  readonly
+<!--                  readonly-->
-                  id="searchInlandDeptBtn"
+<!--                  id="searchInlandDeptBtn"-->
-                  @on-change="inputChange"
+<!--                  @on-change="inputChange"-->
-                  style="margin-right: 0;"/>
+<!--                  style="margin-right: 0;"/>-->
                 <div class="api">
-                  <laws-tree :zNodes="searchInlandNodes"
+<!--                  <laws-tree :zNodes="searchInlandNodes"-->
-                             treeDivId="domesticTree1"
+<!--                             treeDivId="domesticTree1"-->
-                             ref="reloadTree2"
+<!--                             ref="reloadTree2"-->
-                             deptSelect
+<!--                             deptSelect-->
-                             showRMenu
+<!--                             showRMenu-->
-                             @treeDblClick="searchInlandNodesClick"
+<!--                             @treeDblClick="searchInlandNodesClick"-->
-                             class="ztree" style="width: 200px;height: 400px;overflow: auto">
+<!--                             class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
-                  </laws-tree>
+<!--                  </laws-tree>-->
                 </div>
               </el-popover>
             </el-form-item>
+
+
+
+
             <el-form-item class="search-item">
-              <el-input v-model="standItemSearch.nameOrRequest" size="small" placeholder="根据条款名称/内容查找" clearable maxlength="100"></el-input>
+              <el-input v-model="standItemSearch.itemsName" size="small" placeholder="根据条款名称查找" clearable maxlength="100"></el-input>
+            </el-form-item>
+<!--            新车实施日期-->
+            <el-form-item class="search-item">
+              <div class="block">
+                <el-date-picker
+                    v-model="standItemSearch.XCXSSRQ"
+                    type="date"
+                    placeholder="新车实施日期">
+                </el-date-picker>
+              </div>
+            </el-form-item>
+<!--            //在产车实施日期-->
+            <el-form-item class="search-item">
+              <div class="block">
+                <el-date-picker
+                    v-model="standItemSearch.ZCCSSRQ"
+                    type="date"
+                    placeholder="在产车实施日期">
+                </el-date-picker>
+              </div>
             </el-form-item>
 <!--            <el-form-item class="search-item">-->
 <!--              <el-input v-model="standItemSearch.parts" size="small" placeholder="根据涉及零部件查找" clearable maxlength="100"></el-input>-->
@@ -507,7 +531,7 @@
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              prop="itemsName"
+              prop="itemsTitle"
               label="条款内容"
           >
           </el-table-column>
@@ -533,30 +557,30 @@
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              prop="putTime"
+              prop="applyArctic"
               label="适用车型"
           >
           </el-table-column>
           <el-table-column
-            prop="responsibleUnitShow"
+            prop="responsibleUnit"
             label="责任部门">
           </el-table-column>
           <el-table-column
-            prop="zrgcs"
+            prop="dutyEngineer"
             label="责任工程师">
           </el-table-column>
           <el-table-column
-            prop="dutyEngineerShow"
+            prop="comparedWithPrevious"
             label="基于上一版本差异"
             width="150">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="svppsShow"
+            prop="complianceRequire"
             label="符合性状态">
           </el-table-column>
           <el-table-column
-            prop="applyArcticShow"
+            prop="complianceState"
             label="合规性分析">
           </el-table-column>
           <el-table-column label="操作" align="center" width="50" fixed="right">
@@ -1247,15 +1271,13 @@ export default {
       modalStandItemflag: false,
       tableLoading: false,
       standItemSearch: {
+        XCXSSRQ:'',
+        ZCCSSRQ:'',
         standId: '',
         fileType: '',
-        responsibleUnit: '',
+        itemsName:'',
-        orgName: '',
-        validFlag: '0',
         pageSize: this.$store.getters.userInfo.configContent,
         page: 1,
-        nameOrRequest: '',
-        parts: ''
       },
       standitemTotal: 0,
       searching: false,
@@ -2231,11 +2253,14 @@ export default {
     selectSarStandItems (id, flag) {
       this.standItemSearch.standId = this.sarStandardsInfoEO.id
       this.standItemSearch.fileType = this.fileType
-      this.$http.get('lawss/sarStandItems/getSarStandItemsList', this.standItemSearch, {
+      this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => {
-        _this: this, loading: 'tableLoading'
-      }, res => {
         this.selectedItemList = []
-        this.standItemList = res.data.list
+        if (res.ok) {
+          this.standItemList = res.data;
+          console.log("hello"+this.standItemList+res.data);
+          this.standitemTotal = res.data.count // 分页需要
+        }
+
         // if (this.standItemList != null && this.standItemList.length > 0) {
         //   for (let ind = 0; ind < this.standItemList.length; ind++) {
         //     // 去掉html标签
@@ -2244,7 +2269,7 @@ export default {
         //     this.standItemList[ind].termsConditions = itemContent
         //   }
         // }
-        this.standitemTotal = res.data.count // 分页需要
+
       }, e => {
       })
     },

src/pages/processCenter/pages/creatProcess/bzdy/step2.vue

@@ -135,6 +135,7 @@
             </el-table>
         </div>
         <ProcessFooter
+                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
@@ -155,7 +156,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
 
     export default {
         name: "bzdyStep2",
@@ -229,7 +230,21 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
+            handleSave() {
+                this.saveLoading = true
+                let _formData = new FormData()
+                _formData.append('taskIds', this.taskIds)
+                _formData.append('json', JSON.stringify({
+                    form: this.form,
+                    commentText: this.commentText,
+                }))
+                saveTaskForPub(_formData).then(res => {
+                    this.saveLoading = false
+                    this.$message.success('保存成功')
+                }).catch(e => {
+                    this.saveLoading = false
+                })
+            },
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
@@ -261,11 +276,13 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.title = data.title
+                        this.form.title = data.title || data.form.title
-                        this.form.date = data.date
+                        this.form.date = data.date || data.form.date
-                        this.json = data
+                        this.json = data || data.form
-                        this.form.model = data.model
+                        this.form.model = data.model || data.form.model
-                        this.form.modelName = data.modelName
+                        this.form.modelName = data.modelName || data.form.modelName
+                        this.form.responUserList = data.form.responUserList
+                        this.form.responUserListName = data.form.responUserListName
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/creatProcess/bzdy/step3.vue

@@ -147,6 +147,7 @@
             </el-table>
         </div>
         <ProcessFooter
+                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
@@ -156,6 +157,7 @@
         </ProcessFooter>
         <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
             <el-upload
+                    class="upload-demo"
                     multiple
                     drag
                     :action="fileUrl"
@@ -164,7 +166,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>
@@ -179,7 +181,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
 
     export default {
         name: "bzdyStep3",
@@ -272,7 +274,21 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
+            handleSave() {
+                this.saveLoading = true
+                let _formData = new FormData()
+                _formData.append('taskIds', this.taskIds)
+                _formData.append('json', JSON.stringify({
+                    form: this.form,
+                    commentText: this.commentText,
+                }))
+                saveTaskForPub(_formData).then(res => {
+                    this.saveLoading = false
+                    this.$message.success('保存成功')
+                }).catch(e => {
+                    this.saveLoading = false
+                })
+            },
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
@@ -304,11 +320,15 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.title = data.title
+                        this.form.title = data.title || data.form.title
-                        this.form.date = data.date
+                        this.form.date = data.date || data.form.date
-                        this.json = data
+                        this.json = data || data.form
-                        this.form.model = data.model
+                        this.form.model = data.model || data.form.model
-                        this.form.modelName = data.modelName
+                        this.form.modelName = data.modelName || data.form.modelName
+                        this.form.responUserList = data.form.responUserList
+                        this.form.responUserListName = data.form.responUserListName
+                        this.form.fileName = data.form.fileName || data.fileName || ''
+                        this.form.fileId = data.form.fileId || data.fileId || ''
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/creatProcess/bzdy/step4.vue

@@ -252,13 +252,14 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.title = data.title
+                        console.log(data);
-                        this.form.date = data.date
+                        this.form.title = data.title || data.form.title
-                        this.json = data
+                        this.form.date = data.date || data.form.date
-                        this.form.file = data.fileId
+                        this.json = data || data.form
-                        this.form.fileName = data.fileName
+                        this.form.file = data.fileId || data.form.fileId
-                        this.form.model = data.model
+                        this.form.fileName = data.fileName || data.form.fileName
-                        this.form.modelName = data.modelName
+                        this.form.model = data.model || data.form.model
+                        this.form.modelName = data.modelName || data.form.modelName
                     }).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>
@@ -174,6 +174,7 @@
             </el-table>
         </div>
         <ProcessFooter
+                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
@@ -183,6 +184,7 @@
         </ProcessFooter>
         <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
             <el-upload
+                    class="upload-demo"
                     multiple
                     drag
                     :action="fileUrl"
@@ -191,7 +193,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>
@@ -296,7 +298,21 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
+            handleSave() {
+                this.saveLoading = true
+                let _formData = new FormData()
+                _formData.append('taskIds', this.taskIds)
+                _formData.append('json', JSON.stringify({
+                    form: this.form,
+                    commentText: this.commentText,
+                }))
+                saveTaskForPub(_formData).then(res => {
+                    this.saveLoading = false
+                    this.$message.success('保存成功')
+                }).catch(e => {
+                    this.saveLoading = false
+                })
+            },
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
@@ -326,12 +342,12 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.title = data.title
+                        this.form.title = data.title || data.form.title
-                        this.form.date = data.date
+                        this.form.date = data.date || data.form.date
-                        this.json = data
+                        this.json = data || data.form
-                        this.tableData = data.responUserList
+                        this.tableData = data.responUserList || data.form.responUserList
-                        this.form.hzfileId = data.hzfileId
+                        this.form.hzfileId = data.hzfileId || data.form.hzfileId
-                        this.form.hzfileName = data.hzfileName
+                        this.form.hzfileName = data.hzfileName || data.form.hzfileName
                     }).catch(e => {
                     })
                 })

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>
@@ -341,12 +341,12 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.title = data.title
+                        this.form.title = data.title || data.form.title
-                        this.form.date = data.date
+                        this.form.date = data.date || data.form.date
-                        this.json = data
+                        this.json = data || data.form
-                        this.tableData = data.responUserList
+                        this.tableData = data.responUserList || data.form.responUserList
-                        this.form.hzfileName = data.hzfileName
+                        this.form.hzfileId = data.hzfileId || data.form.hzfileId
-                        this.form.hzfileId = data.hzfileId
+                        this.form.hzfileName = data.hzfileName || data.form.hzfileName
                     }).catch(e => {
                     })
                 })

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>
@@ -341,12 +341,12 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.title = data.title
+                        this.form.title = data.title || data.form.title
-                        this.form.date = data.date
+                        this.form.date = data.date || data.form.date
-                        this.json = data
+                        this.json = data || data.form
-                        this.tableData = data.responUserList
+                        this.tableData = data.responUserList || data.form.responUserList
-                        this.form.hzfileName = data.hzfileName
+                        this.form.hzfileId = data.hzfileId || data.form.hzfileId
-                        this.form.hzfileId = data.hzfileId
+                        this.form.hzfileName = data.hzfileName || data.form.hzfileName
                     }).catch(e => {
                     })
                 })

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>
@@ -341,12 +341,12 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.title = data.title
+                        this.form.title = data.title || data.form.title
-                        this.form.date = data.date
+                        this.form.date = data.date || data.form.date
-                        this.json = data
+                        this.json = data || data.form
-                        this.tableData = data.responUserList
+                        this.tableData = data.responUserList || data.form.responUserList
-                        this.form.hzfileName = data.hzfileName
+                        this.form.hzfileId = data.hzfileId || data.form.hzfileId
-                        this.form.hzfileId = data.hzfileId
+                        this.form.hzfileName = data.hzfileName || data.form.hzfileName
                     }).catch(e => {
                     })
                 })

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>
@@ -341,12 +341,12 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.title = data.title
+                        this.form.title = data.title || data.form.title
-                        this.form.date = data.date
+                        this.form.date = data.date || data.form.date
-                        this.json = data
+                        this.json = data || data.form
-                        this.tableData = data.responUserList
+                        this.tableData = data.responUserList || data.form.responUserList
-                        this.form.hzfileName = data.hzfileName
+                        this.form.hzfileId = data.hzfileId || data.form.hzfileId
-                        this.form.hzfileId = data.hzfileId
+                        this.form.hzfileName = data.hzfileName || data.form.hzfileName
                     }).catch(e => {
                     })
                 })

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="责任人"
@@ -354,6 +358,15 @@
                 @checkedRole="saveUserInfo"
                 :nodeList="nodeList"
         ></Role-tree>
+        <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>
     </div>
 </template>
 
@@ -367,6 +380,8 @@
         name: "bzjdStep1-1",
         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
+            },
             getData () {
                 queryTaskFirst({
                     bpnId: this.$route.query.bpnId

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',

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="责任人"
@@ -214,6 +218,15 @@
                 :nodeList="nodeList2"
         ></Role-tree>
         <loading :loading="loading">加载中...</loading>
+        <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>
     </div>
 </template>
 
@@ -227,6 +240,8 @@
         name: "bzjdStep2",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 type: '',
                 drawerTitle: '',
                 histortData: [],
@@ -262,6 +277,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,
@@ -308,7 +330,6 @@
                 this.active = name
             },
             handleSave() {
-
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('taskIds', this.taskIds)

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"
@@ -356,6 +360,15 @@
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
             </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>
         <loading :loading="loading">加载中...</loading>
     </div>
 </template>
@@ -370,6 +383,8 @@
         name: "bzjdStep3",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 fhList: [
                     {
                         value: '1',
@@ -418,6 +433,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,

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"
@@ -261,6 +265,15 @@
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <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>
     </div>
 </template>
 
@@ -274,6 +287,8 @@
         name: "bzjdStep4",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 histortData: [],
                 sarType: '',
                 itemList: [],
@@ -300,6 +315,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,

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"
@@ -260,6 +264,15 @@
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <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>
         <loading :loading="loading">加载中...</loading>
     </div>
 </template>
@@ -274,6 +287,8 @@
         name: "bzjdStep5",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 histortData: [],
                 sarType: '',
                 itemList: [],
@@ -300,6 +315,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,

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"
@@ -259,6 +263,15 @@
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <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>
         <loading :loading="loading">加载中...</loading>
     </div>
 </template>
@@ -273,6 +286,8 @@
         name: "bzjdStep6",
         data() {
             return {
+                itermsConditionsFlag: false,
+                itermsConditionsTitle: '',
                 histortData: [],
                 sarType: '',
                 itemList: [],
@@ -299,6 +314,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,

src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue

@@ -678,7 +678,6 @@ 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)
@@ -718,22 +717,19 @@ export default {
       this.saveLoading = true;
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
-      _formData.append("createUser", this.$store.getters.userInfo.userId);
-      _formData.append("createUserName", this.$store.getters.userInfo.userName);
       _formData.append("prcType", "4");
       _formData.append('taskIds', this.taskIds)
       _formData.append("json", JSON.stringify({
         form: this.listForm,
         commentText: this.commentText
       }));
-
+      saveTaskForPub(_formData).then(res => {
-      // saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
-      //   this.saveLoading = false;
+        this.$message.success("保存成功");
-      //   this.$message.success("保存成功");
+        this.bpnId = res.result;
-      //   this.bpnId = res.result;
+      }).catch(e => {
-      // }).catch(e => {
+        this.saveLoading = false;
-      //   this.saveLoading = false;
+      });
-      // });
     },
     //提交事件
     handleSubmit() {

src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue

@@ -282,6 +282,7 @@ export default {
         endTime: '', // 结束日期
         cname: '', // 名称
         standType: '',
+        standId: '',
       },
       formRules: {
         cid: [
@@ -299,6 +300,7 @@ export default {
         standSort: '',
         standNumber: '',
         standType: '',
+        standId: '',
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent
       },
@@ -456,6 +458,7 @@ export default {
           this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
         }
         this.form.standType = bringData[0].standType
+        this.form.standId = bringData[0].id
         this.form.cname = bringData[0].standName;
         this.listModel = false;
       } else if (this.selectedList.length > 1) {

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/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">
@@ -222,7 +222,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
 
 export default {
   name: "xmpgStep3",
@@ -348,7 +348,6 @@ 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);
@@ -362,36 +361,41 @@ export default {
      */
     getFormFieldList(item) {
       this.listForm = JSON.parse(JSON.stringify(item));
-      this.listForm.prcNum = this.prcNum;
+      if(item.form === undefined){
-      this.listForm.prcName = this.prcName;
+        this.listForm.prcNum = this.prcNum;
-      this.listForm["id"] = item.id;
+        this.listForm.prcName = this.prcName;
-      this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0]));
+        this.listForm["id"] = item.id;
-      this.listForm.breakdownList = [];
+        this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0]));
-      for (let i = 0; i < item.pepdtos.length; i++) {
+        this.listForm.breakdownList = [];
-        for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
+        for (let i = 0; i < item.pepdtos.length; i++) {
-          this.listForm.breakdownList.push({
+          for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
-            itemsName: item.pepdtos[i].breakdownList[j].itemsName,
+            this.listForm.breakdownList.push({
-            itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
+              itemsName: item.pepdtos[i].breakdownList[j].itemsName,
-            responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
+              itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
-            responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit,
+              responsibleEngineer: item.pepdtos[i].breakdownList[j].responsibleEngineer,
-            productLine: item.pepdtos[i].sarStandProjectLibraries.productLine,
+              responsibleUnit: item.pepdtos[i].breakdownList[j].responsibleUnit,
-            projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber,
+              productLine: item.pepdtos[i].sarStandProjectLibraries.productLine,
-            projectName: item.pepdtos[i].sarStandProjectLibraries.projectName,
+              projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber,
-            implementer: item.pepdtos[i].breakdownList[j].implementer || null,
+              projectName: item.pepdtos[i].sarStandProjectLibraries.projectName,
-            distributePerson: item.pepdtos[i].distributePerson,
+              implementer: item.pepdtos[i].breakdownList[j].implementer || null,
-            distributePersonId: item.pepdtos[i].distributePersonId,
+              distributePerson: item.pepdtos[i].distributePerson,
-            uname: item.pepdtos[i].uname,
+              distributePersonId: item.pepdtos[i].distributePersonId,
-            projectManager: item.pepdtos[i].projectManager,
+              uname: item.pepdtos[i].uname,
-            certifiedEngineerName: item.pepdtos[i].certifiedEngineerName,
+              projectManager: item.pepdtos[i].projectManager,
-            qualityEngineerName: item.pepdtos[i].qualityEngineerName,
+              certifiedEngineerName: item.pepdtos[i].certifiedEngineerName,
-            standNumber: item.pepdtos[i].standNumber,
+              qualityEngineerName: item.pepdtos[i].qualityEngineerName,
-            standName: item.pepdtos[i].standName,
+              standNumber: item.pepdtos[i].standNumber,
-            xCXSSRQ: item.pepdtos[i].xCXSSRQ,
+              standName: item.pepdtos[i].standName,
-            zCCSSRQ: item.pepdtos[i].zCCSSRQ
+              xCXSSRQ: item.pepdtos[i].xCXSSRQ,
-          });
+              zCCSSRQ: item.pepdtos[i].zCCSSRQ
+            });
+          }
         }
+      } else {
+        this.listForm = item.form
+        this.listForm.breakdownList = item.form.breakdownList
       }
-      console.log(this.listForm.breakdownList);
+
     },
     checkedRole (data) {
       if (this.type === 1) {
@@ -441,6 +445,22 @@ export default {
 
     //保存事件
     handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "5");
+      _formData.append('taskIds', this.taskIds)
+      _formData.append("json", JSON.stringify({
+        form: this.listForm,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
     },
     //提交事件
     handleSubmit() {

src/pages/processCenter/pages/creatProcess/xmpg/step4.vue

@@ -347,7 +347,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
 
 export default {
   name: "xmpgStep4",
@@ -454,36 +454,59 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        if (item.fenFlag === undefined ) {
+        if(item.form === undefined){
-          item.step3DTOS.forEach(item => {
+          if (item.fenFlag === undefined ) {
-            item.implementerId = this.$store.getters.userInfo.userId
+            item.step3DTOS.forEach(item => {
-            item.implementer = this.$store.getters.userInfo.userName
+              item.implementerId = this.$store.getters.userInfo.userId
-          })
+              item.implementer = this.$store.getters.userInfo.userName
-          this.dataList = item.step3DTOS;
+            })
+            this.dataList = item.step3DTOS;
+          } else {
+            this.dataList = item.dataList;
+            this.dataList.forEach(item => {
+              item.implementerId = this.$store.getters.userInfo.userId
+              item.implementer = this.$store.getters.userInfo.userName
+            })
+          }
+          this.listForm.prcNum = this.prcNum;
+          this.listForm.prcName = this.prcName;
+          this.listForm["id"] = item.id;
+          this.listForm.standName = item.step3DTOS[0].standName;
+          this.listForm.standNumber = item.step3DTOS[0].standNumber;
+          this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
+          this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
+          this.listForm.itemsName = item.step3DTOS[0].itemsName;
+          this.listForm.itemNum = item.step3DTOS[0].itemNum;
+          this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit;
+          this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer;
         } else {
-          this.dataList = item.dataList;
+          this.listForm = item.form
-          this.dataList.forEach(item => {
+          this.dataList = item.form.dataList
-            item.implementerId = this.$store.getters.userInfo.userId
-            item.implementer = this.$store.getters.userInfo.userName
-          })
         }
-        this.listForm.prcNum = this.prcNum;
+
-        this.listForm.prcName = this.prcName;
-        this.listForm["id"] = item.id;
-        this.listForm.standName = item.step3DTOS[0].standName;
-        this.listForm.standNumber = item.step3DTOS[0].standNumber;
-        this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
-        this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
-        this.listForm.itemsName = item.step3DTOS[0].itemsName;
-        this.listForm.itemNum = item.step3DTOS[0].itemNum;
-        this.listForm.responsibleUnit = item.step3DTOS[0].responsibleUnit;
-        this.listForm.responsibleEngineer = item.step3DTOS[0].responsibleEngineer;
       });
     },
 
 
     //保存事件
     handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      this.listForm.dataList = this.dataList;
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "5");
+      _formData.append('taskIds', this.taskIds)
+      _formData.append("json", JSON.stringify({
+        form:this.listForm,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
     },
     //提交事件
     handleSubmit() {

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);

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>

src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue

@@ -219,7 +219,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
 
 export default {
   name: "xmpg2Step3",
@@ -339,18 +339,39 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        this.listForm.prcNum = this.prcNum;
+        if (item.form === undefined) {
-        this.listForm.prcName = this.prcName;
+          this.listForm.prcNum = this.prcNum;
-        this.listForm["id"] = item.id;
+          this.listForm.prcName = this.prcName;
-        this.listForm.dataList = item.dataList;
+          this.listForm["id"] = item.id;
-        this.dataList = item.dataList;
+          this.listForm.dataList = item.dataList;
-        this.dataList.distributePerson = item.dataList[0].distributePerson;
+          this.dataList = item.dataList;
-        this.listForm.breakdownList = item.breakdownList;
+          this.dataList.distributePerson = item.dataList[0].distributePerson;
+          this.listForm.breakdownList = item.breakdownList;
+        } else {
+          this.listForm = item.form
+          this.dataList = item.form.dataList
+        }
+
       });
     },
     //保存事件
     handleSave() {
-
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "6");
+      _formData.append("taskIds", this.taskIds);
+      _formData.append("json", JSON.stringify({
+        form: this.listForm,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
     },
     //提交事件
     handleSubmit() {

src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue

@@ -225,7 +225,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail,  saveTaskForPub } from "api/process";
 
 export default {
   name: "xmpg2Step4",
@@ -333,6 +333,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);
@@ -345,18 +346,38 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        this.listForm.prcNum = this.prcNum;
+        if(item.form === undefined){
-        this.listForm.prcName = this.prcName;
+          this.listForm.prcNum = this.prcNum;
-        this.listForm["id"] = item.id;
+          this.listForm.prcName = this.prcName;
-        this.listForm.dataList = item.dataList;
+          this.listForm["id"] = item.id;
-        this.dataList = item.dataList;
+          this.listForm.dataList = item.dataList;
-        // this.dataList.distributePerson = item.dataList[0].distributePerson;
+          this.dataList = item.dataList;
-        this.listForm.breakdownList = item.breakdownList;
+          this.listForm.breakdownList = item.breakdownList;
+        } else {
+          this.listForm = item.form
+          this.dataList = item.form.dataList
+        }
+
       });
     },
     //保存事件
     handleSave() {
-
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "6");
+      _formData.append("taskIds", this.taskIds);
+      _formData.append("json", JSON.stringify({
+        form: this.listForm,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
     },
     //提交事件
     handleSubmit() {

src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue

@@ -208,7 +208,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
 
 export default {
   name: "xmpg2Step5",
@@ -328,44 +328,64 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        this.listForm.prcNum = this.prcNum;
+        if(item.form === undefined){
-        this.listForm.prcName = this.prcName;
+          this.listForm.prcNum = this.prcNum;
-        this.listForm["id"] = item.id;
+          this.listForm.prcName = this.prcName;
-        this.listForm.dataList = item.dataList;
+          this.listForm["id"] = item.id;
-        this.dataList = item.dataList;
+          this.listForm.dataList = item.dataList;
-        console.log(this.dataList);
+          this.dataList = item.dataList;
-        // this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear
+          // this.dataList.standNumber = item.dataList.standSort + '\xa0\xa0' +item.dataList.standSort + '-' + item.dataList.standYear
-        let children = [];
+          let children = [];
-        item.breakdownList.forEach(
+          item.breakdownList.forEach(
-          item => {
+            item => {
-            let aa = {
+              let aa = {
-              key: item.standId,
+                key: item.standId,
-              id: item.id,
+                id: item.id,
-              standId: item.itemsNum,
+                standId: item.itemsNum,
-              itemsNum: item.itemsNum,
+                itemsNum: item.itemsNum,
-              itemsName: item.itemsName,
+                itemsName: item.itemsName,
-              workPeople: "请选择责任人"
+                workPeople: "请选择责任人"
-            };
+              };
-            children.push(aa);
+              children.push(aa);
-          }
+            }
-        );
+          );
-        this.dataList.forEach(key => {
+          this.dataList.forEach(key => {
-          key["children"] = [];
+            key["children"] = [];
-          children.forEach(breakDown => {
+            children.forEach(breakDown => {
-            if (key.standId === breakDown.key) {
+              if (key.standId === breakDown.key) {
-              key["children"].push(breakDown);
+                key["children"].push(breakDown);
+              }
+            });
+            if (key["children"].length === 0) {
+              delete key["children"];
             }
           });
-          if (key["children"].length === 0) {
+          this.listForm.children = children;
-            delete key["children"];
+        } else {
-          }
+          this.listForm = item.form
-        });
+          this.dataList = item.form.dataList
-        this.listForm.children = children;
+        }
+
       });
     },
     //保存事件
     handleSave() {
-
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "6");
+      _formData.append("taskIds", this.taskIds);
+      _formData.append("json", JSON.stringify({
+        form: this.listForm,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
     },
     //提交事件
     handleSubmit() {

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -338,7 +338,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail } from "api/process";
+import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
 
 export default {
   name: "xmpg2Step6",
@@ -470,16 +470,37 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
-        this.listForm.prcNum = this.prcNum;
+        if(item.form === undefined){
-        this.listForm.prcName = this.prcName;
+          this.listForm.prcNum = this.prcNum;
-        this.listForm["id"] = item.id;
+          this.listForm.prcName = this.prcName;
-        // this.listForm.dataList = item.dataList;
+          this.listForm["id"] = item.id;
-        this.dataList = this.listForm.dataList;
+          // this.listForm.dataList = item.dataList;
+          this.dataList = this.listForm.dataList;
+        } else {
+          this.listForm = item.form
+          this.dataList = item.form.dataList
+        }
+
       });
     },
     //保存事件
     handleSave() {
-
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "6");
+      _formData.append("taskIds", this.taskIds);
+      _formData.append("json", JSON.stringify({
+        form: this.listForm,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
     },
     //提交事件
     handleSubmit() {

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)

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -190,12 +190,14 @@
               </template>
             </el-table-column>
             <el-table-column
-                prop="XCXSSRQ"
+                prop="SSRQ"
-                sortable="putTime"
+                sortable="custom"
                 width="150px"
                 label="实施日期">
               <template slot-scope="scope">
-                {{ formatIssueDate(scope.row.putTime) }}
+<!--                {{ formatIssueDate(scope.row.putTime) }}-->
+                <span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
+
               </template>
             </el-table-column>
 
@@ -3509,6 +3511,10 @@ export default {
             if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) {
               res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ
             }
+            if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
+              res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
+              console.log(res.data.list[i].SSRQ);
+            }
           }
           this.stahndinfoList = res.data.list
           this.total = res.data.count

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -641,7 +641,7 @@
                 </el-form-item>
                 <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                               prop="standState" label-width="150px" class="add-form-item">
-                  <template slot="label">文本状态<i class="el-icon-warning-outline"></i></template>
+                  <template slot="label">文本状态</template>
                   <el-select v-model="sarStandardsInfoEO.textStatus"
                              placeholder="请选择文本状态"
                              clearable>

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">
               <el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
@@ -30,7 +30,7 @@
             <el-col :span="4" :push="3">项目级别: <span class="valueColor">{{ localProEO.projectLevel }} </span></el-col>
           </el-row>
           <el-row style="margin-top: 10px">
-            <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.projectManager }} </span></el-col>
+            <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
             <el-col :span="5" :push="1"> 项目计划开始时间: <span
                 class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
             <el-col :span="5" :push="2">项目计划完成时间: <span
@@ -599,6 +599,7 @@ export default {
     showLocalProductData(item) {
       console.log(item)
       this.localProEO = JSON.parse(JSON.stringify(item))
+      console.log(this.localProEO)
       this.proId = this.localProEO.id
       // 查询详情表格数据
       this.$http.get('sarStandProjectLibrary/queryStandInfo', {

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -458,8 +458,22 @@ export default {
         _this: this
       }, res => {
         this.myLoading.loadData = false
-        this.nonList = res.data.records
         this.total = res.data.total
+        this.nonList = res.data.records
+        this.nonList.forEach(item => {
+          // 责任部门转换
+          if (item.responsibleUnit !== null || item.responsibleUnit !== "") {
+            let k = (item.responsibleUnit || "").split(",");
+            for (let i in this.zrbmOptions) {
+              for (let m = 0; m < k.length; m++) {
+                if (this.zrbmOptions[i].value === k[m]) {
+                  k[m] = this.zrbmOptions[i].label;
+                }
+                item.responsibleUnit = k.join(",");
+              }
+            }
+          }
+        });
       }, e => {
         this.myLoading.loadData = false
       })
@@ -665,18 +679,15 @@ export default {
     },
   },
   mounted () {
+
     // 从数据库中查询各下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {
-      this.allSelectOptions = res.data || {}
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.getTableByPage()
-      this.getGzzOption()
-      this.setMap(this.standStateOptions)
     }, e => {
     })
-    this.getTableByPage()
     // 加载所有的部门
     this.getOrgTreeSource()
   }

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>
 

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -11,19 +11,27 @@
             <div v-show="heightShow" class="transition-box">
                 <p class="transition-box-p">
                     <label class="transition-box-label">标准号：</label>
-                    <span class="transition-box-span" @click="handlePreview($route.query.item)">{{ $route.query.item.cid }}</span>
+                    <span class="transition-box-span table-jump"
+                          @click="handlePreview(itemData)"
+                    >
+                      {{ this.$route.query.item.cid }}
+                    </span>
                 </p>
                 <p class="transition-box-p">
                     <label class="transition-box-label">标准名称：</label>
-                    <span class="transition-box-span">{{ $route.query.item.cname || '-' }}</span>
+                    <span class="transition-box-span table-jump"
+                          @click="handlePreview(itemData)"
+                    >
+                      {{ this.$route.query.item.cname || '-' }}
+                    </span>
                 </p>
                 <p class="transition-box-p">
                     <label class="transition-box-label">上传时间：</label>
-                    <span class="transition-box-span">{{ $route.query.item.endTime || '-' }}</span>
+                    <span class="transition-box-span">{{ this.$route.query.item.startTime || '-' }}</span>
                 </p>
                 <p class="transition-box-p">
                     <label class="transition-box-label">征求意见周期：</label>
-                    <span class="transition-box-span" v-if="$route.query.item.startTime && $route.query.item.endTime">{{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}}</span>
+                    <span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
                     <span class="transition-box-span" v-else>-</span>
                 </p>
             </div>
@@ -120,6 +128,7 @@
         name: 'consultationDetails',
         data () {
             return {
+                itemData: this.$route.query.item,
                 id: '', // 选中id
                 type: '', // 选中状态
                 spinShow: false,
@@ -152,6 +161,17 @@
             }
         },
         methods: {
+          // 点击查看
+          handlePreview (item) {
+            let routeUrl = this.$router.resolve({
+              name: 'OtherStandardDetails',
+              params: {
+                id: item.standId,
+                pageType: 'INLAND_STAND'
+              }
+            })
+            window.open(routeUrl.href, '_blank')
+          },
             exportAll () {
                 window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid)
             },
@@ -166,21 +186,6 @@
                     }
                 })
             },
-
-          //点击查看
-          handlePreview(data) {
-            console.log(data);
-            return
-            let routeUrl = this.$router.resolve({
-              name: "OtherStandardDetails",
-              params: {
-                id: data.id,
-                pageType: data.standType
-              }
-            });
-            window.open(routeUrl.href, "_blank");
-          },
-
             // 获取详情信息列表
             getList() {
                 this.spinShow = true
@@ -188,7 +193,6 @@
                     _this: this
                 }, res => {
                     this.standinfoList = res.data.records
-                    console.log(this.standinfoList);
                     this.total = res.data.total
                     this.spinShow = false
                 }, e => {
@@ -272,10 +276,10 @@
                             cid: this.$route.query.item.cid,
                             content: this.opinionContent.content,
                             partCode: this.opinionContent.partCode,
-                            userId: this.$store.getters.userInfo.userId,
+                            userId: this.$store.getters.userInfo.userId || '',
-                            userName: this.$store.getters.userInfo.account,
+                            userName: this.$store.getters.userInfo.userName || '',
-                            deptName: this.$store.getters.userInfo.orgName,
+                            deptName: this.$store.getters.userInfo.orgName || '',
-                            deptId: this.$store.getters.userInfo.orgId
+                            deptId: this.$store.getters.userInfo.orgId || ''
                         }
                         if (this.type === 'edit') {
                             form.id = this.id

src/sysConfig/index.js

@@ -6,7 +6,7 @@
 // 服务器地址
 // const devIp = '10.96.10.171'
 // const devInterfacePORT = '9999'
-const devIp = 'localhost'
+const devIp = '10.96.170.156'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'