优化根据单据编号查看单据明细的功能

jshERP-web/src/views/financial/ItemOutList.vue

@@ -57,7 +57,7 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a @click="myHandleDetail(record, 'itemOut')">查看</a>
+          <a @click="myHandleDetail(record, '支出')">查看</a>
           <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />

jshERP-web/src/views/financial/MoneyInList.vue

@@ -57,7 +57,7 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a @click="myHandleDetail(record, 'moneyIn')">查看</a>
+          <a @click="myHandleDetail(record, '收款')">查看</a>
           <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />

jshERP-web/src/views/financial/MoneyOutList.vue

@@ -57,7 +57,7 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a @click="myHandleDetail(record, 'moneyOut')">查看</a>
+          <a @click="myHandleDetail(record, '付款')">查看</a>
           <a-divider type="vertical" />
           <a @click="myHandleEdit(record)">编辑</a>
           <a-divider type="vertical" />

jshERP-web/src/views/financial/dialog/FinancialDetail.vue

@@ -12,7 +12,7 @@
       style="top:5%;height: 100%;overflow-y: hidden">
       <a-form :form="form">
         <!--收预付款-->
-        <template v-if="financialType === 'advanceIn'">
+        <template v-if="financialType === '收预付款'">
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款会员">
@@ -54,7 +54,7 @@
           </a-row>
         </template>
         <!--转账-->
-        <template v-if="financialType === 'giro'">
+        <template v-if="financialType === '转账'">
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
@@ -106,7 +106,7 @@
           </a-row>
         </template>
         <!--收入-->
-        <template v-if="financialType === 'itemIn'">
+        <template v-if="financialType === '收入'">
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
@@ -162,7 +162,7 @@
           </a-row>
         </template>
         <!--支出-->
-        <template v-if="financialType === 'itemOut'">
+        <template v-if="financialType === '支出'">
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
@@ -218,7 +218,7 @@
           </a-row>
         </template>
         <!--收款-->
-        <template v-if="financialType === 'moneyIn'">
+        <template v-if="financialType === '收款'">
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款单位">
@@ -270,7 +270,7 @@
           </a-row>
         </template>
         <!--付款-->
-        <template v-if="financialType === 'moneyOut'">
+        <template v-if="financialType === '付款'">
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款单位">

jshERP-web/src/views/report/InDetail.vue

@@ -61,21 +61,28 @@
       :pagination="ipagination"
       :loading="loading"
       @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-card>
 </template>
 <script>
+  import BillDetail from '../bill/dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatMonth } from '@/utils/util';
   import {getAction} from '@/api/manage'
-  import {findBySelectSup} from '@/api/api'
+  import {findBySelectSup, findBillDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   export default {
     name: "BuyInReport",
     mixins:[JeecgListMixin],
     components: {
+      BillDetail,
       JEllipsis
     },
     data () {
@@ -107,7 +114,10 @@
               return parseInt(index)+1;
             }
           },
-          {title: '单据编号', dataIndex: 'number', width: 140},
+          {
+            title: '单据编号', dataIndex: 'number', width: 140,
+            scopedSlots: { customRender: 'numberCustomRender' },
+          },
           {title: '名称', dataIndex: 'mname', width: 120},
           {title: '规格', dataIndex: 'standard', width: 100},
           {title: '型号', dataIndex: 'model', width: 100},
@@ -172,6 +182,13 @@
             this.$message.info(res.data);
           }
         })
+      },
+      myHandleDetail(record) {
+        findBillDetailByNumber({ number: record.number }).then((res) => {
+          if (res && res.code === 200) {
+            this.handleDetail(res.data, record.newType);
+          }
+        })
       }
     }
   }

jshERP-web/src/views/report/OutDetail.vue

@@ -61,21 +61,28 @@
       :pagination="ipagination"
       :loading="loading"
       @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-card>
 </template>
 <script>
+  import BillDetail from '../bill/dialog/BillDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatMonth } from '@/utils/util';
   import {getAction} from '@/api/manage'
-  import {findBySelectCus} from '@/api/api'
+  import {findBySelectCus, findBillDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   export default {
     name: "BuyInReport",
     mixins:[JeecgListMixin],
     components: {
+      BillDetail,
       JEllipsis
     },
     data () {
@@ -107,7 +114,10 @@
               return parseInt(index)+1;
             }
           },
-          {title: '单据编号', dataIndex: 'number', width: 140},
+          {
+            title: '单据编号', dataIndex: 'number', width: 140,
+            scopedSlots: { customRender: 'numberCustomRender' },
+          },
           {title: '名称', dataIndex: 'mname', width: 120},
           {title: '规格', dataIndex: 'standard', width: 100},
           {title: '型号', dataIndex: 'model', width: 100},
@@ -172,6 +182,13 @@
             this.$message.info(res.data);
           }
         })
+      },
+      myHandleDetail(record) {
+        findBillDetailByNumber({ number: record.number }).then((res) => {
+          if (res && res.code === 200) {
+            this.handleDetail(res.data, record.newType);
+          }
+        })
       }
     }
   }

jshERP-web/src/views/report/modules/AccountInOutList.vue

@@ -18,25 +18,38 @@
       :pagination="ipagination"
       :loading="loading"
       @change="handleTableChange">
+      <span slot="numberCustomRender" slot-scope="text, record">
+        <a @click="myHandleDetail(record)">{{record.number}}</a>
+      </span>
     </a-table>
     <!-- table区域-end -->
+    <!-- 表单区域 -->
+    <bill-detail ref="billDetail"></bill-detail>
+    <financial-detail ref="financialDetail"></financial-detail>
   </a-modal>
 </template>
 <script>
+  import BillDetail from '../../bill/dialog/BillDetail'
+  import FinancialDetail from '../../financial/dialog/FinancialDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import JEllipsis from '@/components/jeecg/JEllipsis'
-  import {getAction} from '@/api/manage'
+  import {findBillDetailByNumber, findFinancialDetailByNumber} from '@/api/api'
   export default {
     name: "AccountInOutList",
     mixins:[JeecgListMixin],
     components: {
-      JEllipsis
+      BillDetail,
+      FinancialDetail,
+      JEllipsis,
+      findBillDetailByNumber,
+      findFinancialDetailByNumber
     },
     data () {
       return {
         title:"操作",
         visible: false,
         disableMixinCreated: false,
+        toFromType: '',
         // 查询条件
         queryParam: {
           accountId:'',
@@ -55,7 +68,10 @@
               return parseInt(index)+1;
             }
           },
-          { title: '单据编号', dataIndex: 'number', width: 150},
+          {
+            title: '单据编号', dataIndex: 'number', width: 150,
+            scopedSlots: { customRender: 'numberCustomRender' },
+          },
           { title: '类型', dataIndex: 'type', width: 100},
           { title: '单位信息', dataIndex: 'supplierName', width: 150},
           { title: '金额', dataIndex: 'changeAmount', width: 80},
@@ -115,6 +131,25 @@
       },
       handleCancel () {
         this.close()
+      },
+      myHandleDetail(record) {
+        let that = this
+        this.toFromType = record.fromType
+        if(record.fromType === 'bill') {
+          findBillDetailByNumber({ number: record.number }).then((res) => {
+            if (res && res.code === 200) {
+              that.$refs.billDetail.show(res.data, record.type);
+              that.$refs.billDetail.title="详情";
+            }
+          })
+        } else if(record.fromType === 'financial') {
+          findFinancialDetailByNumber({ billNo: record.number }).then((res) => {
+            if (res && res.code === 200) {
+              that.$refs.financialDetail.show(res.data, record.type);
+              that.$refs.financialDetail.title="详情";
+            }
+          })
+        }
       }
     }
   }

jshERP-web/vue.config.js

@@ -5,38 +5,8 @@ function resolve (dir) {
     return path.join(__dirname, dir)
 }
 
-let objectProject = {
-    index: {
-        entry: 'src/main.js', // page 的入口
-        template: 'public/index.html', // 模板来源
-        filename: 'index.html', // 在 dist/index.html 的输出
-        // 当使用 title 选项时，template 中的 title 标签需要是 <title><%= htmlWebpackPlugin.options.title %></title>
-        title: 'Index Page',
-        // 在这个页面中包含的块，默认情况下会包含,提取出来的通用 chunk 和 vendor chunk。
-        chunks: ['chunk-vendors', 'chunk-common', 'index']
-    }
-}
-let page = {}
-let projectname = process.argv[3] // 获取执行哪个文件
-if (process.env.NODE_ENV === 'development') {
-    page = objectProject
-} else {
-    page[projectname] = objectProject[projectname]
-}
-let publicPathStr, dirStr
-if (projectname === undefined || projectname === 'index') {
-    publicPathStr = '/'
-    dirStr = 'dist'
-} else {
-    publicPathStr = './'
-    dirStr = 'dist/plugin/' + projectname
-}
-
 // vue.config.js
 module.exports = {
-    outputDir: dirStr, // 标识是打包哪个文件
-    filenameHashing: true,
-    pages: page,
     /*
       Vue-cli3:
       Crashed when using Webpack `import()` #2463
@@ -44,8 +14,6 @@ module.exports = {
      */
     // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
     productionSourceMap: false,
-    // 静态文件的路径前缀
-    publicPath: publicPathStr,
     configureWebpack: config => {
     // 生产环境取消 console.log
         if (process.env.NODE_ENV === 'production') {