From beb9e876e5db5568623593f0c0fa18277ef98401 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Thu, 3 Nov 2022 15:57:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/mixins/activitiMixin.js    |  4 ++++
 src/views/activiti/processInsManage.vue       | 16 +++++++++------
 .../operationlog/ProcessOperationLogList.vue  | 20 +++++++++++--------
 .../ProcessWasteMaterialsLists.vue            |  4 ++--
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/views/activiti/mixins/activitiMixin.js b/src/views/activiti/mixins/activitiMixin.js
index c8a2f60..2f32b5b 100644
--- a/src/views/activiti/mixins/activitiMixin.js
+++ b/src/views/activiti/mixins/activitiMixin.js
@@ -82,6 +82,10 @@ export const activitiMixin = {
     },
     historicDetail:function () {
       return () => import(`@/views/activiti/historicDetail`)
+    },
+    //流程操作记录显示地址
+    operatingRecordDetail:function (){
+      return () => import('@/views/operationlog/ProcessOperationLogList')
     }
   },
   methods:{
diff --git a/src/views/activiti/processInsManage.vue b/src/views/activiti/processInsManage.vue
index 11f463f..181387a 100644
--- a/src/views/activiti/processInsManage.vue
+++ b/src/views/activiti/processInsManage.vue
@@ -142,6 +142,11 @@
                  :processData="lcModa.processData" :isNew = "lcModa.isNew"
                  @close="lcModa.visible=false,lcModa.disabled = false"></component>
     </a-modal>
+    <a-modal title="流程操作记录" v-model="operatingRecord" :mask-closable="false" :width="'80%'" :footer="null">
+      <div v-if="operatingRecord">
+        <component :is="operatingRecordDetail" :tableId="tableId"></component>
+      </div>
+    </a-modal>
   </div>
 </template>
 
@@ -187,6 +192,9 @@ export default {
       },
       modalLsVisible: false,
       procInstId: '',
+      //用于控制流程操作记录的显示
+      operatingRecord: false,
+      tableId: '',
       lcModa: {
         title:'',
         disabled:false,
@@ -274,12 +282,8 @@ export default {
         this.$message.error("流程主表id不存在");
         return;
       }
-      this.lcModa.disabled = true;
-      this.lcModa.title = '查看流程业务信息：'+v.name;
-      this.lcModa.formComponent = this.getFormComponent(v.routeName).component;
-      this.lcModa.processData = v;
-      this.lcModa.isNew = false;
-      this.lcModa.visible = true;
+      this.tableId = v.tableId;
+      this.operatingRecord = true;
     },
     detail(r) {
       if (!r.routeName) {
diff --git a/src/views/operationlog/ProcessOperationLogList.vue b/src/views/operationlog/ProcessOperationLogList.vue
index 9697cf4..00311d1 100644
--- a/src/views/operationlog/ProcessOperationLogList.vue
+++ b/src/views/operationlog/ProcessOperationLogList.vue
@@ -48,6 +48,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ProcessOperationLogModal from './modules/ProcessOperationLogModal'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import { getAction } from '@api/manage'
 
   export default {
     name: 'ProcessOperationLogList',
@@ -56,8 +57,18 @@
       ProcessOperationLogModal,
       JSuperQuery,
     },
+    props: {
+      tableId: {
+        type: String,
+        default: '',
+        required: true
+      },
+    },
     data () {
       return {
+        queryParam: {
+          processRelevanceId: this.tableId
+        },
         description: '流程操作记录',
         // 表头
         columns: [
@@ -88,14 +99,6 @@
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
             }
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
           }
         ],
         url: {
@@ -119,6 +122,7 @@
       },
     },
     methods: {
+
       initDictConfig(){
       },
       getSuperFieldList(){
diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
index 252126f..b797be7 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsLists.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
@@ -232,7 +232,7 @@
           {
             title:'单价(元)',
             align:"center",
-            dataIndex: 'price'
+            dataIndex: 'materialPrice'
           },
           {
             title:'金额(元)',
@@ -369,7 +369,7 @@
         fieldList.push({type:'string',value:'freightSpace',text:'库存仓位',dictCode:''})
         fieldList.push({type:'string',value:'materialsUnit',text:'计量单位',dictCode:''})
         fieldList.push({type:'int',value:'materialQuantity',text:'数量',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'materialPrice',text:'单价',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'materialAmount',text:'金额',dictCode:''})
         fieldList.push({type:'date',value:'productionDate',text:'生产日期'})
         fieldList.push({type:'String',value:'expirationDate',text:'保质期'})