添加流程进行中可以查看制式表格

2 years ago · 8af50a6be5
5 changed files with 44 additions and 11 deletions
--- a/src/views/activiti/form/ProcessMaterialWarehousing.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousing.vue
@ -6,7 +6,7 @@
        <process-material-warehousing-form :isNew="isNew" :processData="processData" :disabled="disabled"
                                           @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask"
                                           @backTask="backTask" @loadData="loadData" :isPlanType="isPlanType"
-                                           :isSourceCapital="isSourceCapital"/>
+                                           :isSourceCapital="isSourceCapital" :itemId="itemId"/>
      </a-tab-pane>

      <a-tab-pane tab="流程节点图" key="2" forceRender>
@ -15,6 +15,9 @@
      <a-tab-pane tab="审批历史" key="3" forceRender>
        <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
      </a-tab-pane>
+      <a-tab-pane tab="制式表格" key="4" forceRender v-if="isTable">
+        <process-material-warehousing-statement :isTable="isTable" :materWared="this.$route.query.item"/>
+      </a-tab-pane>
    </a-tabs>
  </a-card>
 </template>
@ -23,10 +26,10 @@
  import ProcessMaterialWarehousingForm from './ProcessMaterialWarehousingForm'
  import historicPictrue from '../historicPictrue'
  import historicDetail from '../historicDetail'
-
+  import ProcessMaterialWarehousingStatement from '../../accessrecords/statement/ProcessMaterialWarehousingStatement'
  export default {
    name: 'ProcessMaterialsReturn',
-    components: { ProcessMaterialWarehousingForm, historicPictrue, historicDetail },
+    components: { ProcessMaterialWarehousingForm, historicPictrue, historicDetail ,ProcessMaterialWarehousingStatement},
    data() {
      return {}
    },
@ -34,10 +37,12 @@
      /*流程数据*/
      isNew: { type: Boolean, default: false, required: false },
      task: { type: Boolean, default: false, required: false },
+      isTable:{type: Boolean, default: false, required: false},
      /*采购类型*/
      isPlanType: {type: Boolean, default: false, required: false},
      /*资金来源*/
      isSourceCapital:{type: Boolean, default: false, required: false},
+      itemId:{type:String,default:'',required: false},
      processData: {
        type: Object,
        default: () => {
@ -61,6 +66,10 @@
        required: false
      }
    },
+    created() {
+      console.log(this.itemId,"this.itemId")
+      this.$route.query.item=this.itemId
+    },
    methods: {
      afterSub(formData) {
        this.$emit('afterSubmit', formData)
--- a/src/views/activiti/form/ProcessMaterialsDelivery.vue
+++ b/src/views/activiti/form/ProcessMaterialsDelivery.vue
@ -4,7 +4,7 @@
          <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"/>
+                                             @backTask="backTask" @loadData="loadData" :itemId="itemId"/>
          </a-tab-pane>
          <a-tab-pane tab="流程节点图" key="2" forceRender>
            <historic-pictrue :pictureId="pictureId" :procInstId="procInstId"/>
@ -12,6 +12,9 @@
          <a-tab-pane tab="审批历史" key="3" forceRender>
            <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
          </a-tab-pane>
+          <a-tab-pane tab="制式表格" key="4" forceRender v-if="isTable">
+            <ProcessMaterialsDeliveryStatement :isTable="isTable" :materWared="this.$route.query.item"/>
+          </a-tab-pane>
        </a-tabs>

  </a-card>
@ -21,10 +24,10 @@
  import ProcessMaterialsDeliveryForm from './ProcessMaterialsDeliveryForm'
  import historicPictrue from '../historicPictrue'
  import historicDetail from '../historicDetail'
-
+  import ProcessMaterialsDeliveryStatement from '../../accessrecords/statement/ProcessMaterialsDeliveryStatement'
  export default {
    name: 'ProcessMaterialsDelivery',
-    components: { ProcessMaterialsDeliveryForm, historicPictrue, historicDetail },
+    components: { ProcessMaterialsDeliveryForm, historicPictrue, historicDetail,ProcessMaterialsDeliveryStatement },
    data() {
      return {
        delivery: 1,
@ -36,6 +39,8 @@
      /*流程数据*/
      isNew: { type: Boolean, default: false, required: false },
      task: { type: Boolean, default: false, required: false },
+      isTable:{type: Boolean, default: false, required: false},
+      itemId:{type:String,default:'',required: false},
      processData: {
        type: Object,
        default: () => {
@ -76,6 +81,10 @@
        this.delivery = 2
      }
    },
+    created() {
+      console.log(this.itemId,"this.itemId")
+      this.$route.query.item=this.itemId
+    },
    methods: {
      afterSub(formData) {
        this.$emit('afterSubmit', formData)
--- a/src/views/activiti/form/ProcessUdgetPlan.vue
+++ b/src/views/activiti/form/ProcessUdgetPlan.vue
@ -4,7 +4,7 @@
        <a-tabs style="text-align: center">
          <a-tab-pane tab="流程正文" key="1" forceRender>
            <process-udget-plan-form  :isNew="isNew" :processData="processData" :disabled="disabled"  @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask" :hieg="hieg" @loadData="loadData" :isPlanType="isPlanType"
-                                      :isSourceCapital="isSourceCapital" :routePlanName="routePlanName"/>
+                                      :isSourceCapital="isSourceCapital" :routePlanName="routePlanName" :itemId="itemId"/>
          </a-tab-pane>

          <a-tab-pane tab="流程节点图" key="2" forceRender>
@ -13,6 +13,9 @@
          <a-tab-pane tab="审批历史" key="3" forceRender>
            <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
          </a-tab-pane>
+          <a-tab-pane tab="制式表格" key="4" forceRender v-if="isTable">
+            <ProcessMaterialsPlanList :isTable="isTable"   :materWared="this.$route.query.item"/>
+          </a-tab-pane>
        </a-tabs>

   <!-- <a-tabs style="text-align: center">
@ -35,10 +38,11 @@
  import ProcessUdgetPlanForm from './ProcessUdgetPlanForm'
  import historicPictrue from '../historicPictrue'
  import historicDetail from '../historicDetail'
+  import ProcessMaterialsPlanList from '../../accessrecords/plan/ProcessMaterialsPlanList'
  var docxx = require("docx-preview");
  export default {
    name: 'ProcessUdgetPlan',
-    components: {ProcessUdgetPlanForm,historicPictrue, historicDetail},
+    components: {ProcessUdgetPlanForm,historicPictrue, historicDetail,ProcessMaterialsPlanList},
    data() {
      return {
        tabKey:2,
@ -50,11 +54,13 @@
      /*流程数据*/
      isNew: {type: Boolean, default: false, required: false},
      task: {type: Boolean, default: false, required: false},
+      isTable:{type: Boolean, default: false, required: false},
      /*采购类型*/
      isPlanType: {type: Boolean, default: false, required: false},
      /*资金来源*/
      isSourceCapital:{type: Boolean, default: false, required: false},
      routePlanName:{type:String,default:'',required: false},
+      itemId:{type:String,default:'',required: false},
      processData:{
        type:Object,
        default:()=>{return {}},
@ -112,6 +118,10 @@
    //     required: false
    //   }
    // },
+    created() {
+      console.log(this.itemId,"this.itemId")
+       this.$route.query.item=this.itemId
+    },
    methods: {
      afterSub(formData){
        this.$emit('afterSubmit',formData)
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@ -648,7 +648,6 @@
      let userInfo = sessionStorage.getItem('USER_INFORMATION')
      // userInfo.company=company;
      if (!this.isNew) {
-        console.log(this.routePlanName,"---------------------->")
        this.init()
        // this.isSourceCapital=true;
        // this.isPlanType=true;
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@ -154,6 +154,8 @@
                 :isSourceCapital="lcModa.isSourceCapital"
                 :task="true" :hieg="lcModa.hieg"
                 :routePlanName="lcModa.routePlanName"
+                 :isTable="lcModa.isTable"
+                 :itemId="lcModa.itemId"
                 @afterSubmit="afterSub"
                 @passTask="()=>passTask(lcModa.processData)"
                 @backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId"
@ -294,7 +296,9 @@
          hieg: true,
          isSourceCapital: false,
          isPlanType: false,
-          routePlanName:''
+          routePlanName: '',
+          isTable:'',
+          itemId:''
        },
        tableName: '',
        tableId: '',
@ -479,6 +483,7 @@
        this.lcModa.disabled = true
        this.tableName = r.tableName
        this.tableId = r.tableId
+        this.lcModa.itemId=r.tableId
        //获取是不是第一个审核人和最后一个审核人（第一个审核人和最后一个审核人需要对表单进行操作）
        if (r.processName === '预算计划采购流程') {
          let userInfo = sessionStorage.getItem('USER_INFORMATION')
@ -552,6 +557,7 @@
        this.lcModa.task = true
        this.lcModa.procInstId = r.procInstId
        this.lcModa.visible = true
+        this.lcModa.isTable=true;
      },
      passTask(v) {
        console.log(v.procInstId, '33333333333333333')