Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-mini-web

src/locale/lang/zh-CN.js

@@ -619,7 +619,8 @@ export const columns = {
   purchase:'采购订单',
   purEnter:'采购入库单',
   purReturn:'采购退货单',
-  purPay:'收款单',
+  purPay:'付款单',
+  BillInformation:'账单信息',
   orderTrack:'销售跟踪',
   ordchase:'销售订单',
   outbound:'出库单',

src/view/pur/pur-enter/index.vue

@@ -108,7 +108,7 @@
       </div>
       <div slot="bottom">
         <DkTabs v-model="tabsModel" :options="detailTabsOptions" @on-click="tabsClick"></DkTabs>
-        <!-- 货物明细-->
+        <!-- 待入库货物明细-->
         <div v-show="standardGoodsFlag">
           <DkTable ref="standardGoodsFlag"
                    primaryKey="itemId"
@@ -123,7 +123,7 @@
                    :pageTotalFlag="false"
                    v-if="this.tableModel === 'waitEntry'">
             <!-- 来源单号-->
-            <DkTableColumn field="fromNo"></DkTableColumn>
+            <DkTableColumn field="purNo" :title="$t('fromNo')"></DkTableColumn>
             <!-- 商品型号-->
             <DkTableColumn field="skuModel" :filter="false"></DkTableColumn>
             <!-- 商品名称-->
@@ -144,6 +144,7 @@
             <DkTableColumn field="remarks"></DkTableColumn>
           </DkTable>
 
+          <!-- 已入库货物明细-->
           <DkTable ref="standardGoodsFlag"
                    primaryKey="itemId"
                    :showCheckboxHeader="false"
@@ -157,7 +158,7 @@
                    :pageTotalFlag="false"
                    v-if="this.tableModel === 'ingEntry'">
             <!-- 来源单号-->
-            <DkTableColumn field="fromNo"></DkTableColumn>
+            <DkTableColumn field="purNo" :title="$t('fromNo')"></DkTableColumn>
             <!-- 商品型号-->
             <DkTableColumn field="skuModel" :filter="false"></DkTableColumn>
             <!-- 商品名称-->

src/view/pur/pur-track-report/index.vue

@@ -173,10 +173,10 @@
         </div>
       </DkPanel>
     </DkCollapse>
-    <!--    订单收款-->
+    <!--    订单付款-->
     <DkCollapse @on-change="changeCollapse" ref="collapse" v-if="this.tabsModel ==='purPay'">
       <!--商品信息-->
-      <DkPanel prop="goodsInformation">
+      <DkPanel prop="BillInformation">
         <div id="pur-pay" ref="pur-pay" slot="content">
           <EditTable v-if="purPayFlag"
                      ref="purReturnable"
@@ -382,7 +382,24 @@ export default {
       ],
 
       purPayData:[],//订单收款
-      purPayColumns:[],
+      purPayColumns:[
+        {
+          field: 'intoNo',
+          type: 'disabled',
+        },//入库单号
+        {
+          field: 'amtPayableHandle',
+          type: 'disabled',
+        },//核销金额
+        {
+          field: 'amtWaive',
+          type: 'disabled',
+        },//优惠金额
+        {
+          field: 'accDate',
+          type: 'disabled',
+        },//账务日期
+      ],
 
       purNo: null,//采购订单号
       purEntryVOList: [],//入库
@@ -411,6 +428,7 @@ export default {
     tabsClick(val) {
       this.purEntryFlag = false
       this.purReturnFlag = false
+      this.purPayFlag = false
       //如果切换的tab存在就去根据条件查询
       if (val) {
         this.totalTab = val
@@ -419,6 +437,7 @@ export default {
             this.purFlag = true;
             this.purEntryFlag = false;
             this.purReturnFlag = false;
+            this.purPayFlag = false;
           }, 100)
         }
         else if(val == 'purEnter'){
@@ -426,6 +445,7 @@ export default {
             this.purFlag = false;
             this.purEntryFlag = true;
             this.purReturnFlag = false;
+            this.purPayFlag = false;
           }, 100)
         }
         else if(val == 'purReturn'){
@@ -433,6 +453,15 @@ export default {
             this.purFlag = false;
             this.purEntryFlag = false;
             this.purReturnFlag = true;
+            this.purPayFlag= false;
+          }, 100)
+        }
+        else if(val == 'purPay'){
+          setTimeout(() => {
+            this.purFlag = false;
+            this.purEntryFlag = false;
+            this.purReturnFlag = false;
+            this.purPayFlag= true;
           }, 100)
         }