From 6a23869029068a05cef75c9ffe91f1e6192f6605 Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Mon, 6 Feb 2023 15:27:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E6=B5=81=E7=A8=8B=E4=B8=8A?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B6=E8=AF=95=E8=A1=A8=E6=A0=BC=EF=BC=8C?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E7=94=B3=E8=AF=B7=E3=80=81=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E3=80=81=E6=88=91=E7=9A=84=E5=B7=B2=E5=8A=9E?=
 =?UTF-8?q?=E3=80=81=E5=B7=B2=E7=BB=93=E6=9D=9F=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/applyList.vue                       | 3 +++
 src/views/activiti/doneManage.vue                      | 6 ++++++
 src/views/activiti/form/ProcessMaterialWarehousing.vue | 3 +++
 src/views/activiti/form/ProcessUdgetPlan.vue           | 4 +++-
 src/views/activiti/form/ProcessUdgetPlanForm.vue       | 8 ++++----
 src/views/activiti/processFinishManage.vue             | 3 +++
 src/views/activiti/processInsManage.vue                | 4 ++++
 7 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/views/activiti/applyList.vue b/src/views/activiti/applyList.vue
index 62f7c33..ce9f41c 100644
--- a/src/views/activiti/applyList.vue
+++ b/src/views/activiti/applyList.vue
@@ -162,6 +162,7 @@
     <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"
+                 :itemId="lcModa.itemId"
                  @afterSubmit="afterSub" @loadData="reloadData" @close="lcModa.visible=false,lcModa.disabled = false"></component>
 <!--       -->
     </a-modal>
@@ -335,6 +336,7 @@
           hieg: false,
           procInstId:'',
           pictureId:'',
+          itemId:'',
         },
         form:{
           priority:0,
@@ -495,6 +497,7 @@
         isView = isView||false;
         this.lcModa.disabled = isView;
         this.lcModa.hieg = isView;
+        this.lcModa.itemId=r.tableId
         this.lcModa.title = '修改流程业务信息：'+r.title;
         if (isView) this.lcModa.title = '查看流程业务信息：'+r.title;
         this.lcModa.formComponent = this.getFormComponent(r.routeName).component;
diff --git a/src/views/activiti/doneManage.vue b/src/views/activiti/doneManage.vue
index c4f5f4a..225b153 100644
--- a/src/views/activiti/doneManage.vue
+++ b/src/views/activiti/doneManage.vue
@@ -125,6 +125,7 @@
     <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"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
+                 :itemId="lcModa.itemId"
                  @close="lcModa.visible=false,lcModa.disabled = false"></component>
     </a-modal>
   </div>
@@ -176,6 +177,7 @@ export default {
         title:'',
         disabled:false,
         visible:false,
+        itemId:'',
         formComponent : null,
         isNew : false
       },
@@ -201,6 +203,9 @@ export default {
       });
     },
     removeHtmlStyle(str) {
+      if (!str){
+        return;
+      }
       str = str.replace(/<\/?[^>]*>/g, '');       //匹配所有html标签
 
       str = str.replace(/<p[^>]*>/g, '<p class="tag-class">'); //去除标签内所有属性，并设置自定义类名
@@ -237,6 +242,7 @@ export default {
         return;
       }
       this.lcModa.disabled = true
+      this.lcModa.itemId=r.tableId
       this.lcModa.title = '查看流程业务信息：' + r.processName
       this.lcModa.formComponent = this.getFormComponent(r.routeName).component
       this.lcModa.processData = r
diff --git a/src/views/activiti/form/ProcessMaterialWarehousing.vue b/src/views/activiti/form/ProcessMaterialWarehousing.vue
index fb52482..3bc3e57 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousing.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousing.vue
@@ -68,6 +68,9 @@
     },
     created() {
       console.log(this.itemId,"this.itemId")
+      if (this.itemId){
+        this.isTable=true
+      }
       this.$route.query.item=this.itemId
     },
     methods: {
diff --git a/src/views/activiti/form/ProcessUdgetPlan.vue b/src/views/activiti/form/ProcessUdgetPlan.vue
index f92f6d2..93c49ce 100644
--- a/src/views/activiti/form/ProcessUdgetPlan.vue
+++ b/src/views/activiti/form/ProcessUdgetPlan.vue
@@ -119,7 +119,9 @@
     //   }
     // },
     created() {
-      console.log(this.itemId,"this.itemId")
+      if (this.itemId){
+        this.isTable=true
+      }
        this.$route.query.item=this.itemId
     },
     methods: {
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 08d84b8..5934e3b 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -124,17 +124,17 @@
               <template v-slot:title="props">
                 <p v-for="(item,index) in historyBigId" :key="index">历史价格：{{ item }}</p>
               </template>
-              <a-button @mouseenter="chaKan(props)">查看</a-button>
+              <a-button @mouseenter="chaKan(props)" v-has="'udgePalan:view'">查看</a-button>
             </a-tooltip>
             <!--          <a-button @click="chaKan(props)">查看</a-button>-->
           </template>
           <template v-slot:actionPrice="props">
             <a-tooltip placement="top">
               <template v-slot:title="props">
-                <p v-for="(item,index) in historyPrices" :key="index">历史价格：{{ item.price }} 历史数量：{{item.quantity}}
+                <p v-for="(item,index) in historyPrices" :key="index" >历史价格：{{ item.price }} 历史数量：{{item.quantity}}
                   修改人：{{item.createBy_dictText}}</p>
               </template>
-              <a-button @mouseenter="seeHistoryPrice(props)">记录</a-button>
+              <a-button @mouseenter="seeHistoryPrice(props)" v-has="'udgePalan:hisotoryPrice'">记录</a-button>
             </a-tooltip>
             <!--          <a-button @click="chaKan(props)">查看</a-button>-->
           </template>
@@ -144,7 +144,7 @@
               <template v-slot:title="props">
                 库存数：{{ wateNumber }}
               </template>
-              <a-button @mouseenter="seeWateNumber(props)">库存</a-button>
+              <a-button @mouseenter="seeWateNumber(props)" v-has="'udgePalan:stock'">库存</a-button>
             </a-tooltip>
             <!--          <a-button @click="chaKan(props)">查看</a-button>-->
           </template>
diff --git a/src/views/activiti/processFinishManage.vue b/src/views/activiti/processFinishManage.vue
index 18b57e0..7b29149 100644
--- a/src/views/activiti/processFinishManage.vue
+++ b/src/views/activiti/processFinishManage.vue
@@ -136,6 +136,7 @@
     <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"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
+                 :itemId="lcModa.itemId"
                  @close="lcModa.visible=false,lcModa.disabled = false"></component>
     </a-modal>
   </div>
@@ -156,6 +157,7 @@ export default {
         title:'',
         disabled:false,
         visible:false,
+        itemId:'',
         formComponent : null,
         isNew : false
       },
@@ -231,6 +233,7 @@ export default {
         return;
       }
       console.log(r.id,'查看数据********')
+      this.lcModa.itemId=r.tableId
       this.lcModa.disabled = true;
       this.lcModa.title = '查看流程业务信息：'+r.name;
       this.lcModa.formComponent = this.getFormComponent(r.routeName).component;
diff --git a/src/views/activiti/processInsManage.vue b/src/views/activiti/processInsManage.vue
index f24a78b..4c19750 100644
--- a/src/views/activiti/processInsManage.vue
+++ b/src/views/activiti/processInsManage.vue
@@ -138,6 +138,7 @@
     <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"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew"  :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
+                 :itemId="lcModa.itemId"
                  @close="lcModa.visible=false,lcModa.disabled = false"></component>
     </a-modal>
     <a-modal title="流程操作记录" v-model="operatingRecord" :mask-closable="false" :width="'80%'" :footer="null">
@@ -159,6 +160,7 @@ export default {
     return {
       openSearch: true,
       openTip: true,
+
       loading: true, // 表单加载状态
       selectCount: 0, // 多选计数
       selectList: [], // 多选数据
@@ -197,6 +199,7 @@ export default {
         title:'',
         disabled:false,
         visible:false,
+        itemId:'',
         formComponent : null,
         isNew : false
       },
@@ -290,6 +293,7 @@ export default {
         );
         return;
       }
+      this.lcModa.itemId=r.tableId
       this.lcModa.disabled = true;
       this.lcModa.title = '查看流程业务信息：'+r.name;
       this.lcModa.formComponent = this.getFormComponent(r.routeName).component;