1、修改dk-list组件

components/dkbase/dk-dropdown-date/dk-dropdown-date.js

@@ -234,13 +234,12 @@ Component({
         show: false,
         dateDefault: this.data.dateTypeList[this.data.dateTypeList.length - 1]
       })
-      console.log('dateDefault',this.data.dateDefault,this.data.dateSearch);
       let date = [util.formatTime(new Date(this.data.dateSearch[0])).substring(0, 10),
       util.formatTime(new Date(this.data.dateSearch[1])).substring(0, 10)]
       this.setData({
         dataDefaultSearch: date
       })
-      this.triggerEvent('dateCommit', { date: date, dateDefault: this.data.dateDefault })
+      this.triggerEvent('dateCommit', {code:this.data.code,  date: date, dateDefault: this.data.dateDefault })
     },
   }
 })

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

@@ -54,6 +54,14 @@ Component({
       type: Array,
       value: []
     },
+    // 内容(不定)
+    contentObj:{
+      type: Object,
+    },
+    // 不定列的列名
+    contentCol:{
+      type:String,
+    },
     // 是否显示底部
     flgFooter: {
       type: Boolean,

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

@@ -40,7 +40,19 @@
 
 
       <!-- 内容 -->
-      <view class="table-content-row" wx:for="{{content}}" wx:for-item="col" data-item="{{col}}">
+      <view wx:if="{{!contentCol}}" class="table-content-row" wx:for="{{content}}" wx:for-item="col" data-item="{{col}}">
+        <view style="display: flex;">
+          <view class="table-content-row-font">
+            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="{{col.title}}" copyValue="{{wxmlUtil.setItemValue(item,col.name)}}"></dk-text>
+          </view>
+          <view class="table-content-class">
+            {{wxmlUtil.setItemValue(item,col.name)}}
+          </view>
+        </view>
+      </view>
+
+      <!-- 内容变动 -->
+      <view wx:if="{{contentCol}}" class="table-content-row" wx:for="{{contentObj[item[contentCol]]}}" wx:for-item="col" data-item="{{col}}">
         <view style="display: flex;">
           <view class="table-content-row-font">
             <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="{{col.title}}" copyValue="{{wxmlUtil.setItemValue(item,col.name)}}"></dk-text>
@@ -71,7 +83,7 @@
   </view>
 </view>
 
-<van-popup show="{{show}}" position="bottom" bind:close="closePop" custom-class="function-pop-class" >
+<van-popup show="{{show}}" position="bottom" bind:close="closePop" custom-class="function-pop-class">
   <van-cell-group border="{{false}}" custom-class="function-cell-group">
     <van-grid square border="{{false}}" icon-size="42px">
       <!--按钮-->

components/dkbusiness/dk-dropdown-menu/dk-dropdown-menu.js

@@ -163,12 +163,14 @@ Component({
       searchForm[code + 'End'] = data[1]
       let menuList = this.data.menuList
       let dateDefault = e.detail.dateDefault
-      if (this.data.index) {
+      console.log('bb',this.data.index,dateDefault);
+      if (this.data.index || this.data.index == 0) {
         if (menuList.length > this.data.index) {
           menuList[this.data.index].defaultValue = dateDefault.value
           menuList[this.data.index].title = dateDefault.text
         }
       }
+      console.log('menuList',menuList,e.detail);
       this.setData({
         searchForm: searchForm,
         menuList: menuList

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

@@ -7,14 +7,8 @@
  *		作者				日期					版本				修改内容
  *		于继渤		        2022-0-12	            1.00		   	    
  *******************************************************************************/
-const app = getApp();
-const api = require('../../../utils/api.js');
-const {
-  DESIGN_STATUS
-} = require('../../../utils/Constants.js');
-const Constants = require('../../../utils/Constants.js');
+const Constants = require('@/utils/Constants.js');
 const util = require('../../../utils/util.js')
-const common = require('../../../utils/common.js')
 const mixins = require('../../../mixins/index.js')
 Page({
   mixins: [mixins],
@@ -29,7 +23,7 @@ Page({
     pullMenuList: [{ code: 'outStatus', pullType: 'mSelect', typeName: 'outStatus' }, { code: 'receiveStatus', pullType: 'mSelect', typeName: 'receiveStatus' }, { code: 'followCount', dataType: 'number' }, { code: 'nextFollowTime', dataType: 'date' }],
 
     // 假数据
-    dataList: [{ salesChannelName: '零售',customerId:11, customerName: '张三', displayStatus: '成交', orderNo: 'SA-LWYD-ZOO-202401300SBG', customerPhone: '15659741980', addressFull: '辽宁省沈阳市浑南区沈阳市浑南区人民政府(新聪街西)1', orgName: '零售部', staffName: '薛玉', tsumAmount: 3000, categoryQuantity: 1, tsumQuantity: 1 ,makeTime :'2023-1-3'}, { salesChannelName: '分销', customerName: '李四', displayStatus: '成交', orderNo: 'SA-LWYD-ZOO-202401300SBD', customerPhone: '15659741980', addressFull: '辽宁省沈阳市浑南区沈阳市浑南区人民政府(新聪街西)2', orgName: '零售部', staffName: '薛玉', tsumAmount: 4000, categoryQuantity: 2, tsumQuantity: 2,makeTime :'2023-12-3' }],
+    dataList: [{ salesChannelName: '零售', customerId: 11, customerName: '张三', displayStatus: '成交', orderNo: 'SA-LWYD-ZOO-202401300SBG', customerPhone: '15659741980', addressFull: '辽宁省沈阳市浑南区沈阳市浑南区人民政府(新聪街西)1', orgName: '零售部', staffName: '薛玉', tsumAmount: 3000, categoryQuantity: 1, tsumQuantity: 1, makeTime: '2023-1-3' }, { salesChannelName: '分销', customerName: '李四', displayStatus: '未成交', orderNo: 'SA-LWYD-ZOO-202401300SBD', customerPhone: '15659741980', addressFull: '辽宁省沈阳市浑南区沈阳市浑南区人民政府(新聪街西)2', orgName: '零售部', staffName: '薛玉', tsumAmount: 4000, categoryQuantity: 2, tsumQuantity: 2, makeTime: '2023-12-3' }],
 
     // 列表区（脚部金额）
     footerAmount: { name: 'tsumAmount', title: '合计金额' },
@@ -38,6 +32,11 @@ Page({
     // 列表区（内容）
     contentList: [{ name: 'orderNo', title: '订单单号' }, { name: 'customerPhone', title: '客户电话' }, { name: 'addressFull', title: '客户地址' }, { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: '业务员' }], title: '客户地址' }],
 
+    contentObj: {
+      '成交': [{ name: 'orderNo', title: '订单单号' }, { name: 'customerPhone', title: '客户电话' }, { name: 'addressFull', title: '客户地址' }, { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: '业务员' }], title: '客户地址' }],
+      '未成交': [{ name: 'orderNo', title: '订单单号' }, { name: 'customerPhone', title: '客户电话' }, { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: '业务员' }], title: '客户地址' }]
+    },
+
     // 弹出按钮
     buttonList: [{ name: 'follow' }, { name: 'followTask', title: '跟进任务' }, { name: 'order', title: '销售订单' },
     { name: 'collection', title: '客户收款' }, { name: 'merge', title: '客户合并' }],
@@ -77,8 +76,8 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 周兴
    */
-  openValidData(item,name){
-    console.log('item',item,name,item.customerId);
+  openValidData(item, name) {
+    console.log('item', item, name, item.customerId);
     if (!item.customerId) {
       wx.showToast({
         title: '无此联系人,或陌生接待',
@@ -94,8 +93,8 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 周兴
    */
-  getData(params){
-    console.log('fff',params);
+  getData(params) {
+    console.log('fff', params);
   },
 
   /**

package-basic-data/pages/test/test.wxml

@@ -9,10 +9,9 @@
 
 <!-- 暂无数据 -->
 <van-empty wx:if="{{dataList.length<=0}}" description="暂无数据" />
-<!-- 列表 -->
 
 <!-- 列表区 -->
-<dk-list list="{{dataList}}" titleCorner="salesChannelName" title="customerName" status="displayStatus" subTitle="makeTime" content="{{contentList}}" footerAmount="{{footerAmount}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" 
+<dk-list list="{{dataList}}" titleCorner="salesChannelName" title="customerName" status="displayStatus" subTitle="makeTime" content="{{contentList}}" contentObj="{{contentObj}}" contentCol="displayStatus" 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>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>