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

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -18,6 +18,7 @@
             :showRMenu="jurisdictionCheckForTree"
             :isHideRNode="jurisdictionCheckForTree"
             :editable="jurisdictionCheckForTree"
+            expandFirst
             showCopyBtn
             deptSelect
             autoSelect

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

@@ -14,6 +14,7 @@
                 <el-form
                         ref="bzzqyjForm"
                         :model="form"
+                        :rules="formRules"
                         class="label-input-form"
                         label-width="210px"
                 >
@@ -499,7 +500,7 @@
                     _this: this
                 }, res => {
                     this.standInfoList = res.data.list
-                    this.total = res.data.total
+                    this.total = res.data.count
                     this.spinShow = false
                 }, e => {
                 })

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

@@ -198,6 +198,7 @@
             </el-table>
         </div>
         <ProcessFooter
+                show-save
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
@@ -220,7 +221,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: "bzjdStep2",
@@ -306,7 +307,26 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
+            handleSave() {
+
+                this.saveLoading = true
+                let _formData = new FormData()
+                _formData.append('taskIds', this.taskIds)
+                _formData.append('pId', this.pId)
+                _formData.append('json', JSON.stringify({
+                    form: this.form,
+                    roleForm: this.roleForm,
+                    commentText: this.commentText,
+                    itemList: this.itemList,
+                    sarType: this.sarType
+                }))
+                saveTaskForPub(_formData).then(res => {
+                    this.saveLoading = false
+                    this.$message.success('保存成功')
+                }).catch(e => {
+                    this.saveLoading = false
+                })
+            },
             handleSubmit() {
                 this.$refs['bzzqyjForm'].validate((valid) => {
                     if (valid) {

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

@@ -530,7 +530,12 @@
                         this.form.itemsName1 = data.itemsName1
                         this.sarType = data.standInData
                         this.json = data
-                        const itemList = JSON.parse(data.itemList)
+                        let itemList
+                        if (typeof (data.itemList) == 'string') {
+                            itemList = JSON.parse(data.itemList)
+                        } else {
+                            itemList = data.itemList
+                        }
                         itemList.forEach(item => {
                             item.unitDeptName = this.$store.getters.userInfo.orgName
                             item.onlineData = ''
@@ -542,6 +547,7 @@
                             item.technicalRequir = ''
                             item.itemsTitle = item.itermsConditions
                         })
+                        console.log(2);
                         this.itemList = itemList
                         this.loading = false
                     }).catch(e => {

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

@@ -363,7 +363,7 @@
                         this.sarType = data.standInData
                         this.json = data
                         this.itemList = data.itemList
-                        this.loading = true
+                        this.loading = false
                     }).catch(e => {
                     })
                 })

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

@@ -976,38 +976,51 @@
                 <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
             </div>
         </el-dialog>
-        <el-drawer
+        <Role-tree
-                :title="drawerTitle"
+                is-title="选择责任部门对接人"
-                :visible.sync="modalShowFlag"
+                :is-visible.sync="modalShowRoleFlag"
-                :wrapperClosable="false"
+                @checkedRole="checkedRole2"
-                size="800px">
+                :nodeList="nodeList2"
-          <el-input
+        ></Role-tree>
-              style="width:70%;padding: 10px"
+        <Role-tree
-              placeholder="请输入姓名"
+                check-box
-              v-model="filterText">
+                :is-title="drawerTitle"
-          </el-input>
+                :is-visible.sync="modalShowFlag"
-            <el-tree
+                @checkedRole="checkedRole"
-                    :filter-node-method="filterNode"
+                :nodeList="nodeList"
-                    v-if="modalShowFlag"
+        ></Role-tree>
-                    node-key="id"
+<!--        <el-drawer-->
-                    style="height: 100%; overflow: auto;"
+<!--                :title="drawerTitle"-->
-                    class="filter-tree"
+<!--                :visible.sync="modalShowFlag"-->
-                    :data="treeData"
+<!--                :wrapperClosable="false"-->
-                    :props="defaultUserProps"
+<!--                size="800px">-->
-                    :default-checked-keys="nodeList"
+<!--          <el-input-->
-                    highlight-current
+<!--              style="width:70%;padding: 10px"-->
-                    check-strictly
+<!--              placeholder="请输入姓名"-->
-                    @check="drawerCheck"
+<!--              v-model="filterText">-->
-                    default-expand-all
+<!--          </el-input>-->
-                    :expand-on-click-node="false"
+<!--            <el-tree-->
-                    show-checkbox
+<!--                    :filter-node-method="filterNode"-->
-                    ref="tree">
+<!--                    v-if="modalShowFlag"-->
-            </el-tree>
+<!--                    node-key="id"-->
-            <div id="roleFormButton" class="demo-drawer-footer">
+<!--                    style="height: 100%; overflow: auto;"-->
-                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+<!--                    class="filter-tree"-->
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
+<!--                    :data="treeData"-->
-            </div>
+<!--                    :props="defaultUserProps"-->
-        </el-drawer>
+<!--                    :default-checked-keys="nodeList"-->
+<!--                    highlight-current-->
+<!--                    check-strictly-->
+<!--                    @check="drawerCheck"-->
+<!--                    default-expand-all-->
+<!--                    :expand-on-click-node="false"-->
+<!--                    show-checkbox-->
+<!--                    ref="tree">-->
+<!--            </el-tree>-->
+<!--            <div id="roleFormButton" class="demo-drawer-footer">-->
+<!--                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>-->
+<!--                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>-->
+<!--            </div>-->
+<!--        </el-drawer>-->
         <!-- 选择标准的弹框 -->
         <el-drawer
                 ref="standard"
@@ -1256,6 +1269,7 @@
                     label: 'model'
                 },
                 nodeList: [],
+                nodeList2: [],
                 type: '',
                 defaultUserProps: {
                     children: 'children',
@@ -1267,6 +1281,7 @@
                 key3:4,
                 treeData: [], // 人员数据
                 modalShowFlag: false, // drawer开关
+                modalShowRoleFlag: false, // drawer开关
                 modalShowFlag1: false, // drawer开关
                 modalShowFlag2: false, // drawer开关
                 modalShowFlag3: false, // drawer开关
@@ -1491,6 +1506,39 @@
             },
         },
         methods: {
+            choiceZRRS () {
+                if (this.userType === 'zrUserId') {
+                    this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
+                    this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
+                }
+                this.modalshowflag2 = true
+            },
+            checkedRole2 (data) {
+                var idList = ''
+                var nameList = ''
+                data.forEach( item => {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                })
+                this.zrUserIds = idList
+                this.zrUserIds = nameList
+            },
+            checkedRole (data) {
+              if (this.userType === 'jlUserId') {
+                    this.roleForm.jlUserId = data[0].id
+                    this.roleForm.jlUserName = data[0].name
+                }else if(this.userType === 'zrUserId'){
+                this.roleForm.zrUserId=data[0].id;
+                this.roleForm.zrUserName=data[0].name;
+
+              }
+
+
+            },
           // z责任人会签姓名搜索
           filterNode(value, data) {
             if (!value) return true;
@@ -1792,6 +1840,7 @@
             },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+
                     this.treeData = res.data
                 })
             },

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

@@ -253,7 +253,7 @@
     </ProcessFooter>
     <Role-tree
       check-box
-      :is-title="drawerTitle"
+      is-title="选择人员信息"
       :is-visible.sync="modalshowflag"
       :nodeList="nodeList"
       @checkedRole="drawerCheck"
@@ -303,6 +303,7 @@ export default {
         dockUserName: '',
         dockUser: ''
       },
+      deleteDataList: [],
       roleFormRules: {
         dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
       },
@@ -476,7 +477,7 @@ export default {
         this.$message.warning('请选择基础信息进行添加')
       } else {
         if (this.roleForm.dockUserName === '') {
-          this.$message.warning('请选择基础信息进行添加')
+          this.$message.warning('请完善人员信息')
         } else {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {

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

@@ -123,7 +123,7 @@
                     @click.native="clickOpen(scope.row)"
                     v-model="scope.row.dutyPeopleInfo"
                     size="mini"
-                    placeholder="请输入内容"
+                    placeholder="请选择分发责任人"
                     />
             </template>
           </el-table-column>
@@ -220,8 +220,8 @@
     >
     </ProcessFooter>
     <Role-tree
+      is-title="选择人员信息"
       check-box
-      :is-title="drawerTitle"
       :is-visible.sync="modalshowflag"
       :nodeList="nodeList"
       @checkedRole="drawerCheck"
@@ -234,7 +234,7 @@ import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import { roleTreeData } from "@/api/unqualProcess.js"
-import {completeTask, inboundLiaisonDetail} from "@/api/process.js"
+import {completeTask, inboundLiaisonDetail, saveinboundTask, saveTaskForPub} from "@/api/process.js"
 
 export default {
   name: "wfhxzgStep2",
@@ -367,12 +367,28 @@ export default {
     },
 
     // 保存按钮
-    handleSave() {},
+    handleSave() {
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('taskIds', this.taskIds)
+      _formData.append('json', JSON.stringify({
+        // roleForm: this.roleForm,
+        standardInfoList: this.dataList,
+        commentText: this.commentText
+      }))
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
     // 提交按钮
     handleSubmit() {
       this.isSubmit = true
       let zqa = new Map();
-      for (let lastDataListElement of this.lastDataList) {
+      for (let lastDataListElement of this.dataList) {
         let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
         if( a == null){
           a = {

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

@@ -229,7 +229,7 @@
     </ProcessFooter>
     <Role-tree
       check-box
-      :is-title="drawerTitle"
+      is-title="选择人员信息"
       :is-visible.sync="modalshowflag"
       :nodeList="nodeList"
       @checkedRole="drawerCheck"
@@ -241,7 +241,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {completeTask, inboundLiaisonDetail} from "@/api/process.js";
+import {completeTask, inboundLiaisonDetail, saveTaskForPub} from "@/api/process.js";
 
 export default {
   name: "wfhxzgStep3",
@@ -405,7 +405,41 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     // 保存按钮
-    handleSave() {},
+    handleSave() {
+      this.isSubmit = true
+      let zqa = new Map();
+      for (let lastDataListElement of this.dataList) {
+        let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
+        if( a == null){
+          a = {
+            id: lastDataListElement.dutyPeopleInfoId,
+            name: lastDataListElement.dutyPeopleInfo,
+            standardInfoList: []
+          }
+        }
+        a.standardInfoList.push(lastDataListElement);
+        zqa.set(a.id, a);
+      }
+      let list = [];
+      for(let item of zqa) {
+        list.push(item[1])
+      }
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('taskIds', this.taskIds)
+      _formData.append('json', JSON.stringify({
+        // roleForm: this.roleForm,
+        dockUserList: list,
+        commentText: this.commentText
+      }))
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
     // 提交按钮
     handleSubmit() {
       this.isSubmit = true
@@ -418,7 +452,7 @@ export default {
       })
       if(flag)return this.$message.warning('请选择负责人填入')
       let zqa = new Map();
-      for (let lastDataListElement of this.lastDataList) {
+      for (let lastDataListElement of this.dataList) {
         let a = zqa.get(lastDataListElement.dutyPeopleId)
         if( a == null){
           a = {

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

@@ -230,7 +230,7 @@ import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {uploadFile} from '@/api/unqualProcess.js';
-import {inboundLiaisonDetail, completeTask} from "@/api/process"
+import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process"
 
 export default {
   name: "wfhxzgStep4",
@@ -306,10 +306,13 @@ export default {
     },
     getFormFieldList (item) {
       this.$nextTick(() => {
-
+        let listJSON = JSON.parse(JSON.stringify(item.responUserInfo.info))
-        this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))]
+        if (listJSON.length !== undefined) {
+          this.dataList = listJSON
+        } else {
+          this.dataList = [listJSON]
+        }
         this.newDataList = []
-        console.log(this.dataList)
           this.dataList.forEach(item => {
           if (item.fileText.length !== 0) {
             item.fileText.forEach(item1 => {
@@ -402,7 +405,40 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     // 保存按钮
-    handleSave() {},
+    handleSave() {
+      let zqa = new Map();
+      for (let lastDataListElement of this.dataList) {
+        let a = zqa.get(lastDataListElement.dutyPeopleId)
+        if( a == null){
+          a = {
+            standardInfoList: []
+          }
+        }
+        a.standardInfoList.push(lastDataListElement);
+        zqa.set(a.id, a);
+      }
+      let list = []
+      for(let item of zqa) {
+        list.push(item[1].standardInfoList)
+      }
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('taskIds', this.taskIds)
+      _formData.append('json', JSON.stringify({
+        // roleForm: this.roleForm,
+        responUserInfo: {
+          info: this.dataList.splice(-1, 1)
+        },
+        commentText: this.commentText
+      }))
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
     // 提交按钮
     handleSubmit() {
       this.isSubmit = true

src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue

@@ -30,6 +30,7 @@
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -37,6 +38,7 @@
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -232,12 +234,14 @@
                   <el-input
                     v-model="projectSearch.projectNumber"
                     placeholder="请输入项目编号"
+                    disabled
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="项目名称" class="search-item search-item-last">
                   <el-input
                     v-model="projectSearch.projectName"
                     placeholder="请输入项目名称"
+                    disabled
                   ></el-input>
                 </el-form-item>
                 <el-form-item class="search-item btn-box">

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

@@ -30,6 +30,7 @@
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -37,6 +38,7 @@
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>

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

@@ -24,6 +24,7 @@
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -31,6 +32,7 @@
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>

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

@@ -24,6 +24,7 @@
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -31,6 +32,7 @@
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>

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

@@ -24,6 +24,7 @@
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -31,6 +32,7 @@
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>

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

@@ -24,6 +24,7 @@
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -31,6 +32,7 @@
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>

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

@@ -24,12 +24,14 @@
                 <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"
+                  disabled
                   placeholder="请输入项目名称"
                   clearable
                 ></el-input>

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

@@ -24,6 +24,7 @@
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -31,6 +32,7 @@
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>

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

@@ -24,6 +24,7 @@
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -31,6 +32,7 @@
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>

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

@@ -24,6 +24,7 @@
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -31,6 +32,7 @@
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>

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

@@ -24,6 +24,7 @@
                                 <el-input
                                         v-model="listForm.projectNumber"
                                         placeholder="请输入项目编号"
+                                        disabled
                                         clearable
                                 ></el-input>
                             </el-form-item>
@@ -31,6 +32,7 @@
                                 <el-input
                                         v-model="listForm.projectName"
                                         placeholder="请输入项目名称"
+                                        disabled
                                         clearable
                                 ></el-input>
                             </el-form-item>

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

@@ -24,6 +24,7 @@
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -31,6 +32,7 @@
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>

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

@@ -24,6 +24,7 @@
                 <el-input
                   v-model="listForm.projectNumber"
                   placeholder="请输入项目编号"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>
@@ -31,6 +32,7 @@
                 <el-input
                   v-model="listForm.projectName"
                   placeholder="请输入项目名称"
+                  disabled
                   clearable
                 ></el-input>
               </el-form-item>

src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue

@@ -201,7 +201,7 @@
             style="width: 100%;"
             :model="historySeeForm"
           >
-            <el-form-item class="add-form-item" label="标准编号:">
+            <el-form-item class="add-form-item" label="标准号:">
               <div class="seeItem">{{historySeeForm.standSerialNumber}}</div>
             </el-form-item>
             <el-form-item class="add-form-item" label="标准名称:">
@@ -232,7 +232,7 @@
               <div class="seeItem">{{historySeeForm.qaEngineer}}</div>
             </el-form-item>
             <el-form-item class="add-form-item" label="要求关闭时间:">
-              <div class="seeItem">{{historySeeForm.actualCloseTime}}</div>
+              <div class="seeItem">{{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}</div>
             </el-form-item>
           </el-form>
         </div>
@@ -566,6 +566,7 @@ export default {
       this.$nextTick(() => {
         const arr = []
         let questionType = []
+        if (this.historySeeForm.quesType){
         questionType = this.historySeeForm.quesType.split(',')
         questionType.map((item) => {
           this.optionList.map((opr) => {
@@ -576,6 +577,7 @@ export default {
           })
         })
         this.historySeeForm.quesType = arr.toString()
+        }
       })
     },
     // 分页事件

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

@@ -5,7 +5,7 @@
       <div class="content-top">
         <el-form :modal="nonConformitySearch" inline class="label-input-form">
           <el-form-item label="标准号/标准名称" class="search-item">
-            <el-input v-model="nonConformitySearch.standId"
+            <el-input v-model="nonConformitySearch.standSerialNumber"
                       placeholder="请输入"
                       clearable
                       :maxlength="100"></el-input>
@@ -269,7 +269,7 @@
                   <div class="seeItem">{{historySeeForm.qaEngineer}}</div>
                 </el-form-item>
                 <el-form-item class="add-form-item" label="计划关闭时间:">
-                  <div class="seeItem">{{historySeeForm.planCloseTime}}</div>
+                  <div class="seeItem">{{historySeeForm.planCloseTime ? historySeeForm.planCloseTime.substring(0, 11) : '-'}}</div>
                 </el-form-item>
               </el-form>
             </div>
@@ -384,7 +384,7 @@
                 </div>
                 <div class="typeitems">
                   <div class="itemsLeft">验证时间:</div>
-                  <div class="itemsRight">{{(item.validTime ? item.validTime.substring(0, 11): '')}}</div>
+                  <div class="itemsRight">{{(item.validTime ? item.validTime.substring(0, 11) : '')}}</div>
                 </div>
                 <div class="typeitems">
                   <div class="itemsLeft">验证结果:</div>
@@ -430,6 +430,7 @@ export default {
       pageNo: 1,
       nonConformitySearch: {
         standId: '', // 标准号/名称
+        standSerialNumber:'',
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
       },
@@ -591,16 +592,18 @@ export default {
       this.$nextTick(() => {
         const arr = []
         let questionType = []
-        questionType = this.historySeeForm.quesType.split(',')
+        if (this.historySeeForm.quesType) {
-        questionType.map((item) => {
+          questionType = this.historySeeForm.quesType.split(',')
-          this.optionList.map((opr) => {
+          questionType.map((item) => {
-            if (item === opr.value) {
+            this.optionList.map((opr) => {
-              item = opr.label
+              if (item === opr.value) {
-              arr.push(item)
+                item = opr.label
-            }
+                arr.push(item)
+              }
+            })
           })
-        })
+          this.historySeeForm.quesType = arr.toString()
-        this.historySeeForm.quesType = arr.toString()
+        }
       })
     },
   //点击编辑按钮事件

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

@@ -32,54 +32,52 @@
             <el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">添加</el-button>
             <el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
         </div>
-        <div class="container" style="position:relative;">
+        <div class="container">
-            <div style="position: absolute;top: 0;left: 0;bottom: 0;right: 0;">
+            <el-table
-                <el-table
+                    :data="standinfoList"
-                        :data="standinfoList"
+                    height="100%"
-                        height="100%"
+                    border
-                        border
+                    style="width: 100%"
-                        style="width: 100%"
+                    :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-                        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
-                    <el-table-column
+                <el-table-column
-                            prop="partCode"
+                        prop="partCode"
-                            label="章节编号"
+                        label="章节编号"
-                            align="center"
+                        align="center"
-                            width="180">
+                        width="180">
-                    </el-table-column>
+                </el-table-column>
-                    <el-table-column
+                <el-table-column
-                            prop="content"
+                        prop="content"
-                            align="center"
+                        align="center"
-                            label="修改意见内容(包括理由或依据)"
+                        label="修改意见内容(包括理由或依据)"
-                    >
+                >
-                    </el-table-column>
+                </el-table-column>
-                    <el-table-column
+                <el-table-column
-                            prop="deptName"
+                        prop="deptName"
-                            align="center"
+                        align="center"
-                            label="提出部门"
+                        label="提出部门"
-                    >
+                >
-                    </el-table-column>
+                </el-table-column>
-                    <el-table-column
+                <el-table-column
-                            prop="userName"
+                        prop="userName"
-                            align="center"
+                        align="center"
-                            label="提出人"
+                        label="提出人"
-                    >
+                >
-                    </el-table-column>
+                </el-table-column>
-                    <el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
+                <el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
-                        <template slot-scope="scope">
+                    <template slot-scope="scope">
-                            <div @click.stop style="display: inline-block">
+                        <div @click.stop style="display: inline-block">
-                                <el-dropdown trigger="click" @command="handleCommand">
+                            <el-dropdown trigger="click" @command="handleCommand">
-                                    <i v-if="scope.row.userId === $store.getters.userInfo.userId" class="iconfont">&#xe61e;</i>
+                                <i class="iconfont">&#xe61e;</i>
-                                    <el-dropdown-menu slot="dropdown">
+                                <el-dropdown-menu slot="dropdown">
-                                        <el-dropdown-item v-if="scope.row.userId === $store.getters.userInfo.userId" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
+                                    <el-dropdown-item v-if="scope.row.userId === $store.getters.userInfo.userId" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                                        <el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>
+                                    <el-dropdown-item v-if="scope.row.userId === $store.getters.userInfo.userId" :command="[scope.row, '删除']">删除</el-dropdown-item>
-                                    </el-dropdown-menu>
+                                </el-dropdown-menu>
-                                </el-dropdown>
+                            </el-dropdown>
-                            </div>
+                        </div>
-                        </template>
+                    </template>
-                    </el-table-column>
+                </el-table-column>
-                </el-table>
+            </el-table>
-            </div>
         </div>
         <pagination
                 style="position: static;width: 100%;"
@@ -174,15 +172,9 @@
                     _this: this
                 }, res => {
                     this.standinfoList = res.data.records
+                    console.log(this.standinfoList);
                     this.total = res.data.total
                     this.spinShow = false
-                    res.data.records.forEach(item => {
-                        if (item.ideaKey == 1) {
-                            this.ideaKey = false
-                        } else {
-                            this.ideaKey = true
-                        }
-                    })
                 }, e => {
                 })
             },
@@ -388,6 +380,7 @@
             display: flex;
             margin:10px 0;
             flex-direction: column;
+            padding: 0;
             .el-tabs{
                 height: 100%;
                 display: flex;

src/sysConfig/index.js

@@ -6,7 +6,7 @@
 // 服务器地址
 // const devIp = '10.96.10.171'
 // const devInterfacePORT = '9999'
-const devIp = '10.96.170.156'
+const devIp = '127.0.0.1'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -31,7 +31,7 @@ const processPort = '17210'
  *****************************************************************/
 // 生产环境配置
 const prodIp = '62.234.136.153'
-const prodInterfacePORT = '8033'
+const prodInterfacePORT = '8038'
 
 
 // 判断环境