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

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

@@ -772,7 +772,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,

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

@@ -866,7 +866,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,

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

@@ -9,6 +9,18 @@
  *******************************************************************************/
 const util = require('@/utils/util.js')
 const app = getApp();
+// 防抖函数 - 2024/6/28 于继渤
+function debounce(func, wait) {
+  let timeout;
+  return function() {
+    const context = this;
+    const args = arguments;
+    clearTimeout(timeout);
+    timeout = setTimeout(() => {
+      func.apply(context, args);
+    }, wait);
+  };
+}
 Component({
   /**
    * 组件的属性列表
@@ -670,8 +682,8 @@ Component({
    */
   lifetimes: {
     attached: function () {
-      console.log('fffd', this.data.form, this.data.contentObj);
-
+      // 防抖
+      this.commit = debounce(this.commit, 400); 
     },
     detached: function () {
       // 在组件实例被从页面节点树移除时执行

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

@@ -419,4 +419,4 @@
 </dk-single-dropdown-item>
 
 <!-- 修改已选商品金额 和单价 -->
-<dk-popup type="basic" title="修改价格" value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}" bind:commit="editItemsChangePrice" bind:changeStep="changePriceStep" bind:blurNumberField="blurNumPriceberField"></dk-popup>
+<dk-popup type="basic" title="修改价格" value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}" bind:commit="editItemsChangePrice" bind:changeStep="changePriceStep" bind:blurNumberField="blurNumPriceberField"stepperDecimal="decimalPlaces"></dk-popup>

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

@@ -1,8 +1,7 @@
 .fontSizeStyle {
   font-size: 15px;
 }
-
-
+ 
 
 
 .choose-item {
@@ -61,7 +60,9 @@
   border-radius: 15rpx;
   box-shadow: 2px 2px 5px #bbb7b7;
 }
-
+.van-checkbox__icon{
+  border: 1px solid var(--checkbox-border-color,rgb(141, 139, 139)) !important;
+}
 .top-class-2 {
   flex-direction: column;
   justify-content: center;

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

@@ -3,7 +3,9 @@
 }
 
 
-
+.van-checkbox__icon{
+  border: 1px solid var(--checkbox-border-color,rgb(141, 139, 139)) !important;
+}
 
 .choose-item {
   display: flex;

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

@@ -845,29 +845,7 @@ Page({
                 type: 'switch',
                 title: mixins.$t("subUnitId"),
                 code: 'flgSubUnit',
-              }, { //包装单位
-                code: 'subUnitId',
-                name: 'subUnitName',
-                title: mixins.$t("packageUnit"),
-                type: 'choose',
-                urlKey: 'unit',
-                required: true,
-                readonly: true,
-              }, { //包装
-                code: 'packBox',
-                title: mixins.$t("package"),
-                type: 'number',
-                sign: "",
-                digits: 0,
-                required: true,
-                readonly: true,
-              },
-              {
-                code: 'calculationFormula',
-                type: 'textarea',
-                title: mixins.$t("calculationFormula"),
-                readonly: true,
-              }
+              } 
             ],
             warehouse: [{ //期初库存标识
               type: 'switch',
@@ -959,6 +937,8 @@ Page({
         });
       }, 200)
     }
+
+
   },
   /**
    * @desc : 页面加载数据方法

pages/shopping/shopping.wxml

@@ -9,7 +9,7 @@
 <view style="display: flex;">
 <view style="width: 85%;">
    <!-- 查询条件 --> 
-   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}"  bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['skuName','skuCode','onlyCode'])}}">
+   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}"  bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['skuModel','skuName','reservoirArea','colorNumber'])}}">
       </dk-dropdown-menu>
 </view>
 
@@ -187,4 +187,4 @@
 <dk-save-button  countName="商品数量" countEnd="" cssType="sale" model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:open="submit"></dk-save-button>
 
 <!-- 修改已选商品金额 和单价 -->
-<dk-popup type="basic" title="修改价格"   value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}"  bind:commit="editItemsChangePrice" bind:changeStep="changePriceStep" bind:blurNumberField="blurNumPriceberField"  ></dk-popup>
+<dk-popup type="basic" title="修改价格"   value="{{dataItemChangePrice}}" show="{{showChangePrice}}" routeObjName="{{routeObjName}}" contentObj="{{popChangePrice}}" validFlag="{{true}}"  bind:commit="editItemsChangePrice" bind:changeStep="changePriceStep" bind:blurNumberField="blurNumPriceberField" stepperDecimal="decimalPlaces" ></dk-popup>