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

app.wxss

@@ -608,6 +608,7 @@ end
 /**数量计数器 start**/
 .van-stepper__input{
   background: transparent !important;
+  width: 50% !important;
 }
 
 .van-stepper__plus{

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

@@ -171,7 +171,7 @@ Component({
     // 是否只读
     readonly: {
       type: Boolean,
-    }, 
+    },
     titpsFlag: { //商品右上角信息
       type: Boolean,
       value: false
@@ -284,7 +284,7 @@ Component({
       type: String,
       value: '合计金额'
     },
-    customerReadonly:{
+    customerReadonly: {
       type: Boolean,
       value: false
     },
@@ -599,15 +599,15 @@ Component({
       } else { //外协品走
         //  全-免费版-销售出库-新建、编辑、详情-外协品-抽屉不展示库存量、仓库字段 商品品牌 色号 
         popContent_sku = popContent_
-        let whId_index = popContent_.findIndex(element => element.code == 'whId');  
+        let whId_index = popContent_.findIndex(element => element.code == 'whId');
         if (whId_index !== -1) {
           // 找到了满足条件的元素，index 是它的索引   
           popContent_sku.splice(whId_index, 1)
-        }  
+        }
         let brandName_index = popContent_.findIndex(element => element.code == 'brandName');
         if (brandName_index !== -1) {
           popContent_sku.splice(brandName_index, 1)
-        } 
+        }
         let nonStdCode_index = popContent_.findIndex(element => element.code == 'nonStdCode');
         if (nonStdCode_index !== -1) {
           popContent_sku.splice(nonStdCode_index, 1)
@@ -729,8 +729,8 @@ Component({
         //如果设有做大值 判断  箱片的反算数量 大于 数量最大值
         if (dataItem["itemQty_max"] && itemQty > dataItem["itemQty_max"]) {
           //那就吧 把最大值的数量换算 箱片赋值箱片
-          dataItem['box'] = parseInt(Number(dataItem['itemQty']) %  Number(dataItem['packBox']))
-          dataItem['piece'] = Number(dataItem['itemQty']) %  Number(dataItem['packBox'])
+          dataItem['box'] = parseInt(Number(dataItem['itemQty']) % Number(dataItem['packBox']))
+          dataItem['piece'] = Number(dataItem['itemQty']) % Number(dataItem['packBox'])
           dataItem.packageBox = dataItem['box'] + dataItem.subUnitName + dataItem['piece'] + dataItem.unitName
           this.setData({
             dataItem: JSON.stringify(dataItem)
@@ -1260,13 +1260,13 @@ Component({
           },
           success: function (res) {
             // 通过eventChannel向被打开页面传送数据
-              res.eventChannel.emit('params', {
-                choose: true,
-                item: e.currentTarget.dataset.type ? e.currentTarget.dataset.type : _this.data.type,
-                noWarehouseFlag: !noWarehouseFlag ? '': noWarehouseFlag,
-                popContent: _this.data.popContent,
-                controlFlags: _this.data.controlFlags
-              })
+            res.eventChannel.emit('params', {
+              choose: true,
+              item: e.currentTarget.dataset.type ? e.currentTarget.dataset.type : _this.data.type,
+              noWarehouseFlag: !noWarehouseFlag ? '' : noWarehouseFlag,
+              popContent: _this.data.popContent,
+              controlFlags: _this.data.controlFlags
+            })
           }
         })
       }
@@ -1543,6 +1543,11 @@ Component({
         code: ds.key
       })
     },
+    setchooseVisible(isflag) {
+      this.setData({
+        chooseVisible: isflag
+      })
+    },
     /**
      * @desc   : 修改数值输入框的值
      * @author : 周兴
@@ -1860,15 +1865,15 @@ Component({
       }
       let form = this.data.form
       // 如果删除的是外部的
-      if(item.show == undefined || item.show){
+      if (item.show == undefined || item.show) {
         let goodsList = form[this.data.itemName]
-        let filters = goodsList.filter(it=>it.show == false);
+        let filters = goodsList.filter(it => it.show == false);
         // 需要把隐藏中的显示出来一条
-        if(filters && filters.length > 0){
+        if (filters && filters.length > 0) {
           filters[0].show = true;
         }
         this.setData({
-          form:form
+          form: form
         })
       }
 
@@ -2313,11 +2318,11 @@ Component({
           dataItem.factPrice = Number(dataItem.priceSale) * Number((Number(dataItem.discount) / 100)) //实际单价  = 销售单价*折扣 
           dataItem.factAmt = dataItem.factPrice * dataItem['itemQty'] //实际销售金额= 实际销售单价*数量
         }
-        if (key == "factPrice") { 
+        if (key == "factPrice") {
           dataItem.factPrice = e.detail.value
           dataItem.priceSale = e.detail.value
-          dataItem.factAmt = dataItem.factPrice * dataItem['itemQty']  
-          dataItem.sumPrice = dataItem.priceSale * dataItem['itemQty']  
+          dataItem.factAmt = dataItem.factPrice * dataItem['itemQty']
+          dataItem.sumPrice = dataItem.priceSale * dataItem['itemQty']
         }
       }
       this.setData({

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

@@ -45,12 +45,12 @@
       </van-field>
     </view>
   </view>
-  <!-- 单据信息 -->
+  <!-- 单据信息 --> 
   <view wx:for="{{cardList}}" wx:for-item="card" data-item="{{card}}" wx:for-index="cardIndex"
    wx:if="{{card.name == 'items' || contentObj[card.name] && contentObj[card.name].length > 0}}">
     <view style="display: flex;justify-content: center;align-items: center;" id="{{card.name}}">
       <view wx:if="{{ card.name == 'items' && !readonly && chooseVisible && card.chooseGoodsItemFlag}}" style="margin:10rpx 15rpx;text-align: center;flex: 1;">
-        <van-button icon="{{imageUrl + 'choose_goods_sale.png'}}" size="normal" color="#3E69F6" catchtap="openChooseItems" data-item="{{card}}" custom-style="height:70rpx;border-radius:15rpx;width:100%;padding:0" data-index="{{cardIndex}}" type="info">选商品
+        <van-button icon="{{imageUrl + 'choose_goods_sale.png'}}" size="normal" color="#3E69F6" catchtap="openChooseItems" data-item="{{card}}" custom-style="height:70rpx;border-radius:15rpx;width:100%;padding:0" data-index="{{cardIndex}}" type="info">选商品 
         </van-button>
       </view>
       <view wx:if="{{card.name == 'items' && !readonly && chooseVisible &&  card.chooseInventoryFlag}}" style="margin:10rpx 15rpx;text-align: center;flex: 1;">

components/dkbase/dk-list-report/dk-list-report.wxml

@@ -110,8 +110,8 @@
     </view>
 
     <!-- 内容 -->
-    <view style="display: flex;flex-wrap: wrap;justify-content: center;" catchtap="toDetail" data-item="{{item}}" data-index="{{index}}">
-      <view wx:if="{{!contentCol}}" class="{{contentCardTwoFlg?'card-class_four':'card-class'}}" wx:for="{{content}}" wx:for-item="col" data-item="{{col}}">
+    <view style="width:100%;display: flex;flex-wrap: wrap;justify-content: center;" catchtap="toDetail" data-item="{{item}}" data-index="{{index}}">
+      <view wx:if="{{!contentCol}}"  wx:for="{{content}}" class="{{contentCardTwoFlg?'card-class_four':'card-class'}}" wx:for-item="col" data-item="{{col}}" style="{{content.length <= 4? 'width: 46%;': ''}}">
         <image src="{{imageUrl + col.image + '.png'}} " class="card-bottom-image" />
         <view id="itemCardView" style="position: absolute;z-index: 1;width: 98%;">
           <view class="card-label-class" catchtap="showTip" data-item="{{col}}">{{col.label}}

package-business-analysis/pages/business-overview/business-overview.js

@@ -22,7 +22,9 @@ Page({
     profitMarginData: {},
     formData: '{}',
     accDateShow: false,
-    clickFlag:false,
+    clickFlag: false,
+    makeTimeStart: null,
+    makeTimeEnd: null,
   },
 
   /**
@@ -32,14 +34,16 @@ Page({
    */
   setSearchParams(params) {
     let data = util.getCurrentMonth();
-    // params.cpId = 1
-    params.cpId = app.globalData.user.cpId
     delete params.pageSize
     delete params.currentPage
     let formData = JSON.parse(this.data.formData)
     params.querys = JSON.stringify({
       accDateStart: formData.accDateStart ? formData.accDateStart : data[0],
-      accDateEnd:formData.accDateEnd ? formData.accDateEnd : data[1],
+      accDateEnd: formData.accDateEnd ? formData.accDateEnd : data[1],
+    })
+    this.setData({
+      makeTimeStart: formData.accDateStart ? formData.accDateStart : data[0],
+      makeTimeEnd: formData.accDateEnd ? formData.accDateEnd : data[1],
     })
     return params;
   },
@@ -79,19 +83,19 @@ Page({
   opentime() {
     this.setData({
       accDateShow: !this.data.accDateShow,
-      clickFlag:true
+      clickFlag: true
     })
   },
 
-    /**
+  /**
    * @desc : 日期组件后的回调
    * @author : 周兴
    * @date : 2024/1/26 12:16
    */
   clickDate(e) {
-    if(this.data.clickFlag){
+    if (this.data.clickFlag) {
       this.setData({
-        clickFlag:false
+        clickFlag: false
       })
       return;
     }
@@ -116,4 +120,68 @@ Page({
     this.searchData()
   },
 
+  /**
+   * @desc : 明细跳转
+   * @author : 常皓宁
+   * @date : 2024/7/4 13:16
+   */
+  toDetail(e) {
+    let type = e.currentTarget.dataset.item
+    //未付费跳转付费页面
+    //true为标准版
+    if (this.data.freeVersionFlag) {
+      let menuList = app.globalData.menus
+      let filters = menuList.filter(it => it.objectCode == 'ivt-sum-report');
+      //只要一个没有就都没有 需要购买 跳转购买页面
+      if (!filters || filters.length == 0) {
+        //跳转购买
+        return
+      }
+    }
+    //收发存汇总表
+    if (type == 'INT') {
+      wx.navigateTo({
+        url: '/package-inventory/pages/ivt-sum-report/ivt-sum-report',
+        success: function (res) {
+          // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+          res.eventChannel.emit('params', {
+            currentPage: 1,
+            pageSize: 10
+          })
+        }
+      })
+    }
+    //客户收支表
+    else if (type == 'CUS') {
+      wx.navigateTo({
+        url: '/package-business-analysis/pages/cus-rec-pay-report/cus-rec-pay-report',
+        success: function (res) {
+          // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+          res.eventChannel.emit('params', {
+            currentPage: 1,
+            pageSize: 10
+          })
+        }
+      })
+    }
+    //利润表
+    else {
+      let this_ = this
+      wx.navigateTo({
+        url: '/package-business-analysis/pages/profit-report/profit-report',
+        success: function (res) {
+          // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+          res.eventChannel.emit('params', {
+            item: {
+              makeTimeStart: this_.data.makeTimeStart,
+              makeTimeEnd: this_.data.makeTimeEnd,
+              title: this_.data.dateDefault
+            }
+          })
+        }
+      })
+    }
+
+  },
+
 })

package-business-analysis/pages/business-overview/business-overview.wxml

@@ -1,6 +1,7 @@
+<loading wx:if="{{loading}}"></loading>
 <view>
   <view class="content">
-    <view class="item-card">
+    <view class="item-card" catchtap="toDetail" data-item="INT">
       <view class="card-title">
         <view class="name-title">
           <view class="name"> 库存资产</view>
@@ -17,7 +18,7 @@
       </view>
     </view>
 
-    <view class="item-card">
+    <view class="item-card" catchtap="toDetail" data-item="CUS">
       <view class="card-title">
         <view class="name-title">
           <view class="name"> 客户欠款</view>
@@ -34,7 +35,7 @@
       </view>
     </view>
 
-    <view class="item-card">
+    <view class="item-card" catchtap="toDetail" data-item="SAL">
       <view class="card-title">
         <view class="name-title">
           <view class="name"> 销售利润</view>

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

@@ -97,6 +97,23 @@ Page({
   /** 查询所有报表信息 */
   /** 查询页面展示的所有 */
   getSaleProfit() {
+    //如果是跳转过来的star
+    if(this.data.item){
+      this.setData({
+        searchForm:JSON.stringify({
+          makeTimeStart:this.data.item.makeTimeStart,
+          makeTimeEnd:this.data.item.makeTimeEnd
+        }),
+        searchContent:[{
+          code: 'makeTime',
+          defaultValue: this.data.item.title.value,
+          searchType: Constants.searchType.date,
+          title:this.data.item.title.text
+        }]
+      })
+      this.data.item = null
+    }
+    //end
     this.setData({
       loading: true
     })

package-purchase/pages/pur-track-report/pur-track-report.js

@@ -12,18 +12,12 @@ Page({
     // 查询条件
     searchContent: [
       { code: 'createtime', title: mixins.$t("pastThirthtyDays"), defaultValue: 5, searchType: Constants.searchType.date },
-
+      { code: 'staff', title: mixins.$t("staffId"), dropType: 'staff'},
+      { code: 'org', title: mixins.$t("orgId"), dropType: 'org'},
       { code: 'choose', title: mixins.$t("choose"), searchType: Constants.searchType.pick }
     ],
     // 列表区（内容）
-    contentList: [
-      { label: '订单数量', code: 'sumQuantity', image: 'order-bg' },
-      { label: '入库数量', code: 'intoQty', image: 'inbound-bg' },
-      { label: '已核销金额', code: 'amtHandle', amountFlag: true, image: 'reverse-bg' },
-      { label: '订单金额', code: 'sumAmount', amountFlag: true, image: 'reverse-bg' },
-      { label: '退货数量', code: 'returnQty', image: 'reverse-bg' },
-      { label: '未核销金额', code: 'amtReceivable', amountFlag: true, image: 'reverse-bg' },
-    ],
+    contentList: [],
   },
 
   /**
@@ -34,6 +28,27 @@ Page({
   getData(params) {
     return this.excute(this.data.service, this.data.service.getPurTrackingReport, params);
   },
+  loadInit(){
+    let contentList = []
+    if (this.data.gradeCode == Constants.gradeCode.PRO) {
+      contentList = [
+        { label: '订单数量', code: 'sumQuantity', image: 'order-bg' },
+        { label: '入库数量', code: 'intoQty', image: 'inbound-bg' },
+        { label: '退货数量', code: 'returnQty', image: 'reverse-bg' },
+        { label: '未核销金额', code: 'amtReceivable', amountFlag: true, image: 'reverse-bg' },
+      ]
+    }else {
+      contentList = [
+        { label: '订单数量', code: 'sumQuantity', image: 'order-bg' },
+        { label: '订单金额', code: 'sumAmount', amountFlag: true, image: 'reverse-bg' },
+        { label: '退货数量', code: 'returnQty', image: 'reverse-bg' },
+        { label: '付款金额', code: 'paymentAmount', amountFlag: true, image: 'reverse-bg' },
+      ]
+    }
+    this.setData({
+      contentList: contentList
+    })
+  },
    /**
    * @desc :   跳转明细
    * @date : 2024年3月8日

package-purchase/pages/pur-track-report/pur-track-report.wxml

@@ -3,7 +3,7 @@
 <loading wx:if="{{loading}}" loadingName="{{$t['loading']}}" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 <van-sticky scroll-top="0">
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['supplierName','telephone','adddress','orderNo'])}}">
   </dk-dropdown-menu>
  
 </van-sticky>

package-purchase/pages/purchase-order/purchase-order-detail/purchase-order-detail.wxml

@@ -110,6 +110,6 @@
   </view>
 </view> -->
 <!-- 编辑  -->
-<view wx:if="{{item.flgValid}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
+<view wx:if="{{item.flgValid}}" data-item="{{item}}" style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="toEdit">
   <image src="{{imageUrl + 'edit.png'}} " class="edit-class"  />
 </view>

package-purchase/pages/purchase-receipt/add/add.js

@@ -104,11 +104,7 @@ Page({
       controls: [{
         card: 'relation',
         code: 'sourceNo'
-      }],
-      contentBottomLeft: [{
-        code: 'remarks',
-        type: "remarks"
-      }]
+      }], 
     }, {
       name: 'other',
       title: mixins.$t("otherInfo"), // '其他信息'
@@ -199,9 +195,9 @@ Page({
       })
       this.setData({
         contentList: contentList_,
-        cardList,
-        chooseVisible: false,
+        cardList, 
       })
+      this.selectComponent('#' + this.data.formName).setchooseVisible(true)
     }
     this.setData({
       formData: JSON.stringify(formData)
@@ -255,10 +251,8 @@ Page({
    */
   setValuesByEdit(data) {
     { //是否可编辑逻辑
-      if (data.fromId) { //有来源单据
-        this.setData({ //隐藏选商品按钮
-          chooseVisible: true
-        })
+      if (data.fromId) { //有来源单据 
+        this.selectComponent('#' + this.data.formName).setchooseVisible(false)//隐藏选商品按钮
         if (this.data.flgHandleSetting) { //系统参数为自动办理
           if (this.data.nopay) { //未付款
             //大编辑
@@ -678,7 +672,7 @@ Page({
   getData(e) {
     if (!e.idKey) {
       return
-    }
+    } 
     let param = {}
     let excute = this.excute(this.data.purchaseService, this.data.purchaseService.purSelectId + e.id, {});
     excute.then(res => {
@@ -686,9 +680,8 @@ Page({
         let formData = JSON.parse(this.data.formData)
         formData = res.data.data
         this.setData({
-          formData: JSON.stringify(formData),
-          chooseVisible: true
-        })
+          formData: JSON.stringify(formData), 
+        }) 
         this.calculateTotal(res.data.data.purchaseItemResponseList)
         // 刷新商品明细 显示 查看更多
         let card = this.data.cardList.filter(it => it.name == 'items');
@@ -756,5 +749,12 @@ Page({
         cardList_
       })
     }
+    if(this.data.formMode == Constants.formMode.other){ //转入库进
+      this.selectComponent('#' + this.data.formName).setchooseVisible(false)
+    }
+  },
+  onLoad(){ 
+      
+   
   },
 })

package-purchase/pages/purchase-receipt/add/add.wxml

@@ -4,7 +4,7 @@
 <loading wx:if="{{loading}}" ></loading>
 
  
-<dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula"  descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" iconCol="imagesUrl"  quantityCol="{{(!intoStatusflag)?'intoQty':'intoingQty'}}" sumAmountCol="itemAmt"sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle=""   bind:clear = "clear" readonly = "{{readonly}}" chooseVisible="{{!chooseVisible}}" controlFlags ="{{controlFlags}}"
+<dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula"  descCol="skuName" priceCol="priceInto" pupPriceCol="sumPrice" iconCol="imagesUrl"  quantityCol="{{(!intoStatusflag)?'intoQty':'intoingQty'}}" sumAmountCol="itemAmt"sumQuantityCol="itemQty" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle=""   bind:clear = "clear" readonly = "{{readonly}}"   controlFlags ="{{controlFlags}}"
 bind:delItem="setGoods" bind:setGoods="setGoods" bind:editItems="setGoods" table="{{table}}">
 </dk-form-bill>
 

package-purchase/pages/purchase-return/purchase-return.wxml

@@ -6,19 +6,12 @@
   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['rpNo','skuName','skuCode','onlyCode'])}}">
   </dk-dropdown-menu>
 
-  <dk-tabs wx:if="{{!flgHandleSetting}}" active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>
+  <dk-tabs wx:if="{{!flgHandleSetting}}" active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs"> </dk-tabs>
 </van-sticky>
-<!-- 暂无数据 -->
-<van-empty wx:if="{{tableData.length<=0}}" description="暂无数据" />
+
 
 <!-- 列表区 -->
 <dk-list list="{{tableData}}" flgSubFormatDate="{{true}}" titleCorner="" title="supName" status="intoStatusName" content="{{contentList}}" collectCol="collectStatus" contentObj="{{contentObj}}" contentCol="" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{buttonList}}" bind:open="open"></dk-list>
-
-
 <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>

pages/shopping/shopping.wxml

@@ -165,7 +165,7 @@
 
             <view style="display:flex;align-items: center;">
       
-                <van-stepper value="{{item.itemQty}}" data-index="{{index}}" min="0" integer="{{true}}" max="999999999"  bind:change="changeAllreadyChooseQuantity" disabled="true" />
+                <van-stepper value="{{item.itemQty}}" data-index="{{index}}" min="0"   max="999999999"  bind:change="changeAllreadyChooseQuantity" disabled="true" />
               </view>
           </view>
         </view>