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

src/App.vue

@@ -341,7 +341,6 @@ export default {
   //background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
   background-size: 100% 100%;
   font-family: MicrosoftYaHei, 微软雅黑;
-
   & > div {
     position: absolute;
     top: 0;

src/components/CustomFormComponents/File.vue

@@ -267,7 +267,11 @@ export default {
     },
     uploadSuccess(res, file, fileList) {
       if (res.ok) {
-        // this.value += res.data.id + ','
+          let obj = {name: '', response: {}}
+          obj.name = file.response.data.oldFileName
+          obj.response.data = file.response.data
+          this.showFileList.push(obj)
+          // this.value += res.data.id + ','
         this.$emit('input', this.value ? this.value + ','+ res.data.id + ',' : this.value+ res.data.id + ',')
         this.$emit('success')
         this.$message({
@@ -314,7 +318,6 @@ export default {
           this.$emit('input', '')
         }
       }
-
       const showFileList = []
       fileList.map(item => {
         let obj = {name: '', response: {}}

src/components/CustomFormComponents/InputForAllStandards2.vue

@@ -196,7 +196,11 @@
         },
         computed: {
             placeholder () {
-                return `${this.placeholderText}`
+                if (this.placeholderText){
+                    return `${this.placeholderText}`
+                } else {
+                    return `请输入${this.config.attrName}`
+                }
             },
             showMessage () {
                 return `${this.config.attrName}不能为空`

src/pages/config/pages/mechanismManage/index.vue

@@ -68,6 +68,12 @@
                 清空
               </el-button>
             </el-form-item>
+
+            <el-form-item>
+              <el-button size="mini" type="primary" @click="selectEdit">
+                批量配置岗位
+              </el-button>
+            </el-form-item>
           </el-form>
         </div>
         <el-table
@@ -78,8 +84,14 @@
           style="width: 100%; flex: auto;"
           class="drag-table"
           height="100%"
+          @selection-change="selectedData"
           :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
             prop="account"
             label="账号"
@@ -177,7 +189,7 @@
     <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
     <el-drawer
       class="postPage"
-      title="配置岗位"
+      :title="drawerTitle"
       :visible.sync="modalPost"
       :wrapperClosable="false"
       size="800px"
@@ -269,7 +281,10 @@ export default {
       data: [], // table数据
       treeLoading: false,
       Loading: false,
-      id: ''
+      id: '',
+      // 批量配置岗位勾选暂存
+      manageData: [],
+      drawerTitle: '配置岗位'
     }
   },
   methods: {
@@ -285,16 +300,30 @@ export default {
       this.modalPost = false
     },
     PostSubmit() {
-      this.$http.postData('sarUser/user/position', {
+      if (this.drawerTitle === '配置岗位') {
-        positionIds: this.$refs.tree2.getCheckedKeys(),
+        this.$http.postData('sarUser/user/position', {
-        userId: this.userId
+          positionIds: this.$refs.tree2.getCheckedKeys(),
-      }, {}, res => {
+          userId: this.userId
-        if (res.ok) {
+        }, {}, res => {
-          this.$message.success('配置岗位成功')
+          if (res.ok) {
-          this.modalPost = false
+            this.$message.success('配置岗位成功')
-          this.getData()
+            this.modalPost = false
-        }
+            this.getData()
-      })
+          }
+        })
+      } else {
+        this.$http.postData('sarUser/user/positionBatch', {
+          positionIds: this.$refs.tree2.getCheckedKeys(),
+          userId: this.userId
+        }, {}, res => {
+          if (res.ok) {
+            this.$message.success('配置岗位成功')
+            this.modalPost = false
+            this.getData()
+          }
+        })
+      }
+
     },
     searchPostName() {
       this.page = 1;
@@ -407,7 +436,6 @@ export default {
         loading: 'treeLoading'
       }, res => {
         this.treeData = res.data
-        console.log(this.treeData);
         this.nodeKeyId = this.treeData[0].id
         this.$nextTick(function () {
           this.$refs.tree.setCurrentKey(this.nodeKeyId)
@@ -493,6 +521,20 @@ export default {
       this.pageSize = pageSize
       this.getTree2()
     },
+
+    /** 批量编辑岗位的勾选数据 */
+    selectedData(val) {
+      this.manageData = val
+    },
+
+    selectEdit() {
+      this.userId = []
+      this.manageData.forEach(item=>{
+        this.userId.push(item.userId)
+      })
+      this.drawerTitle = '批量配置岗位'
+      this.modalPost = true
+    },
   },
   computed: {},
   watch: {

src/pages/home2/components/todoList/index.vue

@@ -1423,6 +1423,170 @@ export default {
             }
           })
           break
+        case '23':
+          if (row.taskInfo === '工作组组长指派责任人') {
+            this.$router.push({
+              name: 'qbfsStep2',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '工作组成员标准复审') {
+            this.$router.push({
+              name: 'qbfsStep3',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '工作组组长审批') {
+            this.$router.push({
+              name: 'qbfsStep4',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+        case '24':
+          if (row.taskInfo === '标准法规部部长审核') {
+            this.$router.push({
+              name: 'qbfzStep2',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '会签并填写意见') {
+            this.$router.push({
+              name: 'qbfzStep3',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '起草人修改标准状态') {
+            this.$router.push({
+              name: 'qbfzStep4',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '标准法规部部长审核1') {
+            this.$router.push({
+              name: 'qbfzStep5',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '审定责任人审定') {
+            this.$router.push({
+              name: 'qbfzStep6',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '批准负责人批准') {
+            this.$router.push({
+              name: 'qbfzStep7',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
+        case '25':
+          if (row.taskInfo === '部门高级经理审批') {
+            this.$router.push({
+              name: 'qbzxdjhgkStep2',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if(row.taskInfo === '部门中心主任会签') {
+            this.$router.push({
+              name: 'qbzxdjhgkStep3',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '标准法规工作组组长审定') {
+            this.$router.push({
+              name: 'qbzxdjhgkStep4',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '标准法规部部长审批') {
+            this.$router.push({
+              name: 'qbzxdjhgkStep5',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '企标制修订计划整改') {
+            this.$router.push({
+              name: 'qbzxdjhgkStep1',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
         case 'laws2':
           if (row.taskInfo === '责任对接人进行任务下发') {
             this.$router.push({

src/pages/login/index.vue

@@ -183,7 +183,7 @@
                     if (hasHomeMenu) {
                         this.setMenu(JSON.stringify(menuList)).then(res => {
                             if (this.showIETips) {//判断是否IE浏览器
-                                alert('检测到您使用的是IE浏览器,已经和时代脱轨了!建议您更换为谷歌浏览器')
+                                alert('为了最佳显示效果 请使用google chrome')
                             }
                             this.$router.push('/home2')
                         }, e => {

src/pages/loginVerify/index.vue

@@ -84,7 +84,7 @@
                             if(routerParam && routerParam != ''){
                                 const UA = navigator.userAgent.toLocaleLowerCase()
                                 if (UA.match(/msie/) != null || UA.match(/trident/) != null) {
-                                    alert('检测到您使用的是IE浏览器,已经和时代脱轨了!建议您更换为谷歌浏览器')
+                                    alert('为了最佳显示效果 请使用google chrome')
                                 }
                                 const param = routerParam.split("&");
                                 this.$router.push({

src/pages/processCenter/pages/components/ProcessMixin.vue

@@ -38,7 +38,7 @@ export default {
           value: "4"
         },
         {
-          label: "项目合规评估流程-标准",
+          label: "标准合规评估流程",
           value: "5"
         },
         {
@@ -57,6 +57,14 @@ export default {
           label: '项目清单确认流程',
           value: "10"
         },
+        {
+          label: "政策课题组参会流程",
+          value: "18"
+        },
+        {
+          label: "政策课题组入会流程",
+          value: "17"
+        },
         {
           label: "外部署名推荐审批流程",
           value: "16"
@@ -66,7 +74,7 @@ export default {
           value: "15"
         },
         {
-          label: "参与外部标准制修订信息提报六合彩能",
+          label: "参与外部标准制修订信息提报流程",
           value: "14"
         },
         {

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

@@ -209,7 +209,7 @@
                 @checkedRole="checkedRole"
                 :nodeList="nodeList"
         ></Role-tree>
-        <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
+        <el-dialog width='400px' :visible.sync="fileMadel" title="上传调研模板">
             <el-upload
                     multiple
                     class="upload-demo"

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

@@ -213,6 +213,7 @@
     ></Role-tree>
     <el-dialog width='400px' :visible.sync="fileMadel" title="上传调研模板">
       <el-upload
+              v-if="fileMadel"
               multiple
               class="upload-demo"
               drag
@@ -224,7 +225,7 @@
               :on-success="importFileSuccess"
               :on-remove="importFileRemove"
               :show-file-list="true"
-              :file-list="form.fjList"
+              :file-list="form.modelList"
       >
         <div style="padding: 20px 0">
           <i class="el-icon-upload" style="color: #3399ff"></i>
@@ -234,6 +235,7 @@
     </el-dialog>
     <el-dialog width='400px' :visible.sync="fileMadel2" title="上传附件">
       <el-upload
+              v-if="fileMadel2"
               multiple
               class="upload-demo"
               drag
@@ -245,7 +247,7 @@
               :on-success="importFileSuccess2"
               :on-remove="importFileRemove2"
               :show-file-list="true"
-              :file-list="form.modelList"
+              :file-list="form.fjList"
       >
         <div style="padding: 20px 0">
           <i class="el-icon-upload" style="color: #3399ff"></i>

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

@@ -199,7 +199,6 @@
         </div>
         <ProcessFooter
                 :show-save="submitShow"
-                show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
                 :show-submit="submitShow"

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

@@ -90,7 +90,7 @@
                 </el-button>
             </div>
             <el-table border
-                      ref="selection"
+                      ref="filterTable"
                       :data="itemList"
                       tooltip-effect="dark"
                       style="width: 100%;"
@@ -623,6 +623,11 @@
             ProcessTitle
         },
         methods: {
+            handleResize() {
+                this.$nextTick(()=> {
+                    this.$refs.filterTable.doLayout();
+                });
+            },
             PLedit () {
                 if (this.zrIdList.length > 0) {
                     this.PLmodalType = 2
@@ -1114,6 +1119,7 @@
             }
         },
         mounted () {
+            window.addEventListener('resize', this.handleResize);
             this.$http.get('sys/dictype/getDicTypeListCode', '', {
                 _this: this
             }, res => {

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

@@ -130,7 +130,7 @@
         <template slot="title">拆分信息</template>
       </ProcessTitle>
       <el-table border
-                ref="selection"
+                ref="filterTable"
                 :data="itemList"
                 tooltip-effect="dark"
                 style="width: 100%;"
@@ -393,6 +393,11 @@ export default {
     ProcessTitle
   },
   methods: {
+    handleResize() {
+      this.$nextTick(()=> {
+        this.$refs.filterTable.doLayout();
+      });
+    },
     getBDList () {
       this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
         standHisId: this.oldNumber,
@@ -515,6 +520,7 @@ export default {
     },
   },
   mounted () {
+    window.addEventListener('resize', this.handleResize);
     this.getHistoryData()
     this.getData()
   }

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

@@ -91,7 +91,7 @@
         </el-button>
       </div>
       <el-table border
-                ref="selection"
+                ref="filterTable"
                 :data="itemList"
                 tooltip-effect="dark"
                 style="width: 100%;"
@@ -637,6 +637,11 @@ export default {
     ProcessTitle
   },
   methods: {
+    handleResize() {
+      this.$nextTick(()=> {
+        this.$refs.filterTable.doLayout();
+      });
+    },
     PLedit () {
       if (this.zrIdList.length > 0) {
         this.PLmodalType = 2
@@ -1136,6 +1141,7 @@ export default {
     }
   },
   mounted() {
+    window.addEventListener('resize', this.handleResize);
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {

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

@@ -69,7 +69,7 @@
                 <el-button :disabled="!itemList.length" type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
             </div>
             <el-table border
-                      ref="selections"
+                      ref="filterTable"
                       :data="itemList"
                       tooltip-effect="dark"
                       style="width: 100%;"
@@ -323,6 +323,11 @@
             ProcessTitle
         },
         methods: {
+            handleResize() {
+                this.$nextTick(()=> {
+                    this.$refs.filterTable.doLayout();
+                });
+            },
             handleTransfer() {
                 this.drawerModal = true
             },
@@ -515,6 +520,7 @@
             },
         },
         mounted () {
+            window.addEventListener('resize', this.handleResize);
             this.getHistoryData()
             this.getData()
         }

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

@@ -69,7 +69,7 @@
                 <el-button  type="primary" :disabled="acceptShow && !itemList.length" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
             </div>
             <el-table border
-                      ref="selection"
+                      ref="filterTable"
                       :data="itemList"
                       tooltip-effect="dark"
                       style="width: 100%;"
@@ -267,7 +267,6 @@
         </div>
         <ProcessFooter
                 :show-save="submitShow"
-                show-submit
                 :show-submit="submitShow"
                 :show-confirm="acceptShow"
                 :submitLoading="isSubmit"
@@ -543,6 +542,11 @@
             ProcessTitle
         },
         methods: {
+            handleResize() {
+                this.$nextTick(()=> {
+                    this.$refs.filterTable.doLayout();
+                });
+            },
             getBDList () {
                 this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
                     standHisId: this.oldNumber,
@@ -902,6 +906,7 @@
             },
         },
         mounted () {
+            window.addEventListener('resize', this.handleResize);
             this.getHistoryData()
             this.getData()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -66,7 +66,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <el-table border
-                      ref="selection"
+                      ref="filterTable"
                       :data="itemList"
                       tooltip-effect="dark"
                       style="width: 100%;"
@@ -292,6 +292,12 @@
                 <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
             </div>
         </el-dialog>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
     </div>
 </template>
 
@@ -344,6 +350,11 @@
             ProcessTitle
         },
         methods: {
+            handleResize() {
+                this.$nextTick(()=> {
+                    this.$refs.filterTable.doLayout();
+                });
+            },
             checkBD (id,id2,itemsNum) {
                 let itemsEoPage = {
                     oldItemId: id,
@@ -501,6 +512,7 @@
             },
         },
         mounted () {
+            window.addEventListener('resize', this.handleResize);
             this.getHistoryData()
             this.getData()
         }

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

@@ -66,7 +66,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <el-table border
-                      ref="selection"
+                      ref="filterTable"
                       :data="itemList"
                       tooltip-effect="dark"
                       style="width: 100%;"
@@ -350,6 +350,11 @@
             ProcessTitle
         },
         methods: {
+            handleResize() {
+                this.$nextTick(()=> {
+                    this.$refs.filterTable.doLayout();
+                });
+            },
             checkBD (id,id2,itemsNum) {
                 let itemsEoPage = {
                     oldItemId: id,
@@ -489,6 +494,7 @@
             },
         },
         mounted () {
+            window.addEventListener('resize', this.handleResize);
             this.getHistoryData()
             this.getData()
         }

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

@@ -66,7 +66,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <el-table border
-                      ref="selection"
+                      ref="filterTable"
                       :data="itemList"
                       tooltip-effect="dark"
                       style="width: 100%;"
@@ -348,6 +348,11 @@
             ProcessTitle
         },
         methods: {
+            handleResize() {
+                this.$nextTick(()=> {
+                    this.$refs.filterTable.doLayout();
+                });
+            },
             checkBD (id,id2,itemsNum) {
                 let itemsEoPage = {
                     oldItemId: id,
@@ -487,6 +492,7 @@
             },
         },
         mounted () {
+            window.addEventListener('resize', this.handleResize);
             this.getHistoryData()
             this.getData()
         }

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

@@ -14,7 +14,6 @@
         <el-form
           ref="bzzqyjForm"
           :model="form"
-          :rules="formRules"
           class="label-input-form"
           label-width="210px"
         >
@@ -265,18 +264,6 @@ export default {
       commentText: '',
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
-      roleRow: {},
-      nodeList: [],
-      type: '',
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      treeData: [], // 人员数据
-      modalshowflag: false, // drawer开关
-      drawerTitle: '', //drawer标题
-      textarea: '', // 意见
-      ListModel: false, // 新增编辑抽屉开关
       active: '1', // 默认显示
       isSubmit: false,
       saveLoading: false,
@@ -290,11 +277,6 @@ export default {
         modelList: [],
         modelNameList: '',
       },
-      formRules: {
-        responUserList: [
-          { required: true, message: '请选择责任人', trigger: 'change' },
-        ]
-      },
       json: {}
     }
   },
@@ -323,16 +305,6 @@ export default {
         this.$message.warning('文件不存在,下载失败')
       }
     },
-    updataFj (item) {
-      let id
-      let type = item.fileName.split('.')
-      if (type[1] === 'pdf') {
-        id = item.attId
-      } else {
-        id = item.oriAttId
-      }
-      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
-    },
     getHistoryData () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,
@@ -384,27 +356,6 @@ export default {
     handleTabs(name) {
       this.active = name
     },
-    handleSubmitNo() {
-      if (this.commentText) {
-        this.isSubmit = true
-        var json = this.json
-        json.actionFlag = 1
-        json.commentText = this.commentText
-        this.$http.post('lawss/activiti/completeTask', {
-          json: JSON.stringify(json),
-          taskIds: this.taskIds,
-          userId: this.$store.getters.userInfo.userId
-        }, {}, res => {
-          if (res.success) {
-            this.$message.success('驳回成功')
-            this.$router.push('/processCenter')
-          }
-          this.isSubmit = false
-        })
-      } else {
-        this.$message.warning('请输入反馈意见')
-      }
-    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({

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

@@ -161,6 +161,7 @@
     </div>
     <ProcessFooter
       show-submit
+      show-save
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       @save="handleSave"
@@ -213,7 +214,6 @@ export default {
       form: {
         cid: "", // 编号
         endTime: "", // 结束日期
-        cname: "", // 名称
         fjList: [],
         fjListId: '',
         responUserList: "",
@@ -369,19 +369,18 @@ export default {
         }).then(res => {
           let data = JSON.parse(res.mesg)
           this.commentText2 = data.commentText2 || ''
-          this.form.cid = data.cid
+          this.form.cid = data.form ? data.form.cid : data.cid
-          this.form.endTime = data.endTime
+          this.form.endTime = data.form ? data.form.endTime : data.endTime
-          this.form.cname = data.cname
+          this.form.fjList = data.form ? data.form.fjList : data.fjList
-          this.form.fjList = data.fjList
+          this.form.textType = data.form ? data.form.textType : data.textType
-          // this.form.fjListId = data.fjListId
+          this.form.modelList = data.form ? data.form.modelList : data.modelList
-          this.form.textType = data.textType
+          this.form.responUserListName = data.form ? data.form.responUserListName : (data.responUserListName ? data.responUserListName :  '')
-          this.form.modelList = data.modelList
+          this.form.responUserList = data.form ? data.form.responUserList : (data.responUserList ? data.responUserList :  '')
-          this.form.modelNameList = data.modelNameList
+          // if (data.fjListId === '' || data.form.fjListId === '') {
-          if (data.fjListId === '') {
+          //   this.form.fjListId = ''
-            this.form.fjListId = ''
+          // } else {
-          } else {
+          //   this.form.fjListId = data.form ? data.form.fjListId :data.fjListId
-            this.form.fjListId = data.fjListId || data.form.fjListId
+          // }
-          }
           this.json = data
         }).catch(e => {
         });

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

@@ -684,22 +684,16 @@
                             this.submitShow = true
                         }
                         this.commentText3 = data.commentText3 || ''
-                        this.form.fjList = data.fjList || data.form.fjList || []
+                        this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
-                        if (data.fjListId === '') {
+                        this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
-                            this.form.fjListId = ''
+                        this.form.textType = data.form ? data.form.textType : data.textType
-                        } else {
+                        this.form.cid = data.form ? data.form.cid : data.cid
-                            this.form.fjListId = data.fjListId || data.form.fjListId
+                        this.form.endTime = data.form ? data.form.endTime : data.endTime
-                        }
-                        this.form.textType = data.textType || data.form.textType
-                        this.form.modelList = data.modelList || data.form.modelList
-                        // this.form.modelNameList = data.modelNameList || data.form.modelNameList
-                        this.form.cid = data.cid || data.form.cid
-                        this.form.endTime = data.endTime || data.form.endTime
                         this.todoId = res.id
                         this.json = data
                         this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
                         this.getItemList(data.standId,data.textType)
-                        this.data = data.info || data.data || data.form.data || []
+                        this.data = data.form ? data.form.data : (data.data ? data.data : (data.info ? data.info : []))
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue

@@ -455,22 +455,13 @@
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
                         this.form.fjList = data.fjList || data.form.fjList
-                        if (data.fjListId === '') {
-                            this.form.fjListId = ''
-                        } else {
-                            this.form.fjListId =  data.form.fjListId || data.fjListId
-                        }
                         this.form.cid = data.cid || data.form.cid
                         this.form.endTime = data.endTime || data.form.endTime
-                        this.form.cname = data.cname || data.form.cname
                         this.form.textType = data.textType || data.form.textType
                         this.form.modelList = data.modelList || data.form.modelList
-                        this.form.modelNameList = data.modelNameList || data.form.modelNameList
                         this.commentText41 = data.commentText41 || ''
                         this.form.bzfgId = data.startUser
                         this.form.bzfgName = data.startUserName
-                        // this.form.bzfgId = data.bzfgId || ''
-                        // this.form.bzfgName = data.bzfgName || ''
                         this.json = data
                         this.data = data.info || data.data
                     }).catch(e => {

src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue

@@ -439,18 +439,11 @@
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
                         this.form.fjList = data.fjList || data.form.fjList
-                        if (data.fjListId === '') {
-                            this.form.fjListId = ''
-                        } else {
-                            this.form.fjListId =  data.form.fjListId || data.fjListId
-                        }
                         this.commentText42 = data.commentText42 || ''
                         this.form.cid = data.cid || data.form.cid
                         this.form.endTime = data.endTime || data.form.endTime
-                        this.form.cname = data.cname || data.form.cname
                         this.form.textType = data.textType || data.form.textType
                         this.form.modelList = data.modelList || data.form.modelList
-                        this.form.modelNameList = data.modelNameList || data.form.modelNameList
                         this.form.bzfgId = data.bzfgId || ''
                         this.json = data
                         this.data = data.info || data.data

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

@@ -648,19 +648,12 @@ export default {
             this.acceptShow = false
             this.submitShow = true
           }
-          this.form.fjList = data.fjList || data.form.fjList
-          if (data.fjListId === '') {
-            this.form.fjListId = ''
-          } else {
-            this.form.fjListId =  data.form.fjListId || data.fjListId
-          }
           this.commentText4 = data.commentText4 || ''
+          this.form.fjList = data.fjList || data.form.fjList
           this.form.cid = data.cid || data.form.cid
           this.form.endTime = data.endTime || data.form.endTime
-          this.form.cname = data.cname || data.form.cname
           this.form.textType = data.textType || data.form.textType
           this.form.modelList = data.modelList || data.form.modelList
-          this.form.modelNameList = data.modelNameList || data.form.modelNameList
           this.form.spId = data.spId || ''
           this.form.spName = data.spName || ''
           this.json = data

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

@@ -250,6 +250,7 @@
     </div>
     <ProcessFooter
             show-submit
+            show-save
             :submitLoading="isSubmit"
             :saveLoading="saveLoading"
             @save="handleSave"
@@ -560,27 +561,11 @@
           }).then(res => {
             let data = JSON.parse(res.mesg);
             this.commentText5 = data.commentText5 || ''
-            this.form.fjList = data.fjList || data.form.fjList
+            this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
-            if (data.fjListId === '') {
+            this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )
-              this.form.fjListId = ''
+            this.form.textType = data.form ? data.form.textType : data.textType
-            } else {
+            this.form.cid = data.form ? data.form.cid : data.cid
-              this.form.fjListId =  data.form.fjListId || data.fjListId
+            this.form.endTime = data.form ? data.form.endTime : data.endTime
-            }
-            this.form.cid = data.cid || data.form.cid;
-            this.form.endTime = data.endTime || data.form.endTime;
-            this.form.cname = data.cname || data.form.cname;
-            this.form.textType = data.textType || data.form.textType
-            this.form.modelList = data.modelList || data.form.modelList
-            this.form.modelNameList = data.modelNameList || data.form.modelNameList
-            // this.oldData = JSON.parse(JSON.stringify(data.summaryList))
-            // console.log(data);
-            // data.summaryList.forEach(item => {
-            //   if (item.state) {
-            //   } else {
-            //     item.state = "1";
-            //   }
-            //   item.type = false;
-            // });
             data.info.forEach(item => {
               if (item.state) {
               } else {

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

@@ -486,16 +486,12 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg);
-          this.form.fjList = data.fjList || data.form.fjList
-          if (data.fjListId === '') {
-            this.form.fjListId = ''
-          } else {
-            this.form.fjListId =  data.form.fjListId || data.fjListId
-          }
           this.commentText6 = data.commentText6 || ''
+          this.form.fjList = data.fjList || data.form.fjList
           this.form.cid = data.cid || data.form.cid;
           this.form.endTime = data.endTime || data.form.endTime;
-          this.form.cname = data.cname || data.form.cname;
+          this.form.textType = data.textType || data.form.textType
+          this.form.modelList = data.modelList || data.form.modelList
           this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
           data.info.forEach(item => {
@@ -504,9 +500,6 @@ export default {
             }
           })
           this.json = data
-          this.form.textType = data.textType || data.form.textType
-          this.form.modelList = data.modelList || data.form.modelList
-          this.form.modelNameList = data.modelNameList || data.form.modelNameList
           this.data = arr
         }).catch(e => {
         });

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

@@ -483,16 +483,12 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
-          this.form.fjList = data.fjList || data.form.fjList
-          if (data.fjListId === '') {
-            this.form.fjListId = ''
-          } else {
-            this.form.fjListId =  data.form.fjListId || data.fjListId
-          }
           this.commentText7 = data.commentText7 || ''
+          this.form.fjList = data.fjList || data.form.fjList
           this.form.cid = data.cid || data.form.cid;
           this.form.endTime = data.endTime || data.form.endTime;
-          this.form.cname = data.cname || data.form.cname;
+          this.form.textType = data.textType || data.form.textType
+          this.form.modelList = data.modelList || data.form.modelList
           this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
           data.info.forEach(item => {
@@ -500,9 +496,6 @@ export default {
               arr.push(item)
             }
           })
-          this.form.textType = data.textType || data.form.textType
-          this.form.modelList = data.modelList || data.form.modelList
-          this.form.modelNameList = data.modelNameList || data.form.modelNameList
           this.json = data
           this.data = arr
         }).catch(e => {

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

@@ -487,16 +487,12 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
-          this.form.fjList = data.fjList || data.form.fjList
-          if (data.fjListId === '') {
-            this.form.fjListId = ''
-          } else {
-            this.form.fjListId =  data.form.fjListId || data.fjListId
-          }
           this.commentText8 = data.commentText8 || ''
+          this.form.fjList = data.fjList || data.form.fjList
           this.form.cid = data.cid || data.form.cid;
           this.form.endTime = data.endTime || data.form.endTime;
-          this.form.cname = data.cname || data.form.cname;
+          this.form.textType = data.textType || data.form.textType
+          this.form.modelList = data.modelList || data.form.modelList
           this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
           data.info.forEach(item => {
@@ -505,9 +501,6 @@ export default {
             }
           })
           this.json = data
-          this.form.textType = data.textType || data.form.textType
-          this.form.modelList = data.modelList || data.form.modelList
-          this.form.modelNameList = data.modelNameList || data.form.modelNameList
           this.data = arr
         }).catch(e => {
         })

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

@@ -486,16 +486,12 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
-          this.form.fjList = data.fjList || data.form.fjList
-          if (data.fjListId === '') {
-            this.form.fjListId = ''
-          } else {
-            this.form.fjListId =  data.form.fjListId || data.fjListId
-          }
           this.commentText9 = data.commentText9 || ''
+          this.form.fjList = data.fjList || data.form.fjList
           this.form.cid = data.cid || data.form.cid;
           this.form.endTime = data.endTime || data.form.endTime;
-          this.form.cname = data.cname || data.form.cname;
+          this.form.textType = data.textType || data.form.textType
+          this.form.modelList = data.modelList || data.form.modelList
           this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
           data.info.forEach(item => {
@@ -504,9 +500,6 @@ export default {
             }
           })
           this.json = data
-          this.form.textType = data.textType || data.form.textType
-          this.form.modelList = data.modelList || data.form.modelList
-          this.form.modelNameList = data.modelNameList || data.form.modelNameList
           this.data = arr
         }).catch(e => {
         });

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -64,11 +64,11 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
               <el-input
                 disabled
                 v-model="qbfsForm.rqbName"
-                placeholder="请输入被修订标准代号"
+                placeholder="请输入代替企标编号"
                 :maxlength="500"/>
             </el-form-item>
             <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -78,22 +78,15 @@
                 placeholder="请输入体系结构"
                 :maxlength="500"/>
             </el-form-item>
-            <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-form-item  label="引用标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
               <el-input
                 disabled
                 v-model="qbfsForm.esMatingRelations"
-                placeholder="请输入配套标准"
+                placeholder="请输入引用标准"
                 :maxlength="500"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-              <el-select disabled  v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
-                <el-option label="制定" value="制定"></el-option>
-                <el-option label="修订" value="修订"></el-option>
-                <el-option label="完成" value="完成"></el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
               <el-input
                 readonly
@@ -102,23 +95,6 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
-              <el-input
-                readonly
-                v-model="qbfsForm.wgLeaderName"
-                placeholder="请输入工作组组长"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
-              <el-date-picker
-                disabled
-                v-model="qbfsForm.releaseTime"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择标准发布时间">
-              </el-date-picker>
-            </el-form-item>
             <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
               <div v-if="qbfsForm.unitName">
                 <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
@@ -139,9 +115,26 @@
                 ></el-input>
               </div>
             </el-form-item>
-            <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+            <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.wgLeaderName"
+                placeholder="请输入工作组组长"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
+              <el-date-picker
+                disabled
+                v-model="qbfsForm.releaseTime"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择标准发布时间">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                           class="add-form-item form-item-disabled">
-              <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
                 <el-option
                   v-for="item in BZList"
                   :key="item.value"
@@ -150,11 +143,11 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-form-item  label="是否采用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
               <el-input
                 disabled
                 v-model="qbfsForm.isRelate"
-                placeholder="请输入是否引用标准"
+                placeholder="请输入是否采用标准"
                 :maxlength="500"/>
             </el-form-item>
             <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
@@ -419,7 +412,13 @@ export default {
       }, {
         _this: this,
       }, res => {
-        this.standinfoList = res.data.list
+        this.standinfoList = []
+        //展示的数据只能是未开始的
+        res.data.list.forEach(item => {
+          if(item.planStatus === '0'){
+            this.standinfoList.push(item)
+          }
+        })
         this.total = res.data.count
       })
 

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -63,11 +63,11 @@
                placeholder="请选择初稿完成时间">
              </el-date-picker>
            </el-form-item>
-           <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+           <el-form-item v-if="qbfsForm.reviseStatus === '修订'"  label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
              <el-input
                disabled
                v-model="qbfsForm.rqbName"
-               placeholder="请输入被修订标准代号"
+               placeholder="请输入代替企标编号"
                :maxlength="500"/>
            </el-form-item>
            <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -77,11 +77,11 @@
                placeholder="请输入体系结构"
                :maxlength="500"/>
            </el-form-item>
-           <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+           <el-form-item  label="引用标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
              <el-input
                disabled
                v-model="qbfsForm.esMatingRelations"
-               placeholder="请输入配套标准"
+               placeholder="请输入引用标准"
                :maxlength="500"/>
            </el-form-item>
            <el-form-item label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
@@ -94,13 +94,6 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
-           <el-form-item   prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-             <el-select disabled  v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
-               <el-option label="制定" value="制定"></el-option>
-               <el-option label="修订" value="修订"></el-option>
-               <el-option label="完成" value="完成"></el-option>
-             </el-select>
-           </el-form-item>
            <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
              <el-input
                readonly
@@ -109,23 +102,6 @@
                clearable
              ></el-input>
            </el-form-item>
-           <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
-             <el-input
-               readonly
-               v-model="qbfsForm.wgLeaderName"
-               placeholder="请输入工作组组长"
-               clearable
-             ></el-input>
-           </el-form-item>
-           <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
-             <el-date-picker
-               disabled
-               v-model="qbfsForm.releaseTime"
-               type="date"
-               value-format="yyyy-MM-dd"
-               placeholder="请选择标准发布时间">
-             </el-date-picker>
-           </el-form-item>
            <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
              <div v-if="qbfsForm.unitName">
                <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
@@ -146,9 +122,26 @@
                ></el-input>
              </div>
            </el-form-item>
-           <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+           <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
+             <el-input
+               readonly
+               v-model="qbfsForm.wgLeaderName"
+               placeholder="请输入工作组组长"
+               clearable
+             ></el-input>
+           </el-form-item>
+           <el-form-item label="标准发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
+             <el-date-picker
+               disabled
+               v-model="qbfsForm.releaseTime"
+               type="date"
+               value-format="yyyy-MM-dd"
+               placeholder="请选择标准发布时间">
+             </el-date-picker>
+           </el-form-item>
+           <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                          class="add-form-item form-item-disabled">
-             <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+             <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
                <el-option
                  v-for="item in BZList"
                  :key="item.value"
@@ -157,11 +150,11 @@
                </el-option>
              </el-select>
            </el-form-item>
-           <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+           <el-form-item  label="是否采用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
              <el-input
                disabled
                v-model="qbfsForm.isRelate"
-               placeholder="请输入是否引用标准"
+               placeholder="请输入是否采用标准"
                :maxlength="500"/>
            </el-form-item>
            <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
@@ -440,7 +433,13 @@ export default {
       }, {
         _this: this,
       }, res => {
-        this.standinfoList = res.data.list
+        this.standinfoList = []
+        //展示的数据只能是未开始的
+        res.data.list.forEach(item => {
+          if(item.planStatus === '0'){
+            this.standinfoList.push(item)
+          }
+        })
         this.total = res.data.count
       })
 

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -27,15 +27,6 @@
           placeholder="请输入企标名称"
           :maxlength="500"/>
       </el-form-item>
-      <el-form-item prop="planStatus" label="计划类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-        <el-select  v-model="qbfsForm.planStatus" placeholder="请选择计划类型">
-          <el-option label="未开始" value="未开始"></el-option>
-          <el-option label="制定中" value="制定中"></el-option>
-          <el-option label="修订中" value="修订中"></el-option>
-          <el-option label="已取消" value="已取消"></el-option>
-          <el-option label="已完成" value="已完成"></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px"
                     class="add-form-item form-item-disabled">
         <el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
@@ -50,6 +41,12 @@
                   @click.native="choiceZRRS('1')">
         </el-input>
       </el-form-item>
+      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+        <el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
+        <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
+                  @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
+        </el-input>
+      </el-form-item>
       <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px"
                     class="add-form-item form-item-disabled">
         <el-input v-model="qbfsForm.resPerson" style="display: none;"></el-input>
@@ -78,13 +75,7 @@
           placeholder="请选择计划标准发布时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+      <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-        <el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
-        <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
-                  @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="rqbName" label="被修订标准代号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
         <el-input
           style="display: none;"
           v-model="qbfsForm.rqbJson">
@@ -92,7 +83,7 @@
         <el-input
           clearable
           v-model="qbfsForm.rqbName"
-          placeholder="请选择被修订标准代号"
+          placeholder="请选择代替企标编号"
           readonly
           @click.native="choiceQYBZ">
         </el-input>
@@ -110,9 +101,9 @@
           @click.native="choiceTXJG(qbfsForm.tsJson)">
         </el-input>
       </el-form-item>
-      <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+      <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                     class="add-form-item form-item-disabled">
-        <el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+        <el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
           <el-option
             v-for="item in BZList"
             :key="item.value"
@@ -121,9 +112,9 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="isRelate" label="是否引用标准" style="width: 100%; margin-right:10px"
+      <el-form-item prop="isRelate" label="是否采用标准" style="width: 100%; margin-right:10px"
                     class="add-form-item form-item-disabled">
-        <el-select  v-model="qbfsForm.isRelate" placeholder="请选择是否引用标准">
+        <el-select  v-model="qbfsForm.isRelate" placeholder="请选择是否采用标准">
           <el-option label="是" value="是"></el-option>
           <el-option label="否" value="否"></el-option>
         </el-select>
@@ -146,25 +137,29 @@
         </template>
       <el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
                     class="add-form-item form-item-disabled">
-        <el-select  v-model="qbfsForm.useLevel" placeholder="请选择采标程度">
+        <el-select v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
-          <el-option label="等同" value="等同"></el-option>
+          <el-option
-          <el-option label="修改" value="修改"></el-option>
+            v-for="(item, index) in cbcdOptions"
-          <el-option label="非等效" value="非等效"></el-option>
+            :key="index"
+            :value="item.value"
+            :label="item.label">
+          </el-option>
         </el-select>
       </el-form-item>
       <template>
         <custom-input-for-all-standards2
           class="classDisplay"
-          :config="{attrName: '配套标准'}"
+          :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
+          :config="{attrName: '引用标准'}"
           :labelWidth="'180px'"
           v-model="qbfsForm.esMatingRelations"
         ></custom-input-for-all-standards2>
       </template>
-      <el-form-item label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
+      <el-form-item label="立项原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
         <el-input
           type="textarea"
           v-model="qbfsForm.newReason"
-          placeholder="请输入新增原因"
+          placeholder="请输入立项原因"
           :maxlength="500"/>
       </el-form-item>
     </el-form>
@@ -272,7 +267,7 @@
       custom-class="demo-drawer"
     >
       <div class="standardForComments">
-        <div class="content" style="height: 100%;">
+        <div class="content" style="height: 100%;overflow: auto">
           <el-tree
             v-if="TXJGmodal"
             ref="TXJGTree"
@@ -360,6 +355,7 @@ export default {
       nodeList2: [],
       nodeList: [],
       standSortOptions: [],
+      cbcdOptions: [],
       BZList: [],
       qcdwOptions: [],
       qbfsForm: {
@@ -367,9 +363,9 @@ export default {
         unit: "", // 单位
         unitName: "",
         esName: "", // 企标名称
-        planStatus: "", // 计划状态
+        planStatus: "0", // 计划状态
         reviseStatus: "", // 制修订状态
-        area: "", //标准范围
+        area: "", //适用车型
         isRelate: "", //采用何种标准
         technologic: '',  //指标依据
         resPerson: "", // 评审责任人
@@ -380,7 +376,8 @@ export default {
         releaseTime: "", // 计划标准发布时间
         drafter: "", // 起草人
         drafterName: "",
-        newReason: "" //新增原因
+        esMatingRelations: "", //配套标准
+        newReason: "" //立项原因
         // remarks: '', // 备注
       },
       qbfsFormRules: {
@@ -393,9 +390,6 @@ export default {
         esName: [
           { required: true, message: "请输入企标名称", trigger: "blur" }
         ],
-        planStatus: [
-          { required: true, message: "请选择计划状态", trigger: "blur" }
-        ],
         reviseStatus: [
           { required: true, message: "请选择制修订状态", trigger: "blur" }
         ],
@@ -418,7 +412,7 @@ export default {
           {required: true, message: '请选择起草人', trigger: 'change'},
         ],
         newReason: [
-          {required: true, message: '请输入新增原因', trigger: 'blur'},
+          {required: true, message: '请输入立项原因', trigger: 'blur'},
         ],
       },
 
@@ -441,10 +435,12 @@ export default {
      this.$http.get('sys/dictype/getDicTypeListCode', '',{
        _this: this
      }, res => {
-       this.BZList = res.data.ENERGYTYPES //标准范围
+       this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
+       this.BZList = res.data.ENERGYTYPES //适用车型
        this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
        this.standSystemOptions = res.data.TXLBBUSS // 体系结构
        this.qcdwOptions = res.data.QCDW // 起草单位
+
      })
   },
   methods: {
@@ -489,13 +485,14 @@ export default {
       this.clearQYBZ()
     },
     QYBZenterDrawer () {
+      console.log(this.QYBZformSelect);
       if (this.QYBZformSelect.length > 1) {
         this.$message.warning('请选择一条标准')
       } else if (this.QYBZformSelect.length < 1){
         this.$message.warning('请选择要带入的标准')
       } else {
         this.qbfsForm.rqbJson = this.QYBZformSelect[0].id
-        this.qbfsForm.rqbName = this.QYBZformSelect[0].standName
+        this.qbfsForm.rqbName = this.QYBZformSelect[0].standCode
         this.clearQYBZ()
         this.QYBZmodal = false
       }
@@ -550,6 +547,9 @@ export default {
       if(this.qbfsForm.unit){
         this.$refs.qbfsForm.validateField('unit')
       }
+      if(this.qbfsForm.unitName){
+        this.$refs.qbfsForm.validateField('unitName')
+      }
     },
     choiceZRR() {
       this.nodeList = [];

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -20,9 +20,6 @@
             <el-form-item label="企标名称" prop="esName1" class="add-form-item form-item-disabled">
               <el-input readonly v-model="qbfsForm.esName1" placeholder="请输入企标名称" clearable></el-input>
             </el-form-item>
-            <el-form-item label="计划状态" prop="planStatus1" class="add-form-item form-item-disabled">
-              <el-input readonly v-model="qbfsForm.planStatus1" placeholder="请输入计划状态" clearable></el-input>
-            </el-form-item>
             <el-form-item  label="制修订状态" prop="reviseStatus1" class="add-form-item form-item-disabled">
               <el-input readonly v-model="qbfsForm.reviseStatus1" placeholder="请输入制修订状态" clearable></el-input>
             </el-form-item>
@@ -34,9 +31,6 @@
             <el-form-item label="企标名称" prop="esName2" class="add-form-item form-item-disabled">
               <el-input readonly v-model="qbfsForm.esName2" placeholder="请输入企标名称" clearable></el-input>
             </el-form-item>
-            <el-form-item label="计划状态" prop="planStatus2" class="add-form-item form-item-disabled">
-              <el-input readonly v-model="qbfsForm.planStatus2" placeholder="请输入计划状态" clearable></el-input>
-            </el-form-item>
             <el-form-item  label="制修订状态" prop="reviseStatus2" class="add-form-item form-item-disabled">
               <el-input readonly v-model="qbfsForm.reviseStatus2" placeholder="请输入制修订状态" clearable></el-input>
             </el-form-item>
@@ -90,13 +84,7 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+            <el-form-item prop="rqbName" v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-              <el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
-              <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
-                        @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
-              </el-input>
-            </el-form-item>
-            <el-form-item prop="rqbName" label="被修订标准代号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
               <el-input
                 style="display: none;"
                 v-model="qbfsForm.rqbJson">
@@ -104,7 +92,7 @@
               <el-input
                 clearable
                 v-model="qbfsForm.rqbName"
-                placeholder="请选择被修订标准代号"
+                placeholder="请选择代替企标编号"
                 readonly
                 @click.native="choiceQYBZ">
               </el-input>
@@ -112,17 +100,21 @@
             <template>
               <custom-input-for-all-standards2
                 class="classDisplay"
-                :config="{attrName: '配套标准'}"
+                :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
+                :config="{attrName: '引用标准'}"
                 :labelWidth="'180px'"
                 v-model="qbfsForm.esMatingRelations"
               ></custom-input-for-all-standards2>
             </template>
             <el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
                           class="add-form-item form-item-disabled">
-              <el-select  v-model="qbfsForm.useLevel" placeholder="请选择采标程度">
+              <el-select v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
-                <el-option label="等同" value="等同"></el-option>
+                <el-option
-                <el-option label="修改" value="修改"></el-option>
+                  v-for="(item, index) in cbcdOptions"
-                <el-option label="非等效" value="非等效"></el-option>
+                  :key="index"
+                  :value="item.value"
+                  :label="item.label">
+                </el-option>
               </el-select>
             </el-form-item>
             <el-form-item v-if="qbfsForm.isRelate === '否'" prop="technologic" label="简述指标依据" style="width: 100%; margin-right:10px"
@@ -133,24 +125,28 @@
                 placeholder="请输入指标依据"
                 :maxlength="500"/>
             </el-form-item>
-
+            <el-form-item label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
+              <el-input
+                type="textarea"
+                v-model="qbfsForm.mergeReason"
+                placeholder="请输入合并原因"
+                clearable
+              ></el-input>
+            </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item prop="planStatus" label="计划类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-              <el-select  v-model="qbfsForm.planStatus" placeholder="请选择计划类型">
-                <el-option label="未开始" value="未开始"></el-option>
-                <el-option label="制定中" value="制定中"></el-option>
-                <el-option label="修订中" value="修订中"></el-option>
-                <el-option label="已取消" value="已取消"></el-option>
-                <el-option label="已完成" value="已完成"></el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
               <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
               <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人"
                         @click.native="choiceZRRS('1')">
               </el-input>
             </el-form-item>
+            <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+              <el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
+              <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
+                        @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
+              </el-input>
+            </el-form-item>
             <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
               <el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
               <el-input v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
@@ -164,6 +160,17 @@
                 placeholder="请选择标准发布时间">
               </el-date-picker>
             </el-form-item>
+            <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
+                          class="add-form-item form-item-disabled">
+              <el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
+                <el-option
+                  v-for="item in BZList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
               <el-input
                 style="display: none;"
@@ -177,9 +184,9 @@
                 @click.native="choiceTXJG(qbfsForm.tsJson)">
               </el-input>
             </el-form-item>
-            <el-form-item prop="isRelate" label="是否引用标准" style="width: 100%; margin-right:10px"
+            <el-form-item prop="isRelate" label="是否采用标准" style="width: 100%; margin-right:10px"
                           class="add-form-item form-item-disabled">
-              <el-select  v-model="qbfsForm.isRelate" placeholder="请选择是否引用标准">
+              <el-select  v-model="qbfsForm.isRelate" placeholder="请选择是否采用标准">
                 <el-option label="是" value="是"></el-option>
                 <el-option label="否" value="否"></el-option>
               </el-select>
@@ -192,14 +199,6 @@
                 v-model="qbfsForm.esStandRelations"
               ></custom-input-for-all-standards>
             </template>
-            <el-form-item label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
-              <el-input
-                type="textarea"
-                v-model="qbfsForm.mergeReason"
-                placeholder="请输入合并原因"
-                clearable
-              ></el-input>
-            </el-form-item>
           </el-col>
         </el-row>
       </div>
@@ -440,7 +439,7 @@
       custom-class="demo-drawer"
     >
       <div class="standardForComments">
-        <div class="content" style="height: 100%;">
+        <div class="content" style="height: 100%;overflow: auto">
           <el-tree
             v-if="TXJGmodal"
             ref="TXJGTree"
@@ -509,6 +508,7 @@ export default {
       TXJGList: [],
       BZList: [],
       standSortOptions: [],
+      cbcdOptions: [], //采标程度
       QYBZList: [],
       QYBZformSelect: [],
       standSystemOptions: [],
@@ -556,9 +556,6 @@ export default {
         esName: [
           {required: true, message: '请输入企标名称', trigger: 'blur'},
         ],
-        planStatus: [
-          {required: true, message: '请选择计划状态', trigger: 'change'},
-        ],
         reviseStatus: [
           {required: true, message: '请选择制修订状态', trigger: 'change'},
         ],
@@ -593,6 +590,7 @@ export default {
         reviewer: "",
         draftTime: "",
         isSubTime: "",
+        planStatus: "0",
         mergeReason: "",
         company: "",
         resPersonName: '',
@@ -631,7 +629,8 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {
-      this.BZList = res.data.ENERGYTYPES //标准范围
+      this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
+      this.BZList = res.data.ENERGYTYPES //适用车型
       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
       this.standSystemOptions = res.data.TXLBBUSS // 体系结构
       this.qcdwOptions = res.data.QCDW // 起草单位
@@ -696,7 +695,7 @@ export default {
         this.$message.warning('请选择要带入的标准')
       } else {
         this.qbfsForm.rqbJson = this.QYBZformSelect[0].id
-        this.qbfsForm.rqbName = this.QYBZformSelect[0].standName
+        this.qbfsForm.rqbName = this.QYBZformSelect[0].standCode
         this.clearQYBZ()
         this.QYBZmodal = false
       }
@@ -871,7 +870,13 @@ export default {
       }, {
         _this: this,
       }, res => {
-        this.standinfoList = res.data.list
+        this.standinfoList = []
+        //展示的数据只能是未开始的
+        res.data.list.forEach(item => {
+          if(item.planStatus === '0'){
+            this.standinfoList.push(item)
+          }
+        })
         this.total = res.data.count
       })
 

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -63,11 +63,11 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
               <el-input
                 disabled
                 v-model="qbfsForm.rqbName"
-                placeholder="请输入被修订标准代号"
+                placeholder="请输入代替企标编号"
                 :maxlength="500"/>
             </el-form-item>
             <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -77,11 +77,11 @@
                 placeholder="请输入体系结构"
                 :maxlength="500"/>
             </el-form-item>
-            <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+            <el-form-item  label="引用标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
               <el-input
                 disabled
                 v-model="qbfsForm.esMatingRelations"
-                placeholder="请输入配套标准"
+                placeholder="请输入引用标准"
                 :maxlength="500"/>
             </el-form-item>
             <el-form-item label="更名后企标名称" prop="renameEs" class="add-form-item form-item-disabled">
@@ -93,13 +93,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-              <el-select disabled  v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
-                <el-option label="制定" value="制定"></el-option>
-                <el-option label="修订" value="修订"></el-option>
-                <el-option label="完成" value="完成"></el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
               <el-input
                 readonly
@@ -108,6 +101,26 @@
                 clearable
               ></el-input>
             </el-form-item>
+            <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
+              <div v-if="qbfsForm.unitName">
+                <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
+                  <el-input
+                    readonly
+                    v-model="qbfsForm.unitName"
+                    placeholder="请输入起草责任单位"
+                    clearable
+                  ></el-input>
+                </el-tooltip>
+              </div>
+              <div v-else>
+                <el-input
+                  readonly
+                  v-model="qbfsForm.unitName"
+                  placeholder="请输入起草责任单位"
+                  clearable
+                ></el-input>
+              </div>
+            </el-form-item>
             <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
               <el-input
                 readonly
@@ -125,29 +138,9 @@
                 placeholder="请选择标准发布时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
+            <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
-             <div v-if="qbfsForm.unitName">
-               <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
-                 <el-input
-                   readonly
-                   v-model="qbfsForm.unitName"
-                   placeholder="请输入起草责任单位"
-                   clearable
-                 ></el-input>
-               </el-tooltip>
-             </div>
-              <div v-else>
-                <el-input
-                  readonly
-                  v-model="qbfsForm.unitName"
-                  placeholder="请输入起草责任单位"
-                  clearable
-                ></el-input>
-              </div>
-            </el-form-item>
-            <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
                           class="add-form-item form-item-disabled">
-              <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+              <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
                 <el-option
                   v-for="item in BZList"
                   :key="item.value"
@@ -156,18 +149,18 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+            <el-form-item  label="是否采用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
               <el-input
                 disabled
                 v-model="qbfsForm.isRelate"
-                placeholder="请输入是否引用标准"
+                placeholder="请输入是否采用标准"
                 :maxlength="500"/>
             </el-form-item>
             <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
               <el-input
                 disabled
                 v-model="qbfsForm.technologic"
-                placeholder="请输入是否引用标准"
+                placeholder="请输入简述指标依据"
                 :maxlength="500"/>
             </el-form-item>
             <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
@@ -427,7 +420,13 @@ export default {
       }, {
         _this: this,
       }, res => {
-        this.standinfoList = res.data.list
+        this.standinfoList = []
+        //展示的数据只能是未开始的
+        res.data.list.forEach(item => {
+          if(item.planStatus === '0'){
+            this.standinfoList.push(item)
+          }
+        })
         this.total = res.data.count
       })
 

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue

@@ -16,14 +16,11 @@
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
           <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-            <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+            <el-input
-              <el-option
+              disabled
-                v-for="(item, index) in standSortOptions"
+              v-model="qbfsForm.bussSort"
-                :key="index"
+              placeholder="请输入企标类别"
-                :value="item.value"
+              :maxlength="500"/>
-                :label="item.label">
-              </el-option>
-            </el-select>
           </el-form-item>
           <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
@@ -32,13 +29,6 @@
               placeholder="请输入企标名称"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-            <el-select  disabled  v-model="qbfsForm.planStatus"  placeholder="请选择计划状态">
-              <el-option label="制定" value="制定"></el-option>
-              <el-option label="修订" value="修订"></el-option>
-              <el-option label="完成" value="完成"></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-select disabled  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
               <el-option label="制定完成" value="制定完成"></el-option>
@@ -53,6 +43,13 @@
               placeholder="请输入起草人"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.unitName"
+              placeholder="请输入起草责任单位"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -85,18 +82,11 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.unitName"
-              placeholder="请输入起草责任单位"
-              :maxlength="500"/>
-          </el-form-item>
-          <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.rqbName"
-              placeholder="请输入被修订标准代号"
+              placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -106,9 +96,9 @@
               placeholder="请输入体系结构"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+          <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                         class="add-form-item form-item-disabled">
-            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
               <el-option
                 v-for="item in BZList"
                 :key="item.value"
@@ -117,18 +107,18 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+          <el-form-item  label="是否采用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.isRelate"
-              placeholder="请输入是否引用标准"
+              placeholder="请输入是否采用标准"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.technologic"
-              placeholder="请输入是否引用标准"
+              placeholder="请输入简述指标依据"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
@@ -139,25 +129,28 @@
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
-            <el-input
+            <el-select disabled v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
-              disabled
+              <el-option
-              v-model="qbfsForm.useLevel"
+                v-for="(item, index) in cbcdOptions"
-              placeholder="请输入采标程度"
+                :key="index"
-              :maxlength="500"/>
+                :value="item.value"
+                :label="item.label">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+          <el-form-item  label="引用标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.esMatingRelations"
-              placeholder="请输入配套标准"
+              placeholder="请输入引用标准"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
+          <el-form-item v-if="type === '5'"  label="立项原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
               disabled
               v-model="qbfsForm.newReason"
-              placeholder="请输入新增原因"
+              placeholder="请输入立项原因"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
@@ -359,6 +352,7 @@ export default {
       drawerTitle: '',
       detailData: [],
       standSortOptions: [],
+      cbcdOptions: [],
     }
   },
   mounted() {
@@ -368,7 +362,8 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {
-      this.BZList = res.data.ENERGYTYPES //标准范围
+      this.BZList = res.data.ENERGYTYPES //适用车型
+      this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
@@ -457,6 +452,8 @@ export default {
     handleSubmit(){
       this.isSubmit = true
       this.qbfsForm.bzfgbzFlag = '0'
+      this.qbfsForm.planStatus = '未开始'
+      this.qbfsForm.area = this.qbfsForm.area.join(',')
       this.qbfsForm.commentText = this.commentText
       let json = JSON.stringify(this.qbfsForm);
       this.$http.post('lawss/activiti/completeTask', {

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

@@ -16,14 +16,11 @@
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
           <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-            <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+            <el-input
-              <el-option
+              disabled
-                v-for="(item, index) in standSortOptions"
+              v-model="qbfsForm.bussSort"
-                :key="index"
+              placeholder="请输入企标类别"
-                :value="item.value"
+              :maxlength="500"/>
-                :label="item.label">
-              </el-option>
-            </el-select>
           </el-form-item>
           <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
@@ -32,13 +29,6 @@
               placeholder="请输入企标名称"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-            <el-select  disabled  v-model="qbfsForm.planStatus"  placeholder="请选择计划状态">
-              <el-option label="制定" value="制定"></el-option>
-              <el-option label="修订" value="修订"></el-option>
-              <el-option label="完成" value="完成"></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-select disabled  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
               <el-option label="制定完成" value="制定完成"></el-option>
@@ -53,6 +43,13 @@
               placeholder="请输入起草人"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.unitName"
+              placeholder="请输入起草责任单位"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -85,18 +82,11 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.unitName"
-              placeholder="请输入起草责任单位"
-              :maxlength="500"/>
-          </el-form-item>
-          <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.rqbName"
-              placeholder="请输入被修订标准代号"
+              placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -106,9 +96,9 @@
               placeholder="请输入体系结构"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+          <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                         class="add-form-item form-item-disabled">
-            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
               <el-option
                 v-for="item in BZList"
                 :key="item.value"
@@ -117,18 +107,18 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+          <el-form-item  label="是否采用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.isRelate"
-              placeholder="请输入是否引用标准"
+              placeholder="请输入是否采用标准"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.technologic"
-              placeholder="请输入是否引用标准"
+              placeholder="请输入简述指标依据"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
@@ -139,25 +129,28 @@
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
-            <el-input
+            <el-select disabled v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
-              disabled
+              <el-option
-              v-model="qbfsForm.useLevel"
+                v-for="(item, index) in cbcdOptions"
-              placeholder="请输入采标程度"
+                :key="index"
-              :maxlength="500"/>
+                :value="item.value"
+                :label="item.label">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+          <el-form-item  label="引用标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.esMatingRelations"
-              placeholder="请输入配套标准"
+              placeholder="请输入引用标准"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
+          <el-form-item v-if="type === '5'"  label="立项原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
               disabled
               v-model="qbfsForm.newReason"
-              placeholder="请输入新增原因"
+              placeholder="请输入立项原因"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
@@ -359,6 +352,7 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
+      cbcdOptions: [],
 
     }
   },
@@ -371,6 +365,7 @@ export default {
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+      this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
     })
   },
   methods:{

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

@@ -16,14 +16,11 @@
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
           <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-            <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+            <el-input
-              <el-option
+              disabled
-                v-for="(item, index) in standSortOptions"
+              v-model="qbfsForm.bussSort"
-                :key="index"
+              placeholder="请输入企标类别"
-                :value="item.value"
+              :maxlength="500"/>
-                :label="item.label">
-              </el-option>
-            </el-select>
           </el-form-item>
           <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
@@ -32,13 +29,6 @@
               placeholder="请输入企标名称"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-            <el-select  disabled  v-model="qbfsForm.planStatus"  placeholder="请选择计划状态">
-              <el-option label="制定" value="制定"></el-option>
-              <el-option label="修订" value="修订"></el-option>
-              <el-option label="完成" value="完成"></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-select disabled  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
               <el-option label="制定完成" value="制定完成"></el-option>
@@ -53,6 +43,13 @@
               placeholder="请输入起草人"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.unitName"
+              placeholder="请输入起草责任单位"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -85,18 +82,11 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.unitName"
-              placeholder="请输入起草责任单位"
-              :maxlength="500"/>
-          </el-form-item>
-          <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.rqbName"
-              placeholder="请输入被修订标准代号"
+              placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -106,9 +96,9 @@
               placeholder="请输入体系结构"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+          <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                         class="add-form-item form-item-disabled">
-            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
               <el-option
                 v-for="item in BZList"
                 :key="item.value"
@@ -117,11 +107,11 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+          <el-form-item  label="是否采用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.isRelate"
-              placeholder="请输入是否引用标准"
+              placeholder="请输入是否采用标准"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
@@ -139,25 +129,28 @@
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
-            <el-input
+            <el-select disabled v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
-              disabled
+              <el-option
-              v-model="qbfsForm.useLevel"
+                v-for="(item, index) in cbcdOptions"
-              placeholder="请输入采标程度"
+                :key="index"
-              :maxlength="500"/>
+                :value="item.value"
+                :label="item.label">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+          <el-form-item  label="引用标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.esMatingRelations"
-              placeholder="请输入配套标准"
+              placeholder="请输入引用标准"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
+          <el-form-item v-if="type === '5'"  label="立项原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
               disabled
               v-model="qbfsForm.newReason"
-              placeholder="请输入新增原因"
+              placeholder="请输入立项原因"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
@@ -357,6 +350,7 @@ export default {
       drawerTitle: '',
       detailData: [],
       standSortOptions: [],
+      cbcdOptions: [],
     }
   },
   mounted() {
@@ -366,6 +360,7 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {
+      this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
       this.BZList = res.data.ENERGYTYPES //标准范围
       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })

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

@@ -16,14 +16,11 @@
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
           <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-            <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+            <el-input
-              <el-option
+              disabled
-                v-for="(item, index) in standSortOptions"
+              v-model="qbfsForm.bussSort"
-                :key="index"
+              placeholder="请输入企标类别"
-                :value="item.value"
+              :maxlength="500"/>
-                :label="item.label">
-              </el-option>
-            </el-select>
           </el-form-item>
           <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
@@ -32,13 +29,6 @@
               placeholder="请输入企标名称"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-            <el-select  disabled  v-model="qbfsForm.planStatus"  placeholder="请选择计划状态">
-              <el-option label="制定" value="制定"></el-option>
-              <el-option label="修订" value="修订"></el-option>
-              <el-option label="完成" value="完成"></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-select disabled  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
               <el-option label="制定完成" value="制定完成"></el-option>
@@ -53,6 +43,13 @@
               placeholder="请输入起草人"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.unitName"
+              placeholder="请输入起草责任单位"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -85,18 +82,11 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.unitName"
-              placeholder="请输入起草责任单位"
-              :maxlength="500"/>
-          </el-form-item>
-          <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.rqbName"
-              placeholder="请输入被修订标准代号"
+              placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -106,9 +96,9 @@
               placeholder="请输入体系结构"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+          <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                         class="add-form-item form-item-disabled">
-            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
               <el-option
                 v-for="item in BZList"
                 :key="item.value"
@@ -117,18 +107,18 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+          <el-form-item  label="是否采用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.isRelate"
-              placeholder="请输入是否引用标准"
+              placeholder="请输入是否采用标准"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.technologic"
-              placeholder="请输入是否引用标准"
+              placeholder="请输入简述指标依据"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
@@ -139,25 +129,28 @@
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
-            <el-input
+            <el-select disabled v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
-              disabled
+              <el-option
-              v-model="qbfsForm.useLevel"
+                v-for="(item, index) in cbcdOptions"
-              placeholder="请输入采标程度"
+                :key="index"
-              :maxlength="500"/>
+                :value="item.value"
+                :label="item.label">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+          <el-form-item  label="引用标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.esMatingRelations"
-              placeholder="请输入配套标准"
+              placeholder="请输入引用标准"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
+          <el-form-item v-if="type === '5'"  label="立项原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
               disabled
               v-model="qbfsForm.newReason"
-              placeholder="请输入新增原因"
+              placeholder="请输入立项原因"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
@@ -359,6 +352,7 @@ export default {
       drawerTitle: '',
       detailData: [],
       standSortOptions: [],
+      cbcdOptions: [],
     }
   },
   mounted() {
@@ -368,6 +362,7 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {
+      this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
       this.BZList = res.data.ENERGYTYPES //标准范围
       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })

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

@@ -16,14 +16,11 @@
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
           <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-            <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+            <el-input
-              <el-option
+              disabled
-                v-for="(item, index) in standSortOptions"
+              v-model="qbfsForm.bussSort"
-                :key="index"
+              placeholder="请输入企标类别"
-                :value="item.value"
+              :maxlength="500"/>
-                :label="item.label">
-              </el-option>
-            </el-select>
           </el-form-item>
           <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
@@ -32,13 +29,6 @@
               placeholder="请输入企标名称"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-            <el-select  disabled  v-model="qbfsForm.planStatus"  placeholder="请选择计划状态">
-              <el-option label="制定" value="制定"></el-option>
-              <el-option label="修订" value="修订"></el-option>
-              <el-option label="完成" value="完成"></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-select disabled  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
               <el-option label="制定完成" value="制定完成"></el-option>
@@ -53,6 +43,13 @@
               placeholder="请输入起草人"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.unitName"
+              placeholder="请输入起草责任单位"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -85,18 +82,11 @@
               placeholder="请选择计划标准发布时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+          <el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.unitName"
-              placeholder="请输入起草责任单位"
-              :maxlength="500"/>
-          </el-form-item>
-          <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.rqbName"
-              placeholder="请输入被修订标准代号"
+              placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -106,9 +96,9 @@
               placeholder="请输入体系结构"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="area" label="标准范围" style="width: 100%; margin-right:10px"
+          <el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
                         class="add-form-item form-item-disabled">
-            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+            <el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
               <el-option
                 v-for="item in BZList"
                 :key="item.value"
@@ -117,18 +107,18 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item  label="是否引用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
+          <el-form-item  label="是否采用标准" style="width: 100%; margin-right:10px"  prop="isRelate" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.isRelate"
-              placeholder="请输入是否引用标准"
+              placeholder="请输入是否采用标准"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '否'" label="简述指标依据" style="width: 100%; margin-right:10px"  prop="technologic" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.technologic"
-              placeholder="请输入是否引用标准"
+              placeholder="请输入简述指标依据"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '是'" label="采用标准" style="width: 100%; margin-right:10px"  prop="esStandRelations" class="add-form-item form-item-disabled">
@@ -139,25 +129,28 @@
               :maxlength="500"/>
           </el-form-item>
           <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
-            <el-input
+            <el-select disabled v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
-              disabled
+              <el-option
-              v-model="qbfsForm.useLevel"
+                v-for="(item, index) in cbcdOptions"
-              placeholder="请输入采标程度"
+                :key="index"
-              :maxlength="500"/>
+                :value="item.value"
+                :label="item.label">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item  label="配套标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
+          <el-form-item  label="引用标准" style="width: 100%; margin-right:10px"  prop="esMatingRelations" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.esMatingRelations"
-              placeholder="请输入配套标准"
+              placeholder="请输入引用标准"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item v-if="type === '5'"  label="新增原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
+          <el-form-item v-if="type === '5'"  label="立项原因" style="width: 100%; margin-right:10px"  prop="newReason" class="add-form-item form-item-disabled">
             <el-input
               type="textarea"
               disabled
               v-model="qbfsForm.newReason"
-              placeholder="请输入新增原因"
+              placeholder="请输入立项原因"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
@@ -359,6 +352,7 @@ export default {
       drawerTitle: '',
       detailData: [],
       standSortOptions: [],
+      cbcdOptions: [],
     }
   },
   mounted() {
@@ -368,7 +362,8 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {
-      this.BZList = res.data.ENERGYTYPES //标准范围
+      this.BZList = res.data.ENERGYTYPES //适用车型
+      this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
@@ -457,6 +452,8 @@ export default {
     handleSubmit(){
       this.isSubmit = true
       this.qbfsForm.bzfgbzFlag = '0'
+      this.qbfsForm.planStatus = '未开始'
+      this.qbfsForm.area = this.qbfsForm.area.join(',')
       this.qbfsForm.commentText = this.commentText
       let json = JSON.stringify(this.qbfsForm);
       this.$http.post('lawss/activiti/completeTask', {

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -314,7 +314,7 @@ export default {
     },
     //清空
     clearSearch() {
-      this.sarSarAccessEOSearch.projectName = ''
+      this.sarSarAccessEOSearch.carType = ''
       this.sarSarAccessEOSearch.detailedListName = ''
       this.searchSarAccess()
 

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -877,7 +877,7 @@ export default {
       this.zrbmOptions = res.data.ZRBMCLASS
       // 能源类型数据字典
       this.CycxOptions = res.data.CLLX
-      // this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      this.categoryOptions = res.data.NYLXCLASS // 能源类型
       // 适用车型数据字典
       this.applyArcticOptions = res.data.PRODUCTTYPE
       // 适用产品线数据字典

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -462,39 +462,44 @@ export default {
         }, {
           _this: this
         }, res => {
-          res.data.records.forEach(item => {
+          if (res.data !== null) {
-            if (item.nylx === "[]") {
+            res.data.records.forEach(item => {
-              item.nylx = null;
+              if (item.nylx === "[]") {
-            }
+                item.nylx = null;
-            if (item.typeApplicable === "[]") {
+              }
-              item.typeApplicable = null;
+              if (item.typeApplicable === "[]") {
-            }
+                item.typeApplicable = null;
-            if (item.sycpx === "[]") {
+              }
-              item.sycpx = null;
+              if (item.sycpx === "[]") {
-            }
+                item.sycpx = null;
-            if(item.zrbm === "[]"){
+              }
-              item.zrbm = null
+              if(item.zrbm === "[]"){
-            }
+                item.zrbm = null
-            if (item.zccssrqgj === "undefined") {
+              }
-              item.zccssrqgj = '-'
+              if (item.zccssrqgj === "undefined") {
-            }
+                item.zccssrqgj = '-'
-            if (item.xcxssrqgj === "undefined") {
+              }
-              item.xcxssrqgj = '-'
+              if (item.xcxssrqgj === "undefined") {
-            }
+                item.xcxssrqgj = '-'
-            if (item.ssrq === "undefined") {
+              }
-              item.ssrq = '-'
+              if (item.ssrq === "undefined") {
-            }
+                item.ssrq = '-'
-          });
+              }
-          this.standinfoList = res.data.records;
+            });
-          this.standardFormTotal = res.data.total;
+            this.standinfoList = res.data.records;
-          this.standinfoList.forEach(item => {
+            this.standardFormTotal = res.data.total;
-            if (item.standYear === null) {
+            this.standinfoList.forEach(item => {
-              item.standNumber = item.standSortShow + " " + item.standNumber;
+              if (item.standYear === null) {
-            } else {
+                item.standNumber = item.standSortShow + " " + item.standNumber;
-              item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
+              } else {
-            }
+                item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
-          });
+              }
-          this.standInfoTableLoading = false
+            });
+            this.standInfoTableLoading = false
+          } else {
+            this.standinfoList = []
+          }
+
         }, e => {
           this.standInfoTableLoading = false
         });
@@ -506,30 +511,35 @@ export default {
         }, {
           _this: this
         }, res => {
-          res.data.records.forEach(item => {
+          if (res.data !== null) {
-            if (item.nylx === "[]") {
+            res.data.records.forEach(item => {
-              item.nylx = null;
+              if (item.nylx === "[]") {
-            }
+                item.nylx = null;
-            if (item.typeApplicable === "[]") {
+              }
-              item.typeApplicable = null;
+              if (item.typeApplicable === "[]") {
-            }
+                item.typeApplicable = null;
-            if (item.sycpx === "[]") {
+              }
-              item.sycpx = null;
+              if (item.sycpx === "[]") {
-            }
+                item.sycpx = null;
-            if(item.zrbm === "[]"){
+              }
-              item.zrbm = null
+              if(item.zrbm === "[]"){
-            }
+                item.zrbm = null
-          });
+              }
-          this.standinfoList = res.data.records;
+            });
-          this.standardFormTotal = res.data.total;
+            this.standinfoList = res.data.records;
-          this.standinfoList.forEach(item => {
+            this.standardFormTotal = res.data.total;
-            if (item.standYear === null) {
+            this.standinfoList.forEach(item => {
-              item.standNumber = item.standSortShow + " " + item.standNumber;
+              if (item.standYear === null) {
-            } else {
+                item.standNumber = item.standSortShow + " " + item.standNumber;
-              item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
+              } else {
-            }
+                item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
-          });
+              }
-          this.standInfoTableLoading = false
+            });
+            this.standInfoTableLoading = false
+          } else {
+            this.standinfoList = []
+          }
+
         }, e => {
           this.standInfoTableLoading = false
         });
@@ -542,21 +552,25 @@ export default {
       }, {
         _this: this
       }, res => {
-        res.data.records.forEach(item => {
+        if (res.data !== null) {
-          if (item.nylx === "[]") {
+          res.data.records.forEach(item => {
-            item.nylx = null;
+            if (item.nylx === "[]") {
-          }
+              item.nylx = null;
-          if (item.typeApplicable === "[]") {
+            }
-            item.typeApplicable = null;
+            if (item.typeApplicable === "[]") {
-          }
+              item.typeApplicable = null;
-          if (item.sycpx === "[]") {
+            }
-            item.sycpx = null;
+            if (item.sycpx === "[]") {
-          }
+              item.sycpx = null;
-          if(item.zrbm === "[]"){
+            }
-            item.zrbm = null
+            if(item.zrbm === "[]"){
-          }
+              item.zrbm = null
-        });
+            }
-        this.standinfoList = res.data.records;
+          });
+          this.standinfoList = res.data.records;
+        } else {
+          this.standinfoList = []
+        }
         this.standardFormTotal = res.data.total;
         this.standinfoList.forEach(item => {
           if (item.standYear === null) {
@@ -769,13 +783,17 @@ export default {
      * 高级检索
      */
     selectMoreBtn() {
-      this.isAdvancedSearch = true;
+      this.standardForm.zrbm = ''
+      this.standardForm.responseUnit = ''
+      this.standardForm.standName = ''
+      this.standardForm.standNumber = ''
       this.standardFormList.standName = "";
       this.standardFormList.typeApplicable = "";
       this.standardFormList.nylx = "";
       this.standardFormList.zrbm = "";
       this.standardFormList.sycpx = "";
       this.showTableFlag = false;
+      this.isAdvancedSearch = true;
       this.page = 1;
       this.standardForm.page = 1;
       this.selectInfoMore();

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -1039,6 +1039,32 @@ export default {
             this.$message.warning('请勿添加重复数据')
           } else{
             this.sarAccessInfoList.push(item)
+            this.sarAccessInfoList.forEach(item => {
+              // 能源类型转换
+              if (item.nylx !== null) {
+                let k = (item.nylx || "").split(",");
+                for (let i in this.applyArcticOptions) {
+                  for (let m = 0; m < k.length; m++) {
+                    if (this.applyArcticOptions[i].value === k[m]) {
+                      k[m] = this.applyArcticOptions[i].label;
+                    }
+                    item.nylx = k.join(",");
+                  }
+                }
+              }
+              // 适用车型转换
+              if (item.typeApplicable !== null) {
+                let k = (item.typeApplicable || "").split(",");
+                for (let i in this.energyKindOptions) {
+                  for (let m = 0; m < k.length; m++) {
+                    if (this.energyKindOptions[i].value === k[m]) {
+                      k[m] = this.energyKindOptions[i].label;
+                    }
+                    item.typeApplicable = k.join(",");
+                  }
+                }
+              }
+            })
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -367,11 +367,14 @@
                                         </template>
                                         <el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
-                                                <el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.useLevel">
+                                                <el-select :disabled="DrawerType === 'see'" v-model="addForm.useLevel" filterable placeholder="请选择采标程度" style="width: 100%;">
-                                                    <el-radio label="等同" value="等同"></el-radio>
+                                                    <el-option
-                                                    <el-radio label="修改" value="修改"></el-radio>
+                                                            v-for="(item, index) in CBList"
-                                                    <el-radio label="非等效" value="非等效"></el-radio>
+                                                            :key="index"
-                                                </el-radio-group>
+                                                            :label="item.label"
+                                                            :value="item.value">
+                                                    </el-option>
+                                                </el-select>
                                             </div>
                                         </el-form-item>
                                         <el-form-item v-if="addForm.isRelate === '否'" label="简述技术指标依据" style="width: 100%; margin-right:10px" class="add-form-item" prop="technologic" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
@@ -591,6 +594,7 @@
         },
         data() {
             return {
+                CBList: [],
                 BZList: [],
                 TXJGList: [],
                 TXJGmodal: false,
@@ -761,7 +765,7 @@
                  this.$message.warning('请选择要带入的标准')
                 } else {
                     this.addForm.rqbJson = this.QYBZformSelect[0].id
-                    this.addForm.rqbName = this.QYBZformSelect[0].standName
+                    this.addForm.rqbName = this.QYBZformSelect[0].standCode
                     this.clearQYBZ()
                     this.QYBZmodal = false
                 }
@@ -1092,7 +1096,7 @@
                 this.standSystemOptions = res.data.TXLBBUSS // 体系结构
                 this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
                 this.BZList = res.data.ENERGYTYPES
-                console.log(res.data);
+                this.CBList = res.data.DEGREESTANDARD
             }, e => {
             })
         },

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -4,7 +4,7 @@
     <div class="search-area">
       <div class="left">
         <el-form inline :model="localProTableSearch" class="label-input-form"
-                 @keyup.enter.native="getLocalProductTableBtn">
+                 @keyup.enter.native="getLocalProductTableBtns">
           <el-form-item label="项目编号" class="search-item">
             <el-input
               v-model="localProTableSearch.projectNumber"
@@ -51,7 +51,7 @@
               class="common-button-primary"
               size="small"
               v-btn-permission="'b1ac4fb12eeb08c525b018ef839dbd40'"
-              @click="getLocalProductTableBtn">查询
+              @click="getLocalProductTableBtns">查询
             </el-button>
           </el-form-item>
           <el-form-item class="search-item btn-box">
@@ -477,7 +477,7 @@ export default {
         projectClassification: "",
         // 项目状态
         projectStatus: "",
-        page: ""
+        page: 1
       },
       //查询3类
       projectLibrarySearchDefault: {
@@ -1210,6 +1210,37 @@ export default {
       this.SarExportSearchEo = this.localProTableSearch;
       this.$http.get("sarStandProjectLibrary/queryProject", {
         ...this.localProTableSearch,
+        page: this.page,
+        pageSize: this.pageSize,
+      }, {
+        _this: this, loading: "loading"
+      }, res => {
+        if (this.localProTableSearch.prodectCode === "Maintenance") {
+          this.localProTableList = res.data.Maintenance.records;
+          this.productTypeOptions = this.projectData
+          this.xmztOptions = this.projectStatus
+          this.total = res.data.Maintenance.total;
+        } else if (this.localProTableSearch.prodectCode === "notMaintenance") {
+          this.localProTableList = res.data.notMaintenance.records;
+          this.productTypeOptions = this.notProjectData
+          this.xmztOptions = this.notProjectStatus
+          this.total = res.data.notMaintenance.total;
+        }
+      }, e => {
+      });
+      // this.$refs.selection.selectAll(false)
+    },
+
+    getLocalProductTableBtns() {
+      this.projectLibrarySearch.page = 1;
+      this.isAdvancedSearch = false;
+      this.getLocalProductTables();
+    },
+    getLocalProductTables() {
+      this.localProTableSearch.prodectCode = this.ifMaintaince;
+      this.localProTableSearch.dataType = this.insideTabsActiveName;
+      this.SarExportSearchEo = this.localProTableSearch;
+      this.$http.get("sarStandProjectLibrary/queryProject", {
         ...this.projectLibrarySearch,
         page: this.page,
         pageSize: this.pageSize,
@@ -1227,26 +1258,6 @@ export default {
           this.xmztOptions = this.notProjectStatus
           this.total = res.data.notMaintenance.total;
         }
-        // this.localProTableList.map((item) => {
-        //   this.xmztOptions.map((opr) => {
-        //     if (item.productBrand === opr.value) {
-        //       item.productBrand = opr.label
-        //     }
-        //   })
-        //   this.scxxOptions.map((xmItem) => {
-        //     if (item.saleMarket === xmItem.value) {
-        //       item.saleMarket = xmItem.label
-        //     }
-        //   })
-        //   this.scxxOptions.map((xmItem) => {
-        //     if (item.targetMarket === xmItem.value) {
-        //       item.targetMarket = xmItem.label
-        //     }
-        //   })
-        // })
-        // if ((this.localProTableList.length === 0 || this.localProTableList === []) && this.localProTableSearch.page !== 1) {
-        //   this.pageChange(1)
-        // }
       }, e => {
       });
       // this.$refs.selection.selectAll(false)

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -845,7 +845,9 @@ export default {
       // 查询详情表格数据
       this.$http.get('sarStandProjectLibrary/queryStandInfoNew', {
         id: this.localProEO.id,
-        cars: "1"
+        cars: "1",
+        current: 1,
+        pageSize: this.$store.getters.userInfo.configContent
       }, {
         _this: this,
         loading: 'loading'

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

@@ -318,7 +318,7 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     exportAll() {
-      window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid)
+      window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.id)
     },
     exportAll1() {
       window.open('/api/slrs/sar-public-idea-all/tuallStand?type=1&cid=' + this.$route.query.item.id)

src/sysConfig/index.js

@@ -6,11 +6,11 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-// const devIp = '192.168.10.248'
+const devIp = '192.168.10.6'
 // const devIp = '62.234.136.153'
-// const devInterfacePORT = '8033'
+const devInterfacePORT = '9999'
-const devIp = '10.19.11.243'
+// const devIp = '10.19.11.243'
-const devInterfacePORT = '4304'
+// const devInterfacePORT = '4304'
 // 配置 idm 认证
 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='