Merge branch 'develop' into FOTON

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

@@ -53,7 +53,7 @@
             multiple
             drag
 
-            :show-file-list="showUploadlist"
+            :show-file-list="!showModifyName && showUploadlist"
             :on-success="uploadSuccess"
             :before-upload="beforeUpload"
             :on-remove="removeOneFile"
@@ -68,6 +68,43 @@
           <i :class="iconClass"></i>
           <div class="el-upload__text">{{ tips }}</div>
         </el-upload>
+        <ul class="el-upload-list el-upload-list--text" v-if="showModifyName">
+          <li class="el-upload-list__item is-success"
+              v-for="(file, index) in showFileList"
+              :key="index"
+              :title="file.name"
+              @click="handlePreview(file)">
+            <a class="el-upload-list__item-name">
+              <i class="el-icon-document"></i>
+              {{ file.name }}
+            </a>
+            <label class="el-upload-list__item-status-label">
+              <i class="el-icon-upload-success el-icon-circle-check"></i>
+            </label>
+            <i class="el-icon-edit" @click.stop="handleModifyName(file)"></i>
+            <i class="el-icon-close" @click.stop="handleRemoveFile(file)"></i>
+          </li>
+          <el-button
+            size="small"
+            @click="clickButtonToUpload('opinionFileList')"
+            icon="el-icon-upload"
+            class="form-upload-btn"
+            v-if="reUpload || showUploadBtn">{{ uploadText || '重新上传' }}</el-button>
+        </ul>
+      </el-dialog>
+      <el-dialog title="修改文件名称"
+                 :visible.sync="openModifyFileNameDialog"
+                 append-to-body
+      >
+        <el-form-item>
+          <el-input v-model="modifyFile.fileName"></el-input>
+        </el-form-item>
+        <div class="demo-drawer-footer" style="text-align: right;">
+          <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="modifyFileNameLoading"
+                     @click="handleModifyNameSubmite">提交</el-button>
+          <el-button class="common-button-default" size="mini" icon="el-icon-close"
+                     @click="openModifyFileNameDialog = false">取消</el-button>
+        </div>
       </el-dialog>
     </el-form-item>
   </el-col>
@@ -87,7 +124,13 @@ export default {
       uploadPath: 'api/att/attFile/uploadNew',
       defaultFileList: [], // 默认显示
       showFileList: [],
-      importModalshowflagtemp: false
+      importModalshowflagtemp: false,
+      modifyFile: {
+        fileName: '',
+        fileId: ''
+      },
+      openModifyFileNameDialog: false,
+      modifyFileNameLoading: false
     }
   },
   props: {
@@ -150,6 +193,10 @@ export default {
     },
     showUploadBtn: {
       type: Boolean
+    },
+    showModifyName: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {
@@ -204,6 +251,37 @@ export default {
     }
   },
   methods: {
+    // 删除
+    handleRemoveFile(file){
+      const index = this.$refs.importFileAboutStand.uploadFiles.findIndex(e => e.response.data.id === file.response.data.id);
+      this.$refs.importFileAboutStand.uploadFiles.splice(index, 1);
+      this.showFileList.splice(index, 1)
+    },
+    // 修改
+    handleModifyName(file) {
+      this.modifyFile.fileName = file.name
+      this.modifyFile.fileId = file.response.data.id
+      this.openModifyFileNameDialog = true
+    },
+    // 修改dialog-确认
+    handleModifyNameSubmite(){
+      this.modifyFileNameLoading = true
+      this.$http.get('att/attFile/updateFileName', this.modifyFile, {
+        _this: this
+      }, res => {
+        if(res.ok){
+          this.modifyFileNameLoading = false
+          this.openModifyFileNameDialog = false
+          this.showFileList.forEach(item=>{
+            if(item.response.data.id === this.modifyFile.fileId){
+              item.name = this.modifyFile.fileName
+            }
+          })
+        }
+      }, e => {
+        this.modifyFileNameLoading = false
+      })
+    },
     handleExceed(files, fileList) {
       if (this.exceed) {
         this.$message.warning(this.exceed)
@@ -491,4 +569,12 @@ export default {
       color: rgba(64, 158, 255, 1);
     }
   }
+  .el-upload-list__item .el-icon-edit{
+    position: absolute;
+    top: 5px;
+    right: 25px;
+    cursor: pointer;
+    opacity: .75;
+    color: #606266;
+  }
 </style>

src/pages/personal/pages/my-questions/index.vue

@@ -1673,17 +1673,31 @@ export default {
     queBtn(){
       this.fileList = []
       // 清空提问
-      const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand)
+      if(this.standList.length === 0){
-      this.standType = selectedStand.classification
+        this.standType = !this.activeType ? 'INLAND' : this.activeType
-      this.questionForm = {
+        this.questionForm = {
-        pubQue :  selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题
+          pubQue :  '',//公共问题
-        classification: selectedStand.classification, //标准类型
+          classification: !this.activeType ? 'INLAND' : this.activeType, //标准类型
-        problemDescription: '', //问题
+          problemDescription: '', //问题
-        questioner: this.$store.getters.userInfo.userId, //提问人
+          questioner: this.$store.getters.userInfo.userId, //提问人
-        standardEncdoing: selectedStand.standardEncdoing,  //标准编号
+          standardEncdoing: '',  //标准编号
-        standardName: selectedStand.standardName,   //标准名称
+          standardName: '',   //标准名称
-        standardId: selectedStand.standardId,   //标准id
+          standardId:'',   //标准id
-        fileList: '',
+          fileList: '',
+        }
+      }else{
+        const selectedStand = this.activestand == '0' || this.activeType === 'INLAND' ? this.standList[0] : this.standMap.get(this.activestand)
+        this.standType = selectedStand.classification
+        this.questionForm = {
+          pubQue :  selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题
+          classification: selectedStand.classification, //标准类型
+          problemDescription: '', //问题
+          questioner: this.$store.getters.userInfo.userId, //提问人
+          standardEncdoing: selectedStand.standardEncdoing,  //标准编号
+          standardName: selectedStand.standardName,   //标准名称
+          standardId: selectedStand.standardId,   //标准id
+          fileList: '',
+        }
       }
       this.dialogVisible = true
     },

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

@@ -2988,20 +2988,32 @@
                                             _this: this
                                         }, res => {
                                             if (res.success) {
-                                                this.submitLoading = false
+                                                const planForm = {}
-                                                this.isSubmit = false
+                                                planForm.reviseStatus = this.form.reviseStatus
-                                                if (this.$route.query.bpnId !== '') {
+                                                planForm.standCode = this.form.DTQBBHBUSS
-                                                    let taskId = {
+                                                planForm.processType = "buss2";
-                                                        id: this.$route.query.bpnId
+                                                this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
+                                                    _this: this
+                                                }, res => {
+                                                    if (res.ok) {
+                                                        if (res.data === '操作成功') {
+                                                            this.submitLoading = false
+                                                            this.isSubmit = false
+                                                            if (this.$route.query.bpnId && this.$route.query.bpnId !== '') {
+                                                                let taskId = {
+                                                                    id: this.$route.query.bpnId
+                                                                }
+                                                                taskDel(taskId).then(res=>{
+                                                                    return res
+                                                                })
+                                                            }
+                                                            // 流程提交之后，应该流转至待办任务页面
+                                                            this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})                                                        } else {
+                                                        }
+                                                    } else {
+                                                        this.$message.warning(res.data)
                                                     }
-                                                    taskDel(taskId).then(res=>{
+                                                })
-                                                        return res
-                                                    })
-                                                }
-                                                // 流程提交之后，应该流转至待办任务页面
-                                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                                } else {
-                                                this.$message.warning(res.data)
                                             }
                                         })
                                     }

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

@@ -2501,6 +2501,17 @@ return
                     if (res.result === '操作成功' || res.ok) {
                         // 自动匹配配置标准
                         this.saveConfStand(res.data)
+                        const planForm = {}
+                        planForm.planStatus = '4'
+                        planForm.reviseStatus = this.form.reviseStatus
+                        planForm.standCode = this.form.DTQBBHBUSS
+                        planForm.processType = "buss2";
+                        this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
+                            _this: this
+                        }, res => {
+                            this.submitLoading = false
+                            this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        })
                     } else {
                         this.$message.warning(res.message)
                         this.isSubmit = false

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()
@@ -2947,7 +2949,9 @@
                                                 this.$message.success(res.message)
                                                 const planForm = {}
                                                 planForm.id = this.form.planId
-                                                planForm.planStatus = '2'
+                                                planForm.reviseStatus = this.form.reviseStatus
+                                                planForm.standCode = this.form.DTQBBHBUSS
+                                                planForm.processType = "buss1"
                                                 this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
                                                     _this: this
                                                 }, res => {

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

@@ -2554,17 +2554,12 @@
                         const planForm = {}
                         planForm.id = this.form.planId
                         planForm.planStatus = '4'
+                        planForm.reviseStatus = this.form.reviseStatus
+                        planForm.standCode = this.form.DTQBBHBUSS
+                        planForm.processType = "buss1";
                         this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
                             _this: this
                         }, res => {
-                            if (this.$route.query.bpnId && this.$route.query.bpnId !== '') {
-                                let taskId = {
-                                    id: this.$route.query.bpnId
-                                }
-                                taskDel(taskId).then(res=>{
-                                    return res
-                                })
-                            }
                             this.submitLoading = false
                             this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                         })

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

@@ -2720,7 +2720,9 @@
                                 this.$message.success(res.message)
                                 const planForm = {}
                                 planForm.id = this.form.planId
-                                planForm.planStatus = '2'
+                                planForm.reviseStatus = this.form.reviseStatus
+                                planForm.standCode = this.form.DTQBBHBUSS
+                                planForm.processType = "buss1";
                                 this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
                                     _this: this
                                 }, res => {

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/qbzxdjhgk/step5.vue

@@ -508,8 +508,12 @@ export default {
     handleSubmit(){
       this.isSubmit = true
       this.qbfsForm.bzfgbzFlag = '0'
-      this.qbfsForm.planStatus = '未开始'
+      this.qbfsForm.planStatus = '计划已确认'
-      this.qbfsForm.area = this.qbfsForm.area.join(',')
+      if(this.qbfsForm.area && this.qbfsForm.length > 0){
+        this.qbfsForm.area = this.qbfsForm.area.join(',')
+      }else {
+        this.qbfsForm.area = ""
+      }
       this.qbfsForm.commentText = this.commentText
       let json = JSON.stringify(this.qbfsForm);
       this.$http.post('lawss/activiti/completeTask', {

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" }
         // ],
@@ -932,7 +951,6 @@ export default {
       })
     },
     listSubmit (item) {
-      console.log(item);
       return new Promise((resolve, reject) => {
         let newForm = Object.assign(this.roleForm, item,this.qblx_pageData);
         newForm.startUserName = this.$store.getters.userInfo.userName
@@ -961,7 +979,7 @@ export default {
               if (res.success) {
                 resolve()
                 this.$message.success(res.message);
-                if (this.bpnId !== '') {
+                if (this.bpnId !== undefined && this.bpnId !== '') {
                   let taskId = {
                     id: this.bpnId
                   }

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"/>
@@ -582,7 +582,7 @@ import ProcessTitle from "../../components/ProcessTitle";
 import MechanismTree from "@/components/mechanismTree";
 import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards'
 import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2'
-import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst, taskDel } from "api/process";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst, taskDel,processCreatePlan } from "api/process";
 
 
 export default {
@@ -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
@@ -784,46 +816,53 @@ export default {
                 _this: this
               }, res => {
                 if (res.success) {
-                  this.isSubmit = true;
+                  const _formData = new FormData()
-                  this.qbfsForm.type = '5'
+                  _formData.append('infoJson', JSON.stringify(this.qbfsForm))
-                  this.qbfsForm.commentText = this.commentText;
+                  processCreatePlan(_formData).then(res => {
-                  let json = Object.assign(this.qbfsForm, this.roleForm);
+                    this.qbfsForm.planId = res.data
-                  this.$http.post("lawss/activiti/startProcessRollBack", {
+                    if (res.code === '200' || res.message === '入库成功'){
-                    createUser: this.$store.getters.userInfo.userId,
+                      this.isSubmit = true;
-                    createUserName: this.$store.getters.userInfo.userName,
+                      this.qbfsForm.type = '5'
-                    type: '25',
+                      this.qbfsForm.commentText = this.commentText;
-                    json: JSON.stringify({
+                      let json = Object.assign(this.qbfsForm, this.roleForm);
-                      roleForm: this.roleForm,
+                      this.$http.post("lawss/activiti/startProcessRollBack", {
-                      qbfsForm: this.qbfsForm,
+                        createUser: this.$store.getters.userInfo.userId,
-                      commentText: this.commentText
+                        createUserName: this.$store.getters.userInfo.userName,
-                    })
+                        type: '25',
-                  }, {
+                        json: JSON.stringify({
-                    _this: this
+                          roleForm: this.roleForm,
-                  }, res => {
+                          qbfsForm: this.qbfsForm,
-                    if (res.ok) {
+                          commentText: this.commentText
-                      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) {
+                        if (res.ok) {
-                          this.$message.success(res.message);
+                          this.$http.post("lawss/activiti/completeTask", {
-                          if (this.bpnId !== '') {
+                            taskIds: res.data,
-                            let taskId = {
+                            userId: this.$store.getters.userInfo.userId,
-                              id: this.bpnId
+                            json: JSON.stringify(json)
+                          }, {
+                            _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.isSubmit = false;
-                          this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
                         }
                       });
                     }
-                  });
+                  })
                 }
                 this.isSubmit = false
               }, e => {
@@ -918,7 +957,6 @@ export default {
           this.getFileInfo();
         });
         this.type = item.type
-        this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
     // 请求上传的文件信息

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

@@ -127,6 +127,7 @@ export default {
       type: '',
       commentText: '',
       qbfsForm: {},
+      LXDList:[],
       isTransfer: false,
       isSubmit: false,
       saveLoading: false,
@@ -220,13 +221,14 @@ export default {
       })
     },
     assemble(ids,names){
-      let list= new Array();
+      let list= [];
-      let idArray=ids.split(',');
+      if(ids && ids !== '' && names && names !== ''){
-      let nameArray=names.split(',');
+        let idArray=ids.split(',');
-      for(let i=0; i<idArray.length; i++){
+        let nameArray=names.split(',');
-        list.push({id:idArray[i],name:nameArray[i]});
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
       }
-
       return list;
     },
     handleTabs(name){

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

@@ -127,6 +127,7 @@ export default {
       type: '',
       commentText: '',
       qbfsForm: {},
+      LXDList:[],
       isTransfer: false,
       isSubmit: false,
       saveLoading: false,
@@ -219,6 +220,17 @@ export default {
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },

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

@@ -127,6 +127,7 @@ export default {
       type: '',
       commentText: '',
       qbfsForm: {},
+      LXDList:[],
       isTransfer: false,
       isSubmit: false,
       saveLoading: false,
@@ -218,6 +219,17 @@ export default {
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },

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

@@ -127,6 +127,7 @@ export default {
       type: '',
       commentText: '',
       qbfsForm: {},
+      LXDList:[],
       isTransfer: false,
       isSubmit: false,
       saveLoading: false,
@@ -218,6 +219,17 @@ export default {
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },
@@ -267,7 +279,9 @@ export default {
       this.isSubmit = true
       this.qbfsForm.bzfgbzFlag = '0'
       this.qbfsForm.planStatus = '未开始'
-      this.qbfsForm.area = this.qbfsForm.area.join(',')
+      if(this.qbfsForm.area && this.qbfsForm.length > 0){
+        this.qbfsForm.area = this.qbfsForm.area.join(',')
+      }
       this.qbfsForm.commentText = this.commentText
       let json = JSON.stringify(this.qbfsForm);
       this.$http.post('lawss/activiti/completeTask', {

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -749,6 +749,7 @@
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
                     :disabled="formdisableflag"
+                    :show-modify-name="true"
                     @fileSuccess="fileSuccess"
                   ></custom-file>
                 </template>

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

@@ -429,13 +429,13 @@
 
             <template slot-scope="scope">
                 <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
-                  {{ filterReviseStatus(scope.row.reviseStatus) }}
+                  {{ filterReviseStatus(scope.row.revisionStatus) }}
                 </span>
               <span v-if="scope.row.standStatusShow === '参考'" style="color: #98E165">
-                  {{ filterReviseStatus(scope.row.reviseStatus) }}
+                  {{ filterReviseStatus(scope.row.revisionStatus) }}
                 </span>
               <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
-                  {{ filterReviseStatus(scope.row.reviseStatus) }}
+                  {{ filterReviseStatus(scope.row.revisionStatus) }}
                 </span>
             </template>
           </el-table-column>
@@ -823,6 +823,7 @@
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag"
+                    :show-modify-name="true"
                   ></custom-file>
                 </template>
                 <template v-else-if="field.attrType === 'TEXTAREA'">
@@ -1210,7 +1211,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="企标制修订状态" title="企标制修订状态" class="add-form-item form-item-disabled">
-                  <el-select v-model="sarBussionessSearch.reviseStatus" title="请选择" filterable clearable @change="getStandInfoByReviseStatus">
+                  <el-select v-model="sarBussionessSearch.revisionStatus" title="请选择" filterable clearable>
                     <el-option
                             v-for="item in opinionsStand"
                             :key="item.value"
@@ -1724,11 +1725,13 @@ export default {
   data() {
     return {
       opinionsStand:[
-        {value: 'buss1_1',label: '技术标准-制定'},
+        {value: 'buss1_1',label: '技术标准-制定中'},
-        {value: 'buss1_2',label: '技术标准-修订'},
+        {value: 'buss1_2',label: '技术标准-修订中'},
-        {value: 'buss2_1',label: '产品标准-制定'},
+        {value: 'buss1_4',label: '技术标准-已完成'},
-        {value: 'buss2_2',label: '产品标准-修订'},
+        {value: 'buss2_1',label: '产品标准-制定中'},
-        {value: 'buss2_3',label: '产品标准-修改'},
+        {value: 'buss2_2',label: '产品标准-修订中'},
+        {value: 'buss2_3',label: '产品标准-修改中'},
+        {value: 'buss2_4',label: '产品标准-已完成'},
       ],
       QCBFC: false,  //C类标准展示备案日期
       replaceLawsNumModel: false,
@@ -2490,19 +2493,23 @@ export default {
       if(data){
         if(data.indexOf("buss1_") !== -1){
           if(data === 'buss1_1'){
-            return "制定"
+            return "技术标准-制定中"
           }else if(data === 'buss1_2'){
-            return "修订"
+            return "技术标准-修订中"
+          }else if(data === 'buss1_4'){
+            return "技术标准-已完成"
           }else {
             return ""
           }
         }else if(data.indexOf("buss2_") !== -1){
           if(data === 'buss2_1'){
-            return "制定"
+            return "产品标准-制定中"
           }else if(data === 'buss2_2'){
-            return "修订"
+            return "产品标准-修订中"
           }else if(data === 'buss2_3'){
-            return "修改"
+            return "产品标准-修改中"
+          }else if(data === 'buss2_4'){
+            return "产品标准-已完成"
           }else {
             return ""
           }

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,11 +242,13 @@
                                         </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>
                                                 <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 prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
@@ -911,6 +915,8 @@
                 map.set('2','修订中')
                 map.set('3','已取消')
                 map.set('4','已完成')
+                map.set('5','立项已完成')
+                map.set('6','计划已确认')
                 return map.get(item)
             },
             TXJGcloseDrawer () {

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -913,6 +913,7 @@
                         :config="field"
                         v-model="sarStandardsInfoEO[field.attrField]"
                         :disabled="formdisableflag"
+                        :show-modify-name="true"
                         @fileSuccess="fileSuccess"
                       ></custom-file>
                     </template>

src/pages/regulatoryRepository/standQA/index.vue

@@ -1047,9 +1047,22 @@ export default {
     //提问按钮
     queBtn(){
       this.fileList = []
-      const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand)
+      if(this.standList.length === 0){
-      this.standType = selectedStand.classification
+        this.standType = !this.activeType ? 'INLAND' : this.activeType
-      this.questionForm = {
+        this.questionForm = {
+          pubQue :  '',//公共问题
+          classification: !this.activeType ? 'INLAND' : this.activeType, //标准类型
+          problemDescription: '', //问题
+          questioner: this.$store.getters.userInfo.userId, //提问人
+          standardEncdoing: '',  //标准编号
+          standardName: '',   //标准名称
+          standardId:'',   //标准id
+          fileList: '',
+        }
+      }else{
+        const selectedStand = this.activestand == '0' || this.activeType === 'INLAND' ? this.standList[0] : this.standMap.get(this.activestand)
+        this.standType = selectedStand.classification
+        this.questionForm = {
           pubQue :  selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题
           classification: selectedStand.classification, //标准类型
           problemDescription: '', //问题
@@ -1058,6 +1071,7 @@ export default {
           standardName: selectedStand.standardName,   //标准名称
           standardId: selectedStand.standardId,   //标准id
           fileList: '',
+        }
       }
       this.dialogVisible = true
     },