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

api/pages/ivt/inboundReturn.js

@@ -19,7 +19,10 @@ module.exports = {
       addReturn:{
         key:'addReturn',url:'/package-purchase/pages/purchase-return/add/add'
       },
-
+      edit:{
+        key:'edit',url:'/package-purchase/pages/purchase-return/add/add',
+        idKey:'intoId'
+      },
       detail:{
         key:'detail',url:'/package-purchase/pages/purchase-return/detail/detail'
       },

api/pages/mst/goodsBrand.js

@@ -15,8 +15,8 @@ module.exports = {
   },
   routeUrl: {
     goodsBrand: {
-      selectProductAttributeSuppliers:{ //选择供应商
-        key:'selectProductAttributeSuppliers',url:'/package-base-select/pages/select-product-attribute-suppliers/select-product-attribute-suppliers'
+      selectProductAttributeSuppliers: { //选择供应商
+        key: 'selectProductAttributeSuppliers', url: '/package-base-select/pages/select-data/select-data', type: 'supplier', chooseFlag: true
       },
     }
   }

app.json

@@ -187,7 +187,6 @@
             "root": "package-base-select",
             "name": "package-base-select",
             "pages": [
-                "pages/base-test/base-test",
                 "pages/select-collection_confirm/select-collection_confirm",
                 "pages/select-data-dictionary/select-data-dictionary",
                 "pages/select-data/select-data",

components/dkbase/dk-form-more-items/dk-form-more-items.wxml

@@ -38,9 +38,9 @@
       <view class="item-title-class">{{card.title}}</view>
       <view class="item-count-class" wx:if="{{card.name == 'items'}}">{{$t['together'] + form[itemName].length + $t['bill']}}</view>
       <view class="item-count-class" wx:else=""></view>
-      <view style="width: 15%;text-align: right;">
+      <view style="width:{{(card.chooseFlag && card.name=='items')?'35%':'15%'}} ;text-align: right;">
         <dk-tag wx:if="{{card.chooseFlag && form[objIdCol]}}" type="primary" padding="0 20rpx" height="40rpx" color="#9FAEE5" textColor="#FFFFFF" radius="5rpx" roundFlag="{{true}}" data-index="{{cardIndex}}" value="{{card.chooseTitle}}" catchtap="choose"></dk-tag>
-        <dk-tag wx:if="{{card.name=='items'}}" type="primary" padding="0 20rpx" height="40rpx" color="#9FAEE5" textColor="#FFFFFF" radius="5rpx" roundFlag="{{true}}" data-index="{{cardIndex}}" value="{{(card.show ||  card.show == undefined )?'收起':'展开'}}" catchtap="clickTag"></dk-tag>
+        <dk-tag  wx:if="{{card.name=='items'}}" type="primary" style="margin-left: 10rpx;" padding="0 20rpx" height="40rpx" color="#9FAEE5" textColor="#FFFFFF" radius="5rpx" roundFlag="{{true}}" data-index="{{cardIndex}}" value="{{(card.show ||  card.show == undefined )?'收起':'展开'}}" catchtap="clickTag"></dk-tag>
       </view>
     </view>
     <!--明细card-->
@@ -77,7 +77,7 @@
           <view wx:if="{{!readonly}}" slot="right">删除</view>
         </van-swipe-cell>
       </view>
-      <view class="item-btn-title-class" bind:tap="addItem">
+      <view class="item-btn-title-class" bind:tap="addItem" wx:if="{{card.addFlag || card.addFlag == undefined}}">
         <view class="item-add-btn-class">
           <van-icon name="plus" color="#606EB2" size="26rpx" custom-style="font-weight:bold" />
         </view>

components/dkbase/dk-popup/dk-popup.js

@@ -92,7 +92,6 @@ Component({
     value: {
       type: String,
       observer: function (newVal) {
-        console.log('ff',newVal);
         if (newVal) {
           this.setData({
             form: JSON.parse(newVal) || {}
@@ -210,16 +209,15 @@ Component({
                 bindData: function (data) {  
                   let key = e.currentTarget.dataset.item.code
                   let name = e.currentTarget.dataset.item.name 
-                  console.log('key',key)
+                  console.log('key',key,data)
                   console.log('name',name)
                   let form = that.data.form
                   form[key] = data.data.id
                   form[name] = data.data.name 
+                  form[key+'_data'] = data.data.list
                   that.setData({
                     form: form,
-                    
                   })
-                 
                 }
               },
               success: function (res) {
@@ -235,7 +233,16 @@ Component({
                   data['formType'] = item.button.formType
                 }
                 if(that.data.form){
-                  data['item'] = that.data.form
+                  let form = that.data.form;
+                  data['item'] = form
+                  let key = e.currentTarget.dataset.item.code
+                  if(form[key+ '_data']){
+                    data['item'].data = that.data.form[key+ '_data']
+                    delete form[key+ '_data']
+                    that.setData({
+                      form:form
+                    })
+                  }
                 }
                 data['route'] = route
                 console.log('打开下拉',)
@@ -384,7 +391,7 @@ Component({
    */
   lifetimes: {
     attached: function () {
-      console.log('fffd',this.data.form,this.data.value);
+      console.log('fffd',this.data.form,this.data.contentObj);
     },
     detached: function () {
       // 在组件实例被从页面节点树移除时执行

components/dkbase/dk-popup/dk-popup.wxml

@@ -41,7 +41,6 @@
         <view style="width: 50%;text-align: right;">{{item.rightTitle}}：{{form[item.rightCode]}}</view>
       </view>
     </view>
-
     <!--内容-->
     <view wx:for="{{contentObj}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
       <!--文本框-->

package-accounts-manage/pages/other-receipt/add/add.js

@@ -9,7 +9,7 @@ Page({
   data: {
     cardList: [
       { name: 'main' },
-      { name: 'bill', title: '应收', chooseFlag: true, chooseTitle: '选类别', urlKey: 'selectIncomeCategory' },
+      { name: 'items', title: '应收', chooseFlag: true, addFlag:false, chooseTitle: '选类别', urlKey: 'selectIncomeCategory' },
       { name: 'file' }],
     contentObj: {
       main: [
@@ -43,9 +43,9 @@ Page({
         },
 
       ],
-      bill: [ 
-        { code: 'receivableWaive', type: 'number', title: '收入类别', readonly: true,required: true  },
-        { code: 'receiptResidue', type: 'number', title: '收入金额',required: true  },
+      items: [ 
+        { code: 'receivableWaive',name: 'receivableWaiveName', type: 'choose', title: '收入类别', readonly: true,required: true  },
+        { code: 'receiptResidue',type: 'number', title: '收入金额',required: true  },
       
       ],
       file: [{
@@ -94,8 +94,14 @@ Page({
       formData.orgId = data.id
       formData.orgName = data.name
     }
-
-
+    if (code == "items") { //选单 
+       data.forEach(element => {
+        element.receivableWaive = element.dataCode
+        element.receivableWaiveName = element.dataValue
+      });
+      formData.itemList = data
+    }
+  
     this.setData({
       cardList: cardList_,
       formData: JSON.stringify(formData)

package-base-select/pages/base-test/base-test.js

@@ -1,66 +0,0 @@
-// package-base-select/pages/base-test/base-test.js
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
-})

package-base-select/pages/base-test/base-test.json

@@ -1,3 +0,0 @@
-{
-    "usingComponents": {}
-}

package-base-select/pages/base-test/base-test.wxml

@@ -1,2 +0,0 @@
-<!--package-base-select/pages/base-test/base-test.wxml-->
-<text>package-base-select/pages/base-test/base-test.wxml</text>

package-base-select/pages/base-test/base-test.wxss

@@ -1 +0,0 @@
-/* package-base-select/pages/base-test/base-test.wxss */

package-base-select/pages/select-data/select-data.js

@@ -34,6 +34,11 @@ Page({
         placeholder: [],
         // tab页签
         tagList: [],
+        // 用于多选
+        valueKey: null,
+        labelKey: null,
+        // 多选时是否允许重复
+        repeatFlag: false,
         // 确定按钮
         buttonList: [{
             name: 'confirm',
@@ -72,9 +77,32 @@ Page({
      */
     chooseData(e) {
         let list = e.detail.list;
-        this.setData({
-            choosedData: list
-        })
+        let valueKey = this.data.valueKey;
+        if (!valueKey) {
+            this.setData({
+                choosedData: list
+            })
+        } else {
+            let choosedData = this.data.choosedData
+            let filters = []
+            if (list && list.length > 0) {
+                list.forEach(it => {
+                    // 不允许重复
+                    if (!this.data.repeatFlag) {
+                        filters = choosedData.filter(t => t[valueKey] == it[valueKey])
+                        if (!filters || filters.length == 0) {
+                            choosedData.push(it);
+                        }
+                    } else {
+                        // 可以重复
+                        choosedData.push(it);
+                    }
+                })
+                this.setData({
+                    choosedData: choosedData
+                })
+            }
+        }
     },
     /**
      * @desc : 确定事件-返回数据
@@ -82,15 +110,12 @@ Page({
      * @date : 2024/3/25 15:16
      */
     confirm() {
-        let listComp = this.selectComponent('#list');
-        let list = []
-        if (listComp) {
-            list = listComp.data.list;
-            list = list.filter(it => it.checked);
-        }
+        let list = [...this.data.choosedData]
+        let id = list.map(it => it[this.data.valueKey])
+        let name = list.map(it => it[this.data.labelKey])
         const eventChannel = this.getOpenerEventChannel();
         eventChannel.emit('bindData', {
-            data: list
+            data: { list, id, name }
         })
         wx.navigateBack({
             delta: 1
@@ -102,7 +127,6 @@ Page({
      * @date : 2022/5/23 15:16
      */
     toDetail(e) {
-        console.log('rrr', e);
         // 如果选择框开启就走确定模式
         if (this.data.chooseFlag) {
             return;
@@ -119,14 +143,14 @@ Page({
                     name: item.orgName
                 }
                 break;
-                // 员工
+            // 员工
             case Constants.chooseType.staff:
                 data = {
                     id: item.staffId,
                     name: item.staffName
                 }
                 break;
-                // 供应商
+            // 供应商
             case Constants.chooseType.supplier:
                 data = {
                     id: item.supId,
@@ -134,7 +158,7 @@ Page({
                     item: item
                 }
                 break;
-                // 对象类型
+            // 对象类型
             case Constants.chooseType.objectType:
                 data = {
                     id: item.objId,
@@ -143,14 +167,14 @@ Page({
                 }
                 break;
 
-                // 仓库
+            // 仓库
             case Constants.chooseType.warehouse:
                 data = {
                     id: item.whId,
                     name: item.whName
                 }
                 break;
-                // 数据字典
+            // 数据字典
             case Constants.chooseType.dictionary:
                 data = {
                     id: item.dataId,
@@ -233,6 +257,7 @@ Page({
      * @author : 周兴
      */
     loadInit(e) {
+        console.log('item', this.data.item);
         let route = this.data.chooseRoute;
         if (!route || !route.type) {
             return;
@@ -240,8 +265,7 @@ Page({
         let title;
 
         // 读取传入的单据类型
-        let chooseType = route.type
-
+        let chooseType = route.type 
         switch (chooseType) {
             // 部门
             case Constants.chooseType.org:
@@ -254,11 +278,11 @@ Page({
                     contentList: [{
                         name: 'orgCode',
                         title: '部门编码'
-                    }, ],
+                    },],
                     placeholder: ['orgName']
                 })
                 break;
-                // 员工
+            // 员工
             case Constants.chooseType.staff:
                 title = "员工"
                 this.setData({
@@ -267,18 +291,18 @@ Page({
                     method: 'getStaff',
                     title: 'staffName',
                     contentList: [{
-                            name: 'staffCode',
-                            title: '员工编码'
-                        },
-                        {
-                            name: 'orgName',
-                            title: '部门'
-                        },
+                        name: 'staffCode',
+                        title: '员工编码'
+                    },
+                    {
+                        name: 'orgName',
+                        title: '部门'
+                    },
                     ],
                     placeholder: ['staffName']
                 })
                 break;
-                // 供应商
+            // 供应商
             case Constants.chooseType.supplier:
                 title = "供应商"
                 this.setData({
@@ -286,26 +310,34 @@ Page({
                     routeObjName: 'supplier',
                     method: 'selectByCond',
                     title: 'supName',
-                    tagList: [{
-                        title: mixins.$t("all") //全部
-                    }, {
-                        title: mixins.$t("procurementSupplier") //采购供应商
-                    }, {
-                        title: mixins.$t("serviceProvider") // 服务供应商
-                    }],
+                    valueKey: 'supId',
+                    labelKey: 'supName',
+                    chooseFlag: route.chooseFlag,
                     contentList: [{
-                            name: 'supTypeName',
-                            title: '供应商类别'
-                        },
-                        {
-                            name: 'returnAddress',
-                            title: '供应商地址'
-                        },
+                        name: 'supTypeName',
+                        title: '供应商类别'
+                    },
+                    {
+                        name: 'returnAddress',
+                        title: '供应商地址'
+                    },
                     ],
                     placeholder: ['supplier']
                 })
+                // 多选时就不要有其他的tag标签
+                if (!route.chooseFlag) {
+                    this.setData({
+                        tagList: [{
+                            title: mixins.$t("all") //全部
+                        }, {
+                            title: mixins.$t("procurementSupplier") //采购供应商
+                        }, {
+                            title: mixins.$t("serviceProvider") // 服务供应商
+                        }],
+                    })
+                }
                 break;
-                // 仓库
+            // 仓库
             case Constants.chooseType.warehouse:
                 title = "仓库"
                 this.setData({
@@ -314,18 +346,18 @@ Page({
                     method: 'warehouseListBy',
                     title: 'whName',
                     contentList: [{
-                            name: 'supervisor',
-                            title: '仓库主管'
-                        },
-                        {
-                            name: 'contactPhone',
-                            title: '联系电话'
-                        },
+                        name: 'supervisor',
+                        title: '仓库主管'
+                    },
+                    {
+                        name: 'contactPhone',
+                        title: '联系电话'
+                    },
                     ],
                     placeholder: ['whName']
                 })
                 break;
-                // 数据字典
+            // 数据字典
             case Constants.chooseType.dictionary:
                 title = "数据字典"
                 this.setData({
@@ -336,18 +368,18 @@ Page({
                     chooseFlag: route.chooseFlag,
                     title: 'dataValue',
                     contentList: [{
-                            name: 'dataCode',
-                            title: '数据编码'
-                        },
-                        {
-                            name: 'dictCode',
-                            title: '字典项目'
-                        },
+                        name: 'dataCode',
+                        title: '数据编码'
+                    },
+                    {
+                        name: 'dictCode',
+                        title: '字典项目'
+                    },
                     ],
                     placeholder: ['orgName']
                 })
                 break;
-                // 对象类型
+            // 对象类型
             case Constants.chooseType.objectType:
                 title = "对象类型"
                 this.setData({
@@ -355,32 +387,32 @@ Page({
                     method: 'getSupplierAndCustomerData',
                     title: 'objName',
                     contentList: [{
-                            name: 'objCode',
-                            title: '对象编码'
-                        },
-                        {
-                            name: 'objTypeName',
-                            title: '对象'
-                        },
-                        {
-                            name: 'addressFull',
-                            title: '地址'
-                        },
+                        name: 'objCode',
+                        title: '对象编码'
+                    },
+                    {
+                        name: 'objTypeName',
+                        title: '对象'
+                    },
+                    {
+                        name: 'addressFull',
+                        title: '地址'
+                    },
                     ],
                     searchContent: [{
-                            code: 'supplier-customer',
-                            title: '选择对象',
-                            searchType: Constants.searchType.switch,
-                            list: [{
-                                    code: 'supplier',
-                                    title: '供应商'
-                                },
-                                {
-                                    code: 'customer',
-                                    title: '客户'
-                                }
-                            ]
+                        code: 'supplier-customer',
+                        title: '选择对象',
+                        searchType: Constants.searchType.switch,
+                        list: [{
+                            code: 'supplier',
+                            title: '供应商'
                         },
+                        {
+                            code: 'customer',
+                            title: '客户'
+                        }
+                        ]
+                    },
 
                     ],
                     placeholder: ['customerName', 'supplierName', 'address', 'telephone']
@@ -391,6 +423,12 @@ Page({
             default:
                 break;
         }
+        // 多选，数据回显到已选列表
+        if (this.data.chooseFlag && this.data.item && this.data.item.data) {
+            this.setData({
+                choosedData: this.data.item.data
+            })
+        }
         wx.setNavigationBarTitle({
             title: '选择' + title,
         })

package-base-select/pages/select-data/select-data.wxml

@@ -7,8 +7,8 @@
     </dk-dropdown-menu>
     <!-- 多选 -->
     <van-tabs wx:if="{{chooseFlag}}" type="card" custom-class="tags-class" tab-active-class="{{active==0?'dk-tab-active-left':'dk-tab-active-right'}}" animated="{{true}}" swipeable="{{true}}" active="{{ active }}" dot bind:change="changeTag">
-      <van-tab title="商品列表"></van-tab>
-      <van-tab title="已选商品" info="{{choosedData.length==0?'':choosedData.length}}"></van-tab>
+      <van-tab title="待选列表"></van-tab>
+      <van-tab title="已选列表" info="{{choosedData.length==0?'':choosedData.length}}"></van-tab>
     </van-tabs>
     <!--tag-->
     <dk-tabs wx:if="{{tagList && tagList.length > 0}}" active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs"> </dk-tabs>
@@ -21,7 +21,7 @@
 <dk-list wx:if="{{active == 0}}" id="list" list="{{tableData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}" chooseFlag="{{chooseFlag}}" bind:toDetail="toDetail" bind:choose="chooseData"></dk-list>
 
 <!-- 已选列表区 -->
-<dk-list wx:if="{{chooseFlag && active == 1}}" id="list" list="{{choosedData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}"></dk-list>
+<dk-list wx:if="{{chooseFlag && active == 1}}" id="choosed" list="{{choosedData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}"></dk-list>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 

package-base-select/pages/select-data/select-data.wxss

@@ -18,7 +18,7 @@
 	font-size: 12px;
   }
 
-.van-tab--active>.van-ellipsis {
+.van-tabs__nav--card >.van-tab--active>.van-ellipsis {
 	color: #fff !important;
 }
 

package-basic-data/pages/product-attribute/product-attribute.js

@@ -45,7 +45,8 @@ Page({
       [
         { code: 'brandCode', type: 'str', title: mixins.$t('brandCode'), required: false, readonly: true, },
         { code: 'brandName', type: 'str', title: mixins.$t('brandName'), required: true },
-        { code: 'supplierIds',formMode: 'index', idKey: 'roleId', chooseType:true, name: 'supplierNames', title: 'supplier', type: 'choose', required: true, dropType: 'supplier', required: true, },
+        { code: 'supplierIds',formMode: 'index', idKey: 'roleId', chooseType:true, name: 'supplierNames',
+         title: mixins.$t('supplier'), type: 'choose', required: true, dropType: 'supplier', required: true, },
         { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
       ],
     sideKey: 0,
@@ -315,7 +316,7 @@ Page({
         [
           { code: 'brandCode', type: 'str', title: mixins.$t('brandCode'), required: false, readonly: true, },
           { code: 'brandName', type: 'str', title: mixins.$t('brandName'), required: true },
-          { code: 'supplierIds', name: 'supplierNames', title: 'supplier', type: 'choose', required: true, dropType: 'supplier', required: true, urlKey: 'selectProductAttributeSuppliers', code: 'supplierIds',formMode: 'index', idKey: 'roleId', },
+          { code: 'supplierIds', name: 'supplierNames', title: 'supplier', type: 'choose', required: true, dropType: 'supplier', required: true, urlKey: 'selectProductAttributeSuppliers', code: 'supplierIds',formMode: 'index', idKey: 'roleId',  title:mixins.$t('supplier')},
       
           { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
         ]
@@ -325,7 +326,7 @@ Page({
       popContent =
         [
           { code: 'catCode', type: 'str', title: mixins.$t('catCode'), required: false, readonly: true, },
-          { code: 'parentId', name: 'parentName', title: 'parent', type: 'choose', required: true, dropType: 'supplier', required: true, urlKey: 'selectProductTypes', },
+          { code: 'parentId', name: 'parentName', title: 'parent', type: 'choose', required: true,  required: true, urlKey: 'selectProductTypes', },
           { code: 'catName', type: 'str', title: mixins.$t('catName'), required: true },
           { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
         ]

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

@@ -17,9 +17,9 @@ Page({
     showPopFlag: true,
     stepperFlag: true,
     cardList: [
-      {name: 'items',title: mixins.$t("goodsDetail"), chooseGoodsFlag: '',sumAmount: 0,displayNum: 2},
-       {name: 'other',title: mixins.$t("otherInfo")}
-      ],
+      { name: 'items', title: mixins.$t("goodsDetail"), chooseGoodsFlag: '', sumReturnAmt: 0, displayNum: 2 },
+      { name: 'other', title: mixins.$t("otherInfo") }
+    ],
 
     cardContentList: [
       { code: 'whId', name: 'whName', title: mixins.$t("warehouseId"), type: 'choose', urlKey: 'openingInventory' }
@@ -49,7 +49,7 @@ Page({
       title: mixins.$t("totalReturn"),//'合计金额',
       type: 'str'
     }, {
-      code: 'sumAmount',
+      code: 'sumReturnAmt',
       content: 0,
       type: 'number'
     }],
@@ -61,19 +61,19 @@ Page({
 * @author : 于继渤
 */
   setParams(params) {
-    params.fromId = this.data.item.purId ? this.data.item.purId : params.purId
-    params.fromNo = this.data.item.purNo ? this.data.item.purNo : params.purNo
+    params.fromId = this.data.item.purId ? this.data.item.purId : params.purId //采购订单id
     let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
-    params.automaticFlg = btnFormData ? btnFormData.flag : false //自动出入库标识 
+    params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出入库标识 
     params.itemList = params.goodsList
-    params.returnQty = params.sumQuantity
-    params.returnAmt = params.sumAmount
+    params.returnQty = params.sumReturnQty
+    params.returnAmt = params.sumReturnAmt
     params.orgId = app.globalData.user.orgId
     params.staffId = app.globalData.user.staffId
     params.makeStaff = app.globalData.user.staffId
+    params.supId = this.data.item.supId
     delete params['goodsList']
-    delete params['sumAmount']
-    delete params['sumQuantity']
+    delete params['sumReturnAmt']
+    delete params['sumReturnQty']
     console.log('params', params)
     // return
     return params
@@ -126,7 +126,7 @@ Page({
     let index = e.detail.index
     let formData = JSON.parse(this.data.formData)
     formData.goodsList[index].itemQty = e.detail.item
-    formData.goodsList[index].returnQty =Math.abs(e.detail.item) 
+    formData.goodsList[index].returnQty = Math.abs(e.detail.item)
     this.setData({
       formData: JSON.stringify(formData)
     })
@@ -141,33 +141,28 @@ Page({
 */
   calculateTotal(goodsList) {
     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 sumReturnAmt = Number(0) //合计金额
+    let sumReturnQty = Number(0) //合计金额
     formData.goodsList.forEach(res => {
       res.itemAmt = Number(res.itemQty * res.priceReturn * -1)
       res.returnAmt = Number(res.itemQty * res.priceReturn)
-      sumAmount += res.itemAmt
-      sumQuantity += res.itemQty
+      sumReturnAmt += res.itemAmt
+      sumReturnQty += res.itemQty
     })
-    formData.sumAmount = sumAmount
-    formData.sumQuantity = sumQuantity
-    console.log('formData', formData)
+    formData.sumReturnAmt = sumReturnAmt
+    formData.sumReturnQty = sumReturnQty
     let cardList = this.data.cardList
     let contentList = this.data.contentList
-
-    cardList[0].sumAmount = sumAmount.toFixed(2)
+    cardList[0].sumReturnAmt = sumReturnAmt.toFixed(2)
     if (contentList.length > 0) {
-      contentList[2].content = sumAmount.toFixed(2)
+      contentList[2].content = sumReturnAmt.toFixed(2)
     }
     this.setData({
       cardList: cardList,
       contentList: contentList,
       formData: JSON.stringify(formData),
-      sumAmount: sumAmount.toFixed(2),
-      afterGoodsRejectedAmount: Number(goodsRejectedAmount + formData.sumAmount).toFixed(2),
-      sumQuantity: sumQuantity,
+      sumReturnAmt: sumReturnAmt.toFixed(2),
+      sumReturnQty: sumReturnQty,
     })
   },
 
@@ -219,6 +214,36 @@ Page({
     }
   },
 
+
+
+
+  /**
+    * @desc : 给表单赋值
+    * @date : 2024/2/1 15:49
+    * @author : 于继渤
+    */
+  setValuesByEdit(data) {
+    console.log('给表单赋值', data)
+    let formData = JSON.parse(this.data.formData)
+    data.goodsList.forEach(res => {
+      res['itemQty'] = res.returnQty * -1
+      res['itemQtyMax'] = res.returnQty* -1
+      res['priceReturn'] = res.priceInto * -1
+    })
+    formData = data
+    this.setData({
+      formData: JSON.stringify(formData)
+    })
+    this.calculateTotal()
+  },
+
+
+
+
+
+
+
+
   /**
    * 生命周期函数--监听页面加载
    */
@@ -234,21 +259,14 @@ Page({
       // })
 
 
-      if (that.data.formMode == Constants.formMode.edit) {
-        that.setData({
-          contentList: [],
-          showPopFlag: false,
-          stepperFlag: false
-        })
-        that.selectByUpdate(data)
-      } else {
+      if (that.data.formMode != Constants.formMode.edit) {
         let formData = that.data.formData
         formData = {
           goodsList: data.choooseInboundItemList
         }
         that.setData({
           formData: JSON.stringify(formData),
-          goodsRejectedAmount: Number(data.goodsRejectedAmount),
+          beforeSumAmount: Number(data.beforeSumAmount),
           tableData: data.choooseInboundItemList,
           item: JSON.parse(data.item)
         })

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}}
+          {{item.supName ? item.supName : item.supplierName}}
         </view>
       </view>
       <!-- 收货人 -->
@@ -52,14 +52,14 @@
     <view style="width:50%;color:#1B365D;text-align: center;font-size:4vw; border-right: 1rpx lightgray solid ;" bindtap="toChooseGoods">
       <view style="font-weight:bold;font-size:15px; margin-bottom: -11px;">
         <!-- 合计金额 - 合计退货金额 -->
-        <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="13" contentColor="#1B365D" spaceWidth="0" contentFontWeight="bold" content="{{goodsRejectedAmount }}"></dk-cell>
+        <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="13" contentColor="#1B365D" spaceWidth="0" contentFontWeight="bold" content="{{beforeSumAmount }}"></dk-cell>
       </view>
       <view style="font-size:13px;">退货前总额</view>
     </view>
     <view style="width:50%;color:#1B365D;text-align: center;font-size:4vw; " bindtap="scanQRCode">
       <view style="margin-bottom: -11px;">
         <!-- 退货后总额 =  退货前 + 合计 -->
-        <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="13" contentColor="#A5814A" spaceWidth="0" contentFontWeight="bold" content="{{afterGoodsRejectedAmount}}"></dk-cell>
+        <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="13" contentColor="#A5814A" spaceWidth="0" contentFontWeight="bold" content="{{afterSumAmount}}"></dk-cell>
       </view>
       <view style="font-size:13px;">退货后总额</view>
     </view>
@@ -69,7 +69,7 @@
 
 <dk-form-bill id="dk-form-bill"  routeObjName="{{routeObjName}}"  
 cardList="{{cardList}}"  titleTagCol ="shortName"  titleCol ="skuCode"   showPopFlag="{{showPopFlag}}"
-descCol = "skuModel" priceCol ="priceReturn" quantityCol ="itemQty"   sumAmountCol ="sumAmount"
+descCol = "skuModel" priceCol ="priceReturn" quantityCol ="itemQty"   sumAmountCol ="sumReturnAmt"
 contentObj="{{contentObj}}" model:value="{{formData}}"
 popType = "sale" 
 

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

@@ -8,8 +8,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-    goodsRejectedAmount: 0,
-    afterGoodsRejectedAmount: 0,
+    beforeSumAmount: 0,
+    afterSumAmount: 0,
     pageFlag: false,
     tableData: [],
     // 路由
@@ -18,7 +18,7 @@ Page({
       name: 'items',
       title: mixins.$t("goodsDetail"),
       chooseGoodsFlag: false,
-      sumAmount: 0,
+      sumReturnAmt: 0,
       info: '(' + mixins.$t("outOfStorage") + ')',
       color: '#E4002B',
       displayNum: 2
@@ -37,13 +37,12 @@ Page({
         title: mixins.$t("uploader")
       }]
     },
-
     buttonList: [
       { name: 'merge', title: mixins.$t("outProcessing"), }
     ],
     contentList: [
       { code: 'need', title: mixins.$t("totalReturn"), type: 'str' },
-      { code: 'sumAmount', content: 0, type: 'number' }
+      { code: 'sumReturnAmt', content: 0, type: 'number' }
     ],
   },
 
@@ -68,42 +67,73 @@ Page({
       cardList[0].color = ''
     }
     let contentList = this.data.contentList
-    contentList[1].content = data.returnAmt 
-    cardList[0].sumAmount = data.returnAmt  
-     let formData = JSON.parse(this.data.formData)
+    contentList[1].content = data.returnAmt
+    cardList[0].sumReturnAmt = 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.priceInto = res.priceInto * -1
       res['returnQtyMax'] = res.returnQty
     })
-
     this.setData({
+      beforeSumAmount: Math.abs(data.returnAmt),
       contentList: contentList,
       buttonList: buttonList,
       cardList: cardList,
       formData: JSON.stringify(formData),
-      item:data
+      item: data
     })
   },
 
-  setForm(item){
-    
-  },
-
 
 
+  /**
+  * @desc :商品明细数量加减事件
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
+  onChangeStepper(e) {
+    let index = e.detail.index
+    let formData = JSON.parse(this.data.formData)
+    formData.goodsList[index].returnQty = e.detail.item
+    this.setData({
+      formData: JSON.stringify(formData)
+    })
+    //计算金额
+    this.calculateTotal()
+  },
 
   /**
+* @desc :计算金额
+* @date : 2024/2/1 15:49
+* @author : 于继渤
+*/
+  calculateTotal(goodsList) {
+    let formData = JSON.parse(this.data.formData)
+    let beforeSumAmount = this.data.beforeSumAmount
+    let sumReturnAmt = Number(0)
+    formData.goodsList.forEach(res => {
+      res.returnAmt = res.returnQty * res.priceInto
+      sumReturnAmt += res.returnAmt
+    })
+    let contentList = this.data.contentList
+    let cardList = this.data.cardList
+    contentList[1].content = sumReturnAmt * -1
+    cardList[0].sumReturnAmt = sumReturnAmt * -1
+    this.setData({
+      afterSumAmount:  beforeSumAmount + (sumReturnAmt * -1) ,
+      contentList: contentList,
+      cardList: cardList,
+      formData: JSON.stringify(formData)
+    })
+  },
+  /**
    * 生命周期函数--监听页面加载
    */
   loadInit() {
-    console.log('item', this.data.item)
-    let item = this.data.item
 
-    // this.getDetail(item.intoId)
-  
+
   },
 
 

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

@@ -58,14 +58,14 @@
     <view style="width:50%;color:#1B365D;text-align: center;font-size:4vw; border-right: 1rpx lightgray solid ;" bindtap="toChooseGoods">
       <view style="font-weight:bold;font-size:15px; margin-bottom: -11px;">
         <!-- 合计金额 - 合计退货金额 -->
-        <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="13" contentColor="#1B365D" spaceWidth="0" contentFontWeight="bold" content="{{goodsRejectedAmount}}"></dk-cell>
+        <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="13" contentColor="#1B365D" spaceWidth="0" contentFontWeight="bold" content="{{beforeSumAmount}}"></dk-cell>
       </view>
       <view style="font-size:13px;">退货前总额</view>
     </view>
     <view style="width:50%;color:#1B365D;text-align: center;font-size:4vw; " bindtap="scanQRCode">
       <view style="margin-bottom: -11px;">
         <!-- 退货后总额 =  退货前 + 合计 -->
-        <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="13" contentColor="#A5814A" spaceWidth="0" contentFontWeight="bold" content="{{afterGoodsRejectedAmount}}"></dk-cell>
+        <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="13" contentColor="#A5814A" spaceWidth="0" contentFontWeight="bold" content="{{afterSumAmount}}"></dk-cell>
       </view>
       <view style="font-size:13px;">退货后总额</view>
     </view>
@@ -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 ="returnAmt" quantityCol ="returnQty"  quantityMax="returnQtyMax" stepperFlag="{{item.outStatus !=='出库状态-已出库' ?  true : false}}" sumAmountCol ="sumAmount"
+descCol = "skuModel" priceCol ="priceInto" quantityCol ="returnQty"  quantityMax="returnQtyMax" stepperFlag="{{item.outStatus !=='出库状态-已出库' ?  true : false}}" sumAmountCol ="sumReturnAmt"
 contentObj="{{contentObj}}" model:value="{{formData}}" 
  popType = "sale" priceTitle = "">
 </dk-form-bill>