From 4d1a12330bb46eadf4ed1d71a0bb50a540fedc7b Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Tue, 14 Feb 2023 14:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E8=AF=95=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E9=A2=84=E8=A7=88=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan/ProcessMaterialWarehousingPlan.vue   | 15 ++++-
 .../plan/ProcessMaterialsPlan.vue             | 13 +++-
 .../plan/ProcessMaterialsPlanList.vue         | 63 ++++---------------
 .../ProcessMaterialWarehousingStatement.vue   |  8 ++-
 .../ProcessMaterialsDeliveryStatement.vue     |  5 +-
 .../ProcessMaterialsPlanStatement.vue         |  8 +--
 .../ProcessMaterialsPlanStatement2.vue        |  4 +-
 .../ProcessMaterialsPlanStatement3.vue        |  7 ++-
 .../ProcessMaterialsPlanStatement4.vue        |  7 ++-
 .../form/ProcessMaterialWarehousing.vue       |  3 +-
 src/views/activiti/form/ProcessUdgetPlan.vue  |  4 +-
 .../activiti/form/ProcessUdgetPlanForm.vue    | 26 +-------
 12 files changed, 66 insertions(+), 97 deletions(-)

diff --git a/src/views/accessrecords/plan/ProcessMaterialWarehousingPlan.vue b/src/views/accessrecords/plan/ProcessMaterialWarehousingPlan.vue
index 604eeb6..2b8452c 100644
--- a/src/views/accessrecords/plan/ProcessMaterialWarehousingPlan.vue
+++ b/src/views/accessrecords/plan/ProcessMaterialWarehousingPlan.vue
@@ -3,14 +3,14 @@
 
     <a-tabs style="text-align: center" :active-key="this.tabKey" @change="callback">
       <a-tab-pane tab="物资明细" key="1" forceRender >
-        <process-material-warehousing-detail :materWared="this.$route.query.item" />
+        <process-material-warehousing-detail :materWared="this.$route.query.item"  />
       </a-tab-pane>
 
       <a-tab-pane tab="流程节点图" key="2" forceRender >
         <process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/>
       </a-tab-pane>
       <a-tab-pane tab="制式表格" key="3" forceRender>
-        <process-material-warehousing-statement :materWared="this.$route.query.item"/>
+        <process-material-warehousing-statement :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
       </a-tab-pane>
     </a-tabs>
   </a-card>
@@ -114,6 +114,17 @@ export default {
           this.loading = false;
         })
       }
+      if (key == 3) {
+        getAction(this.url.getProcessPicture, { id: this.$route.query.item }).then((res) => {
+          if (res.success) {
+            // this.dataSource = res.result.records;
+            // this.ipagination.total = res.result.total;
+            console.log(res, '获取数据')
+            this.$route.query.procInstId=res.result.procInstId;
+            console.log(this.procInstId)
+          }
+        })
+      }
     }
 
   },
diff --git a/src/views/accessrecords/plan/ProcessMaterialsPlan.vue b/src/views/accessrecords/plan/ProcessMaterialsPlan.vue
index 51714a5..326c22e 100644
--- a/src/views/accessrecords/plan/ProcessMaterialsPlan.vue
+++ b/src/views/accessrecords/plan/ProcessMaterialsPlan.vue
@@ -10,7 +10,7 @@
         <process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/>
       </a-tab-pane>
       <a-tab-pane tab="制式表格" key="3" forceRender>
-        <ProcessMaterialsPlanList  :materWared="this.$route.query.item"/>
+        <ProcessMaterialsPlanList  :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
       </a-tab-pane>
     </a-tabs>
   </a-card>
@@ -125,6 +125,17 @@
             this.loading = false;
           })
         }
+        if (key == 3) {
+          getAction(this.url.getProcessPicture, { id: this.$route.query.item }).then((res) => {
+            if (res.success) {
+              // this.dataSource = res.result.records;
+              // this.ipagination.total = res.result.total;
+              console.log(res, '获取数据')
+              this.$route.query.procInstId=res.result.procInstId;
+              console.log(this.procInstId)
+            }
+          })
+        }
       },
     }
   }
diff --git a/src/views/accessrecords/plan/ProcessMaterialsPlanList.vue b/src/views/accessrecords/plan/ProcessMaterialsPlanList.vue
index 4a34e57..95f8c26 100644
--- a/src/views/accessrecords/plan/ProcessMaterialsPlanList.vue
+++ b/src/views/accessrecords/plan/ProcessMaterialsPlanList.vue
@@ -42,13 +42,13 @@
       <!--        <process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/>-->
       <!--      </a-tab-pane>-->
       <a-tab-pane tab="采购申请表" key="3" forceRender>
-        <process-materials-plan-statement  :materWared="this.$route.query.item"/>
+        <process-materials-plan-statement  :materWared="this.$route.query.item"  :procInstId="this.$route.query.procInstId"/>
       </a-tab-pane>
       <a-tab-pane tab="采购通知书" key="4" forceRender>
-        <process-materials-plan-statement2  :materWared="this.$route.query.item"/>
+        <process-materials-plan-statement2  :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
       </a-tab-pane>
         <a-tab-pane  tab="代储代销物资采购通知书"  key="5" forceRender v-if="this.isIf">
-          <process-materials-plan-statement3  :materWared="this.$route.query.item"/>
+          <process-materials-plan-statement3  :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
         </a-tab-pane>
      <!-- <a-tab-pane tab="报验单" key="6" forceRender>
         <process-materials-plan-statement4 :materWared="this.$route.query.item"/>
@@ -115,54 +115,15 @@
         ],
       }
     },
-    props: {
-    //
-    //   /*流程数据*/
-    //   processData:{
-    //     type:Object,
-    //     default:()=>{return {}},
-    //     required:false
-    //   },
-    //   item: {
-    //     type:String,
-    //   },
-    // },
-    // props: {
-    //   /*流程数据*/
-    //   processData:{
-    //     type:Object,
-    //     default:()=>{return {}},
-    //     required:false
-    //   },
-    //   /*是否新增*/
-    //   isNew: {type: Boolean, default: false, required: false},
-    //   /*是否处理流程*/
-    //   task: {type: Boolean, default: false, required: false},
-    //   //流程表单data
-    //   formData: {
-    //     type: Object,
-    //     default: () => {
-    //     },
-    //     required: false
-    //   },
-    //   //表单模式：false流程表单 true普通表单
-    //   formBpm: {
-    //     type: Boolean,
-    //     default: false,
-    //     required: false
-    //   },
-    //   //表单禁用
-    //   disabled: {
-    //     type: Boolean,
-    //     default: false,
-    //     required: false
-    //   }
-    //   materWared:{
-    //     type:String,
-    //   },
-    },
+/*    props: {
+      procInstId: {
+        type: String,
+        default: '',
+        required: true
+      },
+    },*/
     created(){
-      console.log("进来没有")
+      console.log("进来没有",this.procInstId)
       if (this.$route.query.sourceCapital==2){
         this.isIf=true;
       }
@@ -182,7 +143,7 @@
     methods: {
       callback(key){
         if (key==2){
-          getAction(this.url.getProcessPicture, { id:this.$route.query.item }).then((res) => {
+          getAction(this.url.getProcessPicture, { id:this.$route.query.item}).then((res) => {
             if (res.success) {
               // this.dataSource = res.result.records;
               // this.ipagination.total = res.result.total;
diff --git a/src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue b/src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue
index 2b4866c..65a6250 100644
--- a/src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue
+++ b/src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue
@@ -52,7 +52,8 @@
         pdfWord: '',
         pdfSrc: '',
         queryParam: {
-          id: ''
+          id: '',
+          procInstId:''
         },
         url: {
           list: '/hy/processUdgetPlan/getPlanTable',
@@ -98,7 +99,7 @@
     methods: {
       // 下载
       downWord() {
-        downFile(this.url.queryPlandDownWord, { id: this.queryParam.id }).then((data) => {
+        downFile(this.url.queryPlandDownWord, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
           if (!data.size > 0) {
             this.$message.warning('文件下载失败')
             return
@@ -116,7 +117,8 @@
       },
       previewWord() {
         this.$message.loading('加载中请稍后......')
-        downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => {
+        console.log(this.$route.query.procInstId,"***************")
+        downFile(this.url.queryPlanPrevie, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
           if (!data.size > 0) {
             this.$message.warning('文件预览失败')
             return
diff --git a/src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue b/src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue
index 0eaa8b5..9c75567 100644
--- a/src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue
+++ b/src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue
@@ -52,7 +52,8 @@
         pdfWord: '',
         pdfSrc: '',
         queryParam: {
-          id: ''
+          id: '',
+          procInstId:''
         },
         url: {
           list: '/hy/processUdgetPlan/getPlanTable',
@@ -98,7 +99,7 @@
     methods: {
       // 下载
       downWord() {
-        downFile(this.url.queryDeliveryDownWord, { id: this.queryParam.id }).then((data) => {
+        downFile(this.url.queryDeliveryDownWord, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
           if (!data.size > 0) {
             this.$message.warning('文件下载失败')
             return
diff --git a/src/views/accessrecords/statement/ProcessMaterialsPlanStatement.vue b/src/views/accessrecords/statement/ProcessMaterialsPlanStatement.vue
index b35601e..4e24cc8 100644
--- a/src/views/accessrecords/statement/ProcessMaterialsPlanStatement.vue
+++ b/src/views/accessrecords/statement/ProcessMaterialsPlanStatement.vue
@@ -59,7 +59,8 @@
         modalLsVisible: false,
         pdfWord: '',
         queryParam: {
-          id: ''
+          id: '',
+          procInstId:''
         },
         pdfSrc: '',
         url: {
@@ -96,7 +97,7 @@
     methods: {
       // 下载
       downWord() {
-        downFile(this.url.queryPlandDownWord, { id: this.queryParam.id }).then((data) => {
+        downFile(this.url.queryPlandDownWord, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
           if (!data.size > 0) {
             this.$message.warning('文件下载失败')
             return
@@ -114,12 +115,11 @@
       },
       previewWord() {
         this.$message.loading('加载中请稍后......')
-        downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => {
+        downFile(this.url.queryPlanPrevie, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
           if (!data.size > 0) {
             this.$message.warning('文件预览失败')
             return
           }
-          console.log(data)
           const blob = new Blob([data], { type: 'application/pdf' })
           this.pdfSrc = window.URL.createObjectURL(blob)
           window.open(this.pdfSrc)//新窗口打开，借用浏览器去打印
diff --git a/src/views/accessrecords/statement/ProcessMaterialsPlanStatement2.vue b/src/views/accessrecords/statement/ProcessMaterialsPlanStatement2.vue
index 7a60642..cdea1cd 100644
--- a/src/views/accessrecords/statement/ProcessMaterialsPlanStatement2.vue
+++ b/src/views/accessrecords/statement/ProcessMaterialsPlanStatement2.vue
@@ -98,7 +98,7 @@
     methods: {
       // 下载
       downWord() {
-        downFile(this.url.queryPlandDownWord, { id: this.queryParam.id }).then((data) => {
+        downFile(this.url.queryPlandDownWord, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
           if (!data.size>0) {
             this.$message.warning("文件下载失败")
             return
@@ -116,7 +116,7 @@
       },
             previewWord() {
         this.$message.success("加载中请稍后......")
-        downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => {
+        downFile(this.url.queryPlanPrevie, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
           if (!data.size>0) {
             this.$message.warning("文件预览失败")
             return
diff --git a/src/views/accessrecords/statement/ProcessMaterialsPlanStatement3.vue b/src/views/accessrecords/statement/ProcessMaterialsPlanStatement3.vue
index 77e5bcb..0461fb4 100644
--- a/src/views/accessrecords/statement/ProcessMaterialsPlanStatement3.vue
+++ b/src/views/accessrecords/statement/ProcessMaterialsPlanStatement3.vue
@@ -52,7 +52,8 @@
         pdfWord: '',
         pdfSrc: '',
         queryParam: {
-          id: ''
+          id: '',
+          procInstId:''
         },
         url: {
           list: '/hy/processUdgetPlan/getPlanTable',
@@ -98,7 +99,7 @@
     methods: {
       // 下载
       downWord() {
-        downFile(this.url.querySourceCapitalDownWord, { id: this.queryParam.id }).then((data) => {
+        downFile(this.url.querySourceCapitalDownWord, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
           if (!data.size > 0) {
             this.$message.warning('文件下载失败')
             return
@@ -116,7 +117,7 @@
       },
       previewWord() {
         this.$message.loading('加载中请稍后......')
-        downFile(this.url.querySourceCapitalPrevie, { id: this.queryParam.id }).then((data) => {
+        downFile(this.url.querySourceCapitalPrevie, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
           if (!data.size > 0) {
             this.$message.warning('文件预览失败')
             return
diff --git a/src/views/accessrecords/statement/ProcessMaterialsPlanStatement4.vue b/src/views/accessrecords/statement/ProcessMaterialsPlanStatement4.vue
index 5821be0..4eeaf80 100644
--- a/src/views/accessrecords/statement/ProcessMaterialsPlanStatement4.vue
+++ b/src/views/accessrecords/statement/ProcessMaterialsPlanStatement4.vue
@@ -52,7 +52,8 @@
         pdfWord: '',
         pdfSrc: '',
         queryParam: {
-          id: ''
+          id: '',
+          procInstId:''
         },
         url: {
           list: '/hy/processUdgetPlan/getPlanTable',
@@ -98,7 +99,7 @@
     methods: {
       // 下载
       downWord() {
-        downFile(this.url.queryInspectionFormDownWord, { id: this.queryParam.id }).then((data) => {
+        downFile(this.url.queryInspectionFormDownWord, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
           if (!data.size > 0) {
             this.$message.warning('文件下载失败')
             return
@@ -116,7 +117,7 @@
       },
       previewWord() {
         this.$message.loading('加载中请稍后......')
-        downFile(this.url.queryInspectionFormPrevie, { id: this.queryParam.id }).then((data) => {
+        downFile(this.url.queryInspectionFormPrevie, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
           if (!data.size > 0) {
             this.$message.warning('文件预览失败')
             return
diff --git a/src/views/activiti/form/ProcessMaterialWarehousing.vue b/src/views/activiti/form/ProcessMaterialWarehousing.vue
index a1894d4..e7b6424 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousing.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousing.vue
@@ -16,7 +16,7 @@
         <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"/>
+        <process-material-warehousing-statement :isTable="isTable" :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
       </a-tab-pane>
     </a-tabs>
   </a-card>
@@ -72,6 +72,7 @@
         this.isTable=true
       }
       this.$route.query.item=this.itemId
+      this.$route.query.procInstId=this.procInstId
     },
     methods: {
       afterSub(formData) {
diff --git a/src/views/activiti/form/ProcessUdgetPlan.vue b/src/views/activiti/form/ProcessUdgetPlan.vue
index 9947804..c316c33 100644
--- a/src/views/activiti/form/ProcessUdgetPlan.vue
+++ b/src/views/activiti/form/ProcessUdgetPlan.vue
@@ -14,7 +14,7 @@
             <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"/>
+            <ProcessMaterialsPlanList :isTable="isTable"   :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
           </a-tab-pane>
         </a-tabs>
 
@@ -122,7 +122,9 @@
       if (this.itemId){
         this.isTable=true
       }
+      console.log(this.itemId,this.procInstId,"***********")
        this.$route.query.item=this.itemId
+       this.$route.query.procInstId=this.procInstId
     },
     methods: {
       afterSub(formData){
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index d9574e2..9b17d79 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -1519,31 +1519,7 @@
         })
       },
       saveAndpassTask() {
-        this.getAllTable().then(tables => {
-          return validateFormAndTables(this.form, tables)
-        }).then(allValues => {
-          let formData = this.classifyIntoFormData(allValues)
-          if (this.isPlanType) {
-            if (!formData.planType) {
-              this.$message.error('请选择采购类型')
-              return
-            } else {
-              if (formData.ifDirect == null && this.routePlanName == '采购员' && formData.planType==1) {
-                this.$message.error('请选择是否属于直达物资!')
-                return
-              } else {
-                if (formData.ifDirect == 1) {
-                  if (formData.ifInspection == null) {
-                    this.$message.error('请选择是否需要送检!')
-                    return
-                  }
-                }
-              }
-              this.passTask()
               this.handleSubmit(true)
-            }
-          }
-        })
       },
       // handler
       handleSubmit(e) {
@@ -1610,6 +1586,8 @@
                     }
                   }
                 }
+              }else if (e==true){
+                this.passTask()
               }
               console.log(formData, '格式化的数据')
               if (this.btndisabled === false) {