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/components/CustomFormComponents/DatePickerGroup.vue

@@ -7,6 +7,7 @@
       :label-width="labelWidth"
       class="add-form-item"
       :class="{'form-item-disabled': disabled}"
+      :required="required"
     >
       <el-input
         v-show="false"
@@ -89,6 +90,10 @@ export default {
     labelWidth: {
       type: String,
       default: '210px'
+    },
+    required:{
+      type:Boolean,
+      default:false
     }
   },
   components: {},

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

@@ -44,6 +44,9 @@
           width="250"
           label="上传时间"
           align="center">
+          <template slot-scope="scope">
+            <span>{{ $moment(scope.row.dataUploadTime).format("YYYY-MM-DD") }}</span>
+          </template>
         </el-table-column>
       </el-table>
       <div class="more" v-if="!pageVerify" @click="togo">更多 ⋙</div>

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

@@ -495,6 +495,31 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if (row.taskInfo === '产品标准起草'){
+            this.$router.push({
+              name: 'bussFs6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType,
+                bpnId:row.id
+              }
+            })
+          }else if (row.taskInfo === '技术标准起草'){
+            this.$router.push({
+              name: 'bussFs7',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType,
+                bpnId:row.id,
+                verifySarStandard:true,
+              }
+            })
           }
           break;
         case '2':
@@ -1698,6 +1723,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          }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;
         case "26":

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/bzdy/step3.vue

@@ -303,14 +303,17 @@
             ProcessTitle
         },
         methods: {
-            clickButtonToUpload2(file) {
+            // clickButtonToUpload2(file) {
-                let attId = ""
+            //     let attId = ""
-                if(file && file.id){
+            //     if(file && file.id){
-                    attId = file.id
+            //         attId = file.id
-                }else {
+            //     }else {
-                    attId = file.response.data.id
+            //         attId = file.response.data.id
-                }
+            //     }
-                this.$preview(attId)
+            //     this.$preview(attId)
+            // },
+            clickButtonToUpload2(fileId) {
+                this.$preview(fileId)
             },
             clickButtonToUpload(file) {
                 let attId = ""
@@ -386,11 +389,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.DOC' || fileSuffix === '.doc' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF'|| fileSuffix === '.ZIP'|| fileSuffix === '.zip'|| fileSuffix === '.RAR'|| fileSuffix === '.rar') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF,ZIP,RAR,DOC文件')
                     return false
                 }
                 // 判断文件上传大小
@@ -412,7 +415,7 @@
                     this.form.fileName = response.data.name
                     this.form.fileList.push(response.data)
                     this.$message({
-                        showClose: true,
+                        // showClose: true,
                         message: response.message,
                         type: 'success'
                     })
@@ -495,7 +498,7 @@
                             this.acceptShow = false
                             this.submitShow = true
                         }
-                        this.commentText3 = data.commentText3 || ''
+                        // this.commentText3 = data.commentText3 ||  ''
                         this.todoId = res.id
                         this.form.title = data.title || data.form.title
                         this.form.processName = data.processName || data.form.processName
@@ -505,11 +508,16 @@
                         this.form.modelList = data.modelList || data.form.modelList
                         this.form.responUserList = data.form ? data.form.responUserList : data.responUserList
                         this.form.responUserListName = data.form ? data.form.responUserListName : data.responUserListName
-                        this.form.fileName = data.form?  data.form.fileName : ''
+                        // this.form.fileName = data.form?  data.form.fileName : ''
-                        this.form.fileId = data.form ?  data.form.fileId : ''
+                        // this.form.fileId = data.form ?  data.form.fileId : ''
-                        this.form.dyhz = data.form ? data.form.dyhz : ''
+                        // this.form.dyhz = data.form ? data.form.dyhz : ''
                         this.newDocUser = data.docUser
-                        this.form.fileList = data.form ? data.form.fileList : []
+                        // this.form.fileList = data.form ? data.form.fileList : []
+                        this.commentText3 = data.commentText3 || data.commentText || ''
+                        this.form.fileName = data.form?  data.form.fileName :   data.fileName || ''
+                        this.form.fileId =  data.form ?  data.form.fileId : data.fileId || ''
+                        this.form.dyhz = data.form ? data.form.dyhz : data.dyhz || ''
+                        this.form.fileList = data.form ? data.form.fileList : data.fileList || []
                     }).catch(e => {
                     })
                 })

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

@@ -279,14 +279,17 @@
             ProcessTitle
         },
         methods: {
-            clickButtonToUpload2(file) {
+            // clickButtonToUpload2(file) {
-                let attId = ""
+            //     let attId = ""
-                if(file && file.id){
+            //     if(file && file.id){
-                    attId = file.id
+            //         attId = file.id
-                }else {
+            //     }else {
-                    attId = file.response.data.id
+            //         attId = file.response.data.id
-                }
+            //     }
-                this.$preview(attId)
+            //     this.$preview(attId)
+            // },
+            clickButtonToUpload2(fileId) {
+              this.$preview(fileId)
             },
             clickButtonToUpload(file) {
                 let attId = ""

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

@@ -435,7 +435,7 @@
           </div>
           <div style="width: 80%">
             <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
-              <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
+              <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1" required>
                 <el-input :disabled="disabledXX"
                   type="textarea"
                   v-model="plForm.technicalRequir"
@@ -444,7 +444,7 @@
                   :autosize="{minRows:10,maxRows:10}"
                 ></el-input>
               </el-form-item>
-              <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
+              <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1" required>
                 <el-input :disabled="disabledXX"
                   type="textarea"
                   v-model="plForm.changePoint"
@@ -453,7 +453,7 @@
                   :autosize="{minRows:10,maxRows:10}"
                 ></el-input>
               </el-form-item>
-              <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
+              <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1" required>
                 <el-input :disabled="disabledXX"
                   type="textarea"
                   :autosize="{ minRows: 4, maxRows: 14}"
@@ -466,18 +466,20 @@
                 class="myDataPick"
                 :config="{attrName: '新车型实施日期'}"
                 v-model="plForm.newData"
+                :required="true"
               ></custom-date-pick-group>
               <custom-date-pick-group
                 class="myDataPick"
                 :config="{attrName: '在产车实施日期'}"
                 v-model="plForm.onlineData"
+                :required="true"
               ></custom-date-pick-group>
-              <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
+              <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" required>
                 <el-select :disabled="disabledXX"  multiple  v-model="plForm.applyArctic">
                   <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="责任人" prop="zrUserId" class="add-form-item">
+              <el-form-item label="责任人" prop="zrUserId" class="add-form-item" required>
                 <el-input :disabled="disabledXX"
                   style="display: none;"
                   v-model="plForm.zrUserId"

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

@@ -382,7 +382,7 @@
                         <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
                     </div>
                     <el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
-                    <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
+                    <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1" required>
                         <el-input
                                 type="textarea"
                                 v-model="editForm.technicalRequir"
@@ -391,7 +391,7 @@
                                 :autosize="{minRows:10,maxRows:10}"
                         ></el-input>
                     </el-form-item>
-                    <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
+                    <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1" required>
                         <el-input
                                 type="textarea"
                                 v-model="editForm.changePoint"
@@ -400,7 +400,7 @@
                                 :autosize="{minRows:10,maxRows:10}"
                         ></el-input>
                     </el-form-item>
-                    <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
+                    <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1" required>
                         <el-input
                                 type="textarea"
                                 :autosize="{ minRows: 4, maxRows: 14}"
@@ -413,18 +413,20 @@
                             class="myDataPick"
                             :config="{attrName: '新车型实施日期'}"
                             v-model="editForm.newData"
+                            :required="true"
                     ></custom-date-pick-group>
                     <custom-date-pick-group
                             class="myDataPick"
                             :config="{attrName: '在产车实施日期'}"
                             v-model="editForm.onlineData"
+                            :required="true"
                     ></custom-date-pick-group>
-                    <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
+                    <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" required>
                         <el-select multiple  v-model="editForm.applyArctic">
                             <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
+                    <el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" required>
                         <el-select
                                 v-model="editForm.complianceRequir"
                                 placeholder="请选择符合性要求">
@@ -432,7 +434,7 @@
                             <el-option value="2" label="不符合"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="合规性分析" prop="complianceState" class="add-form-item" >
+                    <el-form-item label="合规性分析" prop="complianceState" class="add-form-item" required>
                         <el-input
                                 v-model="editForm.complianceState"
                                 placeholder="请输入合规性分析"

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

@@ -373,7 +373,8 @@
       custom-class="demo-drawer"
     >
       <div class="demo-drawer-content">
-        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+<!--        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">-->
+        <div style="position: absolute;bottom: 115px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
             <div class="left">
               <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
@@ -438,7 +439,7 @@
                 </el-form-item>
               </el-form>
             </div>
-            <div style="height: calc(100% - 65px); overflow: auto">
+            <div style="height: calc(100% - 125px); overflow: auto">
               <el-table
                 :data="productData"
                 tooltip-effect="dark"

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

@@ -348,7 +348,8 @@ export default {
          _this: this
        }, res => {
          if (res.success) {
-           this.$message.success(res.message)
+           // this.$message.success(res.message)
+           this.$message.success('驳回成功')
            this.$router.push('/processCenter')
          }
          this.isSubmit = false

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

@@ -253,7 +253,7 @@
       custom-class="demo-drawer"
     >
       <div class="demo-drawer-content">
-        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+        <div style="position: absolute;bottom: 120px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
             <div class="left">
               <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form"
@@ -291,7 +291,7 @@
               tooltip-effect="dark"
               style="width: 100%"
               border
-              height="100%"
+              height="calc(100% - 64px)"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
               @row-click="rowClick"
@@ -1080,6 +1080,7 @@ export default {
         this.listForm.commentText = this.commentText
         this.listForm.fileName = this.fileInfoList
         this.listForm.dataList = this.dataList
+        this.listForm.listType = this.listType
         let json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
@@ -1517,6 +1518,8 @@ export default {
         this.dataList = this.listForm.dataList
         this.roleForm = mes.roleForm
         this.commentText = mes.commentText
+        this.listType = mes.form.listType
+        console.log(this.listForm)
       })
     },
   },

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

@@ -2492,7 +2492,7 @@
                 bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
                 const json = Object.assign(bringData, bringData.attrInfoCaseMap);
                 this.form = JSON.parse(JSON.stringify(json))
-                this.form.textStatus = this.form.textStatus === 'jjxoynfepp' || this.form.textStatus === 'vsaga7nwub' ? '' : this.form.textStatus
+                this.form.textStatus = this.form.textStatus === 'jjxoynfepp' || this.form.textStatus === 'vsaga7nwub' || this.form.textStatus === 'hb0iy9z23c' || this.form.textStatus === 'chblaarg77' || this.form.textStatus === 'qke0ckro2p' || this.form.textStatus === 'ylmfkii1jt'  ? '' : this.form.textStatus
                 this.getListTree(bringData)
                 this.form.standId = bringData.id
                 if (this.form.country) {
@@ -2538,6 +2538,7 @@
                 this.modelFunc()
                 this.menu2("",this.form.standSystem)
                 this.$forceUpdate()
+                this.ccc = false
               }
               // 遍历对象初始化文件信息
               for (const p in this.form) {

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

@@ -146,7 +146,6 @@
   ></Role-tree>
   <!--    选择责任人-->
   <Role-tree
-     check-box
     :is-title="drawerTitle"
     :is-visible.sync="modalshowflag"
     @checkedRole="checkedRole"
@@ -413,8 +412,14 @@ export default {
       this.modalshowflag = true;
     },
       checkedRole (data) {
-          this.qbfsForm.bussFsSubUser2 = data[0].id;
+        let idList = []
-          this.qbfsForm.bussFsSubUser2Name = data[0].name;
+        let nameList = []
+        data.forEach((item,index) => {
+          idList.push(item.id)
+          nameList.push(item.name)
+        })
+          this.qbfsForm.bussFsSubUser2 = idList.join(',');
+          this.qbfsForm.bussFsSubUser2Name = nameList.join(',');
           this.modalShowFlag = false;
       },
     checkedRole2(data) {

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

@@ -318,19 +318,19 @@ export default {
     },
   },
   methods:{
-     async getFsFile(){
+    async getFsFile(){
-        let fileObj = await this.getSaveFile("model_fs")
+      let fileObj = await this.getSaveFile("model_fs")
-        if(fileObj){
+      if(fileObj){
-          this.qbfsForm.FSD = fileObj.id
+        this.qbfsForm.FSD = this.qbfsForm.FSD ? this.qbfsForm.FSD : fileObj.id
-          if(this.qbfsForm.standName){
+        if(this.qbfsForm.standName){
-            this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单'
+          this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单'
-          }else {
+        }else {
-            this.qbfsForm.FSDName = '复审单'
+          this.qbfsForm.FSDName = '复审单'
-          }
-          this.FSDList=this.assemble(fileObj.id,this.qbfsForm.FSDName);
-          this.formKey++
         }
-     },
+        this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
+        this.formKey++
+      }
+    },
      getSaveFile(model) {
       return new Promise((resolve, reject) => {
         this.$http.get('/lawss/activiti/saveEditFile', {
@@ -464,6 +464,9 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg)
+            if(processForm.FSD && processForm.FSD != ''){
+              this.qbfsForm.FSD = processForm.FSD
+            }
             if (processForm.qbfsForm === undefined) {
               this.getFormFieldList(processForm)
             } else {

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

@@ -587,7 +587,7 @@ export default {
           // }
           if (this.$route.query.bpnId && this.$route.query.bpnId !== '') {
             let taskId = {
-              id: this.$route.query.bpnId
+              id: this.$route.query.bpnId,
             }
             taskDel(taskId).then(res=>{
               return res
@@ -646,6 +646,7 @@ export default {
             // }else{
             //   this.qbfsForm.qcflag = 1
             // }
+            this.qbfsForm.prcId = this.$route.query.prcId
             let json = JSON.stringify(this.qbfsForm);
             this.$http.post('lawss/activiti/completeTask', {
               taskIds: this.$route.query.taskIds,

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

@@ -6,7 +6,7 @@
   </ProcessHeader>
   <div class="headerTabs">
     <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-    <!--            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
+    <!--            <div class="headerTabsItem" :class="actchoiceZRRListive === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
     <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">人员信息</div>
   </div>
   <div class="content">

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

@@ -243,7 +243,7 @@
             <el-table
               :data="standinfoList"
               tooltip-effect="dark"
-              style="width: 100%"
+              style="width: 100%;height: 79%"
               border
               class="table-height"
               :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
@@ -335,14 +335,14 @@
                 </template>
               </el-table-column>
             </el-table>
+            <pagination
+              :page="page"
+              :pageSize="pageSize"
+              :total="total"
+              @pageChange="pageChange"
+              @pageSizeChange="pageSizeChange"
+            ></pagination>
           </div>
-          <pagination
-            :page="page"
-            :pageSize="pageSize"
-            :total="total"
-            @pageChange="pageChange"
-            @pageSizeChange="pageSizeChange"
-          />
         </div>
       </div>
       <div class="demo-drawer-footer">

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

@@ -1008,12 +1008,11 @@
                     standNum: [
                         { required: true, message: '请输入企标顺序号', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: validateStandNumber, trigger: 'change'}
+                        {validator: validateStandNumber, trigger: 'blur'}
-
                     ],
                     standNumNotRule: [],
                     standYear: [
-                        { required: true, message: '请输入标准年份'},
+                        { required: true, message: '请输入标准年份',trigger: 'blur'},
                     ],
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },

src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue

@@ -1246,6 +1246,7 @@
                 this.XGDFileList = list3
                 this.QTWJBUSSFileList = list4
                 this.GLWJBUSSFileList = list5
+              console.log(fileType)
                 if(fileMadel){
                     this.fileType = fileType
                     this.fileUpload(fileType)
@@ -2134,42 +2135,88 @@
                 //     fileList = fileList.splice(0, 1)
                 // }
                 if (response.ok) {
-                    const fileObj = {}
+                  // debugger
-                    fileObj.id = file.response.data.id
+                  for(let i = 0 ; i < fileList.length ; i++){
-                    fileObj.name = file.response.data.name
+                      const fileObj = {}
-                switch (this.fileType){
+                    console.log(fileList[i],'fileList[i]')
+                      fileObj.id = fileList[i].response ? fileList[i].response.data.id : fileList[i].id
+                      fileObj.name =fileList[i].response? fileList[i].response.data.name : fileList[i].name
+                      switch (this.fileType){
                         case 'FBGBUSS':
-                            this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
+                          this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
+                          if(this.FBGBUSSFileList.every((item)=>item.id !== fileObj.id) && fileObj.id!==undefined){
                             this.FBGBUSSFileList.push(fileObj)
-                            break;
+                          }
+                          break;
                         case 'BZSMBUSS' :
-                            this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
+                          this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
+                          if(this.BZSMBUSSFileList.every((item)=>item.id !== fileObj.id) && fileObj.id!==undefined)
                             this.BZSMBUSSFileList.push(fileObj)
-                            break;
+                          break;
                         case 'LSBBBUSS':
-                            this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
+                          this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
+                          if(this.LSBBBUSSFileList.every((item)=>item.id !== fileObj.id) && fileObj.id!==undefined)
                             this.LSBBBUSSFileList.push(fileObj)
-                            break;
+                          break;
                         case 'QTWJBUSS':
-                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
+                          this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
+                          if(this.QTWJBUSSFileList.every((item)=>item.id !== fileObj.id) && fileObj.id!==undefined)
                             this.QTWJBUSSFileList.push(fileObj)
-                            break;
+                          break;
                         case 'GLWJBUSS':
-                            this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
+                          this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
+                          if(this.GLWJBUSSFileList.every((item)=>item.id !== fileObj.id) && fileObj.id!==undefined)
                             this.GLWJBUSSFileList.push(fileObj)
-                            break;
+                          break;
                         case 'XGD':
-                            this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined);
+                          this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined);
+                          if(this.XGDFileList.every((item)=>item.id !== fileObj.id) && fileObj.id!==undefined)
                             this.XGDFileList.push(fileObj)
-                            break;
+                          break;
                         default : ;
-                    }
+                      }
+                    // }
+                    console.log(this.FBGBUSSFileList)
+                  }
+
+                //     const fileObj = {}
+                //     fileObj.id = file.response.data.id
+                //     fileObj.name = file.response.data.name
+                //   console.log(fileObj.name,'fileObj.name')
+                // switch (this.fileType){
+                //         case 'FBGBUSS':
+                //             this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
+                //             this.FBGBUSSFileList.push(fileObj)
+                //             break;
+                //         case 'BZSMBUSS' :
+                //             this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
+                //             this.BZSMBUSSFileList.push(fileObj)
+                //             break;
+                //         case 'LSBBBUSS':
+                //             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
+                //             this.LSBBBUSSFileList.push(fileObj)
+                //             break;
+                //         case 'QTWJBUSS':
+                //             this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
+                //             this.QTWJBUSSFileList.push(fileObj)
+                //             break;
+                //         case 'GLWJBUSS':
+                //             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
+                //             this.GLWJBUSSFileList.push(fileObj)
+                //             break;
+                //         case 'XGD':
+                //             this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined);
+                //             this.XGDFileList.push(fileObj)
+                //             break;
+                //         default : ;
+                //     }
                     this.formKey++
                     this.$message({
                         showClose: true,
                         message: response.message,
                         type: 'success'
                     })
+                  this.fileMadel = false
                 }
             },
             downloadFile (data) {

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/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,7 +2802,10 @@
                         this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                     }
                     this.formKey++
-                }else {
+                } 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
                     }, res => {

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

@@ -2488,6 +2488,7 @@
                             }
                         })
                     }else{
+                      this.$message.warning('请确认审批意见是否填写完整')
                     }
                 })
             },

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

@@ -403,16 +403,14 @@ export default {
     })
   },
   methods: {
-    validateForm () {
+    validateForm (callback) {
-      let flag = null
       this.$refs['qbfsForm'].validate((valid) => {
         if (valid) {
-          flag = true
+          callback && callback()
-        } else {
+        } else{
-          flag = false
+          this.$message.warning("请完善基础信息");
         }
       })
-      return flag
     },
     choiceShow(){
       this.getStandDataBtn()
@@ -423,22 +421,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

@@ -425,16 +425,14 @@ export default {
     })
   },
   methods: {
-    validateForm () {
+    validateForm (callback) {
-      let flag = null
       this.$refs['qbfsForm'].validate((valid) => {
         if (valid) {
-          flag = true
+          callback && callback()
-        } else {
+        } else{
-          flag = false
+          this.$message.warning("请完善基础信息");
         }
       })
-      return flag
     },
     choiceShow(){
       this.getStandDataBtn()
@@ -445,19 +443,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 +499,9 @@ export default {
         }
         this.qbfsForm.rqbName = this.selectList[0].rqbName
         this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
-        this.qbfsForm.isRelate = this.selectList[0].isRelate.indexOf("null") !== -1 ? "":this.selectList[0].isRelate
+        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') {
@@ -446,7 +446,6 @@ export default {
       }
     };
     const standNameVerify = async (rule, value, callback) => {
-      debugger
       if (value === '' || value === null) {
         return callback(new Error('请输入企标名称'))
       } else {
@@ -1021,16 +1020,14 @@ export default {
         this.$refs.qbfsForm.validateField('resPersonName');
       }
     },
-    validateForm () {
+    validateForm (callback) {
-      let flag = null
       this.$refs['qbfsForm'].validate((valid) => {
         if (valid) {
-          flag = true
+          callback && callback()
-        } else {
+        } else{
-          flag = false
+          this.$message.warning("请完善基础信息");
         }
       })
-      return flag
     }
   },
 };

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

@@ -1021,16 +1021,14 @@ export default {
         this.$refs.qbfsForm.validateField('resPersonName');
       }
     },
-    validateForm () {
+    validateForm (callback) {
-      let flag = null
       this.$refs['qbfsForm'].validate((valid) => {
         if (valid) {
-          flag = true
+          callback && callback()
-        } else {
+        } else{
-          flag = false
+          this.$message.warning("请完善基础信息");
         }
       })
-      return flag
     },
     choiceShow(){
       this.showType = 'one'
@@ -1081,19 +1079,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

@@ -412,16 +412,14 @@ export default {
     })
   },
   methods: {
-    validateForm () {
+    validateForm (callback) {
-      let flag = null
       this.$refs['qbfsForm'].validate((valid) => {
         if (valid) {
-          flag = true
+          callback && callback()
-        } else {
+        } else{
-          flag = false
+          this.$message.warning("请完善基础信息");
         }
       })
-      return flag
     },
     choiceShow(){
       this.getStandDataBtn()
@@ -432,7 +430,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>
@@ -527,13 +527,13 @@ export default {
           this.$message.warning('企标名称已存在,请更改!')
       }else {
           if (this.$route.query.prcNum === undefined) {
-            let flag = this.$refs["childForm"].validateForm();
+            this.$refs["childForm"].validateForm(()=>{
-            let qbzxdFrom = this.$refs["childForm"].qbfsForm;
+              let qbzxdFrom = this.$refs["childForm"].qbfsForm;
-            if (flag) {
               this.$refs["roleForm"].validate((valid) => {
                 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,
@@ -557,7 +557,7 @@ export default {
                       }, res => {
                         if (res.success) {
                           this.$message.success(res.message);
-                          this.addLog(qbzxdFrom)
+                          // this.addLog(qbzxdFrom)
                           if (this.bpnId !== '' && this.bpnId !== undefined) {
                             let taskId = {
                               id: this.bpnId
@@ -566,7 +566,6 @@ export default {
                               return res
                             })
                           }
-
                           this.isSubmit = false;
                           this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
                         }
@@ -577,39 +576,93 @@ export default {
                   this.$message.warning("请完善人员信息");
                 }
               });
-            } else {
+
-              this.$message.warning("请完善基础信息");
+            });
-            }
+
+            // if (flag) {
+            //
+            // } else {
+            //   this.$message.warning("请完善基础信息");
+            // }
           } else {
-            let flag = this.$refs["childForm"].validateForm();
+            let flag = this.$refs["childForm"].validateForm(() => {
-            let qbzxdFrom = this.$refs["childForm"].qbfsForm;
+              let qbzxdFrom = this.$refs["childForm"].qbfsForm;
-            if (flag) {
+              if(this.$route.query.taskInfo == '重新起草'){
-              this.$refs["roleForm"].validate((valid) => {
+                this.isSubmit = true;
-                if (valid) {
+                qbzxdFrom.commentText = this.commentText;
-                  this.isSubmit = true;
+                qbzxdFrom.addFlag = '0'
-                  qbzxdFrom.commentText = this.commentText;
+                let json = Object.assign(qbzxdFrom, this.roleForm);
-                  var json = Object.assign(qbzxdFrom, this.roleForm);
+                this.$http.post("lawss/activiti/startProcessRollBack", {
-                  this.$http.post("lawss/activiti/completeTask", {
+                  createUser: this.$store.getters.userInfo.userId,
-                    taskIds: this.$route.query.taskIds,
+                  createUserName: this.$store.getters.userInfo.userName,
-                    userId: this.$store.getters.userInfo.userId,
+                  type: '25',
-                    json: JSON.stringify(json)
+                  json: JSON.stringify({
-                  }, {
+                    roleForm: this.roleForm,
-                    _this: this
+                    qbfsForm: qbzxdFrom,
-                  }, res => {
+                    commentText: this.commentText
-                    if (res.success) {
+                  })
-                      this.$message.success(res.message);
+                }, {
-                      this.isSubmit = false;
+                  _this: this
-                      this.addLog(qbzxdFrom)
+                }, res => {
-                      this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
+                  if (res.ok) {
-                    }
+                    this.$http.post("lawss/activiti/completeTask", {
-                  });
+                      taskIds: res.data,
-                } else {
+                      userId: this.$store.getters.userInfo.userId,
-                  this.$message.warning("请完善人员信息");
+                      json: JSON.stringify(json)
-                }
+                    }, {
-              });
+                      _this: this
-            } else {
+                    }, res => {
-              this.$message.warning("请完善基础信息");
+                      if (res.success) {
-            }
+                        this.$message.success(res.message);
+                        // this.addLog(qbzxdFrom)
+                        if (this.bpnId !== '' && this.bpnId !== undefined) {
+                          let taskId = {
+                            id: this.bpnId
+                          }
+                          taskDel(taskId).then(res=>{
+                            return res
+                          })
+                        }
+
+                        this.isSubmit = false;
+                        this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
+                      }
+                    });
+                  }
+                });
+              }else {
+                this.$refs["roleForm"].validate((valid) => {
+                  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,
+                      userId: this.$store.getters.userInfo.userId,
+                      json: JSON.stringify(json)
+                    }, {
+                      _this: this
+                    }, res => {
+                      if (res.success) {
+                        this.$message.success(res.message);
+                        this.isSubmit = false;
+                        // this.addLog(qbzxdFrom)
+                        this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
+                      }
+                    });
+                  } else {
+                    this.$message.warning("请完善人员信息");
+                  }
+                });
+              }
+            });
+
+            // if (flag) {
+            //
+            // } else {
+            //   this.$message.warning("请完善基础信息");
+            // }
           }
         }
     },

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

@@ -519,19 +519,29 @@ export default {
       }
       this.qbfsForm.commentText = this.commentText
       let json = JSON.stringify(this.qbfsForm);
-      this.$http.post('lawss/activiti/completeTask', {
+            this.$http.post('lawss/activiti/completeTask', {
-        taskIds: this.$route.query.taskIds,
+              taskIds: this.$route.query.taskIds,
-        userId: this.$store.getters.userInfo.userId,
+              userId: this.$store.getters.userInfo.userId,
-        json: json,
+              json: json,
+            }, {
+              _this: this
+            }, res => {
+              if (res.success) {
+                this.addLog(this.qbfsForm)
+                this.$message.success(res.message)
+                this.$router.push('/processCenter')
+              }
+              this.isSubmit = false
+            }, e => {
+            });
+    },
+    addLog(qbzxdFrom){
+      let json = Object.assign(qbzxdFrom);
+      this.$http.post("esRevisePlanLog/log/addLog", {
+        json: JSON.stringify(json)
       }, {
         _this: this
       }, res => {
-        if (res.success) {
-          this.$message.success(res.message)
-          this.$router.push('/processCenter')
-        }
-        this.isSubmit = false
-      }, e => {
       });
     },
     beforeBack(){

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

@@ -693,26 +693,36 @@ export default {
     choiceZRRS(type) {
       this.roleType = type
       if(type === '1' ){
-        this.drawerTitle2 = '请选择起草人'
+        this.drawerTitle = '请选择起草人'
         this.nodeList2 = [];
         if (this.addQblxData.drafter !== undefined) {
           this.nodeList2 = this.addQblxData.drafter.split(",");
         }
+        this.modalshowflag = true;
       }else if(type === '2'){
         this.drawerTitle2 = '请选择评审责任人'
         this.nodeList2 = [];
         if (this.addQblxData.resPerson !== undefined) {
           this.nodeList2 = this.addQblxData.resPerson.split(",");
         }
+        this.modalshowflag2 = true;
       }
-      this.modalshowflag2 = true;
     },
     checkedRole(data) {
-      this.$set(this.addQblxData, 'wgLeader', data[0].id)
+      if(this.roleType === '1'){
-      this.$set(this.addQblxData, 'wgLeaderName', data[0].name)
+        this.$set(this.addQblxData, 'drafter', data[0].id)
+        this.$set(this.addQblxData, 'drafterName', data[0].name)
+      }else {
+        this.$set(this.addQblxData, 'wgLeader', data[0].id)
+        this.$set(this.addQblxData, 'wgLeaderName', data[0].name)
+      }
+
       if(this.addQblxData.wgLeaderName){
         this.$refs.qblx_pageData.validateField('wgLeaderName')
       }
+      if(this.addQblxData.drafterName){
+        this.$refs.qblx_pageData.validateField('drafterName');
+      }
       this.modalshowflag = false;
     },
     checkedRole2(data) {

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">
@@ -193,19 +193,19 @@
               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-->
+          <!--            <el-input-->
-<!--              type="textarea"-->
+          <!--              type="textarea"-->
-<!--              v-model="qbfsForm.newReason"-->
+          <!--              v-model="qbfsForm.newReason"-->
-<!--              placeholder="请输入立项原因"-->
+          <!--              placeholder="请输入立项原因"-->
-<!--              :maxlength="500"/>-->
+          <!--              :maxlength="500"/>-->
-<!--          </el-form-item>-->
+          <!--          </el-form-item>-->
           <el-form-item label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
             <div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
               <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
-<!--              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
+              <!--              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
-<!--                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>-->
+              <!--                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>-->
-<!--                  </span>-->
+              <!--                  </span>-->
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-edit"  @click="handleFilePreview(item,'onlineEdit')"></el-button>
                   </span>
@@ -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,53 +848,54 @@ 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.isSubmit = true;
-                      this.qbfsForm.type = '5'
+                  this.qbfsForm.type = '5'
-                      this.qbfsForm.commentText = this.commentText;
+                  this.qbfsForm.commentText = this.commentText;
-                      let json = Object.assign(this.qbfsForm, this.roleForm);
+                  this.qbfsForm.addFlag = '0'
-                      this.$http.post("lawss/activiti/startProcessRollBack", {
+                  let json = Object.assign(this.qbfsForm, this.roleForm);
-                        createUser: this.$store.getters.userInfo.userId,
+                  this.$http.post("lawss/activiti/startProcessRollBack", {
-                        createUserName: this.$store.getters.userInfo.userName,
+                    createUser: this.$store.getters.userInfo.userId,
-                        type: '25',
+                    createUserName: this.$store.getters.userInfo.userName,
-                        json: JSON.stringify({
+                    type: '25',
-                          roleForm: this.roleForm,
+                    json: JSON.stringify({
-                          qbfsForm: this.qbfsForm,
+                      roleForm: this.roleForm,
-                          commentText: this.commentText
+                      qbfsForm: this.qbfsForm,
-                        })
+                      commentText: this.commentText
+                    })
+                  }, {
+                    _this: this
+                  }, 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.ok) {
+                        if (res.success) {
-                          this.$http.post("lawss/activiti/completeTask", {
+                          this.$message.success("提交成功");
-                            taskIds: res.data,
+                          if (this.bpnId !== '') {
-                            userId: this.$store.getters.userInfo.userId,
+                            let taskId = {
-                            json: JSON.stringify(json)
+                              id: this.bpnId
-                          }, {
-                            _this: this
-                          }, res => {
-                            if (res.success) {
-                              this.$message.success("企标制修订立项计划-立项已完成");
-                              if (this.bpnId !== '') {
-                                let taskId = {
-                                  id: this.bpnId
-                                }
-                                taskDel(taskId).then(res=>{
-                                  return res
-                                })
-                              }
-                              this.isSubmit = false;
-                              this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
                             }
-                          });
+                            taskDel(taskId).then(res=>{
+                              return res
+                            })
+                          }
+                          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/xmpg/step2.vue

@@ -23,8 +23,9 @@
                 <el-input v-model="listForm.projectName" clearable disabled placeholder="请输入项目名称"></el-input>
               </el-form-item>
               <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+<!--                :picker-options="pickerOptions"-->
                 <el-date-picker
-                        :picker-options="pickerOptions"
+
                         v-model="listForm.endTime"
                         type="date"
                         placeholder="请选择截止日期"
@@ -458,6 +459,11 @@ export default {
       this.listForm.children = dataListChildren;
       this.listForm.dataList = this.dataList;
       const json = JSON.stringify(this.listForm);
+      if(this.nodeList.length == 0){
+        this.$message.warning('请先分发责任人')
+        this.isSubmit = false;
+        return
+      }
       this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,

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

@@ -391,6 +391,7 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      debugger
       let dataChildren = [];
       let dataListChildren = [];
       this.dataList.forEach(item => {
@@ -404,20 +405,26 @@ export default {
       this.listForm.children = dataListChildren;
       this.listForm.dataList = this.dataList;
       const json = JSON.stringify(this.listForm);
-      this.$http.post("lawss/activiti/completeTask", {
+      // this.$refs['listForm'].validate((valid) => {
-        taskIds: this.taskIds,
+      //   if (valid) {
-        userId: this.userId,
+          this.$http.post("lawss/activiti/completeTask", {
-        json: json
+            taskIds: this.taskIds,
-      }, {
+            userId: this.userId,
-        _this: this
+            json: json
-      }, res => {
+          }, {
-        if (res.success) {
+            _this: this
-          this.$message.success(res.message);
+          }, res => {
-          this.$router.push("/processCenter");
+            if (res.success) {
-        }
+              this.$message.success(res.message);
-        this.isSubmit = false;
+              this.$router.push("/processCenter");
-      }, e => {
+            }
-      });
+            this.isSubmit = false;
+          }, e => {
+          });
+        // }else {
+        //   this.$message.warning('请确认复审评分是否填写完整')
+        // }
+      // })
     },
     //批量分发按钮
     choiceZRRS(row, type, index) {

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

@@ -437,6 +437,18 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="适用车型" class="search-item search-item-last">
+            <el-select :disabled="disabledXX"  v-model="handleSelectForm.applyArctic"
+                       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"
               size="small"
@@ -863,7 +875,8 @@ export default {
         projectName: "",
         managementHostName: "", //管理主体
         developmentHostName: "", //开发主体
-        categoryName: "" //项目细分类
+        categoryName: "", //项目细分类
+        carType: "" 
       },
       qdform: {
         projectId:"",
@@ -1027,6 +1040,7 @@ export default {
       this.handleSelectForm.standNumber = ''
       this.handleSelectForm.lawsNumber = ''
       this.handleSelectForm.standCode = ''
+      this.handleSelectForm.applyArctic = ''
       //清空标准名称/政策名称的查询
       this.handleSelectForm.lawName = ''
       this.handleSelectForm.standName = ''
@@ -1409,7 +1423,7 @@ export default {
             }
           });
         } else {
-          return this.$message.warning("请选择清单");
+          //return this.$message.warning("请选择清单");
         }
       });
     },

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

@@ -729,6 +729,19 @@ export default {
                 bpnId:row.id
               }
             })
+          }else if (row.taskInfo === '技术标准起草'){
+            this.$router.push({
+              name: 'bussFs7',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType,
+                bpnId:row.id,
+                verifySarStandard:true,
+              }
+            })
           }
           break;
         case '2':
@@ -2191,6 +2204,19 @@ export default {
           }else if(row.taskInfo === '重新起草') {
             this.$router.push({
               name: 'qbzxdjhgkStep1',
+              query:{
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                taskInfo: row.taskInfo,
+                prcType: row.prcType
+              }
+            })
+          }
+          else if(row.taskInfo === '技术标准起草') {
+            this.$router.push({
+              name: 'qbzxdjhgkStep6',
               query:{
                 taskIds: row.taskIds,
                 prcId: row.prcId,

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

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

src/pages/regulatoryRepository/dataCenter/index.vue

@@ -63,11 +63,28 @@
       <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 ref="treeSelect" class="tree-select" v-model="dataCenterSearch.treeId" value-key="id" placeholder="请选择类型">
+              <el-option class="tree-select-option" :value="dataCenterSearch.treeId" :label="dataCenterSearch.dataType">
+                <el-tree
+                  ref="tree"
+                  node-key="id"
+                  class="tree-line"
+                  icon-class="icon-tree"
+                  :indent="0"
+                  :props="props"
+                  :data="treeList"
+                  :default-expanded-keys="['1']"
+                  highlight-current
+                  @node-click="selectTreeClick2"
+                  :filter-node-method="filterNode">
+                </el-tree>
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="资料标题:">
             <el-input
@@ -77,16 +94,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>
@@ -231,21 +264,21 @@
       </div>
     </el-drawer>
     <el-drawer
-        :title="attributeTitle"
+      :title="attributeTitle"
-        :wrapperClosable="false"
+      :wrapperClosable="false"
-        :visible.sync="showInfoModal"
+      :visible.sync="showInfoModal"
-        size="800px"
+      size="800px"
-        :styles="styles"
+      :styles="styles"
-        :close="cancelModel"
+      :close="cancelModel"
     >
       <div style="height: 92%;margin-left: 3%">
         <el-form
-            ref="attributeEO"
+          ref="attributeEO"
-            :model="attributeEO"
+          :model="attributeEO"
-            :rules="attributeEOFormRules"
+          :rules="attributeEOFormRules"
-            class="label-input-form"
+          class="label-input-form"
-            label-width="130px"
+          label-width="130px"
-            v-if="showInfoModal"
+          v-if="showInfoModal"
         >
           <el-form-item label="所属目录" prop="treeId" class="add-form-item">
             <el-select ref="treeSelect" class="tree-select" v-model="attributeEO.treeId" value-key="id" placeholder="请选择所属目录">
@@ -267,61 +300,79 @@
             </el-select>
           </el-form-item>
           <el-form-item
-              label="类型"
+            label="类型"
-              prop="dataType"
+            prop="dataType"
-              class="add-form-item"
+            class="add-form-item"
+          >
+            <el-select ref="treeSelect" class="tree-select" v-model="attributeEO.dataType" value-key="id" placeholder="请选择类型">
+              <el-option class="tree-select-option" :value="attributeEO.dataType" :label="attributeEO.dataType">
+                <el-tree
+                  ref="tree"
+                  node-key="id"
+                  class="tree-line"
+                  icon-class="icon-tree"
+                  :indent="0"
+                  :props="props"
+                  :data="treeList"
+                  :default-expanded-keys="['1']"
+                  highlight-current
+                  @node-click="selectTreeClick3"
+                  :filter-node-method="filterNode">
+                </el-tree>
+              </el-option>
+            </el-select>
+<!--            <el-input-->
+<!--              v-model="attributeEO.dataType"-->
+<!--              placeholder="请输入类型"-->
+<!--              clearable-->
+<!--            />-->
+          </el-form-item>
+          <el-form-item
+            label="资料标题"
+            prop="dataTitle"
+            class="add-form-item"
           >
             <el-input
-                v-model="attributeEO.dataType"
+              class="dataTitle"
-                placeholder="请输入类型"
+              v-model="attributeEO.dataTitle"
-                clearable
+              placeholder="请输入资料标题"
+              clearable
             />
           </el-form-item>
           <el-form-item
-              label="资料标题"
+            label="资料说明"
-              prop="dataTitle"
+            prop="dataExplain"
-              class="add-form-item"
+            class="add-form-item"
           >
             <el-input
-                v-model="attributeEO.dataTitle"
+              type="textarea"
-                placeholder="请输入资料标题"
+              :autosize="{ minRows: 1, maxRows: 10}"
-                clearable
+              resize="none"
-            />
+              style="width: 95%"
-          </el-form-item>
+              maxlength="4000"
-          <el-form-item
+              show-word-limit
-              label="资料说明"
+              v-model="attributeEO.dataExplain"
-              prop="dataExplain"
+              placeholder="请输入资料说明"
-              class="add-form-item"
+              clearable
-          >
-            <el-input
-                type="textarea"
-                :autosize="{ minRows: 1, maxRows: 10}"
-                resize="none"
-                style="width: 95%"
-                maxlength="4000"
-                show-word-limit
-                v-model="attributeEO.dataExplain"
-                placeholder="请输入资料说明"
-                clearable
             />
             <el-button icon="el-icon-delete" circle type="danger" size="mini" @click="attributeEO.dataExplain = ''"></el-button>
           </el-form-item>
           <el-form-item
-              label="附件"
+            label="附件"
-              prop="attachFileId"
+            prop="attachFileId"
-              class="add-form-item"
+            class="add-form-item"
           >
             <el-upload
-                class="upload-demo"
+              class="upload-demo"
-                action="/api/att/attFile/uploadNew"
+              action="/api/att/attFile/uploadNew"
-                :before-upload="beginImportFile"
+              :before-upload="beginImportFile"
-                :on-preview="handlePreview"
+              :on-preview="handlePreview"
-                :on-remove="handleRemove"
+              :on-remove="handleRemove"
-                multiple
+              multiple
-                :limit="50"
+              :limit="50"
-                :on-exceed="handleExceed"
+              :on-exceed="handleExceed"
-                :on-success="uploadSuccess"
+              :on-success="uploadSuccess"
-                :file-list="fileList">
+              :file-list="fileList">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
@@ -403,12 +454,14 @@ export default {
       dataCenterSearch: {
         dataType: '',
         dataTitle: '',
+        treeId: '',
         dataUploadTime: [],
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         total: 0
       },
       dataCenterTable: [],
+      cbcdOptions: [],
       productModelAdd: {
         name: '',
         parentId: '',
@@ -492,9 +545,29 @@ export default {
       this.searchInfo()
     },
     selectTreeClick(treeNode) {
-      this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
       this.attributeEO.treeId = treeNode.id === '1' ? '' : treeNode.id
       this.attributeEO.treeName = treeNode.name
+      this.$http.get('fileMaterialCenter/zlTree/queryTree',  {
+        treeId : this.attributeEO.treeId
+      }, {
+        _this: this
+      }, res => {
+        if(res.ok){
+          // this.attributeEO.dataType = res.data.id
+          this.attributeEO.dataType = res.data.name
+        }
+      })
+
+    },
+    selectTreeClick2(treeNode) {
+      this.dataCenterSearch.treeId = treeNode.id === '1' ? '' : treeNode.id
+      this.dataCenterSearch.dataType = treeNode.name
+
+    },
+    selectTreeClick3(treeNode) {
+      // this.attributeEO.dataType = treeNode.id === '1' ? '' : treeNode.id
+      this.attributeEO.dataType = treeNode.name
+
     },
     // 树节点鼠标移入移出
     mouseenter(data) {
@@ -730,12 +803,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
@@ -806,35 +884,35 @@ export default {
         if (valid) {
           if (this.attributeTitle === '新增'){
             this.$http.postData(
-                'fileMaterialCenter/file-material',
+              'fileMaterialCenter/file-material',
-                this.attributeEO,
+              this.attributeEO,
-                {
+              {
-                  _this: this,
+                _this: this,
-                },
+              },
-                (res) => {
+              (res) => {
-                  if (res.ok) {
+                if (res.ok) {
-                    this.$message.success('新增成功')
+                  this.$message.success('新增成功')
-                    this.submitLoading = false
+                  this.submitLoading = false
-                    this.cancelModel()
+                  this.cancelModel()
-                    this.searchInfo()
+                  this.searchInfo()
-                  }
                 }
+              }
             )
           }else {
             this.$http.putData(
-                'fileMaterialCenter/file-material',
+              'fileMaterialCenter/file-material',
-                this.attributeEO,
+              this.attributeEO,
-                {
+              {
-                  _this: this,
+                _this: this,
-                },
+              },
-                (res) => {
+              (res) => {
-                  if (res.ok) {
+                if (res.ok) {
-                    this.$message.success('修改成功')
+                  this.$message.success('修改成功')
-                    this.submitLoading = false
+                  this.submitLoading = false
-                    this.cancelModel()
+                  this.cancelModel()
-                    this.searchInfo()
+                  this.searchInfo()
-                  }
                 }
+              }
             )
           }
         }else{
@@ -868,7 +946,7 @@ export default {
 
 <style scoped lang="less">
 #dataCenter {
- /deep/ .el-input--small .el-input__inner {
+  /deep/ .el-input--small .el-input__inner {
     width: 160px;
   }
   background-color: white;
@@ -1032,7 +1110,12 @@ export default {
     }
   }
 }
-
+/deep/.dataTitle  .el-input__inner{
+  width: 560px !important;
+}
+/deep/.el-input__inner{
+  width: 180px !important;
+}
 /deep/ .icon-tree {
   margin: 0 5px 0 10px;
   position: relative;

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -1,4 +1,4 @@
-<!--企业标准库-->
+ <!--企业标准库-->
 <template>
   <div id="EnterpriseStandardDatabase" :class="{ 'tree-close': sideClose }" class="v-class">
     <!--左侧树-->
@@ -5827,4 +5827,7 @@ export default {
     }
   }
 }
+/deep/.el-table__fixed-body-wrapper .el-table__body {
+  padding-bottom: 20px;
+}
 </style>

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,16 +1220,48 @@
                             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 => {
-                            this.submitLoading = false
                             if (res.ok) {
                                 if (res.data === '操作成功') {
-                                    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.submitLoading = false
+                                            this.addDrawer = false
+                                            // this.$message.success(res.message)
+                                          }
+                                        })
+                                      }
+                                    })
+                                  }
                                 } else {
                                     this.addDrawer = false
                                     this.$message.warning(res.data)

src/router/index.js

@@ -2137,6 +2137,15 @@ const routes = [
           title: '企标复审流程'
         }
       },
+      {
+        path: '/bussFs7',
+        name: 'bussFs7',
+        component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/step7.vue'),
+        meta: {
+          requireAuth: true,
+          title: '企标复审流程'
+        }
+      },
       //企标复审流程
       {
         path: '/qbfsStep1',
@@ -2275,6 +2284,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

@@ -5,12 +5,13 @@
  */
 // 服务器地址
 // const devIp = '39.98.140.126'
-// const devInterfacePORT = '10005'
+// const devInterfacePORT = '4202'
 // 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 devIp = '10.0.3.10'
+// const devIp = '10.0.3.10'
+const devIp = 'localhost'
 const devInterfacePORT = '10086'
 // const devIp = '62.234.136.153'
 // const devInterfacePORT = '8033'
@@ -22,8 +23,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 +48,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 = ''