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

components/dkbase/dk-form-bill/dk-form-bill.js

@@ -12,6 +12,7 @@ const util = require('@/utils/util.js')
 const Constants = require('@/utils/Constants');
 const chooseLocation = requirePlugin('chooseLocation');
 const config = require('@/config/config.js')
+import Dialog from '@/dist/dialog/dialog.js';
 const app = getApp();
 Component({
   /**
@@ -215,7 +216,6 @@ Component({
     chooseText: {
       type: String,
     },
-
     goodsTagColor: { //标签颜色
       type: String,
     },
@@ -272,6 +272,7 @@ Component({
           selectGoodsUrl: '/package-base-select/pages/select-goods/select-goods'
         })
       }
+      
       // 处理contentObj
       this.handleContentObj();
     },
@@ -288,6 +289,8 @@ Component({
     show: function () {
       // 设置地址
       this.setAddress();
+      // 是否弹出询问框
+      this.checkDialog();
     }
   },
   /**
@@ -295,6 +298,42 @@ Component({
    */
   methods: {
     /**
+     * @desc   : 改变后是否弹出询问
+     * @author : 周兴
+     * @date   : 2024/1/26 11:46
+     */
+    checkDialog(){
+      let item = this.data.item;
+      let originalData = this.data.originalData;
+      let form = this.data.form
+      let itemName = this.data.itemName
+
+      if(item && item.clearItemFlag && form[itemName] && form[itemName].length > 0 
+        && originalData && originalData.id != form[item.code]){
+        Dialog.confirm({
+          message: '是否清空商品明细？',
+        }).then(() => {
+          form[itemName] = []
+          originalData.id = form[item.code]
+          originalData.name = form[item.name]
+          this.setData({
+            originalData:originalData,
+            form:form,
+            value:JSON.stringify(form)
+          })
+        }).catch(() => {
+          setTimeout(()=>{
+            form[item.code] =  originalData.id
+            form[item.name] =  originalData.name
+            this.setData({
+              form:form,
+              value:JSON.stringify(form)
+            })
+          },500)
+        })
+      }
+    },
+    /**
      * @desc   : 处理ContentObj数据
      * @author : 周兴
      * @date   : 2024/1/26 11:46
@@ -455,14 +494,18 @@ Component({
           card: item.card
         })
       } else if (item.item.type == 'choose') {
+        
         that.setData({
           changeObj: item.item.changeObj,
         })
+        console.log('go',this.data.form);
         // 跳转链接
         if (item.item.urlKey) {
           this.setData({
             index: item.index,
-            card: item.card
+            card: item.card,
+            item:item.item,
+            key:item.key
           })
           let route = this.data.routeUrl[this.data.routeObjName][item.item.urlKey]
           let url = route.url
@@ -490,7 +533,15 @@ Component({
                         contentObj: contentObj
                       })
                     }
-                  }  
+                  } 
+                  // 如果需要询问，那么需要记录原始的值
+                  console.log('eeef',item,that.data.form,item.key, that.data.form[item.key]);
+                  if(item.item.clearItemFlag){
+                    that.setData({
+                      originalData: {id:that.data.form[item.key],name:that.data.form[item.name]}
+                    })
+                  } 
+
                   that.triggerEvent("chooseData", { code: item.key, data: data, index: item.index })
                   // 如果需要联动控制选商品按钮
                   if (item.item.controlChooseFlag) {
@@ -704,6 +755,9 @@ Component({
     openChooseItems(e) {
       console.log("openChooseItems", e);
       if (this.data.selectGoodsUrl) {
+        this.setData({
+          item:null
+        })
         let _this = this
         wx.navigateTo({
           url: this.data.selectGoodsUrl,
@@ -1413,6 +1467,7 @@ Component({
     customersChoose() {
       this.triggerEvent("customersChoose", {})
     },
+
     /**
      * @desc : 获取语言的方法
      * @author : 周兴

components/dkbase/dk-form-bill/dk-form-bill.wxml

@@ -1,5 +1,5 @@
 <wxs src='../../../utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
-
+<van-dialog id="van-dialog" />
 <!-- 销售订单  -->
 <view style="display:flex;" wx:if="{{type == 'sale' &&  saleStaffAndOrgFlag}}">
   <!-- 主从业务员  -->

package-accounts-manage/pages/funds-transfer/funds-transfer.js

@@ -56,8 +56,26 @@ Page({
               // 路由
       routeObjName: 'transfer',
         // 主键Id 
-      primaryKey: 'trfId',
-          tableData: [{  collectStatus: '11', collectAmount: 1000, }]
+      primaryKey: 'trfId', 
+          // 列表区（脚部金额）
+    footerAmount: {
+      name: 'amtTrf',
+      title: mixins.$t('totalAmount')
+    },
+               // 列表区（脚部信息）
+     footerInfo: [{   name: 'amtTrf',  }],
+contentnFootList: [
+  {
+    title: mixins.$t('totalAmount'),
+    code: 'amtTrf',
+    content: 0,
+    type: 'number'
+  }, {
+    type: 'count',
+    code: 'count',
+    bill: 1,
+  }
+],
   },
 
  /** 

package-accounts-manage/pages/funds-transfer/funds-transfer.wxml

@@ -16,7 +16,7 @@
 <van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}"  />
 
 <!-- 列表区 -->
-<dk-list  bind:toDetail="toDetail"   list="{{tableData}}" flgPoint = "{{true}}" title="trfOutMacName" collectCol = "amtTrf"  content="{{contentList}}"    ></dk-list>
+<dk-list  bind:toDetail="toDetail"   list="{{tableData}}" flgPoint = "{{true}}" title="trfOutMacName"   content="{{contentList}}" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}"   ></dk-list>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 <view style="height: 200rpx;"></view>

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

@@ -376,6 +376,18 @@ mixins: [mixins],
           item.amtReceivable = element.receiptResidue //收入金额  
           itemList.push(item)
         });
+        let receiptList = []
+        tableData.forEach(item => {
+          payment.push(
+            {
+              amtRec: item.sumAmount, 
+              macCode: item.macCode,
+              macId: item.macId,
+              macName: item.macName,
+            }
+          )
+        })
+        params.receiptList = receiptList
         params.sumAmtReceivable = itemNumber
       } else if (this.data.formType == 8) { //订单开单收款
 

package-inventory/pages/inventory-adjustment/add/add.js

@@ -1,7 +1,6 @@
 // package-basic-data/pages/test/add/add.js
 const mixins = require('@/mixins/index.js')
 const utils = require('@/utils/util');
-import Dialog from '@/dist/dialog/dialog.js';
 const app = getApp()
 const Constants = require('@/utils/Constants');
 Page({
@@ -10,7 +9,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    controlFlags:{choosewhFlag:true,chooseWhByUserDefault:true,choosewhReadonly:false,paramsByWhId:true,sourcePage:'inventory-adjustment'},
+    controlFlags: { choosewhFlag: true, chooseWhByUserDefault: true, choosewhReadonly: false, paramsByWhId: true, sourcePage: 'inventory-adjustment' },
     draftFlag: false,
     purIdArray: '', //来源单id 
     // 弹出按钮
@@ -29,99 +28,100 @@ Page({
       rightCode: 'invQty'
     }],
     popContent: [{
-        code: 'itemQty',
-        type: 'step',
-        title: mixins.$t('countedQuantity'), //'数量', 
-        required: true
-      },
+      code: 'itemQty',
+      type: 'step',
+      title: mixins.$t('countedQuantity'), //'数量', 
+      required: true
+    },
 
-      {
-        code: 'oWhId',
-        name: 'oWhName',
-        title: '源库区', //'盘亏原因',
+    {
+      code: 'oWhId',
+      name: 'oWhName',
+      title: '源库区', //'盘亏原因',
+      type: 'choose',
+      urlKey: 'selectInventorySku'
+    },
+    {
+      code: 'whId',
+      name: 'whName',
+      title: '目标库区', //'盘亏原因',
+      type: 'choose',
+      urlKey: 'chooseWh'
+    },
+    {
+      code: 'nonStdCode',
+      title: mixins.$t("goodsBatch"), //'商品批次',
+      type: 'str',
+      readonly: true,
+    },
+    {
+      code: 'oNonStdCode',
+      name: 'oNonStdName',
+      title: '源批号', // '仓库',
+      type: 'str',
+    },
+    {
+      code: 'nonStdCode',
+      name: 'nonStdName',
+      title: '目标批号', //'盘亏原因',
+      type: 'str',
+      urlKey: 'openingReason'
+    },
+
+    ],
+
+    cardList: [{
+      name: 'main',
+      title: mixins.$t("inventoryInformation"), //'盘点信息 
+    },
+    {
+      name: 'items',
+      title: mixins.$t("goodsDetail"), //'商品明细',
+      info: '(' + mixins.$t("warehousingProcessing") + ')',
+      color: '#E4002B',
+      displayNum: 2
+    }, {
+      name: 'other',
+      title: mixins.$t("otherInfo"), // '其他信息'
+    }
+    ],
+    contentObj: {
+      main: [{
+        code: 'transferType',
+        name: 'transferTypeName',
+        title: "调整类型", //mixins.$t("inventoryEmployees"),  
+        type: 'choose',
+        required: true,
+        clearItemFlag:true,
+        urlKey: 'chooseAdjustmentType',
+      }, {
+        code: 'staffId',
+        name: 'staffName',
+        title: '责任人', //'盘点员工', 
+        type: 'choose',
+        required: true,
+        urlKey: 'chooseStaff'
+      }, {
+        code: 'orgId',
+        name: 'orgName',
+        title: '部门', //'盘点部门',  
         type: 'choose',
-        urlKey: 'selectInventorySku'
+        required: true,
+        urlKey: 'chooseOrg'
       },
       {
         code: 'whId',
         name: 'whName',
-        title: '目标库区', //'盘亏原因',
         type: 'choose',
+        title: "目标仓库", //'盘点仓库' 
         urlKey: 'chooseWh'
       },
       {
         code: 'nonStdCode',
-        title: mixins.$t("goodsBatch"), //'商品批次',
-        type: 'str',
-        readonly: true,
-      },
-      {
-        code: 'oNonStdCode',
-        name: 'oNonStdName',
-        title: '源批号', // '仓库',
-        type: 'str',
-      },
-      {
-        code: 'nonStdCode',
         name: 'nonStdName',
-        title: '目标批号', //'盘亏原因',
         type: 'str',
-        urlKey: 'openingReason'
-      },
-
-    ],
-
-    cardList: [{
-        name: 'main',
-        title: mixins.$t("inventoryInformation"), //'盘点信息 
-      },
-      {
-        name: 'items',
-        title: mixins.$t("goodsDetail"), //'商品明细',
-        info: '(' + mixins.$t("warehousingProcessing") + ')',
-        color: '#E4002B',
-        displayNum: 2
-      }, {
-        name: 'other',
-        title: mixins.$t("otherInfo"), // '其他信息'
+        title: "目标批号", //'盘点仓库'  
       }
-    ],
-    contentObj: {
-      main: [{
-          code: 'transferType',
-          name: 'transferTypeName',
-          title: "调整类型", //mixins.$t("inventoryEmployees"),  
-          type: 'choose',
-          required: true,
-          urlKey: 'chooseAdjustmentType',
-        }, {
-          code: 'staffId',
-          name: 'staffName',
-          title: '责任人', //'盘点员工', 
-          type: 'choose',
-          required: true,
-          urlKey: 'chooseStaff'
-        }, {
-          code: 'orgId',
-          name: 'orgName',
-          title: '部门', //'盘点部门',  
-          type: 'choose',
-          required: true,
-          urlKey: 'chooseOrg'
-        },
-        {
-          code: 'whId',
-          name: 'whName',
-          type: 'choose',
-          title: "目标仓库", //'盘点仓库' 
-          urlKey: 'chooseWh'
-        },
-        {
-          code: 'nonStdCode',
-          name: 'nonStdName',
-          type: 'str',
-          title: "目标批号", //'盘点仓库'  
-        }
       ],
       items: [],
       other: [{
@@ -137,7 +137,6 @@ Page({
     },
     // 路由
     routeObjName: 'inventoryAdjustment',
-
     // inboundProcessingService: app.globalData['inboundProcessingService'],
   },
   /*
@@ -159,22 +158,18 @@ Page({
       }
     }
   },
- 
   /*
    * @desc   : 绑定数据
    * @author : 王英杰
    * @date   : 2024年3月12日
    */
   chooseData(e) {
- 
-    console.log("t", e, this.data.formData);
     let formData = JSON.parse(this.data.formData)
     let code = e.detail.code
     let data = e.detail.data.data
     if (code == "transferType") { //调整类型
       formData.transferType = data.id
       formData.transferTypeName = data.name
- 
       this.switchTransferType(formData.transferType)
     }
     if (code == "staffId") { //员工
@@ -189,7 +184,6 @@ Page({
       formData.whId = data.id
       formData.whName = data.name
 
-      
       if (formData.goodsList) {
         formData.goodsList.forEach(element => { //总单的目标仓库 作为一个总开关 直接改变 所以品的仓库
           element.whId = data.id
@@ -212,34 +206,35 @@ Page({
       this.setData({
         contentObj: {
           main: [{
-              code: 'transferType',
-              name: 'transferTypeName',
-              title: "调整类型", //mixins.$t("inventoryEmployees"),  
-              type: 'choose',
-              required: true,
-              urlKey: 'chooseAdjustmentType',
-            }, {
-              code: 'staffId',
-              name: 'staffName',
-              title: '责任人', //'盘点员工', 
-              type: 'choose',
-              required: true,
-              urlKey: 'chooseStaff'
-            }, {
-              code: 'orgId',
-              name: 'orgName',
-              title: '部门', //'盘点部门',  
-              type: 'choose',
-              required: true,
-              urlKey: 'chooseOrg'
-            },
-            {
-              code: 'whId',
-              name: 'whName',
-              type: 'choose',
-              title: "目标仓库", //'盘点仓库' 
-              urlKey: 'chooseWh'
-            },
+            code: 'transferType',
+            name: 'transferTypeName',
+            title: "调整类型", //mixins.$t("inventoryEmployees"),  
+            type: 'choose',
+            required: true,
+            clearItemFlag:true,
+            urlKey: 'chooseAdjustmentType',
+          }, {
+            code: 'staffId',
+            name: 'staffName',
+            title: '责任人', //'盘点员工', 
+            type: 'choose',
+            required: true,
+            urlKey: 'chooseStaff'
+          }, {
+            code: 'orgId',
+            name: 'orgName',
+            title: '部门', //'盘点部门',  
+            type: 'choose',
+            required: true,
+            urlKey: 'chooseOrg'
+          },
+          {
+            code: 'whId',
+            name: 'whName',
+            type: 'choose',
+            title: "目标仓库", //'盘点仓库' 
+            urlKey: 'chooseWh'
+          },
           ],
           items: [],
           other: [{
@@ -254,32 +249,32 @@ Page({
           }]
         },
         popContent: [{
-            code: 'itemQty',
-            type: 'step',
-            title: mixins.$t('countedQuantity'), //'数量', 
-            required: true
-          },
+          code: 'itemQty',
+          type: 'step',
+          title: mixins.$t('countedQuantity'), //'数量', 
+          required: true
+        },
 
-          {
-            code: 'oWhId',
-            name: 'oWhName',
-            title: '源库区', //'盘亏原因',
-            type: 'choose',
-            urlKey: 'selectInventorySku'
-          },
-          {
-            code: 'whId',
-            name: 'whName',
-            title: '目标库区', //'盘亏原因',
-            type: 'choose',
-            urlKey: 'chooseWh'
-          },
-          {
-            code: 'nonStdCode',
-            title: mixins.$t("goodsBatch"), //'商品批次',
-            type: 'str',
-            readonly: true,
-          },
+        {
+          code: 'oWhId',
+          name: 'oWhName',
+          title: '源库区', //'盘亏原因',
+          type: 'choose',
+          urlKey: 'selectInventorySku'
+        },
+        {
+          code: 'whId',
+          name: 'whName',
+          title: '目标库区', //'盘亏原因',
+          type: 'choose',
+          urlKey: 'chooseWh'
+        },
+        {
+          code: 'nonStdCode',
+          title: mixins.$t("goodsBatch"), //'商品批次',
+          type: 'str',
+          readonly: true,
+        },
 
 
         ],
@@ -288,33 +283,34 @@ Page({
       this.setData({
         contentObj: {
           main: [{
-              code: 'transferType',
-              name: 'transferTypeName',
-              title: "调整类型", //mixins.$t("inventoryEmployees"),  
-              type: 'choose',
-              required: true,
-              urlKey: 'chooseAdjustmentType',
-            }, {
-              code: 'staffId',
-              name: 'staffName',
-              title: '责任人', //'盘点员工', 
-              type: 'choose',
-              required: true,
-              urlKey: 'chooseStaff'
-            }, {
-              code: 'orgId',
-              name: 'orgName',
-              title: '部门', //'盘点部门',  
-              type: 'choose',
-              required: true,
-              urlKey: 'chooseOrg'
-            },
-            {
-              code: 'nonStdCode',
-              name: 'nonStdName',
-              type: 'str',
-              title: "目标批号", //'盘点仓库'  
-            }
+            code: 'transferType',
+            name: 'transferTypeName',
+            title: "调整类型", //mixins.$t("inventoryEmployees"),  
+            type: 'choose',
+            required: true,
+            clearItemFlag:true,
+            urlKey: 'chooseAdjustmentType',
+          }, {
+            code: 'staffId',
+            name: 'staffName',
+            title: '责任人', //'盘点员工', 
+            type: 'choose',
+            required: true,
+            urlKey: 'chooseStaff'
+          }, {
+            code: 'orgId',
+            name: 'orgName',
+            title: '部门', //'盘点部门',  
+            type: 'choose',
+            required: true,
+            urlKey: 'chooseOrg'
+          },
+          {
+            code: 'nonStdCode',
+            name: 'nonStdName',
+            type: 'str',
+            title: "目标批号", //'盘点仓库'  
+          }
           ],
           items: [],
           other: [{
@@ -329,25 +325,25 @@ Page({
           }]
         },
         popContent: [{
-            code: 'itemQty',
-            type: 'step',
-            title: mixins.$t('countedQuantity'), //'数量', 
-            required: true
-          },
+          code: 'itemQty',
+          type: 'step',
+          title: mixins.$t('countedQuantity'), //'数量', 
+          required: true
+        },
 
-          {
-            code: 'oNonStdCode',
-            name: 'oNonStdName',
-            title: '源批号', // '仓库',
-            type: 'str',
-          },
-          {
-            code: 'nonStdCode',
-            name: 'nonStdName',
-            title: '目标批号', //'盘亏原因',
-            type: 'str',
-            urlKey: 'openingReason'
-          },
+        {
+          code: 'oNonStdCode',
+          name: 'oNonStdName',
+          title: '源批号', // '仓库',
+          type: 'str',
+        },
+        {
+          code: 'nonStdCode',
+          name: 'nonStdName',
+          title: '目标批号', //'盘亏原因',
+          type: 'str',
+          urlKey: 'openingReason'
+        },
 
         ],
       })
@@ -404,30 +400,30 @@ Page({
   setParams(params) {
     let formData = JSON.parse(this.data.formData)
     params.staffId = formData.staffId
-    params.orgId = formData.orgId 
+    params.orgId = formData.orgId
     params.transferType = formData.transferType
     params.makeStaff = app.globalData.user.staffId
     params.remarks = formData.remarks
-    params.oWhId = formData.oWhId||''  
+    params.oWhId = formData.oWhId || ''
     params.whId = formData.whId
-    params.oNonStdCode = formData.oNonStdCode||''   
+    params.oNonStdCode = formData.oNonStdCode || ''
     params.nonStdCode = formData.nonStdCode
 
     let itemList = []
     formData.goodsList.forEach((element, index) => {
       let item = {}
-      item.itemIndex = index 
-      item.transferQty = element.itemQty 
-      item.oWhId = element.oWhId||''   
-      item.whId = element.whId||''   
-      item.oNonStdCode = element.oNonStdCode||''   
-      item.nonStdCode = element.nonStdCode||''   
-      item.skuId = element.skuId||''    
-      item.oInvId = element.invId||''   
+      item.itemIndex = index
+      item.transferQty = element.itemQty
+      item.oWhId = element.oWhId || ''
+      item.whId = element.whId || ''
+      item.oNonStdCode = element.oNonStdCode || ''
+      item.nonStdCode = element.nonStdCode || ''
+      item.skuId = element.skuId || ''
+      item.oInvId = element.invId || ''
       // item.priceInto = element.priceInto||''   
       // item.intoingAmt = element.intoingAmt||''   
       itemList.push(item)
-    }); 
+    });
 
     params.itemList = itemList
     return params;
@@ -518,7 +514,6 @@ Page({
     this.setData({
       formData: JSON.stringify(formData)
     })
- 
   },
   /**
    * @desc : 按钮点击事件回调
@@ -526,7 +521,7 @@ Page({
    * @author : 王英杰
    */
   open(e) {
- 
+
     console.log('ee', e);
     let that = this
     let code = e.detail.name

package-inventory/pages/inventory-adjustment/add/add.wxml

@@ -8,7 +8,7 @@
 <!-- <dk-form id="{{formName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
 </dk-form> -->
 
-<dk-form-bill sumAmountColFlag="{{false}}" type="out" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" subCol="skuCode" descCol="skuskuCodeModel"   quantityCol="itemQty"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['wholesalePrice']}}：" bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}" popupTopObj="{{popupTopObj}}"
+<dk-form-bill sumAmountColFlag="{{false}}" type="out" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" subCol="skuCode" descCol="skuskuCodeModel"   quantityCol="itemQty"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['wholesalePrice']}}：" bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}" popupTopObj="{{popupTopObj}}" 
 bind:delItem="setGoods" bind:setGoods="setGoods" bind:changeField="changeField" controlFlags ="{{controlFlags}}">
 </dk-form-bill>
 

package-purchase/pages/supplier-list/add/add.js

@@ -160,6 +160,7 @@ Page({
        params.serviceCategories = (params.serviceCategories && params.serviceCategories.length > 0) ? params.serviceCategories.split(',') : []
        params.brandIds = (params.brandIds && params.brandIds.length > 0) ? params.brandIds.split(',') : []
        params.returnAddress   = saveData.addressFull
+       params.makeStaff = app.globalData.user.staffId
        return params
    },