制修订类型

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

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

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

@@ -842,9 +842,9 @@ export default {
                 if (res.success) {
                   const _formData = new FormData()
                   _formData.append('infoJson', JSON.stringify(this.qbfsForm))
-                  processCreatePlan(_formData).then(res => {
+                  // processCreatePlan(_formData).then(res => {
-                    this.qbfsForm.planId = res.data
+                  //   this.qbfsForm.planId = res.data
-                    if (res.code === '200' || res.message === '入库成功'){
+                  // if (res.code === '200' || res.message === '入库成功'){
                   this.isSubmit = true;
                   this.qbfsForm.type = '5'
                   this.qbfsForm.commentText = this.commentText;
@@ -885,8 +885,8 @@ export default {
                       });
                     }
                   });
-                    }
+                  // }
-                  })
+                  // })
                 }
                 this.isSubmit = false
               }, e => {

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

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

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

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

src/pages/regulatoryRepository/dataCenter/index.vue

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