Răsfoiți Sursa

1、修改负数数量组件
2、修改问题

zhoux 1 an în urmă
părinte
comite
364479cc57

+ 1 - 1
components/dkbase/dk-cell/dk-cell.wxml

@@ -5,7 +5,7 @@
   <view wx:if="{{placeholder && !displayValue}}" class="{{contentRight?'content_class':'content_left_class'}}" style="--contentColor--:{{placeholderColor}};--fontSize--:{{(contentFontSize==0?fontSize:contentFontSize) + 'px'}};--titleWidth--:{{titleWid?titleWid :titleWidth + 'px'}};--fontWeight--:{{contentFontWeight==''?fontWeight:contentFontWeight}};--spaceWidth--:{{title?spaceWidth:''}}">{{placeholder}}</view>
   <!--错误提示信息-->
   <view wx:if="{{errorMessage}}" class="{{contentRight?'content_class':'content_left_class'}} errMsg_class" style="--contentColor--:{{placeholderColor}};--fontSize--:{{(contentFontSize==0?fontSize:contentFontSize) + 'px'}};--titleWidth--:{{titleWid?titleWid :titleWidth + 'px'}};--fontWeight--:{{contentFontWeight==''?fontWeight:contentFontWeight}};--spaceWidth--:{{title?spaceWidth:''}}">{{errorMessage}}</view>
-  <view wx:if="{{displayValue}}" class="{{contentRight?'content_class':'content_left_class'}}" style="--contentColor--:{{contentColor}};--fontSize--:{{(contentFontSize==0?fontSize:contentFontSize) + 'px'}};--titleWidth--:{{titleWid?titleWid :titleWidth + 'px'}};--fontWeight--:{{contentFontWeight==''?fontWeight:contentFontWeight}};--spaceWidth--:{{title?spaceWidth:''}}">
+  <view wx:if="{{displayValue}}" class="{{contentRight?'content_class':'content_left_class'}}" style="--contentColor--:{{contentColor}};--fontSize--:{{(contentFontSize==0?fontSize:contentFontSize) + 'px'}};--titleWidth--:{{titleWid?titleWid :titleWidth + 'px'}};--fontWeight--:{{contentFontWeight==''?fontWeight:contentFontWeight}};--spaceWidth--:{{title?spaceWidth:''}};--center-:{{center}}">
     <view wx:if="{{amount && displayValue}}" class="sign-class" style="--fontSize--:{{signSize?signSize:((fontSize - 5 ) + 'px')}};--color--:{{contentColor}}">{{percentSignFlag ? '' :car}}</view>{{displayValue}}
     <view wx:if="{{decimalFlag && decimalValue}}" class="sign-class" style="--fontSize--:{{signSize?signSize:((fontSize - 5 ) + 'px')}};--color--:{{contentColor}}">{{decimalValue}}</view>
      <view wx:if="{{tail}}" class="sign-class-tail" style="--fontSize--:{{signSize?signSize:((fontSize - 5 ) + 'px')}};--color--:{{tailColor==''?contentColor:tailColor}};--line--:{{tailLine?'line-through':'none'}};--tailFontWeight--:{{tailFontWeight==''?fontWeight:tailFontWeight}}">{{tail}}</view>

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

@@ -245,7 +245,7 @@
               <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="#95A8CB" inputValue="{{form[item.code]}}" negative="{{item.negative}}" maxFlag="{{item.maxFlag}}" max="{{item.max}}" bind:triggerBindBlur="changeNumberBlur" bind:triggerBindValue="changeNumberField"></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="#95A8CB" inputValue="{{form[item.code]}}" negative="{{item.negative}}" maxFlag="{{item.maxFlag}}" max="{{item.max}}"  min="{{item.min}}" bind:triggerBindBlur="changeNumberBlur" bind:triggerBindValue="changeNumberField"></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}}" 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}}">

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

@@ -84,7 +84,7 @@
               </view>
             </van-field>
             <!--数字类-->
-            <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}}" data-index="{{indext}}" data-card="{{card.name}}" center="left" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{itemt[item.code + '_errMsg']}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#FF7B1A" titleFontWeight="{{item.required?'normal':'normal'}}" titleColor="{{item.required?'#95A8CB':'#95A8CB'}}"inputValue="{{itemt[item.code]}}" readonly="{{!!readonly || !!item.readonly || (objIdCol && !form[objIdCol]) || (item.control && !itemt[item.control])}}"  maxFlag="{{item.maxFlag}}" max="{{item.max}}"   required="{{item.required?true:false }}"bind:triggerBindValue="changeItemNumberField"></dk-number-input>
+            <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}}" data-index="{{indext}}" data-card="{{card.name}}" center="left" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{itemt[item.code + '_errMsg']}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#FF7B1A" titleFontWeight="{{item.required?'normal':'normal'}}" titleColor="{{item.required?'#95A8CB':'#95A8CB'}}"inputValue="{{itemt[item.code]}}" readonly="{{!!readonly || !!item.readonly || (objIdCol && !form[objIdCol]) || (item.control && !itemt[item.control])}}"  maxFlag="{{item.maxFlag}}" max="{{item.max}}" negative="{{item.negative}}" min="{{item.min}}"   required="{{item.required?true:false }}"bind:triggerBindValue="changeItemNumberField"></dk-number-input>
             <!--备注-->
             <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]}}" 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>
@@ -140,7 +140,7 @@
       <!--联系电话-->
       <dk-number-phone-input id="{{item.code}}" wx:if="{{item.type=='phone'}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" required="{{item.required?true:false }}" rightIcon="phone" model:value="{{ form[item.code]}}" bind:changeField="changePhone" bind:changeFieldblur="changePhoneblur" clearable bind:clear="clearField" errorMessage="{{item.errMsg}}" id="{{item.code}}" readonly="{{!!readonly || !!item.readonly}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.code)}}"></dk-number-phone-input>
       <!--数字类-->
-      <dk-number-input id="{{item.code}}" wx:if="{{item.type=='number'}}" required="{{item.required?true:false }}"  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" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" readonly="{{!!readonly || !!item.readonly}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#FF7B1A" titleFontWeight="{{item.required?'normal':'normal'}}" titleColor="{{item.required?'#95A8CB':'#95A8CB'}}"  maxFlag="{{item.maxFlag}}" max="{{item.max}}"  inputValue="{{form[item.code]}}" bind:triggerBindValue="changeNumberField"></dk-number-input>
+      <dk-number-input id="{{item.code}}" wx:if="{{item.type=='number'}}" required="{{item.required?true:false }}"  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" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" readonly="{{!!readonly || !!item.readonly}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#FF7B1A" titleFontWeight="{{item.required?'normal':'normal'}}" titleColor="{{item.required?'#95A8CB':'#95A8CB'}}"  maxFlag="{{item.maxFlag}}" max="{{item.max}}" negative="{{item.negative}}" min="{{item.min}}"  inputValue="{{form[item.code]}}" bind:triggerBindValue="changeNumberField"></dk-number-input>
       <!--备注-->
       <van-field wx:if="{{item.type=='textarea'}}" 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 }}" readonly="{{!!readonly && !!item.readonly}}" clearable 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>
       <!--附件-->

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

@@ -76,7 +76,7 @@
       <!--联系电话-->
       <dk-number-phone-input wx:if="{{item.type=='phone' && !item.hide}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card}}" required="{{item.required?true:false }}" clearable rightIcon="phone" model:value="{{ form[item.code]}}" bind:changeField="changePhone" bind:clear="clearField" bind:changeFieldblur="changePhoneblur" errorMessage="{{item.errMsg}}" id="{{item.code}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.code)}}"></dk-number-phone-input>
       <!--数字类-->
-      <dk-number-input wx:if="{{item.type=='number' && !item.hide}}" 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}}" center="left" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" titleValue="{{item.title?item.title:$t[item.code]}}" negative="{{item.negative}}" max="{{item.max}}" maxFlag="{{item.maxFlag}}" inputColor="#FF7B1A" titleFontWeight="normal" titleColor="#95A8CB" readonly="{{!!item.readonly}}" required="{{item.required}}" tip="{{item.tip}}" inputValue="{{form[item.code]}}" bind:triggerBindValue="changeNumberField"></dk-number-input>
+      <dk-number-input wx:if="{{item.type=='number' && !item.hide}}" 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}}" center="left" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" titleValue="{{item.title?item.title:$t[item.code]}}" negative="{{item.negative}}" max="{{item.max}}" maxFlag="{{item.maxFlag}}" min="{{item.min}}" inputColor="#FF7B1A" titleFontWeight="normal" titleColor="#95A8CB" readonly="{{!!item.readonly}}" required="{{item.required}}" tip="{{item.tip}}" inputValue="{{form[item.code]}}" bind:triggerBindValue="changeNumberField"></dk-number-input>
 
       <!--备注-->
       <van-field wx:if="{{item.type=='textarea' && !item.hide}}" rows="{{item.rows}}" show-word-limit="{{item.showWordLimit}}" type="textarea" 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 }}" readonly="{{!!item.readonly}}" input-class="dk-cell-value-class {{item.rows ?  'input-rows-class' : ''}}" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeField" bind:blur="blurField" errorMessage="{{item.errMsg}}">

+ 67 - 28
components/dkbase/dk-number-input/dk-number-input.js

@@ -20,9 +20,9 @@ Component({
       value: ''
     },
     required: Boolean,//是否显示表单必填星号 
-    requiredLeft:{
-      type:String,
-      value:'50rpx'
+    requiredLeft: {
+      type: String,
+      value: '50rpx'
     },
     titleWidth: {
       type: String,
@@ -45,7 +45,7 @@ Component({
       value: false
     },
     // 内容是否居右,默认是false
-    contentRight:{
+    contentRight: {
       type: Boolean,
       value: false
     },
@@ -114,6 +114,13 @@ Component({
       value: 10000000
     },
     /**
+     * 最小值
+     */
+    min: {
+      type: Number,
+      value: 0
+    },
+    /**
      * 字体大小
      */
     fontSize: {
@@ -168,8 +175,8 @@ Component({
     /**
      * 提示信息
      */
-    tip:{
-      type:String,
+    tip: {
+      type: String,
     }
   },
 
@@ -184,14 +191,14 @@ Component({
    * 组件的方法列表
    */
   methods: {
-     /**
-     * @desc   : 显示tip
-     * @author : 周兴
-     * @date   : 2024/4/25 11:46
-     */
-    showTip(){
+    /**
+    * @desc   : 显示tip
+    * @author : 周兴
+    * @date   : 2024/4/25 11:46
+    */
+    showTip() {
       let tip = this.data.tip
-      if(tip){
+      if (tip) {
         wx.showToast({
           title: tip,
           icon: 'none',
@@ -221,10 +228,10 @@ Component({
     * @author : 周兴
     * @date : 2022/6/30 16:16
     */
-    bindFocus(e){
-      if(isNaN(this.data.inputValue)){
+    bindFocus(e) {
+      if (isNaN(this.data.inputValue)) {
         this.setData({
-          inputValue:0
+          inputValue: 0
         })
       }
     },
@@ -234,6 +241,23 @@ Component({
     * @date : 2022/6/30 16:16
     */
     bindInput(e) {
+      let inputValue = this.data.inputValue
+
+      let minFlag = this.data.minFlag
+      let min = this.data.min
+      // console.log('tttt',inputValue,maxFlag,minFlag,min);
+
+      // 如果输入后让数据变成非数字,那么就要还原成之前的数据
+      if (isNaN(e.detail)) {
+        // 如果最小值在0之上 ,就不允许输入负数
+        if (minFlag && min >= 0 && e.detail == '-' || e.detail != '-') {
+          this.setData({
+            inputValue: inputValue
+          })
+          return;
+        }
+      }
+
       let flag = true;
       let values = e.detail.split('.')
       // 如果输入的是小数点,那么需要判断是否已经有小数点
@@ -241,6 +265,7 @@ Component({
         // 说明有多个小数点
         // console.log('zzz',values,this.data.inputValue,(this.data.inputValue + '').indexOf('.'));
         if (values && values.length > 2) {
+          flag = false;
           if ((this.data.inputValue + '').indexOf('.') >= 0) {
             return this.data.inputValue;
           } else {
@@ -252,41 +277,55 @@ Component({
         if (e.detail == '.') {
           return '0.';
         }
-        flag = false;
       }
       //控制小数点后数字的输入
       let digits = this.data.digits
       if (values && values.length === 2 && values[1].length > digits) {
         flag = false;
+        this.setData({
+          inputValue: inputValue
+        })
         return this.data.inputValue;
       }
-
       if (flag) {
         let value = 0;
+        let detailValue = e.detail
+        // 直接变为负
+        if (this.data.negative) {
+          detailValue = -1 * Math.abs(detailValue)
+        }
         // 判断是否超过最大值
         if (this.data.maxFlag) {
-          if (e.detail > this.data.max) {
+          if (detailValue > this.data.max) {
             value = this.data.max
           } else {
-            value = e.detail
+            value = detailValue
           }
         } else {
-          value = e.detail
+          value = detailValue
         }
         if (this.data.minFlag) {
-          if (e.detail <= this.data.min) {
+          if (detailValue <= this.data.min) {
             value = this.data.min
           } else {
-            value = value
+            value = detailValue
           }
         } else {
-          value = value
+          value = detailValue
+        }
+        console.log('valu', value, this.data.max, this.data.min,this.data.maxFlag,this.data.minFlag);
+
+        if (e.detail == '-') {
+          value = e.detail
         }
         this.setData({
           clearFlag: false,
           inputValue: value,
         })
-        this.handleData()
+        // console.log('bbbbb',this.data.inputValue);
+        if (e.detail != '-') {
+          this.handleData()
+        }
       }
     },
     /**
@@ -343,9 +382,9 @@ Component({
           value = -1 * value;
         }
       } else {
-        if (value < 0) {
-          value = -1 * value;
-        }
+        // if (value < 0) {
+        //   value = -1 * value;
+        // }
       }
       this.triggerEvent('triggerBindValue', {
         value: value

+ 4 - 3
components/dkbase/dk-number-input/dk-number-input.wxml

@@ -4,9 +4,10 @@
     </view>
     <dk-cell height="48rpx" left="{{left}}" signSize="{{signSize}}" fontWeight="{{titleFontWeight}}" fontSize="{{fontSize}}" tail="{{percentSignFlag ? '%' : ''}}" percentSignFlag="{{percentSignFlag}}" contentColor="{{inputColor}}" amount="{{sign?true:false }}" contentFontWeight="{{fontWeight}}" contentRight="{{contentRight}}" center="{{center=='right'?'flex-end':center}}" title="{{titleValue}}" content="{{(inputValue || inputValue == 0)?inputValue:null}}" titleWid="{{titleWidth}}" catchtap="handleInput" titleColor="{{titleColor}}" placeholder="{{placeholder}}" errorMessage="{{errorMessage}}">
     </dk-cell> -->
-    <van-field  label-class="input-title-class" style="--color--:{{titleColor}};--fontSize--:{{fontSize + 'px'}};--width--:{{titleWidth}};--fontWeight--:{{titleFontWeight}};" required="{{required?true:false }}" input-align="{{left}}" label="{{titleValue}}" placeholder="{{(inputValue || inputValue == 0)?'':placeholder}}" data-type='name' readonly="{{true}}" autosize border="{{ false }}" errorMessage="{{errorMessage}}" catchtap="handleInput" showInput="{{false}}">
+
+    <van-field label-class="input-title-class" style="--color--:{{titleColor}};--fontSize--:{{fontSize + 'px'}};--width--:{{titleWidth}};--fontWeight--:{{titleFontWeight}};" required="{{required?true:false }}" input-align="{{left}}" label="{{titleValue}}" placeholder="{{(inputValue || inputValue == 0)?'':placeholder}}" data-type='name' readonly="{{true}}" autosize border="{{ false }}" errorMessage="{{errorMessage}}" catchtap="handleInput" showInput="{{false}}">
       <van-icon wx:if="{{tip}}" slot="label-icon" name="question-o" catchtap="showTip" />
-      <dk-cell slot="inputbefor" style="width: 100%;" center="{{center=='right'?'flex-end':center}}" contentRight="{{contentRight}}" left="0" height="46rpx" contentFontSize="{{fontSize}}" contentColor="{{inputColor}}" contentFontWeight="{{fontWeight}}" amount="{{sign?true:false }}"  tail="{{percentSignFlag ? '%' : ''}}" percentSignFlag="{{percentSignFlag}}" placeholderColor="#c8c9cc" content="{{(inputValue || inputValue == 0)?inputValue:null}}" placeholder="{{(inputValue || inputValue == 0)?'':placeholder}}"></dk-cell>
+      <dk-cell slot="inputbefor" style="width: 100%;" center="{{center=='right'?'flex-end':center}}" contentRight="{{contentRight}}" left="0" height="46rpx" contentFontSize="{{fontSize}}" contentColor="{{inputColor}}" contentFontWeight="{{fontWeight}}" amount="{{sign?true:false }}" tail="{{percentSignFlag ? '%' : ''}}" percentSignFlag="{{percentSignFlag}}" placeholderColor="#c8c9cc" content="{{(inputValue || inputValue == 0)?inputValue:null}}" placeholder="{{(inputValue || inputValue == 0)?'':placeholder}}"></dk-cell>
     </van-field>
   </view>
 
@@ -18,7 +19,7 @@
     </view>
   </view> -->
   <!--文本框-->
-  <view wx:else >
+  <view wx:else>
     <van-field input-align="right" required="{{required}}" label-class="input-title-class" style="--color--:{{titleColor}};--inputColor--:{{inputColor}};--fontSize--:{{fontSize + 'px'}};--width--:{{titleWidth}};--fontWeight--:{{titleFontWeight}};--inputFontWeight--:{{inputColor}}" value="{{inputValue?inputValue:undefined}}" input-align="{{center}}" label="{{titleValue}}" placeholder="{{placeholder}}" autosize auto-focus clearable border="{{ false }}" input-class="dk-cell-value-class" type="text" inputMode="decimal" bind:focus="bindFocus" bind:change="bindInput" bind:blur="bindBlur">
     </van-field>
   </view>

+ 0 - 1
components/dkbase/dk-popup/dk-popup.js

@@ -415,7 +415,6 @@ Component({
      * @date   : 2024/2/2 11:46
      */
     changeStep(e) {
-      console.log('eee',e);
       if (this.data.readonly) {
         return;
       }

+ 3 - 4
components/dkbase/dk-popup/dk-popup.wxml

@@ -69,15 +69,14 @@
       <!--数量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 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}}" />
-        <dk-stepper wx:elif="{{item.code == 'itemQty'}}" value="{{form[item.code]}}" input-width="60px" 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="cell_title"  title="{{item.title?item.title:'数量'}}" required="{{item.required?true:false }}">
-        <dk-stepper value="{{form[item.code]}}" input-width="60px" 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 wx:if="{{item.type=='negativeStep'}}" border="{{ false }}" title-class="cell_title"  title="{{item.title?item.title:'数量'}}" required="{{item.required?true:false }}" custom-class="step-class">
+        <dk-stepper value="{{form[item.code]}}" input-width="60px" 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" readonly="{{!!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}}" 
+      <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}}" min="{{item.min}}"  negative="{{item.negative}}"  data-index="{{index}}" center="{{'right'}}" readonly="{{!!readonly || !!item.readonly}}" 
       placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" contentRight="{{true}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#FF7B1A" titleFontWeight="normal" required="{{item.required?true:false }}" requiredLeft="15rpx" titleColor="#95A8CB" inputValue="{{form[item.code]}}" titleWidth = "174px"bind:triggerBindValue="changeNumberField" bind:triggerBindBlur="blurNumberField"></dk-number-input>
       <!--备注-->
       <van-field wx:if="{{item.type=='textarea'}}" type="textarea" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" 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 }}" readonly="{{!!readonly || !!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeField" errorMessage="{{item.errMsg}}">

+ 5 - 0
components/dkbase/dk-popup/dk-popup.wxss

@@ -79,6 +79,11 @@
   overflow-x: hidden;
 }
 
+
+.step-class{
+  align-items: center;
+}
+
 /**cell值颜色**/
 .dk-cell-value-class {
   text-align: right !important;

+ 78 - 187
components/dkbase/dk-stepper/dk-stepper.js

@@ -1,206 +1,97 @@
+const Constants = require("@/utils/Constants");
+
 // components/dkbase/dk-stepper/dk-stepper.js
 Component({
 
-    /**
-     * 组件的属性列表
-     */
-    properties: {
-      // 设置数字部分显示宽度
-      inputWidth:{
-        type: String,
-        value: "32px"
-      },
-      value: {
-        type: String
-      },
-      min: {
-        type: String,
-        value:"1"
-      },
-      max: {
-        type: String
-      },
-      step: {
-        type: String,
-        value:"1"
-      },
-      integer: {
-        type: Boolean,
-        value: false
-      },
-      disabled: {
-        type: Boolean,
-        value: false
-      },
-      disableInput: {
-        type: Boolean,
-        value: false
-      },
-      asyncChange: {
-        type: Boolean,
-        value: false
-      },
-      buttonSize: {
-        type: Number,
-        value: "17px"
-      },
-      showPlus: {
-        type: Boolean,
-        value: true
-      },
-      showMinus: {
-        type: Boolean,
-        value: true
-      },
-      decimalLength: {
-        type: Number
-      },
-      theme:{
-        type: String
-      },
-      disablePlus:{
-        type: Boolean
-      },
-      disableMinus:{
-        type: Boolean
-      },
-      longPress:{
-        type: Boolean,
-        value: true
-      },
-      alwaysEmbed:{
-        type: Boolean,
-        value: false
-      },
-      // 用于控制是否显示负数
-      shieldShow:{
-        type: Boolean,
-        value: true
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    // 设置数字部分显示宽度
+    inputWidth: {
+      type: String,
+      value: "32px"
+    },
+    value: {
+      type: Number,
+      observer: function (newVal) {
+        this.setData({
+          dataValue: newVal
+        })
       }
     },
+    min: {
+      type: Number
+    },
+    step: {
+      type: Number,
+      value: 1
+    },
+    readonly: {
+      type: Boolean,
+      value: false
+    },
+  },
 
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    inputTimer: null,
+    dataValue: null,
+    max: 0
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
     /**
-     * 组件的初始数据
+     * 步进器数值改变
+     * @author 刘尧
      */
-    data: {
-      // 光标点击控制遮罩显隐 true遮罩隐藏 false显示
-      checkFocus: false,
-      // 组件内容显示
-      inputValue: '-' + '1',
-      shieldWidth: '',
-      shieldRight: '',
-      inputTimer: null
+    changeStep(e) {
+      console.log('e', e);
+      this.setData({
+        dataValue: e.detail.inputValue,
+      })
+      // 触发自定义事件  
+      this.triggerEvent('change', this.data.dataValue);
     },
-
     /**
-     * 组件的方法列表
+     * @desc   : 减法
+     * @author : 周兴
+     * @date   : 2024/2/2 11:46
      */
-    methods: {
-      /**
-       * 步进器数值改变
-       * @author 刘尧
-       */
-      changeStep(e){
-        console.log('e', e);
-        if(Number(e.detail) < 0){
-          e.detail = Number(e.detail) * -1
-        }
+    handleMinus() {
+      let dataValue = this.data.dataValue
+      let min = this.data.min
+      dataValue = dataValue - this.data.step
+      if (dataValue >= min) {
         this.setData({
-          inputValue: e.detail * -1,
-          value: e.detail
-        })
-        // 触发自定义事件  
-        this.triggerEvent('change', String(e.detail));
-      },
-      /**
-       * 显示数字遮罩层
-       * @author 刘尧
-       * @param {*} e 
-       */
-      shieldShow(e){
-        if(this.data.checkFocus){
-          this.setData({
-            checkFocus: false
-          })
-        } 
-      },
-      /**
-       * 步进器点击加号事件
-       * @author 刘尧
-       * @param {*} e 
-       */
-      bindPlus(e){
-        this.shieldShow()
-      },
-       /**
-       * 步进器点击减号事件
-       * @author 刘尧
-       * @param {*} e 
-       */
-      bindMinus(e){
-        this.shieldShow()
-      },
-
-      // 遮罩层input组件和van-stepper组件均绑定以下焦点事件,以便控制遮罩显隐
-
-      /**遮罩组件点击事件
-       * @author : 刘尧
-       * @date : 2024/6/3 09:02
-       * @param {*} e 
-       */
-      inputOnFocus(e){
-        if(!this.data.checkFocus && !this.data.disableInput){
-          this.setData({
-            checkFocus:true
-          })
-        }
-      },
-      /** 
-       * 步进器失去焦点
-       * @author : 刘尧
-       * @date : 2024/6/3 08:44
-       *  */
-      onBlur(e){        
-        // 清除之前的定时器  
-        if (this.data.inputTimer) {  
-          clearTimeout(this.data.inputTimer);  
-        }  
-        // 设置新的定时器,等待一段时间来判断输入是否停止  
-        this.setData({  
-          inputTimer: setTimeout(() => {  
-            this.setData({  
-              checkFocus: false  
-            });  
-          }, 500)
-        });  
-      },
-      /** 
-       * 步进器获取焦点
-       * @author : 刘尧
-       * @date : 2024/6/3 08:43
-       *  */
-      onFocus(e){
-        this.setData({
-          checkFocus:true
+          dataValue: dataValue,
         })
       }
+      // 触发自定义事件  
+      this.triggerEvent('change', this.data.dataValue);
     },
-    observers: {
-      'value, min': function(value, min) {
-        /**
-         * 数据监听当组件被赋予value值或最小值时执行
-         * @author 刘尧
-         */
-          this.setData({
-            inputValue: value * -1 || min
-          })
-      },
-      'inputWidth, buttonSize': function(inputWidth, buttonSize){
-        let deviceWidth = wx.getSystemInfoSync().windowWidth; //获取设备屏幕宽度
+    /**
+     * @desc   : 加法
+     * @author : 周兴
+     * @date   : 2024/2/2 11:46
+     */
+    handlePlus() {
+      let dataValue = this.data.dataValue
+      let max = this.data.max
+      console.log('max', max, dataValue);
+      dataValue = dataValue + this.data.step
+      if (dataValue <= max) {
         this.setData({
-          shieldWidth: (750 / deviceWidth) * Number(inputWidth.replace('px', '')) + 'rpx',
-          shieldRight: (750 / deviceWidth) * Number(buttonSize.replace('px', '')) + 'rpx'
+          dataValue: dataValue,
         })
       }
-    }
+      // 触发自定义事件  
+      this.triggerEvent('change', this.data.dataValue);
+    },
+  },
 })

+ 11 - 5
components/dkbase/dk-stepper/dk-stepper.wxml

@@ -1,12 +1,18 @@
 <view>
   <view class="com-content">
     <!-- 将文字显示上方获取焦点相关事件处理遮罩文字显隐 -->
-    <view class="number-view" style="width: {{inputWidth}};margin-right:{{buttonSize}};">
-      <input disabled class="number-content" style="width: {{inputWidth ? inputWidth: ''}};" bindtap="inputOnFocus" wx:if="{{ !checkFocus && shieldShow }}" value="{{ inputValue }}"></input>
+    <view class="number-view">
+      <!-- <input disabled class="number-content" style="width: {{inputWidth ? inputWidth: ''}};" bindtap="inputOnFocus" wx:if="{{ !checkFocus && shieldShow }}" value="{{ inputValue }}"></input> -->
+      <image src="{{dataValue>min?'/static/image/btn-minus.png':'/static/image/btn-minus-d.png'}}" style="width: 38rpx;height:38rpx;" catchtap="handleMinus"></image>
+      <view style="width: 200rpx;">
+        <dk-number-input digits="{{digits}}" fontSize="14" left="30rpx" formatThousandth="{{false}}" sign=""  min="{{min}}" negative="{{true}}" center="center" readonly="{{!!readonly }}" contentRight="{{false}}" inputColor="#FF7B1A" requiredLeft="15rpx" inputValue="{{dataValue}}" bind:triggerBindBlur="changeStep"></dk-number-input>
+      </view>
+      <image src="{{dataValue<max?'/static/image/btn-plus.png':'/static/image/btn-plus-d.png'}}" style="width: 38rpx;height:38rpx;" catchtap="handlePlus"></image>
     </view>
     <!-- 原始步进器组件 -->
-    <van-stepper
-    value="{{value}}"
-    input-width="{{inputWidth}}" async-change="{{asyncChange}}" button-size="{{buttonSize}}" show-plus="{{showPlus}}" min="{{min}}" max="{{max}}" step="{{step}}" disabled="{{disabled}}" disableInput="{{disableInput}}" integer="{{integer}}" show-minus="{{showMinus}}" decimal-length="{{decimalLength}}" theme="{{theme}}" disable-plus="{{disablePlus}}" disable-minus="{{disableMinus}}" long-press="{{longPress}}" always-embed="{{alwaysEmbed}}" bind:plus="bindPlus" bind:minus="bindMinus" bind:focus="onFocus" bind:blur="onBlur" bind:change="changeStep"></van-stepper>
+
+    <!-- <van-stepper :show-plus="false"
+    value="{{dataValue}}"
+    input-width="{{inputWidth}}" async-change="{{asyncChange}}" button-size="{{buttonSize}}"  min="{{min}}" max="{{max}}" step="{{step}}" disabled="{{disabled}}" disableInput="{{disableInput}}" integer="{{integer}}" show-minus="{{showMinus}}" decimal-length="{{decimalLength}}" theme="{{theme}}" disable-plus="{{disablePlus}}" disable-minus="{{disableMinus}}" long-press="{{longPress}}" always-embed="{{alwaysEmbed}}" bind:plus="bindPlus" bind:minus="bindMinus" bind:focus="onFocus" bind:blur="onBlur" bind:change="changeStep"></van-stepper> -->
   </view>
 </view>

+ 1 - 0
components/dkbase/dk-stepper/dk-stepper.wxss

@@ -19,4 +19,5 @@
   text-align: center;
   z-index: 100;
   background-color: #ffffff;
+  columns: #1b365d;
 }

+ 6 - 4
components/dkbase/dk-title/dk-title.wxml

@@ -1,4 +1,6 @@
-<dk-tag padding="0 8rpx" class="vanTag" wx:if="{{titleTag && titleTag.length > 0}}" fontSize="{{fontSize + 'px'}}" style="position: absolute;" value="{{titleTag}}"></dk-tag>
-<view class="title_class" style="--indent--:{{(indent && indent!= 0)?(indent + 'rpx'):((titleTag.length * fontSize + 2 + 12 ) * 2 + 'rpx') }};--height--:{{title.length == 0?'50rpx':'auto'}};color:#1B365D;  font-weight:bold; --titleFontSize--:{{titleFontSize}} ">
-  {{title}}
-</view> 
+<view style="display: flex;">
+  <dk-tag padding="0 8rpx" class="vanTag" wx:if="{{titleTag && titleTag.length > 0}}" fontSize="{{fontSize + 'px'}}" value="{{titleTag}}"></dk-tag>
+  <view class="title_class" style="--indent--:{{(indent && indent!= 0)?(indent + 'rpx'):((titleTag.length * fontSize + 2 + 12 ) * 2 + 'rpx') }};--height--:{{title.length == 0?'50rpx':'auto'}};color:#1B365D; margin-left: 8rpx;  font-weight:bold; --titleFontSize--:{{titleFontSize}} ">
+    {{title}}
+  </view>
+</view>

+ 1 - 1
components/dkbase/dk-title/dk-title.wxss

@@ -2,7 +2,7 @@
 *默认样式
 */
 .title_class{
-  text-indent:var(--indent--);
+  /* text-indent:var(--indent--); */
   height: var(--height--);
   font-size: var(--titleFontSize--);
   padding-top: 5rpx;

+ 53 - 23
package-base-select/pages/select-collection_confirm/select-collection_confirm.js

@@ -34,16 +34,9 @@ Page({
     otherPayableService: app.globalData['otherPayableService'],
     saleOutBoundReturnService: app.globalData['saleOutBoundReturnService'],
     saleOutBoundService: app.globalData['saleOutBoundService'],
-
-  },
-
-  /**
-   * @desc : 设置查询参数
-   * @date : 2024年3月8日
-   * @author : 姜永辉
-   */
-  setSearchParams(params) {
-    return params;
+    negative: false, // 是否进行负数处理
+    min: null,       // 输入的最小值
+    max: null,       // 输入的最大值
   },
 
   /** 
@@ -54,9 +47,47 @@ Page({
   getData(params) {
     return this.excute(this.data.moneyAccountService, this.data.moneyAccountService.selectByCond, params);
   },
-
   /**
-   * @desc :   处理接口返回数据
+   * @desc : 控制输入负数处理,输入的最大值最小值
+   * @date : 2024年6月4日
+   * @author : 周兴
+   */
+  handleInput() {
+    let formType = this.data.formType
+    // formType :1 收款单 ,2 付款单,3 客户收款保存参数,4 客户退款 5 退收款单 6 退付款单  7 其他收入单
+    // 8:订单开单收款  9:其他支出 10:销售退货 >>> 客户退款 11:销售出库>>> 客户收款 
+    switch (formType) {
+      // 只能为正
+      case 1:
+      case 2:
+      case 3:
+      case 8:
+      case 11:
+        this.setData({
+          min: 0
+        })
+        break;
+      // 只能为负
+      case 4:
+      case 5:
+      case 6:
+      case 10:
+        this.setData({
+          negative: true,
+          min: -99999999
+        })
+        break
+      // 7、9 可正可负
+      case 7:
+      case 9:
+        this.setData({
+          min: -99999999
+        })
+    }
+    console.log('ffdd', this.negative, this.data.min);
+  },
+  /**
+   * @desc :  处理接口返回数据
    * @date : 2024年3月8日
    * @author : 姜永辉
    */
@@ -85,6 +116,8 @@ Page({
         form: this.data.params
       })
     }
+    // 控制输入
+    this.handleInput();
   },
 
 
@@ -156,9 +189,6 @@ Page({
     return retList
 
   },
-  loadInit(){
-    console.log('tttt',this.data.params);
-  },
   /**
    * @desc : 将优惠和本次核销的金额分摊到应付单据的明细里
    * @date : 2024/2/1 15:49
@@ -279,7 +309,7 @@ Page({
       })
 
     } else if (this.data.formType == 3) {
-    
+
       if (form.editFlag) {
         tableData.forEach(res => {
           res.amtRec = res.sumAmount
@@ -296,8 +326,8 @@ Page({
           })
         })
       }
-     //客户收款保存参数
-      params.sumAmtRec = Number(itemList.sum('amtRec')) 
+      //客户收款保存参数
+      params.sumAmtRec = Number(itemList.sum('amtRec'))
       params.accDate = params.accDate ? params.accDate : utils.formatDayTime(new Date())
       // 240521 最佳客户信息
       params.cusName = form.objInfo.cusName
@@ -449,7 +479,7 @@ Page({
       params.annexPaths = formData.annexPaths || [] //附件 
       params.remarks = formData.remarks // 备注
       params.makeStaff = app.globalData.user.staffId // 制单人 
-      params.salesChannel = formData.channelId 
+      params.salesChannel = formData.channelId
       let itemNumber = 0
       formData.itemList.forEach(element => {
         if (!isNaN(element.amtPayable)) { //是数字才能加减
@@ -638,7 +668,7 @@ Page({
         formData: true
       })
     } else if (this.data.formType == 11) { //出库收款
-      setTimeout(() => { 
+      setTimeout(() => {
         // 给父页面传递数据
         const eventChannel = this.getOpenerEventChannel();
         eventChannel.emit('refresh', {})
@@ -657,9 +687,9 @@ Page({
     wx.previewImage({
       urls: imgs,
       current: e.currentTarget.dataset.imgurl, //当前图片地址
-      success: function (res) {},
-      fail: function (res) {},
-      complete: function (res) {},
+      success: function (res) { },
+      fail: function (res) { },
+      complete: function (res) { },
     })
   },
 

+ 2 - 2
package-base-select/pages/select-collection_confirm/select-collection_confirm.wxml

@@ -57,7 +57,7 @@
           </view>
       
           <view wx:if="{{item.checked && settlementTypeListLength > 1 }}" style="text-align:left;">
-            <dk-number-input negative="{{form.sumTempAmount < 0 ?true:false}}" signSize="11px" center="left" fontSize="15" inputColor="#CAA977;" fontWeight="500" negative="{{form.sumAmount < 0}}" data-key="priceSale" inputValue="{{item.sumAmount ? item.sumAmount : 0}}" data-value="{{item.sumAmount}}" data-index="{{index}}" bind:triggerBindValue="sumAmountBindValue" bind:triggerBindBlur="sumAmountBlurValue"></dk-number-input>
+            <dk-number-input signSize="11px" center="left" fontSize="15" inputColor="#CAA977;" fontWeight="500" negative="{{negative}}" min="{{min}}" data-key="priceSale" inputValue="{{item.sumAmount ? item.sumAmount : 0}}" data-value="{{item.sumAmount}}" data-index="{{index}}" bind:triggerBindValue="sumAmountBindValue" bind:triggerBindBlur="sumAmountBlurValue"></dk-number-input>
           </view>
         </view>
         <view class="image-code" wx:if="{{item.checked && item.macReceiptCode }}" style="margin-top: 32rpx;margin-right: 40rpx;margin-bottom: 26rpx;border: 1rpx solid #000000;border-radius: 15rpx;">
@@ -80,7 +80,7 @@
     </view>
     <view style="padding-top: 10rpx; text-align:center;">
 
-      <dk-number-input readonly="{{settlementTypeListLength > 1}}" negative="{{form.sumAmount < 0 ?true:false}}" signSize="15px" fontSize="27" color fontWeight="600" data-key="priceSale" inputValue="{{form.sumAmount}}" data-value="{{form.sumAmount}}" bind:triggerBindValue="changeSalesPriceField" ></dk-number-input>
+      <dk-number-input readonly="{{settlementTypeListLength > 1}}" negative="{{negative}}" min="{{min}}" signSize="15px" fontSize="27" color fontWeight="600" data-key="priceSale" inputValue="{{form.sumAmount}}" data-value="{{form.sumAmount}}" bind:triggerBindValue="changeSalesPriceField" ></dk-number-input>
     </view>
 
     <view style="z-index: 12;margin-top:40rpx;box-shadow: 0px 4rpx 16rpx rgba(190, 144, 73, 0.5);border-radius: 15rpx;">

+ 43 - 73
package-base-select/pages/select-goods/select-goods.js

@@ -38,38 +38,7 @@ Page({
     }],
     brandId: null,
     active: 0,
-    popContent: [{
-      code: 'itemQty',
-      type: 'negativeStep',
-      title: '数量',
-      required: true
-    },
-    {
-      code: 'whId',
-      name: 'whName',
-      title: '仓库',
-      type: 'choose',
-      urlKey: 'chooseWh'
-    },
-    {
-      code: 'skuSpec',
-      title: '规格',
-      type: 'str',
-      readonly: true,
-      dropType: ''
-    },
-    {
-      code: 'brandName',
-      title: mixins.$t('brandName'),
-      type: 'str',
-      readonly: true,
-    },
-    {
-      code: 'nonStdCode',
-      title: '色号',
-      type: 'str',
-    },
-    ],
+    popContent: [],
     popContentBox: [],
     popupTopObj: [{
       leftTitle: '库存量',
@@ -325,44 +294,45 @@ Page({
             quantity: 0
           }
         ],
-        popContent: [{
-          code: 'itemQty',
-          type: 'step',
-          title: mixins.$t("count"),
-          required: true
-        },
-        {
-          code: 'packageBox',
-          type: 'packageBox',
-          title: mixins.$t("packageBox"),
-        },
-        {
-          code: 'priceOut',
-          type: 'number',
-          title: mixins.$t("priceSale"),
-          required: true,
-          readonly: false,
-          center: 'right'
-        },
-        {
-          code: 'whId',
-          name: 'whName',
-          choosePopupType: '',
-          title: mixins.$t("warehouseId"),
-          type: 'choose',
-          urlKey: 'openingInventory',
-        },
-        {
-          code: 'brandName',
-          title: mixins.$t('brandName'),
-          type: 'str',
-          readonly: true,
-        },
-        {
-          code: 'nonStdCode',
-          title: mixins.$t("goodsBatch"),
-          type: 'str',
-        },
+        popContent: [
+          {
+            code: 'itemQty',
+            type: 'step',
+            title: mixins.$t("count"),
+            required: true
+          },
+          {
+            code: 'packageBox',
+            type: 'packageBox',
+            title: mixins.$t("packageBox"),
+          },
+          {
+            code: 'priceOut',
+            type: 'number',
+            title: mixins.$t("priceSale"),
+            required: true,
+            readonly: false,
+            center: 'right'
+          },
+          {
+            code: 'whId',
+            name: 'whName',
+            choosePopupType: '',
+            title: mixins.$t("warehouseId"),
+            type: 'choose',
+            urlKey: 'openingInventory',
+          },
+          {
+            code: 'brandName',
+            title: mixins.$t('brandName'),
+            type: 'str',
+            readonly: true,
+          },
+          {
+            code: 'nonStdCode',
+            title: mixins.$t("goodsBatch"),
+            type: 'str',
+          },
         ]
       })
     }
@@ -398,10 +368,10 @@ Page({
         },
         {
           code: 'brandName',
-          title: mixins.$t('brandName'), 
+          title: mixins.$t('brandName'),
           type: 'str',
-          readonly:true,
-      },
+          readonly: true,
+        },
         {
           code: 'nonStdCode',
           title: mixins.$t("goodsBatch"),

+ 1 - 1
package-basic-data/pages/customer-list/add/add.js

@@ -91,7 +91,7 @@ Page({
       center = center.filter(it=>it.code != 'startAmount' && it.code != 'macId')
       // 初始款项-欠款
       if (data.id == Constants.initialPayType.debt) {
-        center.push({ code: 'startAmount', type: 'number', required: true, title: mixins.$t('initialDebtOwed') })
+        center.push({ code: 'startAmount', type: 'number', required: true, min:Constants.MIN_VALUE, title: mixins.$t('initialDebtOwed') })
       } else if (data.id == Constants.initialPayType.payment) {
         // 初始款项-预收
         center.push({ code: 'startAmount', type: 'number', required: true, title: mixins.$t('initialPayment') })

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

@@ -27,7 +27,7 @@ Page({
         { code: 'accDate', name: 'accDate', type: 'date', required: true, },
         { code: 'staffId', name: 'staffName', required: true, title: mixins.$t("staffId"), type: 'choose', urlKey: 'chooseStaff' },
         { code: 'orgId', name: 'orgName', required: true, type: 'choose', urlKey: 'chooseOrg' },
-        { code: 'sumAmtRec', type: 'number', negative: true, maxFlag: false, title: mixins.$t("thisRefund"), readonly: false },
+        { code: 'sumAmtRec', type: 'number', negative: true,min:Constants.MIN_VALUE, maxFlag: false, title: mixins.$t("thisRefund"), readonly: false },
         { code: 'remarks', type: 'textarea', title: mixins.$t("remarks"), readonly: false },
         { code: 'file', type: 'uploader', title: mixins.$t("uploader") }
       ],

+ 3 - 2
package-sales/pages/order-return/add/add.js

@@ -237,6 +237,7 @@ Page({
       })
       res.sumPrice = res.priceOut * res.itemQty
     })
+    console.log('eree',formData);
     //批量查库存
     this.getInventory({
       skuIdNonStdCodeWhIdList: list
@@ -836,7 +837,7 @@ Page({
       ]
       popContent = [{
           code: 'outingQty',
-          type: 'step',
+          type: 'negativeStep',
           title: mixins.$t("count"),
           required: true,
           readonly: true
@@ -1088,7 +1089,7 @@ Page({
         this.setData({
           popContent: [{
               code: 'outingQty',
-              type: 'step',
+              type: 'negativeStep',
               title: mixins.$t("count"),
               required: true
             },

BIN
static/image/btn-minus-d.png


BIN
static/image/btn-minus.png


BIN
static/image/btn-plus-d.png


BIN
static/image/btn-plus.png


+ 4 - 0
utils/Constants.js

@@ -8,6 +8,10 @@ module.exports = {
   MAX_PAGE_SIZE: 100000,
   // 成功的code
   SUCESS_CODE: 200,
+  // 最小值
+  MIN_VALUE:-10000000,
+  // 最大值
+  MAX_VALUE:10000000,
   // 默认语言
   lan: 'zh_CN',
   // 企业到期提醒时间