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

api/pages/sharesign/integralShare.js

@@ -11,6 +11,7 @@ module.exports = {
 	integralShareService: { 
 		// 前缀
 		prefix: 'oauth-server/oauth/integralShare/',
+		selectByCondHis :'list_by_history',
 	},
 	routeUrl: {
 		integralShare: {

components/dkbase/dk-timeclock-calendar/dk-timeclock-calendar.js

@@ -40,6 +40,8 @@ Component({
     dateList: [], //日历主体渲染数组
     selectDay: {}, //选中时间
     // open: false,
+    slipFlag: false, // 滑动事件开关
+    startPoint: undefined, // 滑动坐标数据
   },
 
   /**
@@ -261,7 +263,40 @@ Component({
         })
         this.triggerEvent("change", this.data.selectDay)
       }
-    }
+    },
+    // 滑动事件监听开始事件
+    myTouchStart(e){
+      // ---------------------记录滑动事件信息---------------------
+      //开启滑动事件
+      const slipFlag = true
+      //记录触摸点的坐标信息
+      const startPoint = e.touches[0]
+      //---------------------记录滑动事件信息end---------------------
+      this.setData({
+        slipFlag: slipFlag,
+        startPoint: startPoint
+      })
+    },
+    // 滑动事件监听结束事件
+    myTouchMove(e) {
+      const startPoint = this.data.startPoint
+      const slipFlag = this.data.slipFlag
+      // ----------------监听手势左右滑事件----------------
+      if (((startPoint.clientX - e.touches[e.touches.length - 1].clientX) > 80) && slipFlag) {
+          this.nextMonth()
+          this.setData({
+            slipFlag: false
+          })
+          return
+      } else if (((startPoint.clientX - e.touches[e.touches.length - 1].clientX) < -80) && slipFlag) {
+          this.lastMonth()
+          this.setData({
+            slipFlag: false
+          })
+          return
+      }
+      // ----------------监听手势左右滑事件end----------------
+    },
   },
   lifetimes: {
     attached() {

components/dkbase/dk-timeclock-calendar/dk-timeclock-calendar.wxml

@@ -26,7 +26,7 @@
 	</view>
 
 	<!-- 日历主体 -->
-	<view class="flex-start flex-wrap calendar-main" style="height:{{dateList.length/7*89}}rpx;  ">
+	<view class="flex-start flex-wrap calendar-main" bind:touchstart="myTouchStart" bind:touchmove="myTouchMove" style="height:{{dateList.length/7*110}}rpx;">
 		<view wx:for="{{dateList}}" wx:key="dateList" class="day">
 			<view class="bg {{(item.year === selectDay.year && item.month === selectDay.month) ? (item.day === selectDay.day?'select':''): 'other-month'}}" data-day="{{item.day}}" data-year="{{item.year}}" data-month="{{item.month}}" data-date-string="{{item.dateString}}">
 				{{item.day}}

components/dkbase/dk-timeclock-calendar/dk-timeclock-calendar.wxss

@@ -142,7 +142,8 @@
 	width: 14.2%;
 	color: #666;
 	text-align: center; 
-	height: 89rpx; 
+  height: 89rpx; 
+  margin-top: 15rpx;
   }
   
   .calendar .calendar-main .day .bg {
@@ -172,5 +173,5 @@
 	display: flex; 
 	align-items: center;
 	justify-content: center;
-	margin-top: -5rpx;
+	margin-top: 10rpx;
   }

i18n/zh-CN.js

@@ -76,7 +76,7 @@ const mac = {
   paymentInfo: '付款信息',
   rpNo: '单号',
   paymentOrderNo: '付款单号',
-  receiptOrderNo: '收款单号',
+  receiptOrderNo: '收入单号',
   sumAmtReceivableHandle: '核销应收',
   sumAmtPayableHandle: '核销应付',
   thisRefund: '本次金额',
@@ -185,7 +185,7 @@ const ivt = {
   storageNum: '库存量',
   sellableQuantity: '可售量',
   freezeQty:'冻结量',
-  countedQuantity: '盘点数量',
+  countedQuantity: '目标数量',
   profitAndLossQuantity: '盈亏数量',
   inventoryLossReasons: '盘亏原因',
   inventoryInformation: '盘点信息',
@@ -350,7 +350,7 @@ const basicData = {
   supervisor: '仓库主管',
   channelCode: '渠道编码',
   channelName: '渠道名称',
-  dataName: '资源名称',
+  dataName: '资料名称',
   dataCode: '资源编码',
 
   incomeCode: '收入编码',

package-basic-data/pages/beginner-guide/beginner-guide.js

@@ -171,6 +171,15 @@ Page({
     if (item.title == '库存统计') {
       url = '/package-inventory/pages/ivt-detail-report/ivt-detail-report'
     }
+    if (item.title == '经营概况') {
+      url = '/package-business-analysis/pages/business-overview/business-overview'
+    }
+    if (item.title == '销售汇总表') {
+      url = '/package-sales/pages/order-sum-report/order-sum-report'
+    }
+    if (item.title == '库存查询') {
+      url = '/package-inventory/pages/ivt-detail-report/ivt-detail-report'
+    }
     this.setData({
       loading: true
     })

package-basic-data/pages/customer-reception/customer-reception.wxml

@@ -3,7 +3,7 @@
 <loading wx:if="{{loading}}" ></loading>
 <van-sticky scroll-top="0">
   <dk-navbar titleFontColor="#000000" navbarTitle="客户接待" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName'\,'telephone','adddress'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" navBarHeight="{{navBarHeight}}"  searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName'\,'telephone','adddress'])}}">
   </dk-dropdown-menu>
   <dk-tabs active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>
 </van-sticky>

package-basic-data/pages/share-power/share-power.js

@@ -108,7 +108,17 @@ Page({
     wx.navigateTo({
       url: toUrl,
     })
-
+  },
+  /**
+  * @desc : 跳转Welcome
+  * @author : 刘尧
+  * @date : 2024/8/5 09:26
+  */
+  wantToApp(){
+    let toUrl = '/pages/welcome/welcome'
+    wx.navigateTo({
+      url: toUrl,
+    })
   },
   /**
 * @desc : 获取微信派发的 openid

package-basic-data/pages/share-power/share-power.wxml

@@ -46,7 +46,7 @@
       <view class="button-view">
         <van-button size="normal" wx:if="{{helpFlag}}" color="#FF7B1A" custom-style="width:100%;margin-top:30rpx;border-radio:50rpx;" bind:tap="helpMe">帮我点一下
         </van-button>
-        <van-button size="normal" wx:else color="#FF7B1A" custom-style="width:100%;margin-top:30rpx;border-radio:50rpx;">我也想使用软件
+        <van-button size="normal" wx:else color="#FF7B1A" custom-style="width:100%;margin-top:30rpx;border-radio:50rpx;" bind:tap="wantToApp">我也想使用软件
         </van-button>
         <van-button size="normal" color="#FF7B1A1A;"
           custom-style="width:100%;margin-top:30rpx;margin-bottom:50rpx;border-radio:50rpx;" bind:tap="toUnderstand">了解软件</van-button>

package-basic-data/pages/sign/sign.js

@@ -45,6 +45,8 @@ Page({
     // this.getIntegralTactic()
     // // 积分
     // this.getIntegral()
+    // 获取优惠劵
+    this.getCouponNumber()
     // 头像
     this.getUser()
   },
@@ -59,6 +61,24 @@ Page({
     })
   },
 
+    /**
+  * @desc : 优惠劵数量获取
+  * @author : 刘尧
+  * @date : 2024/7/29 15:54
+  */
+  getCouponNumber() {
+    let params = {
+      couponStatus: Constants.couponStatus.unused,
+      flgValid: true
+    }
+    let service = app.globalData['couponUseService']
+    this.excute(service, service.countByCond, params).then(res => {
+      this.setData({
+        couponCount: res.data.data
+      })
+    });
+  },
+
   /**
   * 日期
   * @param {*} e 

package-inventory/pages/inventory-adjustment/add/add.js

@@ -60,6 +60,7 @@ Page({
         name: 'whName',
         title: mixins.$t('whid'), //'目标仓库'
         type: 'choose',
+        required: true,
         urlKey: 'chooseWh'
       }, 
       {
@@ -73,6 +74,7 @@ Page({
         code: 'nonStdCode',
         name: 'nonStdName',
         title: mixins.$t('nonStdCode'), //'目标批号'  
+        required: true,
         type: 'str',
         urlKey: 'openingReason',
         tip: mixins.$t('tipPop'),
@@ -82,7 +84,7 @@ Page({
 
     cardList: [{
         name: 'main',
-        title: mixins.$t("inventoryInformation"), //'盘点信息 
+        title: '调整信息', //'盘点信息 
       },
       {
         name: 'items',
@@ -211,6 +213,7 @@ Page({
    * @author : 王英杰
    */
   switchTransferType(transferType) {
+    console.log(666);
     if (transferType == Constants.inventoryAdjustment.warehouse) { //调整类型-仓库调整
       this.setData({
         contentObj: {
@@ -280,6 +283,7 @@ Page({
             name: 'whName',
             title: mixins.$t('whid'), //'目标仓库'
             type: 'choose',
+            required: true,
             urlKey: 'chooseWh'
           },
           
@@ -365,6 +369,7 @@ Page({
             name: 'nonStdName',
             title: mixins.$t('nonStdCode'), //'目标批号'  
             type: 'str',
+            required: true,
             tip: mixins.$t('tipPop'),
           },
 
@@ -505,7 +510,7 @@ Page({
     });
 
     wx.setNavigationBarTitle({
-      title: '编辑库存盘点', // mixins.$t('supplierAdd')
+      title: '编辑库存调整', // mixins.$t('supplierAdd')
     })
     if (formData.checkStatus == Constants.checkStaus.COMPLETE) {
       buttonList = [{

package-inventory/pages/inventory-adjustment/add/add.wxml

@@ -8,7 +8,7 @@
 <!-- <dk-form id="{{formName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
 </dk-form> -->
 
-<dk-form-bill sumAmountColFlag="{{false}}" type="out" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel"   descCol="skuName"  subCol="calculationFormula"     quantityCol="itemQty"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale"  bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}" popupTopObj="{{popupTopObj}}"  iconCol="imagesUrl" 
+<dk-form-bill sumAmountColFlag="{{false}}" type="out" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="brandName" titleCol="skuModel"   descCol="skuName"  subCol="calculationFormula"     quantityCol="itemQty"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale"  bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}" popupTopObj="{{popupTopObj}}"  iconCol="imagesUrl" 
 bind:delItem="setGoods" bind:setGoods="setGoods" bind:changeField="changeField" controlFlags ="{{controlFlags}}" detailTipFlag="{{true}}"bindtap="handleTap" isCompare= "{{true}}"sourceCode="{{sourceCode}}" compareCode="{{compareCode}}"validFlag="{{true}}" >
 </dk-form-bill>
 

package-inventory/pages/inventory-adjustment/detail/detail.js

@@ -75,7 +75,7 @@ Page({
 
     cardList: [{
       name: 'main',
-      title: mixins.$t("inventoryInformation"), //'盘点信息 
+      title: '调整信息', //'盘点信息 
     },
     {
       name: 'items',
@@ -270,14 +270,15 @@ Page({
           name: 'whName',
           title: mixins.$t('whid'),//'目标仓库'
           type: 'choose',
+          required: true,
           urlKey: 'chooseWh'
         },
-        {
-          code: 'brandName',
-          title: mixins.$t('brandName'),
-          type: 'str',
-          readonly: true,
-        },
+        // {
+        //   code: 'brandName',
+        //   title: mixins.$t('brandName'),
+        //   type: 'str',
+        //   readonly: true,
+        // },
         {
           code: 'nonStdCode',
           title: mixins.$t("goodsBatch"), //'色号',
@@ -358,6 +359,7 @@ Page({
           name: 'nonStdName',
           title: mixins.$t('nonStdCode'),//'目标批号'  
           type: 'str',
+          required: true,
           tip: mixins.$t('tipPop'),
         },
 

package-inventory/pages/inventory-adjustment/detail/detail.wxml

@@ -8,7 +8,7 @@
 <!-- <dk-form id="{{formName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
 </dk-form> -->
 
-<dk-form-bill sumAmountColFlag="{{false}}" type="out" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel"   descCol="skuName"  subCol="calculationFormula"    quantityCol="itemQty"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale"  bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}" popupTopObj="{{popupTopObj}}"  iconCol="imagesUrl" 
+<dk-form-bill sumAmountColFlag="{{false}}" type="out" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel"   descCol="skuName"  subCol="calculationFormula" titleTagCol="brandName"   quantityCol="itemQty"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale"  bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}" popupTopObj="{{popupTopObj}}"  iconCol="imagesUrl" 
 bind:delItem="setGoods" bind:setGoods="setGoods" bind:changeField="changeField" controlFlags ="{{controlFlags}}"detailTipFlag="{{true}}"bindtap="handleTap">
 </dk-form-bill>
 
@@ -18,4 +18,4 @@ bind:delItem="setGoods" bind:setGoods="setGoods" bind:changeField="changeField"
  
  
 <!-- 新建按钮 -->
-<dk-save-button   btnAutoWidthFlag="{{true}}"  buttonList="{{buttonList}}"   bind:open="open"></dk-save-button>
+<!-- <dk-save-button   btnAutoWidthFlag="{{true}}"  buttonList="{{buttonList}}"   bind:open="open"></dk-save-button> -->

package-inventory/pages/inventory-adjustment/inventory-adjustment.js

@@ -34,10 +34,6 @@ Page({
     pullType: 'mSelect',
     typeName: 'transferType'
   }, {
-    code: 'staffName', 
-  }, {
-    code: 'orgName', 
-  }, {
     code: 'transferNo', 
     title:mixins.$t('adjustmentOrderNumber'),//'调整单号'
   },
@@ -86,12 +82,6 @@ Page({
 
     contentObj: {
      [ mixins.$t('warehouseAdjustment')]: [  {//仓库调整
-        name: 'oWhName',
-        title: mixins.$t('owhid'),//'源仓库'
-      }, {
-        name: 'whName',
-        title:  mixins.$t('whid'),//'目标仓库'
-      }, {
         name: [{
           name: 'transferOrg',
           title: ''
@@ -105,12 +95,6 @@ Page({
         title:  mixins.$t('adjustDate'),//'调整日期',
       }],
       [mixins.$t('batchAdjustment')]: [ {//'批次调整'
-        name: 'ononStdCode',
-        title: mixins.$t('oNonStdCode'),//'源批号'
-      },{
-        name: 'nonStdCode',
-        title: mixins.$t('nonStdCode'),//'目标批号'
-      },  {
         name: [{
           name: 'transferOrg',
           title: ''
@@ -139,13 +123,12 @@ Page({
         name: 'printedBill',
         title: mixins.$t('printedBill'),//'打印票据'
       } 
-     
     ], 
     totallength: 0, //视图下方提醒数量 
     // 路由
     routeObjName: 'inventoryAdjustment', 
-       // 主键Id
-       primaryKey: 'transferId',
+    // 主键Id
+    primaryKey: 'transferId',
   },
   /**
    * @desc : （编辑）

package-inventory/pages/inventory-adjustment/inventory-adjustment.wxml

@@ -4,7 +4,7 @@
 <van-dialog id="van-dialog" />
 <van-sticky scroll-top="0">
   <!-- 查询条件 -->
-  <dk-dropdown-menu  model:value="{{searchForm}}"menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orderNo'])}}">
+  <dk-dropdown-menu  model:value="{{searchForm}}"menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" navBarHeight="{{navBarHeight}}" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orderNo', 'staffId', 'orgId'])}}">
   </dk-dropdown-menu>
  
   

package-inventory/pages/inventory-check/inventory-check.js

@@ -34,10 +34,6 @@ Page({
       pullType: 'mSelect',
       typeName: 'coilingState'
     }, {
-      code: 'staffName', 
-    }, {
-      code: 'orgName', 
-    }, {
       code: 'checkNo', 
       title:mixins.$t('checkNo')//'盘点单号'
     }, ],

package-inventory/pages/inventory-check/inventory-check.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,['orderNo' ])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" navBarHeight="{{navBarHeight}}" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orderNo', 'staffId', 'orgId' ])}}">
   </dk-dropdown-menu>
  
   

package-inventory/pages/inventory-freeze/add/add.js

@@ -28,12 +28,6 @@ Page({
     },
     { code: 'skuSpec', title: mixins.$t('goodSpec'), type: 'str', readonly: true, },
     {
-      code: 'brandName',
-      title: mixins.$t('brandName'),
-      type: 'str',
-      readonly: true,
-    },
-    {
       code: 'nonStdCode',
       title: mixins.$t('goodsBatch'),
       type: 'str',
@@ -283,7 +277,9 @@ Page({
       wx.setNavigationBarTitle({
         title: '库存冻结详情'
       })
-
+      this.setData({
+        noShowEdit: true
+      })
       this.getItemDetal(this.data.id)
       this.setColumn()
     } else if (this.data.formMode == Constants.formMode.detailEdit) {

package-inventory/pages/inventory-freeze/add/add.wxml

@@ -1,6 +1,6 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
-<dk-form-bill type="out" popType ="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel"  subCol="calculationFormula"  descCol="skuName"  quantityCol="itemQty"  contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}"
+<dk-form-bill type="out" popType ="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel"  subCol="calculationFormula"  descCol="skuName"  quantityCol="itemQty"  contentObj="{{contentObj}}" titleTagCol="brandName" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}"
 bind:editItems="editItems" sumAmountColFlag="{{false}}"  iconCol="imagesUrl" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"detailTipFlag="{{true}}"bindtap="handleTap"
 >
 </dk-form-bill>

package-inventory/pages/inventory-freeze/inventory-freeze.js

@@ -128,9 +128,6 @@ Page({
       name: 'thawing',
       title: mixins.$t('thawing')//'解冻'
     }, {
-      name: 'editFreeze',
-      title: mixins.$t('edit') 
-    }, {
       name: 'printedBill',
       title: mixins.$t('printedBill') //打印票据
     }

package-inventory/pages/inventory-freeze/inventory-freeze.wxml

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

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

@@ -6,7 +6,7 @@
 <van-sticky scroll-top="0">
   <dk-navbar titleFontColor="#000000" navbarTitle="采购订单" bind:clickBack="handleNavBack" operateShow="{{ guideUrl ? true: false}}" operateUrl="{{guideUrl}}" bind:getNavbarHeight="getNavbarHeight"/>
   <!-- 查询条件 --> 
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['supplierName','orderNo'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['supplierName','orderNo'])}}" navBarHeight="{{navBarHeight}}" >
   </dk-dropdown-menu>
   <dk-tabs active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>
 </van-sticky>