From 9d6b4285f8f43ff045673f964612e0ede1aee3fc Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Sat, 12 Nov 2022 19:21:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E6=8B=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/applyList.vue                  |  3 ++-
 src/views/activiti/form/ProcessMaterialsAllot.vue |  2 +-
 .../activiti/form/ProcessMaterialsAllotForm.vue   | 12 +++++++-----
 .../activiti/form/ProcessMaterialsDelivery.vue    |  7 ++++++-
 .../form/ProcessMaterialsDeliveryForm.vue         | 15 ++++++++++++---
 src/views/activiti/historicDetail.vue             |  4 ++--
 6 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/views/activiti/applyList.vue b/src/views/activiti/applyList.vue
index c061a03..94693a2 100644
--- a/src/views/activiti/applyList.vue
+++ b/src/views/activiti/applyList.vue
@@ -156,7 +156,8 @@
     <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%">
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent" :hieg ="lcModa.hieg"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
-                 @afterSubmit="afterSub" @close="lcModa.visible=false,lcModa.disabled = false"></component>
+                 @close="lcModa.visible=false,lcModa.disabled = false"></component>
+<!--       @afterSubmit="afterSub"-->
     </a-modal>
     <!--提交申请表单-->
     <a-modal title="提交申请" v-model="modalVisible" :mask-closable="false" :width="500" :footer="null">
diff --git a/src/views/activiti/form/ProcessMaterialsAllot.vue b/src/views/activiti/form/ProcessMaterialsAllot.vue
index 835a2ac..66fbd02 100644
--- a/src/views/activiti/form/ProcessMaterialsAllot.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllot.vue
@@ -25,7 +25,7 @@
     components: {ProcessMaterialsAllotForm,historicPictrue, historicDetail},
     data() {
       return {
-        isNew:''
+
       }
     },
     props: {
diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
index 94f44d2..7c0cef4 100644
--- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
@@ -42,7 +42,7 @@
                                  dictCode="material_type" placeholder="请选择物资类型"/>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="8" v-if="task" >
             <a-form-item label="被调拨部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-depart v-decorator="['beAllotDepartment',validatorRules.beAllotDepartment]"  @change ='Department'/>
             </a-form-item>
@@ -367,7 +367,8 @@
       }
       let company = sessionStorage.getItem('PARENT_ID')
       let userInfo = sessionStorage.getItem('USER_INFORMATION')
-      console.log(userInfo)
+      // console.log("userInfouserInfo",JSON.parse(userInfo));
+
       // userInfo.company=company;
       this.popupCallback(company, userInfo)
 
@@ -379,7 +380,7 @@
         if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined){
 
           if(record.row.id !== ''  && record.row.id !== undefined &&  this.materialGroupId !== record.row.materialGroup ){
-            console.log("执行materialGroup")
+            // console.log("执行materialGroup")
             this.fetchMerchandiseNews(record.row.materialGroup,1);
               let value = [
                 {
@@ -406,7 +407,7 @@
 
         }
         if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.equipment !== '' && record.row.allotNumber === '' && isDB ){
-          console.log("执行materialNumber")
+          // console.log("执行materialNumber")
           let materialName = {}
           this.bigIdMerchandiseNewsList.forEach(item => {
             if (item.merchandiseNewsId === record.row.equipment) {
@@ -596,8 +597,9 @@
       init() {
         this.btndisabled = true
         var r = this.processData
+        // console.log("2323232323232323232323232323232323232323",r)
         this.getAction(this.url.queryById, {
-          tableId: r.tableId,
+          id: r.tableId,
           tableName: r.tableName
         }).then((res) => {
           if (res.success) {
diff --git a/src/views/activiti/form/ProcessMaterialsDelivery.vue b/src/views/activiti/form/ProcessMaterialsDelivery.vue
index 8d1032a..f1d36b1 100644
--- a/src/views/activiti/form/ProcessMaterialsDelivery.vue
+++ b/src/views/activiti/form/ProcessMaterialsDelivery.vue
@@ -3,7 +3,7 @@
 
     <a-tabs  style="text-align: center">
       <a-tab-pane tab="流程正文" key="1" forceRender>
-        <process-materials-delivery-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask"/>
+        <process-materials-delivery-form :isNew="isNew" :hieg="hieg" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask"/>
       </a-tab-pane>
 
       <a-tab-pane tab="流程节点图" key="2" forceRender>
@@ -50,6 +50,11 @@
         type: Boolean,
         default: false,
         required: false
+      },
+      hieg: {
+        type: Boolean,
+        default: true,
+        required: false
       }
     },
         methods: {
diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index 6e434f0..817e9a3 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -65,7 +65,7 @@
           :columns="processMaterialsDeliveryListTable.columns"
           :dataSource="processMaterialsDeliveryListTable.dataSource"
           :maxHeight="300"
-          :disabled="this.heid"
+          :disabled="hiegs"
           @valueChange="onSelect"
           :rowNumber="true"
           :rowSelection="true"
@@ -138,7 +138,7 @@
         libraryAssociationIdInvisible: 'ZK',
         rolePlay: false,
         jiy: [],
-        heid: true,
+        // heid: true,
         addId: '',
         bigIdMerchandiseNewsList: [],
         labelCol: {
@@ -369,7 +369,14 @@
         type: Boolean,
         default: false,
         required: false
+      },
+      //表单禁用
+      hieg: {
+        type: Boolean,
+        default: false,
+        required: false
       }
+
     },
     computed: {
       formDisabled() {
@@ -380,6 +387,8 @@
           }
           return true
         }
+        // console.log("============================",this.hiegs=this.hieg);
+        this.hiegs = this.hieg;
         return this.disabled
       },
       showFlowSubmitButton() {
@@ -417,7 +426,7 @@
       isMaterialType(val) {
         if (val !== undefined) {
           this.accountingAttributesVal = val
-          this.heid = false
+          this.hiegs = false
           this.fetchData(val)
 
         }
diff --git a/src/views/activiti/historicDetail.vue b/src/views/activiti/historicDetail.vue
index 6041b6b..467842e 100644
--- a/src/views/activiti/historicDetail.vue
+++ b/src/views/activiti/historicDetail.vue
@@ -106,12 +106,12 @@ export default {
     procInstId: {
       type: String,
       default: '',
-      required: true
+      required: false
     },
     pictureId: {
       type: String,
       default: '',
-      required: true
+      required: false
     },
     lcModa: {
       type: Object,