修改流程

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

@@ -893,14 +893,14 @@
             <!--                                    <el-option label="未制定" value="2"></el-option>-->
             <!--                                </el-select>-->
             <!--                            </el-form-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-form-item v-if="this.form.reviseStatus != '3'" 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 v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'" label="起草责任单位" style="margin-right:20px" prop="unit" class="search-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.unit"
@@ -972,87 +972,6 @@
               width="80"
               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"
-              width="150">
-              <template slot-scope="scope">
-                <div>{{ getMap1(scope.row.planStatus)}}</div>
-              </template>
-            </el-table-column>
-            <el-table-column
-              v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
-              prop="reviseStatus"
-              width="150"
-              align="center"
-              label="制修订状态">
-              <template slot-scope="scope">
-                <div>{{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' : '修订') }}</div>
-              </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"
-              label="计划标准初稿完成时间">
-              <template slot-scope="scope">
-                <span>{{ scope.row.draftTime ? $moment(scope.row.draftTime).format("YYYY-MM-DD") : "" }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              v-if="this.form.reviseStatus === '1' || this.form.reviseStatus === '2'"
-              width="200"
-              prop="releaseTime"
-              align="center"
-              label="计划标准发布时间">
-              <template slot-scope="scope">
-                <span>{{ scope.row.releaseTime ? $moment(scope.row.releaseTime).format("YYYY-MM-DD") : "" }}</span>
-              </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"
@@ -1089,6 +1008,88 @@
               prop="putTime"
               label="实施日期">
             </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus != '3'"
+              prop="bussSort"
+              label="企标类别"
+              align="center"
+              width="120">
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus != '3'"
+              prop="esName"
+              label="企标名称"
+              align="center"
+              width="120">
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus != '3'"
+              prop="planStatus"
+              label="计划状态"
+              align="center"
+              width="150">
+              <template slot-scope="scope">
+                <div>{{ getMap1(scope.row.planStatus)}}</div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus != '3'"
+              prop="reviseStatus"
+              width="150"
+              align="center"
+              label="制修订状态">
+              <template slot-scope="scope">
+                <div>{{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' : '修订') }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus != '3'"
+              prop="drafterName"
+              width="120"
+              align="center"
+              label="起草人">
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus != '3'"
+              prop="resPersonName"
+              width="120"
+              align="center"
+              label="评审责任人">
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus != '3'"
+              prop="wgLeaderName"
+              width="120"
+              align="center"
+              label="工作组组长">
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus != '3'"
+              prop="draftTime"
+              width="200"
+              align="center"
+              label="计划标准初稿完成时间">
+              <template slot-scope="scope">
+                <span>{{ scope.row.draftTime ? $moment(scope.row.draftTime).format("YYYY-MM-DD") : "" }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus != '3'"
+              width="200"
+              prop="releaseTime"
+              align="center"
+              label="计划标准发布时间">
+              <template slot-scope="scope">
+                <span>{{ scope.row.releaseTime ? $moment(scope.row.releaseTime).format("YYYY-MM-DD") : "" }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="this.form.reviseStatus != '3'"
+              align="center"
+              prop="unitName"
+              label="起草责任单位">
+            </el-table-column>
+
             <!--                            <el-table-column-->
             <!--                              v-if="this.form.reviseStatus === '3'"-->
             <!--                              align="center"-->
@@ -1204,7 +1205,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel} from "api/process";
+import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail} from "api/process";
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -2273,9 +2274,6 @@ export default {
       }
     },
     handleSearchStandard () {
-      if(!this.form.reviseStatus){
-        this.$message.warning('请先选择制修订类型')
-      }else {
         this.tableData.standardData = []
         this.standardDrawer = true
         this.$nextTick(() => {
@@ -2286,7 +2284,6 @@ export default {
           }
         })
         this.getDomesticStandardTable()
-      }
     },
     saveUserInfo () {
       this.filterText = ''
@@ -3088,51 +3085,61 @@ export default {
               json.prcCreateUser = this.form.prcCreateUser
               json.prcCreateUserName = this.form.prcCreateUserName
               json.standCode = this.tableData.standardData[0].standCode
-              this.$http.post('lawss/activiti/startProcessRollBack', {
+              this.$http.post('lawss/activiti/completeTask', {
-                createUser: this.$store.getters.userInfo.userId,
+                taskIds: res.data,
-                createUserName: this.$store.getters.userInfo.userName,
+                userId : this.$store.getters.userInfo.userId,
-                type: 'buss1',
+                json: JSON.stringify(json)
-                json: JSON.stringify({
+              }, {
-                  form: this.form,
+                _this: this
-                  roleForm: this.roleForm,
+              }, res => {
-                  commentText: this.commentText
+                if (res.success) {
-                })
+                  this.$http.post('lawss/activiti/startProcessRollBack', {
-              }, {}, res => {
+                    createUser: this.$store.getters.userInfo.userId,
-                if (res.ok) {
+                    createUserName: this.$store.getters.userInfo.userName,
-                  this.$http.post('lawss/activiti/completeTask', {
+                    type: 'buss1',
-                    taskIds: res.data,
+                    json: JSON.stringify({
-                    userId : this.$store.getters.userInfo.userId,
+                      form: this.form,
-                    json: JSON.stringify(json)
+                      roleForm: this.roleForm,
-                  }, {
+                      commentText: this.commentText
-                    _this: this
+                    })
-                  }, res => {
+                  }, {}, res => {
-                    if (res.success) {
+                    if (res.ok) {
-                      this.$message.success(res.message)
+                      this.$http.post('lawss/activiti/completeTask', {
-                      const planForm = {}
+                        taskIds: res.data,
-                      planForm.id = this.form.planId
+                        userId : this.$store.getters.userInfo.userId,
-                      planForm.reviseStatus = this.form.reviseStatus
+                        json: JSON.stringify(json)
-                      planForm.standCode = this.form.DTQBBHBUSS
+                      }, {
-                      planForm.processType = "buss1"
-                      this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, {
                         _this: this
                       }, res => {
-                        if (res.ok) {
+                        if (res.success) {
-                          if (res.data === '操作成功') {
+                          this.$message.success(res.message)
-                            this.submitLoading = false
+                          const planForm = {}
-                            this.isSubmit = false
+                          planForm.id = this.form.planId
-                            if (this.$route.query.bpnId !== '') {
+                          planForm.reviseStatus = this.form.reviseStatus
-                              let taskId = {
+                          planForm.standCode = this.form.DTQBBHBUSS
-                                id: this.$route.query.bpnId
+                          planForm.processType = "buss1"
+                          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 !== '') {
+                                  let taskId = {
+                                    id: this.$route.query.bpnId
+                                  }
+                                  taskDel(taskId).then(res=>{
+                                    return res
+                                  })
+                                }
+                                // 流程提交之后，应该流转至待办任务页面
+                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})                                                        } else {
                               }
-                              taskDel(taskId).then(res=>{
+                            } else {
-                                return res
+                              this.$message.warning(res.data)
-                              })
                             }
-                            // 流程提交之后，应该流转至待办任务页面
+                          })
-                            this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})                                                        } else {
-                          }
-                        } else {
-                          this.$message.warning(res.data)
                         }
                       })
                     }
@@ -3177,6 +3184,7 @@ export default {
       })
     },
   },
+
   mounted () {
     this.getTaskId()
     this.getTree()

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

@@ -3087,8 +3087,8 @@ export default {
               json.applyUpdUserId = this.form.applyUpdUserId
               json.prcCreateUser = this.form.prcCreateUser
               json.prcCreateUserName = this.form.prcCreateUserName
-              json.standCode = this.tableData.standardData[0].standCode
+              json.standCode = this.standardCheckedList[0].standCode
-              json.id = this.tableData.standardData[0].id
+              json.id = this.standardCheckedList[0].id
               this.$http.post('lawss/activiti/startProcessRollBack', {
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,

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

@@ -583,9 +583,9 @@ export default {
         newReason: [
           {required: true, message: '请输入立项原因', trigger: 'blur'},
         ],
-        LXDName: [
+        // LXDName: [
-          { required: true, validator: validateFsOnlineFile, trigger: 'blur' }
+        //   { required: true, validator: validateFsOnlineFile, trigger: 'blur' }
-        ],
+        // ],
       },
 
     }

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

@@ -534,6 +534,7 @@ export default {
                 if (valid) {
                   this.isSubmit = true;
                   qbzxdFrom.commentText = this.commentText;
+                  qbzxdFrom.addFlag = '0'
                   let json = Object.assign(qbzxdFrom, this.roleForm);
                   this.$http.post("lawss/activiti/startProcessRollBack", {
                     createUser: this.$store.getters.userInfo.userId,
@@ -588,6 +589,7 @@ export default {
                 if (valid) {
                   this.isSubmit = true;
                   qbzxdFrom.commentText = this.commentText;
+                  qbzxdFrom.addFlag = '0'
                   var json = Object.assign(qbzxdFrom, this.roleForm);
                   this.$http.post("lawss/activiti/completeTask", {
                     taskIds: this.$route.query.taskIds,

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

@@ -519,20 +519,20 @@ 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
+              _this: this
-      }, res => {
+            }, res => {
-        if (res.success) {
+              if (res.success) {
-          this.$message.success(res.message)
+                this.$message.success(res.message)
-          this.$router.push('/processCenter')
+                this.$router.push('/processCenter')
-        }
+              }
-        this.isSubmit = false
+              this.isSubmit = false
-      }, e => {
+            }, e => {
-      });
+            });
     },
     beforeBack(){
       if(!this.commentText){

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

@@ -848,6 +848,7 @@ export default {
                   this.isSubmit = true;
                   this.qbfsForm.type = '5'
                   this.qbfsForm.commentText = this.commentText;
+                  this.qbfsForm.addFlag = '0'
                   let json = Object.assign(this.qbfsForm, this.roleForm);
                   this.$http.post("lawss/activiti/startProcessRollBack", {
                     createUser: this.$store.getters.userInfo.userId,

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

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

src/pages/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>