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

src/locale/lang/zh-CN.js

@@ -632,6 +632,9 @@ export const columns = {
   outbound:'出库单',
   macname:'资金账户',
   amtinflow:'发生额',
+  ordOutReturn:'退货单',
+  ordRecPay:'收款单',
+  priceOther:'其他价格',
 }
 
 /**

src/view/mst/goods/form.vue

@@ -90,6 +90,10 @@
           <DkFormItem prop="priceLimited">
             <InputNumberPop ref="priceLimited" v-model="formData.priceLimited"/>
           </DkFormItem>
+          <!--其他售价-->
+          <DkFormItem prop="priceOther">
+            <InputNumberPop ref="priceOther" v-model="formData.priceOther"/>
+          </DkFormItem>
         </DkForm>
       </DkPanel>
       <DkPanel prop="invInto" v-show="false">
@@ -161,6 +165,7 @@ export default {
         priceStandard : null, //零售价
         priceWholesale : null,//批发价
         priceLimited : null, //销售售价
+        priceOther : null, //其他价
         remarks: null,
       },
     }

src/view/mst/goods/index.vue

@@ -49,10 +49,11 @@
           <DkTableColumn field="seriesName"></DkTableColumn>
           <DkTableColumn field="brandName"></DkTableColumn>
           <DkTableColumn field="shortName"></DkTableColumn>
-          <DkTableColumn field="pricePurchase"></DkTableColumn>
-          <DkTableColumn field="priceStandard"></DkTableColumn>
-          <DkTableColumn field="priceWholesale"></DkTableColumn>
-          <DkTableColumn field="priceLimited"></DkTableColumn>
+          <DkTableColumn field="pricePurchase" dataType="number"></DkTableColumn>
+          <DkTableColumn field="priceStandard" dataType="number"></DkTableColumn>
+          <DkTableColumn field="priceWholesale" dataType="number"></DkTableColumn>
+          <DkTableColumn field="priceLimited" dataType="number"></DkTableColumn>
+          <DkTableColumn field="priceOther" dataType="number"></DkTableColumn>
           <DkTableColumn field="remarks"></DkTableColumn>
           <DkTableColumn field="flgValid" type="switch" ></DkTableColumn>
         </DkTable>

src/view/sale/order-track-report/index.vue

@@ -1,4 +1,4 @@
-<!-- @desc:采购跟踪  @auth:常皓宁  @time:2024/04/22 09:15 -->
+<!-- @desc:销售跟踪  @auth:宋扬  @time:2024/04/22 09:15 -->
 <template>
   <div slot="top" style="margin-left: 5px;">
     <DkTabs v-model="tabsModel" :options="tabsOptions" @on-click="tabsClick"></DkTabs>
@@ -180,8 +180,8 @@
         <DkForm slot="content" ref="formInline" v-model="ordOutReturnData"
                 style="width:100%" :label-max-words="5">
           <!--出库单号-->
-          <DkFormItem prop="outNo">
-            <InputPop ref="outNo" v-model="ordOutReturnData.outNo" :readonly="true"/>
+          <DkFormItem prop="outNo"  >
+            <InputPop ref="outNo" v-model="ordOutReturnData.outNo" :readonly="true" />
           </DkFormItem>
           <!--客户电话-->
           <DkFormItem prop="cusPhone">
@@ -221,14 +221,14 @@
           </DkFormItem>
           <!--出库日期-->
           <DkFormItem prop="outDate" :data-type="$config.dataType.date">
-            <DatePickerPop v-model="ordOutReturnData.outDate" :readonly="true"/>
+            <DatePickerPop v-model="ordOutReturnData.outDate" :readonly="true" />
           </DkFormItem>
           <!--总出库中数量-->
           <DkFormItem prop="outingQtySum" >
             <InputNumber ref="outingQtySum" v-model="ordOutReturnData.outingQtySum" :readonly="true"/>
           </DkFormItem>
           <!--总已出库数量-->
-          <DkFormItem prop="outQtySum">
+          <DkFormItem prop="outQtySum" >
             <InputNumber ref="outQtySum" v-model="ordOutReturnData.outQtySum" :readonly="true"/>
           </DkFormItem>
           <!--单据备注-->
@@ -253,19 +253,55 @@
         </div>
       </DkPanel>
     </DkCollapse>
-
-
-    <!--    订单收款-->
-    <DkCollapse @on-change="changeCollapse" ref="collapse" v-if="this.tabsModel ==='purPay'">
-      <!--商品信息-->
-      <DkPanel prop="goodsInformation">
-        <div id="pur-pay" ref="pur-pay" slot="content">
-          <EditTable v-if="purPayFlag"
-                     ref="purReturnable"
-                     majorField="retuenItemId"
-                     :data="purPayData"
-                     :columns="purPayColumns"
-                     :height="400"
+    <!--   订单收款-->
+    <DkCollapse @on-change="changeCollapse" ref="collapse" v-if="this.tabsModel ==='ordRecPay' ">
+      <DkTabs v-model="tabsModelRecPay" :options="tabsOptionsRecPay" @on-click="tabsClickRecPay"></DkTabs>
+      <DkPanel prop="essentialInformation">
+        <!--  单据信息  -->
+        <DkForm slot="content" ref="formInline" v-model="ordRecPayData"
+                style="width:100%" :label-max-words="5">
+          <!--收款单号-->
+          <DkFormItem prop="rpNo">
+            <InputPop ref="rpNo" v-model="ordRecPayData.rpNo" :readonly="true"/>
+          </DkFormItem>
+          <!--收款类型-->
+          <DkFormItem prop="receiptType">
+            <InputPop ref="receiptType" v-model="ordRecPayData.receiptType" :readonly="true"/>
+          </DkFormItem>
+          <!--客户电话-->
+          <DkFormItem prop="cusPhone">
+            <InputPop ref="cusPhone" :disabled="true" v-model="ordRecPayData.cusPhone":readonly="true"/>
+          </DkFormItem>
+          <!--客户名称-->
+          <DkFormItem prop="cusName">
+            <InputPop ref="cusName" :disabled="true" v-model="ordRecPayData.cusName":readonly="true"/>
+          </DkFormItem>
+          <!--业务部门-->
+          <DkFormItem prop="orgName" >
+            <InputPop ref="orgName" v-model="ordRecPayData.orgName" :readonly="true"/>
+          </DkFormItem>
+          <!--业务员-->
+          <DkFormItem prop="staffName" >
+            <InputPop ref="staffName" v-model="ordRecPayData.staffName" :readonly="true"/>
+          </DkFormItem>
+          <!--账务日期-->
+          <DkFormItem prop="accDate" :data-type="$config.dataType.date">
+            <DatePickerPop v-model="ordRecPayData.accDate" :readonly="true"/>
+          </DkFormItem>
+          <!--单据备注-->
+          <DkFormItem prop="remarks">
+            <InputPop ref="remarks" v-model="ordRecPayData.remarks" :readonly="true"/>
+          </DkFormItem>
+        </DkForm>
+      </DkPanel>
+      <!--收款信息-->
+      <DkPanel prop="recHandleDetail">
+        <div id="ord-rec-pay" ref="ord-rec-pay" slot="content">
+          <EditTable v-if="ordRecPayFlag"
+                     ref="recPayTable"
+                     :data="ordRecPayItemList"
+                     :columns="ordRecPayItemColumns"
+                     :height=this.tableHeight+60
                      :freeze="false"
                      :show-footer="true"
                      :delete-flag="false"
@@ -290,8 +326,8 @@ export default {
     return {
       ordFlag:true,
       ordOutboundFlag: true,
-      ordReturnFlag: true,
-      purPayFlag:true,
+      ordOutReturnFlag: true,
+      ordRecPayFlag:true,
       ordData: {},//销售订单
       orderItemList: [],//订单明细
       //订单明细列
@@ -373,6 +409,8 @@ export default {
           equal: true,
         },
       ],
+      // 出库数据list
+      ordOutboundDataList: [],
       //销售出库单
       ordOutboundData: {},
       //销售出库单明细
@@ -446,7 +484,9 @@ export default {
           equal: true,
         },
       ],
-      //退货
+      //退货数据list
+      ordOutReturnDataList:[],
+      //退货主表
       ordOutReturnData:{},
       //销退货明细
       ordOutRetrunItemList:[],
@@ -464,10 +504,6 @@ export default {
           field: 'skuName',
           type: 'disabled',
         },
-        {
-          field: 'brandName',
-          type: 'disabled',
-        },
         //仓库
         {
           field: 'whName',
@@ -479,49 +515,89 @@ export default {
           type: 'text',
           equal: true,
         },
-        //数量
+        //出库状态
         {
-          field: 'itemQty',
+          field: 'outStatusName',
+          type: 'text',
+          equal: true,
+        },
+        //出库中数量
+        {
+          field: 'outingQty',
           type: 'disabled',
           digits: 2,
           number: true,
           sum: true
         },
-        //价格
+        //出库中金额
         {
-          field: 'priceSale',
+          field: 'outingAmt',
+          type: 'number',
+          digits: 2,
+          number: true,
+          sum: true
+        },
+        //已出库数量
+        {
+          field: 'outQty',
           type: 'disabled',
           digits: 2,
-          number: true
+          number: true,
+          sum: true
         },
-        //金额
+        //已出库金额
         {
-          field: 'itemAmt',
+          field: 'outAmt',
           type: 'number',
           digits: 2,
           number: true,
           sum: true
         },
-        //商品标价
         {
-          field: 'priceStd',
+          field: 'remarks',
+          type: 'text',
+          equal: true,
+        },
+      ],
+      // 收款数据List
+      ordRecPayDataList:[],
+      // 收款主表
+      ordRecPayData:{},
+      // 收款明细
+      ordRecPayItemList:[],
+      //收款明细列
+      ordRecPayItemColumns:[
+        {
+          field: 'biznisNo',
           type: 'disabled',
-          number: true,
-          digits: 2,
         },
-        //标价金额
         {
-          field: 'amtStd',
+          field: 'accDate',
           type: 'disabled',
+        },
+        //应收金额
+        {
+          field: 'amtShould',
+          type: 'number',
           digits: 2,
-          number: true
+          number: true,
+          sum: true
         },
-        //标价折扣
+        //应收冲抵金额
         {
-          field: 'priceDiscount',
+          field: 'amtReceivableHandle',
+          type: 'number',
+          digits: 2,
+          number: true,
+          sum: true
+        },
+        //优惠金额
+        {
+          field: 'amtWaive',
           type: 'disabled',
           number: true,
           digits: 2,
+          sum: true
         },
         {
           field: 'remarks',
@@ -529,27 +605,25 @@ export default {
           equal: true,
         },
       ],
-      // 出库数据list
-      ordOutboundDataList: [],
-      //退货数据list
-      ordOutReturnDataList:[],
       // 模式切换值
       tabsModel: 'ordchase',
+
       tabsOptions: [{label: self.$t('ordchase'), name: 'ordchase'}, //销售订单
         {label: self.$t('outbound'), name: 'outbound'}, //出库单
         {label: self.$t('ordOutReturn'), name: 'ordOutReturn'},//销售退货
-        {label: self.$t('purPay'), name: 'purPay'},//采购退货
+        {label: self.$t('ordRecPay'), name: 'ordRecPay'},//订单收款
       ],
+
       tabsModelOut: null,
       tabsModelOutReturn: null,
-      tabsModel3: null,
+      tabsModelRecPay: null,
+
       tabsOptionsOut: [],
       tabsOptionsOutReturn: [],
-      tabsOptions3: [],
+      tabsOptionsRecPay: [],
     }
   },
   methods: {
-
     /**
      * @desc   : 整体tab切换
      * @author : 宋扬
@@ -558,6 +632,7 @@ export default {
     tabsClick(val) {
       this.ordOutboundFlag = false;
       this.ordOutReturnFlag = false;
+      this.ordRecPayFlag = false;
       //如果切换的tab存在就去根据条件查询
       if (val) {
         if(val == 'ordchase'){
@@ -565,6 +640,7 @@ export default {
             this.ordFlag = true;
             this.ordOutboundFlag = false;
             this.ordOutReturnFlag = false;
+            this.ordRecPayFlag = false;
           }, 100)
         }
         else if(val == 'outbound'){
@@ -572,6 +648,7 @@ export default {
             this.ordFlag = false;
             this.ordOutboundFlag = true;
             this.ordOutReturnFlag = false;
+            this.ordRecPayFlag = false;
           }, 100)
         }
         else if(val == 'ordOutReturn'){
@@ -579,9 +656,17 @@ export default {
             this.ordFlag = false;
             this.ordOutboundFlag = false;
             this.ordOutReturnFlag = true;
+            this.ordRecPayFlag = false;
+          }, 100)
+        }
+        else if(val == 'ordRecPay'){
+          setTimeout(() => {
+            this.ordFlag = false;
+            this.ordOutboundFlag = false;
+            this.ordOutReturnFlag = false;
+            this.ordRecPayFlag = true;
           }, 100)
         }
-
       }
     },
 
@@ -612,18 +697,36 @@ export default {
       if (val) {
         this.ordOutReturnDataList.forEach(it => {
           if (it.outNo == val) {
-            this.purReturnData = it
-            this.ordOutRetrunItemList = it.purReturnItemVOList
+            this.ordOutReturnData = it
+            this.ordOutRetrunItemList = it.outReturnItemList
           }
         })
       }
     },
+
     /**
-     * @desc   : 通过id查询
-     * @author : 常皓宁
-     * @date   : 2024/2/29 8:49
+     * @desc   : 收款tab切换
+     * @author : 宋扬
+     * @date   : 2024/4/26 10:27
      */
-    getPur(id) {
+    tabsClickRecPay(val) {
+      //如果切换的tab存在就去根据条件查询
+      if (val) {
+        this.ordRecPayDataList.forEach(it => {
+          if (it.rpNo == val) {
+            this.ordRecPayData = it
+            this.ordRecPayItemList = it.recpayitemlist
+          }
+        })
+      }
+    },
+
+    /**
+     * @desc   : 查询数据
+     * @author : 宋扬
+     * @date   : 2024/4/26 10:28
+     */
+    getOrd(id) {
       let params = {
         ordId: id
       }
@@ -642,24 +745,30 @@ export default {
               return {label: m.outNo, name: m.outNo}
             })
           }
-
-          let purReturnList = res.data.list[0].purReturnVOList
-          if (purReturnList && purReturnList.length > 0) {
-            this.purReturnData = this.purReturnVOList[0]
-            this.purReturnItemList = res.data.list[0].purReturnVOList[0].purReturnItemVOList
-            this.tabsOptions2 = purReturnList.map(m => {
-              return {label: m.retuenIntoNo, name: m.retuenIntoNo}
+          // 赋值出库退货单List值
+          this.ordOutReturnDataList = res.data.list[0].outReturnDataList
+          if (this.ordOutReturnDataList && this.ordOutReturnDataList.length > 0) {
+            this.ordOutReturnData = this.ordOutReturnDataList[0]
+            this.ordOutRetrunItemList = this.ordOutReturnDataList[0].outreturnitemlist
+            this.tabsOptionsOutReturn = this.ordOutReturnDataList.map(m => {
+              return {label: m.outNo, name: m.outNo}
+            })
+          }
+          // 赋值收款单List值
+          this.ordRecPayDataList = res.data.list[0].recPayDataList
+          if (this.ordRecPayDataList && this.ordRecPayDataList.length > 0) {
+            this.ordRecPayData = this.ordRecPayDataList[0]
+            this.ordRecPayItemList = this.ordRecPayDataList[0].recpayitemlist
+            this.tabsOptionsRecPay = this.ordRecPayDataList.map(m => {
+              return {label: m.rpNo, name: m.rpNo}
             })
           }
-          this.purPayData = res.data.list[0].purPayList
         }
       })
     },
   },
   created() {
-    this.getPur(this.$route.params.row.orderId)
-  },
-  activated() {
+    this.getOrd(this.$route.params.row.orderId)
   },
 }
 </script>