From bcf9c1828d9e96771b654974f35b16e7626c17bd Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Mon, 14 Nov 2022 17:33:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E6=8B=A8=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jeecg/HPlan.vue                        |  1 +
 src/views/activiti/form/ProcessMaterialsAllotForm.vue | 10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/components/jeecg/HPlan.vue b/src/components/jeecg/HPlan.vue
index e639cac..e84b4e8 100644
--- a/src/components/jeecg/HPlan.vue
+++ b/src/components/jeecg/HPlan.vue
@@ -152,6 +152,7 @@
             params.ids.push(res.result.id)
             params.vals.push(res.result.warehousingBatch)
             this.showText=params;
+
           }
           if (res.code === 510) {
             this.$message.warning(res.message)
diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
index c856c04..81e9b0d 100644
--- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
@@ -94,13 +94,13 @@
       </a-form>
     </j-form-container>
     <div class="div_process">
-      <a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center" v-show="isHava">
+      <a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center" >
         <a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
         <a-button style="margin-left: 8px" type="primary" :disabled="disabled||btndisabled" @click="applySubmit">提交申请
         </a-button>
         <a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>
       </a-form-item>
-      <a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center" v-show="isHava">
+      <a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center" >
         <a-button type="primary" @click="passTask">通过</a-button>
         <a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
       </a-form-item>
@@ -784,11 +784,7 @@
         }
         console.log(this.data.haveAndNot,"------------666666666666665555555555555555")
 
-        if (this.data.haveAndNot==0){
-          this.isHava=true;
-          this.disabled=true
-          console.log(this.disabled,"55555555555555555555555")
-        }
+
         let fieldval = pick(this.data, 'id', 'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'beAllotDepartment', 'fileId', 'haveAndNot')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)