Merge branch 'develop_new' into develop

src/common/onlineEdit/index.js

@@ -20,7 +20,7 @@ export default (id,nodeName,userId,userName) => {
                 editFileInfo.pId = editFileInfo.pid
             }
             const nowTime = new Date().getTime()
-            window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
+            window.open(onlyOfficeUrl+'/editor?fileId='+editFileInfo.id+'&pid='+editFileInfo.pId+'&taskIds='+editFileInfo.taskId+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id +'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
         }
     }).catch(e => {
     })

src/pages/processCenter/pages/components/ProcessFooter.vue

@@ -97,6 +97,15 @@
                 v-if="showOver3"
         >驳回</el-button>
       </el-popover>
+      <el-button
+        type="primary"
+        size="small"
+        class="common-button-primary"
+        icon="el-icon-check"
+        @click="handleReceive"
+        :loading="submitLoading"
+        v-if="showReceive"
+      >接收任务</el-button>
       <el-button
               type="danger"
               size="small"
@@ -215,6 +224,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showReceive: {
+      type: Boolean,
+      default: false
+    },
     visible: {
       type: Boolean,
       default: false
@@ -383,6 +396,9 @@ export default {
     handleSubmit() {
       this.$emit('submit')
     },
+    handleReceive() {
+      this.$emit('receive')
+    },
     handleAccept() {
       this.$emit('accept')
     },

src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue

@@ -31,7 +31,10 @@
         </el-form-item>
         <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
           <template>
-            <div style="padding-left: 10px; color: #666666;">{{ !form.reviseStatus || form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div>
+            <div style="padding-left: 10px; color: #666666;"  v-if="form.reviseStatus === '1'">制定</div>
+            <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '2'">修订</div>
+            <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '3'">修改</div>
+            <div style="padding-left: 10px; color: #666666;"  v-else></div>
           </template>
         </el-form-item>
         <!--                                <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->

src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue

@@ -19,7 +19,10 @@
         </el-form-item>
         <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
           <template>
-            <div style="padding-left: 10px; color: #666666;">{{ !form.reviseStatus || form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div>
+            <div style="padding-left: 10px; color: #666666;"  v-if="form.reviseStatus === '1'">制定</div>
+            <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '2'">修订</div>
+            <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '3'">修改</div>
+            <div style="padding-left: 10px; color: #666666;"  v-else></div>
           </template>
         </el-form-item>
         <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">

src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue

@@ -24,7 +24,10 @@
         </el-form-item>
           <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
               <template>
-                  <div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div>
+                <div style="padding-left: 10px; color: #666666;"  v-if="form.reviseStatus === '1'">制定</div>
+                <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '2'">修订</div>
+                <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '3'">修改</div>
+                <div style="padding-left: 10px; color: #666666;"  v-else></div>
               </template>
           </el-form-item>
         <!--                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->

src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue

@@ -18,7 +18,10 @@
           </el-form-item>
           <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
             <template>
-              <div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div>
+              <div style="padding-left: 10px; color: #666666;"  v-if="form.reviseStatus === '1'">制定</div>
+              <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '2'">修订</div>
+              <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '3'">修改</div>
+              <div style="padding-left: 10px; color: #666666;"  v-else></div>
             </template>
           </el-form-item>
           <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">

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

@@ -46,8 +46,19 @@
               </el-form-item>
               <el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >
                 <template>
-                                        <div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div>
+                  <div style="padding-left: 10px; color: #666666;"  v-if="form.reviseStatus === '1'">制定</div>
+                  <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '2'">修订</div>
+                  <div style="padding-left: 10px; color: #666666;"  v-else-if="form.reviseStatus === '3'">修改</div>
+                  <div style="padding-left: 10px; color: #666666;"  v-else></div>
                 </template>
+                <!--                                  <el-select  v-model="form.reviseStatus" filterable clearable>-->
+                <!--                                    <el-option-->
+                <!--                                      v-for="item in opinionsStand"-->
+                <!--                                      :key="item.value"-->
+                <!--                                      :value="item.value"-->
+                <!--                                      :label="item.label"-->
+                <!--                                    ></el-option>-->
+                <!--                                  </el-select>-->
               </el-form-item>
               <!--                                <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
               <!--                                    <el-select :disabled="disabledXX"  :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">-->
@@ -882,14 +893,14 @@
             <!--                                    <el-option label="未制定" value="2"></el-option>-->
             <!--                                </el-select>-->
             <!--                            </el-form-item>-->
-                            <el-form-item label="企标名称" style="margin-right:20px" prop="esName" class="search-item" >
+            <el-form-item v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'" label="企标名称" style="margin-right:20px" prop="esName" class="search-item" >
               <el-input :disabled="disabledXX"
                         v-model="standardSearchForm.esName"
                         placeholder="请输入企标名称"
                         clearable
                         :maxlength="100"></el-input>
             </el-form-item>
-                            <el-form-item label="起草责任单位" style="margin-right:20px" prop="unit" class="search-item" >
+            <el-form-item v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'" label="起草责任单位" style="margin-right:20px" prop="unit" class="search-item" >
               <el-input :disabled="disabledXX"
                         style="width:176px"
                         v-model="standardSearchForm.unit"
@@ -897,6 +908,30 @@
                         clearable
                         :maxlength="100"></el-input>
             </el-form-item>
+            <el-form-item v-if="this.form.reviseStatus === '3'" label="企标编号" style="margin-right:20px" prop="unit" class="search-item" >
+              <el-input :disabled="disabledXX"
+                        style="width:176px"
+                        v-model="standardSearchForm.standCode"
+                        placeholder="请输入企标编号"
+                        clearable
+                        :maxlength="100"></el-input>
+            </el-form-item>
+            <el-form-item v-if="this.form.reviseStatus === '3'" label="起草单位" style="margin-right:20px" prop="unit" class="search-item" >
+              <el-input :disabled="disabledXX"
+                        style="width:176px"
+                        v-model="standardSearchForm.QCDW"
+                        placeholder="请输入起草单位"
+                        clearable
+                        :maxlength="100"></el-input>
+            </el-form-item>
+            <el-form-item v-if="this.form.reviseStatus === '3'" label="中文名称" style="margin-right:20px" prop="unit" class="search-item" >
+              <el-input :disabled="disabledXX"
+                        style="width:176px"
+                        v-model="standardSearchForm.standName"
+                        placeholder="请输入中文名称"
+                        clearable
+                        :maxlength="100"></el-input>
+            </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button :disabled="disabledXX"
                          type="primary"
@@ -938,18 +973,21 @@
               align="center"
             ></el-table-column>
             <el-table-column
+              v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
               prop="bussSort"
               label="企标类别"
               align="center"
               width="120">
             </el-table-column>
             <el-table-column
+              v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
               prop="esName"
               label="企标名称"
               align="center"
               width="120">
             </el-table-column>
             <el-table-column
+              v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
               prop="planStatus"
               label="计划状态"
               align="center"
@@ -959,6 +997,7 @@
               </template>
             </el-table-column>
             <el-table-column
+              v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
               prop="reviseStatus"
               width="150"
               align="center"
@@ -968,24 +1007,28 @@
               </template>
             </el-table-column>
             <el-table-column
+              v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
               prop="drafterName"
               width="120"
               align="center"
               label="起草人">
             </el-table-column>
             <el-table-column
+              v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
               prop="resPersonName"
               width="120"
               align="center"
               label="评审责任人">
             </el-table-column>
             <el-table-column
+              v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
               prop="wgLeaderName"
               width="120"
               align="center"
               label="工作组组长">
             </el-table-column>
             <el-table-column
+              v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
               prop="draftTime"
               width="200"
               align="center"
@@ -995,6 +1038,7 @@
               </template>
             </el-table-column>
             <el-table-column
+              v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
               width="200"
               prop="releaseTime"
               align="center"
@@ -1004,10 +1048,53 @@
               </template>
             </el-table-column>
             <el-table-column
+              v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
               align="center"
               prop="unitName"
               label="起草责任单位">
             </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus === '3'"
+              align="center"
+              prop="standCode"
+              label="企标编号">
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus === '3'"
+              align="center"
+              prop="standName"
+              label="中文名称">
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus === '3'"
+              align="center"
+              prop="standStatusShow"
+              label="文本状态">
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus === '3'"
+              align="center"
+              prop="dtqbbhbuss"
+              label="代替企标编号">
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus === '3'"
+              align="center"
+              prop="issueTime"
+              label="发布日期">
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus === '3'"
+              align="center"
+              prop="putTime"
+              label="实施日期">
+            </el-table-column>
+            <!--                            <el-table-column-->
+            <!--                              v-if="this.form.reviseStatus === '3'"-->
+            <!--                              align="center"-->
+            <!--                              prop="revisionStatus"-->
+            <!--                              label="企标制修订状态">-->
+            <!--                            </el-table-column>-->
             <!--                            <el-table-column label="操作" align="center" width="80">-->
             <!--                                <template slot-scope="scope">-->
             <!--                                    <el-button :disabled="disabledXX" -->
@@ -1221,6 +1308,11 @@
       ccc:false,
       disabledXX:!!this.$route.query.disabledXX,
       bpnId: this.$route.query.bpnId,
+      opinionsStand:[
+        {value: '1',label: '制定'},
+        {value: '2',label: '修订'},
+        {value: '3',label: '修改'},
+      ],
       fileList: [],
       FBGBUSSFileList: [],
       BZSMBUSSFileList: [],
@@ -1246,6 +1338,9 @@
       loadSarStandard: false,
       verifySarStandard: true,
       standardSearchForm: {
+        standName:'',
+        standCode:'',
+        QCDW:'',
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         unit: '',
@@ -1992,26 +2087,42 @@
         // 带入
         case 2:
           if (this.standardCheckedList.length === 1) {
-                            this.form.standName = this.standardCheckedList[0].esName
+            console.log(this.standardCheckedList);
-                            this.form.standSort = this.standardCheckedList[0].bussSort
+            this.form.standName = this.standardCheckedList[0].esName || this.standardCheckedList[0].standName
+            this.form.standSort = this.standardCheckedList[0].bussSort || this.standardCheckedList[0].standSort
             this.form.planId = this.standardCheckedList[0].id
             this.form.planStatus = this.standardCheckedList[0].planStatus
-                            this.form.reviseStatus = this.standardCheckedList[0].reviseStatus
+            this.form.reviseStatus = this.form.reviseStatus === '3'? this.form.reviseStatus :this.standardCheckedList[0].reviseStatus
-                            // 代替企标编号
+            this.$http.get('lawss/sarBussionessStand/getStandInfoUpdateById', {
-                            this.form.DTQBBHBUSS = this.filterDate(this.standardCheckedList[0].rqbName)
+              id: this.standardCheckedList[0].id
-                            // 标准编号
+            }, {
-                            this.form.standNum = this.filterDate(this.standardCheckedList[0].standNum)
+              _this: this
-                            // 适用车型
+            }, res => {
-                            this.form.SYCXCLASS = this.filterObj(this.standardCheckedList[0].area)
+              console.log(res.data);
-                            // 采标程度
+              this.form.standEnName = res.data.standEnName
-                            this.form.CYCD = this.filterDate(this.standardCheckedList[0].useLevel)
+              this.form.putTime = res.data.putTime
-                            // 采用标准drafter
+              this.form.QCDW = res.data.attrInfoMap.QCDW
-                            this.form.CYBZ = this.filterDate(this.standardCheckedList[0].esStandRelations)
+              this.form.WJSCRYBUSSName = res.data.attrInfoMap.WJSCRYBUSS
-                            // 引用标准
+              this.form.NYLXCLASS = res.data.attrInfoMap.NYLXCLASS.split(',')
-                            this.form.YYBZ = this.filterDate(this.standardCheckedList[0].esMatingRelations)
+              this.form.SYCXCLASS = res.data.attrInfoMap.SYCXCLASS.split(',')
-                            // 起草人带入
+              this.form.CYCVPPSBMBUSS = res.data.attrInfoMap.CYCVPPSBMBUSS
-                            this.form.QCRBUSS = this.filterStringDate(this.standardCheckedList[0].drafterName)
+              this.form.KCVPPSBMBUSS = res.data.attrInfoMap.KCVPPSBMBUSS
-                            this.form.QCRBUSSID = this.filterStringDate(this.standardCheckedList[0].drafter)
+              this.form.SYCPXCLASS = res.data.attrInfoMap.SYCPXCLASS.split(',')
+              this.form.CYCD = res.data.attrInfoMap.CYCD.split(',')
+              this.form.TXLBBUSS = res.data.attrInfoMap.TXLBBUSS
+              this.form.QCRBUSS = res.data.attrInfoMap.QCRBUSS
+              this.form.CYCVPPSCNBUSS = res.data.attrInfoMap.CYCVPPSCNBUSS
+              this.form.KCVPPSCNBUSS = res.data.attrInfoMap.KCVPPSCNBUSS
+              this.form.DTQBBHBUSS = res.data.attrInfoMap.DTQBBHBUSS
+              this.form.CYBZ = res.data.attrInfoMap.CYBZ
+              this.form.YYBZ = res.data.attrInfoMap.YYBZ
+              this.form.XCSJBUSS = res.data.attrInfoMap.XCSJBUSS
+              this.BZSMBUSSFileList=this.assemble(res.data.attrInfoMap.BZSMBUSS.substring(0, res.data.attrInfoMap.BZSMBUSS.lastIndexOf(',')),res.data.attrInfoMap.BZSMBUSSName);
+              this.FBGBUSSFileList=this.assemble(res.data.attrInfoMap.FBGBUSS.substring(0, res.data.attrInfoMap.FBGBUSS.lastIndexOf(',')),res.data.attrInfoMap.FBGBUSSName);
+              this.LSBBBUSSFileList=this.assemble(res.data.attrInfoMap.LSBBBUSS.substring(0, res.data.attrInfoMap.LSBBBUSS.lastIndexOf(',')),res.data.attrInfoMap.LSBBBUSSName);
+              this.QTWJBUSSFileList=this.assemble(res.data.attrInfoMap.QTWJBUSS.substring(0, res.data.attrInfoMap.QTWJBUSS.lastIndexOf(',')),res.data.attrInfoMap.QTWJBUSSName);
+              this.GLWJBUSSFileList=this.assemble(res.data.attrInfoMap.GLWJBUSS.substring(0, res.data.attrInfoMap.GLWJBUSS.lastIndexOf(',')),res.data.attrInfoMap.GLWJBUSSName);
+            })
             // 起草部门带入
             this.form.QCDW = this.filterStringDate(this.standardCheckedList[0].unitName)
             this.form.QCDWID = this.filterStringDate(this.standardCheckedList[0].unit)
@@ -2117,6 +2228,9 @@
       this.standardSearchForm.unit = ''
       this.standardSearchForm.esName = ''
       this.standardSearchForm.planStatus = '0,3,6'
+      this.standardSearchForm.standCode = ''
+      this.standardSearchForm.standName = ''
+      this.standardSearchForm.QCDW = ''
       this.standardSearchForm.reviseStatus = ''
       setTimeout(() => {
         this.handleSearchStandard()
@@ -2130,8 +2244,25 @@
       done()
     },
     getDomesticStandardTable () {
+      console.log(this.form.reviseStatus);
       this.loadSarStandard = true
-                this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans', this.standardSearchForm, {
+      let url = ''
+      let userInfo;
+      userInfo = JSON.parse(localStorage.getItem('userInfo'));
+      if(this.form.reviseStatus === '3'){
+        url = 'lawss/sarBussionessStand/getSarBussionStandPage'
+      }else{
+        url = 'esRevisePlan/es-revise-plan/queryAllPlans'
+      }
+      this.standardSearchForm = {...this.standardSearchForm}
+      if(this.form.reviseStatus === '3'){
+        this.standardSearchForm.userId = userInfo.userId
+        this.standardSearchForm.isKu = 1
+        this.standardSearchForm.vaildFlag = 0
+        delete this.standardSearchForm.planStatus
+      }
+      if(this.form.reviseStatus === '3'){
+        this.$http.get(url, this.standardSearchForm, {
           _this: this
         }, res => {
           this.loadSarStandard = false
@@ -2142,8 +2273,25 @@
         }, e => {
           this.loadSarStandard = false
         })
+      }else{
+        this.$http.post(url, this.standardSearchForm, {
+          _this: this
+        }, res => {
+          this.loadSarStandard = false
+          if (res.ok) {
+            this.tableData.standardData = res.data.list
+            this.tableCount = res.data.count
+          }
+        }, e => {
+          this.loadSarStandard = false
+        })
+      }
     },
     handleSearchStandard () {
+      if(!this.form.reviseStatus){
+        this.$message.warning('请先选择制修订类型')
+      }else {
+        this.tableData.standardData = []
         this.standardDrawer = true
         this.$nextTick(() => {
           // 动态设置表格高度
@@ -2153,6 +2301,7 @@
           }
         })
         this.getDomesticStandardTable()
+      }
     },
     saveUserInfo () {
       this.filterText = ''
@@ -2953,6 +3102,11 @@
               json.applyUpdUserId = this.form.applyUpdUserId
               json.prcCreateUser = this.form.prcCreateUser
               json.prcCreateUserName = this.form.prcCreateUserName
+              if(this.form.reviseStatus == '3'){
+                json.standCode = this.standardCheckedList[0].standCode
+                json.id = this.standardCheckedList[0].id
+              }
+
               this.$http.post('lawss/activiti/startProcessRollBack', {
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,
@@ -3045,6 +3199,9 @@
   mounted () {
     this.getTaskId()
     this.getTree()
+    if(this.$route.query){
+      this.form.reviseStatus = this.$route.query.reviseStatus
+    }
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {

src/pages/processCenter/pages/creatProcess/qbrk/step13.vue

@@ -2683,6 +2683,7 @@
              */
             getFormFieldList (item) {
                 this.$nextTick(() => {
+                  console.log(item);
                     this.form = JSON.parse(JSON.stringify(item))
                     this.form.topId = this.pId
                     this.form.prcNum = this.prcNum
@@ -2801,6 +2802,9 @@
                         this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     }
                     this.formKey++
+                } else if(this.form.reviseStatus === '3'){
+                  this.form.standCode = this.form.standCode
+                  this.formKey++
                 } else {
                     this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, {
                         _this: this

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

@@ -423,22 +423,22 @@ export default {
       this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
         reviseStatus: this.standardSearch.reviseStatus || '',
         esName: this.standardSearch.standName,
-        planStatus: '0',
+        planStatus: '1,2,3,6',
         page: this.page,
         pageSize: this.pageSize,
       }, {
         _this: this,
       }, res => {
-        this.standinfoList = []
+        this.standinfoList = res.data.list
         //展示的数据只能是未开始的
-        res.data.list.forEach(item => {
+        // res.data.list.forEach(item => {
-          if(item.planStatus === '0'){
+        //   if(item.planStatus === '0'){
-            if(item.isRelate && item.isRelate === 'null'){
+        //     if(item.isRelate && item.isRelate === 'null'){
-              item.isRelate = ""
+        //       item.isRelate = ""
-            }
+        //     }
-            this.standinfoList.push(item)
+        //     this.standinfoList.push(item)
-          }
+        //   }
-        })
+        // })
         this.total = this.standinfoList.length
       })
 

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

@@ -445,19 +445,19 @@ export default {
       this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
         reviseStatus: this.standardSearch.reviseStatus || '',
         esName: this.standardSearch.standName,
-        planStatus: '0',
+        planStatus: '1,2,3,6',
         page: this.page,
         pageSize: this.pageSize,
       }, {
         _this: this,
       }, res => {
-        this.standinfoList = []
+        this.standinfoList = res.data.list
         //展示的数据只能是未开始的
-        res.data.list.forEach(item => {
+        // res.data.list.forEach(item => {
-          if(item.planStatus === '0'){
+        //   if(item.planStatus === '0'){
-            this.standinfoList.push(item)
+        //     this.standinfoList.push(item)
-          }
+        //   }
-        })
+        // })
         this.total = this.standinfoList.length
       })
 
@@ -501,7 +501,9 @@ export default {
         }
         this.qbfsForm.rqbName = this.selectList[0].rqbName
         this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
+        if(this.qbfsForm.isRelate){
           this.qbfsForm.isRelate = this.selectList[0].isRelate.indexOf("null") !== -1 ? "":this.selectList[0].isRelate
+        }
         this.qbfsForm.useLevel = this.selectList[0].useLevel
         this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
         this.qbfsForm.technologic = this.selectList[0].technologic

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

@@ -431,8 +431,8 @@ export default {
   props: ['message'],
   data(){
     const validateFsOnlineFile = async (rule, value, callback) => {
-      if(this.qbfsForm.FSD){
+      if(this.qbfsForm.LXD){
-        let fileObj = await this.processEditFile(this.qbfsForm.FSD)
+        let fileObj = await this.processEditFile(this.qbfsForm.LXD)
         if (fileObj) {
           const editFileInfo = fileObj
           if (editFileInfo && editFileInfo.editStatus === '1') {

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

@@ -1081,19 +1081,20 @@ export default {
       this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
         reviseStatus: this.standardSearch.reviseStatus || '',
         esName: this.standardSearch.standName,
-        planStatus: '0',
+        planStatus: '1,2,3,6',
         page: this.page,
         pageSize: this.pageSize,
       }, {
         _this: this,
       }, res => {
-        this.standinfoList = []
+        this.standinfoList = res.data.list
-        //展示的数据只能是未开始的
+        // this.standinfoList = []
-        res.data.list.forEach(item => {
+        // //展示的数据只能是未开始的
-          if(item.planStatus === '0'){
+        // res.data.list.forEach(item => {
-            this.standinfoList.push(item)
+        //   if(item.planStatus === '0'){
-          }
+        //     this.standinfoList.push(item)
-        })
+        //   }
+        // })
         this.total = this.standinfoList.length
         this.replaceLoading = false
       })

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

@@ -432,7 +432,7 @@ export default {
       this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
         reviseStatus: this.standardSearch.reviseStatus || '',
         esName: this.standardSearch.standName,
-        planStatus: '0',
+        planStatus: '1,2,3,6',
         page: this.page,
         pageSize: this.pageSize,
       }, {

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

@@ -95,7 +95,7 @@
               <el-card>
                 <el-form-item prop="countersignerName" style="margin-bottom: 0">
                   <h4>创新技术委员会成员/标准体系工作组成员(必选)</h4>
-                  <h4>二级研发(部所所长、总工、中心主任/研究院院长)(必选)</h4>
+                  <h4>二级研发(部所所长、总工、中心主任/研究院院长)(可选)</h4>
                   <h4>质量相关人员(可选)</h4>
                   <h4>制造部相关人员(可选)</h4>
                   <h4>采购部相关人员(可选)</h4>
@@ -127,30 +127,30 @@
                               :color="roleForm.approver ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="approverName" style="margin-bottom: 0">
-                  <h4>总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长</h4>
+                  <h4>标准法规部高级经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input :disabled="disabledXX"  v-model="roleForm.approver" style="display: none;"></el-input>
-                    <el-input :disabled="disabledXX"  v-model="roleForm.approverName" readonly placeholder="选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长"
+                    <el-input :disabled="disabledXX"  v-model="roleForm.approverName" readonly placeholder="选择标准法规部高级经理"
-                              @click.native="choiceZRR('approver', '选择总院技术委员会覆盖领域企业标准：专委会主任/总院技术委员会未覆盖领域企业标准：总院院长或总院主管副院长', roleForm.approver)">
+                              @click.native="choiceZRR('approver', '选择标准法规部高级经理', roleForm.approver)">
-                    </el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="抄送" placement="top"
-                              :color="roleForm.engineer ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="engineerName" style="margin-bottom: 0">
-                  <h4>相关单位、工程研究总院标准法规部</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input :disabled="disabledXX"  v-model="roleForm.engineer" style="display: none;"></el-input>
-                    <el-input :disabled="disabledXX"  v-model="roleForm.engineerName" readonly placeholder="选择相关单位、工程研究总院标准法规部"
-                              @click.native="choiceZRR('engineer', '选择相关单位、工程研究总院标准法规部', roleForm.engineer)">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
+<!--            <el-timeline-item timestamp="抄送" placement="top"-->
+<!--                              :color="roleForm.engineer ? '#66b1ff' : ''">-->
+<!--              <el-card>-->
+<!--                <el-form-item prop="engineerName" style="margin-bottom: 0">-->
+<!--                  <h4>相关单位、工程研究总院标准法规部</h4>-->
+<!--                  <div style="margin-top: 10px;width: 300px;">-->
+<!--                    <el-input :disabled="disabledXX"  v-model="roleForm.engineer" style="display: none;"></el-input>-->
+<!--                    <el-input :disabled="disabledXX"  v-model="roleForm.engineerName" readonly placeholder="选择相关单位、工程研究总院标准法规部"-->
+<!--                              @click.native="choiceZRR('engineer', '选择相关单位、工程研究总院标准法规部', roleForm.engineer)">-->
+<!--                    </el-input>-->
+<!--                  </div>-->
+<!--                </el-form-item>-->
+<!--              </el-card>-->
+<!--            </el-timeline-item>-->
           </el-form>
         </el-timeline>
       </div>
@@ -534,6 +534,7 @@ export default {
                 if (valid) {
                   this.isSubmit = true;
                   qbzxdFrom.commentText = this.commentText;
+                  qbzxdFrom.addFlag = '0'
                   let json = Object.assign(qbzxdFrom, this.roleForm);
                   this.$http.post("lawss/activiti/startProcessRollBack", {
                     createUser: this.$store.getters.userInfo.userId,
@@ -588,6 +589,7 @@ export default {
                 if (valid) {
                   this.isSubmit = true;
                   qbzxdFrom.commentText = this.commentText;
+                  qbzxdFrom.addFlag = '0'
                   var json = Object.assign(qbzxdFrom, this.roleForm);
                   this.$http.post("lawss/activiti/completeTask", {
                     taskIds: this.$route.query.taskIds,

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

@@ -125,7 +125,7 @@
               placeholder="请选择立项完成时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+          <el-form-item prop="tsJsonName" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               style="display: none;"
               v-model="qbfsForm.tsJson">
@@ -558,6 +558,12 @@
       @checkedRole="checkedRolePeoples"
       :nodeList="nodeList2"
     ></Role-tree>
+    <Mechanism-tree v-if="!disabledXX"
+                    is-title="选择起草责任单位"
+                    :is-visible.sync="modalshowflagZRBM"
+                    :nodeList="nodeListZRBM"
+                    @checkedRole="drawerCheckZRBM"
+    />
     <!--    单选人-->
     <Role-tree
       check-box
@@ -757,7 +763,7 @@ export default {
         endTime: [
           { required: true, message: "请选择立项完成时间", trigger: "change" }
         ],
-        tsJson: [
+        tsJsonName: [
           { required: true, message: "请选择体系结构", trigger: "change" }
         ],
         area: [
@@ -842,12 +848,13 @@ export default {
                 if (res.success) {
                   const _formData = new FormData()
                   _formData.append('infoJson', JSON.stringify(this.qbfsForm))
-                  processCreatePlan(_formData).then(res => {
+                  // processCreatePlan(_formData).then(res => {
-                    this.qbfsForm.planId = res.data
+                  //   this.qbfsForm.planId = res.data
-                    if (res.code === '200' || res.message === '入库成功'){
+                  // if (res.code === '200' || res.message === '入库成功'){
                   this.isSubmit = true;
                   this.qbfsForm.type = '5'
                   this.qbfsForm.commentText = this.commentText;
+                  this.qbfsForm.addFlag = '0'
                   let json = Object.assign(this.qbfsForm, this.roleForm);
                   this.$http.post("lawss/activiti/startProcessRollBack", {
                     createUser: this.$store.getters.userInfo.userId,
@@ -870,7 +877,7 @@ export default {
                         _this: this
                       }, res => {
                         if (res.success) {
-                              this.$message.success("企标制修订立项计划-立项已完成");
+                          this.$message.success("提交成功");
                           if (this.bpnId !== '') {
                             let taskId = {
                               id: this.bpnId
@@ -879,16 +886,16 @@ export default {
                               return res
                             })
                           }
-                              this.isSubmit = false;
                           this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
+                          // this.isSubmit = false;
                         }
                       });
                     }
                   });
+                  // }
+                  // })
                 }
-                  })
+                // this.isSubmit = false
-                }
-                this.isSubmit = false
               }, e => {
               });
             } else {
@@ -1205,6 +1212,7 @@ export default {
       this.QYBZget()
     },
     choiceZRBM(type, title, id) {
+      console.log(1);
       this.nodeListZRBM = []
       this.nodeListZRBM.push(id)
       this.drawerTitle = title

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

@@ -282,6 +282,18 @@
                           placeholder="请输入项目名称"
                 ></el-input>
               </el-form-item>
+              <el-form-item label="适用车型" class="search-item search-item-last">
+                <el-select :disabled="disabledXX"  v-model="projectSearch.carType"
+                           placeholder="请选择适用车型" filterable clearable>
+                  <el-option
+                    v-for="(item, index) in energyKindOptions"
+                    :key="index.value"
+                    :value="item.value"
+                    :label="item.label"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item class="search-item btn-box">
                 <el-button :disabled="disabledXX"
                            type="primary"
@@ -863,7 +875,8 @@ export default {
         projectName: "",
         managementHostName: "", //管理主体
         developmentHostName: "", //开发主体
-        categoryName: "" //项目细分类
+        categoryName: "", //项目细分类
+        carType: "" 
       },
       qdform: {
         projectId:"",

src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue

@@ -429,7 +429,10 @@ export default {
         case 'buss1':
           // 企标制修订-技术标准
           this.$router.push({
-            name: 'bussLibrary1'
+            name: 'bussLibrary1',
+            query:{
+              reviseStatus:'3'
+            },
           })
           break
         case 'buss2':

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -2200,6 +2200,18 @@ export default {
               }
             })
           }
+          else if(row.taskInfo === '技术标准起草') {
+            this.$router.push({
+              name: 'qbzxdjhgkStep6',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
           break
       }
     },

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -898,6 +898,18 @@ export default {
           break
         //企标制修订计划管控
         case '25':
+          if(mes !== null && mes.taskInfo !== null && mes.taskInfo !== undefined) {
+            if (mes.taskInfo === '技术标准起草'){
+              this.$router.push({
+                name: 'qbzxdjhgkStep6',
+                query: {
+                  type: '25',
+                  processName: '企标制修订计划管控',
+                  bpnId: id,
+                  verifySarStandard: true,
+                }
+              })
+            }else {
               this.$router.push({
                 name: 'qbzxdjhgkStep1',
                 query: {
@@ -906,6 +918,9 @@ export default {
                   bpnId: id
                 }
               })
+            }
+          }
+
           break
         //企标制修订立项计划
         case '26':

src/pages/regulatoryRepository/dataCenter/index.vue

@@ -63,11 +63,19 @@
       <div class="search-area">
         <el-form :modal="dataCenterSearch" :inline="true">
           <el-form-item label="类型:">
-            <el-input
+            <!--            <el-input-->
-              size="small"
+            <!--              size="small"-->
-              v-model="dataCenterSearch.dataType"
+            <!--              v-model="dataCenterSearch.dataType"-->
-              placeholder="请输入类型"
+            <!--              placeholder="请输入类型"-->
-            ></el-input>
+            <!--            ></el-input>-->
+            <el-select size="small"  v-model="dataCenterSearch.dataType"  filterable placeholder="请输入类型" style="width: 100%;">
+              <el-option
+                v-for="(item, index) in cbcdOptions"
+                :key="index"
+                :value="item.value"
+                :label="item.label">
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="资料标题:">
             <el-input
@@ -77,16 +85,32 @@
               clearable
             ></el-input>
           </el-form-item>
-          <el-form-item label="上传时间:">
+          <el-form-item label="上传开始时间:">
+            <!--            <el-date-picker-->
+            <!--              v-model="dataCenterSearch.dataUploadTime"-->
+            <!--              clearable-->
+            <!--              value-format="yyyy-MM-dd"-->
+            <!--              size="small"-->
+            <!--              type="daterange"-->
+            <!--              range-separator="至"-->
+            <!--              start-placeholder="开始日期"-->
+            <!--              end-placeholder="结束日期">-->
+            <!--            </el-date-picker>-->
             <el-date-picker
-              v-model="dataCenterSearch.dataUploadTime"
+              v-model="dataCenterSearch.startDataUploadTime"
-              clearable
-              value-format="yyyy-MM-dd"
               size="small"
-              type="daterange"
+              type="date"
-              range-separator="至"
+              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
+              placeholder="请选择上传开始时间">
-              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="上传结束时间:">
+            <el-date-picker
+              v-model="dataCenterSearch.endDataUploadTime"
+              size="small"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="请选择上传结束时间">
             </el-date-picker>
           </el-form-item>
           <el-form-item>
@@ -409,6 +433,7 @@ export default {
         total: 0
       },
       dataCenterTable: [],
+      cbcdOptions: [],
       productModelAdd: {
         name: '',
         parentId: '',
@@ -730,12 +755,17 @@ export default {
     },
     searchInfo() {
       this.loading = true
-      if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){
+      // if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){
-        this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0]
+      //   this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0]
-        this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1]
+      //   this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1]
-      }else{
+      // }else{
-        this.dataCenterSearch.startDataUploadTime =''
+      //   this.dataCenterSearch.startDataUploadTime =''
-        this.dataCenterSearch.endDataUploadTime = ''
+      //   this.dataCenterSearch.endDataUploadTime = ''
+      // }
+      if(this.dataCenterSearch.endDataUploadTime < this.dataCenterSearch.startDataUploadTime){
+        this.$message.warning('结束时间不能小于开始时间')
+        this.loading = false
+        return
       }
       this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, {
         _this: this
@@ -1032,7 +1062,9 @@ export default {
     }
   }
 }
-
+/deep/.el-input__inner{
+  width: 180px !important;
+}
 /deep/ .icon-tree {
   margin: 0 5px 0 10px;
   position: relative;

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -11,7 +11,7 @@
                             <el-option label="修订中" value="2"></el-option>
                             <el-option label="已取消" value="3"></el-option>
                             <el-option label="已完成" value="4"></el-option>
-                            <el-option label="立项已完成" value="5"></el-option>
+<!--                            <el-option label="立项已完成" value="5"></el-option>-->
                             <el-option label="计划已确认" value="6"></el-option>
                         </el-select>
                     </el-form-item>
@@ -1220,7 +1220,9 @@
                             tips = '添加'
                         }
                         let arr = JSON.parse(JSON.stringify(this.addForm))
+                        this.addForm.unitName = arr.unitName
                         arr.area = arr.area.join(',')
+                        this.addForm = {...this.addForm}
                         this.$http.post(url, this.addForm, {
                             _this: this
                         }, res => {
@@ -1230,6 +1232,36 @@
                                     this.addDrawer = false
                                     this.$message.success(tips + '成功')
                                     this.getData()
+                                  if(this.DrawerType === 'add'){
+                                    this.addForm.addFlag = '1'
+                                    this.addForm.prcCreateUser = this.$store.getters.userInfo.userId
+                                    this.addForm.prcCreateUserName = this.$store.getters.userInfo.userName
+                                    this.addForm.nowEsId = res.message
+                                    this.addForm.type = '5'
+                                    var json = Object.assign(this.addForm)
+                                    this.$http.post('lawss/activiti/startProcessRollBack', {
+                                      createUser: this.$store.getters.userInfo.userId,
+                                      createUserName: this.$store.getters.userInfo.userName,
+                                      type: '25',
+                                      json: JSON.stringify({
+                                        qbfsForm: this.addForm
+                                      })
+                                    }, {}, res => {
+                                      if (res.ok) {
+                                        this.$http.post('lawss/activiti/completeTask', {
+                                          taskIds: res.data,
+                                          userId : this.$store.getters.userInfo.userId,
+                                          json: JSON.stringify(json)
+                                        }, {
+                                          _this: this
+                                        }, res => {
+                                          if (res.success) {
+                                            // this.$message.success(res.message)
+                                          }
+                                        })
+                                      }
+                                    })
+                                  }
                                 } else {
                                     this.addDrawer = false
                                     this.$message.warning(res.data)

src/router/index.js

@@ -2275,6 +2275,15 @@ const routes = [
           title: '企标制修订计划管控流程'
         }
       },
+      {
+        path: '/qbzxdjhgkStep6',
+        name: 'qbzxdjhgkStep6',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标制修订计划管控流程'
+        }
+      },
       {
         path: '/qbzxdjhgkStep1-5',
         name: 'qbzxdjhgkStep1-5',

src/sysConfig/index.js

@@ -8,10 +8,10 @@
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.1.42'
 // const devInterfacePORT = '9999'
-// const devIp = '39.98.140.126'
+const devIp = '10.10.10.46'
-// const devInterfacePORT = '4202'
+const devInterfacePORT = '4202'
-const devIp = '10.0.3.10'
+// const devIp = '10.0.3.10'
-const devInterfacePORT = '10086'
+// const devInterfacePORT = '10086'
 // const devIp = '62.234.136.153'
 // const devInterfacePORT = '8033'
 // 配置 idm 认证
@@ -22,8 +22,8 @@ const devWebUrl = 'http://62.234.136.153:8038/#/'
 const webLoginType = 'dev'
 
 // 配置onlyOffice 前端服务
-// const onlyOfficeUrl = 'http://127.0.0.1:8080'
+const onlyOfficeUrl = 'http://127.0.0.1:8080'
-const onlyOfficeUrl = 'http://10.10.10.46:8103'
+// const onlyOfficeUrl = 'http://10.10.10.46:8103'
 
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -47,8 +47,10 @@ const processPort = '17210'
 
  *****************************************************************/
 // 生产环境配置
-const prodIp = '39.98.140.126'
+// const prodIp = '39.98.140.126'
-const prodInterfacePORT = '4201'
+// const prodInterfacePORT = '4201'
+const prodIp = '10.10.10.46'
+const prodInterfacePORT = '4202'
 // const prodIp = 'slrs.foton.com.cn'
 // const prodInterfacePORT = ''