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

api/pages/ivt/saleOutBound.js

@@ -30,6 +30,9 @@ module.exports = {
       openingInventory: { key: 'openingInventory', url: '/package-base-select/pages/select-data/select-data',type:'warehouse'  },
       selectInventorySku:{ key: 'selectInventorySku', url: '/package-base-select/pages/select-data/select-data',type:'inventorySku'  },
       invalid: { key: 'invalid', method: 'invalid', primaryKey: 'outId' , image:'btn-void.png'},
+      editInto: { key: 'editInto', method: 'editInto', primaryKey: 'outId', image: 'btn-edit.png'}, //编辑
+
+      printedBill:{ key: 'printedBill', method:'printedBill', formMode: 'index', idKey: 'cusId',image:'btn-printing.png' }
     }
   }
 };

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

@@ -1376,8 +1376,8 @@ Component({
           item.priceStd = item.priceStandard//标价
           item.outingQty = item.itemQty * -1
           item.amtStd = Number(item.priceStd * item.itemQty)
-          delete item['outQty']
-          delete item['outAmt']
+          // delete item['outQty']
+          // delete item['outAmt']
           item.outingAmt = item.priceOut * item.outingQty
           item.priceDiscount = item.priceStd ? Number((item.priceOut / item.priceStd) * 100).toFixed(2) : 100//售价折扣
           sumQuantity += item.outQty //数量

i18n/zh-CN.js

@@ -322,6 +322,7 @@ const saleOrder = {
   flgGift: '赠品标识',
   makeOrder: '成交订单',
   saleOutBoundFlag: '开单并出库办理',
+  autoSaleOutBoundFlag: '自动出库办理',
   saleCollection: '需收款',
   customerInformation: '客户信息',
   printedBill: '打印票据',

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

@@ -140,7 +140,7 @@ setSearchParams(params) {
     })
     if (choooseInboundItemList && choooseInboundItemList.length > 0) {
       choooseInboundItemList.forEach(res => {
-        returnTotalAmount += Number(res.rejectQty * res.priceInto)
+        returnTotalAmount += Number(res.itemQty * res.priceSale)
       })
     }
 

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

@@ -67,6 +67,9 @@ Page({
       content: 0,
       type: 'number'
     }],
+
+    // 系统参数
+    flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "1" ? true : false
   },
   /**
    * @desc   : 绑定数据
@@ -155,7 +158,13 @@ Page({
     }
 
     let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
-    params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出入库标识 
+    if (this.data.flgHandleSetting) {
+      params.flgAutoHandle = true
+    } else {
+      params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出入库标识 
+    }
+    // 系统参数
+    params.flgHandleSetting = this.data.flgHandleSetting
     // params.flgHandleSetting = btnFormData ? btnFormData.flag : false //自动出入库标识 
     params.itemList = params.goodsList
     params.orgId = app.globalData.user.orgId
@@ -293,12 +302,12 @@ Page({
     formData.returnAmt = sumReturnAmt
     formData.sumReturnAmt = sumReturnAmt
     formData.returnQty = sumReturnQty
-    if(this.data.formMode = 'add'){
+    if (this.data.formMode = 'add') {
       cardList[2].sumReturnAmt = sumReturnAmt.toFixed(2)
-    }else{
+    } else {
       cardList[0].sumReturnAmt = sumReturnAmt.toFixed(2)
     }
-  
+
     if (contentList.length > 0) {
       contentList[2].content = sumReturnAmt.toFixed(2)
     }
@@ -355,7 +364,7 @@ Page({
     let formData = JSON.parse(this.data.formData)
     data.goodsList.forEach(res => {
       res['itemQty'] = res.returnQty
-      res['itemQtyMin'] = res.sintoItemIntoQty ?  Number(res.sintoItemIntoQty * -1) :   Number(res.invQty * -1) 
+      res['itemQtyMin'] = res.sintoItemIntoQty ? Number(res.sintoItemIntoQty * -1) : Number(res.invQty * -1)
       res['itemQtyMax'] = Number(-1)
       res['priceReturn'] = res.priceInto * -1
     })
@@ -428,7 +437,7 @@ Page({
 
   },
   loadInit() {
-    if(this.data.formMode != Constants.formMode.edit ){
+    if (this.data.formMode != Constants.formMode.edit) {
       let formData = JSON.parse(this.data.formData)
       formData.intoDate = utils.formatDayTime(new Date())
       formData['staff'] = {
@@ -461,7 +470,7 @@ Page({
         formData: JSON.stringify(formData)
       })
     }
-    
+
   }
 
 })

package-sales/pages/sales-outbound/add/add.js

@@ -1,7 +1,7 @@
 const Constants = require('@/utils/Constants.js');
 import Dialog from '@/dist/dialog/dialog.js';
 const mixins = require('@/mixins/index.js')
-const utils = require('@/utils/util')
+const util = require('@/utils/util.js')
 const app = getApp()
 Page({
   mixins: [mixins],
@@ -56,11 +56,11 @@ Page({
     },
     //按钮
     buttonSaveList: [
-      { code: 'collection', title: mixins.$t("collection"), width: '120rpx'},
-      { code: 'save', title: mixins.$t("save"), width: '120rpx'}
+      // { code: 'collection', title: mixins.$t("collection"), width: '120rpx' },
+      { code: 'save', title: mixins.$t("save"), width: '120rpx' }
     ],
     contentSaveList: [
-      { code: 'flag', title: mixins.$t("saleOutBoundFlag"), type: 'checkbox' },
+      { code: 'flag', title: mixins.$t("autoSaleOutBoundFlag"), type: 'checkbox' },
       { code: 'need', title: mixins.$t("saleCollection"), type: 'str' },
       { code: 'receivable', content: 0, type: 'number' }
     ],
@@ -73,7 +73,9 @@ Page({
       { code: 'nonStdCode', title: mixins.$t("goodsBatch"), type: 'str', },
     ],
     popupTopObj: [{ leftTitle: '库存量', leftCode: 'usableQty', rightTitle: '可售量', rightCode: 'invQty' }],
-    titpsFlag: true
+    titpsFlag: true,
+    // 系统参数
+    flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "1" ? true : false
   },
   /**
      * @desc :   编辑
@@ -104,6 +106,7 @@ Page({
      */
   saveChange(e) {
     let btnFormData = JSON.parse(this.data.btnFormData)
+    let formData = JSON.parse(this.data.formData)
     let that = this
     if (!btnFormData.flag) {
       //提示
@@ -118,7 +121,12 @@ Page({
       });
     }
 
+    formData.goodsList.forEach(res => {
+      res.usableQtyInsufficientFlag = JSON.parse(this.data.btnFormData).flag
+    })
+
     this.setData({
+      formData: JSON.stringify(formData),
       titpsFlag: JSON.parse(this.data.btnFormData).flag,
       popupTopObj: JSON.parse(this.data.btnFormData).flag ? [{ leftTitle: '库存量', leftCode: 'usableQty', rightTitle: '可售量', rightCode: 'invQty' }] : [],
     })
@@ -170,7 +178,7 @@ Page({
     params.goodsList.forEach(res => {
       res.outingAmt = res.outAmt
       res.outingQty = res.outQty
-      res.canNegativeFlag =false
+      res.canNegativeFlag = false
       res.outAmt = null
       res.outQty = null
     })
@@ -179,10 +187,16 @@ Page({
     params.makeStaff = app.globalData.user.staffId
     // params.deleteItemList = params.deleteList ? params.deleteList : []
     let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
-    params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出库标识 
+    if (this.data.flgHandleSetting) {
+      params.flgAutoHandle = true
+  } else {
+      params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出入库标识 
+  }
+  // 系统参数
+  params.flgHandleSetting = this.data.flgHandleSetting
     params.addressName = params.address.addressName
-    params.canNegativeFlag =false
-    params.outDate = utils.formatDayTime(new Date())
+    params.canNegativeFlag = false
+    params.outDate = util.formatDayTime(new Date())
     delete params['goodsList']
     delete params['orderItemResponseList']
     console.log('params', params)
@@ -482,12 +496,12 @@ Page({
       formData['orgList'] = item.orgList
     }
     //选择源单
-    
+
     if (code == 'fromNo') {
-      console.log('item.itemList',item.itemList)
+      console.log('item.itemList', item.itemList)
       if (item.itemList && item.itemList.length > 0) {
-        item.itemList.forEach(res=>{
-          
+        item.itemList.forEach(res => {
+
           res.fromId = res.orderId
           res.fromItemId = res.itemId
 
@@ -667,9 +681,17 @@ Page({
       //查询可出库销售订单/商品
       this.setFormMain()
       this.getItemDetal(this.data.item.orderId)
+      // 设置送货日期 当前日期 加一天
+      var currentDate = new Date();
+      currentDate.setDate(currentDate.getDate() + 7);
+      formData.deliveryDate = util.formatDayTime(currentDate)
     } else if (this.data.formMode == Constants.formMode.add) {  //新建
       //处理默认值  业务员业务部门
       formData = this.setStaffOrg(formData)
+      // 设置送货日期 当前日期 加一天
+      var currentDate = new Date();
+      currentDate.setDate(currentDate.getDate() + 7);
+      formData.deliveryDate = util.formatDayTime(currentDate)
     } else if (this.data.formMode == Constants.formMode.detail) { //详情
       //详情办理
       wx.setNavigationBarTitle({

package-sales/pages/sales-outbound/sales-outbound.js

@@ -35,6 +35,13 @@ Page({
       { code: 'org', title: mixins.$t("orgId"), dropType: 'org' },
       { code: 'choose', title: mixins.$t("choose"), searchType: Constants.searchType.pick }
     ],
+        // 查询条件-筛选
+        pullMenuList: [
+          { code: 'outStatus', pullType: 'mSelect', typeName: 'outStatus' },
+          { code: 'receiveStatus', pullType: 'mSelect', typeName: 'receiveStatus' },
+          { code: 'delivery_Time', dataType: 'date' },
+          { code: 'viewVoidedDocuments', dataType: 'checkbox' },
+        ],
     contentObj: {
       '待出库': [
         { name: 'outNo', title: mixins.$t("outOrderNo") },
@@ -60,15 +67,36 @@ Page({
 
     // 弹出按钮
     buttonList: [
+      {
+        name: 'editInto',
+        title: mixins.$t('edit')
+      },
       { name: 'salesOutbound', title: mixins.$t("outProcessing") },
-      { name: 'merge', title: mixins.$t("printedBill") },
+      {
+        name: 'printedBill',
+        title: mixins.$t('printedBill') //打印票据
+      },
       { name: 'invalid', title: mixins.$t("invaidOrder") } //作废
     ],
     // 路由
     routeObjName: 'saleOutBound',
     active: 0
   },
-
+  /**
+     * @desc : 编辑
+     * @author : 于继渤
+     * @date : 2024/1/23 9:16
+     */
+    editInto(e) {
+      let item = e
+      wx.navigateTo({
+        url: this.data.route.add.url,
+        success: function (res) {
+          // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+          res.eventChannel.emit('params', { id: item.outId, formMode: Constants.formMode.edit, item: item })
+        }
+      })
+    },
   /**
    * @desc :   作废
    * @date : 2024年3月8日
@@ -108,6 +136,7 @@ Page({
   setSearchParams(params) {
     //销售状态
     params.outStatus = this.data.outStatus == 'all' ? '' : this.data.outStatus
+    params.viewVoidedDocuments = params.viewVoidedDocuments ? true : false
     return params
   },
   /**

package-sales/pages/sales-outbound/sales-outbound.json

@@ -1,4 +1,6 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText": "销售出库"
+    "navigationBarTitleText": "销售出库",
+    "enablePullDownRefresh": true,
+    "backgroundTextStyle": "light"
   }