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

api/pages/other/company.js

@@ -15,6 +15,8 @@ module.exports = {
         updateCurrentCpByWxid:'update_current_cp_by_wxid',
         // 续费
         reNewCompany:'reNew_company',
+        // 商户负责人转让
+        transferHead: 'transfer_head',
     },
 
     routeUrl: {
@@ -23,6 +25,8 @@ module.exports = {
             companyRegister: { key: 'companyRegister', url: '/package-basic-data/pages/register/company-register/company-register' },
             companyParamSetting: { key: 'companyRegister', url: '/package-basic-data/pages/register/company-param-setting/company-param-setting' },
             productDetail: { key: 'productDetail', url: '/package-basic-data/pages/register/product-detail/product-detail' },
+            updateCommanyOwner: { key: 'updateCommanyOwner',
+            url: '/package-base-select/pages/select-data/select-data', type:'staff'}
         }
     }
 };

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

@@ -276,6 +276,10 @@ Component({
     goodsTagColor: { //标签颜色
       type: String,
     },
+    satffAndOrgReadonly:{
+      type: Boolean,
+      value:false
+    },
     // 结果集
     value: {
       type: String,
@@ -345,26 +349,26 @@ Component({
     //   [{ code: 'quantity', type: 'step', title: '数量', required: true }, { code: 'pricePromotion', type: 'number', title: '销售价格', required: true }, { code: 'warehouseId', name: 'warehouseName', type: 'drop', required: true, dropType: 'warehouse' , required: true}, { code: 'color', type: 'str', title: '批次号' , required: true}, { code: 'giftFlag', type: 'checkbox', title: '赠品标识' }],
     form: {},
     popChangePrice: [{
-        code: 'priceSale',
-        type: 'number',
-        title: mixins.$t("priceSale"),
-        center: 'right',
-        readonly: true
-      },
-      {
-        code: 'factPrice',
-        type: 'number',
-        title: mixins.$t("factPrice"),
-        required: true,
-        readonly: false
-      },
-      {
-        code: 'factAmt',
-        type: 'number',
-        title: mixins.$t("factAmt"),
-        required: true,
-        readonly: false
-      },
+      code: 'priceSale',
+      type: 'number',
+      title: mixins.$t("priceSale"),
+      center: 'right',
+      readonly: true
+    },
+    {
+      code: 'factPrice',
+      type: 'number',
+      title: mixins.$t("factPrice"),
+      required: true,
+      readonly: false
+    },
+    {
+      code: 'factAmt',
+      type: 'number',
+      title: mixins.$t("factAmt"),
+      required: true,
+      readonly: false
+    },
     ],
   },
   lifetimes: {
@@ -565,7 +569,7 @@ Component({
             element.readonly = true
           });
           this.setData({
-            popChangePrice:popChangePrice
+            popChangePrice: popChangePrice
           })
         }
 
@@ -645,17 +649,17 @@ Component({
       ) {
         this.setData({
           popContentBox: [{
-              code: 'box',
-              type: 'step',
-              title: dataItem.subUnitName,
-              required: true
-            },
-            {
-              code: 'piece',
-              type: 'step',
-              title: dataItem.unitName,
-              required: true
-            },
+            code: 'box',
+            type: 'step',
+            title: dataItem.subUnitName,
+            required: true
+          },
+          {
+            code: 'piece',
+            type: 'step',
+            title: dataItem.unitName,
+            required: true
+          },
           ],
         })
       }
@@ -686,7 +690,7 @@ Component({
         this.setGoodsOutAmount()
       }
       if (this.data.type == Constants.billType.saleOutReturn) {
-        form =   this.setGoodsOutReturnAmount(form)
+        form = this.setGoodsOutReturnAmount(form)
       }
       // 外露关闭pop后事件
       this.triggerEvent("editItems", {
@@ -855,7 +859,7 @@ Component({
           // 是否弹出询问框
           Dialog.confirm({
             message: item.item.titpsMessage, //提示信息
-          }).then(() => {}).catch(() => {})
+          }).then(() => { }).catch(() => { })
           return
         }
         //控制校验提示删除明细
@@ -863,7 +867,7 @@ Component({
           // 是否弹出询问框
           Dialog.confirm({
             message: '请先删除商品明细中的商品', //提示信息
-          }).then(() => {}).catch(() => {})
+          }).then(() => { }).catch(() => { })
           return
         }
 
@@ -923,13 +927,15 @@ Component({
                       chooseVisible: false
                     })
                   }
-                  let contentObj = that.data.contentObj;
-                  if (item.card && contentObj[item.card][item.index]?.errMsg && data) {
-                    contentObj[item.card][item.index].errMsg = undefined;
-                    that.setData({
-                      contentObj: contentObj
-                    })
-                  }
+                  // let contentObj = that.data.contentObj;
+                  // if (item.card && contentObj[item.card][item.index]?.errMsg && data) {
+                  //   contentObj[item.card][item.index].errMsg = undefined;
+                  //   that.setData({
+                  //     contentObj: contentObj
+                  //   })
+                  // }
+                  // 清除错误信息
+                  that.clearErrMsg(that);
                 }
               },
               success: function (res) {
@@ -969,6 +975,8 @@ Component({
                       chooseVisible: false
                     })
                   }
+                  // 清除错误信息
+                  that.clearErrMsg(that);
                 }
               },
               success: function (res) {
@@ -983,6 +991,26 @@ Component({
       }
     },
     /**
+     * @desc   : 清除掉错误提示信息
+     * @author : 周兴
+     * @date   : 2024/2/20 11:46
+     */
+    clearErrMsg(that) {
+      let cardList = that.data.cardList
+      let contentObj = that.data.contentObj
+      cardList.forEach(c => {
+        if (contentObj[c.name]) {
+          contentObj[c.name].forEach(it => {
+            it.errMsg = undefined
+          })
+        }
+      })
+
+      that.setData({
+        contentObj: contentObj
+      })
+    },
+    /**
      * @desc   : 打开选择主从业务员/业务部门组件
      * @author : 周兴
      * @date   : 2024/2/20 11:46
@@ -991,6 +1019,9 @@ Component({
       if (this.data.readonly) {
         return;
       }
+      if (this.data.satffAndOrgReadonly) {
+        return;
+      }
       let type = e.currentTarget.dataset.type
       let _this = this
       // 选择主从业务员
@@ -1778,11 +1809,11 @@ Component({
     onCloseDel(e) {
       let deleteFlag = true;
       let item = e.currentTarget.dataset.item
-        //受 销售订单编辑逻辑 限制 转出库后(订单上的出库中加上已出库数量大于0 即证明有后续出库)
-        // cannotModifyFlag ==true不能删除明细 
-        if (item.cannotModifyFlag) {
-         return
-        }
+      //受 销售订单编辑逻辑 限制 转出库后(订单上的出库中加上已出库数量大于0 即证明有后续出库)
+      // cannotModifyFlag ==true不能删除明细 
+      if (item.cannotModifyFlag) {
+        return
+      }
       // 判断删除前是否需要判断
       if (this.data.delValidFlag) {
         // 行不允许删除
@@ -2063,7 +2094,7 @@ Component({
      * @date : 2024/1/19
      */
     setGoodsOutReturnAmount(form) {
-      let cardList = this.data.cardList 
+      let cardList = this.data.cardList
       let index = cardList.findIndex(it => it.name == 'items');
       if (form.goodsList && form.goodsList.length > 0) {
         let sumAmount = Number(0)
@@ -2076,7 +2107,7 @@ Component({
           item.priceOut = item.priceOut
           sumQuantity += Number(item.outingQty) //数量
           sumAmount += item.priceOut * item.outingQty //没有售价默认取标价
-        }) 
+        })
         //合计金额
         cardList[index].sumAmount = sumAmount
         cardList[index].sumQuantity = sumQuantity
@@ -2096,9 +2127,9 @@ Component({
         form.outingQty = sumQuantity
       }
       this.setData({
-        cardList: cardList, 
+        cardList: cardList,
       })
-      return  form
+      return form
     },
     /**
      * @desc :  销售出库设置选品参数
@@ -2297,7 +2328,7 @@ Component({
           delete item['pricePurchase']
           delete item['priceWholesale']
         })
-      } 
+      }
       form = this.setGoodsOutReturnAmount(form)
       this.setData({
         form: form
@@ -2406,14 +2437,29 @@ Component({
       }
     },
     /**
-     * @desc : 上传附件
+     * @desc : 点击上传附件
+     * @author : 周兴
+     * @date : 2024/6/24
+     */
+    clickAttach(e) {
+      this.triggerEvent("clickAttach", {
+      })
+    },
+    /**
+     * @desc : 点击上传附件(取消)
+     * @author : 周兴
+     * @date : 2024/6/24
+     */
+    uploadError(e){
+      this.triggerEvent("uploadError", {
+      })
+    },
+    /**
+     * @desc : 上传附件—（上传完成）
      * @author : 周兴
      * @date : 2024/3/27 16:16
      */
     afterRead(e) {
-      // this.setData({
-      //     uploadFileFlag:true
-      // })
       const _this = this;
       const {
         file
@@ -2422,7 +2468,7 @@ Component({
       let folder = app.globalData.company.cpCode + '/' + this.data.table + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
       let url = config.upload_url;
       url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
-      file.forEach(res => {
+      file.forEach((res, index) => {
         // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
         wx.uploadFile({
           url: url,
@@ -2437,9 +2483,6 @@ Component({
           success(res) {
             let data = JSON.parse(res.data)
             if (data.code === 200) {
-              _this.setData({
-                uploadFileFlag: false
-              })
               let form = _this.data.form
               let annexPaths = form['annexPaths'] || []
               data.data.url = config.image_url + data.data.path
@@ -2449,6 +2492,11 @@ Component({
                 form: form,
                 value: JSON.stringify(form)
               })
+              // 如果是最后一条
+              if (index == file.length - 1) {
+                _this.triggerEvent("uploadSucess", {
+                })
+              }
             }
           },
         })
@@ -2468,17 +2516,17 @@ Component({
       if (this.data.type == Constants.billType.sale || this.data.type == Constants.billType.pur || this.data.type == Constants.billType.out) {
         this.setData({
           popContentBox: [{
-              code: 'box',
-              type: 'step',
-              title: mixins.$t("goodsBox"),
-              required: true
-            },
-            {
-              code: 'piece',
-              type: 'step',
-              title: mixins.$t("goodsPiece"),
-              required: true
-            },
+            code: 'box',
+            type: 'step',
+            title: mixins.$t("goodsBox"),
+            required: true
+          },
+          {
+            code: 'piece',
+            type: 'step',
+            title: mixins.$t("goodsPiece"),
+            required: true
+          },
           ],
 
         })
@@ -2487,17 +2535,17 @@ Component({
       if (this.data.type == Constants.billType.saleOut) {
         this.setData({
           popContentBox: [{
-              code: 'box',
-              type: 'step',
-              title: mixins.$t("goodsBox"),
-              required: true
-            },
-            {
-              code: 'piece',
-              type: 'step',
-              title: mixins.$t("goodsPiece"),
-              required: true
-            },
+            code: 'box',
+            type: 'step',
+            title: mixins.$t("goodsBox"),
+            required: true
+          },
+          {
+            code: 'piece',
+            type: 'step',
+            title: mixins.$t("goodsPiece"),
+            required: true
+          },
           ],
 
         })
@@ -2520,17 +2568,17 @@ Component({
       if (this.data.type == Constants.billType.purInto || this.data.type == Constants.billType.saleOutReturn) {
         this.setData({
           popContentBox: [{
-              code: 'box',
-              type: 'step',
-              title: mixins.$t("goodsBox"),
-              required: true
-            },
-            {
-              code: 'piece',
-              type: 'step',
-              title: mixins.$t("goodsPiece"),
-              required: true
-            },
+            code: 'box',
+            type: 'step',
+            title: mixins.$t("goodsBox"),
+            required: true
+          },
+          {
+            code: 'piece',
+            type: 'step',
+            title: mixins.$t("goodsPiece"),
+            required: true
+          },
           ],
 
         })

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

@@ -50,39 +50,33 @@
 
     <view style="display: flex;justify-content: center;align-items: center;" id="{{card.name}}">
       <view wx:if="{{card.name == 'items' && !readonly && chooseVisible && card.chooseGoodsItemFlag}}" style="margin:10rpx 15rpx;text-align: center;">
-        <van-button icon="{{imageUrl + 'choose_goods_sale.png'}}" size="normal" color="#3E69F6" custom-style="border-radius:15rpx ;" catchtap="openChooseItems" data-item="{{card}}" custom-style="height:70rpx;border-radius:8px;width:191rpx;" data-index="{{cardIndex}}" type="info">选商品
+        <van-button icon="{{imageUrl + 'choose_goods_sale.png'}}" size="normal" color="#3E69F6" catchtap="openChooseItems" data-item="{{card}}" custom-style="height:70rpx;border-radius:15rpx;width:191rpx;padding:0" data-index="{{cardIndex}}" type="info">选商品
         </van-button>
 
       </view>
       <view wx:if="{{card.name == 'items' && !readonly && chooseVisible &&  card.chooseInventoryFlag}}" style="margin:10rpx 15rpx;text-align: center;">
-        <van-button icon="{{imageUrl + 'choose_inventory_sale.png '}}" size="normal" custom-style="height:70rpx;border-radius:8px;width:191rpx;" data-type="inventory" color="#9A36FC" catchtap="openChooseItems" data-item="{{card}}" data-index="{{cardIndex}}" type="info">选库存
+        <van-button icon="{{imageUrl + 'choose_inventory_sale.png '}}" size="normal" custom-style="height:70rpx;border-radius:15rpx;width:191rpx;padding:0" data-type="inventory" color="#9A36FC" catchtap="openChooseItems" data-item="{{card}}" data-index="{{cardIndex}}" type="info">选库存
         </van-button>
 
       </view>
       <view wx:if="{{card.name == 'items' && !readonly && chooseVisible &&  card.chooseCoordinationFlag}}" style="margin:10rpx 15rpx;text-align: center;">
-        <van-button icon="{{imageUrl + 'choose_coordination_sale.png'}}" size="normal" custom-style="height:70rpx;border-radius:8px;width:191rpx;" color="#FF7B1A" catchtap="openChooseCoordinationItems" data-item="{{card}}" data-index="{{cardIndex}}" type="info">选外协
+        <van-button icon="{{imageUrl + 'choose_coordination_sale.png'}}" size="normal" custom-style="height:70rpx;border-radius:15rpx;width:191rpx;;padding:0" color="#FF7B1A" catchtap="openChooseCoordinationItems" data-item="{{card}}" data-index="{{cardIndex}}" type="info">选外协
         </van-button>
-
       </view>
-
-
-
     </view>
 
-
     <view class="dk-card-class">
-
-
       <view wx:if="{{card.title}}" class="item-class">
-        <view class="item-title-class">{{card.title}}</view>
-        <view class="item-info-class" style="color:{{card.color?card.color:'#1B365D'}}">{{card.info}}</view>
-        <view style="width: 35%;text-align: right;">
+        <view style="display: flex;">
+          <view class="item-title-class">{{card.title}}</view>
+          <view class="item-info-class" style="color:{{card.color?card.color:'#1B365D'}}">{{card.info}}</view>
+        </view>
+        <view style="display: flex;">
           <dk-tag wx:if="{{card.expandFlag}}" type="primary" padding="0 20rpx" height="40rpx" color="#9FAEE5" textColor="#FFFFFF" radius="5rpx" roundFlag="{{true}}" value="{{!card.expand?'展开':'收起'}}" catchtap="expandCard" data-item="{{card}}" data-index="{{cardIndex}}"></dk-tag>
           <!--明细，增加选择商品按钮-->
           <dk-tag wx:if="{{card.name == 'items' && !readonly && chooseVisible && ( card.chooseGoodsFlag == undefined || card.chooseGoodsFlag)}}" type="primary" padding="8px" color="#3E69F6" textColor="#FFFFFF" radius="10rpx" roundFlag="{{true}}" fontSize="28rpx" value="选商品" catchtap="openChooseItems" data-item="{{card}}" data-index="{{cardIndex}}"></dk-tag>
           <!-- 自定义tag -->
           <dk-tag wx:if="{{card.name == 'items' && goodsTagText}}" type="primary" padding="8px" color="{{goodsTagColor ? goodsTagColor:'#77C5D5'}}" fontSize="28rpx" textColor="#FFFFFF" radius="10rpx" roundFlag="{{true}}" value="{{goodsTagText}}" data-item="{{card}}" data-index="{{cardIndex}}"></dk-tag>
-
         </view>
       </view>
       <view wx:if="{{card.expandFlag && card.expand || !card.expandFlag}}">
@@ -90,9 +84,7 @@
         <view wx:if="{{card.name == 'items'}}">
           <view wx:for="{{form[itemName]}}" data-item="{{item}}" wx:for-item="item" wx:key="index" border="{{ false }}">
             <!-- <van-swipe-cell disabled="{{swipeDisabled ? item[swipeDisabled] : flase}}" right-width="{{readonly? 0:65 }}" data-index="{{index}}" data-item="{{item}}"  bind:close="onCloseDel"> -->
-            <dk-swiper disabled="{{swipeDisabled ? item[swipeDisabled] : false}}" right-width="{{readonly? 0:65 }}"
-            data-index="{{index}}" data-item="{{item}}"  bind:click="onCloseDel"
-            >
+            <dk-swiper disabled="{{swipeDisabled ? item[swipeDisabled] : false}}" right-width="{{readonly? 0:65 }}" data-index="{{index}}" data-item="{{item}}" bind:click="onCloseDel">
               <van-card wx:if="{{item.show || item.show == undefined}}" data-index="{{index}}" data-item="{{item}}" data-card="{{card}}" catchtap="openChoosedItemInfo">
                 <view slot="thumb" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" catchtap="openChoosedItemInfo">
                   <van-image radius="5px" width="90" height="90" src="{{item[iconCol] }}" />
@@ -154,8 +146,8 @@
                 </view>
               </view>
               <!-- <view wx:if="{{!readonly}}" slot="right">删除</view> -->
-            <!-- </van-swipe-cell> -->
-          </dk-swiper>
+              <!-- </van-swipe-cell> -->
+            </dk-swiper>
           </view>
           <van-empty wx:if="{{!form[itemName] || form[itemName].length == 0}}" description="暂未选择商品" />
           <block style="text-align: center; " wx:if="{{card.displayNum && form[itemName].length > card.displayNum}}">
@@ -177,7 +169,7 @@
             </view>
             <view wx:if="{{sumAmountColFlag}}" class="amount-item-class">
               <!--条数-->
-              <dk-cell titleColor="#95A8CB;" contentColor="#95A8CB" title="{{$t['goodsQuantity'] }}" amount="{{false}}"content="{{(card[sumQuantityCol]?card[sumQuantityCol]:0)}}"></dk-cell>
+              <dk-cell titleColor="#95A8CB;" contentColor="#95A8CB" title="{{$t['goodsQuantity'] }}" amount="{{false}}" content="{{(card[sumQuantityCol]?card[sumQuantityCol]:0)}}"></dk-cell>
               <!--合计金额-->
               <dk-cell fontSize="16" fontWeight="bold" contentFontWeight="700" contentColor="#FF7B1A" titleColor="#1B365D;" title="合计金额" content="{{card[sumAmountCol]?card[sumAmountCol]:0}}"></dk-cell>
               <!-- <view style="display: flex;width: calc(100% - 260rpx);">
@@ -190,10 +182,10 @@
             </view>
             <view wx:if="{{reverseCalculationFlag}}" class="amount-item-class">
               <!--整单折扣-->
-              <dk-cell contentColor="#95A8CB" titleColor="#95A8CB;"  title="{{$t['wholeOrderDiscount']}}" amount="{{false}}"content="{{(card[wholeOrderDiscountCol]?card[wholeOrderDiscountCol]:100) + '%'}}"></dk-cell>
+              <dk-cell contentColor="#95A8CB" titleColor="#95A8CB;" title="{{$t['wholeOrderDiscount']}}" amount="{{false}}" content="{{(card[wholeOrderDiscountCol]?card[wholeOrderDiscountCol]:100) + '%'}}"></dk-cell>
               <!--优惠金额-->
-              <dk-cell   contentColor="#95A8CB" titleColor="#95A8CB;" title="优惠金额" content="{{card[discountAmountCol]?card[discountAmountCol]:0}}"></dk-cell>
-           
+              <dk-cell contentColor="#95A8CB" titleColor="#95A8CB;" title="优惠金额" content="{{card[discountAmountCol]?card[discountAmountCol]:0}}"></dk-cell>
+
             </view>
             <!--使用收款-->
             <!-- <view class="amount-item-class" wx:if="{{type === 'sale' || type === 'saleOut' }}">
@@ -216,7 +208,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="{{!!readonly || !!item.readonly}}"  label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" 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}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" 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>
             <!--选单-->
@@ -257,16 +249,16 @@
               <van-icon wx:if="{{!readonly && form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
             </van-field>
             <!--数字类-->
-            <dk-number-input wx:if="{{item.type=='number'  && (item.show || item.show == undefined)}}" 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}}" data-index="{{index}}" data-card="{{card.name}}" center="left" readonly="{{!!readonly || !!item.readonly}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#FF7B1A" titleFontWeight="normal" titleColor="{{!!item.readonly?'#95A8CB':'#002340'}}"  inputValue="{{form[item.code]}}" negative="{{item.negative}}" maxFlag="{{item.maxFlag}}" max="{{item.max}}" bind:triggerBindBlur="changeNumberBlur" bind:triggerBindValue="changeNumberField" min="{{item.min}}"></dk-number-input>
+            <dk-number-input wx:if="{{item.type=='number'  && (item.show || item.show == undefined)}}" 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}}" data-index="{{index}}" data-card="{{card.name}}" center="left" readonly="{{!!readonly || !!item.readonly}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#FF7B1A" titleFontWeight="normal" titleColor="{{!!item.readonly?'#95A8CB':'#002340'}}" inputValue="{{form[item.code]}}" negative="{{item.negative}}" maxFlag="{{item.maxFlag}}" max="{{item.max}}" bind:triggerBindBlur="changeNumberBlur" bind:triggerBindValue="changeNumberField" min="{{item.min}}"></dk-number-input>
 
             <!--备注-->
             <van-field wx:if="{{item.type=='textarea'  && (item.show || item.show == undefined)}}" type="textarea" required="{{item.required?true:false }}" data-key="{{item.code}}" 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 border="{{ false }}" clearable readonly="{{!!readonly && !!item.readonly}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeField" bind:blur="blurField" bind:clear="clearField" errorMessage="{{item.errMsg}}">
             </van-field>
             <!--附件-->
             <view style="display:flex;width:100%;margin: 1vw; padding-top: 20rpx;" wx:if="{{item.type=='uploader'}}">
-              <view style="width: 168rpx; flex:1;color: #95A8CB;font-size: 28rpx;padding-left: 27rpx;">附件</view>
+              <view style="width: 168rpx; flex:1;color: #95A8CB;font-size: 14px;padding-left: 27rpx;">附件</view>
               <view style="width: calc(100% - 168rpx);text-align: left;">
-                <van-uploader max-count="5" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ form['annexPaths'] }}" bind:delete="deleteImg" bind:after-read="afterRead" multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" bind:oversize="overSize" upload-text="添加照片" />
+                <van-uploader max-count="5" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ form['annexPaths'] }}" bind:delete="deleteImg"  bind:error="uploadError" bind:after-read="afterRead" multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" catchtap="clickAttach" bind:oversize="overSize" upload-text="添加照片" />
                 <!-- <view style="margin-left: 27rpx;color: #C8C9CC;font-size: 12px;">
                 图片最多上传5张
               </view> -->
@@ -301,9 +293,9 @@
   <van-datetime-picker type="date" bind:confirm="chooseDate" bind:cancel="cancelDatePop" loading="{true}" value="{{dataTime}}" min-date="{{ minDate }}" />
 </van-popup>
 
-<dk-popup id="dkPopup" stepperDecimal="decimalPlaces" type="{{popType}}" routeObjName="{{routeObjName}}" titleTagCol="{{titleTagCol}}" titleCol="{{titleCol}}" subCol="{{subCol}}" descCol="{{descCol}}" iconCol="{{iconCol}}"priceTailCol="{{priceTailCol}}"  priceCol="{{pupPriceCol}}"priceTitle="{{priceTitle}}" value="{{dataItem}}" show="{{showPop}}" contentObj="{{popContent_sku}}" popupTopObj="{{popupTopObj_sku}}" bind:changeStep="changeStep" bind:changeCheckBox="changeCheckBox" readonly="{{readonly}}" bind:changeField="changeDetailField" bind:blurNumberField="blurNumberField" bind:commit="editItems" bind:openPackageBox="openPackageBox" bind:openDkNumberInput = "openPopDkNumberInput"></dk-popup>
+<dk-popup id="dkPopup" stepperDecimal="decimalPlaces" type="{{popType}}" routeObjName="{{routeObjName}}" titleTagCol="{{titleTagCol}}" titleCol="{{titleCol}}" subCol="{{subCol}}" descCol="{{descCol}}" iconCol="{{iconCol}}" priceTailCol="{{priceTailCol}}" priceCol="{{pupPriceCol}}" priceTitle="{{priceTitle}}" value="{{dataItem}}" show="{{showPop}}" contentObj="{{popContent_sku}}" popupTopObj="{{popupTopObj_sku}}" bind:changeStep="changeStep" bind:changeCheckBox="changeCheckBox" readonly="{{readonly}}" bind:changeField="changeDetailField" bind:blurNumberField="blurNumberField" bind:commit="editItems" bind:openPackageBox="openPackageBox" bind:openDkNumberInput="openPopDkNumberInput"></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-popup type="basic" title="修改价格"   value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}"  bind:blurNumberField ="blurChangePriceNumberField"   bind:commit="editItemsChangePrice"  ></dk-popup>
+<dk-popup type="basic" title="修改价格" value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}" bind:blurNumberField="blurChangePriceNumberField" bind:commit="editItemsChangePrice"></dk-popup>

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

@@ -134,7 +134,6 @@
   font-size: 15px;
   color: #1B365D;
   font-weight: 600;
-  width: 26%;
 }
 
 .item-info-class {
@@ -142,7 +141,7 @@
   font-size: 14px;
   display: flex;
   align-items: flex-end;
-  width: 59%;
+  margin-left: 8rpx;
 }
 
 .item-add-btn-class {

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

@@ -737,6 +737,24 @@ Component({
       })
     },
     /**
+     * @desc : 点击上传附件
+     * @author : 周兴
+     * @date : 2024/6/24
+     */
+    clickAttach(e) {
+      this.triggerEvent("clickAttach", {
+      })
+    },
+    /**
+     * @desc : 点击上传附件(取消)
+     * @author : 周兴
+     * @date : 2024/6/24
+     */
+    uploadError(e) {
+      this.triggerEvent("uploadError", {
+      })
+    },
+    /**
      * @desc : 上传附件
      * @author : 周兴
      * @date : 2024/3/27 16:16
@@ -769,9 +787,6 @@ Component({
           success(res) {
             let data = JSON.parse(res.data)
             if (data.code === 200) {
-              _this.setData({
-                uploadFileFlag: false
-              })
               let form = _this.data.form
               let annexPaths = form['annexPaths'] || []
               data.data.url = config.image_url + data.data.path
@@ -781,7 +796,11 @@ Component({
                 form: form,
                 value: JSON.stringify(form)
               })
-              console.log('ff', _this.data.form);
+              // 如果是最后一条
+              if (index == file.length - 1) {
+                _this.triggerEvent("uploadSucess", {
+                })
+              }
             }
           },
         })

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

@@ -147,7 +147,7 @@
       <view style="display:flex;width:100%;margin: 1vw; padding-top: 20rpx;" wx:if="{{item.type=='uploader'}}">
         <view style="width: 168rpx; flex:1;color: #95A8CB;font-size: 28rpx;padding-left: 27rpx;">附件</view>
         <view style="width: calc(100% - 168rpx);text-align: left;">
-          <van-uploader max-count="5" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ form['annexPaths']  }}" data-readonly="{{!!item.readonly}}" bind:delete="deleteImg" bind:after-read="afterRead" multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" bind:oversize="overSize" upload-text="添加照片" />
+          <van-uploader max-count="5" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ form['annexPaths']  }}" data-readonly="{{!!item.readonly}}" bind:delete="deleteImg" bind:after-read="afterRead" bind:error="uploadError" catchtap="clickAttach"  multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" bind:oversize="overSize" upload-text="添加照片" />
           <view style="margin-left: 27rpx;color: #C8C9CC;font-size: 12px;">
             图片最多上传5张
           </view>

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

@@ -25,7 +25,7 @@ Component({
       type: Array,
       value: []
     },
-    transparentStyle:{
+    transparentStyle: {
       type: Boolean,
       value: false
     },
@@ -149,14 +149,14 @@ Component({
         util.showToast(item.tip);
       }
     },
-     /**
-     * @desc   : 外漏str的点击事件
-     * @author : 周兴
-     * @date   : 2024/1/26 11:46
-     */
-    openStr(e){ 
+    /**
+    * @desc   : 外漏str的点击事件
+    * @author : 周兴
+    * @date   : 2024/1/26 11:46
+    */
+    openStr(e) {
       let item = e.currentTarget.dataset;
-        this.triggerEvent("openStr", {  code: item.key,})
+      this.triggerEvent("openStr", { code: item.key, })
     },
     /**
      * @desc   : 打开下拉
@@ -165,7 +165,7 @@ Component({
      */
     open(e) {
       let item = e.currentTarget.dataset;
-      console.log('item',item)
+      console.log('item', item)
       if (item.item.readonly) {
         return
       }
@@ -291,17 +291,17 @@ Component({
             if (item.required && !form[item.code]) {
               item.errMsg = title + '不为空'
               flag = false;
-            } else{
+            } else {
               item.errMsg = undefined
             }
             // 电话校验
-            console.log(item.type,item.required,form[item.code]);
+            console.log(item.type, item.required, form[item.code]);
             if (item.type == 'phone' && item.required && form[item.code]) {
               // 联系电话格式错误
               var myreg = Constants.Mobile_Phone_Number_Regular_Expression
               if (!myreg.test(form[item.code])) {
                 item.errMsg = title + '格式错误'
-                flag = false; 
+                flag = false;
               }
             }
           })
@@ -351,7 +351,7 @@ Component({
      * @date   : 2024/1/26 11:46
      */
     chooseData(e) {
-      console.log("chooseData-dkform",e.detail);
+      console.log("chooseData-dkform", e.detail);
       let contentObj = this.data.contentObj;
       let form = this.data.form
       if (e.detail.ids) {
@@ -404,7 +404,7 @@ Component({
       this.triggerEvent("chooseData", {
         code: this.data.dropCode,
         //初始欠款的为空
-        list: e.detail.list?e.detail.list:e.detail.item
+        list: e.detail.list ? e.detail.list : e.detail.item
       })
     },
     /**
@@ -426,9 +426,9 @@ Component({
     },
 
 
-    openDatePopDay(e){
+    openDatePopDay(e) {
       let item = e.currentTarget.dataset;
-      
+
       if (item.item.readonly) {
         return
       }
@@ -440,23 +440,23 @@ Component({
         dropDateCode: e.currentTarget.dataset.key
       })
     },
-        /**
-   * @desc : 选择筛选中的日期
-   * @author : 周兴
-   * @date : 2024/1/29 08:59
-   */
-  pickDateCommit(e) {
-    let form = this.data.form
-    
-    let date = e.detail.date[0] + '~' + e.detail.date[1]
-    form[this.data.dropDateCode] = date
-    form[this.data.dropDateCode + 'Start'] = e.detail.date[0];
-    form[this.data.dropDateCode + 'End'] = e.detail.date[1];
-    this.setData({
-      form: form,
-      value: JSON.stringify(form)
-    })
-  },
+    /**
+* @desc : 选择筛选中的日期
+* @author : 周兴
+* @date : 2024/1/29 08:59
+*/
+    pickDateCommit(e) {
+      let form = this.data.form
+
+      let date = e.detail.date[0] + '~' + e.detail.date[1]
+      form[this.data.dropDateCode] = date
+      form[this.data.dropDateCode + 'Start'] = e.detail.date[0];
+      form[this.data.dropDateCode + 'End'] = e.detail.date[1];
+      this.setData({
+        form: form,
+        value: JSON.stringify(form)
+      })
+    },
     /**
      * @desc   : 关闭日期pop
      * @author : 周兴
@@ -832,6 +832,24 @@ Component({
       })
     },
     /**
+     * @desc : 点击上传附件
+     * @author : 周兴
+     * @date : 2024/6/24
+     */
+    clickAttach(e) {
+      this.triggerEvent("clickAttach", {
+      })
+    },
+    /**
+     * @desc : 点击上传附件(取消)
+     * @author : 周兴
+     * @date : 2024/6/24
+     */
+    uploadError(e) {
+      this.triggerEvent("uploadError", {
+      })
+    },
+    /**
      * @desc : 上传附件
      * @author : 周兴
      * @date : 2024/3/27 16:16
@@ -863,9 +881,6 @@ Component({
           success(res) {
             let data = JSON.parse(res.data)
             if (data.code === 200) {
-              _this.setData({
-                uploadFileFlag: false
-              })
               let form = _this.data.form
               let annexPaths = form['annexPaths'] || []
               data.data.url = config.image_url + data.data.path
@@ -875,7 +890,11 @@ Component({
                 form: form,
                 value: JSON.stringify(form)
               })
-              console.log('ff', _this.data.form);
+              // 如果是最后一条
+              if (index == file.length - 1) {
+                _this.triggerEvent("uploadSucess", {
+                })
+              }
             }
           },
         })

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

@@ -95,7 +95,7 @@
       <view style="display:flex;width:100%;margin: 1vw; padding-top: 20rpx;" wx:if="{{item.type=='uploader'}}">
         <view style="width: 168rpx; flex:1;color: #95A8CB;font-size: 14px;padding-left: 20rpx;">{{item.name?item.name:'附件'}}</view>
         <view style="width: calc(100% - 168rpx);text-align: left;">
-          <van-uploader max-count="{{uploaderMAX}}" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ form['annexPaths'] }}" bind:delete="deleteImg" bind:after-read="afterRead" multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" bind:oversize="overSize" />
+          <van-uploader max-count="{{uploaderMAX}}" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ form['annexPaths'] }}" bind:delete="deleteImg" bind:after-read="afterRead" bind:error="uploadError" catchtap="clickAttach" multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" bind:oversize="overSize" />
           <view style="margin-left: 27rpx;color: #C8C9CC;font-size: 12px;">
             图片最多上传{{uploaderMAX}}张
           </view>

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

@@ -22,7 +22,7 @@
                 <dk-text catchtap="toTitle" data-item="{{item}}" textDecoration="underline" fontSize="15px" value="{{item[title]}}"></dk-text>
               </view>
             </view>
-            <view style="display: flex;">
+            <view style="display: flex; align-items: center;">
               <!-- 原来的弯角 -->
               <view class="corner-view" wx:if="{{item[titleCorner]}}">
                 <view class="corner-view-text">{{item[titleCorner]}}</view>

components/dkbase/dk-list/dk-list.wxss

@@ -172,10 +172,10 @@
 
 .corner-view {
   /* width: 70rpx; */
-  height: 40rpx;
+  height: 49rpx;
   text-align: center;
   background-color: #FFE5BD;
-  line-height: 40rpx;
+  line-height: 49rpx;
 }
 
 .corner-view-text {

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

@@ -73,7 +73,7 @@
       <!-- 箱片 专用 stepper-->
         <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:-9999999999)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
    <!-- 除了箱片 正常用的 stepper-->
-        <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:-99999999999)}}" 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:-99999999999)}}" max="{{form[item.code + '_max']?form[item.code + '_max']:( item.max?item.max:999999999)}}" bind:change="changeStep" disabled="{{!!readonly}}" />
       </van-cell>
       <!--显示负数step-->  
       <van-cell wx:if="{{item.type=='negativeStep'}}" border="{{ false }}" title-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}"  title="{{item.title?item.title:'数量'}}" required="{{item.required?true:false }}" custom-class="step-class">

components/dkbase/dk-save-button/dk-save-button.js

@@ -112,6 +112,7 @@ Component({
      */
     submit(e) {
       let item = e.currentTarget.dataset.item
+      console.log('item', item);
       console.log(e)
       this.triggerEvent("open", { name: item.code, customUrl: item.customUrl })
     },

config/config.js

@@ -3,7 +3,7 @@ const profiles = 'dev';
 const configListObj = {
   // 北京东科企信软件有限公司 本地开发
   dev: {
-    server_add: 'http://192.168.0.93',     server_port: '7001',
+    server_add: 'http://192.168.0.57',     server_port: '7001',
     upload_url:'https://s.dev01.dkiboss.com:7000/api/mdm-server/file/upload',
     image_url:'https://s.dev01.dkiboss.com:7000/file',
     corpid: 'ww796c5d1684937b2f', //企业微信corpid

dist/uploader/index.js

@@ -96,6 +96,7 @@ VantComponent({
             if (!res) {
                 return;
             }
+            console.log('mmmmmm');
             if (isPromise(res)) {
                 res.then((data) => this.onAfterRead(data || file));
             }

i18n/zh-CN.js

@@ -216,6 +216,7 @@ const home = {
   transactionAmount: '成交额',
   collectionAmount: '收支额',
   registerCommany: '注册商户',
+  updateCommanyOwner: '权限转让',
   settingCommany: '商户设置',
   standardVersion: '免费版',
   flagshipVersion: '旗舰版',

mixins/index.js

@@ -87,7 +87,7 @@ module.exports = {
     // 页面头部高度
     stickyHeight: 0,
     // 页面的员工和部门
-    orgStaffInfo:null
+    orgStaffInfo:null,
   },
   /**
    * @desc : 获取路由信息，供data中的对象使用
@@ -110,6 +110,36 @@ module.exports = {
     }
   },
   /**
+   * @desc : 点击上传附件
+   * @author : 周兴
+   * @date : 2024/6/24
+   */
+  clickAttach(e){
+    this.setData({
+      loading:true,
+    })
+  },
+  /**
+   * @desc : 上传附件成功
+   * @author : 周兴
+   * @date : 2024/6/24
+   */
+  uploadSucess(e){
+    this.setData({
+      loading:false,
+    })
+  },
+  /**
+   * @desc : 上传附件取消
+   * @author : 周兴
+   * @date : 2024/6/24
+   */
+  uploadError(e){
+    this.setData({
+      loading:false,
+    })
+  },
+  /**
    * @desc : 查询共通方法
    * @author : 周兴
    * @date : 2024/1/19
@@ -1132,7 +1162,7 @@ module.exports = {
    * @date : 2024/1/22
    */
   onShow() {
-    console.log('fffd',this.data.refreshByAdd);
+    console.log('t1');
     // 新建后关闭新建后刷新页面
     if (this.data.refreshByAdd) {
       this.searchData();

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

@@ -531,6 +531,9 @@ Page({
     let dataItem = JSON.parse(this.data.dataItemChangePrice)
     let key = e.detail.key
     dataItem[key] = e.detail.value
+    if( this.data.billType == Constants.billType.inventory){
+      dataItem["priceSale"]  =  dataItem["priceOut"] 
+    }
     this.setData({
       dataItemChangePrice: JSON.stringify(dataItem)
     })
@@ -542,7 +545,7 @@ Page({
     */
    editItemsChangePrice(e) {
     let dataItem = JSON.parse(this.data.dataItemChangePrice)
-    let index = this.data.changePriceIndex
+    let index = this.data.changePriceIndex 
     let choosedGoodsList = this.data.choosedGoodsList
     choosedGoodsList[index] = dataItem
     let sum = Number(0)
@@ -585,10 +588,10 @@ Page({
     if(this.data.billType == Constants.billType.sale){ //销售订单的时候 改价格pop
       popChangePrice[popChangePriceindex].code = 'priceSale'
     }
-    if(this.data.item == Constants.billType.saleOutReturn ||
-      this.data.item == Constants.billType.out ||
-      this.data.item == Constants.billType.saleOut ||
-      this.data.item == Constants.billType.inventory){ //销售的时候 改价格pop
+    if(this.data.billType == Constants.billType.saleOutReturn ||
+      this.data.billType == Constants.billType.out ||
+      this.data.billType == Constants.billType.saleOut ||
+      this.data.billType == Constants.billType.inventory){ //销售的时候 改价格pop
       popChangePrice[popChangePriceindex].code = 'priceOut'
     }
     this.setData({

package-basic-data/pages/customer-list/detail/detail.wxml

@@ -548,11 +548,11 @@
               <view style="display: flex;justify-content:space-between;">
                 <view style="display: flex; width: 50%;">
                   <view class="table-content-row-font">
-                    <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="收款类型">
+                    <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="账户名称">
                     </dk-text>
                   </view>
                   <view class="table-content-class">
-                    {{item.rpTypeName}}
+                    {{item.macNames}}
                   </view>
 
                 </view>

package-basic-data/pages/register/company-setting/company-setting.js

@@ -30,6 +30,11 @@ Page({
                 { code: 'feedback', type: 'textarea', readonly: 'true', title: mixins.$t('feedback') },
             ],
         },
+        buttonFootList: [{
+          code: 'close',
+          title: mixins.$t('close')
+        }],
+        companyService: app.globalData['companyService'],
     },
 
     /**
@@ -54,6 +59,95 @@ Page({
     },
 
     /**
+     * @desc : 页面初始信息加载
+     * @param {*} e 
+     * @date : 2024/06/21 09:23
+     * @author : 刘尧
+     */
+    loadInit(e){
+      if(app.globalData.user.flgInit){
+        const buttonFootList = [{
+          code: 'updateCommanyOwner',
+          title: mixins.$t('updateCommanyOwner')
+      }]
+        this.setData({
+          buttonFootList: buttonFootList
+        })
+      }
+    },
+    /**
+    * @desc : 底部按钮回调
+    * @date : 2024/6/21 13:35
+    * @author : 刘尧
+     */
+    openFormEdit(e){
+      switch(e.detail.name){
+        case "updateCommanyOwner":
+          const contentObj = this.data.contentObj
+          const index = contentObj.main.findIndex(res => res.code === "cpManager")
+          contentObj.main[index].type = 'choose'
+          contentObj.main[index].urlKey = 'updateCommanyOwner'
+          contentObj.main[index].name = contentObj.main[index].code
+          contentObj.main[index].required = true
+          contentObj.main[index].readonly = false
+          this.setData({
+            contentObj: contentObj
+          })
+          break;
+        case "save":
+          this.save(e)
+          break;
+        case "close":
+          this.close(e)
+          break;
+      }
+    },
+      /**
+   * @desc : 参数设置
+   * @author : 刘尧
+   * @date : 2024/6/18 17:12
+   */
+  setParams(params){
+    params = JSON.parse(this.data.formData)
+    params.svcIp = app.globalData.company.svcIp
+    params.svcPort = app.globalData.company.svcPort
+    return params
+  },
+  /**
+   * @desc : 数据保存
+   * @author : 刘尧
+   * @date : 2024/6/18 17:12
+   */
+    saveData(params){
+      return this.excute(this.data.companyService, this.data.companyService.transferHead, params);
+    },
+    /**
+    * @desc : 选择用户回调
+    * @date : 2024/6/21 14:03
+    * @author : 刘尧
+     */
+    chooseData(e){
+      const data = e.detail.data.data
+      const formData = JSON.parse(this.data.formData)
+      formData.owner = data.id
+      formData.cpManager = data.name
+      formData.cpPhone = data.staffPhone
+      const contentObj = this.data.contentObj
+      const index = contentObj.main.findIndex(res => res.code === "cpManager")
+      contentObj.main[index].type = 'str'
+      contentObj.main[index].urlKey = ''
+      contentObj.main[index].required = true
+      contentObj.main[index].readonly = true
+      const buttonList = [{
+        code: 'save',
+        title: mixins.$t('save')}]
+      this.setData({
+        contentObj: contentObj,
+        formData: JSON.stringify(formData),
+        buttonFootList: buttonList
+      })
+    },
+    /**
     * @desc : 加载数据
     * @date : 2024/2/1 15:49
     * @author : 姜永辉
@@ -63,14 +157,12 @@ Page({
             data: 1
         })
     },
-
     /**
      * @desc : 给表单赋值
      * @date : 2024/2/1 15:49
      * @author : 姜永辉
      */
     setValuesByEdit(data) {
-        console.log('setValuesByEdit');
         let contentObj = this.data.contentObj
         this.setData({
             formData: JSON.stringify(data)

package-basic-data/pages/register/company-setting/company-setting.wxml

@@ -17,7 +17,10 @@
 </dk-form>
 
 <!--  保存 -->
-<view class="bottom-class">
+<!-- <view class="bottom-class">
   <van-button custom-class="save-button-class" disabled="{{loading}}" loading="{{loading}}" bind:click="close" type="default">{{$t['close']}}
   </van-button>
-</view>
+</view> -->
+
+<!-- 底部按钮 -->
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonFootList}}" contentList="{{contentnFootList}}" bind:open="openFormEdit"></dk-save-button>

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

@@ -81,7 +81,12 @@ Page({
   toPoint(e) {
     const userInfo = e.detail.item
     let buttonList = []
-    if(!userInfo.flgCanLogin){
+    if(userInfo.flgInit){
+      buttonList = [
+        { name: 'staffRight', title: mixins.$t('functionalPermissions') },
+        { name: 'staffPurview', title: mixins.$t('purviewPermissions') }
+      ]
+    }else if(!userInfo.flgCanLogin){
         buttonList = [
           { name: 'leaveOffice', title: mixins.$t('leaveOffice') },
         ]

package-business-analysis/pages/echarts-data.js

@@ -59,12 +59,11 @@ const option1 = {
       type: 'bar',
       color: '#41be92',
       tooltip: {
-        // valueFormatter: function (value) {
-        //   return value + ' ml';
-        // }
+        valueFormatter: (value)=> {
+          return '￥' + getWAmount(value/divisor)
+        }
       },
       data: [
-        2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3
       ]
     },
     {
@@ -73,12 +72,11 @@ const option1 = {
       color: '#efc25b',
       yAxisIndex: 1,
       tooltip: {
-        // valueFormatter: function (value) {
-        //   return value + ' ml';
-        // }
+        valueFormatter: (value)=> {
+          return value + '%'
+        }
       },
       data: [
-        2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3
       ]
     }
   ]
@@ -281,6 +279,7 @@ const getOpData = (data,labelKey,valueKey,optionType)=>{
     options.xAxis[0].data = data.map(it=>it[labelKey])
     options.series[0].data = data.map(it=>it.profit)
     options.series[1].data = data.map(it=>it.profitRate)
+    console.log(options)
     return options;
   }
   if(optionType === 2){

package-inventory/pages/cost-check/cost-check.js

@@ -35,8 +35,8 @@ Page({
     // 查询条件
     searchContent: [{
       code: 'intoDate',
-      title: mixins.$t('pastThirthtyDays'),//近30天',
-      defaultValue: 5,
+      title: mixins.$t('currentMonth'),//本月',
+      defaultValue: 2,
       searchType: Constants.searchType.date
     },
     {
@@ -253,22 +253,10 @@ Page({
     * @author : 于继渤
     */
   setSearchParams(params) {
-    let formData = JSON.parse(this.data.formData)
-
-    // if (formData.createTime) {
-    //   delete formData['createTime']
-    // }
-    // if (formData.enterWhDate) {
-    //   delete formData['enterWhDate']
-    // }
-    // params.intoTypeName = formData.intoType
-    // params.supName = formData.supName
-    // params.intoDateStart = formData.enterWhDateStart ? formData.enterWhDateStart : params.intoDateStart
-    // params.intoDateEnd = formData.enterWhDateEnd ? formData.enterWhDateEnd : params.intoDateEnd
-    // params.createTimeStart = formData.createTimeStart
-    // params.createTimeEnd = formData.createTimeEnd
-    // params.staffId = formData.staffId
-    // params.orgId = formData.orgId
+    if(params.intoDateStart.indexOf('/') != -1){
+      params.intoDateStart =  params.intoDateStart.replace(/\//g, '-')
+      params.intoDateEnd =  params.intoDateEnd.replace(/\//g, '-')
+    }
     return params;
   },
   /**

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

@@ -617,6 +617,9 @@ Page({
   saveButton(e) {
 
     let name = e.detail.name
+    this.setData({
+      saveButtonName:name
+    })
     if (name == 'save') { //保存
       this.save({})
     } else if (name == 'collection') { //收款
@@ -676,7 +679,9 @@ Page({
     params.objInfo['addressFull'] = params.addressFull
     // 记录原始的合计金额
     params.sumAmountSocial = params.sumAmount
-    params.sumAmount = params.factAmt
+    if(this.data.saveButtonName == 'collection') {
+      params.sumAmount = params.factAmt
+    } 
     params.formType = 8
     delete params['goodsList']
     // return

package-sales/pages/order-billing/add/add.wxml

@@ -2,11 +2,14 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
 
-
-<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"   titleCol="skuModel" iconCol="imagesUrl" descCol="skuName"  subCol="calculationFormula" priceTailCol="sumPrice"pupPriceCol="factAmt" priceCol="factAmt"  quantityCol="itemQty" sumAmountCol="sumAmount" sumQuantityCol="sumQuantity" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" swipeDisabled ="cannotModifyFlag"
+<dk-form-bill  type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"   titleCol="skuModel" iconCol="imagesUrl" descCol="skuName"  subCol="calculationFormula" priceTailCol="sumPrice"pupPriceCol="factAmt" priceCol="factAmt"  quantityCol="itemQty" sumAmountCol="sumAmount" sumQuantityCol="sumQuantity" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" swipeDisabled ="cannotModifyFlag"
 bind:editItems="editItems"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList" 
-bind:customersChoose="customersChoose"  bind:changePhoneblur="changePhoneblur"  popType="sale" priceTitle="" staff="staff" org="org" bind:openReverseCalculationPop="openReverseCalculationPop"reverseCalculationFlag="true"wholeOrderDiscountCol="discount"discountAmountCol="discAmt"  >
+bind:customersChoose="customersChoose"  bind:changePhoneblur="changePhoneblur" 
+bind:clickAttach="clickAttach"  bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" popType="sale" priceTitle="" staff="staff" org="org" 
+bind:openReverseCalculationPop="openReverseCalculationPop" reverseCalculationFlag="true" wholeOrderDiscountCol="discount" discountAmountCol="discAmt"  >
 </dk-form-bill>
+
+{{uploadFileFlag}}
 <van-dialog id="van-dialog" />  
 <view style="height: 200rpx;"></view>
 

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

@@ -150,7 +150,10 @@ Page({
     if (index_receivable != -1) {
       contentSaveList[index_receivable]['content'] = data.data.amtResidue
     }
-
+    data.data.outingAmt = data.data.outingAmt?data.data.outingAmt:0
+    data.data.outAmt = data.data.outAmt?data.data.outAmt:0
+    data.data.outoutamt = data.data.outingAmt+data.data.outAmt
+    data.data.amtStatus = (( data.data.factAmt+ data.data.discAmt) <=  data.data.sumAmount &&   data.data.factAmt > 0)? (( data.data.factAmt+ data.data.discAmt) ==  data.data.sumAmount ? '已收款':'部分收款')  : '未收款'
     this.setData({
       item: data.data,
       contentSaveList: contentSaveList,

package-sales/pages/order-billing/detail/detail.wxml

@@ -6,7 +6,7 @@
   <view class="tags-class">
 
     <view style="width: 33%;text-align: right;">
-      <dk-tag fontSize="14px" border="1rpx solid #95A8CB" height="45rpx" color="transparent" textColor="#002340" radius="10rpx" roundFlag="{{true}}" size="medium" value="{{(item.amtFactReceipt < item.sumAmount &&  item.amtFactReceipt > 0)? (item.amtFactReceipt == item.sumAmount ? '已收款':'部分收款')  : '未收款'}}"></dk-tag>
+      <dk-tag fontSize="14px" border="1rpx solid #95A8CB" height="45rpx" color="transparent" textColor="#002340" radius="10rpx" roundFlag="{{true}}" size="medium" value="{{item.amtStatus}}"></dk-tag>
     </view>
     <view style="width: 33%;text-align: center;">
       <dk-tag fontSize="14px" border="1rpx solid #95A8CB" height="45rpx" color="transparent" textColor="#002340" radius="10rpx" roundFlag="{{true}}" size="medium" value="{{item.returnQty > 0? '有退货' : '无退货'}}"></dk-tag>
@@ -50,22 +50,31 @@
   <!--对象-->
   <view class="dk-card-class" wx:if="{{flgStd}}">
     <view style="display: flex;padding:10rpx;">
-      <view style="background-color:#F4F9FF;width:33%;padding:10rpx;border-radius: 16rpx;">
+      <view style="background-color:#F4F9FF;width:50%;padding:10rpx;border-radius: 16rpx;">
         <view style="font-size:13px;text-align: center;margin-top: 10rpx;">订单金额</view>
         <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" content="{{item.factAmt}}"></dk-cell>
       </view>
-      <view style="background-color:#F4F9FF;width:33%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
+      <view style="background-color:#F4F9FF;width:50%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
         <view style="font-size:13px;text-align: center;margin-top: 10rpx;">退货金额</view>
         <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#EA4444" spaceWidth="0" contentFontWeight="700" content="{{item.returnAmt}}"></dk-cell>
       </view>
 
-      <view style="background-color:#F4F9FF;width: 33%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
-        <view style="font-size:13px;text-align: center;margin-top: 10rpx;">出库金额</view>
-        <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" content="{{(item.outAmt&&item.outingAmt)?(item.outAmt +item.outingAmt):0}}"></dk-cell>
-      </view>
+    
 
     </view>
+    <view style="display: flex;padding:10rpx;">
+      <view style="background-color:#F4F9FF;width: 50%;padding:10rpx;border-radius: 16rpx;">
+        <view style="font-size:13px;text-align: center;margin-top: 10rpx;">出库中金额</view>
+        <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" content="{{item.outingAmt}}"></dk-cell>
+      </view>
+      <view style="background-color:#F4F9FF;width:50%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
+        <view style="font-size:13px;text-align: center;margin-top: 10rpx;">已出库金额</view>
+        <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#EA4444" spaceWidth="0" contentFontWeight="700" content="{{item.outAmt}}"></dk-cell>
+      </view>
 
+   
+
+    </view>
   </view>
 
   <view class="dk-card-class" wx:if="{{!flgStd}}">
@@ -88,16 +97,16 @@
 
       <view style="background-color:#F4F9FF;width: 50%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
         <view style="font-size:13px;text-align: center;margin-top: 10rpx;">出库金额</view>
-        <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" content="{{(item.outAmt&&item.outingAmt)?(item.outAmt +item.outingAmt):0}}"></dk-cell>
+        <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" content="{{item.outoutamt}}"></dk-cell>
       </view>
     </view>
   </view>
 </view>
 
 
-<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuModel" descCol="skuName" subCol="calculationFormula" priceTailCol="sumPrice"pupPriceCol="factAmt" priceCol="factAmt" quantityCol="itemQty" sumAmountCol="sumAmount" iconCol="imagesUrl" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" readonly="{{true}}" bind:editItems="editItems" saleStaffAndOrgFlag="{{false}}" bind:customersChoose="customersChoose" popType="sale"  >
+<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuModel" descCol="skuName" subCol="calculationFormula" priceTailCol="sumPrice"pupPriceCol="factAmt" priceCol="factAmt" quantityCol="itemQty" sumAmountCol="sumAmount" iconCol="imagesUrl" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" readonly="{{true}}" bind:editItems="editItems" saleStaffAndOrgFlag="{{false}}" bind:customersChoose="customersChoose" popType="sale"reverseCalculationFlag="true"wholeOrderDiscountCol="discount"discountAmountCol="discAmt"  >
 </dk-form-bill>
-<view style="height: 200rpx;"></view>
+<view style="height: 200rpx;"></view> 
 <!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formMode =='other'}}">
   <view bind:tap="toEdit" class="btn-add-class">
     <van-icon name="edit" color="#FFFFFF" size="60rpx" />

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

@@ -74,7 +74,7 @@ Page({
     // 列表区（脚部信息）
     footerInfo: [{
       name: 'sumQuantity',
-      title: mixins.$t("piece"),
+      title: '',
       prefix: mixins.$t("goodsQuantity"),
     }],
     // 列表区（内容）
@@ -96,7 +96,7 @@ Page({
           title: ''
         }, {
           name: 'staffName',
-          title: mixins.$t("staffId")
+          title:''
         }],
         title: mixins.$t("storeInformation")
       }
@@ -178,17 +178,17 @@ Page({
       code: 'add',
       title: mixins.$t("add")
     }],
-    contentSaveList: [{
-      code: 'amount',
-      content: 0,
-      type: 'number',
-      title: mixins.$t("totalAmount")
-    }, {
+    contentSaveList: [ {
       type: 'count',
       code: 'count',
       bill: 0,
       quantity: 0
-    }],
+    },{
+      code: 'amount',
+      content: 0,
+      type: 'number',
+      title: mixins.$t("sumTotalAmount")
+    },],
     primaryKey: 'orderId'
   },
   /**
@@ -232,13 +232,13 @@ Page({
           idKey: 'cusId'
         }, //跳转客户收款
         {
+          name: 'invalid',
+          title: mixins.$t("invaidOrder")
+        }, //作废
+        {
           name: 'printedBill',
           title: mixins.$t("printedBill")
         }, //打印
-        {
-          name: 'invalid',
-          title: mixins.$t("invaidOrder")
-        } //作废
       ]
     }
     this.setData({
@@ -344,7 +344,16 @@ Page({
    * @author : 于继渤
    */
   onChangeTabs(e) {
-    let code = e.detail.detail.code
+    console.log('onChangeTabs',e);
+    let index = e.detail.detail.index
+    let code = null
+    if(index == 1){
+      code = ["出库状态-待出库", "出库状态-出库中"]
+    }else if(index == 2){
+      code = [ "出库状态-已出库"]
+    }else if(index == 0){ //全部
+      code = ["出库状态-待出库","出库状态-出库中", "出库状态-已出库"]
+    } 
     this.setData({
       outStatus: code,
     })
@@ -405,9 +414,9 @@ Page({
       sumAmount += res.sumAmount
       sumQuantity += res.sumQuantity
     })
-    contentSaveList[0].content = sumAmount
-    contentSaveList[1].bill = tableData.length
-    contentSaveList[1].quantity = sumQuantity
+    contentSaveList[1].content = sumAmount
+    contentSaveList[0].bill = tableData.length
+    contentSaveList[0].quantity = sumQuantity
     this.setData({
       contentSaveList: contentSaveList
     })

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

@@ -17,4 +17,4 @@
 <view style="height: 200rpx;"></view>
 
 <!-- 新建按钮 -->
-<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="open"></dk-save-button>
+<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}"countEnd="" bind:open="open"></dk-save-button>

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

@@ -398,8 +398,10 @@ Page({
           res['outingQty_max'] = 0
           console.log('111111111111111');
         })
-
-
+        //禁用业务员业务部门
+        this.setData({
+          satffAndOrgReadonly:true
+        })
         formData.goodsList = item.itemList
         formData.fromNo = item.fromNo
         this.calculateAmount(formData)
@@ -514,6 +516,9 @@ Page({
       // res['sOutItemId'] = res.soutItemId
       // res['sOrderItemId'] = res.sorderItemId
       // res['sOrderId'] = res.sorderId
+      res.sOutId = res.outId ?res.outId :params.outId 
+      res.sOrderId = res.sOrderId  ? res.sOrderId  : params.orderId
+      
       res.itemIndex = itemIndex++
       res.canNegativeFlag = true
       if (this.data.formMode != 'detail') {
@@ -1121,6 +1126,7 @@ Page({
         this.getItemDetal(this.data.item.orderId, 'orderService', 'getOrderForReturn')
       }
       this.setData({
+        satffAndOrgReadonly:true,
         formData: JSON.stringify(formData)
       })
     } else if (this.data.formMode == Constants.formMode.other && this.data.formType == Constants.formMode.edit) { //编辑

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

@@ -3,7 +3,7 @@
 <loading wx:if="{{loading}}"></loading>
 <van-dialog id="van-dialog" />
 <!-- priceStd -->
-<dk-form-bill type="saleOutReturn" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="" titleCol="skuModel" subCol="calculationFormula" descCol="skuName" priceCol="priceOut" quantityCol="outingQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" pupPriceCol="sumPrice" contentObj="{{contentObj}}" iconCol="imagesUrl" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" bind:editItems="setGoods" readonly="{{formMode == 'detail' && formType =='detail'}}" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:customersChoose="customersChoose" popType="sale" priceTitle="" staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel"titleTagCol="brandName">
+<dk-form-bill type="saleOutReturn" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="" titleCol="skuModel" subCol="calculationFormula" descCol="skuName" priceCol="priceOut" quantityCol="outingQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" pupPriceCol="sumPrice" contentObj="{{contentObj}}" iconCol="imagesUrl" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" bind:editItems="setGoods" readonly="{{formMode == 'detail' && formType =='detail'}}" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:customersChoose="customersChoose" popType="sale" priceTitle="" satffAndOrgReadonly="{{satffAndOrgReadonly}}" staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel"titleTagCol="brandName">
 </dk-form-bill> 
  
 <view style="height: 200rpx;"></view>

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

@@ -581,12 +581,14 @@ Page({
       }
       res.sOutId = res.outId
       res.sOutItemId = res.itemId
+      res.sOrderId = params.orderId
+      res.sOrderItemId = res.fromItemId
       // delete
     })
 
     params.itemList = params.goodsList //明细
     params.makeStaff = app.globalData.user.staffId
-    // params.deleteItemList = params.deleteList ? params.deleteList : []
+    params.deleteItemList = params.deleteList ? params.deleteList : []
 
     // 系统参数
     params.flgHandleSetting = this.data.flgHandleSetting

pages/mine/mine.js

@@ -401,7 +401,11 @@ Page({
       url: this.data.route.companySetting.url,
       events: {
         // 回调后，在这里给页面赋值
-        bandData: function (e) {
+        refresh: function (e) {
+          console.log('tttt',e);
+          wx.reLaunch({
+            url: '/pages/welcome/welcome',
+          })
         }
       },
       success: function (res) {

project.private.config.json

@@ -2,9 +2,8 @@
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "setting": {
         "compileHotReLoad": true,
-        "preloadBackgroundData": false,
-        "bigPackageSizeSupport": true
+        "preloadBackgroundData": false
     },
     "projectname": "iboss_wx_app",
-    "libVersion": "3.0.2"
+    "libVersion": "3.4.3"
 }