From 5e9000158bd26ccccb7ded40fc3cf5a22614ba90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 1 Jun 2022 23:21:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E9=80=89=E6=8B=A9=E6=AC=A0=E6=AC=BE?=
 =?UTF-8?q?=E6=88=96=E8=80=85=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/dialog/LinkBillList.vue    | 22 ++++++++++++++++-
 .../views/financial/dialog/DebtBillList.vue   | 24 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/LinkBillList.vue b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
index f0d6cc2d..480fefab 100644
--- a/jshERP-web/src/views/bill/dialog/LinkBillList.vue
+++ b/jshERP-web/src/views/bill/dialog/LinkBillList.vue
@@ -57,6 +57,9 @@
       :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: getType}"
       :customRow="rowAction"
       @change="handleTableChange">
+      <span slot="numberCustomRender" slot-scope="text, record">
+        <a @click="myHandleDetail(record)">{{record.number}}</a>
+      </span>
       <template slot="customRenderStatus" slot-scope="text, record">
         <template v-if="!queryParam.purchaseStatus">
           <a-tag v-if="record.status === '0'" color="red">未审核</a-tag>
@@ -85,17 +88,22 @@
       @change="handleTableChange">
     </a-table>
     <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <bill-detail ref="billDetail"></bill-detail>
   </a-modal>
 </template>
 
 <script>
+  import BillDetail from './BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { findBillDetailByNumber } from '@/api/api'
   import { getAction } from '@/api/manage'
   import Vue from 'vue'
   export default {
     name: 'LinkBillList',
     mixins:[JeecgListMixin],
     components: {
+      BillDetail
     },
     data () {
       return {
@@ -131,7 +139,9 @@
         // 表头
         columns: [
           { title: '', dataIndex: 'organName',width:120, ellipsis:true},
-          { title: '单据编号', dataIndex: 'number',width:150},
+          { title: '单据编号', dataIndex: 'number',width:150,
+            scopedSlots: { customRender: 'numberCustomRender' },
+          },
           { title: '商品信息', dataIndex: 'materialsList',width:280, ellipsis:true,
             customRender:function (text,record,index) {
               if(text) {
@@ -209,6 +219,16 @@
         this.visible = true;
         this.loadData(1)
       },
+      myHandleDetail(record) {
+        findBillDetailByNumber({ number: record.number }).then((res) => {
+          if (res && res.code === 200) {
+            let type = res.data.depotHeadType
+            type = type.replace('其它','')
+            this.$refs.billDetail.show(res.data, type)
+            this.$refs.billDetail.title=type+"-详情"
+          }
+        })
+      },
       close () {
         this.$emit('close');
         this.visible = false;
diff --git a/jshERP-web/src/views/financial/dialog/DebtBillList.vue b/jshERP-web/src/views/financial/dialog/DebtBillList.vue
index c23b3fd9..c694e889 100644
--- a/jshERP-web/src/views/financial/dialog/DebtBillList.vue
+++ b/jshERP-web/src/views/financial/dialog/DebtBillList.vue
@@ -57,17 +57,27 @@
       :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: getType}"
       :customRow="rowAction"
       @change="handleTableChange">
+      <span slot="numberCustomRender" slot-scope="text, record">
+        <a @click="myHandleDetail(record)">{{record.number}}</a>
+      </span>
     </a-table>
     <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-modal>
 </template>
 
 <script>
+  import BillDetail from '../../bill/dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { findBillDetailByNumber } from '@/api/api'
   import Vue from 'vue'
   export default {
     name: 'DebtBillList',
     mixins:[JeecgListMixin],
+    components: {
+      BillDetail
+    },
     data () {
       return {
         title: "操作",
@@ -107,7 +117,10 @@
             }
           },
           { title: '', dataIndex: 'organName',width:120},
-          { title: '单据编号', dataIndex: 'number',width:120},
+          {
+            title: '单据编号', dataIndex: 'number', width: 120,
+            scopedSlots: { customRender: 'numberCustomRender' },
+          },
           { title: '商品信息', dataIndex: 'materialsList',width:200, ellipsis:true,
             customRender:function (text,record,index) {
               if(text) {
@@ -161,6 +174,15 @@
         this.ipagination.pageSizeOptions = ['100', '200', '300']
         this.loadData(1)
       },
+      myHandleDetail(record) {
+        findBillDetailByNumber({ number: record.number }).then((res) => {
+          if (res && res.code === 200) {
+            let type = res.data.depotHeadType
+            type = type.replace('其它','')
+            this.handleDetail(res.data, type)
+          }
+        })
+      },
       close () {
         this.$emit('close');
         this.visible = false;