From aa7d9458c59023944de764e25efcd70193ba73ca Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Mon, 28 Nov 2022 18:08:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93from?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/ProcessMaterialsDelivery.vue         | 56 +++++++++++++++----
 .../form/ProcessMaterialsDeliveryForm.vue     | 32 ++++++++++-
 2 files changed, 75 insertions(+), 13 deletions(-)

diff --git a/src/views/activiti/form/ProcessMaterialsDelivery.vue b/src/views/activiti/form/ProcessMaterialsDelivery.vue
index ebf8311..328a4bd 100644
--- a/src/views/activiti/form/ProcessMaterialsDelivery.vue
+++ b/src/views/activiti/form/ProcessMaterialsDelivery.vue
@@ -1,18 +1,37 @@
 <template>
   <a-card :bordered="false">
+    <a-tabs style="text-align: center"   @change="changeTables">
+      <a-tab-pane tab="总库出库" key="1" v-if="onlineDisabled" forceRender>
+        <a-tabs style="text-align: center">
+          <a-tab-pane tab="流程正文" key="1" forceRender>
+            <process-materials-delivery-form :dianshang="delivery" :isNew="isNew" :hieg="hieg" @delivery="showType" :processData="processData" :disabled="disabled"
+                                             @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
+                                             @backTask="backTask" @loadData="loadData"/>
+          </a-tab-pane>
 
-    <a-tabs style="text-align: center">
-      <a-tab-pane tab="流程正文" key="1" forceRender>
-        <process-materials-delivery-form :isNew="isNew" :hieg="hieg" :processData="processData" :disabled="disabled"
-                                         @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
-                                         @backTask="backTask" @loadData="loadData"/>
+          <a-tab-pane tab="流程节点图" key="2" forceRender>
+            <historic-pictrue :pictureId="pictureId" :procInstId="procInstId"/>
+          </a-tab-pane>
+          <a-tab-pane tab="审批历史" key="3" forceRender>
+            <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
+          </a-tab-pane>
+        </a-tabs>
       </a-tab-pane>
+      <a-tab-pane tab="项目部出库" key="2" v-if="noDisabled" forceRender>
+        <a-tabs style="text-align: center">
+          <a-tab-pane tab="流程正文" key="1" forceRender>
+            <process-materials-delivery-form  :dianshang="delivery" :isNew="isNew" :hieg="hieg"  @delivery="showType" :processData="processData" :disabled="disabled"
+                                             @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
+                                             @backTask="backTask" @loadData="loadData"/>
+          </a-tab-pane>
 
-      <a-tab-pane tab="流程节点图" key="2" forceRender>
-        <historic-pictrue :pictureId="pictureId" :procInstId="procInstId"/>
-      </a-tab-pane>
-      <a-tab-pane tab="审批历史" key="3" forceRender>
-        <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
+          <a-tab-pane tab="流程节点图" key="2" forceRender>
+            <historic-pictrue :pictureId="pictureId" :procInstId="procInstId"/>
+          </a-tab-pane>
+          <a-tab-pane tab="审批历史" key="3" forceRender>
+            <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
+          </a-tab-pane>
+        </a-tabs>
       </a-tab-pane>
     </a-tabs>
   </a-card>
@@ -27,7 +46,11 @@
     name: 'ProcessMaterialsDelivery',
     components: { ProcessMaterialsDeliveryForm, historicPictrue, historicDetail },
     data() {
-      return {}
+      return {
+        delivery: 1,
+        onlineDisabled:true,
+        noDisabled:true
+      }
     },
     props: {
       /*流程数据*/
@@ -79,6 +102,17 @@
       },
       loadData() {
         this.$emit('loadData')
+      },
+      changeTables(val){
+        this.delivery=Number(val);
+      },
+      showType(val){
+        if (val==2){
+          this.onlineDisabled=false
+        }
+        if (val==1){
+          this.noDisabled=false
+        }
       }
     }
   }
diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index 0d35b51..2475e4e 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -9,6 +9,11 @@
               <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
             </a-form-item>
           </a-col>
+          <a-col :span="8" v-show="false">
+            <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['deliveryType']" placeholder="" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
           <a-col :span="8" v-show="false">
             <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['id']" placeholder="" style="width: 100%" disabled/>
@@ -35,7 +40,14 @@
                       date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
             </a-form-item>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="8" v-if="this.deliveryType==1">
+            <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" @change="isMaterialType"
+                                 v-decorator="['materialType',validatorRules.materialType]" :trigger-change="true"
+                                 dictCode="stronger_material_type" placeholder="请选择物资类型"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8" v-if="this.deliveryType==2">
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" @change="isMaterialType"
                                  v-decorator="['materialType',validatorRules.materialType]" :trigger-change="true"
@@ -334,6 +346,7 @@
         btndisabled: false,
         describes: '',
         assignees:'',
+        deliveryType:'',
         validatorRules: {
           // 'blur'是鼠标失去焦点的时候会触发验证
           materialType: { rules: [{ required: true, message: '请选择物资类型!' }] },
@@ -381,8 +394,12 @@
         type: Boolean,
         default: false,
         required: false
+      },
+      dianshang: {
+        type: Number,
+        default: 0,
+        required: false
       }
-
     },
     computed: {
       formDisabled() {
@@ -406,6 +423,17 @@
         return false
       }
     },
+    watch: {
+      dianshang: {
+        immediate: true,
+        handler: function(val) {
+          if (val==1){
+
+          }
+          this.deliveryType = val
+        }
+      }
+    },
     created() {
       //如果是流程中表单，则需要加载流程表单data
       //this.showFlowData()