退货

api/pages/ivt/inboundReturn.js

@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright(c) 2024 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：
+ *		2.采购退货
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		于继渤		  	     2024-1-19       			1.00		       	新建
+ *******************************************************************************/
+module.exports = {
+  inboundReturnService: {
+      // 前缀
+      prefix: 'mdm-server/ivt/inbound_return/', 
+
+  },
+
+  routeUrl: {
+    inboundReturn: {
+      detail:{
+        key:'detail',url:'/package-purchase/pages/purchase-return/detail/detail'
+      },
+    }
+  } 
+};

app.js

@@ -58,10 +58,11 @@ const transfer = require('./api/pages/mac/transfer.js');
 const order = require('./api/pages/sale/order.js');
 const income = require('./api/pages/mac/income.js');
 const saleOutBound = require('./api/pages/ivt/saleOutBound.js');
+const inboundReturn = require('./api/pages/ivt/inboundReturn.js');
 
 // api服务路由文件
 var apiList = [common, oauth,setting, company, wechatPay,user, staff, staffRight, staffPurview, settingValue, customer, role, roleFun, org, roleSensitive, goodsBrand, goodsCategory, goodsSeries, unit, supplier, warehouse, saleChannel, goodsSku, basicData,customerMst,purchase,account,
-  receiptPayment,inbound,inboundOther,inboundProcessing,inboundPurchaseReturn,outbound,outboundOther,outboundProcessing,outboundSaleReturn,inventory,moneyAccount,intoReturn,intoReturnItem,cusFollow,order,transfer,income,saleOutBound]
+  receiptPayment,inbound,inboundOther,inboundProcessing,inboundPurchaseReturn,outbound,outboundOther,outboundProcessing,outboundSaleReturn,inventory,moneyAccount,intoReturn,intoReturnItem,cusFollow,order,transfer,income,saleOutBound,inboundReturn]
 
 const util = require('./utils/util.js')
 const baseMethod = require('./api/pages/baseMethod.js')

package-purchase/pages/purchase-return/detail/detail.js

@@ -13,7 +13,7 @@ Page({
     pageFlag: false,
     tableData: [],
     // 路由
-    routeObjName: 'intoReturnItem',
+    routeObjName: 'inboundReturn',
     cardList: [{
       name: 'items',
       title: mixins.$t("goodsDetail"),
@@ -46,71 +46,65 @@ Page({
       { code: 'sumAmount', content: 0, type: 'number' }
     ],
   },
-  /**
- * @desc : 设置查询参数
- * @date : 2024/2/1 15:49
- * @author : 于继渤
- */
-  setSearchParams(params) {
-    params.returnId = this.data.id
-    return params
-  },
-  /**
-   * @desc :   处理接口返回数据
-   * @date : 2024/2/1 15:49
-   * @author : 于继渤
-   */
-  handleSearchData(tableData) {
-    let formData = JSON.parse(this.data.formData)
-    formData = this.data.item
-    tableData.forEach(res => {
-      res['itemQtyMax'] = res.itemQty
-    })
-    formData['goodsList'] = tableData
 
-    this.setData({
-      formData: JSON.stringify(formData)
-    })
-  },
+
   /**
-   * @desc :   加载数据源
+   * @desc : 给表单赋值
    * @date : 2024/2/1 15:49
    * @author : 于继渤
    */
-  getData(params) {
-    return this.excute(this.data.service, this.data.service.selectByCond, params);
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  loadInit() {
-    console.log('item', this.data.item)
-    let item = this.data.item
+  setValuesByEdit(data) {
     let buttonList = this.data.buttonList
     let cardList = this.data.cardList
-    if (item.outStatus == mixins.$t("outBoundingOutStatus") || item.outStatus == mixins.$t("unOutBoundOutStatus")) {
+    if (data.outStatus == mixins.$t("outBoundingOutStatus") || data.outStatus == mixins.$t("unOutBoundOutStatus")) {
       cardList[0].info = '(' + mixins.$t("outOfStorage") + ')'
       cardList[0].color = '#E4002B'
     }
-    if (item.outStatus == mixins.$t("outBoundedOutStatus")) {
+    if (data.outStatus == mixins.$t("outBoundedOutStatus")) {
       buttonList = [
         { name: 'merge', title: mixins.$t("handleWithdrawal"), }
       ]
-      cardList[0].info = '(' + item.outStatusName + ')'
+      cardList[0].info = '(' + data.outStatusName + ')'
       cardList[0].color = ''
     }
-  
-
-
     let contentList = this.data.contentList
-    contentList[1].content = item.sumAmount
-    cardList[0].sumAmount = item.sumAmount
+    contentList[1].content = data.returnAmt 
+    cardList[0].sumAmount = data.returnAmt  
+     let formData = JSON.parse(this.data.formData)
+    formData = data
+    
+    formData.goodsList.forEach(res => {
+      res.returnQty = res.returnQty * -1
+      res.returnAmt = res.returnAmt * -1
+      res['returnQtyMax'] = res.returnQty
+    })
+
     this.setData({
       contentList: contentList,
       buttonList: buttonList,
-      cardList: cardList
+      cardList: cardList,
+      formData: JSON.stringify(formData),
+      item:data
     })
   },
 
+  setForm(item){
+    
+  },
+
+
+
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  loadInit() {
+    console.log('item', this.data.item)
+    let item = this.data.item
+
+    // this.getDetail(item.intoId)
+  
+  },
+
 
 })

package-purchase/pages/purchase-return/detail/detail.wxml

@@ -77,7 +77,7 @@
 
 <dk-form-bill id="dk-form-bill"  routeObjName="{{routeObjName}}"  bind:onStepper="onChangeStepper"
 cardList="{{cardList}}"  titleTagCol ="shortName"  titleCol ="skuCode"  showPopFlag="{{true}}"
-descCol = "skuModel" priceCol ="priceReturn" quantityCol ="itemQty"  quantityMax="itemQtyMax" stepperFlag="{{item.outStatus !=='出库状态-已出库' ?  true : false}}" sumAmountCol ="sumAmount"
+descCol = "skuModel" priceCol ="returnAmt" quantityCol ="returnQty"  quantityMax="returnQtyMax" stepperFlag="{{item.outStatus !=='出库状态-已出库' ?  true : false}}" sumAmountCol ="sumAmount"
 contentObj="{{contentObj}}" model:value="{{formData}}" 
  popType = "sale" priceTitle = "">
 </dk-form-bill>

package-purchase/pages/purchase-return/purchase-return.js

@@ -1,6 +1,7 @@
 const Constants = require('@/utils/Constants.js');
 const util = require('@/utils/util.js')
 const mixins = require('@/mixins/index.js')
+const app = getApp()
 Page({
   mixins: [mixins],
   /**
@@ -16,12 +17,12 @@ Page({
     { code: 'addressFull', dataType: '' },
     { code: 'makingTime', dataType: 'date' }, { code: 'deliveryTime', dataType: 'date' }],
     // 列表区（脚部金额）
-    footerAmount: { name: 'sumAmount', title: mixins.$t("totalAmount") },
+    footerAmount: { name: 'returnAmt', title: mixins.$t("totalAmount") },
     // 列表区（脚部信息）
-    footerInfo: [{ name: 'sumQuantity', title: mixins.$t("piece"), prefix: mixins.$t("together"), }],
+    footerInfo: [{ name: 'returnQty', title: mixins.$t("piece"), prefix: mixins.$t("together"), }],
     // 列表区（内容）
     contentList: [
-      { name: 'purNo', title: mixins.$t("saleOrderNo") },
+      { name: 'intoNo', title: mixins.$t("saleOrderNo") },
       {
         name: [{ name: 'contactName', title: '' },
         { name: 'contactPhone', title: '' }], title: mixins.$t("returnInfo")
@@ -34,7 +35,8 @@ Page({
     // 弹出按钮
     buttonList: [{ name: 'cancel', title: mixins.$t("invaidOrder") }],
     // 路由
-    routeObjName: 'intoReturn',
+    // routeObjName: 'inbound',
+    routeObjName: 'inboundReturn',
     tableData: [],
     active: 0,
     tabsActive: 0,
@@ -54,7 +56,7 @@ Page({
       url: this.data.route.detail.url,
       success: function (res) {
         // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
-        res.eventChannel.emit('params', { id: item.returnId, formMode: Constants.formMode.index,item:item })
+        res.eventChannel.emit('params', { id: item.intoId, formMode: Constants.formMode.edit,item:item })
       }
     })
   },
@@ -70,12 +72,13 @@ Page({
    */
   setSearchParams(params) {
     let tabsActive = this.data.tabsActive
+    params.intoType = '入库类型-采退入库'
     if (tabsActive == 0) { //出库状态
-      params.outStatus = ''
+      params.intoStatus = ''
     } else if (tabsActive == 1) {
-      params.outStatus = mixins.$t("outBoundingOutStatus")
+      params.intoStatus = mixins.$t("inBoundingIntoStatus")
     } else if (tabsActive == 2) {
-      params.outStatus = mixins.$t("outBoundedOutStatus")
+      params.intoStatus = mixins.$t("inBoundedIntoStatus")
     }
     return params
   },

package-purchase/pages/purchase-return/purchase-return.wxml

@@ -18,7 +18,7 @@
 <van-empty wx:if="{{tableData.length<=0}}" description="暂无数据" />
 
 <!-- 列表区 -->
-<dk-list list="{{tableData}}" flgSubFormatDate="{{true}}" titleCorner="" title="supName" status="outStatusName" subTitle="makeTime" content="{{contentList}}" collectCol="collectStatus" contentObj="{{contentObj}}" contentCol="" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
+<dk-list list="{{tableData}}" flgSubFormatDate="{{true}}" titleCorner="" title="supName" status="intoStatusName" subTitle="makeTime" content="{{contentList}}" collectCol="collectStatus" contentObj="{{contentObj}}" contentCol="" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
 
 
 <view style="height: 200rpx;"></view>