Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss_wx_app

api/pages/ivt/inbound.js

@@ -22,7 +22,7 @@ module.exports = {
       inProcessing: { key: 'inProcessing', method: 'inProcessing', primaryKey: 'intoId', image: 'btn-warehousing-processing.png'}, //入库办理
       editInbound: { key: 'editInbound', method: 'editInbound', primaryKey: 'intoId', image: 'btn-edit.png'}, //编辑
       invaidOrder: { key: 'invaidOrder', method: 'invaidOrder',image: 'btn-void.png',question:true  },//作废
-      ticketPirnt: { key: 'ticketPirnt', method: 'ticketPirnt', primaryKey: 'rpId', image:'btn-printing.png' },//打印
+      printedBill: { key: 'printedBill', method: 'printedBill', primaryKey: 'rpId', image:'btn-printing.png' },//打印
       addReturn:{
         key:'addReturn',url:'/package-purchase/pages/purchase-return/add/add',formMode:'add'
       }, 

api/pages/ivt/outbound.js

@@ -11,7 +11,7 @@ module.exports = {
   outboundService: {
     // 前缀
     prefix: 'mdm-server/ivt/outbound/',
-    outboundRepeal: 'repeal/'
+    outboundRepeal: 'repeal/',
   },
 
   routeUrl: {

api/pages/ivt/saleOutBound.js

@@ -16,8 +16,8 @@ module.exports = {
     handleOutbound: 'handle_outbound',
     getOutboundForUpdate:'get_outbound_for_update',
     repeal:'repeal',
-    selectByCondDetail:'select_by_cond_detail', //总单带明细
-    
+    selectByCondDetail:'select_by_cond_detail', //总单带明细 
+    outboundInsertCollection:'outbound_insert_collection',
     saleOrderOutboundCancel: 'sale_order_outbound_cancel',
   },
 

api/pages/mst/supplier.js

@@ -19,10 +19,10 @@ module.exports = {
       add: { key: 'add', url: '/package-purchase/pages/supplier-list/add/add'  },
       edit: { key: 'edit', url: '/package-purchase/pages/supplier-list/add/add'  },
       chooseSupplierCategory: { key: 'chooseSupplierCategory', url: '/package-base-select/pages/select-data/select-data',type:'kindData', kindType:'供应商类别' },
-      chooseServiceCategory: { key: 'chooseServiceCategory', url: '/package-base-select/pages/select-data/select-data',type:'kindData', kindType:'服务类别' , chooseFlag:'ture' },
+      chooseServiceCategory: { key: 'chooseServiceCategory', url: '/package-base-select/pages/select-data/select-data',type:'kindData', kindType:'服务类别' , chooseFlag:true },
       chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },
       chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-data/select-data',type:'org' }, 
-      chooseBrandy: { key: 'chooseBrandy',url: '/package-base-select/pages/select-data/select-data',type:'brand', chooseFlag:'ture',repeatFlag:'false'}, 
+      chooseBrandy: { key: 'chooseBrandy',url: '/package-base-select/pages/select-data/select-data',type:'brand', chooseFlag: true,repeatFlag:false}, 
     }
   }
 };

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

@@ -1205,7 +1205,7 @@ Component({
      * @author : 周兴
      * @date   : 2024/2/2 11:46
      */
-    clearField(e) {
+    clearField(e) { 
       // 只读
       if (this.data.readonly) {
         return;
@@ -1229,6 +1229,10 @@ Component({
      * @date   : 2024/2/2 11:46
      */
     clearAddress(e) {
+         // 明细 只读只读240320
+         if (this.data.readonly) {
+          return;
+        }
       let form = this.data.form
       delete form['address']
       delete form['addressName'];
@@ -1328,12 +1332,15 @@ Component({
      * @author : 周兴
      * @date   : 2024/2/2 11:46
      */
-    clearChoose(e) {
-
+    clearChoose(e) { 
       let ds = e.currentTarget.dataset
       let key = ds.key
       let name = ds.name
       let item = ds.item
+        // 明细 只读只读240320
+        if (this.data.readonly) {
+          return;
+        }
       // 明细 只读只读240320
       if (item.readonlyItem) {
         return;

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

@@ -204,7 +204,7 @@
             </van-field>
 
             <!--文本框-->
-            <van-field wx:if="{{item.type=='str' && (item.show || item.show == undefined) && !item.hide }}" required="{{item.required?true:false }}" data-key="{{item.code}}" auto-focus="{{true}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize clearable border="{{ false }}" readonly="{{!!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" bind:blur="blurField" bind:clear="clearField" errorMessage="{{item.errMsg}}">
+            <van-field wx:if="{{item.type=='str' && (item.show || item.show == undefined) && !item.hide }}" required="{{item.required?true:false }}" data-key="{{item.code}}" auto-focus="{{true}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize clearable border="{{ false }}" readonly="{{!!readonly || !!item.readonly}}"  input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:50}}" right-icon="{{item.rightIcon}}" bind:change="changeField" bind:blur="blurField" bind:clear="clearField" errorMessage="{{item.errMsg}}">
               <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
             </van-field>
             <!--选单-->

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

@@ -34,15 +34,15 @@ mixins: [mixins],
       orderService: app.globalData['orderService'],
       otherPayableService: app.globalData['otherPayableService'],
       saleOutBoundReturnService: app.globalData['saleOutBoundReturnService'],
-      outboundService: app.globalData['outboundService'],
+      saleOutBoundService: app.globalData['saleOutBoundService'],
 
     },
 
     /**
-    * @desc : 设置查询参数
-    * @date : 2024年3月8日
-    * @author : 姜永辉
-    */
+     * @desc : 设置查询参数
+     * @date : 2024年3月8日
+     * @author : 姜永辉
+     */
     setSearchParams(params) {
       return params;
     },
@@ -65,8 +65,8 @@ mixins: [mixins],
       let formData = JSON.parse(this.data.item)
       //  根据formtype不同值 
       // formType ：1 收款单 ，2 付款单，3 客户收款保存参数,4 客户退款 5 退收款单 6 退付款单  7 订单开单收款
-      if (this.data.formType == 1 || this.data.formType == 2
-        || this.data.formType == 5 || this.data.formType == 6) {
+      if (this.data.formType == 1 || this.data.formType == 2 ||
+        this.data.formType == 5 || this.data.formType == 6) {
         formData.sumAmount = formData.sumAmount
       }
       this.setData({
@@ -116,10 +116,10 @@ mixins: [mixins],
     },
 
     /**
-    * @desc : 将优惠和本次核销的金额分摊到应收单据的明细里
-    * @date : 2024/2/1 15:49
-    * @author : 姜永辉
-    */
+     * @desc : 将优惠和本次核销的金额分摊到应收单据的明细里
+     * @date : 2024/2/1 15:49
+     * @author : 姜永辉
+     */
     setReturnReceivableList(list, sumWaiveAmt, currentReceivableResidue, totalAmount) {
       let retList = []
       if (sumWaiveAmt == null || sumWaiveAmt == undefined) {
@@ -203,21 +203,23 @@ mixins: [mixins],
       let itemList = []
       //收付款类型-收款的查询参数
       params.rpType = params.rpType ? params.rpType : Constants.rpType.receipt
-      params.orgId = form.orgId  //组织部门
-      params.staffId = form.staffId  // 员工
+      params.orgId = form.orgId //组织部门
+      params.staffId = form.staffId // 员工
       // 合计优惠金额
       params.sumWaiveAmt = 0
       params.annexPaths = form.annexPaths ? form.annexPaths : []
-      params.accDate = form.accDate  // 
-      params.remarks = form.remarks  // 备注
-      params.makeStaff = app.globalData.user.staffId  // 制单人 
-      let tableData = this.data.tableData.filter(res => { return res.checked })
+      params.accDate = form.accDate // 
+      params.remarks = form.remarks // 备注
+      params.makeStaff = app.globalData.user.staffId // 制单人 
+      let tableData = this.data.tableData.filter(res => {
+        return res.checked
+      })
       //  根据formtype不同值 
       // formType ：1 收款单 ，2 付款单，3 客户收款保存参数,4 客户退款 5 退收款单 6 退付款单  7 其他收入单 8 订单开单收款 9 其他支出 10 销售退款 的退款 11 销售出库的收款
       if (this.data.formType == 1) {
         params.rpType = Constants.rpType.receipt
         // 1 收款单
-        params.objectId = this.data.form.objInfo.cusId  // 客户
+        params.objectId = this.data.form.objInfo.cusId // 客户
         // 收款金额					
         params.sumAmtRec = Number(form.sumAmount)
         // 合计应收冲抵金额								
@@ -232,21 +234,19 @@ mixins: [mixins],
         let rlsit = this.setReturnReceivableList(form.receivableList || [], form.sumWaiveAmt, form.currentReceivableResidue, form.receivableResidue)
         params.receivableList = rlsit //应收收款的明细 
         tableData.forEach(item => {
-          itemList.push(
-            {
-              amtRec: item.sumAmount,
-              balance: item.balance,
-              macCode: item.macCode,
-              macId: item.macId,
-              macName: item.macName,
-            }
-          )
+          itemList.push({
+            amtRec: item.sumAmount,
+            balance: item.balance,
+            macCode: item.macCode,
+            macId: item.macId,
+            macName: item.macName,
+          })
         })
 
       } else if (this.data.formType == 2) {
         params.rpType = Constants.rpType.payment
         // 2 付款单，
-        params.objectId = this.data.form.objInfo.supId  // 供应商
+        params.objectId = this.data.form.objInfo.supId // 供应商
         // 收款金额					
         params.sumAmtPay = Number(form.sumAmount)
 
@@ -263,15 +263,13 @@ mixins: [mixins],
         params.payableList = rlsit //应付款的明细 
 
         tableData.forEach(item => {
-          itemList.push(
-            {
-              amtPay: item.sumAmount,
-              balance: item.balance,
-              macCode: item.macCode,
-              macId: item.macId,
-              macName: item.macName,
-            }
-          )
+          itemList.push({
+            amtPay: item.sumAmount,
+            balance: item.balance,
+            macCode: item.macCode,
+            macId: item.macId,
+            macName: item.macName,
+          })
         })
 
       } else if (this.data.formType == 3) {
@@ -284,22 +282,20 @@ mixins: [mixins],
           itemList = tableData
         } else {
           tableData.forEach(item => {
-            itemList.push(
-              {
-                amtRec: item.sumAmount,
-                balance: item.balance,
-                macCode: item.macCode,
-                macId: item.macId,
-                macName: item.macName,
-              }
-            )
+            itemList.push({
+              amtRec: item.sumAmount,
+              balance: item.balance,
+              macCode: item.macCode,
+              macId: item.macId,
+              macName: item.macName,
+            })
           })
         }
 
         params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())
         // 240521 最佳客户信息
         params.cusName = form.objInfo.cusName
-        params.cusPhone = form.objInfo.cusPhone 
+        params.cusPhone = form.objInfo.cusPhone
         params.addressArea = form.addressArea
         params.addressFull = form.addressFull
         params.addressGcj02 = form.addressGcj02
@@ -316,22 +312,20 @@ mixins: [mixins],
           itemList = tableData
         } else {
           tableData.forEach(item => {
-            itemList.push(
-              {
-                amtRec: item.sumAmount,
-                balance: item.balance,
-                macCode: item.macCode,
-                macId: item.macId,
-                macName: item.macName,
-              }
-            )
+            itemList.push({
+              amtRec: item.sumAmount,
+              balance: item.balance,
+              macCode: item.macCode,
+              macId: item.macId,
+              macName: item.macName,
+            })
           })
         }
         params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())
       } else if (this.data.formType == 5) {
         // 5 退收款单
         params.rpType = Constants.rpType.returnReceipt
-        params.objectId = this.data.form.objInfo.objectId  // 客户
+        params.objectId = this.data.form.objInfo.objectId // 客户
         // 收款金额					
         params.sumAmtRec = Number(form.sumAmount)
         // 合计应收冲抵金额								
@@ -345,21 +339,19 @@ mixins: [mixins],
         let rlsit = this.setReturnReceivableList(form.receivableList || [], form.sumWaiveAmt, form.currentReceivableResidue, form.receivableResidue)
         params.receivableList = rlsit //应收收款的明细 
         tableData.forEach(item => {
-          itemList.push(
-            {
-              amtRec: item.sumAmount,
-              balance: item.balance,
-              macCode: item.macCode,
-              macId: item.macId,
-              macName: item.macName,
-            }
-          )
+          itemList.push({
+            amtRec: item.sumAmount,
+            balance: item.balance,
+            macCode: item.macCode,
+            macId: item.macId,
+            macName: item.macName,
+          })
         })
 
       } else if (this.data.formType == 6) {
         // 6 退付款单，
         params.rpType = Constants.rpType.returnPayment
-        params.objectId = this.data.form.objInfo.objectId  // 供应商
+        params.objectId = this.data.form.objInfo.objectId // 供应商
         // 收款金额					
         params.sumAmtPay = Number(form.sumAmount)
 
@@ -375,27 +367,25 @@ mixins: [mixins],
         params.payableList = rlsit //应付款的明细 
 
         tableData.forEach(item => {
-          itemList.push(
-            {
-              amtPay: item.sumAmount,
-              balance: item.balance,
-              macCode: item.macCode,
-              macId: item.macId,
-              macName: item.macName,
-            }
-          )
+          itemList.push({
+            amtPay: item.sumAmount,
+            balance: item.balance,
+            macCode: item.macCode,
+            macId: item.macId,
+            macName: item.macName,
+          })
         })
       } else if (this.data.formType == 7) { //其他收入单
         let formData = JSON.parse(this.data.formData)
         //收付款类型-收款的查询参数
         params.objectType = '对象类型-客户'
         params.objectId = formData.objInfo.cusId
-        params.orgId = formData.orgId  //组织部门
-        params.staffId = formData.staffId  // 员工
+        params.orgId = formData.orgId //组织部门
+        params.staffId = formData.staffId // 员工
         params.accDate = formData.accDate
         params.annexPaths = formData.annexPaths || [] //附件 
-        params.remarks = formData.remarks  // 备注
-        params.makeStaff = app.globalData.user.staffId  // 制单人  
+        params.remarks = formData.remarks // 备注
+        params.makeStaff = app.globalData.user.staffId // 制单人  
         let itemNumber = 0
         //收入类别list
         formData.itemList.forEach(element => {
@@ -411,14 +401,12 @@ mixins: [mixins],
         let receiptList = []
         //收款方式list
         tableData.forEach(item => {
-          receiptList.push(
-            {
-              amtRec: item.sumAmount,
-              macCode: item.macCode,
-              macId: item.macId,
-              macName: item.macName,
-            }
-          )
+          receiptList.push({
+            amtRec: item.sumAmount,
+            macCode: item.macCode,
+            macId: item.macId,
+            macName: item.macName,
+          })
         })
         params.receiptList = receiptList
         params.sumAmtReceivable = itemNumber //合计应收
@@ -428,16 +416,14 @@ mixins: [mixins],
         params.sumAmtRec = Number(params.sumAmtRec)
         let itemIndex = Number(1)
         tableData.forEach(item => {
-          itemList.push(
-            {
-              itemIndex: itemIndex++,
-              amtRec: item.sumAmount,
-              balance: item.balance,
-              macCode: item.macCode,
-              macId: item.macId,
-              macName: item.macName,
-            }
-          )
+          itemList.push({
+            itemIndex: itemIndex++,
+            amtRec: item.sumAmount,
+            balance: item.balance,
+            macCode: item.macCode,
+            macId: item.macId,
+            macName: item.macName,
+          })
         })
         params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())
         params.receiptList = itemList
@@ -471,117 +457,116 @@ mixins: [mixins],
         params.sumAmtPay = formData.sumAmount
         let paymentList = []
         tableData.forEach(item => {
-          paymentList.push(
-            {
-              amtPay: item.sumAmount,
-              macCode: item.macCode,
-              macId: item.macId,
-              macName: item.macName,
-            }
-          )
+          paymentList.push({
+            amtPay: item.sumAmount,
+            macCode: item.macCode,
+            macId: item.macId,
+            macName: item.macName,
+          })
         })
         params.paymentList = paymentList
-      }else if (this.data.formType == 10) { //销售退货 >>> 客户退款 
+      } else if (this.data.formType == 10) { //销售退货 >>> 客户退款 
         //新建销售退货参数
         let itemIndex = 0
-        let formData = JSON.parse(this.data.formData) 
+        let formData = JSON.parse(this.data.formData)
         params.fromId = formData.orderId
-        let btnFormData = formData.btnFormData 
+        let btnFormData = formData.btnFormData
         params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出库标识 
-        formData.goodsList.forEach(res => { 
+        formData.goodsList.forEach(res => {
           res.itemIndex = itemIndex++
-          res.canNegativeFlag = true 
+          res.canNegativeFlag = true
           if (params.flgAutoHandle) {
             res.outBox = res.box
             res.outPiece = res.piece
           } else {
             res.outingBox = res.box
             res.outingPiece = res.piece
-          } 
-            delete res['itemId']  
-        }) 
-         itemList = formData.goodsList //明细  
+          }
+          delete res['itemId']
+        })
+        itemList = formData.goodsList //明细  
         params.makeStaff = app.globalData.user.staffId
         // params.deleteItemList = params.deleteList ? params.deleteList : []  
         params.addressName = formData.addressName
         params.objectId = formData.cusId
         params.canNegativeFlag = true
-        params.outDate = utils.formatDayTime(new Date())  
-           //客户退款保存参数 
-           params.sumAmtRec = Number(formData.sumAmtRec)
-           params.rpType = Constants.rpType.returnReceipt
-           //编辑退款 
-           let itemListRecPayItemVO = []
-             tableData.forEach(item => {
-              itemListRecPayItemVO.push(
-                 {
-                   amtRec: item.sumAmount,
-                   balance: item.balance,
-                   macCode: item.macCode,
-                   macId: item.macId,
-                   macName: item.macName,
-                 }
-               )
-             })
-             params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())  
-             params.itemListRecPayItemVO = itemListRecPayItemVO
-      }else if (this.data.formType == 10) { //销售出库>>> 客户收款 
-              //新建销售退货参数
-              let itemIndex = 0
-              let formData = JSON.parse(this.data.formData) 
-              params.fromId = formData.orderId
-              let btnFormData = formData.btnFormData 
-              params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出库标识 
-              formData.goodsList.forEach(res => { 
-                res.itemIndex = itemIndex++
-                res.canNegativeFlag = true 
-                if (params.flgAutoHandle) {
-                  res.outBox = res.box
-                  res.outPiece = res.piece
-                } else {
-                  res.outingBox = res.box
-                  res.outingPiece = res.piece
-                } 
-                  delete res['itemId']  
-              }) 
-               itemList = formData.goodsList //明细  
-              params.makeStaff = app.globalData.user.staffId
-              // params.deleteItemList = params.deleteList ? params.deleteList : []  
-              params.addressName = formData.addressName
-              params.objectId = formData.cusId
-              params.canNegativeFlag = true
-              params.outDate = utils.formatDayTime(new Date())  
-                 //客户退款保存参数 
-                 params.sumAmtRec = Number(formData.sumAmtRec)
-                 params.rpType = Constants.rpType.returnReceipt
-                 //编辑退款 
-                 let itemListRecPayItemVO = []
-                   tableData.forEach(item => {
-                    itemListRecPayItemVO.push(
-                       {
-                         amtRec: item.sumAmount,
-                         balance: item.balance,
-                         macCode: item.macCode,
-                         macId: item.macId,
-                         macName: item.macName,
-                       }
-                     )
-                   })
-                   params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())  
-                   params.itemListRecPayItemVO = itemListRecPayItemVO
-            }
+        params.outDate = utils.formatDayTime(new Date())
+        //客户退款保存参数 
+        params.sumAmtRec = Number(formData.sumAmtRec)
+        params.rpType = Constants.rpType.returnReceipt
+        //编辑退款 
+        let itemListRecPayItemVO = []
+        tableData.forEach(item => {
+          itemListRecPayItemVO.push({
+            amtRec: item.sumAmount,
+            balance: item.balance,
+            macCode: item.macCode,
+            macId: item.macId,
+            macName: item.macName,
+          })
+        })
+        params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())
+        params.itemListRecPayItemVO = itemListRecPayItemVO
+      } else if (this.data.formType == 11) { //销售出库>>> 客户收款 
+        //新建销售退货参数
+        let itemIndex = 0
+        let formData = JSON.parse(this.data.formData)
+        params.fromId = formData.orderId
+        let btnFormData = formData.btnFormData
+        params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出库标识 
+        params.outAmt = null
+        params.outQty = null
+        formData.goodsList.forEach(res => {
+          res.itemIndex = itemIndex++
+          res.canNegativeFlag = false
+          res.outAmt = null
+          res.outQty = null
+          if (params.flgAutoHandle) {
+            res.outBox = res.box
+            res.outPiece = res.piece
+          } else {
+            res.outingBox = res.box
+            res.outingPiece = res.piece
+          }
+        })
+
+        itemList = formData.goodsList //明细  
+        params.makeStaff = app.globalData.user.staffId
+        // params.deleteItemList = params.deleteList ? params.deleteList : []  
+        params.addressName = formData.addressName
+        params.salesChannel = formData.channelId
+        params.objectId = formData.cusId
+        params.canNegativeFlag = false
+        params.outDate = utils.formatDayTime(new Date())
+        //客户退款保存参数 
+        params.sumAmtRec = Number(formData.sumAmtRec)
+        params.rpType = Constants.rpType.returnReceipt
+        //编辑退款 
+        let itemListRecPayItemVO = []
+        tableData.forEach(item => {
+          itemListRecPayItemVO.push({
+            amtRec: item.sumAmount,
+            balance: item.balance,
+            macCode: item.macCode,
+            macId: item.macId,
+            macName: item.macName,
+          })
+        })
+        params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())
+        params.itemListRecPayItemVO = itemListRecPayItemVO
+      }
 
       if (this.data.formType !== 8) {
         params.itemList = itemList
-      } 
+      }
       return params
     },
 
     /**
-    * @desc : 收款保存
-    * @date : 2024/2/1 15:49
-    * @author : 姜永辉
-    */
+     * @desc : 收款保存
+     * @date : 2024/2/1 15:49
+     * @author : 姜永辉
+     */
     saveData() {
       //  根据formtype不同值  
       // formType ：1 收款单 ，2 付款单， 3 客户收款  4 客户退款  5 退收款单 6 退付款单  7 其他收入单 8 订单开单收款  9 其他支出
@@ -600,7 +585,7 @@ mixins: [mixins],
           return this.excute(this.data.service, this.data.service.update, this.data.params)
         } else {
           return this.excute(this.data.service, this.data.service.insertRefund, this.data.params)
-        } 
+        }
       } else if (this.data.formType == 5) {
         return this.excute(this.data.service, this.data.service.insertReceivableReceipt, this.data.params)
       } else if (this.data.formType == 6) {
@@ -617,20 +602,20 @@ mixins: [mixins],
 
       } else if (this.data.formType == 9) {
         return this.excute(this.data.otherPayableService, this.data.otherPayableService.insert, this.data.params);
-      }else if (this.data.formType == 10) { //销售退货 >>> 客户退款
+      } else if (this.data.formType == 10) { //销售退货 >>> 客户退款
         return this.excute(this.data.saleOutBoundReturnService, this.data.saleOutBoundReturnService.outboundInsertRefund, this.data.params);
- 
-      }else if (this.data.formType == 11) { //销售出库 >>> 客户收款
-    
-        return this.excute(this.data.outboundService, this.data.outboundService.outboundInsertRefund, this.data.params);
-       
-      } 
+
+      } else if (this.data.formType == 11) { //销售出库 >>> 客户收款
+
+        return this.excute(this.data.saleOutBoundService, this.data.saleOutBoundService.outboundInsertCollection, this.data.params);
+
+      }
     },
     /**
-      * @desc :   处理保存返回数据
-      * @date : 2024年3月8日
-      * @author : 姜永辉
-      */
+     * @desc :   处理保存返回数据
+     * @date : 2024年3月8日
+     * @author : 姜永辉
+     */
     handleData() {
       if (this.data.formType == 3 || this.data.formType == 4) { //客户收款/退款 
         let pages = getCurrentPages();
@@ -638,10 +623,10 @@ mixins: [mixins],
         prevPage.setData({
           refreshByAdd: true
         })
-        wx.navigateBack({
-          delta: 1
-        })
- 
+        // wx.navigateBack({
+        //   delta: 1
+        // })
+
       } else if (this.data.formType == 8) { //订单收款
         let pages = getCurrentPages();
         let prevPage = pages[pages.length - 2]; //上1页
@@ -659,9 +644,9 @@ mixins: [mixins],
       wx.previewImage({
         urls: imgs,
         current: e.currentTarget.dataset.imgurl, //当前图片地址
-        success: function (res) { },
-        fail: function (res) { },
-        complete: function (res) { },
+        success: function (res) {},
+        fail: function (res) {},
+        complete: function (res) {},
       })
     },
 
@@ -708,10 +693,10 @@ mixins: [mixins],
     },
 
     /**
-      * @desc : 计算多选金额
-      * @date : 2024/3/20 15:49
-      * @author : 于继渤
-      */
+     * @desc : 计算多选金额
+     * @date : 2024/3/20 15:49
+     * @author : 于继渤
+     */
     calculationScale(tableData) {
       let form = this.data.form
       tableData = tableData.filter((item) => {

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

@@ -51,8 +51,6 @@ Page({
     popContent: null,
     // 是否有默认值
     defaultFlag: false,
-    // 简单模式
-    simpleFlag: false,
     // 确定按钮
     buttonList: [{
       name: 'confirm',
@@ -95,6 +93,7 @@ Page({
    * @date : 2024/3/25 15:16
    */
   chooseData(e) {
+    console.log('eerere',e);
     let list = e.detail.list;
     let item = e.detail.item;
     let valueKey = this.data.valueKey;

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

@@ -1,7 +1,7 @@
-<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<loading wx:if="{{loading}}"></loading>
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <van-sticky scroll-top="0">
-  <view style="height: {{(chooseFlag || (tagList && tagList.length > 0))?'190rpx': ((searchContent && searchContent.length > 0)?'200rpx':'90rpx')}}">
+  <view style="height: {{(chooseFlag || (tagList && tagList.length > 0))?'210rpx': ((searchContent && searchContent.length > 0)?'200rpx':'120rpx')}}">
     <!-- 查询条件 -->
     <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,placeholder)}}">
     </dk-dropdown-menu>
@@ -17,20 +17,18 @@
 <!-- 暂无数据 -->
 <van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}" />
 <!--简单列表-->
-<view wx:if="{{simpleFlag}}" style="margin-top:30rpx;">
+<!-- <view wx:if="{{simpleFlag}}" style="margin-top:30rpx;">
   <view wx:for="{{tableData}}" data-item="{{item}}" wx:key="index" class="main-class main-item-class" style="{{item.checked? 'border: 1px solid #1B365D;':''}}" data-index="{{index}}" catchtap="choose">
     {{item[title]}}
   </view>
-</view>
+</view> -->
 
-<!-- 列表区 防止遮住 TODO-->
-<view style="{{chooseFlag?'margin-top:120rpx;':''}}">
-  <dk-list wx:if="{{!simpleFlag && 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>
-</view>
+<!-- 列表区 防止遮住 -->
+<dk-list wx:if="{{ active == 0}}" id="list" simpleFlag="{{simpleFlag}}" 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="{{ !simpleFlag && chooseFlag && active == 1}}" id="choosed" list="{{choosedData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" simpleFlag="{{simpleFlag}}" content="{{contentList}}" footerInfo="{{footerInfo}}" swipeDisabled="{{false}}" swipeDeleteFlag="{{true}}" bind:swipe="delChoosed"></dk-list>
+<dk-list wx:if="{{   chooseFlag && active == 1}}" id="choosed" list="{{choosedData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" simpleFlag="{{simpleFlag}}" content="{{contentList}}" footerInfo="{{footerInfo}}" swipeDisabled="{{false}}" swipeDeleteFlag="{{true}}" bind:swipe="delChoosed"></dk-list>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 <view style="height: 200rpx;"></view>
@@ -44,10 +42,5 @@
   </view>
 </view>
 
-<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toAdd" wx:if="{{addUrl || (popContent && popContent.length > 0)}}">
-  <image src="{{imageUrl + 'btn-new.png'}} " class="edit-class"  />
-</view> -->
-
-
 <dk-popup id="popup" type="basic" validFlag="{{true}}" priceTitle="" title="{{popTitle}}" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjNamePop}}" contentObj="{{popContent}}" bind:commit="editItems">
 </dk-popup>

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

@@ -48,6 +48,7 @@ setSearchParams(params) {
   params.outStatus = Constants.outStatus.outBounded
   params.outType = Constants.outType.sale
   params.cusId = this.data.item.id
+  params.flgValid = true
   return params
 },
   

package-inventory/pages/ivt-detail-report/detail/detail.js

@@ -44,11 +44,11 @@ Page({
     // 可售包装 
     if (item.flgSubUnit) {
       item['freezeBox'] = parseInt(item.freezeQty / item.packBox)
-      item['freezePiece'] = Number(item.freezeQty % item.packBox)
+      item['freezePiece'] = parseFloat(Number(item.freezeQty % item.packBox)).toFixed(item.decimalPlace)
       item.packageBoxFreeze = item['freezeBox'] + item.subUnitName + item['freezePiece'] + item.unitName
 
       item['usableBox'] = parseInt(item.usableQty / item.packBox)
-      item['usablePiece'] = Number(item.usableQty % item.packBox)
+      item['usablePiece'] = parseFloat(Number(item.usableQty % item.packBox)).toFixed(item.decimalPlace) 
       item.packageBoxUsable = item['usableBox'] + item.subUnitName + item['usablePiece'] + item.unitName
     }
 

package-inventory/pages/ivt-detail-report/ivt-detail-report.js

@@ -77,7 +77,7 @@ Page({
         "skuSpec": "商品规格",
         "whName": "仓库名称",
         "invQty": "库存数量",
-        "outingQty": "出库中数量",
+        // "outingQty": "出库中数量",
         "freezeQty": "冻结数量",
         "usableQty": "可用数量",
         "remarks": "备注",
@@ -199,8 +199,8 @@ Page({
       })
       // 可售包装 
       if (item.flgSubUnit) {
-        item['box'] = parseInt(item.invQty / item.packBox)
-        item['piece'] = Number(item.invQty % item.packBox)
+        item['box'] = parseInt(item.invQty / item.packBox) 
+        item['piece'] = parseFloat( Number(item.invQty % item.packBox)).toFixed(item.decimalPlaces)
         item.packageBox = item['box'] + item.subUnitName + item['piece'] + item.unitName
         list.push({
           title: mixins.$t('packageIvtBox'),

package-inventory/pages/outbound-processing/outbound-processing.js

@@ -270,6 +270,11 @@ Page({
       params.outStatus = Constants.outStatus.outBounded
     }
     params.outTypes = params.outTypeList
+    if (!params.flgValid){
+      params.flgValidList = [true]
+    }else{
+      params.flgValidList = [true,false]
+    }
     //采购订单明细 跳转到出库办理  
     let isfirst = this.data.isfirst
     let purNo = this.data.item ? this.data.item.purNo : null

package-inventory/pages/warehousing-processing/warehousing-processing.js

@@ -320,6 +320,12 @@ Page({
     } else {
       params.intoTypes = params.intoTypeStList
     }
+    if (!params.flgValid){
+      params.flgValidList = [true]
+    }else{
+      params.flgValidList = [true,false]
+    }
+    
     return params;
   },
   /** 

package-purchase/pages/purchase-order/purchase-order.js

@@ -205,7 +205,55 @@ Page({
     primaryKey: 'purId'
   },
 
+  /**
+   * @desc : 三个小点点击回调
+   * @date : 2024年3月8日
+   * @author : 姜永辉
+   */
+  toPoint(e) {
+    let item = e.detail.item
+    let buttonList = null
+    if (!item.flgValid) { //作废
+      buttonList = [{
+        name: 'printedBill',
+        title: mixins.$t('printedBill') //打印票据
+      }, ] //打印
+    } else {
+
+      buttonList = [{
+          name: 'transferToWarehouse',
+          title: mixins.$t('transferToWarehouse'), //转入库 
+          formMode: Constants.formMode.other,
+          other: {
+            idKey: 'purId'
+          },
+        }, {
+          name: 'editPur',
+          title: mixins.$t('edit'),
+        }, {
+          name: 'purchaseCancellation',
+          title: mixins.$t('purchaseCancellation'), //采购作废 
+        }, //title:mixins.$t('followUp') 
+        {
+
+          name: 'selectSourcePurchaseOrder',
+          title: mixins.$t('purReturnOutBound'), //采购退货
+          formMode: Constants.formMode.index,
+          formType: Constants.formMode.add,
+          idKey: 'purId',
+        },
+        {
+          name: 'printedBill',
+          title: mixins.$t('printedBill') //打印票据
+        },
 
+      ]
+    }
+    this.setData({
+      // 弹出按钮
+      popbuttonList: buttonList
+    })
+  },
   /**
    * @desc : 作废
    * @date : 2024/2/1 15:49
@@ -339,22 +387,22 @@ Page({
           res.statusName = res.intoStatusName
         }
       });
-    }  
+    }
     sumAmount = tableData.sum('sumAmount')
-    sumQuantity = tableData.sum('sumQuantity') 
+    sumQuantity = tableData.sum('sumQuantity')
     contentnFootList.forEach(it => {
       if (it.code == 'count') {
         it.bill = tableData.length
-        it.quantity = sumQuantity 
+        it.quantity = sumQuantity
       }
       if (it.code == 'totalAmount') {
         it.content = sumAmount
       }
-    }) 
+    })
     this.setData({
       contentnFootList: contentnFootList,
       tableData: tableData
-    })  
+    })
   },
   /**
    * @desc : 详细页面 （编辑）

package-purchase/pages/purchase-receipt/purchase-receipt.js

@@ -33,8 +33,8 @@ Page({
         title: mixins.$t('invaidOrder'),
       },
       {
-        name: 'ticketPirnt',
-        title: mixins.$t('ticketPirnt'),
+        name: 'printedBill',
+        title: mixins.$t('printedBill'),
       },
     ],
     // 弹出按钮
@@ -158,7 +158,26 @@ Page({
     // 路由
     routeObjName: 'inbound',
   },
+/**
+   * @desc :   三个小点打开
+   * @date : 2024年3月8日
+   * @author : 于继渤 
+   */
+  toPoint(e) {
+    let item = e.detail.item
+    let buttonList = null
+    if (!item.flgValid) { //作废
+      buttonList = [{
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, ] //打印
 
+    }  this.setData({
+      // 弹出按钮
+      pointButtonList: buttonList
+    })
+   
+  },
   /**
    * @desc : （编辑）
    * @date : 2024/2/1 15:49
@@ -281,21 +300,7 @@ Page({
       }
     })
   },
-  pupButtons() {
-    return [{
-        name: 'editInbound',
-        title: mixins.$t('edit'),
-      },
-      {
-        name: 'invaidOrder',
-        title: mixins.$t('invaidOrder'),
-      },
-      {
-        name: 'ticketPirnt',
-        title: mixins.$t('ticketPirnt'),
-      },
-    ];
-  },
+   
 
   /**
    * @desc : 切换  待出库  已出库
@@ -306,8 +311,7 @@ Page({
    */
   onChangeTabs(e) {
     let index = e.detail.detail.index
-    let flgHandleSetting = this.data.flgHandleSetting
-    let pupButtons = this.pupButtons()
+    let flgHandleSetting = this.data.flgHandleSetting 
     this.setData({
       active: index,
     })
@@ -328,8 +332,8 @@ Page({
               title: mixins.$t('invaidOrder'),
             },
             {
-              name: 'ticketPirnt',
-              title: mixins.$t('ticketPirnt'),
+              name: 'printedBill',
+              title: mixins.$t('printedBill'),
             },
           ]
         });
@@ -345,8 +349,8 @@ Page({
               title: mixins.$t('invaidOrder'),
             },
             {
-              name: 'ticketPirnt',
-              title: mixins.$t('ticketPirnt'),
+              name: 'printedBill',
+              title: mixins.$t('printedBill'),
             },
           ]
         });
@@ -363,8 +367,8 @@ Page({
               title: mixins.$t('invaidOrder'),
             },
             {
-              name: 'ticketPirnt',
-              title: mixins.$t('ticketPirnt'),
+              name: 'printedBill',
+              title: mixins.$t('printedBill'),
             },
           ]
         });
@@ -380,8 +384,8 @@ Page({
             },
           
             {
-              name: 'ticketPirnt',
-              title: mixins.$t('ticketPirnt'),
+              name: 'printedBill',
+              title: mixins.$t('printedBill'),
             },
           ]
         });
@@ -500,7 +504,7 @@ Page({
    */
   loadInit() {
     let flgHandleSetting = this.data.flgHandleSetting
-    let pupButtons = this.pupButtons()
+ 
     if (flgHandleSetting) { //自动的话 要隐藏作废
       // 如果flgHandleSetting为true，则先添加inProcessing按钮，再添加通用按钮  
       this.setData({
@@ -517,8 +521,8 @@ Page({
             title: mixins.$t('invaidOrder'),
           },
           {
-            name: 'ticketPirnt',
-            title: mixins.$t('ticketPirnt'),
+            name: 'printedBill',
+            title: mixins.$t('printedBill'),
           },
         ]
       });
@@ -534,8 +538,8 @@ Page({
             title: mixins.$t('edit'),
           },
           {
-            name: 'ticketPirnt',
-            title: mixins.$t('ticketPirnt'),
+            name: 'printedBill',
+            title: mixins.$t('printedBill'),
           },
         ]
       });

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

@@ -59,7 +59,34 @@ Page({
       quantity: 0
     }],
   },
-
+  /**
+   * @desc :   三个小点打开
+   * @date : 2024年3月8日
+   * @author : 于继渤 
+   */
+  toPoint(e) {
+    let item = e.detail.item
+    let buttonList = null
+    if (!item.flgValid) { //作废
+      buttonList = [{
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, ] //打印
+    } else {
+      // 弹出按钮
+      buttonList = [{
+        name: 'editInto',
+        title: mixins.$t('edit'),
+      }, { name: 'invalid', title: mixins.$t("invaidOrder") },{
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, ]
+    }
+    this.setData({
+      // 弹出按钮
+      buttonList: buttonList
+    })
+  },
   /**
  * @desc : 跳转明细
  * @date : 2024/2/1 15:49

package-sales/pages/customer-collection/add/add.js

@@ -118,17 +118,18 @@ Page({
         refresh: function (data) { 
           //销售订单跳转
           if (_this.data.formType == Constants.formMode.add) {
-            const eventChannel = this.getOpenerEventChannel();
+            _this.setData({
+              loading: true
+            })
+            const eventChannel = _this.getOpenerEventChannel();
             eventChannel.emit('refresh', {
               id: 1
-            })
-            console.log("refreshrefreshrefresh");
+            }) 
             // 保存成功后 回调
             wx.navigateBack({
               data: 1
             })
-          } else {
-            console.log("adddddddd");
+          } else { 
             let formData = {}
             formData['staff'] = {
               text: app.globalData.user.staffName,

package-sales/pages/customer-collection/customer-collection.js

@@ -154,27 +154,34 @@ Page({
   */
   toPoint(e) {
     let item = e.detail.item
+    let buttonList = null
+    if (!item.flgValid) { //作废
+      buttonList = [{
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, ] //打印
+    } else {  
     if (item.rpType == Constants.rpType.returnReceipt) {
-      this.setData({
-        buttonList:
-          [
-            { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
-            { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
-          ]
-      })
+      buttonList=
+      [
+        { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
+        { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
+      ]
     } else {
-      this.setData({
-        buttonList:
-          [
-            {
-              name: 'cusReturnCollection',
-              title: mixins.$t("cusReturnCollection")
-            },
-            { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
-            { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
-          ]
-      })
-    }
+      buttonList =
+      [
+        {
+          name: 'cusReturnCollection',
+          title: mixins.$t("cusReturnCollection")
+        },
+        { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
+        { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
+      ]
+    }}
+    this.setData({
+      // 弹出按钮
+      buttonList: buttonList
+    })
   },
 
   /**

package-sales/pages/customer-collection/refund/refund.js

@@ -104,11 +104,31 @@ Page({
       url: this.data.route.selectCollectionConfirm.url,
       events: {
         // 回调后
-        bindData: function (data) {
-          // 保存成功后 回调
-          wx.navigateBack({
-            data: 1
-          })
+        refresh: function (data) {
+          //销售订单跳转
+          if (_this.data.formType == Constants.formMode.add) {
+            _this.setData({
+              loading: true
+            })
+            const eventChannel = _this.getOpenerEventChannel();
+            eventChannel.emit('refresh', {
+              id: 1
+            })
+            // 保存成功后 回调
+            wx.navigateBack({
+              data: 1
+            })
+          } else {
+            let formData = {}
+            formData.orgId = app.globalData.user.orgId
+            formData.orgName = app.globalData.user.orgName
+            formData.staffId = app.globalData.user.staffId
+            formData.staffName = app.globalData.user.staffName
+            formData.accDate = util.formatDayTime(new Date()) 
+            _this.setData({
+              formData: JSON.stringify(formData)
+            })
+          }
         }
       },
       success: function (res) {

package-sales/pages/order-billing/order-billing.js

@@ -17,32 +17,94 @@ Page({
    * 页面的初始数据 
    */
   data: {
-    tagList: [{ title: "全部", code: '' }, { title: "待出库", code: ['出库状态-待出库'] }, { title: "已出库", code: ['出库状态-出库中', '出库状态-已出库'] }],
+    tagList: [{
+      title: "全部",
+      code: ''
+    }, {
+      title: "待出库",
+      code: ['出库状态-待出库']
+    }, {
+      title: "已出库",
+      code: ['出库状态-出库中', '出库状态-已出库']
+    }],
     routeObjName: 'order',
     // 查询条件
-    searchContent: [
-      { code: 'createtime', title: mixins.$t("pastThirthtyDays"), defaultValue: 5, searchType: Constants.searchType.date },
-      { code: 'staff', title: mixins.$t("staffId"), dropType: 'staff' },
-      { code: 'org', title: mixins.$t("orgId"), dropType: 'org' },
-      { code: 'choose', title: mixins.$t("choose"), searchType: Constants.searchType.pick }
+    searchContent: [{
+        code: 'createtime',
+        title: mixins.$t("pastThirthtyDays"),
+        defaultValue: 5,
+        searchType: Constants.searchType.date
+      },
+      {
+        code: 'staff',
+        title: mixins.$t("staffId"),
+        dropType: 'staff'
+      },
+      {
+        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: 'deliveryDate', dataType: 'date' },
-      { code: 'viewVoidedDocuments', dataType: 'checkbox' },
+    pullMenuList: [{
+        code: 'outStatus',
+        pullType: 'mSelect',
+        typeName: 'outStatus'
+      },
+      {
+        code: 'receiveStatus',
+        pullType: 'mSelect',
+        typeName: 'receiveStatus'
+      },
+      {
+        code: 'deliveryDate',
+        dataType: 'date'
+      },
+      {
+        code: 'viewVoidedDocuments',
+        dataType: 'checkbox'
+      },
     ],
     // 列表区（脚部金额）
-    footerAmount: { name: 'sumAmount', title: mixins.$t("totalAmount") },
+    footerAmount: {
+      name: 'sumAmount',
+      title: mixins.$t("totalAmount")
+    },
     // 列表区（脚部信息）
-    footerInfo: [{ name: 'sumQuantity', title: mixins.$t("piece"), prefix: mixins.$t("together"), }],
+    footerInfo: [{
+      name: 'sumQuantity',
+      title: mixins.$t("piece"),
+      prefix: mixins.$t("together"),
+    }],
     // 列表区（内容）
-    contentList: [
-      { name: 'orderNo', title: mixins.$t("saleOrderNo") },
-      { name: 'cusPhone', title: mixins.$t("cusPhone")},
-      { name: 'addressFull', title: mixins.$t("adddressFull") },
-      { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: mixins.$t("staffId") }], title: mixins.$t("storeInformation") }
+    contentList: [{
+        name: 'orderNo',
+        title: mixins.$t("saleOrderNo")
+      },
+      {
+        name: 'cusPhone',
+        title: mixins.$t("cusPhone")
+      },
+      {
+        name: 'addressFull',
+        title: mixins.$t("adddressFull")
+      },
+      {
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: mixins.$t("staffId")
+        }],
+        title: mixins.$t("storeInformation")
+      }
     ],
 
     contentObj: {
@@ -83,23 +145,50 @@ Page({
       }]
     },
     // 弹出按钮
-    buttonList: [
-      {
+    buttonList: [{
         name: 'editInto',
         title: mixins.$t('edit')
       },
-      { name: 'saleOutBound', title: mixins.$t("saleOutBound"), formMode: Constants.formMode.other, other: { idKey: 'orderId' } },//出库
       {
-        name: 'saleOrderReturn', title: mixins.$t("saleReturn"), formMode: Constants.formMode.other, other: {
+        name: 'saleOutBound',
+        title: mixins.$t("saleOutBound"),
+        formMode: Constants.formMode.other,
+        other: {
           idKey: 'orderId'
         }
-      },//退货
-      { name: 'collection', title: mixins.$t("cusCollection"), idKey: 'cusId' },//跳转客户收款
-      { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
-      { name: 'invalid', title: mixins.$t("invaidOrder") } //作废
+      }, //出库
+      {
+        name: 'saleOrderReturn',
+        title: mixins.$t("saleReturn"),
+        formMode: Constants.formMode.other,
+        other: {
+          idKey: 'orderId'
+        }
+      }, //退货
+      {
+        name: 'collection',
+        title: mixins.$t("cusCollection"),
+        idKey: 'cusId'
+      }, //跳转客户收款
+      {
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, //打印
+      {
+        name: 'invalid',
+        title: mixins.$t("invaidOrder")
+      } //作废
     ],
-    buttonSaveList: [{ code: 'add', title: mixins.$t("add") }],
-    contentSaveList: [{ code: 'amount', content: 0, type: 'number', title: mixins.$t("totalAmount") }, {
+    buttonSaveList: [{
+      code: 'add',
+      title: mixins.$t("add")
+    }],
+    contentSaveList: [{
+      code: 'amount',
+      content: 0,
+      type: 'number',
+      title: mixins.$t("totalAmount")
+    }, {
       type: 'count',
       code: 'count',
       bill: 0,
@@ -108,10 +197,65 @@ Page({
     primaryKey: 'orderId'
   },
   /**
-  * @desc :   处理接口返回数据
-  * @date : 2024年3月8日
-  * @author : 于继渤
-  */
+   * @desc :   三个小点打开
+   * @date : 2024年3月8日
+   * @author : 于继渤 
+   */
+  toPoint(e) {
+    let item = e.detail.item
+    let buttonList = null
+    if (!item.flgValid) { //作废
+      buttonList = [{
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, ] //打印
+    } else {
+      // 弹出按钮
+      buttonList = [{
+          name: 'editInto',
+          title: mixins.$t('edit')
+        },
+        {
+          name: 'saleOutBound',
+          title: mixins.$t("saleOutBound"),
+          formMode: Constants.formMode.other,
+          other: {
+            idKey: 'orderId'
+          }
+        }, //出库
+        {
+          name: 'saleOrderReturn',
+          title: mixins.$t("saleReturn"),
+          formMode: Constants.formMode.other,
+          other: {
+            idKey: 'orderId'
+          }
+        }, //退货
+        {
+          name: 'collection',
+          title: mixins.$t("cusCollection"),
+          idKey: 'cusId'
+        }, //跳转客户收款
+        {
+          name: 'printedBill',
+          title: mixins.$t("printedBill")
+        }, //打印
+        {
+          name: 'invalid',
+          title: mixins.$t("invaidOrder")
+        } //作废
+      ]
+    }
+    this.setData({
+      // 弹出按钮
+      buttonList: buttonList
+    })
+  },
+  /**
+   * @desc :   处理接口返回数据
+   * @date : 2024年3月8日
+   * @author : 于继渤
+   */
   handleSearchData(tableData) {
     tableData.forEach(res => {
       if (res.outStatus !== Constants.outStatus.unOutBound) { //处理状态
@@ -129,10 +273,10 @@ Page({
   },
 
   /**
-  * @desc :   作废
-  * @date : 2024年3月8日
-  * @author : 于继渤
-  */
+   * @desc :   作废
+   * @date : 2024年3月8日
+   * @author : 于继渤
+   */
   invalid(e) {
     this.setData({
       loading: true
@@ -154,10 +298,10 @@ Page({
   },
 
   /**
-    * @desc :   销售出库方法提示校验
-    * @date : 2024年3月8日
-    * @author : 于继渤
-    */
+   * @desc :   销售出库方法提示校验
+   * @date : 2024年3月8日
+   * @author : 于继渤
+   */
   isAllowedSaleOutBound(e) {
     let result = ''
     //判断出库量是否小于订单量
@@ -167,10 +311,10 @@ Page({
     return result
   },
   /**
-    * @desc :   销售出库退货方法提示校验
-    * @date : 2024年3月8日
-    * @author : 于继渤
-    */
+   * @desc :   销售出库退货方法提示校验
+   * @date : 2024年3月8日
+   * @author : 于继渤
+   */
   isAllowedSaleOrderReturn(e) {
     console.log(e)
     let result = ''
@@ -184,10 +328,10 @@ Page({
 
 
   /**
- * @desc : 切换
- * @date : 2024/2/1 15:49
- * @author : 于继渤
- */
+   * @desc : 切换
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   onChangeTabs(e) {
     let code = e.detail.detail.code
     this.setData({
@@ -196,10 +340,10 @@ Page({
     this.searchData()
   },
   /**
-* @desc : 设置查询参数
-* @date : 2024/2/1 15:49
-* @author : 于继渤
-*/
+   * @desc : 设置查询参数
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   setSearchParams(params) {
     if (!params.outStatusList) {
       params.outStatusList = this.data.outStatus == 'all' ? [] : this.data.outStatus
@@ -210,33 +354,37 @@ Page({
     return params
   },
   /**
-     * @desc : 加载数据
-     * @author : 于继渤
-     * @date : 2024/1/23 9:16
-     */
+   * @desc : 加载数据
+   * @author : 于继渤
+   * @date : 2024/1/23 9:16
+   */
   getData(params) {
     return this.excute(this.data.service, this.data.service.selectByCond, params);
   },
   /**
-     * @desc : 编辑
-     * @author : 于继渤
-     * @date : 2024/1/23 9:16
-     */
+   * @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.orderId, formMode: Constants.formMode.edit, item: item })
+        res.eventChannel.emit('params', {
+          id: item.orderId,
+          formMode: Constants.formMode.edit,
+          item: item
+        })
       }
     })
   },
   /**
-  * @desc :   计算底部合计金额等
-  * @date : 2024年4月8日
-  * @author : 于继渤
-  */
+   * @desc :   计算底部合计金额等
+   * @date : 2024年4月8日
+   * @author : 于继渤
+   */
   calculateTotalAmount() {
     let tableData = this.data.tableData
     let contentSaveList = this.data.contentSaveList

package-sales/pages/order-return/add/add.js

@@ -582,7 +582,7 @@ Page({
         if (res.data.data.data.outStatus == mixins.$t("outBoundedOutStatus") && this.data.formMode != 'other') {
           let buttonSaveList = this.data.buttonSaveList
           buttonSaveList = [{
-            name: 'merge',
+            code: 'merge',
             title: mixins.$t("handleWithdrawal"),
           }]
           this.setData({

package-sales/pages/order-return/order-return.js

@@ -95,6 +95,39 @@ Page({
     routeObjName: 'saleOutBoundReturn',
     active: 0
   },
+    /**
+   * @desc :   三个小点打开
+   * @date : 2024年3月8日
+   * @author : 于继渤 
+   */
+  toPoint(e) {
+    let item = e.detail.item
+    let buttonList = null
+    if (!item.flgValid) { //作废
+      buttonList = [{
+        name: 'printedBill',
+        title: mixins.$t("printedBill")
+      }, ] //打印
+    } else { 
+      // 弹出按钮
+      buttonList = [
+        {
+          name: 'editInto',
+          title: mixins.$t('edit')
+        },
+        { name: 'salesOutReturnBound', title: mixins.$t("outProcessing") },
+        {
+          name: 'printedBill',
+          title: mixins.$t('printedBill') //打印票据
+        },
+        { name: 'invalid', title: mixins.$t("invaidOrder") } //作废
+      ]
+    }
+    this.setData({
+      // 弹出按钮
+      buttonList: buttonList
+    })
+  },
   /**
  * @desc : 切换
  * @date : 2024/2/1 15:49
@@ -154,7 +187,12 @@ onChangeTabs(e) {
           image: '/static/image/success.png',
           duration: 1000
         })
+         // 查询
+         this.searchData();
       }
+      this.setData({
+        loading: false
+      })
     })
   },
   /**

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

@@ -324,26 +324,32 @@ Page({
     params.fromId = params.orderId
     // params.outingAmt = params.outAmt
     // params.outingQty = params.outQty
+    let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
+    if (this.data.flgHandleSetting) {
+      params.flgAutoHandle = true
+    } else {
+      params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出入库标识 
+    }
     params.outAmt = null
     params.outQty = null
     params.goodsList.forEach(res => {
       res.canNegativeFlag = false
       res.outAmt = null
       res.outQty = null
-      res.outingBox = res.box
-      res.outingPiece = res.piece
+      if (params.flgAutoHandle) {
+        res.outBox = res.box
+        res.outPiece = res.piece
+      } else {
+        res.outingBox = res.box
+        res.outingPiece = res.piece
+      } 
       // delete
     })
 
     params.itemList = params.goodsList //明细
     params.makeStaff = app.globalData.user.staffId
     // params.deleteItemList = params.deleteList ? params.deleteList : []
-    let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
-    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.address.addressName : params.address.name
@@ -569,6 +575,25 @@ Page({
         formData.goodsList = listData
         //处理默认值  业务员业务部门
         formData = this.setStaffOrg(formData)
+
+        if (this.data.formMode == Constants.formMode.detail) { //详情
+          if(!formData.flgValid) { //作废单据
+             this.setData({
+               unOrderFlgValid:true,
+               buttonSaveList:[],
+               contentSaveList: [ 
+              {
+                code: 'receivable',
+                content: 0,
+                type: 'number',
+                title: mixins.$t("saleCollection")
+              }
+              ],
+             })
+          }
+        }
+        
+
         //设置选商品不可用
         let cardList = this.data.cardList
         cardList.forEach(element => {
@@ -620,6 +645,7 @@ Page({
    * @author : 于继渤
    */
   saveButton(e) {
+
     let name = e.detail.name
     // this.showQuestion().then(res => {
     //   if (!res) {
@@ -703,6 +729,8 @@ Page({
         element.saleDiscount = data.saleDiscount
       }
     })
+    
+  
     this.setData({
       cardList: cardList,
       formData: JSON.stringify(data),
@@ -1471,7 +1499,8 @@ Page({
         isDetailFlag: true,
       })
       this.setData({
-        formData: JSON.stringify(formData)
+        formData: JSON.stringify(formData),
+        contentSaveList:[]
       })
     } else if (this.data.formMode == Constants.formMode.detailEdit) {
       //编辑

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

@@ -11,7 +11,7 @@
 <view style="height: 200rpx;"></view>
 
 <!-- 底部加号" -->
-<view wx:if="{{formMode =='detail'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+<view wx:if="{{(!unOrderFlgValid)&&formMode =='detail'}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
   <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>
 

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

@@ -39,6 +39,73 @@ Page({
     }],
     // 列表区（内容）
     contentList: [{
+      name: 'outNo',
+      title: mixins.$t("outOrderNo")
+    },
+    {
+      name: 'cusPhone',
+      title: mixins.$t("cusPhone")
+    },
+    {
+      name: 'addressFull',
+      title: mixins.$t("adddressFull")
+    },
+    {
+      name: [{
+        name: 'orgName',
+        title: ''
+      }, {
+        name: 'staffName',
+        title: mixins.$t("staffId")
+      }],
+      title: mixins.$t("storeInformation")
+    }
+    ],
+    // 查询条件
+    searchContent: [{
+      code: 'createtime',
+      title: mixins.$t("pastThirthtyDays"),
+      defaultValue: 5,
+      searchType: Constants.searchType.date
+    },
+    {
+      code: 'staff',
+      title: mixins.$t("staffId"),
+      dropType: 'staff'
+    },
+    {
+      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,119 +127,52 @@ Page({
         }],
         title: mixins.$t("storeInformation")
       }
-    ],
-    // 查询条件
-    searchContent: [{
-        code: 'createtime',
-        title: mixins.$t("pastThirthtyDays"),
-        defaultValue: 5,
-        searchType: Constants.searchType.date
+      ],
+      '出库中': [{
+        name: 'outNo',
+        title: mixins.$t("outOrderNo")
       },
       {
-        code: 'staff',
-        title: mixins.$t("staffId"),
-        dropType: 'staff'
+        name: 'cusPhone',
+        title: mixins.$t("cusPhone")
       },
       {
-        code: 'org',
-        title: mixins.$t("orgId"),
-        dropType: 'org'
+        name: 'addressFull',
+        title: mixins.$t("adddressFull")
       },
       {
-        code: 'choose',
-        title: mixins.$t("choose"),
-        searchType: Constants.searchType.pick
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: mixins.$t("staffId")
+        }],
+        title: mixins.$t("storeInformation")
       }
-    ],
-    // 查询条件-筛选
-    pullMenuList: [{
-        code: 'outStatus',
-        pullType: 'mSelect',
-        typeName: 'outStatus'
+      ],
+      '已出库': [{
+        name: 'outNo',
+        title: mixins.$t("outOrderNo")
       },
       {
-        code: 'receiveStatus',
-        pullType: 'mSelect',
-        typeName: 'receiveStatus'
+        name: 'cusPhone',
+        title: mixins.$t("cusPhone")
       },
       {
-        code: 'delivery_Time',
-        dataType: 'date'
+        name: 'addressFull',
+        title: mixins.$t("adddressFull")
       },
       {
-        code: 'viewVoidedDocuments',
-        dataType: 'checkbox'
-      },
-    ],
-    contentObj: {
-      '待出库': [{
-          name: 'outNo',
-          title: mixins.$t("outOrderNo")
-        },
-        {
-          name: 'cusPhone',
-          title: mixins.$t("cusPhone")
-        },
-        {
-          name: 'addressFull',
-          title: mixins.$t("adddressFull")
-        },
-        {
-          name: [{
-            name: 'orgName',
-            title: ''
-          }, {
-            name: 'staffName',
-            title: mixins.$t("staffId")
-          }],
-          title: mixins.$t("storeInformation")
-        }
-      ],
-      '出库中': [{
-          name: 'outNo',
-          title: mixins.$t("outOrderNo")
-        },
-        {
-          name: 'cusPhone',
-          title: mixins.$t("cusPhone")
-        },
-        {
-          name: 'addressFull',
-          title: mixins.$t("adddressFull")
-        },
-        {
-          name: [{
-            name: 'orgName',
-            title: ''
-          }, {
-            name: 'staffName',
-            title: mixins.$t("staffId")
-          }],
-          title: mixins.$t("storeInformation")
-        }
-      ],
-      '已出库': [{
-          name: 'outNo',
-          title: mixins.$t("outOrderNo")
-        },
-        {
-          name: 'cusPhone',
-          title: mixins.$t("cusPhone")
-        },
-        {
-          name: 'addressFull',
-          title: mixins.$t("adddressFull")
-        },
-        {
-          name: [{
-            name: 'orgName',
-            title: ''
-          }, {
-            name: 'staffName',
-            title: mixins.$t("staffId")
-          }],
-          title: mixins.$t("storeInformation")
-        }
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: mixins.$t("staffId")
+        }],
+        title: mixins.$t("storeInformation")
+      }
       ],
     },
     buttonSaveList: [{
@@ -201,85 +201,98 @@ Page({
   /**
    * @desc :   三个小点打开
    * @date : 2024年3月8日
-   * @author : 于继渤
+   * @author : 于继渤 
    */
   toPoint(e) {
     let item = e.detail.item
-    let buttonList = null
-    //除了已入库 不显示销售退货
-    if (item.outStatus == Constants.outStatus.outBounded) { //"出库状态-已出库"
-      buttonList = [{
-          name: 'editInto',
-          title: mixins.$t('edit')
-        },
-        {
-          name: 'salesOutbound',
-          title: mixins.$t("outProcessing")
-        },
-        {
-          name: 'saleOrderReturn',
-          title: mixins.$t("saleReturn"),
-          formMode: Constants.formMode.other,
-          other: {
-            idKey: 'outId'
-          },
-          formType: 'toSaleOut'
-        }, //退货 
-        {
-          name: 'cusCollection',
-          formType: Constants.formMode.add,
-          title: mixins.$t("cusCollection")
-        },{
-          name: 'cusReturnCollection',
-          formType: Constants.formMode.add,
-          title: mixins.$t("cusReturnCollection")
-        },
-        {
-          name: 'invalid',
-          title: mixins.$t("invaidOrder")
-        }, //作废
-        {
-          name: 'printedBill',
-          title: mixins.$t('printedBill') //打印票据
-        },
-      ]
+    let buttonList = null 
+    if (!item.flgValid) { //作废
+      buttonList= [    {
+        name: 'printedBill',
+        title: mixins.$t('printedBill') //打印票据
+      },]
     } else {
-      // 弹出按钮
-      buttonList = [{
-          name: 'editInto',
-          title: mixins.$t('edit')
-        }, {
-          name: 'salesOutbound',
-          title: mixins.$t("outProcessing")
-        },
-        {
-          name: 'cusCollection',
-          formType: Constants.formMode.add,
-          title: mixins.$t("cusCollection")
-        },
-        {
-          name: 'cusReturnCollection',
-          formType: Constants.formMode.add,
-          title: mixins.$t("cusReturnCollection")
-        },
-        {
-          name: 'invalid',
-          title: mixins.$t("invaidOrder")
-        }, //作废 
-        {
-          name: 'printedBill',
-          title: mixins.$t('printedBill') //打印票据
-        },
-      ]
-    }
-    //6460 标-免费版-销售出库-一览-三个点再加一个客户收款  除了标准版 其他的删除客户收款
-    if(this.data.gradeCode !== Constants.gradeCode.STD){
-      buttonList.forEach((element,index) => {
-            if(element.name == 'cusCollection'){
-              buttonList.splice(index, 1)
+      //除了已入库 不显示销售退货
+      if (item.outStatus == Constants.outStatus.outBounded) { //"出库状态-已出库"
+        buttonList = [{
+            name: 'editInto',
+            title: mixins.$t('edit')
+          },
+          {
+            name: 'salesOutbound',
+            title: mixins.$t("outProcessing")
+          },
+          {
+            name: 'saleOrderReturn',
+            title: mixins.$t("saleReturn"),
+            formMode: Constants.formMode.other,
+            other: {
+              idKey: 'outId'
+            },
+            formType: 'toSaleOut'
+          }, //退货 
+          {
+            name: 'cusCollection',
+            formType: Constants.formMode.add,
+            title: mixins.$t("cusCollection")
+          }, {
+            name: 'cusReturnCollection',
+            formType: Constants.formMode.add,
+            title: mixins.$t("cusReturnCollection")
+          },
+          {
+            name: 'invalid',
+            title: mixins.$t("invaidOrder")
+          }, //作废
+          {
+            name: 'printedBill',
+            title: mixins.$t('printedBill') //打印票据
+          },
+        ]
+      } else {
+        // 弹出按钮
+        buttonList = [{
+            name: 'editInto',
+            title: mixins.$t('edit')
+          }, {
+            name: 'salesOutbound',
+            title: mixins.$t("outProcessing")
+          },
+          {
+            name: 'cusCollection',
+            formType: Constants.formMode.add,
+            title: mixins.$t("cusCollection")
+          },
+          {
+            name: 'cusReturnCollection',
+            formType: Constants.formMode.add,
+            title: mixins.$t("cusReturnCollection")
+          },
+          {
+            name: 'invalid',
+            title: mixins.$t("invaidOrder")
+          }, //作废 
+          {
+            name: 'printedBill',
+            title: mixins.$t('printedBill') //打印票据
+          },
+        ]
+      }
+      //6460 标-免费版-销售出库-一览-三个点再加一个客户收款  除了标准版 其他的删除客户收款
+      if (this.data.gradeCode !== Constants.gradeCode.STD) {
+        if (buttonList.length > 0) {
+          for (let i = 0; i < buttonList.length; i++) {
+            if (buttonList[i].name == 'cusCollection') {
+              buttonList.splice(i, 1)
+              break
             }
-          });
+          }
+        }
+      }
+ 
+    
     }
+
     this.setData({
       // 弹出按钮
       buttonList: buttonList
@@ -335,7 +348,12 @@ Page({
           image: '/static/image/success.png',
           duration: 1000
         })
+        // 查询
+        this.searchData();
       }
+      this.setData({
+        loading: false
+      })
     })
   },
 

pages/mine/mine.wxss

@@ -223,9 +223,9 @@ page {
 	display: grid;
 	align-content: center;
 	width: 32%;
-	height: 108rpx;
 	background: #F8F8F8;
 	filter: blur(var(--filterBlur--));
+	padding-bottom: 20rpx
 }
 
 .help-view-content-item:nth-child(n+4) {
@@ -250,7 +250,6 @@ page {
 .help-view-content-item-important {
 	font-weight: 600;
 	font-size: 16px;
-	font-family: 'PingFang SC';
 	color: #1B365D;
 	justify-content: center;
 	display: flex;
@@ -261,7 +260,6 @@ page {
 	font-style: normal;
 	font-weight: 400;
 	font-size: 10px;
-	font-family: 'PingFang SC';
 }
 
 .help-view-content-item-text {
@@ -270,7 +268,6 @@ page {
 	font-size: 10px;
 	color: #95A8CB;
 	text-align: center;
-	font-family: 'PingFang SC';
 }