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

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

@@ -2437,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
@@ -2453,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,
@@ -2468,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
@@ -2480,6 +2492,11 @@ Component({
                 form: form,
                 value: JSON.stringify(form)
               })
+              // 如果是最后一条
+              if (index == file.length - 1) {
+                _this.triggerEvent("uploadSucess", {
+                })
+              }
             }
           },
         })

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

@@ -256,9 +256,9 @@
             </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> -->

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">

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

@@ -214,7 +214,7 @@ const home = {
   currentWeek: '本周',
   currentMonth: '本月',
   transactionAmount: '成交额',
-  collectionAmount: '收款额',
+  collectionAmount: '收支额',
   registerCommany: '注册商户',
   updateCommanyOwner: '权限转让',
   settingCommany: '商户设置',

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();
@@ -1185,6 +1215,7 @@ module.exports = {
             other: data.item ? (data.item.button ? data.item.button.other : null) : "",
             formMode: data.formMode,
             menuUuid: data.menuUuid,
+            objectCode: data.objectCode,
             guideUrl: data.guideUrl
           })
         }

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

@@ -63,7 +63,7 @@ Page({
     // 新加的数据
     addItem: null,
     // 其他查询条件
-    otherSearchParam:null,
+    otherSearchParam: null,
   },
   /**
    * @desc : 调到新建
@@ -90,6 +90,17 @@ Page({
         }
       })
     } else if (this.data.popContent && this.data.popContent.length > 0) {
+      let popContent = this.data.popContent
+      popContent.forEach(it => {
+        if (it.code == 'decimalPlaces') {
+          let formData = this.data.formData ? JSON.parse(this.data.formData) : {
+            decimalPlaces: 1
+          }
+          this.setData({
+            formData: JSON.stringify(formData)
+          })
+        }
+      })
       this.setData({
         showPop: true
       })
@@ -365,8 +376,8 @@ Page({
     if (this.data.kindType) {
       params.kindType = this.data.kindType
     }
-    if(this.data.otherSearchParam){
-      Object.assign(params,this.data.otherSearchParam)
+    if (this.data.otherSearchParam) {
+      Object.assign(params, this.data.otherSearchParam)
     }
     let chooseType = this.data.chooseRoute.type;
     // 供应商
@@ -589,6 +600,8 @@ Page({
     let title;
     // 读取传入的单据类型
     let chooseType = route.type
+    // 
+    let dataItemData = {}
     switch (chooseType) {
       // 角色
       case Constants.chooseType.role:
@@ -747,8 +760,7 @@ Page({
         break;
       // 仓库
       case Constants.chooseType.warehouse:
-        title = "仓库"
-        let dataItemData = {}
+        title = "仓库"        
         dataItemData['supervisor'] = app.globalData.user.staffName
         dataItemData['contactPhone'] = app.globalData.user.userPhone
 
@@ -892,7 +904,8 @@ Page({
         break;
       // 计量单位 刘尧 2024.05.29
       case Constants.chooseType.unit:
-        title = "单位"
+        title = "单位"        
+        dataItemData['decimalPlaces'] = 0
         this.setData({
           routeObjName: 'common',
           routeObjNamePop: 'unit',
@@ -909,9 +922,11 @@ Page({
           placeholder: ['unitName'],
           popContent: [
             { code: 'unitName', type: 'str', title: mixins.$t('unitName'), required: true },
-            { code: 'decimalPlaces', max: 6, type: 'number', sign: "", digits: 0, title: mixins.$t('decimalPlaces'), required: true, formatThousandth: false },
+            { code: 'decimalPlaces', max: 6, type: 'number', sign: "", digits: 0, title: mixins.$t('decimalPlaces'), required: true, formatThousandth: false, content: 0 },
             { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
-          ]
+          ],
+          //设置小数位数
+          dataItem: JSON.stringify(dataItemData)
         })
         break;
       // 数据字典
@@ -956,7 +971,7 @@ Page({
       case Constants.chooseType.kindData:
         title = "系统数据"
         this.setData({
-          pageFlag:false,
+          pageFlag: false,
           routeObjName: 'common',
           method: 'getDataKind',
           kindType: route.kindType,
@@ -978,13 +993,13 @@ Page({
         break;
       // 对象类型
       case Constants.chooseType.objectType:
-        
+
         this.setData({
-          title:'objName',
+          title: 'objName',
           routeObjName: 'common',
           method: 'getSupplierAndCustomerData',
         })
-        if(!route.objectType){
+        if (!route.objectType) {
           title = "对象类型"
           this.setData({
             contentList: [{
@@ -1017,12 +1032,12 @@ Page({
                 title: '客户',
                 value: 2
               }]
-            } ],
+            }],
             placeholder: ['customerName', 'supplierName', 'address', 'telephone']
           })
-        }else{
+        } else {
           // 客户
-          if(route.objectType == 'customer'){
+          if (route.objectType == 'customer') {
             title = "客户"
             this.setData({
               contentList: [{
@@ -1033,10 +1048,10 @@ Page({
                 name: 'addressFull',
                 title: '客户地址'
               }],
-              placeholder: ['customerName','address', 'telephone'],
-              otherSearchParam:{'supplier-customerList': "2"}
+              placeholder: ['customerName', 'address', 'telephone'],
+              otherSearchParam: { 'supplier-customerList': "2" }
             })
-          }else{
+          } else {
             // 供应商
             title = "供应商"
             this.setData({
@@ -1048,8 +1063,8 @@ Page({
                 name: 'addressFull',
                 title: '供应商地址'
               }],
-              placeholder: ['supplierName','address', 'telephone'],
-              otherSearchParam:{'supplier-customerList': "1"}
+              placeholder: ['supplierName', 'address', 'telephone'],
+              otherSearchParam: { 'supplier-customerList': "1" }
             })
           }
         }

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({
@@ -855,7 +858,7 @@ Page({
     let item = e.currentTarget.dataset.item
     item.itemQty = 1 //打开 popur 数量默认为1
     // item.nonStdCode = "-" //不要在这赋值色号 想赋值去查询回来处理的方法去赋值
-    if (this.data.item == Constants.billType.saleOut || this.data.item == Constants.billType.saleOutReturn) { //跟进仓库批次号cpid 查询库存
+    if (this.data.item == Constants.billType.saleOut || this.data.item == Constants.billType.saleOutReturn || this.data.item == Constants.billType.out) { //跟进仓库批次号cpid 查询库存
       console.log('globalData', app.globalData)
       item.nonStdCode = item.nonStdCode ? item.nonStdCode : '-'
       item.priceOut = item.priceStandard

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

@@ -226,7 +226,7 @@
                   <view style="display: flex;background-color:white;">
                     <view class="number-out-order">
                       <view class="order-summary">
-                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#FF7B1A" fontWeight="600" title="" content="{{item.sumAmount}}"></dk-cell>
+                        <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="17" contentColor="#FF7B1A" fontWeight="600" title="" content="{{item.factAmt}}"></dk-cell>
                       </view>
                       <view class="out-oreder-detail">
                         成交金额

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

@@ -17,6 +17,7 @@ Page({
    */
   data: {
     cardList: ['main', 'oauth', 'remarks'],
+    hrStatus: false,
     // 底部保存按钮
     buttonFootList: [{
       name: 'save',
@@ -88,7 +89,7 @@ Page({
   setParams(params) {
     let formData = JSON.parse(this.data.formData)
     params.roleIds = (params.roleIds && params.roleIds.length > 0) ? params.roleIds.split(',') : []
-    if(this.data.gradeCode != Constants.gradeCode.PRO){
+    if (this.data.gradeCode != Constants.gradeCode.PRO) {
       params.roleIds = [app.globalData.user.roleIds[0]]
       console.log('roleName', app.globalData.user);
     }
@@ -126,24 +127,24 @@ Page({
     }
   },
 
-    /**
-   * @desc : 处理保存后续事件
-   * @date : 2024/6/17 15:49
-   * @author : 于继渤
-   */
+  /**
+ * @desc : 处理保存后续事件
+ * @date : 2024/6/17 15:49
+ * @author : 于继渤
+ */
   handleSaveData() {
-   //新手引导过来,需要返回
-   if (this.data.formReturnMode == Constants.formReturnMode.beginnerGuide) {
-    const eventChannel = this.getOpenerEventChannel();
-    eventChannel.emit('refresh', {
-      id: 1
-    })
-    setTimeout(() => {
-      wx.navigateBack({
-        delta: 1
-      });
-    }, 200)
-  }
+    //新手引导过来,需要返回
+    if (this.data.formReturnMode == Constants.formReturnMode.beginnerGuide) {
+      const eventChannel = this.getOpenerEventChannel();
+      eventChannel.emit('refresh', {
+        id: 1
+      })
+      setTimeout(() => {
+        wx.navigateBack({
+          delta: 1
+        });
+      }, 200)
+    }
   },
   /**
    * @desc : 给表单赋值
@@ -175,6 +176,7 @@ Page({
     }
 
     this.setData({
+      hrStatus: data.hrStatus == 2 ? true : false,
       formData: JSON.stringify(data)
     })
   },
@@ -217,7 +219,7 @@ Page({
         [
           { code: 'flgCanLogin', type: 'switch', title: mixins.$t('flgCanLogin') },
         ]
-        //标准版-新建选择部门页面隐藏新建
+      //标准版-新建选择部门页面隐藏新建
       if (this.data.formMode == Constants.formMode.edit) { } else {
         let formData = {}
         formData.orgId = app.globalData.user.orgId

package-basic-data/pages/staff/add/add.wxml

@@ -11,7 +11,7 @@
 <dk-form id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
 </dk-form>
 <!--  保存 --> 
-<dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonFootList}}" contentList="{{contentnFootList}}" bind:open="save"></dk-save-button>
+<dk-save-button wx:if="{{!hrStatus}}" model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonFootList}}" contentList="{{contentnFootList}}" bind:open="save"></dk-save-button>
 <!-- <view class="bottom-class">
   <van-button custom-class="save-button-class" disabled="{{loading}}" loading="{{loading}}" bind:click="save" type="default">{{$t['save']}}
   </van-button>

package-business-analysis/pages/detail-report/detail-report.js

@@ -211,7 +211,7 @@ Page({
                 left: { name: 'skuName', },
               },
               {
-                left: { name: 'outAmt', type: 'price' },
+                left: { name: 'factAmt', type: 'price' },
                 right: { name: 'outQtyPiece', type: 'qty' }
               },
               {
@@ -233,7 +233,7 @@ Page({
                 left: { name: 'skuName', },
               },
               {
-                left: { name: 'outingAmt', type: 'price' },
+                left: { name: 'factAmt', type: 'price' },
                 right: { name: 'outingQtyPiece', type: 'qty' }
               },
               {

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/other-outbound/other-outbound.wxml

@@ -3,7 +3,7 @@
 
 <loading wx:if="{{loading}}" ></loading>
 
-<dk-form-bill type="out" id="{{formName}}"routeObjName="{{routeObjName}}" cardList="{{cardList}}"   titleCol="skuCode" descCol="skuModel" priceCol="pricePur" quantityCol="{{quantityCol}}" sumAmountCol="itemAmt" sumQuantityCol="{{sumQuantityCol}}"  contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods"  table="{{table}}"
+<dk-form-bill type="out" id="{{formName}}"routeObjName="{{routeObjName}}" cardList="{{cardList}}"   titleCol="skuCode" descCol="skuModel" priceCol="pricePur" quantityCol="{{quantityCol}}"   sumQuantityCol="{{sumQuantityCol}}"  contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods"  table="{{table}}"
 bind:delItem="setGoods" bind:setGoods="setGoods"
 cardContentList="{{cardContentList}}"
 quantityRedTitle="可售量："

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

@@ -16,6 +16,7 @@ Page({
    */
   data: {
     customerEfundFlag: false,
+    navigationBarTitle: '',
     primaryKey: 'rpId',
     // 查询条件
     searchContent: [{
@@ -83,7 +84,7 @@ Page({
      */
   setSearchParams(params) {
     params.objectId = this.data.id ? this.data.id : null
-    params.rpTypeList = params.rpTypeList ? params.rpTypeList : (this.data.menuUuid == Constants.CUSTOMER_EFUND_FUNCTIONCODE ? ['收付款类型-退收款'] : ['收付款类型-收款'])
+    params.rpTypeList = params.rpTypeList ? params.rpTypeList : (this.data.objectCode == Constants.CUSTOMER_EFUND_FUNCTIONCODE ? ['收付款类型-退收款'] : ['收付款类型-收款'])
     return params;
   },
   /**
@@ -159,25 +160,26 @@ Page({
       buttonList = [{
         name: 'printedBill',
         title: mixins.$t("printedBill")
-      }, ] //打印
-    } else {  
-    if (item.rpType == Constants.rpType.returnReceipt) {
-      buttonList=
-      [
-        { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
-        { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
-      ]
+      },] //打印
     } else {
-      buttonList =
-      [
-        {
-          name: 'cusReturnCollection',
-          title: mixins.$t("cusReturnCollection")
-        },
-        { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
-        { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
-      ]
-    }}
+      if (item.rpType == Constants.rpType.returnReceipt) {
+        buttonList =
+          [
+            { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
+            { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
+          ]
+      } else {
+        buttonList =
+          [
+            {
+              name: 'cusReturnCollection',
+              title: mixins.$t("cusReturnCollection")
+            },
+            { name: 'invalid', title: mixins.$t("invaidOrder") },//作废 
+            { name: 'printedBill', title: mixins.$t("printedBill") }, //打印
+          ]
+      }
+    }
     this.setData({
       // 弹出按钮
       buttonList: buttonList
@@ -189,12 +191,15 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 于继渤
    */
-  loadInit() {
+  loadInit() { 
     //客户退款
-    if (this.data.menuUuid == Constants.CUSTOMER_EFUND_FUNCTIONCODE) {
+    if (Constants.CUSTOMER_EFUND_FUNCTIONCODE == this.data.objectCode) {
       wx.setNavigationBarTitle({
         title: '客户退款'
       })
+      this.setData({
+        navigationBarTitle: '客户退款'
+      })
       let searchContent = this.data.searchContent
       searchContent[2].list[1]['checked'] = true
       searchContent[2].list[0]['checked'] = false
@@ -204,5 +209,10 @@ Page({
         customerEfundFlag: true //新建跳转类型标识
       })
     }
+    else{
+      this.setData({
+        navigationBarTitle: '客户收款'
+      })
+    }
   },
 })

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

@@ -3,7 +3,7 @@
 <loading wx:if="{{loading}}" loadingName="{{$t['loading']}}" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 <van-sticky scroll-top="0">
   <!-- 自定义导航 -->
-  <dk-navbar titleFontColor="#000000" navbarTitle="客户收款" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
+  <dk-navbar titleFontColor="#000000" navbarTitle="{{navigationBarTitle}}" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
   <!-- 查询条件 -->
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress','contractNumber'])}}">
   </dk-dropdown-menu>

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>

pages/index/index.js

@@ -272,7 +272,8 @@ Page({
         ImageUri: item.icon ? (this.data.imageUrl + item.icon + '.png') : '',
         PFunctionCode: item.parentUuid,
         isVip: item.isVip,
-        FunctionCode: item.menuUuid
+        FunctionCode: item.menuUuid,
+        objectCode: item.objectCode,
       }
       functionItems.push(pageitem)
     })
@@ -415,6 +416,7 @@ Page({
     let guideUrl = null;
     let menuList = app.globalData.menus
     let companyVip = app.globalData.company.vip
+    
     if(e.currentTarget.dataset.item.isVip){      
       if(companyVip){
         if (menuList && menuList.length > 0) {
@@ -423,11 +425,12 @@ Page({
             guideUrl = filters[0].guideUrl
           }
         }
+        
         // 调转页面
         wx.navigateTo({
           url: url,
           success: function (res) {
-            res.eventChannel.emit('params', { formMode: 'index', menuUuid: code, guideUrl: guideUrl })
+            res.eventChannel.emit('params', { formMode: 'index', menuUuid: code, guideUrl: guideUrl,objectCode:e.currentTarget.dataset.item.objectCode})
           }
         })
       }else{
@@ -447,7 +450,7 @@ Page({
       wx.navigateTo({
         url: url,
         success: function (res) {
-          res.eventChannel.emit('params', { formMode: 'index', menuUuid: code, guideUrl: guideUrl })
+          res.eventChannel.emit('params', { formMode: 'index', menuUuid: code, guideUrl: guideUrl,objectCode:e.currentTarget.dataset.item.objectCode })
         }
       })
     }

pages/mine/mine.js

@@ -152,6 +152,7 @@ Page({
     let params = {
       dateBegin: dateBegin,
       dateEnd: dateEnd,
+      staffId: app.globalData.user.staffId,
     }
     let service = app.globalData['commonService']
     api.request(service.prefix + service.getHomeOrderRecCost, 'POST', params).then(res => {

utils/Constants.js

@@ -524,7 +524,7 @@ module.exports = {
   }
   ],
   //菜单编码  客户退款
-  CUSTOMER_EFUND_FUNCTIONCODE: '2260c936-c469-404c-85ed-aa5046fc8684',
+  CUSTOMER_EFUND_FUNCTIONCODE: 'cus-refund',
 
   //销售订单相关API
   SALE_ORDER_API: "order-server/wxapi/sale/order/",