From 0d64352950217e847648726ae864f9c9b4eaad4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 4 Jul 2021 23:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8D=95=E5=8F=B7=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=BC=B9=E5=87=BA=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/mixins/JeecgListMixin.js       |  2 +-
 .../src/views/bill/dialog/BillDetail.vue      | 20 ++++++++++++----
 .../financial/dialog/FinancialDetail.vue      | 23 ++++++++++++++++++-
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index 3c0d70f6..39b09f21 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -259,7 +259,7 @@ export const JeecgListMixin = {
     },
     handleDetail:function(record, type){
       this.$refs.modalDetail.show(record, type);
-      this.$refs.modalDetail.title="详情";
+      this.$refs.modalDetail.title=type+"-详情";
     },
     /* 导出 */
     handleExportXls2(){
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index dfd3ef6f..03a3abd8 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -243,7 +243,7 @@
                 </a-col>
                 <a-col :span="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
-                    {{model.linkNumber}}
+                    <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -328,7 +328,7 @@
                 </a-col>
                 <a-col :span="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
-                    {{model.linkNumber}}
+                    <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -453,7 +453,7 @@
                 </a-col>
                 <a-col :span="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
-                    {{model.linkNumber}}
+                    <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -597,7 +597,7 @@
                 </a-col>
                 <a-col :span="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联单据">
-                    {{model.linkNumber}}
+                    <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -729,7 +729,7 @@
                 </a-col>
                 <a-col :span="6">
                   <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="关联订单">
-                    {{model.linkNumber}}
+                    <a @click="myHandleDetail(model.linkNumber)">{{model.linkNumber}}</a>
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -817,6 +817,7 @@
 <script>
   import pick from 'lodash.pick'
   import { getAction } from '@/api/manage'
+  import { findBillDetailByNumber} from '@/api/api'
   import { getMpListShort } from "@/utils/util"
   import Vue from 'vue'
   export default {
@@ -1095,6 +1096,15 @@
       close() {
         this.$emit('close');
         this.visible = false;
+      },
+      myHandleDetail(billNumber) {
+        findBillDetailByNumber({ number: billNumber }).then((res) => {
+          if (res && res.code === 200) {
+            let type = res.data.type === "其它"? "":res.data.type
+            this.show(res.data, res.data.subType + type);
+            this.title = res.data.subType + type + "-详情";
+          }
+        })
       }
     }
   }
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index 8fd1a874..497a323a 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -288,6 +288,9 @@
               :pagination="false"
               :columns="moneyInColumns"
               :dataSource="dataSource">
+              <span slot="numberCustomRender" slot-scope="text, record">
+                <a @click="myHandleDetail(record)">{{record.billNumber}}</a>
+              </span>
             </a-table>
             <a-row class="form-row" :gutter="24">
               <a-col :lg="24" :md="24" :sm="24">
@@ -402,13 +405,20 @@
         </template>
       </a-form>
     </j-modal>
+    <!-- 表单区域 -->
+    <bill-detail ref="modalDetail"></bill-detail>
   </a-card>
 </template>
 <script>
   import pick from 'lodash.pick'
+  import BillDetail from '../../bill/dialog/BillDetail'
   import { getAction } from '@/api/manage'
+  import { findBillDetailByNumber} from '@/api/api'
   export default {
     name: 'FinancialDetail',
+    components: {
+      BillDetail
+    },
     data () {
       return {
         title: "详情",
@@ -452,7 +462,10 @@
           { title: '备注',dataIndex: 'remark', width: '30%'}
         ],
         moneyInColumns: [
-          { title: '销售单据编号',dataIndex: 'billNumber',width: '20%'},
+          {
+            title: '销售单据编号', dataIndex: 'billNumber', width: '20%',
+            scopedSlots: { customRender: 'numberCustomRender' },
+          },
           { title: '应收欠款',dataIndex: 'needDebt', width: '10%'},
           { title: '已收欠款',dataIndex: 'finishDebt', width: '10%'},
           { title: '本次收款',dataIndex: 'eachAmount', width: '10%'},
@@ -514,6 +527,14 @@
       close() {
         this.$emit('close');
         this.visible = false;
+      },
+      myHandleDetail(record) {
+        findBillDetailByNumber({ number: record.billNumber }).then((res) => {
+          if (res && res.code === 200) {
+            this.$refs.modalDetail.show(res.data, res.data.subType + res.data.type);
+            this.$refs.modalDetail.title= res.data.subType + res.data.type + "-详情";
+          }
+        })
       }
     }
   }