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

components/dkbase/dk-number-input/dk-number-input.wxml

@@ -20,7 +20,7 @@
   </view> -->
   <!--文本框-->
   <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="{{inputWidthFlag ? 'dk-cell-value-class-input' : 'dk-cell-value-class'}}" type="text" inputMode="decimal" bind:focus="bindFocus" bind:change="bindInput" bind:blur="bindBlur" >
+    <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--:{{fontWeight}};--height--:{{height}}" value="{{inputValue?inputValue:undefined}}" input-align="{{center}}" label="{{titleValue}}" placeholder="{{placeholder}}" autosize auto-focus clearable border="{{ false }}" input-class="{{inputWidthFlag ? 'dk-cell-value-class-input' : 'dk-cell-value-class'}}" type="text" inputMode="decimal" bind:focus="bindFocus" bind:change="bindInput" bind:blur="bindBlur" >
     </van-field>
   </view>
 </view>

components/dkbase/dk-number-input/dk-number-input.wxss

@@ -35,6 +35,7 @@
   padding-left:var(--left--) !important;
   width: var(--width--) !important;
   font-weight: var(--fontWeight--) !important;
+  height: var(--height--) !important;
 }
 
 .input_content-class{
@@ -48,12 +49,14 @@
   font-size:var(--fontSize--) !important;
   color:var(--inputColor--) !important;
   font-weight: var(--inputFontWeight--) !important;
+  height: var(--height--) !important;
 }
 .dk-cell-value-class-input{
   font-size:var(--fontSize--) !important;
   color:var(--inputColor--) !important;
   font-weight: var(--inputFontWeight--) !important;
   width: 110rpx !important;
+  height: var(--height--) !important;
 }
 .van-field__input--right {
   text-align: right !important;

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

@@ -58,8 +58,8 @@
         <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
       </van-field>
       <!--选单-->
-      <van-field wx:if="{{item.type=='choose'}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" data-readonly = "{{item.readonly}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
-        <van-icon wx:if="{{!item.readonly && form[item.name] && (item.clear || item.clear == undefined)}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
+      <van-field wx:if="{{item.type=='choose'}}" required="{{item.required?true:false }}" data-name="{{item.name}}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.name]}}" input-align="left" data-readonly = "{{!!readonly || item.readonly}}" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" is-link catchtap="open" autosize border="{{ false }}" readonly="{{true}}" label-class="{{(!!readonly || !!item.readonly)?'readonly-label':'nomal-label'}}" input-class="dk-cell-value-class" data-type='{{item.dropType}}' errorMessage="{{item.errMsg}}">
+        <van-icon wx:if="{{(!readonly ) && form[item.name] && (item.clear || item.clear == undefined)}}" slot="icon" name="clear" color="#c8c9cc;" data-item="{{item}}" data-name="{{item.name}}" data-key="{{item.code}}" catchtap="clearChoose"></van-icon>
         <van-icon wx:if="{{item.tip}}" slot="label-icon" name="question-o" data-item="{{item}}" catchtap="showTip" />
       </van-field>
       <!--选择框-->

package-accounts-manage/pages/daily-reconciliation-statement/daily-reconciliation-statement.js

@@ -18,14 +18,14 @@ Page({
     // 查询条件
     searchContent: [
       {
-        code: 'accDate', 
+        code: 'accDate',
         title: mixins.$t('pastThirthtyDays'),
-        defaultValue: 5, 
+        defaultValue: 5,
         searchType: Constants.searchType.date
       },
-      { 
-        code: 'mac', 
-        title: mixins.$t('settlement'),  
+      {
+        code: 'mac',
+        title: mixins.$t('settlement'),
         dropType: 'settlement'
       },
     ],
@@ -188,10 +188,89 @@ Page({
     * @date : 2024/7/12 15:21
     * @author : 刘尧
    */
-  toDetail(e){
-    if(this.data.freeVersionFlag){
-      console.log('toDetail', e);
-    }else{
+  toDetail(e) {
+    if (this.data.freeVersionFlag) {
+      // 免费版走下面
+      const data = e.currentTarget.dataset.item
+      let routeObjName = 'cusReceiptPayment'
+      if (data.cusName) {
+        const route = app.globalData['routeUrl'][routeObjName]
+        let customerEfundFlag = true //true 为退款
+        if (data.amtRes > 0) {
+          customerEfundFlag = false
+        } else if (data.amtRes < 0) {
+          customerEfundFlag = true //true 为退款
+        }
+        let url = route.detail.url
+        if (customerEfundFlag) {
+          url = route.editRefundDetail.url
+        }
+        let _this = this;
+        wx.navigateTo({
+          url: url,
+          events: {
+            // 保存成功后刷新页面
+            refresh: function (data) {
+              // 刷新一览界面
+              _this.searchData();
+            }
+          },
+          success: function (res) {
+            let params = {
+              id: data.rpId,
+              formMode: Constants.formMode.other
+            }
+            res.eventChannel.emit('params', params);
+          }
+        })
+      }
+      if (data.supName) {
+        routeObjName = 'supReceiptPayment'
+        const route = app.globalData['routeUrl'][routeObjName]
+        if (data.amtRes > 0) {
+          let _this = this;
+          let url = route.detail.url
+          wx.navigateTo({
+            url: url,
+            events: {
+              // 保存成功后刷新页面
+              refresh: function (data) {
+                // 刷新一览界面
+                _this.searchData();
+              }
+            },
+            success: function (res) {
+              let params = {
+                id: data.rpId,
+                formMode: Constants.formMode.other
+              }
+              res.eventChannel.emit('params', params);
+            }
+          })
+        } else if (data.amtRes < 0) {
+          let _this = this;
+          let url = route.detailRefund.url
+          wx.navigateTo({
+            url: url,
+            events: {
+              // 保存成功后刷新页面
+              refresh: function (data) {
+                // 刷新一览界面
+                _this.searchData();
+              }
+            },
+            success: function (res) {
+              let params = {
+                id: data.rpId,
+                formMode: Constants.formMode.other
+              }
+              res.eventChannel.emit('params', params);
+            }
+          })
+        }
+      }
+    } else {
+      // 专业版走这里
       if (e) {
         let item = null;
         if (e.currentTarget.dataset.item) {
@@ -215,5 +294,5 @@ Page({
       this.open(e);
     }
   }
- 
+
 })

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

@@ -153,6 +153,7 @@ Page({
       url = this.data.route.editRefundDetail.url
     }
     let _this = this;
+    console.log('url', url);
     wx.navigateTo({
       url: url,
       events: {

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

@@ -246,7 +246,7 @@ Page({
             //处理库存量
             this.calculationSalesUsableQty()
           })
-        }else{
+        } else {
           this.setData({
             formData: JSON.stringify(formData),
           })
@@ -536,7 +536,7 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 于继渤
    */
-  setParams(params) { 
+  setParams(params) {
     let itemIndex = 0
     let formData = JSON.parse(this.data.formData)
     params.fromId = params.orderId
@@ -553,7 +553,7 @@ Page({
       res['supId'] = res.supId ? res.supId : null
       res['fromId'] = res.fromId ? res.fromId : res.sOutId
       res['fromItemId'] = res.fromItemId ? res.fromItemId : res.sOutItemId
-    //  res.outQty = res.outingQty 
+      //  res.outQty = res.outingQty 
       res.factPrice = res.priceOut
       res.factAmt = res.outingAmt
       res.costAmt = Number(res.outingQty * res.costPrice)
@@ -601,13 +601,13 @@ Page({
     console.log('params', params)
     return params
   },
-    /**
-   * @desc : 数值转出负值
-   * @date : 2024/2/1 15:49
-   * @author : 王英杰
-   */
-  convertToNegative(number){ 
-     return Math.abs(number)*-1
+  /**
+ * @desc : 数值转出负值
+ * @date : 2024/2/1 15:49
+ * @author : 王英杰
+ */
+  convertToNegative(number) {
+    return Math.abs(number) * -1
   },
   /**
    * @desc : 保存数据服务
@@ -631,7 +631,7 @@ Page({
     if (this.data.formMode == Constants.formMode.detail) { //办理
       return this.excute(this.data.service, this.data.service.saleReturnHandleOutbound, this.data.params);
     }
-    
+
   },
   /**
    * @desc : 处理保存后的数据
@@ -1457,60 +1457,107 @@ Page({
         title: '编辑销售退货'
       })
       let contentObj = this.data.contentObj
-      contentObj.main = [{
-        code: 'cusName',
-        type: 'selectIcon',
-        urlKey: 'selectCustomers',
-        required: true,
-        readonly: this.data.formType =='edit'?true:false,
-        readonlyItem: this.data.formType =='edit'?true:false, 
-        title: mixins.$t('customerName')
-      },
-      {
-        code: 'cusPhone',
-        type: 'phone',
-        title: mixins.$t('cusPhone'),
-        readonly: this.data.formType =='edit'?true:false,
-        readonlyItem: this.data.formType =='edit'?true:false, 
-        required: true
-      },
-      {
-        code: 'addressFull',
-        type: 'address',
-        title: mixins.$t('addressFull'),
-        required: true,
-        readonly: this.data.formType =='edit'?true:false,
-        readonlyItem: this.data.formType =='edit'?true:false, 
-      },
-      {
-        code: 'addressNo',
-        type: 'str',
-        required: true,
-        title: mixins.$t('addressNo'),
-        readonly: this.data.formType =='edit'?true:false,
-        readonlyItem: this.data.formType =='edit'?true:false, 
-      },
-      {
-        code: 'channelId',
-        name: 'channelName',
-        type: 'drop',
-        required: true,
-        dropType: 'saleChannel',
-        title: mixins.$t('saleChannel'),  
-        readonly: this.data.formType =='edit'?true:false,
-        readonlyItem: this.data.formType =='edit'?true:false, 
-      },
-      {
-        code: 'cusFrom',
-        name: 'cusFromName',
-        type: 'drop',
-        required: false,
-        dropType: 'customerFrom',
-        title: mixins.$t('customerSource'),
-        readonly: this.data.formType =='edit'?true:false,
-        readonlyItem: this.data.formType =='edit'?true:false, 
-      },
-      ]
+      if (this.data.gradeCode == Constants.gradeCode.STD) {
+        contentObj.main = [{
+          code: 'cusName',
+          type: 'selectIcon',
+          urlKey: 'selectCustomers',
+          required: true,
+          readonly: this.data.formType == 'edit' ? true : false,
+          readonlyItem: this.data.formType == 'edit' ? true : false,
+          title: mixins.$t('customerName')
+        },
+        {
+          code: 'cusPhone',
+          type: 'phone',
+          title: mixins.$t('cusPhone'),
+          readonly: this.data.formType == 'edit' ? true : false,
+          readonlyItem: this.data.formType == 'edit' ? true : false,
+          required: true
+        },
+        {
+          code: 'addressFull',
+          type: 'address',
+          title: mixins.$t('addressFull'),
+          required: true,
+          readonly: this.data.formType == 'edit' ? true : false,
+          readonlyItem: this.data.formType == 'edit' ? true : false,
+        },
+        {
+          code: 'addressNo',
+          type: 'str',
+          required: true,
+          title: mixins.$t('addressNo'),
+          readonly: this.data.formType == 'edit' ? true : false,
+          readonlyItem: this.data.formType == 'edit' ? true : false,
+        },
+        {
+          code: 'channelId',
+          name: 'channelName',
+          type: 'drop',
+          required: true,
+          dropType: 'saleChannel',
+          title: mixins.$t('saleChannel'),
+          readonly: this.data.formType == 'edit' ? true : false,
+          readonlyItem: this.data.formType == 'edit' ? true : false,
+        },
+        ]
+      } else {
+        contentObj.main = [{
+          code: 'cusName',
+          type: 'selectIcon',
+          urlKey: 'selectCustomers',
+          required: true,
+          readonly: this.data.formType == 'edit' ? true : false,
+          readonlyItem: this.data.formType == 'edit' ? true : false,
+          title: mixins.$t('customerName')
+        },
+        {
+          code: 'cusPhone',
+          type: 'phone',
+          title: mixins.$t('cusPhone'),
+          readonly: this.data.formType == 'edit' ? true : false,
+          readonlyItem: this.data.formType == 'edit' ? true : false,
+          required: true
+        },
+        {
+          code: 'addressFull',
+          type: 'address',
+          title: mixins.$t('addressFull'),
+          required: true,
+          readonly: this.data.formType == 'edit' ? true : false,
+          readonlyItem: this.data.formType == 'edit' ? true : false,
+        },
+        {
+          code: 'addressNo',
+          type: 'str',
+          required: true,
+          title: mixins.$t('addressNo'),
+          readonly: this.data.formType == 'edit' ? true : false,
+          readonlyItem: this.data.formType == 'edit' ? true : false,
+        },
+        {
+          code: 'channelId',
+          name: 'channelName',
+          type: 'drop',
+          required: true,
+          dropType: 'saleChannel',
+          title: mixins.$t('saleChannel'),
+          readonly: this.data.formType == 'edit' ? true : false,
+          readonlyItem: this.data.formType == 'edit' ? true : false,
+        },
+        {
+          code: 'cusFrom',
+          name: 'cusFromName',
+          type: 'drop',
+          required: false,
+          dropType: 'customerFrom',
+          title: mixins.$t('customerSource'),
+          readonly: this.data.formType == 'edit' ? true : false,
+          readonlyItem: this.data.formType == 'edit' ? true : false,
+        },
+        ]
+      }
       this.setData({
         satffAndOrgReadonly: true,
         contentObj: contentObj,