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

api/pages/sale/order.js

@@ -36,7 +36,7 @@ module.exports = {
       chooseSaleOrder: { key: 'chooseSaleOrder', url: '/package-base-select/pages/select-source-sale-order/select-source-sale-order' },
       saleOrderReturn: { key: 'saleOrderReturn', url: '/package-sales/pages/order-return/add/add' , image:'btn-sales-returns.png', tipMethod: 'isAllowedSaleOrderReturn'},
       selectCollectionConfirm: { key: 'selectCollectionConfirm', url: '/package-base-select/pages/select-collection_confirm/select-collection_confirm' },
-      chooseChannel: { key: 'chooseChannel', url: '/package-base-select/pages/select-data/select-data', type: 'saleChannel' },
+      chooseChannel: { key: 'chooseChannel', url: '/package-base-select/pages/select-data/select-data', type: 'saleChannel'},
       choosecusFrom: { key: 'choosecusFrom', url: '/package-base-select/pages/select-data/select-data', type: 'customerFrom' },
       collection:{ key: 'collection', url: '/package-sales/pages/customer-collection/add/add', formMode: 'add', idKey: 'cusId',image:'btn-customer-collection.png',formType:'add' }, //跳转客户收款
       printedBill:{ key: 'printedBill', method:'printedBill', formMode: 'index', idKey: 'cusId',image:'btn-printing.png' }

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

@@ -200,7 +200,7 @@
             <van-icon wx:if="{{!readonly && form[item.code]}}" slot="icon" name="clear" color="#c8c9cc;" data-key="{{item.code}}" catchtap="clearDate"></van-icon>
           </van-field>
           <!--数字类-->
-          <dk-number-input wx:if="{{item.type=='number'  && (item.show || item.show == undefined)}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" center="left" readonly="{{!!readonly || !!item.readonly}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#CAA977" titleFontWeight="normal" titleColor="#95A8CB" inputValue="{{form[item.code]}}" negative="{{item.negative}}" maxFlag="{{item.maxFlag}}" max="{{item.max}}" bind:triggerBindBlur="changeNumberBlur" bind:triggerBindValue="changeNumberField"></dk-number-input>
+          <dk-number-input wx:if="{{item.type=='number'  && (item.show || item.show == undefined)}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" center="left" readonly="{{!!readonly || !!item.readonly}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{item.errMsg}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#FF7B1A" titleFontWeight="normal" titleColor="#95A8CB" inputValue="{{form[item.code]}}" negative="{{item.negative}}" maxFlag="{{item.maxFlag}}" max="{{item.max}}" bind:triggerBindBlur="changeNumberBlur" bind:triggerBindValue="changeNumberField"></dk-number-input>
 
           <!--备注-->
           <van-field wx:if="{{item.type=='textarea'  && (item.show || item.show == undefined)}}" type="textarea" required="{{item.required?true:false }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{index}}" data-card="{{card.name}}" value="{{ form[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" autosize border="{{ false }}" clearable readonly="{{!!readonly && !!item.readonly}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeField" bind:blur="blurField" bind:clear="clearField" errorMessage="{{item.errMsg}}">

components/dkbase/dk-list/dk-list.js

@@ -214,7 +214,7 @@ Component({
       let tel = e.currentTarget.dataset.value
       if (phoneFlag && !tel) {
         phoneFlag = false;
-      } 
+      }
       // 拨打电话
       if (phoneFlag) {
         wx.makePhoneCall({
@@ -235,7 +235,8 @@ Component({
       if (this.data.chooseFlag) {
         this.chooseData(e);
       } else {
-        this.triggerEvent("toDetail", { item: e.currentTarget.dataset.item })
+        this.triggerEvent("toDetail", { item: e.currentTarget.dataset.item,
+           index: e.currentTarget.dataset.index })
       }
     },
     /**

components/dkbase/dk-list/dk-list.wxss

@@ -9,11 +9,6 @@
   background: #fff;
   width: 100%;
   border-radius: 15rpx 15rpx;
-
-
-  background-repeat: no-repeat;
-  background-size: 100% 46px;
-
 }
 
 .table-content {

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

@@ -4,10 +4,10 @@
   <!--标题-->
   <view class="special-topic" wx:if="{{type=='sale'}}">
     <!-- 图片 -->
-    <view class="special-topic-content">
+    <view class="special-topic-content" style="position: fixed;">
       <van-image radius="15rpx" custom-class="goods-pop-image" fit="fill" src="{{ form[iconCol] }}"></van-image>
     </view>
-    <view class="special-topic-title">
+    <view class="special-topic-title" style="margin-left: 175rpx;">
       <!-- 标签 标题-->
       <dk-title titleTag="{{form[titleTagCol]}}" title="{{form[titleCol]}}"></dk-title>
       <view style="padding-top: 10rpx;">

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

@@ -8,7 +8,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    active:0,
+    active: 0,
     // 选择数据
     choosedData: [],
     // // 是否显示tab
@@ -39,6 +39,8 @@ Page({
     labelKey: null,
     // 多选时是否允许重复
     repeatFlag: false,
+    // 简单标识
+    simpleFlag: false,
     // 确定按钮
     buttonList: [{
       name: 'confirm',
@@ -128,6 +130,37 @@ Page({
   },
   /**
    * @desc : 点击事件-返回数据
+   * @author : 周兴
+   * @date : 2024/5/8 15:16
+   */
+  choose(e) {
+    // 如果选择框开启就走确定模式
+    if (this.data.chooseFlag) {
+      return;
+    }
+    let item = e.currentTarget.dataset.item
+    let index = e.currentTarget.dataset.index
+    let tableData = this.data.tableData
+    tableData.forEach(res => {
+      res.checked = false
+    })
+    tableData[index].checked = true
+    this.setData({
+      tableData: tableData
+    })
+    item.id = item.channelId,
+    item.name = item.channelName,
+    item.code = item.channelCode
+    const eventChannel = this.getOpenerEventChannel();
+    eventChannel.emit('bindData', {
+      data: item
+    })
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+  /**
+   * @desc : 点击事件-返回数据
    * @author : 姜永辉
    * @date : 2022/5/23 15:16
    */
@@ -137,6 +170,14 @@ Page({
       return;
     }
     let item = e.detail.item
+    let tableData = this.data.tableData
+    tableData.forEach(res => {
+      res.checked = false
+    })
+    tableData[e.detail.index].checked = true
+    this.setData({
+      tableData: tableData
+    })
     // 读取传入的单据类型
     let route = this.data.chooseRoute
     let data = {}
@@ -158,11 +199,11 @@ Page({
           staffPhone: item.staffPhone,
         }
         break;
-         // 角色
+      // 角色
       case Constants.chooseType.role:
         data = {
           id: item.roleId,
-          name: item.roleName, 
+          name: item.roleName,
         }
         break;
 
@@ -274,14 +315,14 @@ Page({
     if (this.data.kindType) {
       params.kindType = this.data.kindType
     }
-    console.log('eee',this.data.chooseRoute);
+    console.log('eee', this.data.chooseRoute);
     let chooseType = this.data.chooseRoute.type;
     // 供应商
     if (chooseType == Constants.chooseType.supplier) {
       params.supType = "";
       let active = this.data.active
       params.supType = Constants.kindCode.supplierPur;
-     
+
       if (active == 1) { //采购供应商
         params.supType = Constants.kindCode.supplierPur;
       } else if (active == 2) { //服务供应商
@@ -302,10 +343,10 @@ Page({
     if (chooseType == Constants.chooseType.cusFrom) {
       params.dataSourceCode = Constants.chooseType.cusFrom
     }
-    if(chooseType == Constants.chooseType.inventorySku){
+    if (chooseType == Constants.chooseType.inventorySku) {
       params.flgValid = true
     }
-    if(chooseType == Constants.chooseType.warehouse){
+    if (chooseType == Constants.chooseType.warehouse) {
       params.flgValid = true
     }
     return params
@@ -421,16 +462,6 @@ Page({
           placeholder: ['staffName']
         })
         break;
-      //销售渠道
-      case Constants.chooseType.saleChannel:
-        title = "销售渠道"
-        this.setData({
-          routeObjName: 'common',
-          method: 'getInitData',
-          title: 'channelName',
-          placeholder: ['channelName']
-        })
-        break;
 
       //客户来源
       case Constants.chooseType.cusFrom:
@@ -459,8 +490,10 @@ Page({
           routeObjName: 'common',
           method: 'getInitData',
           title: 'channelName',
+          simpleFlag: true,
           placeholder: ['channelName']
         })
+        console.log('rrrrr', this.data.simpleFlag);
         break;
       // 供应商
       case Constants.chooseType.supplier:
@@ -560,8 +593,8 @@ Page({
               name: 'freezeQty',
               title: '冻结量'
             },
-          
-            
+
+
 
           ],
           placeholder: ['whName']

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

@@ -17,11 +17,18 @@
 <!-- 暂无数据 -->
 <van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}" />
 
+<!--简单列表-->
+<view wx:if="{{simpleFlag}}" style="margin-top:30rpx;">
+  <view wx:for="{{tableData}}" data-item="{{item}}" wx:key="index" class="main-class main-item-class" style="{{item.checked? 'border: 1px solid #1B365D;':''}}" data-index="{{index}}"  catchtap="choose">
+    {{item[title]}}
+  </view>
+</view>
+
 <!-- 列表区 -->
-<dk-list wx:if="{{active == 0}}" id="list" list="{{tableData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}" chooseFlag="{{chooseFlag}}" bind:toDetail="toDetail" bind:choose="chooseData"></dk-list>
+<dk-list wx:if="{{!simpleFlag && active == 0}}" id="list" list="{{tableData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}" chooseFlag="{{chooseFlag}}" bind:toDetail="toDetail" bind:choose="chooseData"></dk-list>
 
 <!-- 已选列表区 -->
-<dk-list wx:if="{{chooseFlag && active == 1}}" id="choosed" list="{{choosedData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}" swipeDisabled="{{false}}" swipeDeleteFlag="{{true}}" bind:swipe="delChoosed"></dk-list>
+<dk-list wx:if="{{ !simpleFlag && chooseFlag && active == 1}}" id="choosed" list="{{choosedData}}" title="{{title}}" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}" swipeDisabled="{{false}}" swipeDeleteFlag="{{true}}" bind:swipe="delChoosed"></dk-list>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 

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

@@ -8,17 +8,17 @@
 	box-shadow: 0px 17px 22px 0px #1B365D33;
 }
 
-.tabs-class{
+.tabs-class {
 	position: fixed;
 	top: 180rpx;
-	left:140rpx;
+	left: 140rpx;
 	z-index: 100;
-	width:100% ;
+	width: 100%;
 	height: 70rpx;
 	font-size: 12px;
-  }
+}
 
-.van-tabs__nav--card >.van-tab--active>.van-ellipsis {
+.van-tabs__nav--card>.van-tab--active>.van-ellipsis {
 	color: #fff !important;
 }
 
@@ -36,18 +36,19 @@
 	top: 104rpx;
 }
 
-.van-ellipsis{
+.van-ellipsis {
 	height: 84rpx !important;
 	line-height: 84rpx !important;
 	color: #95A8CB;
-  }
+}
 
-  .van-tabs__wrap{
+.van-tabs__wrap {
 	height: 84rpx !important;
-  }
-  .van-tabs__nav{
+}
+
+.van-tabs__nav {
 	height: 84rpx !important;
-  }
+}
 
 .van-tab {
 	border-right: none !important;
@@ -61,4 +62,16 @@
 .dk-tab-active-right {
 	background: linear-gradient(90.12deg, #4A5E98 0.13%, #718AC6 99.92%);
 	border-radius: 0 13rpx 13rpx 0;
+}
+
+.main-class {
+	margin: 10rpx 32rpx;
+	border-radius: 15rpx;
+	box-shadow: 0px -6px 20px 0px #0000000D;
+
+}
+
+.main-item-class {
+	padding: 20rpx 20rpx;
+	color:#1B365D
 }

package-base-select/pages/select-goods/select-goods.wxml

@@ -55,7 +55,7 @@
             </view>
             <!-- 描述 -->
             <view style="display: flex;padding-top: 10rpx;">
-              <dk-text fontSize="24rpx" value="{{item.skuName}}"></dk-text>
+              <dk-text fontSize="24rpx" value="{{item.skuName}}" data-item="{{item}}" bind:tap="openAddItemInfo"></dk-text>
             </view>
             <view style="display: flex;align-items: flex-end;margin-top:20rpx;">
               <!-- 标准价/标价-->

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

@@ -32,8 +32,9 @@
           <view class="table-content-row-font">
             <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="收款金额" copyValue="{{item.amtRec}}"></dk-text>
           </view>
-          <view class="table-content-class">
-            {{item.amtRec}}
+          <view class="table-content-class" >
+            <!-- {{item.amtRec}} -->
+            <dk-cell height="40rpx" contentRight="{{false}}" left="0rpx" center="left" fontSize="14" contentColor="#FF7B1A" spaceWidth="0rpx" content="{{item.amtRec}}"></dk-cell>
           </view>
         </view>
       </view>

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

@@ -30,7 +30,8 @@ objCol="customerId" objLabel="客户名称" amountTitle="客户欠款" chooseTex
             <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="收款金额" copyValue="{{item.amtRec}}"></dk-text>
           </view>
           <view class="table-content-class">
-            {{item.amtRec}}
+            <!-- {{item.amtRec}} -->
+            <dk-cell height="40rpx" contentRight="{{false}}" left="0rpx" center="left" fontSize="14" contentColor="#FF7B1A" spaceWidth="0rpx" content="{{item.amtRec}}"></dk-cell>
           </view>
         </view>
       </view>

pages/shopping/shopping.wxml

@@ -46,7 +46,7 @@
     <van-cell-group border="{{false}}" style="display: flex;justify-content: flex-end;" custom-class="cell-width">
       <!-- 商品列表 -->
       <view wx:for="{{tableData}}" wx:key="index" border="{{ false }}" class="goods-cell-class">
-        <view class="goods-item-class">
+        <view class="goods-item-class" data-item="{{item}}" bind:tap="openAddItemInfo">
           <view>
             <van-image radius="15rpx" custom-class="goods-item-image" fit="fill" src="{{itemimagesUrl }}" />
           </view>
@@ -57,8 +57,8 @@
               <dk-title titleTag="{{item.shortName}}" title="{{item.skuModel}}"></dk-title>
             </view>
             <!-- 描述 -->
-            <view style="display: flex; ">
-              <dk-text fontSize="24rpx" value="{{item.skuName}}"></dk-text>
+            <view style="display: flex; " >
+              <dk-text fontSize="24rpx" value="{{item.skuName}}" data-item="{{item}}" bind:tap="openAddItemInfo"></dk-text>
             </view>
             <view style="display: flex;align-items: flex-end;">
               <!-- 标准价/标价-->