From d8a7922e6fd97d276a8654d842901b182be0e227 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 21 Nov 2022 16:25:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbrk/step1-2.vue       | 34 ++++++++++++-------
 .../qbzxdjhgk/component/cancel.vue            | 18 +++++-----
 .../qbzxdjhgk/component/delay.vue             | 16 +++++----
 3 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
index 90525c5f5..32ba73884 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
@@ -1,8 +1,8 @@
 <template><div class="bzrkStep1">
   <!--        标准入库流程-->
   <ProcessHeader toggle>
-    <template slot="proName">企标制修订-技术标准</template>
-    <template slot="proNode">企业技术标准起草</template>
+    <template slot="proName">企标制修订计划管控</template>
+    <template slot="proNode">技术标准起草</template>
   </ProcessHeader>
   <div class="headerTabs">
     <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -3064,14 +3064,26 @@ export default {
     // 接受按钮
     handleReceive(){
       this.isSubmit = true
-      execTask({
-        todoId: this.todoId // 当前节点ID
-      }).then(res => {
-        if (res.sign && res.sign === '0') {
-          this.$message.success('接收成功')
-          this.$router.push('/processCenter')
-        }
-        this.isSubmit = false
+      // execTask({
+      //   todoId: this.todoId // 当前节点ID
+      // }).then(res => {
+      //   if (res.sign && res.sign === '0') {
+      //     this.$message.success('接收成功')
+      //     this.$router.push('/processCenter')
+      //   }
+      //   this.isSubmit = false
+      // })
+      this.$http.get("lawss/activiti/acceptTack", {
+        nowEsId: this.tableData.standardData[0].id,
+        oaFlag:'0',
+        taskId: this.$route.query.taskIds,
+      }, {
+        _this: this
+      }, res => {
+          // if (res.sign && res.sign === '0') {
+            this.$message.success('接收成功')
+          //   this.$router.push('/processCenter')
+          // }
       })
     },
     handleSubmit() {
@@ -3096,8 +3108,6 @@ export default {
               this.isSubmit = true
               this.saveLoading = true
               this.form.country=this.countryArr;
-              console.log(this.form);
-              return
               var json = Object.assign(this.form, this.roleForm)
               json.zrUserId = this.form.zrUserId
               json.jlUserId = this.form.jlUserId
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 803054ff1..949defe12 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -429,16 +429,16 @@ export default {
       }, {
         _this: this,
       }, res => {
-        this.standinfoList = []
+        this.standinfoList = res.data.list
         //展示的数据只能是未开始的
-        res.data.list.forEach(item => {
-          if(item.planStatus === '0'){
-            if(item.isRelate && item.isRelate === 'null'){
-              item.isRelate = ""
-            }
-            this.standinfoList.push(item)
-          }
-        })
+        // res.data.list.forEach(item => {
+        //   if(item.planStatus === '0'){
+        //     if(item.isRelate && item.isRelate === 'null'){
+        //       item.isRelate = ""
+        //     }
+        //     this.standinfoList.push(item)
+        //   }
+        // })
         this.total = this.standinfoList.length
       })
 
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
index 3dbed2130..768aee1bc 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -451,13 +451,13 @@ export default {
       }, {
         _this: this,
       }, res => {
-        this.standinfoList = []
+        this.standinfoList = res.data.list
         //展示的数据只能是未开始的
-        res.data.list.forEach(item => {
-          if(item.planStatus === '0'){
-            this.standinfoList.push(item)
-          }
-        })
+        // res.data.list.forEach(item => {
+        //   if(item.planStatus === '0'){
+        //     this.standinfoList.push(item)
+        //   }
+        // })
         this.total = this.standinfoList.length
       })
 
@@ -501,7 +501,9 @@ export default {
         }
         this.qbfsForm.rqbName = this.selectList[0].rqbName
         this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
-        this.qbfsForm.isRelate = this.selectList[0].isRelate.indexOf("null") !== -1 ? "":this.selectList[0].isRelate
+        if(this.qbfsForm.isRelate){
+          this.qbfsForm.isRelate = this.selectList[0].isRelate.indexOf("null") !== -1 ? "":this.selectList[0].isRelate
+        }
         this.qbfsForm.useLevel = this.selectList[0].useLevel
         this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
         this.qbfsForm.technologic = this.selectList[0].technologic