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

api/pages/ivt/saleOutBound.js

@@ -38,6 +38,7 @@ module.exports = {
       printedBill:{ key: 'printedBill', method:'printedBill', formMode: 'index', idKey: 'cusId',image:'btn-printing.png' },
       saleOrderReturn: { key: 'saleOrderReturn', url: '/package-sales/pages/order-return/add/add' , image:'btn-sales-returns.png', tipMethod: 'isAllowedSaleOrderReturn'},
       cusReturnCollection: { key: 'cusReturnCollection', url: '/package-sales/pages/customer-collection/refund/refund', idKey: 'rpId', formMode: 'edit', image: 'btn-customer-refund.png' },
+      cusCollection: { key: 'cusCollection', url: '/package-sales/pages/customer-collection/add/add', idKey: 'receivableId', formMode: 'edit', image: 'btn-customer-collection.png' },
     }
   }
 };

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

@@ -618,7 +618,7 @@ Component({
         this.data.type == Constants.billType.purInto ||
         this.data.type == Constants.billType.inventory
       ) {
-        let itemQty = dataItem['box'] * dataItem['packBox'] + dataItem['piece']
+        let itemQty = Number(dataItem['box'])  * Number(dataItem['packBox']) + Number(dataItem['piece']) 
         //如果设有做大值 判断  箱片的反算数量 大于 数量最大值
         if (dataItem["itemQty_max"] && itemQty > dataItem["itemQty_max"]) {
           //那就吧 把最大值的数量换算 箱片赋值箱片
@@ -632,7 +632,7 @@ Component({
           return
         }
         //数量等于 包乘以包装数 加上片数 
-        dataItem['itemQty'] = dataItem['box'] * dataItem['packBox'] + dataItem['piece']
+        dataItem['itemQty'] =Number(dataItem['box'])  * Number(dataItem['packBox']) + Number(dataItem['piece'])
         dataItem.packageBox = dataItem['box'] + dataItem.subUnitName + dataItem['piece'] + dataItem.unitName
         if (this.data.type == Constants.billType.pur) { // 采购订单
           dataItem.sumPrice = dataItem['itemQty'] * dataItem.pricePur
@@ -1942,7 +1942,7 @@ Component({
         if (key == 'itemQty') {
           dataItem['itemQty'] = value
           dataItem['box'] = parseInt(value / dataItem.packBox)
-          dataItem['piece'] = Number(value % dataItem.packBox)
+          dataItem['piece'] = parseFloat( Number(value % dataItem.packBox).toFixed(dataItem.decimalPlaces)); 
           dataItem.packageBox = dataItem['box'] + dataItem.subUnitName + dataItem['piece'] + dataItem.unitName
           if (this.data.type == Constants.billType.pur) { //采购订单 ，单价*数量，实时变化
             dataItem.sumPrice = dataItem['itemQty'] * dataItem.pricePur
@@ -1959,7 +1959,7 @@ Component({
         if (key == 'outingQty') {
           dataItem['outingQty'] = value
           dataItem['box'] = parseInt(value / dataItem.packBox)
-          dataItem['piece'] = Number(value % dataItem.packBox)
+          dataItem['piece'] = parseFloat( Number(value % dataItem.packBox).toFixed(dataItem.decimalPlaces)); 
           dataItem.packageBox = dataItem['box'] + dataItem.subUnitName + dataItem['piece'] + dataItem.unitName
           if (this.data.type == Constants.billType.saleOut) { //销售退货
             dataItem.sumPrice = dataItem['outingQty'] * dataItem.priceOut
@@ -1972,7 +1972,7 @@ Component({
           // 使用 Math.abs() 函数获取 outingQty 的绝对值  
           let outingQty = Math.abs(dataItem.outingQty);
           dataItem['box'] = parseInt(outingQty / dataItem.packBox)
-          dataItem['piece'] = Number(outingQty % dataItem.packBox)
+          dataItem['piece'] = parseFloat( Number(value % dataItem.packBox).toFixed(dataItem.decimalPlaces)); 
           dataItem.packageBox = dataItem['box'] + dataItem.subUnitName + dataItem['piece'] + dataItem.unitName
           if (this.data.type == Constants.billType.saleOutReturn) { //销售退货
             dataItem.sumPrice = dataItem['outingQty'] * dataItem.priceOut

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

@@ -285,10 +285,10 @@
 <dk-muti-dropdown-item show="{{mutishow}}" typeName='{{dropType}}' bind:commit='chooseData' bind:muticlose='muticlose'></dk-muti-dropdown-item>
 
 <!--日期-->
-<van-popup show="{{ showDate }}" custom-style="border-radius:30rpx 30rpx 0 0;" position="bottom" bind:close="cancelDatePop">
+<van-popup show="{{ showDate }}"   custom-style="border-radius:30rpx 30rpx 0 0;" position="bottom" bind:close="cancelDatePop">
   <van-datetime-picker type="date" bind:confirm="chooseDate" bind:cancel="cancelDatePop" loading="{true}" value="{{dataTime}}" />
 </van-popup>
 
-<dk-popup id="dkPopup" type="{{popType}}" routeObjName="{{routeObjName}}"   titleTagCol="{{titleTagCol}}" titleCol="{{titleCol}}" subCol="{{subCol}}" descCol="{{descCol}}" iconCol="{{iconCol}}" priceCol="{{pupPriceCol}}" priceTitle="{{priceTitle}}" value="{{dataItem}}" show="{{showPop}}" contentObj="{{popContent_sku}}" popupTopObj="{{popupTopObj_sku}}" bind:changeStep="changeStep" bind:changeCheckBox="changeCheckBox" readonly="{{readonly}}" bind:blurNumberField="blurNumberField" bind:commit="editItems" bind:openPackageBox="openPackageBox"></dk-popup>
+<dk-popup id="dkPopup" stepperDecimal ="decimalPlaces"   type="{{popType}}" routeObjName="{{routeObjName}}"   titleTagCol="{{titleTagCol}}" titleCol="{{titleCol}}" subCol="{{subCol}}" descCol="{{descCol}}" iconCol="{{iconCol}}" priceCol="{{pupPriceCol}}" priceTitle="{{priceTitle}}" value="{{dataItem}}" show="{{showPop}}" contentObj="{{popContent_sku}}" popupTopObj="{{popupTopObj_sku}}" bind:changeStep="changeStep" bind:changeCheckBox="changeCheckBox" readonly="{{readonly}}" bind:blurNumberField="blurNumberField" bind:commit="editItems" bind:openPackageBox="openPackageBox"></dk-popup>
 <!-- 箱片 -->
-<dk-popup type="basic" title="修改包装数量" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPopBox}}" routeObjName="{{routeObjName}}" contentObj="{{popContentBox}}" bind:changeStep="changeStep" bind:commit="editItemsBox"></dk-popup>
+<dk-popup type="basic" title="修改包装数量" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPopBox}}" routeObjName="{{routeObjName}}" contentObj="{{popContentBox}}" bind:changeStep="changeStep" bind:commit="editItemsBox"stepperDecimal ="decimalPlaces"></dk-popup>

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

@@ -1,7 +1,7 @@
 <wxs src='../../../utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <view class="dk-card-outer-class">
   <!-- 单据信息 -->
-  <view class="dk-card-class" wx:for="{{cardList}}" wx:for-item="card" data-item="{{card}}">
+  <view class="dk-card-class" wx:for="{{cardList}}" wx:for-item="card" data-item="{{card}}"> 
     <view wx:for="{{contentObj[card]}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
       <!--文本框-->
       <van-field wx:if="{{item.type=='str' && !item.hide}}" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" 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 border="{{ false }}" clearable 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}}">
@@ -29,9 +29,12 @@
       <van-field wx:if="{{item.type=='switch'}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="right" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
         <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
         <view slot="inputbefor" style="text-align: left;padding-top: 5rpx;">
-          <van-switch size="20px" checked="{{ form[item.code]}}" bind:change="onChange" active-color="#3E69F6" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" data-value="{{form[item.code]}}" data-key="{{item.code}}" />
+          <van-switch size="20px" checked="{{ form[item.code]}}" bind:change="onChange" active-color="#3E69F6" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" data-value="{{form[item.code]}}" data-key="{{item.code}}"disabled="{{item.disabled}}" />
         </view>
-      </van-field>
+      </van-field> 
+      <view wx:if="{{item.type=='text'}}" style="font-size:11px;margin-left:16px;color:red;margin-top: 4px;"> 
+        {{item.text}}
+    </view>
       <!-- 是否 -->
       <van-field wx:if="{{item.type=='checkedBox'}}" input-width="200rpx" input-class="dk-cell-value-class" label-class="nomal-label" input-align="right" label="{{item.title?item.title:$t[item.code]}}" autosize border="{{ false }}" readonly="{{true}}" errorMessage="{{item.errMsg}}">
         <view slot="inputbefor" style="text-align: left;padding-top: 5rpx;display: flex;">
@@ -89,8 +92,8 @@
           </view>
         </view>
       </view>
-    </view>
-  </view>
+    </view>  
+  </view> 
 </view>
 <!--单选-->
 <dk-single-dropdown-item show="{{show}}" typeName='{{dropType}}' bind:commit='chooseData' bind:muticlose='muticlose'></dk-single-dropdown-item>

components/dkbase/dk-list-report/dk-list-report.wxml

@@ -9,7 +9,7 @@
       <view style="margin-left: 26rpx;width: 100%; ">
         <!-- 标题 -->
         <view>
-          <dk-title title="{{item.skuModel}}"></dk-title>
+          <dk-title titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
         </view>
         <!-- 描述 -->
         <view style="display: flex;padding-top: 10rpx;">

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

@@ -37,6 +37,10 @@ Component({
       type: String,
       value: 'sale'
     },
+    stepperDecimal:{
+      type: String,
+      value: ''
+    },
     // 是否只读
     readonly: {
       type: Boolean,
@@ -173,6 +177,26 @@ Component({
       }
     },
     /**
+     * @desc   : 清空选择
+     * @author : 周兴
+     * @date   : 2024/5/27 11:46
+     */
+    clearChoose(e){
+      let ds = e.currentTarget.dataset
+      let key = ds.key
+      let name = ds.name
+      let form = this.data.form
+      form[key] = undefined
+      form[name] = undefined
+      this.setData({
+        form: form
+      })
+      // 如果要清除其他值，需要调用
+      this.triggerEvent("clear", {
+        code: ds.key
+      })
+    },
+    /**
      * @desc :  关闭弹窗
      * @author : 周兴
      * @date : 2024/2/19 12:16
@@ -254,12 +278,9 @@ Component({
      * @date   : 2024/1/26 11:46
      */
     open(e) {
-
       if (this.data.readonly) {
         return;
       }
- 
-    
       let item = e.currentTarget.dataset;
       if (item.item.readonly) {
         return

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

@@ -57,6 +57,7 @@
       </van-field>
       <!--选单-->
       <van-field wx:if="{{item.type=='choose'}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" data-readonly = "{{item.readonly}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
+        <van-icon wx:if="{{!item.readonly && form[item.name] && (item.clear || item.clear == undefined)}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
         <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
       </van-field>
       <!--选择框-->
@@ -65,9 +66,10 @@
           <van-checkbox shape="round" value="{{form[item.code]}}" disabled="{{!!readonly || !!item.readonly}}" />
         </view>
       </van-field>
-      <!--数量step-->
+      <!--数量step-->  
       <van-cell wx:if="{{item.type=='step'}}" border="{{ false }}" title-class="cell_title"  title="{{item.title?item.title:'数量'}}" required="{{item.required?true:false }}">
-        <van-stepper value="{{form[item.code]}}" integer="{{true}}" data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:0)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
+        <van-stepper wx:if="{{item.code == 'box'}}"input-width="50px" value="{{form[item.code]}}" integer="{{true}}"  data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:0)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
+        <van-stepper wx:else value="{{form[item.code]}}" input-width="50px" integer="{{ form[stepperDecimal]==0}}"decimal-length="{{ form[stepperDecimal] }}" data-index="{{index}}" data-item="{{item}}" data-key="{{item.code}}" min="{{form[item.code + '_min']?form[item.code + '_min']:( item.min?item.min:0)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
       </van-cell>
       <!--数字类-->
       <dk-number-input wx:if="{{item.type=='number'}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" max="{{(item.max || item.max == '')?item.max:10000000}}" min="{{(item.min || item.min == '')?item.min:-10000000}}"  data-index="{{index}}" center="{{'right'}}" readonly="{{!!readonly || !!item.readonly}}" 

components/dkbase/dk-popup/dk-popup.wxss

@@ -2,6 +2,7 @@
 .dk-popup {
   background-color: transparent !important;
   overflow-x: hidden;
+  padding-bottom: 0 !important;
 }
 
 /**pop弹出框的表头样式*/

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

@@ -3,7 +3,7 @@
   <!-- 列表上半部分 -->
   <van-swipe-cell right-width="{{ 65 }}" disabled="{{swipeDisabled}}" right-hight="10">
     <view wx:if="{{!item[parentIdKey]}}" class="main-title-class" bindtap="clickName" data-item="{{item}}" data-type="fa">
-      <view data-item="{{item}}" data-type="fa" bindtap="clickName"style="flex:1">
+      <view data-item="{{item}}" data-type="fa" style="flex:1">
         <view class="font-title">{{item[nameKey]}}</view>
       </view>
 
@@ -35,7 +35,7 @@
           <view wx:if="{{ischekboxFlag}}">
             <checkbox checked="{{item.selected}}" bindchange="handleCheckboxChange" data-id="{{item.id}}"> </checkbox>
           </view>
-          <view class="{{item[itemListKey].length !== 0 ?'parent':'node'}} " style="padding-top: 16rpx;padding-bottom: 16rpx; width: 100%;margin-left: 5vw;font-size: 14px;" data-item="{{item}}" data-type="sub" data-open="{{item.open}}" bindtap="clickName">
+          <view class="{{item[itemListKey].length !== 0 ?'parent':'node'}} " style="padding-top: 16rpx;padding-bottom: 16rpx; width: 100%;margin-left: 5vw;font-size: 14px;" data-item="{{item}}" data-type="sub" data-open="{{item.open}}" >
             <view class="font">{{item[nameKey]}}</view>
           </view>
 

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

@@ -14,7 +14,7 @@
         </view>
     </view>
     <!-- 列表下半部分 --> 
-    <view class="{{(item.children && item.children.length > 0 && !item[parentIdKey])?'list-below-item':''}}">
+    <view class="{{(item.children && item.children.length > 0 && !item[parentIdKey] && item.open)?'list-below-item':''}}">
         <view style="width: 100%;">
             <view wx:if="{{item[parentIdKey]}}" style="display:flex;align-items:center;margin-left:{{item[itemListKey].length !== 0 ? depth*40 : depth*60}}rpx;font-size:15px; " class="list-below-item">
                 <!--  -->

i18n/zh-CN.js

@@ -37,6 +37,7 @@ const button = {
   ticketPirnt: '票据打印',
   totalAmount: '合计金额',
   goodsDetail: '商品明细',
+  goodsQuantity: '商品数量',
   otherInfo: '其他信息',
   responsiblePerson: '责任人',
   invalidSuccessfully: '作废成功',

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

@@ -34,6 +34,8 @@ mixins: [mixins],
       orderService: app.globalData['orderService'],
       otherPayableService: app.globalData['otherPayableService'],
       saleOutBoundReturnService: app.globalData['saleOutBoundReturnService'],
+      outboundService: app.globalData['outboundService'],
+
     },
 
     /**
@@ -211,7 +213,7 @@ mixins: [mixins],
       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 订单开单收款
+      // formType ：1 收款单 ，2 付款单，3 客户收款保存参数,4 客户退款 5 退收款单 6 退付款单  7 其他收入单 8 订单开单收款 9 其他支出 10 销售退款 的退款 11 销售出库的收款
       if (this.data.formType == 1) {
         params.rpType = Constants.rpType.receipt
         // 1 收款单
@@ -523,7 +525,51 @@ mixins: [mixins],
              })
              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
+            }
 
       if (this.data.formType !== 8) {
         params.itemList = itemList
@@ -573,11 +619,12 @@ mixins: [mixins],
         return this.excute(this.data.otherPayableService, this.data.otherPayableService.insert, this.data.params);
       }else if (this.data.formType == 10) { //销售退货 >>> 客户退款
         return this.excute(this.data.saleOutBoundReturnService, this.data.saleOutBoundReturnService.outboundInsertRefund, this.data.params);
-      }
-      outbound_insert_refund
-
-
-
+ 
+      }else if (this.data.formType == 11) { //销售出库 >>> 客户收款
+    
+        return this.excute(this.data.outboundService, this.data.outboundService.outboundInsertRefund, this.data.params);
+       
+      } 
     },
     /**
       * @desc :   处理保存返回数据
@@ -585,8 +632,7 @@ mixins: [mixins],
       * @author : 姜永辉
       */
     handleData() {
-      if (this.data.formType == 3 || this.data.formType == 4) { //客户收款/退款
-        console.log('处理保存返回数据')
+      if (this.data.formType == 3 || this.data.formType == 4) { //客户收款/退款 
         let pages = getCurrentPages();
         let prevPage = pages[pages.length - 3]; //上二页
         prevPage.setData({
@@ -595,6 +641,7 @@ mixins: [mixins],
         wx.navigateBack({
           delta: 1
         })
+ 
       } else if (this.data.formType == 8) { //订单收款
         let pages = getCurrentPages();
         let prevPage = pages[pages.length - 2]; //上1页

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

@@ -51,6 +51,8 @@ Page({
     popContent: null,
     // 是否有默认值
     defaultFlag: false,
+    // 简单模式
+    simpleFlag: false,
     // 确定按钮
     buttonList: [{
       name: 'confirm',
@@ -77,7 +79,6 @@ Page({
           }
         },
         success: function (res) {
-          console.log('_this.data.chooseType', _this.data.chooseRoute);
           // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
           res.eventChannel.emit('params', { formType: _this.data.chooseRoute.type, backFlag: true })
         }
@@ -123,7 +124,6 @@ Page({
         choosedData: choosedData
       })
     }
-    console.log('ddddd', this.data.choosedData);
   },
   /**
    * @desc : 确定事件-返回数据
@@ -166,16 +166,8 @@ Page({
     this.setData({
       tableData: tableData
     })
-    item.id = item.channelId
-    item.name = item.channelName
-    item.code = item.channelCode
-    const eventChannel = this.getOpenerEventChannel();
-    eventChannel.emit('bindData', {
-      data: item
-    })
-    wx.navigateBack({
-      delta: 1
-    })
+    // 执行点击事件
+    this._toDetail(item);
   },
   /**
    * @desc : 点击事件-返回数据
@@ -757,15 +749,16 @@ Page({
           pageFlag: false,
           popTitle: mixins.$t('add') + title,
           title: 'brandName',
-          contentList: [{
-            name: 'brandCode',
-            title: '品牌编码'
-          },
-          {
-            name: 'brandName',
-            title: '品牌名称'
-          },
-          ],
+          simpleFlag: true,
+          // contentList: [{
+          //   name: 'brandCode',
+          //   title: '品牌编码'
+          // },
+          // {
+          //   name: 'brandName',
+          //   title: '品牌名称'
+          // },
+          // ],
           placeholder: ['brandName']
         })
         // 标准版没有供应商

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

@@ -23,17 +23,17 @@
   </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="{{ !simpleFlag && chooseFlag && active == 1}}" id="choosed" list="{{choosedData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}" swipeDisabled="{{false}}" swipeDeleteFlag="{{true}}" bind:swipe="delChoosed"></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>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
-
+<view style="height: 200rpx;"></view>
 <!-- 确定按钮 -->
 <dk-save-button wx:if="{{chooseFlag}}" btnAutoWidthFlag="{{true}}" buttonList="{{buttonList}}" bind:open="confirm"></dk-save-button>
 

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

@@ -72,5 +72,8 @@
 
 .main-item-class {
 	padding: 20rpx 20rpx;
-	color:#1B365D
+	color:#1B365D;
+	background: linear-gradient(95.33deg, #ADC6FF -2.27%, #F0F5FF 60.66%),
+    linear-gradient(0deg, #F4F8FF, #F4F8FF),
+    radial-gradient(58.28% 235.72% at 10.78% 50%, rgba(191, 213, 255, 0.6) 0%, rgba(216, 229, 255, 0) 56.69%); 
 }

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

@@ -696,7 +696,7 @@ Page({
       this.data.item == Constants.billType.purReturn ||
       this.data.item == Constants.billType.saleOut) {
       item['box'] = parseInt(item.itemQty / item.packBox)
-      item['piece'] = Number(item.itemQty % item.packBox)
+      item['piece'] = parseFloat( Number(item.itemQty % item.packBox)).toFixed(item.decimalPlaces);  
       item.packageBox = item['box'] + item.subUnitName + item['piece'] + item.unitName
       if (this.data.item == Constants.billType.pur) { //采购订单 采购数量 
         item.pricePur = item.pricePurchase?item.pricePurchase:0 //采购价
@@ -895,7 +895,7 @@ Page({
       if (key == 'itemQty') {
         dataItem['itemQty'] = value
         dataItem['box'] = parseInt(value / dataItem.packBox)
-        dataItem['piece'] = Number(value % dataItem.packBox)
+        dataItem['piece'] = parseFloat( Number(value % dataItem.packBox).toFixed(dataItem.decimalPlaces)); 
         dataItem.packageBox = dataItem['box'] + dataItem.subUnitName + dataItem['piece'] + dataItem.unitName
         if (this.data.billType == Constants.billType.pur) { //采购订单 ，单价*数量，实时变化
           dataItem.sumPrice = dataItem['itemQty'] * dataItem.pricePur
@@ -960,7 +960,7 @@ Page({
       this.data.billType == Constants.billType.inventory
     ) {
       //数量等于 包乘以包装数 加上片数 
-      dataItem['itemQty'] = dataItem['box'] * dataItem['packBox'] + dataItem['piece']
+      dataItem['itemQty'] = Number(dataItem['box'])  * Number(dataItem['packBox']) + Number(dataItem['piece'])
       dataItem.packageBox = dataItem['box'] + dataItem.subUnitName + dataItem['piece'] + dataItem.unitName
       if (this.data.billType == Constants.billType.pur) { //采购订单  ，单价*数量，实时变化
         dataItem.sumPrice = dataItem['itemQty'] * dataItem.pricePur
@@ -1141,7 +1141,7 @@ Page({
    * @author : 姜永辉
    */
   getGoodsBrandNoPage() {
-    return this.excute(this.data.commonService, this.data.commonService.getGoodsBrandNoPage, {}).then(res => {
+    return this.excute(this.data.commonService, this.data.commonService.getGoodsBrandNoPage, {flgValid:true}).then(res => {
       console.log('getGoodsBrandNoPage', res.data.data)
       this.setData({
         typeList: this.data.typeList.concat(res.data.data)

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

@@ -400,23 +400,23 @@
 
 
 <!--  采购入库 采购订单 其它入库  --> 
-<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' && billType !== 'inventory'  }}" type="sale" descCol="skuName" titleTagCol="" titleCol="skuModel" iconCol="imagesUrl"  subCol="calculationFormula"  value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="sumPrice"  contentObj="{{popContent}}"bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:openPackageBox="openPackageBox" bind:commit="editItems"> 
+<dk-popup wx:if="{{ billType != 'sale' && billType != 'saleOut' && billType !== 'inventory'  }}" stepperDecimal ="decimalPlaces" type="sale" descCol="skuName" titleTagCol="" titleCol="skuModel" iconCol="imagesUrl"  subCol="calculationFormula"  value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="" priceCol="sumPrice"  contentObj="{{popContent}}"bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:openPackageBox="openPackageBox" bind:commit="editItems"> 
 </dk-popup>
 
 <!-- 库存 -->
-<dk-popup wx:if="{{ billType == 'inventory' }}" type="sale" descCol="skuName" subCol="calculationFormula" titleTagCol="" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="标价：" priceCol="sumPrice" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox"bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:changeField= "changeField" >
+<dk-popup wx:if="{{ billType == 'inventory' }}" type="sale" descCol="skuName"stepperDecimal ="decimalPlaces"  subCol="calculationFormula" titleTagCol="" titleCol="skuModel" iconCol="imagesUrl" value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" priceTitle="标价：" priceCol="sumPrice" contentObj="{{popContent}}" bind:commit="editItems" bind:openPackageBox="openPackageBox"bind:changeStep="changeStep" bind:blurNumberField="blurNumberField" bind:changeField= "changeField" >
 </dk-popup>
 
 
 <!-- 销售开单 -->
-<dk-popup wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="" subCol="calculationFormula" descCol="skuName" titleCol="skuModel"  priceCol="sumPrice"  iconCol="imagesUrl"   value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" bind:changeStep="changeStep" bind:openPackageBox="openPackageBox" contentObj="{{popContent}}" bind:commit="editItems"bind:blurNumberField="blurNumberField">
+<dk-popup wx:if="{{ billType == 'sale' }}" type="sale" titleTagCol="" subCol="calculationFormula" descCol="skuName" stepperDecimal ="decimalPlaces" titleCol="skuModel"  priceCol="sumPrice"  iconCol="imagesUrl"   value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" bind:changeStep="changeStep" bind:openPackageBox="openPackageBox" contentObj="{{popContent}}" bind:commit="editItems"bind:blurNumberField="blurNumberField">
 </dk-popup>
 <!-- 销售出库 -->
-<dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="" subCol="calculationFormula" descCol="skuName" titleCol="skuModel"  priceCol="sumPrice"  iconCol="imagesUrl"   value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:changeStep="changeStep"  bind:commit="editItems" popupTopObj="{{popupTopObj}}" bind:openPackageBox="openPackageBox"bind:blurNumberField="blurNumberField" bind:changeField= "changeField">
+<dk-popup wx:if="{{ billType == 'saleOut'}}" type="sale" titleTagCol="" subCol="calculationFormula" descCol="skuName" stepperDecimal ="decimalPlaces" titleCol="skuModel"  priceCol="sumPrice"  iconCol="imagesUrl"   value="{{dataItem}}" show="{{showPop}}" routeObjName="{{routeObjName}}" contentObj="{{popContent}}" bind:changeStep="changeStep"  bind:commit="editItems" popupTopObj="{{popupTopObj}}" bind:openPackageBox="openPackageBox"bind:blurNumberField="blurNumberField" bind:changeField= "changeField">
 </dk-popup>
 
 <!-- 箱片 -->
-<dk-popup   type="basic"  title="修改包装数量"    titleCol="skuModel"  iconCol="imagesUrl"   value="{{dataItem}}" show="{{showPopBox}}" routeObjName="{{routeObjName}}"   contentObj="{{popContentBox}}" bind:changeStep="changeStep" bind:commit="editItemsBox"></dk-popup>
+<dk-popup   type="basic"  title="修改包装数量"    titleCol="skuModel"  iconCol="imagesUrl"   value="{{dataItem}}" show="{{showPopBox}}" routeObjName="{{routeObjName}}"   contentObj="{{popContentBox}}" bind:changeStep="changeStep" bind:commit="editItemsBox"stepperDecimal ="decimalPlaces" ></dk-popup>
 
 <dk-save-button cssType="sale" model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="submit"></dk-save-button>
 

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

@@ -81,7 +81,7 @@ page {
 .goods-class {
   position: fixed;
   left: 20rpx;
-  top: 324rpx;
+  /* top: 324rpx; */
   background-color: #fff;
   border-radius: 0rpx 16rpx 0rpx 0rpx;
   border-radius: 16px 0px 0px 0px;

package-base-select/pages/select-product-types/select-product-types.js

@@ -118,59 +118,4 @@ Page({
   getData(params) {
     return this.excute(this.data.goodsCategoryService, this.data.goodsCategoryService.selectByCond, params);
   },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
 })

package-basic-data/pages/customer-list/customer-list.js

@@ -24,12 +24,7 @@ Page({
     ],
     gradeCode: app.globalData.company.gradeCode,
     // 查询条件
-    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: [ ],
     buttonSaveList: [{ code: 'add', title: mixins.$t('add') }],
     contentSaveList: [{ code: 'need', title: mixins.$t('together'), type: 'count', color: '#1B365D', tail: mixins.$t('customers'), bill: 1, fontSize: '15px' }],
     // 查询条件-筛选
@@ -41,10 +36,10 @@ Page({
       ],
     // 列表区（脚部信息）
     footerInfo: [{
-      prefix: mixins.$t('followedUp'),
+      // prefix: mixins.$t('followedUp'),
       name: 'followCount',
-      title: mixins.$t('next'),
-      different: mixins.$t('notFollowedUp'),
+      // title: mixins.$t('next'),
+      // different: mixins.$t('notFollowedUp'),
       color: 'red'
     },],
     // 列表区（内容）
@@ -149,6 +144,28 @@ Page({
           // { name: 'followUpTasks', title: mixins.$t('followUpTasks') },
           { name: 'collection', title: mixins.$t("cusCollection"), idKey: 'cusId' },//跳转客户收款
         ],
+        // 列表区（内容）
+        contentList: [
+          { name: 'cusPhone', title: mixins.$t('cusPhone'), phone: true },
+          { name: 'addressFull', title: mixins.$t('addressFull') },
+          {
+            name: [{ name: 'orgName', title: '' },
+            { name: 'staffName', title: '' }], title: mixins.$t('storeInformation')
+          }, 
+        ],
+        footerInfo: [{
+          // prefix: mixins.$t('followedUp'),
+          name: 'followCount',
+          // title: mixins.$t('next'),
+          // different: mixins.$t('notFollowedUp'),
+          color: 'red'
+        },],
+        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 }
+        ],
       })
     }
     if (app.globalData.company.gradeCode == Constants.gradeCode.PRO) { //专业
@@ -158,9 +175,32 @@ Page({
           { name: 'followUpTasks', title: mixins.$t('followUpTasks') },
           { name: 'toReceipt', title: mixins.$t("cusCollection"), idKey: 'cusId' },//跳转收款单
         ],
+        // 列表区（内容）
+        contentList: [
+          { name: 'cusPhone', title: mixins.$t('cusPhone'), phone: true },
+          { name: 'addressFull', title: mixins.$t('addressFull') },
+          {
+            name: [{ name: 'orgName', title: '' },
+            { name: 'staffName', title: '' }], title: mixins.$t('storeInformation')
+          },
+          { name: 'nextFollowTime', title: mixins.$t('nextFollowTime') }
+        ],
+        footerInfo: [{
+          prefix: mixins.$t('followedUp'),
+          name: 'followCount',
+          title: mixins.$t('next'),
+          different: mixins.$t('notFollowedUp'),
+          color: 'red'
+        },],
+        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 }
+        ],
       })
     }
-    
+
 
   },
   /**

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

@@ -429,7 +429,7 @@ Page({
         popContent =
           [
             { code: 'catCode', type: 'str', title: mixins.$t('catCode'), required: false, readonly: true },
-            { code: 'parentId', name: 'parentName', title: mixins.$t('parent'), type: 'choose', required: false, urlKey: 'selectProductTypes', notClear: true },
+            { code: 'parentId', name: 'parentName', title: mixins.$t('parent'), type: 'choose', required: false, urlKey: 'selectProductTypes', notClear: true,clear:true },
             { code: 'catName', type: 'str', title: mixins.$t('catName'), required: true },
             { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
           ]
@@ -437,7 +437,7 @@ Page({
         popContent =
           [
             // { code: 'catCode', type: 'str', title: mixins.$t('catCode'), required: false, readonly: true, },
-            { code: 'parentId', name: 'parentName', title: mixins.$t('parent'), type: 'choose', required: false, urlKey: 'selectProductTypes', notClear: true },
+            { code: 'parentId', name: 'parentName', title: mixins.$t('parent'), type: 'choose', required: false, urlKey: 'selectProductTypes', notClear: true,clear:true },
             { code: 'catName', type: 'str', title: mixins.$t('catName'), required: true },
             { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
           ]

package-basic-data/pages/product-file/add/add.js

@@ -80,7 +80,7 @@ Page({
           type: 'choose',
           urlKey: 'unit',
           required: true,
-          clear:false,
+          clear: false,
         }, { //辅助单位标识
           type: 'switch',
           title: mixins.$t("subUnitId"),
@@ -92,6 +92,7 @@ Page({
           type: 'choose',
           urlKey: 'unit',
           required: true,
+          readonly: true,
         }, { //包装
           code: 'packBox',
           title: mixins.$t("package"),
@@ -99,6 +100,7 @@ Page({
           sign: "",
           digits: 0,
           required: true,
+          readonly: true,
         },
         {
           code: 'calculationFormula',
@@ -194,7 +196,7 @@ Page({
             type: 'choose',
             urlKey: 'unit',
             required: true,
-            clear:false,
+            clear: false,
           }, { //辅助单位标识
             type: 'switch',
             title: mixins.$t("subUnitId"),
@@ -230,7 +232,7 @@ Page({
           type: 'choose',
           urlKey: 'unit',
           required: true,
-          clear:false,
+          clear: false,
         }, { //辅助单位标识
           type: 'switch',
           title: mixins.$t("subUnitId"),
@@ -346,24 +348,27 @@ Page({
     console.log("onShow");
     this.dialogShowChooseData();
   },
-    /**
+  /**
    * @desc : 因为chooseData 的执行顺序要高于onshow 且 chooseData无法弹 dialog 所以在onshow执行
    * @date : 2024/2/1 15:49
    * @author : 王英杰
    */
-  dialogShowChooseData(){
-    if(!this.data.handledata){
+  dialogShowChooseData() {
+    if (!this.data.handledata) {
       return
     }
     this.setData({
-      handledata:false
+      handledata: false
     })
     let formData = JSON.parse(this.data.formData)
     let data = this.data.chooseUnitData
     formData.intoQty = null
+    formData.packBox = null
+    formData.subUnitId = null
+    formData.subUnitName = null
     //提示
     Dialog.confirm({
-      message: '期初数量已输入，更换基础单位需要清空期初数量',
+      message: '更换基础单位将清空包装单位,期初数量,包装数量',
     }).then(() => {
       this.handleChooseDataUnit(formData, data)
     }).catch(() => {});
@@ -389,10 +394,10 @@ Page({
     }
     if (code == "unitId") { //计量单位
       //当期初数量有值的时候 弹提示是否清除
-      if (formData.intoQty) { //在onshow执行 这里无法弹出dialog
+      if (formData.intoQty || formData.packBox) { //在onshow执行 这里无法弹出dialog
         this.setData({
-          chooseUnitData:data,
-          handledata:true
+          chooseUnitData: data,
+          handledata: true
         })
       } else {
         this.handleChooseDataUnit(formData, data)
@@ -400,6 +405,12 @@ Page({
 
     }
     if (code == "subUnitId") { //辅助计量单位
+      if (data.id == formData.unitId) { 
+        setTimeout(() => {
+          util.showToast('包装单位不能等于基本单位');
+        }, 1000)
+        return
+      }
       formData.subUnitId = data.id
       formData.subUnitName = data.name
       if (formData.packBox && formData.unitName && formData.subUnitName) { //选了辅助计量单位 正好 包装也有值 那么直接给出公式
@@ -435,14 +446,31 @@ Page({
       // 遍历 contentObj.warehouse 数组  
       for (let i = 0; i < contentObj.warehouse.length; i++) {
         // 检查当前对象的 code 是否为 'intoQty'  
-        if (contentObj.warehouse[i].code === 'intoQty') {
+        if (contentObj.warehouse[i].code === 'intoQty') { //期初数量
           // 如果是，则修改其 digits 属性  
           contentObj.warehouse[i].digits = formData.decimalPlaces;
+          contentObj.warehouse[i].readonly = false;
           // 找到后，可以跳出循环（如果确定只有一个匹配项）  
           break;
         }
       }
     }
+    if (contentObj.unit.length > 0) {
+      // 遍历 contentObj.unit 数组  
+      for (let i = 0; i < contentObj.unit.length; i++) {
+        // 检查当前对象的 code 是否为 'packBox'  
+        if (contentObj.unit[i].code === 'packBox') { //包装
+          // 如果是，则修改其 digits 属性  
+          contentObj.unit[i].digits = formData.decimalPlaces;
+          contentObj.unit[i].readonly = false;
+          continue
+        }
+        if (contentObj.unit[i].code === 'subUnitId') { //包装单位 
+          contentObj.unit[i].readonly = false;
+          continue
+        }
+      }
+    }
     this.setData({
       contentObj: contentObj,
       formData: JSON.stringify(formData)
@@ -508,14 +536,13 @@ Page({
         // 增加包装；数字类型正整数，默认1
         let formData = {}
         let contentObj = this.data.contentObj
-        formData.packBox = 1
         formData.flgPrice = true
         formData.flgOpeningInv = false
         formData.flgSubUnit = true
-        
+
         that.setData({
           formData: JSON.stringify(formData),
-          loading:false,
+          loading: false,
           contentObj: {
             main: [{ //商品型号
                 code: 'skuModel',
@@ -531,7 +558,7 @@ Page({
                 name: mixins.$t("commodityPicture"), //商品图片
                 type: 'uploader',
               },
-      
+
             ],
             goods: [{ //商品品牌
                 code: 'brandId',
@@ -548,15 +575,15 @@ Page({
                 type: 'choose',
                 urlKey: 'goodsCategory',
                 required: true,
-      
+
               }, { //商品系列
                 code: 'seriesId',
                 name: 'seriesName',
                 title: mixins.$t("goodsSeries"),
                 type: 'choose',
                 urlKey: 'goodsSeries',
-      
-      
+
+
               }, { //商品规格 
                 code: 'skuSpec',
                 name: 'skuSpec',
@@ -572,7 +599,7 @@ Page({
                 type: 'choose',
                 urlKey: 'unit',
                 required: true,
-                clear:false,
+                clear: false,
               }, { //辅助单位标识
                 type: 'switch',
                 title: mixins.$t("subUnitId"),
@@ -584,6 +611,7 @@ Page({
                 type: 'choose',
                 urlKey: 'unit',
                 required: true,
+                readonly: true,
               }, { //包装
                 code: 'packBox',
                 title: mixins.$t("package"),
@@ -591,6 +619,7 @@ Page({
                 sign: "",
                 digits: 0,
                 required: true,
+                readonly: true,
               },
               {
                 code: 'calculationFormula',
@@ -639,7 +668,7 @@ Page({
               title: mixins.$t("otherPriceLimit"),
               required: true,
             }, ],
-      
+
             other: [{
               code: 'remarks',
               type: 'textarea',
@@ -657,7 +686,7 @@ Page({
    * @author : 姜永辉
    */
   handleSaveData() {
-    console.log('eee',this.data.formType,this.data.formType == Constants.formType.shopping);
+    console.log('eee', this.data.formType, this.data.formType == Constants.formType.shopping);
     //购物车跳转来的,新建完毕直接回到选择界面
     if (this.data.formType == Constants.formType.shopping) {
       // var pages = getCurrentPages();
@@ -702,8 +731,7 @@ Page({
     } else {
       // 增加包装；数字类型正整数，默认1
       let formData = JSON.parse(this.data.formData) || {}
-      console.log('eeee',formData,this.data.formData,this.data.formType);
-      formData.packBox = 1
+      console.log('eeee', formData, this.data.formData, this.data.formType);
       formData.flgPrice = true
       formData.flgOpeningInv = false
       formData.flgSubUnit = true
@@ -714,7 +742,7 @@ Page({
         title: mixins.$t('addGoodsSuk'),
       })
     }
-    console.log('dddddd',this.data.formType);
+    console.log('dddddd', this.data.formType);
   },
   /**
    * @desc : 给表单赋值
@@ -725,8 +753,7 @@ Page({
     // data.serviceCategories = (data.serviceCategories && data.serviceCategories.length > 0) ? data.serviceCategories.join(',') : undefined
     data.annexPaths = data.skuImages
     data.onlyCode = data.skuCode
-    data.isflgOpeningInv = false //因为期初库存编辑的时候不让改 所以 即使数据库是true 那么也要置灰 取这个code
-    data.isflgOpeningInv = false //  库存量不为0不让更改 辅助单位取这个code
+ 
     let contentObj = this.data.contentObj
     // 我们要添加的新对象是  编码  新建的时候没有 编辑的时候添加 
     contentObj.main = [{ //唯一编码
@@ -751,7 +778,11 @@ Page({
 
     ]
     if (data.flgSubUnit) {
-      contentObj.unit = [{ //基本单位
+      if(data.inventoryCount !== 0){
+        contentObj.unit = [{
+          text: '本商品有库存，不可更改单位模块；需全部出库后才可更改',
+          type: 'text',
+        },{ //基本单位
           code: 'unitId',
           name: 'unitName',
           title: mixins.$t("unit"),
@@ -762,8 +793,48 @@ Page({
         }, { //辅助单位标识
           type: 'switch',
           title: mixins.$t("subUnitId"),
-          code: (data.inventoryCount !== 0) ? 'isflgOpeningInv' : 'flgSubUnit',
+          code: 'flgSubUnit',
+          disabled:(data.inventoryCount !== 0),
+       
+        }, { //包装单位
+          code: 'subUnitId',
+          name: 'subUnitName',
+          title: mixins.$t("packageUnit"),
+          type: 'choose',
+          urlKey: 'unit',
+          required: true,
+          readonly: data.inventoryCount !== 0 //要校验库存；  库存量不为0不让更改 
+        }, { //包装
+          code: 'packBox',
+          title: mixins.$t("package"),
+          type: 'number',
+          sign: "",
+          digits: 0,
+          required: true,
+          readonly: data.inventoryCount !== 0 
+        },
+        {
+          code: 'calculationFormula',
+          type: 'textarea',
+          title: mixins.$t("calculationFormula"),
+          readonly: true,
+        }
+      ]
+      }else{ //没库存
+        contentObj.unit = [{ //基本单位
+          code: 'unitId',
+          name: 'unitName',
+          title: mixins.$t("unit"),
+          type: 'choose',
+          urlKey: 'unit',
+          required: true,
           readonly: data.inventoryCount !== 0 //要校验库存；  库存量不为0不让更改 
+        }, { //辅助单位标识
+          type: 'switch',
+          title: mixins.$t("subUnitId"),
+          code: 'flgSubUnit',
+          disabled:(data.inventoryCount !== 0),
+       
         }, { //包装单位
           code: 'subUnitId',
           name: 'subUnitName',
@@ -779,6 +850,7 @@ Page({
           sign: "",
           digits: 0,
           required: true,
+          readonly: data.inventoryCount !== 0 
         },
         {
           code: 'calculationFormula',
@@ -787,6 +859,8 @@ Page({
           readonly: true,
         }
       ]
+      }
+    
     } else {
       contentObj.unit = [{ //基本单位
         code: 'unitId',
@@ -806,8 +880,9 @@ Page({
       contentObj.warehouse = [{ //期初库存标识
           type: 'switch',
           title: mixins.$t("openingInv"),
-          code: 'isflgOpeningInv',
-          readonly: true,
+          code: 'flgOpeningInv',
+          disabled: true,
+           
         }, { //仓库名称
           code: 'whId',
           name: 'whName',
@@ -846,8 +921,8 @@ Page({
       contentObj.warehouse = [{ //期初库存标识
         type: 'switch',
         title: mixins.$t("openingInv"),
-        code: 'isflgOpeningInv',
-        readonly: true,
+        code: 'flgOpeningInv', 
+        disabled: true,
       }, ]
     }
     if (data.flgPrice) {

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

@@ -101,7 +101,7 @@ Page({
    * @date : 2024/1/23 9:16
    */
   getGoodsBrandNoPage() {
-    let excute = this.excute(this.data.commonService, this.data.commonService.getGoodsBrandNoPage, {});
+    let excute = this.excute(this.data.commonService, this.data.commonService.getGoodsBrandNoPage, {flgValid:true});
     excute.then(res => {
       if (res.data.code === Constants.SUCESS_CODE) { 
         let sidebarList = []

package-basic-data/pages/product-file/product-series/product-series.js

@@ -17,7 +17,7 @@ Page({
      */
     data: {
       pageFlag:false,
-      dataItem:{},
+      dataItem:'{}',
       tableData: [],
       formDataName: mixins.$t('unit'),
       popContent:

package-basic-data/pages/staff/staff.js

@@ -145,7 +145,7 @@ Page({
       flgValid: false,
       wxUserId: item.wxUserId,
       hrStatus: 2 // 离职2 在职1
-    }
+    } 
     this.excute(this.data.service, this.data.service.leaveOffice, params).then(res => {
       if (res.data.code == Constants.SUCESS_CODE) {
         // 重新查询

package-basic-data/pages/staff/staff.wxml

@@ -1,5 +1,6 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<van-dialog id="van-dialog" />
 <!-- 加载图层 -->
 <loading wx:if="{{loading}}"></loading>
 <!-- 粘性布局的查询条件 -->

package-inventory/pages/choose-product/choose-product.wxss

@@ -234,7 +234,7 @@
 .goods-class{
   position: fixed;
   left:20rpx;
-  top: 298rpx;
+  /* top: 298rpx; */
   background-color: #fff;
 }
 

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

@@ -55,7 +55,7 @@
 .goods-class {
 	position: fixed;
 	left: 20rpx;
-	top: 324rpx;
+	/* top: 324rpx; */
 	background-color: #fff;
 	border-radius: 0rpx 16rpx 0rpx 0rpx;
 	border-radius: 16px 0px 0px 0px;

package-inventory/pages/ivt-sum-report/detail/detail.wxml

@@ -32,7 +32,7 @@
       <view slot="title" style="display: flex;">
         <!-- 标题 -->
         <view style="display: flex;">
-          <dk-title title="{{item.skuModel}}"></dk-title>
+          <dk-title  titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
         </view>
       </view>
       <!-- 描述 -->
@@ -70,7 +70,7 @@
         <view style="display: flex;padding-top: 10rpx;">
           <view style="font-size: 30rpx;width: 55%;color:#1B365D;">{{active==0?item_.intoNo:item_.outNo}}</view>
           <view style="width: 45%;font-size: 24rpx;color:#95A8CB;display: flex;justify-content: center;align-items: center;text-align: center;">
-            <view>{{active==0?$t['intoDate']:$t['outDate']}}：{{active==0?item_.intoDate:item_.outDate }}</view>
+            <view>{{active==0?item_.intoTypeName:item_.outTypeName}}   {{active==0?item_.intoDate:item_.outDate }}</view>
           </view>
         </view>
       </view>
@@ -78,8 +78,8 @@
       <!-- 商品信息 -->
       <view style="background: #FFFFFF;">
         <view style="display: flex;justify-content: space-between;align-items: center;">
-          <view style=" padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 30rpx;">{{$t['goodsDetail']}}</view>
-          <view style=" padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 30rpx;">{{active==0?item_.intoQty:item_.outQty }}</view>
+          <view style=" padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 30rpx;">{{$t['goodsQuantity']}}</view>
+          <view style=" padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 30rpx;">{{active==0?item_.intoQty:item_.outQty }}{{item_.unitName}}</view>
         </view>
       </view>
     </view>

package-inventory/pages/ivt-sum-report/ivt-sum-report.wxml

@@ -9,4 +9,4 @@
 
 
 <!-- 列表区 -->
-<dk-list-report list="{{tableData}}" flgSubFormatDate="{{true}}"   titleCol="skuModel" iconCol="imagesUrl" descCol="skuName" title="skuCode" colorLeft="#437FF8" colorRight="#F43636" statusLeft="outStatusName" reportNameKey="ivt" contentCardTwoFlg="{{true}}" content="{{contentList}}" contentObj="{{contentObj}}" bind:toDetail="toDetail" bind:toTitle="toTitle"    routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list-report>
+<dk-list-report list="{{tableData}}" flgSubFormatDate="{{true}}"  titleTagCol="shortName"  titleCol="skuModel" iconCol="imagesUrl" descCol="skuName" title="skuCode" colorLeft="#437FF8" colorRight="#F43636" statusLeft="outStatusName" reportNameKey="ivt" contentCardTwoFlg="{{true}}" content="{{contentList}}" contentObj="{{contentObj}}" bind:toDetail="toDetail" bind:toTitle="toTitle"    routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list-report>

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

@@ -408,6 +408,7 @@ Page({
                 totalQuantity += Number(element.intoingQty)
             }
             element.packageBox = element['box'] + element.subUnitName + element['piece'] + element.unitName
+            console.log("element",element, element.nonStdCode );
             element.nonStdCode = element.nonStdCode != null ? element.nonStdCode : '-'
         })
         // 左下角的合计金额

package-sales/pages/choose-goods/choose-goods.wxss

@@ -218,7 +218,7 @@
   .goods-class{
     position: fixed;
     left:20rpx;
-    top: 196rpx;
+    /* top: 196rpx; */
     background-color: #fff;
   }
   

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

@@ -115,15 +115,51 @@ Page({
       url: this.data.route.selectCollectionConfirm.url,
       events: {
         // 回调后
-        bindData: function (data) {
-          const eventChannel = this.getOpenerEventChannel();
-          eventChannel.emit('refresh', {
-            id: 1
-          })
-          // 保存成功后 回调
-          wx.navigateBack({
-            data: 1
-          })
+        refresh: function (data) { 
+          //销售订单跳转
+          if (_this.data.formType == Constants.formMode.add) {
+            const eventChannel = this.getOpenerEventChannel();
+            eventChannel.emit('refresh', {
+              id: 1
+            })
+            console.log("refreshrefreshrefresh");
+            // 保存成功后 回调
+            wx.navigateBack({
+              data: 1
+            })
+          } else {
+            console.log("adddddddd");
+            let formData = {}
+            formData['staff'] = {
+              text: app.globalData.user.staffName,
+              value: [app.globalData.user.staffId]
+            }
+            formData['org'] = {
+              text: app.globalData.user.orgName,
+              value: [app.globalData.user.orgId]
+            }
+            formData.orgId = app.globalData.user.orgId
+            formData.orgList = [
+              {
+                orgId: app.globalData.user.orgId,
+                orgName: app.globalData.user.orgName,
+                ownerFlag: true,
+                allocationRatio: 100,
+              }
+            ]
+            formData.staffId = app.globalData.user.staffId
+            formData.staffList = [
+              {
+                staffId: app.globalData.user.staffId,
+                staffName: app.globalData.user.staffName,
+                ownerFlag: true,
+                allocationRatio: 100,
+              }
+            ]
+            _this.setData({
+              formData: JSON.stringify(formData)
+            })
+          }
         }
       },
       success: function (res) {

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

@@ -423,7 +423,7 @@ Page({
       if( formData.goodsList){ //算出 要退款 的钱
         let nmb = 0
         formData.goodsList.forEach(element => {
-          nmb = element.priceOut + nmb
+          nmb = element.outingAmt + nmb
         });
         formData.sumAmtRec = nmb 
       } 

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

@@ -155,10 +155,7 @@ Page({
       ]
     },
     //按钮
-    buttonSaveList: [{
-      code: 'collection',
-      title: mixins.$t("collection")
-    },
+    buttonSaveList: [ 
     {
       code: 'save',
       title: mixins.$t("save")
@@ -365,6 +362,13 @@ Page({
    * @author : 于继渤
    */
   saveData() {
+    if(this.data.collectionFlag){
+      this.setData({
+        collectionFlag:false
+      })
+      this.handCollection()
+      return
+    }
     if (this.data.formMode == Constants.formMode.detailEdit) { //编辑
       //limitEdit 编辑标识 true 大
       this.data.params.limitEdit = true
@@ -383,7 +387,33 @@ Page({
       }
     }
   },
-
+ /**
+   * @desc : 收款
+   * @date : 2024/2/1 15:49
+   * @author : 于
+   */
+  handCollection(e) {
+    let _this = this
+    wx.navigateTo({
+      url: '/package-base-select/pages/select-collection_confirm/select-collection_confirm',
+      events: {
+        // 回调后
+        refresh: function (data) {
+         // 保存成功后 回调
+         wx.navigateBack({
+          data: 1
+        })
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 
+        res.eventChannel.emit('params', {
+          item: _this.data.formData,
+          formType: 11
+        })
+      }
+    })
+  },
   /**
    * @desc : 自定义保存参数
    * @date : 2024/2/1 15:49
@@ -600,7 +630,27 @@ Page({
     if (name == 'save' || name == 'detail') { //保存
       this.save({})
     } else if (name == 'collection') { 
-
+      let formData = JSON.parse(this.data.formData)
+      formData.btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : '' 
+      if( formData.goodsList){ //算出 要收的钱
+        let nmb = 0
+        formData.goodsList.forEach(element => {
+          nmb = element.outingAmt + nmb
+        });
+        formData.sumAmtRec = nmb 
+      } 
+      formData.objInfo = {} //退款页面的 客户信息
+      formData.objInfo['cusPhone'] = formData.cusPhone
+      formData.objInfo['cusName'] = formData.cusName
+      formData.objInfo['objectId'] = formData.cusId
+      formData.objInfo['addressFull'] = formData.addressFull 
+   
+      this.setData({
+        formData:JSON.stringify(formData),
+        collectionFlag:true,
+      })
+      this.save({})
+   
     } 
     // })
   },
@@ -1370,12 +1420,26 @@ Page({
       })
       // 标准版，自动出库办理标识默认勾上
       if (this.data.gradeCode == Constants.gradeCode.STD) {
+            //处理默认值  业务员业务部门
+            let buttonSaveList = this.data.buttonSaveList
+            //按钮
+            buttonSaveList =  [{
+              code: 'collection',
+              title: mixins.$t("collection")
+            },
+            {
+              code: 'save',
+              title: mixins.$t("save")
+            }
+          ] 
         let btnFormData = JSON.parse(this.data.btnFormData) || {}
         btnFormData.flag = true
         this.setData({
-          btnFormData: JSON.stringify(btnFormData)
+          btnFormData: JSON.stringify(btnFormData),
+          buttonSaveList: buttonSaveList
         })
       }
+   
 
       //设置显示
       this.setFlagView()

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

@@ -190,38 +190,7 @@ Page({
     }],
 
     // 弹出按钮
-    buttonList: [{
-        name: 'editInto',
-        title: mixins.$t('edit')
-      },
-      {
-        name: 'salesOutbound',
-        title: mixins.$t("outProcessing")
-      },
-      {
-        name: 'printedBill',
-        title: mixins.$t('printedBill') //打印票据
-      },
-      {
-        name: 'invalid',
-        title: mixins.$t("invaidOrder")
-      }, //作废
-      {
-        name: 'saleOrderReturn',
-        title: mixins.$t("saleReturn"),
-        formMode: Constants.formMode.other,
-        other: {
-          idKey: 'outId'
-        },
-        formType: 'toSaleOut'
-      }, //退货
-
-      {
-        name: 'cusReturnCollection',
-        formType: Constants.formMode.add,
-        title: mixins.$t("cusReturnCollection")
-      },
-    ],
+    buttonList: [],
     // 系统参数
     flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "true" ? true : false,
     // 路由
@@ -235,71 +204,86 @@ Page({
    * @author : 于继渤
    */
   toPoint(e) {
-    console.log('toPoint', e);
     let item = e.detail.item
+    let buttonList = null
     //除了已入库 不显示销售退货
     if (item.outStatus == Constants.outStatus.outBounded) { //"出库状态-已出库"
-      this.setData({
-        // 弹出按钮
-        buttonList: [{
-            name: 'editInto',
-            title: mixins.$t('edit')
-          },
-          {
-            name: 'salesOutbound',
-            title: mixins.$t("outProcessing")
-          },
-          {
-            name: 'printedBill',
-            title: mixins.$t('printedBill') //打印票据
-          },
-          {
-            name: 'invalid',
-            title: mixins.$t("invaidOrder")
-          }, //作废
-          {
-            name: 'saleOrderReturn',
-            title: mixins.$t("saleReturn"),
-            formMode: Constants.formMode.other,
-            other: {
-              idKey: 'outId'
-            },
-            formType: 'toSaleOut'
-          }, //退货
-
-          {
-            name: 'cusReturnCollection',
-            formType: Constants.formMode.add,
-            title: mixins.$t("cusReturnCollection")
+      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 {
-      this.setData({
-        // 弹出按钮
-        buttonList: [{
-            name: 'editInto',
-            title: mixins.$t('edit')
-          }, {
-            name: 'salesOutbound',
-            title: mixins.$t("outProcessing")
-          },
-          {
-            name: 'printedBill',
-            title: mixins.$t('printedBill') //打印票据
-          },
-          {
-            name: 'invalid',
-            title: mixins.$t("invaidOrder")
-          }, //作废 
-          {
-            name: 'cusReturnCollection',
-            formType: Constants.formMode.add,
-            title: mixins.$t("cusReturnCollection")
-          },
-        ],
-      })
+      // 弹出按钮
+      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)
+            }
+          });
     }
+    this.setData({
+      // 弹出按钮
+      buttonList: buttonList
+    })
   },
 
   /**

pages/mine/mine.js

@@ -181,21 +181,21 @@ Page({
   * @date : 2024/4/9
   */
   handleWxService(e){
-    console.log('Constants.WX_SERVICE',Constants.WX_SERVICE);
-    let url= Constants.WX_SERVICE
-    wx.navigateTo({
-      url: '/pages/product/product',
-      success: function (res) {
-        res.eventChannel.emit('url', Constants.WX_SERVICE);
-      }
-    })
-    // wx.openCustomerServiceChat({
-    //   extInfo: {url: Constants.WX_SERVICE},
-    //   corpId: Constants.WX_CPID,
-    //   success(res) {
-    //     console.log('ddd',res);
+    // console.log('Constants.WX_SERVICE',Constants.WX_SERVICE);
+    // let url= Constants.WX_SERVICE
+    // wx.navigateTo({
+    //   url: '/pages/product/product',
+    //   success: function (res) {
+    //     res.eventChannel.emit('url', Constants.WX_SERVICE);
     //   }
     // })
+    wx.openCustomerServiceChat({
+      extInfo: {url: Constants.WX_SERVICE},
+      corpId: Constants.WX_CPID,
+      success(res) {
+        console.log('ddd',res);
+      }
+    })
   },
   /**
   * @desc : 跳转到续费页面

pages/shopping/shopping.wxss

@@ -57,7 +57,7 @@ page{
 .goods-class {
   position: fixed;
   left: 0rpx;
-  top: 324rpx;
+  /* top: 324rpx; */
   background-color: #fff;
   border-radius: 0rpx 16rpx 0rpx 0rpx;
   border-radius: 16px 0px 0px 0px;