feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 待改完

src/api/process.js

@@ -93,6 +93,14 @@ export function processCreateBuss (data) {
   })
 }
 
+export function processCreatePlan (data) {
+  return axios({
+    url: '/api/lawss/actSarItemsPlan/processCreatePlan',
+    method: 'post',
+    data
+  })
+}
+
 export function processCreateFsBuss (data) {
   return axios({
     url: '/api/lawss/actSarItemsBuss/processCreateFsBuss',

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

@@ -1630,6 +1630,8 @@
                 map.set('2','修订中')
                 map.set('3','已取消')
                 map.set('4','已完成')
+                map.set('5','立项已完成')
+                map.set('6','计划已确认')
                 return map.get(item)
             },
             modelProp(row,index){
@@ -2097,7 +2099,7 @@
                 this.standardSearchForm.page = 1
                 this.standardSearchForm.unit = ''
                 this.standardSearchForm.esName = ''
-                this.standardSearchForm.planStatus = '0,3'
+                this.standardSearchForm.planStatus = '0,3,6'
                 this.standardSearchForm.reviseStatus = ''
                 setTimeout(() => {
                     this.handleSearchStandard()

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

@@ -23,7 +23,7 @@
       </el-form-item>
       <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
         <el-input
-          v-model="qbfsForm.esName"
+          v-model.trim="qbfsForm.esName"
           placeholder="请输入企标名称"
           :maxlength="500"/>
       </el-form-item>
@@ -424,6 +424,25 @@ export default {
   },
   props: ['message'],
   data(){
+    const standNameVerify = (rule, value, callback) => {
+      if(value === '' || value === null){
+        return callback(new Error('请输入企标名称'))
+      }else {
+        this.$http.get('esRevisePlan/es-revise-plan/getDataByNameAndSort', {
+          bussSort: this.qbfsForm.bussSort,
+          esName: this.qbfsForm.esName,
+        }, {
+          _this: this,
+        }, res => {
+          if (res.data && res.data > 0) {
+            return callback(new Error('企标名称重复'))
+          }else {
+            callback()
+          }
+        }, e => {
+        })
+      }
+    };
     return {
       workModel: false,
       workSearch: {
@@ -473,7 +492,7 @@ export default {
         unit: "", // 单位
         unitName: "",
         esName: "", // 企标名称
-        planStatus: "0", // 计划状态
+        planStatus: "6", // 计划状态
         reviseStatus: "", // 制修订类型
         area: "", //适用车型
         isRelate: "", //采用何种标准
@@ -500,7 +519,7 @@ export default {
           { required: true, message: "请选择企标类别", trigger: "blur" }
         ],
         esName: [
-          { required: true, message: "请输入企标名称", trigger: "blur" }
+          { required: true, validator: standNameVerify, trigger: "blur" }
         ],
         reviseStatus: [
           { required: true, message: "请选择制修订类型", trigger: "blur" }

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

@@ -156,7 +156,7 @@
         </el-form-item>
         <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
           <el-input
-            v-model="addQblxData.esName"
+            v-model.trim="addQblxData.esName"
             placeholder="请输入企标名称"
             :maxlength="500"/>
         </el-form-item>
@@ -368,7 +368,7 @@ import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
 import MechanismTree from "@/components/mechanismTree";
-import { queryTaskFirst, saveTaskFirst, taskDel, downloadStatus } from "@/api/process.js";
+import { queryTaskFirst, saveTaskFirst, taskDel, downloadStatus,processCreatePlan} from "@/api/process.js";
 
 export default {
   components: {
@@ -379,6 +379,25 @@ export default {
   },
   name: "qbzxdlxStep1",
   data() {
+      const standNameVerify = (rule, value, callback) => {
+          if(value === '' || value === null){
+              return callback(new Error('请输入企标名称'))
+          }else {
+              this.$http.get('esRevisePlan/es-revise-plan/getDataByNameAndSort', {
+                  bussSort: this.addQblxData.bussSort,
+                  esName: this.addQblxData.esName,
+              }, {
+                  _this: this,
+              }, res => {
+                  if (res.data && res.data > 0) {
+                      return callback(new Error('企标名称重复'))
+                  }else {
+                      callback()
+                  }
+              }, e => {
+              })
+          }
+      };
     return {
       tableLoading: false,
       importModalshowflag: false,  //导入弹窗
@@ -445,15 +464,15 @@ export default {
         // unit: [
         //   { required: true, message: "请选择起草单位", trigger: "change" }
         // ],
-        // bussSort: [
+        bussSort: [
-        //   { required: true, message: "请选择企标类别", trigger: "blur" }
+          { required: true, message: "请选择企标类别", trigger: "blur" }
-        // ],
+        ],
-        // esName: [
+        esName: [
-        //   { required: true, message: "请输入企标名称", trigger: "blur" }
+          { required: true,  validator: standNameVerify, trigger: "blur" }
-        // ],
+        ],
-        // reviseStatus: [
+        reviseStatus: [
-        //   { required: true, message: "请选择制修订类型", trigger: "blur" }
+          { required: true, message: "请选择制修订类型", trigger: "blur" }
-        // ],
+        ],
         // resPersonName: [
         //   { required: true, message: "请输入评审责任人", trigger: "blur" }
         // ],
@@ -959,16 +978,22 @@ export default {
               _this: this
             }, res => {
               if (res.success) {
-                resolve()
+                  const _formData = new FormData()
-                this.$message.success(res.message);
+                  _formData.append('infoJson', JSON.stringify(newForm))
-                if (this.bpnId !== '') {
+                  processCreatePlan(_formData).then(res => {
-                  let taskId = {
+                      if (res.result === '操作成功' || res.data === '入库成功') {
-                    id: this.bpnId
+                          resolve()
-                  }
+                          this.$message.success(res.message);
-                  taskDel(taskId).then(res=>{
+                          if (this.bpnId !== undefined && this.bpnId !== '') {
-                    // return res
+                              let taskId = {
+                                  id: this.bpnId
+                              }
+                              taskDel(taskId).then(res=>{
+                                  // return res
+                              })
+                          }
+                      }
                   })
-                }
                 // this.$router.push("/processCenter");
               }
             });

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

@@ -13,7 +13,7 @@
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
-        <el-form :model="qbfsForm"   ref="qbfsForm" class="label-input-form prc-content-border"
+        <el-form :model="qbfsForm" :rules="qbfsFormRules"  ref="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
           <el-form-item prop="projectTarget" label="项目目标" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
@@ -57,7 +57,7 @@
           </el-form-item>
           <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
-              v-model="qbfsForm.esName"
+              v-model.trim="qbfsForm.esName"
               clearable
               placeholder="请输入企标名称"
               :maxlength="500"/>
@@ -596,6 +596,25 @@ export default {
     CustomInputForAllStandards2
   },
   data(){
+    const standNameVerify = (rule, value, callback) => {
+      if(value === '' || value === null){
+        return callback(new Error('请输入企标名称'))
+      }else {
+        this.$http.get('esRevisePlan/es-revise-plan/getDataByNameAndSort', {
+          bussSort: this.qbfsForm.bussSort,
+          esName: this.qbfsForm.esName,
+        }, {
+          _this: this,
+        }, res => {
+          if (res.data && res.data > 0) {
+            return callback(new Error('企标名称重复'))
+          }else {
+            callback()
+          }
+        }, e => {
+        })
+      }
+    };
     return {
       active: '1',
       commentText: '',
@@ -704,39 +723,39 @@ export default {
         examineName: ""
       },
       qbfsFormRules: {
-        unit: [
+        // unit: [
-          { required: true, message: "请选择起草单位", trigger: "change" }
+        //   { required: true, message: "请选择起草单位", trigger: "change" }
-        ],
+        // ],
         bussSort: [
           { required: true, message: "请选择企标类别", trigger: "blur" }
         ],
         esName: [
-          { required: true, message: "请输入企标名称", trigger: "blur" }
+          { required: true, validator: standNameVerify, trigger: "blur" }
         ],
         reviseStatus: [
           { required: true, message: "请选择制修订类型", trigger: "blur" }
         ],
-        resPersonName: [
+        // resPersonName: [
-          { required: true, message: "请输入评审责任人", trigger: "blur" }
+        //   { required: true, message: "请输入评审责任人", trigger: "blur" }
-        ],
+        // ],
-        wgLeaderName: [
+        // wgLeaderName: [
-          { required: true, message: "请输入工作组组长", trigger: "blur" }
+        //   { required: true, message: "请输入工作组组长", trigger: "blur" }
-        ],
+        // ],
-        unitName: [
+        // unitName: [
-          { required: true, message: "请选择起草责任单位", trigger: "blur" }
+        //   { required: true, message: "请选择起草责任单位", trigger: "blur" }
-        ],
+        // ],
-        draftTime: [
+        // draftTime: [
-          { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" }
+        //   { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" }
-        ],
+        // ],
-        releaseTime: [
+        // releaseTime: [
-          {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
+        //   {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
-        ],
+        // ],
         drafterName: [
           {required: true, message: '请选择起草人', trigger: 'change'},
         ],
-        newReason: [
+        // newReason: [
-          {required: true, message: '请输入立项原因', trigger: 'blur'},
+        //   {required: true, message: '请输入立项原因', trigger: 'blur'},
-        ],
+        // ],
       },
 
     }
@@ -745,6 +764,19 @@ export default {
     this.getWorkData()
     this.processTable()
     this.getData()
+
+    this.$http.get('/lawss/activiti/saveEditFile', {
+      model: 'model_lx'
+    },{
+      _this: this
+    }, res => {
+      console.log(res)
+      if(res){
+        this.qbfsForm.LXD = res.id
+        this.qbfsForm.LXDName = '立项单'
+        this.LXDList=this.assemble(res.id,'立项单');
+      }
+    })
     //查询下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
@@ -918,7 +950,6 @@ export default {
           this.getFileInfo();
         });
         this.type = item.type
-        this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
     // 请求上传的文件信息

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -11,6 +11,8 @@
                             <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="6"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label="制修订状态" class="search-item">
@@ -240,7 +242,7 @@
                                         </el-form-item>
                                         <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <el-select :disabled="DrawerType === 'see' || DrawerType === 'add' " v-model="addForm.planStatus" placeholder="请选择计划状态">
-                                                <el-option label="未开始" value="0"></el-option>
+                                                <el-option label="计划已确认" value="0"></el-option>
                                                 <el-option label="制定中" value="1"></el-option>
                                                 <el-option label="修订中" value="2"></el-option>
                                                 <el-option label="已取消" value="3"></el-option>
@@ -911,6 +913,8 @@
                 map.set('2','修订中')
                 map.set('3','已取消')
                 map.set('4','已完成')
+                map.set('5','立项已完成')
+                map.set('6','计划已确认')
                 return map.get(item)
             },
             TXJGcloseDrawer () {