采购退货

package-base-select/pages/select-source-purchase-order/select-source-purchase-order.js

@@ -22,9 +22,15 @@ Page({
   getData(params) {
     return this.excute(this.data.service, this.data.service.selectInboundAndItem, params);
   },
-  // 入库类型-采购入库
+
+  /**
+  * @desc :   设置查询参数
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
   setSearchParams(params) {
-    params.intoType = '入库类型-采购入库'
+    params.intoType = Constants.intoType.pur
+    params.fromId = this.data.id
     return params
   },
   /**
@@ -123,7 +129,7 @@ Page({
 
     this.setData({
       choooseInboundItemList: choooseInboundItemList,
-      returnTotalAmount: returnTotalAmount,
+      returnTotalAmount: returnTotalAmount.toFixed(2),
     })
   },
   /**
@@ -134,19 +140,19 @@ Page({
   toAdd() {
     let choooseInboundItemList = this.data.choooseInboundItemList
     let that = this
-   let formData = that.data.formData
-   let item = that.data.item
- 
+    let formData = that.data.formData
+    let item = that.data.item
+
     wx.navigateTo({
       url: this.data.route.addReturn.url,
-   
+
       success: function (res) {
         // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
         res.eventChannel.emit('params', {
-          
+
           choooseInboundItemList: choooseInboundItemList,
           goodsRejectedAmount: that.data.returnTotalAmount,
-          item:JSON.stringify(item)
+          item: JSON.stringify(item)
         })
       }
     })

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

@@ -10,7 +10,7 @@ Page({
     routeObjName: 'intoReturn',
     tableData: [],
     pageFlag: false,
-    // formData: null,
+    flgAutoIvt: false,
     cardList: [{
       name: 'items',
       title: '商品明细',
@@ -35,10 +35,17 @@ Page({
     },
   },
 
-
+  /**
+* @desc : 设置保存参数
+* @date : 2024/3/19 15:49
+* @author : 于继渤
+*/
   setParams(params) {
-
+    params.purId = this.data.item.purId
+    params.purNo = this.data.item.purNo
+    params.flgAutoIvt = this.data.flgAutoIvt
     params.intoReturnItemVOList = params.goodsList
+    delete params['goodsList']
     console.log('params', params)
     return params
   },
@@ -68,10 +75,10 @@ Page({
   */
   onChangeStepper(e) {
     let index = e.detail.index
-    let formData = JSON.parse(this.data.formData) 
+    let formData = JSON.parse(this.data.formData)
     formData.goodsList[index].itemQty = e.detail.item
     this.setData({
-      formData: JSON.stringify(formData) 
+      formData: JSON.stringify(formData)
     })
     this.calculateTotal()
   },
@@ -83,23 +90,23 @@ Page({
 * @author : 于继渤
 */
   calculateTotal(goodsList) {
-    let formData = JSON.parse(this.data.formData) 
+    let formData = JSON.parse(this.data.formData)
     let sumAmount = Number(0) //合计金额
     let sumQuantity = Number(0) //合计金额
-    let goodsRejectedAmount = this.data.goodsRejectedAmount
-    console.log('formData1',formData)
+    let goodsRejectedAmount =this.data.goodsRejectedAmount
+    console.log('formData1', formData)
     formData.goodsList.forEach(res => {
       res.itemAmt = Number(res.itemQty * res.priceReturn * -1)
       sumAmount += res.itemAmt
       sumQuantity += res.itemQty
     })
-    formData.sumAmount = sumAmount
+    formData.sumAmount =  sumAmount
     formData.sumQuantity = sumQuantity
-    console.log('formData',formData)
+    console.log('formData', formData)
     this.setData({
-      formData: JSON.stringify(formData) ,
-      sumAmount: sumAmount,
-      afterGoodsRejectedAmount: goodsRejectedAmount + sumAmount,
+      formData: JSON.stringify(formData),
+      sumAmount: sumAmount.toFixed(2),
+      afterGoodsRejectedAmount: Number(goodsRejectedAmount + formData.sumAmount).toFixed(2),
       sumQuantity: sumQuantity,
     })
   },
@@ -116,11 +123,12 @@ Page({
       formData = {
         goodsList: data.choooseInboundItemList
       }
+      console.log('data',data)
       that.setData({
         formData: JSON.stringify(formData),
-        goodsRejectedAmount: data.goodsRejectedAmount,
+        goodsRejectedAmount:  Number(data.goodsRejectedAmount),
         tableData: data.choooseInboundItemList,
-        item: data.item
+        item: JSON.parse(data.item)
       })
       that.calculateTotal()
     })

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

@@ -17,7 +17,7 @@
           </view>
         </view>
         <view style="padding-left: 14rpx;padding-top: 19rpx;font-size: 26rpx;line-height: 36rpx;color: #FFFFFF;">
-          {{'佛山恒洁供应商'}}
+          {{item.supplierName}}
         </view>
       </view>
       <!-- 收货人 -->
@@ -30,18 +30,16 @@
           </view>
         </view>
         <view style="padding-left: 14rpx;padding-top: 19rpx;font-size: 26rpx;line-height: 36rpx;color: #FFFFFF;">
-          {{'退货信息 王售后'}}
+          {{'退货信息 ' + item.contactName}}
         </view>
         <view style="padding-left: 22rpx;padding-top: 19rpx;font-size: 26rpx;line-height: 36rpx;color: #FFFFFF;">
-          {{
-            '156 5678 5643'
-          }}
+          {{item.contactPhone}}
         </view>
       </view>
       <!-- 地址 -->
       <view style="display: flex;padding-right: 32rpx;">
         <view style="padding-left: 32rpx;padding-top: 15rpx;font-size: 26rpx;line-height: 36rpx;color: #FFFFFF;">
-          {{'佛山市禅城区XXX路XXX号库房'}}
+          {{item.addressFull}}
         </view>
       </view>
     </view>

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

@@ -12,7 +12,53 @@ Page({
     pageFlag: false,
     tableData: [],
     // 路由
-    routeObjName: 'intoReturnItem'
+    routeObjName: 'intoReturnItem',
+    cardList: [{
+      name: 'items',
+      title: '商品明细',
+      chooseGoodsFlag: false,
+      itemAmt: '',
+      displayNum: 2
+    }, {
+      name: 'other',
+      title: '其他信息'
+    }],
+    contentObj: {
+      other: [{
+        code: 'remarks',
+        type: 'textarea',
+        title: '备注'
+      }, {
+        code: 'file',
+        type: 'uploader',
+        title: '附件'
+      }]
+    },
+  },
+    /**
+   * @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) 
+   tableData.forEach(res=>{
+    res['itemQtyMax']  = res.itemQty
+   })
+    formData['goodsList'] = tableData
+    
+    this.setData({
+      formData: JSON.stringify(formData)
+    })
   },
   /**
    * @desc :   加载数据源

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

@@ -68,111 +68,13 @@
 
 <!-- 空高度  -->
 <view style="margin-top: 10rpx;"></view>
-<!--商品明细  -->
-<view style="margin: 26rpx 34rpx 26rpx 34rpx;box-shadow:2px 2px 5px #e5e5e6;">
-  <view style="background: #FFFFFF;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);border-radius: 15rpx;">
-    <view style="padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 32rpx;display: flex;">
-      <view style="width: 70%;font-weight: bold;">商品明细 <text style="{{item.outStatusName != '已出库' ? 'color:red;font-size:30rpx':'font-size:30rpx'}}">{{ item.outStatusName ? ' ('+item.outStatusName+') ' : '' }}</text></view>
-      <view style="width: 30%;font-size: 26rpx;display: flex; justify-content: flex-end;">
-        <view style="display: flex;justify-content: right;align-items: center;">
-            <!-- todo -->
-
-        </view>
-      </view>
-    </view>
-
-    <van-cell wx:if="{{tableData.length==0}}" border="{{ false }}">
-      <van-empty description="暂未选择商品" />
-    </van-cell>
-    <view wx:for="{{tableData}}" wx:key="index" border="{{ true }}">
-      <van-card wx:if="{{index < 2  || collapseFlag}}">
-        <view slot="thumb" data-item="{{item}}" data-index="{{index}}" bind:tap="openChoosedItemInfo">
-          <van-image radius="5px" width="80" height="80" src="{{item.skuImages? item.skuImages.path : ''}}" />
-        </view>
-        <view slot="title" data-item="{{item}}" data-index="{{index}}" bind:tap="openChoosedItemInfo">
-          <dk-title titleTag="{{'HEGII'}}" title="{{item.skuCode}}"></dk-title>
-        </view>
-        <view slot="desc" data-item="{{item}}" data-index="{{index}}" bind:tap="openChoosedItemInfo">
-          <dk-text value="{{item.skuName}}"></dk-text>
-        </view>
-        <view slot="price">
-          <view style="display: flex;width: 100%;flex-direction: row;">
-            <view style="width:100%;font-family:'PingFang HK';font-style:normal;" data-item="{{item}}" data-index="{{index}}" bind:tap="openChoosedItemInfo">
-              <dk-cell contentFontSize="14" fontWeight="bold" left="0rpx" contentColor="#CAA977" content="{{ item.rejectPrice}}"></dk-cell>
-            </view>
-            <view style="width: 100%;text-align: right;justify-content: center;display: flex;align-items: center;">
-
-              <van-stepper integer="{{true}}" value="{{ item.thisTimeRejectQuantity}}" max="{{-1}}" min="{{item.thisTimeRejectQuantityTemp}}" data-index="{{index}}" bind:change="onChangeStepper" />
-            </view>
-          </view>
-        </view>
-        <view slot="footer">
-          <view class="hr"></view>
-
-
-
-
-          <view style="display: flex;width: 100%;margin-top:5px; align-items: center;">
-            <view catchtap="openRemarkFlag" data-item="{{item}}" data-index="{{index}}" style="width: 70%;text-align: left;font-size:24rpx;color: #95A8CB;">
-              <van-image width="19rpx" height="20rpx" src="/static/img/remerk-edit.png" />
-              备注：<span style="line-height:56rpx;">{{item.remarks ? item.remarks : '请输入内容'}}</span>
-            </view>
-            <view style="width: 50%;text-align: right;">
-
-              <dk-cell contentFontSize="14" fontWeight="bold" contentRight="{{true}}" left="0rpx" contentColor="#CAA977" content="{{ item.rejectAmount}}"></dk-cell>
-            </view>
-          </view>
-        </view>
-
-      </van-card>
-
-    </view>
-
-    <view catchtap="collapseFlagChange" data-index="{{index}}" wx:if="{{tableData.length > 2}}" style="padding: 30rpx 32rpx 30rpx 32rpx;border-radius: 16rpx;color:#95A8CB;text-align: center;font-size: 26rpx;display: flex;justify-content: center;">
-      <view>{{!collapseFlag ? '展开查看更多' : '收起查看更多'}}</view>
-      <view style="padding-left: 10rpx;">
-        <van-icon name="{{!collapseFlag ? 'arrow-down':'arrow-up'}}" size="24rpx" />
-      </view>
-    </view>
-
-
-    <!-- 合计金额 -->
-    <view style="display:flex;  ">
-      <view style="width: 50%;">
-        <view style="padding-left: 30rpx;padding-top: 10px;padding-bottom: 10px;">
-          <text style="color: #95A8CB;font-size: 13px;"> 共计 {{item.sumQuantity}} 件</text>
-        </view>
-      </view>
-      <view style="width: 50%;padding-top: 10px;padding-bottom: 10px;">
-        <dk-cell titleColor="#1B365D" height="39rpx" spaceWidth="10rpx" contentColor="#CAA977" fontSize="14" contentFontWeight="bolder" title="合计金额" content="{{item.sumAmount}}"></dk-cell>
-      </view>
-    </view>
-
-  </view>
-</view>
-
-
-<!-- 其他信息 -->
-<view style="margin: 10px 32rpx 10px 32rpx;margin-top: 41rpx;border-radius: 15rpx;box-shadow:2px 2px 5px #e5e5e6;">
-  <view style="background: #FFFFFF;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);border-radius: 0px 0px 15rpx 15rpx;">
-    <view style=" padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 32rpx;">其他信息</view>
-    <van-field input-width="200rpx" input-class="dk-cell-value-class" input-align="left" label-class="nomal-label" data-key="remarks" maxlength="50" value="{{ form.remarks }}" input-align="right" label="备注" placeholder="请输入备注" autosize border="{{ false }}" bind:change="changeField">
-    </van-field>
-
-    <view style="display:flex;width:100%;margin: 1vw;padding-top:20rpx;">
-      <view style="width: 30%; flex:1;color: #95A8CB;font-size: 28rpx;padding-left: 27rpx;">附件</view>
-      <view style="width: 70%;text-align: left;">
-        <van-uploader max-count="5" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ fileList }}" bind:delete="deleteImg" bind:after-read="afterRead" multiple="true" imageFit="aspectFit" />
-      </view>
-    </view>
-
-
-    <view style="height: 40rpx;"></view>
-  </view>
-
-
-</view>
 
+<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="{{true}}" sumAmountCol ="sumAmount"
+contentObj="{{contentObj}}" model:value="{{formData}}" 
+ popType = "sale" priceTitle = "">
+</dk-form-bill>
 
 <!-- 空高度  -->
 <view style="width: 100%;height: 100px;"></view>

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

@@ -21,7 +21,7 @@
 <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>
 
 
-
+<view style="height: 200rpx;"></view>