优化单据界面的账户和销售展示

jshERP-web/src/views/bill/dialog/BillDetail.vue

@@ -10,6 +10,11 @@
       @cancel="handleCancel"
       wrapClassName="ant-modal-cust-warp"
       style="top:5%;height: 100%;overflow-y: hidden">
+      <template slot="footer">
+        <a-button key="back" @click="handleCancel">
+          取消
+        </a-button>
+      </template>
       <a-form :form="form">
         <!--调拨出库-->
         <template v-if="billType === '调拨出库'">
@@ -544,11 +549,7 @@
                 {{model.number}}
               </a-form-item>
             </a-col>
-            <a-col :lg="6" :md="12" :sm="24">
+            <a-col :lg="6" :md="12" :sm="24"></a-col>
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
-                {{model.salesManStr}}
-              </a-form-item>
-            </a-col>
           </a-row>
           <a-table
             ref="table"
@@ -606,7 +607,7 @@
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="销售人员">
-                {{model.salesMan}}
+                {{model.salesManStr}}
               </a-form-item>
             </a-col>
           </a-row>

jshERP-web/src/views/bill/mixins/BillModalMixin.js

@@ -272,7 +272,7 @@ export const BillModalMixin = {
     },
     //改变优惠、本次付款、欠款的值
     autoChangePrice(target) {
-      let allTaxLastMoney = target.statisticsColumns.taxLastMoney
+      let allTaxLastMoney = target.statisticsColumns.taxLastMoney-0
       let discount = this.form.getFieldValue('discount')-0
       let otherMoney = this.form.getFieldValue('otherMoney')-0
       let discountMoney = (discount*0.01*allTaxLastMoney).toFixed(2)-0
@@ -285,6 +285,7 @@ export const BillModalMixin = {
     },
     //改变优惠率
     onKeyUpDiscount(e) {
+      debugger
       const value = e.target.value-0
       let discountMoney = this.form.getFieldValue('discountMoney')-0
       let discountLastMoney = this.form.getFieldValue('discountLastMoney')-0

jshERP-web/src/views/bill/modules/PurchaseBackModal.vue

@@ -73,7 +73,7 @@
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
-                <a-input placeholder="请选择其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
+                <a-input placeholder="请输入其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
               </a-form-item>
             </a-col>
           </a-row>

jshERP-web/src/views/bill/modules/SaleBackModal.vue

@@ -73,7 +73,7 @@
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
-                <a-input placeholder="请选择其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
+                <a-input placeholder="请输入其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
               </a-form-item>
             </a-col>
           </a-row>
@@ -204,7 +204,7 @@
         } else {
           this.model.operTime = this.model.operTimeStr
           this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)
-          if(this.model.accountId == null) {
+          if(this.model.accountId == null || this.model.accountId == 0) {
             this.model.accountId = 0
             this.manyAccountBtnStatus = true
             this.accountIdList = this.model.accountIdList
@@ -239,6 +239,11 @@
         }
         billMain.totalPrice = 0-totalPrice
         billMain.changeAmount = 0-billMain.changeAmount
+        if(billMain.accountId === 0) {
+          billMain.accountId = ''
+        }
+        billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : ""
+        billMain.accountMoneyList = this.accountMoneyList.length>0 ? JSON.stringify(this.accountMoneyList) : ""
         if(this.model.id){
           billMain.id = this.model.id
         }

jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -62,7 +62,7 @@
           <a-row class="form-row" :gutter="24">
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="优惠率">
-                <a-input placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
+                <a-input style="width:185px;" placeholder="请输入优惠率" v-decorator.trim="[ 'discount' ]" suffix="%" @keyup="onKeyUpDiscount"/>
               </a-form-item>
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
@@ -77,7 +77,7 @@
             </a-col>
             <a-col :lg="6" :md="12" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="其它费用">
-                <a-input placeholder="请选择其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
+                <a-input placeholder="请输入其它费用" v-decorator.trim="[ 'otherMoney' ]" @keyup="onKeyUpOtherMoney"/>
               </a-form-item>
             </a-col>
           </a-row>

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

@@ -49,20 +49,27 @@
       :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 {findBySelectCus, findSupplierById, findDepotHeadTotalPay, findAccountHeadTotalPay} from '@/api/api'
+  import {findBySelectCus, findSupplierById, findDepotHeadTotalPay, findAccountHeadTotalPay, findBillDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   export default {
     name: "BuyInReport",
     mixins:[JeecgListMixin],
     components: {
+      BillDetail,
       JEllipsis
     },
     data () {
@@ -94,7 +101,10 @@
               return parseInt(index)+1;
             }
           },
-          {title: '单据编号', dataIndex: 'number', width: 140},
+          {
+            title: '单据编号', dataIndex: 'number', width: 140,
+            scopedSlots: { customRender: 'numberCustomRender' },
+          },
           {title: '类型', dataIndex: 'type', width: 100},
           {title: '单位名称', dataIndex: 'supplierName', width: 200},
           {title: '单据金额', dataIndex: 'billMoney', width: 80},
@@ -177,6 +187,13 @@
       searchQuery() {
         this.loadData(1);
         this.initStatistics();
+      },
+      myHandleDetail(record) {
+        findBillDetailByNumber({ number: record.number }).then((res) => {
+          if (res && res.code === 200) {
+            this.handleDetail(res.data, record.type);
+          }
+        })
       }
     }
   }

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

@@ -49,20 +49,27 @@
       :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 {findBySelectSup, findSupplierById, findDepotHeadTotalPay, findAccountHeadTotalPay} from '@/api/api'
+  import {findBySelectSup, findSupplierById, findDepotHeadTotalPay, findAccountHeadTotalPay, findBillDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   export default {
     name: "BuyInReport",
     mixins:[JeecgListMixin],
     components: {
+      BillDetail,
       JEllipsis
     },
     data () {
@@ -94,7 +101,10 @@
               return parseInt(index)+1;
             }
           },
-          {title: '单据编号', dataIndex: 'number', width: 140},
+          {
+            title: '单据编号', dataIndex: 'number', width: 140,
+            scopedSlots: { customRender: 'numberCustomRender' },
+          },
           {title: '类型', dataIndex: 'type', width: 100},
           {title: '单位名称', dataIndex: 'supplierName', width: 200},
           {title: '单据金额', dataIndex: 'billMoney', width: 80},
@@ -177,6 +187,13 @@
       searchQuery() {
         this.loadData(1);
         this.initStatistics();
+      },
+      myHandleDetail(record) {
+        findBillDetailByNumber({ number: record.number }).then((res) => {
+          if (res && res.code === 200) {
+            this.handleDetail(res.data, record.type);
+          }
+        })
       }
     }
   }