bug

app.wxss

@@ -614,15 +614,15 @@ end
 .van-stepper__plus{
   background: #3E69F6 !important;
   border-radius: 5rpx !important;
-  width: 34.87rpx !important;
-  height: 34.04rpx !important;
+  width: 50rpx !important;
+  height: 50rpx !important;
   color: #fff !important;
   background-color: #3E69F6 !important;
 }
 
 .van-stepper__minus{
-  width: 34.87rpx !important;
-  height: 34.04rpx !important;
+  width: 50rpx !important;
+  height: 50rpx !important;
   background: #fff !important;
   border: 1px solid #3E69F6 !important;
   border-radius: 5rpx !important;

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

@@ -88,10 +88,10 @@
             <!--备注-->
             <van-field wx:if="{{item.type=='textarea'}}" type="textarea" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{indext}}" data-card="{{card.name}}" value="{{ itemt[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" clearable autosize border="{{ false }}" readonly="{{!!readonly || !!item.readonly|| !form[objIdCol]}}" 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="changeItemField" bind:blur="blurField" bind:clear="clearItemField" errorMessage="{{itemt[item.code + '_errMsg']}}">
             </van-field>
-          </view>
-          <van-divider wx:if="{{indext < form[itemName].length - 1}}" custom-style="margin:20rpx 20rpx" borderColor="#DCDCDC"></van-divider>
+          </view> 
           <!-- <view wx:if="{{!readonly}}" slot="right">删除</view> -->
         </dk-swiper>
+        <van-divider wx:if="{{indext < form[itemName].length - 1}}" custom-style="margin:20rpx 20rpx" borderColor="#DCDCDC"></van-divider>
       </view>
       <view class="item-btn-title-class" bind:tap="addItem" wx:if="{{card.addFlag || card.addFlag == undefined}}">
         <view class="item-add-btn-class">

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-popup/dk-popup.wxss

@@ -31,7 +31,7 @@
   border-radius: 30rpx 30rpx 0px 0px !important;
   justify-content: space-between;
 }
-
+ 
 .special-basic-topic-title {
   font-size: 16px;
   font-weight: bold;
@@ -110,8 +110,10 @@
 
 .readonly-label{
   color: #95A8CB !important;
+  place-self: center;
 }
 
 .nomal-label{
-  color: #002340 !important 
+  color: #002340 !important ;
+  place-self: center;
 }

components/dkbase/dk-swiper/dk-swiper.wxss

@@ -4,21 +4,7 @@
   /* margin: auto; */
   overflow: hidden; 
 } 
-
-.right{ 
-  position: absolute; 
-  top:0;
-  background-color: #3E69F6; 
-  width: 65px;
-  height: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  text-align: center; 
-  z-index: 1; 
-  right: 0; 
-  color: #fff 
-} 
+ 
 .right{ 
   position: absolute; 
   top:0;

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

@@ -155,6 +155,7 @@ Page({
         title: mixins.$t("actualTotalAmount")
       },
     ],
+    minDate: new Date().getTime(),
     popContent: [{
         code: 'itemQty',
         type: 'step',
@@ -311,6 +312,18 @@ Page({
       showReverseCalculationPop: true,
     })
   },
+   /**
+   * @desc : 2024-04-28类型转成时间戳
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  convertDateToMillisecondsTimestamp(dateString) {
+    // 创建Date对象  
+    const date = new Date(`${dateString}T00:00:00Z`); // 假设dateString是YYYY-MM-DD格式，并添加T00:00:00Z使其成为ISO 8601格式  
+    // 获取毫秒级时间戳  
+    const timestamp = date.getTime();
+    return timestamp;
+  },
   /**
    * @desc :  总单的各个反算
    * 反算逻辑涉及到五个地方（1，总单的各个反算  2.明细的反算（在dk-form-bill里） 3.点击总单pop确定均分 4.点击明细pop确定反写总单 5明细dpop点击价格 还能弹pop 有点逻辑）
@@ -992,8 +1005,8 @@ Page({
     if (index_receivable != -1) {
       contentSaveList[index_receivable]['content'] = data.sumAmount
     }
-
-
+ 
+     
 
     this.setData({
       cardList: cardList,
@@ -1296,8 +1309,10 @@ Page({
       var currentDate = new Date();
       currentDate.setDate(currentDate.getDate() + 7);
       formData.deliveryDate = util.formatDayTime(currentDate)
+      let dataTime = this.convertDateToMillisecondsTimestamp(formData.deliveryDate)
       this.setData({
-        formData: JSON.stringify(formData)
+        formData: JSON.stringify(formData),
+        dataTime:dataTime
       })
     }
 

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

@@ -6,7 +6,7 @@
 bind:editItems="editItems"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList" 
 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"  >
+bind:openReverseCalculationPop="openReverseCalculationPop" reverseCalculationFlag="true" wholeOrderDiscountCol="discount" discountAmountCol="discAmt" dataTime="{{dataTime}}" minDate="{{minDate}}">
 </dk-form-bill>
 
 {{uploadFileFlag}}