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

i18n/zh-CN.js

@@ -50,6 +50,8 @@ const saleOrder = {
 //资金管理
 const accountsManage = { 
   availableBalance:'可用余额',
+  totalWriteOffAmount:'核销总额',
+  totalWriteOffOrder:'核销单据',
   payment:'付款',
   collection:'收款',
 

package-accounts-manage/pages/accounting-verification/accounting-verification.js

@@ -1,20 +1,102 @@
-// package-accounts-manage/pages/receipt/receipt.js
+const Constants = require('@/utils/Constants.js');
+const util = require('@/utils/util.js')
+const mixins = require('@/mixins/index.js')
 Page({
-
+  mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
-    statusItem: {
-      text: '沈阳大东部'
-    },
-    statusItem2: {
-      text: '张三三'
-    },
-    createTimeType: {
-      text: '本日',
-      value: 3
-    },
+    // 查询条件
+    searchContent: [{ code: 'createtime', title: '本月', defaultValue: 3, searchType: Constants.searchType.date }, { code: 'choose', title: '筛选', searchType: Constants.searchType.pick }],
+    // 查询条件-筛选
+    pullMenuList: [{ code: 'purchaseStatus', pullType: 'mSelect', typeName: 'purchaseStatus' },
+    { code: 'contactName', dataType: '' },
+    { code: 'contactPhones', dataType: '' },
+    { code: 'addressFull', dataType: '' },
+    { code: 'makingTime', dataType: 'date' }, { code: 'deliveryTime', dataType: 'date' }],
+    // 列表区（内容）
+    contentList: [{ name: 'orderNo', title: '核销单号' },
+   { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: '' },], title: '门店/业务员' },  { name: 'makingTime', title: '核销日期' },],
+   contentObj: {
+    '预收冲应收': [{ name: 'orderNo', title: '核销单号' },
+    { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: '' },], title: '门店/业务员' },  { name: 'makingTime', title: '核销日期' },],
+    '预付冲应付':  [{ name: 'orderNo', title: '核销单号' },
+    { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: '' },], title: '门店/业务员' },  { name: 'makingTime', title: '核销日期' },],
+    '应收转应收': [{ name: 'orderNo', title: '核销单号' },
+    { name: 'staffName1', title: '转出业务员' },
+    { name: 'cName', title: '转入客户' },
+    { name: 'staffName2', title: '转入业务员' },
+     { name: 'makingTime', title: '核销日期' },],
+    '应付转应付':  [{ name: 'orderNo', title: '核销单号' },
+    { name: 'supplierName1', title: '转入供销商' },
+    { name: 'makingTime', title: '核销日期' },]
+  },
+    // 弹出按钮
+    buttonList: [{ name: 'follow', title: '采购作废' }, { name: 'followTask', title: '冲正重开' }, { name: 'purchase-return-repla-sup', title: '采购退货' },
+    { name: 'collection', title: '采购退货冲正' }, { name: 'merge', title: '打印票据' }],
+    totallength: 6000, //视图下方提醒数量
+    selectTotallength: 12,
+    selectlength: 5,
+    // 路由
+    routeObjName: 'other-expenditure-orders',
+    tableData: [],
+    active: 0,
+  },
+  getData(){
+    this.setData({
+      totallength: 6000,
+      tableData: [
+        {
+          supplierName: '张曼曼',
+          displayStatus: '预收冲应收',
+          makingTime: '2022-04-04',
+          orderNo: 'FQ202207061423001',
+          sumAccount:2000,
+          staffName:"王丽丽",
+          orgName:"沈河家天下店",
+          collectStatus:'totalWriteOffOrder',
+          collectStatusAmount:1,
+          backgroundColor: '#95A8CB',
+        },
+        {
+          supplierName: '恒洁卫浴厂家',
+          displayStatus: '预付冲应付',
+          makingTime: '2022-04-04',
+          orderNo: 'FQ202207061423001',
+          staffName:"王丽丽",
+          orgName:"沈河家天下店",
+          sumAccount:2000,
+          collectStatus:'totalWriteOffOrder',
+          backgroundColor: '#95A8CB',
+          collectStatusAmount:1,
+        },
+        {
+          supplierName: '张曼曼',
+          displayStatus: '应收转应收',
+          makingTime: '2022-04-04',
+          orderNo: 'FQ202207061423001',
+          cName:'李磊',
+          staffName1:"王丽丽",
+          staffName2:"王丽丽",
+          sumAccount:2000,
+          collectStatus:'totalWriteOffOrder',
+          backgroundColor: '#95A8CB',
+          collectStatusAmount:1,
+        },
+        {
+          supplierName: '恒洁卫浴厂家',
+          supplierName1: '箭牌厂家',
+          displayStatus: '应付转应付',
+          makingTime: '2022-04-04',
+          orderNo: 'FQ202207061423001',
+          sumAccount:2000,
+          collectStatus:'totalWriteOffOrder',
+          backgroundColor: '#95A8CB',
+          collectStatusAmount:1,
+        }
+      ]
+    })
   },
   //抽屉打开
   openSearchPop() {
@@ -28,16 +110,16 @@ Page({
     })
   },
 
-  onCloseShare(){
+  onCloseShare() {
     this.setData({
       showShare: false,
     })
   },
-    /**
-   * @desc : 抽屉离焦关闭
-   * @author : 于继渤
-   * @date : 2022/5/27 12:16
-   */
+  /**
+ * @desc : 抽屉离焦关闭
+ * @author : 于继渤
+ * @date : 2022/5/27 12:16
+ */
   onClose() {
     this.setData({
       show: false
@@ -45,12 +127,12 @@ Page({
     this.selectComponent("#pick").toggle(false) //取消选中样式
   },
 
-  toAdd(){
+  toAdd() {
     wx.navigateTo({
       url: './add/add',
     })
   },
-  toDetail(){
+  toDetail() {
     wx.navigateTo({
       url: './detail/detail',
     })
@@ -59,35 +141,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    this.setData({
-      totallength: 6000,
-      tableData: [
-        {
-          supplierName: '张曼曼',
-          displayStatus: '预收冲应收',
-          makingTime: '2022-04-04',
-          orderNo: 'FQ202207061423001',
-        },
-        {
-          supplierName: '恒洁卫浴厂家',
-          displayStatus: '预付冲应付',
-          makingTime: '2022-04-04',
-          orderNo: 'FQ202207061423001',
-        },
-        {
-          supplierName: '张曼曼',
-          displayStatus: '应收转应收',
-          makingTime: '2022-04-04',
-          orderNo: 'FQ202207061423001',
-        },
-        {
-          supplierName: '恒洁卫浴厂家',
-          displayStatus: '应付转应付',
-          makingTime: '2022-04-04',
-          orderNo: 'FQ202207061423001',
-        }
-      ]
-    })
+
   },
 
   /**

package-accounts-manage/pages/accounting-verification/accounting-verification.wxml

@@ -1,246 +1,24 @@
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 <van-sticky scroll-top="0">
-  <van-search model:value="{{ searchText }}" bind:change="onSearchText" bind:search="doSearch" placeholder="输入客户名称/地址/电话"> </van-search>
-  <van-dropdown-menu active-color="#1B365D">
-    <!-- 创建时间 -->
-    <van-dropdown-item id="create-time-type" title="{{createTimeType.text}}">
-      <dk-dropdown-date id="createtime" dateType="createtime" blankFlag="{{false}}" defaultValue='{{createTimeType.value}}' bind:dateCommit='dateCommit'></dk-dropdown-date>
-    </van-dropdown-item>
-
-    <!-- 筛选 -->
-    <van-dropdown-item id='pick' title="{{'筛选'+ (searchFormNumber ? '['+searchFormNumber+']' : '')}}" bind:open='openSearchPop' bind:close='closeSearchPop' data-type="pick" />
-
-  </van-dropdown-menu>
-
+  <!-- 查询条件 -->
+  <dk-dropdown-menu model:searchForm="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','telephone'])}}">
+  </dk-dropdown-menu>
 </van-sticky>
-
-
+<!-- 暂无数据 -->
 <van-empty wx:if="{{tableData.length<=0}}" description="暂无数据" />
-
-<view wx:for="{{tableData}}" data-item="{{item}}" wx:key="index" class="main-class">
-  <!-- 列表上半部分 -->
-  <view class="main-foot" style="position: relative;border-radius: 15rpx;">
-
-    <view class="table-content" bind:tap="toDetail" data-item="{{item}}">
-      <view class="table-content-row">
-        <view class="order-and-status">
-          <view catchtap="toCustomer" style="width: 39rpx;height: 39rpx;background-color: #95A8CB;border-radius:50%;margin-top: 5rpx;">
-            <view style="width: 39rpx; height: 39rpx;text-align: center;">
-              <van-image round width="28rpx" height="28rpx" src="/static/img/purchase-order-icon.png" />
-            </view>
-          </view>
-          <!-- 供应商 -->
-          <view catchtap="toCustomer" data-item="{{item}}" style="width:calc(70% - 39rpx);display:flex;padding-left: 14rpx;font-size: 30rpx;">
-            <dk-text bind:tap="toCustomer" data-item="{{item}}" textDecoration="underline" fontSize="15px" value="{{item.supplierName ? item.supplierName : ''}}"></dk-text>
-          </view>
-
-
-          <!-- 状态 -->
-          <view style="width: calc(30%); height: 49rpx;padding-right:0rpx;" data-item="{{item}}">
-            <view style="{{item.displayStatus == '暂存'  ?  'height: 49rpx;border-radius: 6rpx;background-color: #E4002B;text-align: center;' : 'height: 49rpx;border-radius: 6rpx;background-color:#9FAEE5;text-align: center;'}}">
-              <text style=" font-size: 13px;color:  #FFFFFF;">{{item.displayStatus }}</text>
-            </view>
-          </view>
-          <!-- 三个小点 -->
-          <view class="oas-title-value" data-item="{{item}}" catchtap="onclik">
-            <van-icon size="25" name="ellipsis" color="#1B365D" />
-          </view>
-        </view>
-      </view>
-
-
-      <!-- 订单单号 -->
-      <view class="table-content-row">
-        <view style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="核销单号" copyValue="{{item.orderNo}}"></dk-text>
-          </view>
-          <view class="table-content-class" style="display: flex; width: 100%;justify-content: space-between;">
-            {{item.orderNo}}
-          </view>
-        </view>
-      </view>
-
-
-
-
-      <view class="table-content-row">
-        <view wx:if="{{item.displayStatus == '预收冲应收' || item.displayStatus == '预付冲应付'}}" style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="门店/业务员" copyValue="{{item.addressFull ? item.addressFull : ''}}"></dk-text>
-          </view>
-          <view class="table-content-class">
-            {{ '佛山居然店 | 王丽丽'}}
-          </view>
-        </view>
-
-
-
-        <view wx:if="{{item.displayStatus == '应收转应收'}}" style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="转出业务员" copyValue="{{item.addressFull ? item.addressFull : ''}}"></dk-text>
-          </view>
-          <view class="table-content-class">
-            {{ '王丽丽'}}
-          </view>
-        </view>
-
-        <view wx:if="{{item.displayStatus == '应付转应付'}}" style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="转入供应商" copyValue="{{item.addressFull ? item.addressFull : ''}}"></dk-text>
-          </view>
-          <view class="table-content-class">
-            {{ '箭牌厂家'}}
-          </view>
-        </view>
-
-      </view>
-      <view wx:if="{{item.displayStatus == '应收转应收'}}" class="table-content-row">
-        <view style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="转入客户" copyValue="{{item.addressFull ? item.addressFull : ''}}"></dk-text>
-          </view>
-          <view class="table-content-class">
-            {{ '李磊'}}
-          </view>
-        </view>
-      </view>
-
-      <view wx:if="{{item.displayStatus == '应收转应收'}}" class="table-content-row">
-        <view style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="转入业务员" copyValue="{{item.addressFull ? item.addressFull : ''}}"></dk-text>
-          </view>
-          <view class="table-content-class">
-            {{ '王丽丽'}}
-          </view>
-        </view>
-      </view>
-
-
-      <!-- 预计收货日期 -->
-      <view class="table-content-row">
-        <view style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="核销时间"></dk-text>
-          </view>
-          <view class="table-content-class">
-            {{item.makingTime}}
-          </view>
-        </view>
-      </view>
-
-
-
-
-      <!-- 核销总额状态和核销总额 -->
-      <view class="bottom-bar" style="background-color:white;border-radius: 0px  0px 15rpx 15rpx;">
-        <view style="display: flex;width: 100%;height: 115rpx;background: #FBF6EF;border-radius: 0px  0px 12rpx 12rpx;align-items: center;">
-
-          <view style="width: 100%;padding-top: 5px; ">
-            <view style="width: 100%;border-radius: 10px; text-align: left;padding-left:15px ;">
-              <view style="color: #1B365D;font-size: 28rpx;">
-                <view>核销单据</view>
-                <view>{{ '共 1 单'}}</view>
-
-              </view>
-            </view>
-
-          </view>
-
-          <view style=" width: 100%;padding-top: 5px;text-align: right; ">
-
-            <view style="height: 35px; width: 281.3rpx;background: #F2E0BC;border-radius: 10px; text-align: center;margin : auto;">
-              <view style="color: #A5814A;padding-top:7px;font-size: 26rpx;align-items: center;">
-                <view style="width: 50%;text-align: right;">
-
-                </view>
-                <dk-cell height="46rpx" spaceWidth="15rpx" fontSize="15" contentColor="#CAA977" fontWeight="" title="核销总额" content="{{2000}}"></dk-cell>
-
-              </view>
-            </view>
-          </view>
-        </view>
-
-      </view>
-
-
-    </view>
-  </view>
-</view>
+<!-- 列表区 -->
+<dk-list list="{{tableData}}" titleCorner="" title="supplierName" status="displayStatus" content="{{contentList}}" collectCol="sumAccount" collectName="{{$t['totalWriteOffAmount']}}" 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>
-<view style="height: 220rpx;"></view>
-
-<!-- 卡片右上角 -->
-<van-popup show="{{showShare}}" position="bottom" bind:close="onCloseShare" custom-class="function-pop-class">
-  <van-cell-group border="{{false}}" custom-class="function-cell-group">
-    <van-grid square border="{{false}}" icon-size="42px">
-
-
-
-      <!--采购退货-->
-      <van-grid-item use-slot catchtap="toPurchaseReturns" data-item="{{bottomItem}}">
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/return.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="取消核销"></dk-text>
-        </view>
-      </van-grid-item>
-
-
-      <!--订单打印-->
-      <van-grid-item use-slot catchtap="toOrderPrint" data-item="{{bottomItem}}">
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/purchase-order-print.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="订单打印"></dk-text>
-        </view>
-      </van-grid-item>
-
-
-
 
+<view style="height: 200rpx;"></view>
 
 
-
-
-
-
-    </van-grid>
-
-
-
-
-  </van-cell-group>
-  <view class="popup-button">
-    <van-button type="default" custom-class="pop-button-class" size="large" catchtap="onCloseShare">取消
-    </van-button>
-  </view>
-</van-popup>
-
 <!-- 新建按钮 -->
 <dk-save-bottom purchasePriceFlag="{{false}}" flagTypeName="accounting-verification" selectTotallength="{{selectTotallength}}" selectlength="{{selectlength}}" totallength="{{totallength}}" bind:submit="toAdd" submitFlag="{{true}}" />
 
 
-<!-- 筛选抽屉 -->
-<dk-side-pull-menu show_p="{{show}}" searchForm="{{searchForm}}" bind:clearSearchForm="clearSearchForm" bind:doSearchData="doSearchData" bind:onClose="onClose">
-
-  <van-cell-group>
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}" border="{{ false }}" label="核销总额单号" placeholder="请输入核销总额单号" data-key="customerPhone" color="#95A8CB" bind:change="onChangeField"></van-field>
-
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}" border="{{ false }}" label="客户名称" placeholder="请输入客户名称" data-key="customerPhone" color="#95A8CB" bind:change="onChangeField"></van-field>
-
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}" border="{{ false }}" label="客户电话" placeholder="请输入客户电话" data-key="customerPhone" color="#95A8CB" bind:change="onChangeField"></van-field>
-
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}" border="{{ false }}" label="业务员" placeholder="请输入业务员" data-key="customerPhone" color="#95A8CB" bind:change="onChangeField"></van-field>
-
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}" border="{{ false }}" label="业务部门" placeholder="请输入业务部门" data-key="customerPhone" color="#95A8CB" bind:change="onChangeField"></van-field>
-
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}" border="{{ false }}" label="核销总额日期" placeholder="请输入核销总额日期" data-key="customerPhone" color="#95A8CB" bind:change="onChangeField"></van-field>
 
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}" border="{{ false }}" label="可用金额排序" placeholder="请输入可用金额排序" data-key="customerPhone" color="#95A8CB" bind:change="onChangeField"></van-field>
-  </van-cell-group>
 
-</dk-side-pull-menu>

package-accounts-manage/pages/accounting-verification/accounting-verification.wxss

@@ -1,394 +0,0 @@
-page {
-  background: #F5F5F5;
-}
-
-.list {
-  width: calc(100%-20rpx);
-  padding: 20rpx;
-}
-
-.van-cell__value {
-  width: 72% !important;
-  text-align: left !important;
-  -webkit-flex: auto !important;
-  flex: auto !important;
-}
-
-.van-cell__title {
-  width: 28% !important;
-  -webkit-flex: auto !important;
-  flex: auto !important;
-  color: #6f7071 !important;
-}
-
-.date-and-amount {
-  margin-top: 7rpx;
-  display: flex;
-  width: 100%;
-  justify-content: space-around;
-}
-
-.daa-date {
-  width: 45%;
-  margin-top: 7rpx;
-  font-size: 3.5vw;
-  color: #808080;
-  line-height: 60rpx;
-  text-align: right;
-}
-
-.order-and-status {
-  display: flex;
-  width: 100%;
-  justify-content: space-around;
-}
-
-.order-and-status-sales{
-  display: flex;
-  margin-left: 70rpx;
-  width: calc(100% - 70rpx);
-  justify-content: space-around;
-}
-
-.oas-no {
-  width: 50%;
-  font-size: 3.8vw;
-  color: #3b3b3b;
-  text-align: left;
-}
-
-.oas-status {
-  width: 30%;
-  font-size: 3.5vw;
-  color: #1989fa;
-  text-align: right;
-
-}
-
-.daa-amount {
-  margin-top: 7rpx;
-  width: 75%;
-  font-size: 4vw;
-  color: #e97e04;
-  text-align: right;
-  line-height: 60rpx;
-}
-
-.daa-amount-cun {
-  margin-top: 7rpx;
-  width: 40%;
-  font-size: 4vw;
-  color: #1989FA;
-  text-align: right;
-  line-height: 60rpx;
-}
-
-.horizontal-bar {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-}
-
-.customer-name {
-  width: 80% !important;
-  font-size: 3.5vw;
-  line-height: 50rpx;
-  margin-top: 7rpx;
-  color: #323233;
-}
-
-.btn-to-cun {
-  margin-top: 7rpx;
-  width: 50%;
-  text-align: right;
-}
-
-
-.van-picker__toolbar {
-  display: none !important;
-}
-
-/*新加的弹窗样式*/
-.van-field__label {
-  color: #6f7071 !important;
-}
-
-.van-field__input {
-  color: #6f7071 !important;
-}
-
-.pop-search-view {
-  float: right;
-  margin-right: 20rpx;
-  color: #ffffff;
-  font-size: 44rpx;
-}
-
-.pop-search-item-content {
-  padding: 0 3% 0 3%;
-}
-
-.pop-search-item-content-button {
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-}
-
-.pop-search-item-content-button-custom {
-  border: 0 !important;
-  margin: 0 !important;
-  color: #CC3333;
-  background-color: white;
-}
-
-.pop-search-item-content-button-custom::after {
-  border: 1rpx solid #CC3333 !important;
-  background: transparent !important;
-}
-
-.pop-search-item-content-button-custom-gray {
-  border: 0 !important;
-  margin: 0 !important;
-  color: #c1c1c1;
-  background-color: white;
-}
-
-.pop-search-item-content-button-custom-gray::after {
-  border: 1rpx solid #c1c1c1 !important;
-  background: transparent !important;
-}
-
-.scroll {
-  height: calc(100%);
-}
-
-.table-row-custom {
-  display: flex;
-  width: 100%;
-  flex-direction: row;
-  margin-top: 1px;
-
-}
-
-.cn-a-b {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-}
-
-.customer-name {
-  width: 50%;
-  font-size: 4vw;
-  line-height: 50rpx;
-  color: #323233;
-  word-break: break-all;
-}
-
-.customer-name2 {
-  width: 100%;
-  font-size: 4vw;
-  line-height: 50rpx;
-  color: #323233;
-  word-break: break-all;
-}
-
-.btn-to-cun {
-  display: inline;
-  width: 100%;
-  text-align: right;
-
-}
-
-.telephone {
-  display: flex;
-  margin-top: 7rpx;
-  font-size: 3.5vw;
-  line-height: 50rpx;
-  color: #323233;
-  width: 55%;
-
-}
-
-.category {
-  display: flex;
-  margin-top: 7rpx;
-  font-size: 3.5vw;
-  line-height: 50rpx;
-  color: #323233;
-  width: 45%;
-}
-
-.address {
-  margin-top: 7rpx;
-  word-break: break-all;
-  white-space: pre-wrap;
-  font-size: 3.5vw;
-  line-height: 50rpx;
-  color: #323233;
-  width: 89%;
-}
-
-.staffname {
-  margin-top: 7rpx;
-  font-size: 3.5vw;
-  line-height: 50rpx;
-  color: #323233;
-  width: 100%;
-  text-align: right;
-}
-
-.address-staffname {
-  display: flex;
-  margin-top: 7rpx;
-  width: 100%;
-}
-
-.image-small {
-  color: #b3b3b3;
-  font-size: 14px;
-}
-
-.hr {
-  width: 100%;
-  height: 2rpx;
-  margin-top: 15rpx;
-  margin-bottom: 15rpx;
-  /* margin-left: 37.5rpx; */
-  background-color: var(--divider-text-color, #e0e1e2);
-}
-
-
-
-
-
-
-
-
-.oas-title-value {
-  width: 80rpx;
-  font-size: 5px;
-  text-align: right;
-  padding-left: 5rpx;
-  color: #1989fa;
-}
-
-
-.value-class {
-  text-align: right !important;
-  font-size: 26rpx !important;
-}
-
-.title-class .van-field__label{
-  font-size: 14px;
-  color:#2E3853 !important;
-  font-weight: 500;
-}
-
-.oas-status-two {
-  width: 40%;
-  font-size: 3.8vw;
-  color: #1989fa;
-  text-align: center;
-}
-
-.time-value-class {
-  color: #1B365D !important;
-  font-weight: 400;
-}
-
-
-
-/* 字体设置 */
-.font-setting {
-  font-size: 3.9vw;
-}
-.bottom-bar{
-  border-radius: 15px;
-  display: flex;
-}
-
-
-
-
-/* 2022/07/25 样式引用*/
-
-
-.van-tabs__scroll{
-  background-color: #F5F5F5 !important;
-}
-
-.van-dropdown-menu__title{
-  color: #1B365D !important;
-}
-
-.van-tabs-class{
-  background: #fff !important;
-}
-
-.dk-font{
-  font-size: 13px;
-  color: #1B365D;
-  font-weight: bold;
-}
-
-/**品类*/
-.category-class{
-  width: 40%;
-  font-size: 15px;
-  color: #95A8CB;
-  align-items: center;
-  display: flex;
-}
-/**合计金额*/
-.totalamount-class{
-  width: 60%;
-  text-align: right !important;
-}
-.modal-app {
-  width: 80%;
-  border-radius: 15rpx;
-}
-
-.modal-button {
-  width: 50%;
-}
-.button-pop-cell-class{
-  border-radius: 15rpx !important;
-}
-
-.button-pop-class{
-  width: 640rpx !important;
-  height: 88rpx !important;
-  background: #1B365D !important;
-  border-radius: 15rpx !important;
-  border: none !important;
-}
-
-.input-class{
-  text-align: left !important;
-  height: 70px !important;
-  color: #1B365D !important;
-}
-.corner-view {
-  position: absolute;
-  /* 扇形弧度 */
-  border-radius: 0 0 100rpx 0; 
-  /* 左上弧度 */
-  border-top-left-radius: 15rpx;
-  /* 位置 */
-  top: 0;
-  left: 0;
-  padding: 14rpx;
-  width: 70rpx;
-  height: 56rpx;
-  background-color: #E3DCD1; 
-
-}
-.corner-view-text{
-  transform: rotate(-45deg);
-    /* 字体颜色 */
-    color: #B19264;
-    font-size: 24rpx;
-    font-weight: 600;
-    font-size: 26rpx;
-}

package-accounts-manage/pages/funds-transfer/funds-transfer.js

@@ -1,15 +1,78 @@
-// package-accounts-manage/pages/receipt/receipt.js
+const Constants = require('@/utils/Constants.js');
+const util = require('@/utils/util.js')
+const mixins = require('@/mixins/index.js')
 Page({
-
+  mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
-
-    createTimeType: {
-      text: '本日',
-      value: 2
-    },
+   // 查询条件
+   searchContent: [{ code: 'createtime', title: '本月', defaultValue: 3, searchType: Constants.searchType.date }, { code: 'choose', title: '筛选', searchType: Constants.searchType.pick }],
+   // 查询条件-筛选
+   pullMenuList: [{ code: 'purchaseStatus', pullType: 'mSelect', typeName: 'purchaseStatus' },
+   { code: 'contactName', dataType: '' },
+   { code: 'contactPhones', dataType: '' },
+   { code: 'addressFull', dataType: '' },
+   { code: 'makingTime', dataType: 'date' }, { code: 'deliveryTime', dataType: 'date' }],
+   // 列表区（内容）
+   contentList: [{ name: 'orderNo', title: '调整单号' },
+   { name: 'account' ,title: '转入账户' },
+   { name: 'makingTime', title: '转账日期' } ,  { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: '' },], title: '责任信息' },],
+   
+   // 弹出按钮
+   buttonList: [{ name: 'follow', title: '采购作废' }, { name: 'followTask', title: '冲正重开' }, { name: 'purchase-return-repla-sup', title: '采购退货' },
+   { name: 'collection', title: '采购退货冲正' }, { name: 'merge', title: '打印票据' }],
+   totallength: 6000, //视图下方提醒数量
+   selectTotallength: 12,
+   selectlength: 5,
+   // 路由
+   routeObjName: 'other-expenditure-orders',
+   tableData: [],
+   active: 0,
+  },
+  getData(){
+    this.setData({
+      totallength: 6000,
+      tableData: [
+        {
+          supplierName: '农行0660',
+          account:'建行002',
+          displayStatus: '付款单',
+          makingTime: '2022-04-04',
+          orderNo: 'FQ202207061423001',
+          orgName:'沈河家天下店',
+          staffName:'李佳佳',
+          sumAccount:2000,
+          backgroundColor: '#95A8CB',
+          collectStatus:'null',
+        },
+        {
+          supplierName: '农行0660',
+          account:'建行002',
+          displayStatus: '预付款',
+          makingTime: '2022-04-04',
+          orderNo: 'FQ202207061423001',
+          orgName:'沈河家天下店',
+          staffName:'李佳佳',
+          sumAccount:2000,
+          backgroundColor: '#95A8CB',
+          collectStatus:'null',
+        },
+        {
+          supplierName: '张先生',
+          account:'建行002',
+          displayStatus: '其他付款',
+          makingTime: '2022-04-04',
+          orderNo: 'FQ202207061423001',
+          orgName:'沈河家天下店',
+          backgroundColor: '#95A8CB',
+          staffName:'李佳佳',
+          sumAccount:2000,
+          collectStatus:'null',
+        }
+      ]
+    })
   },
   //抽屉打开
   openSearchPop() {
@@ -54,29 +117,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    this.setData({
-      totallength: 6000,
-      tableData: [
-        {
-          supplierName: '农行0660',
-          displayStatus: '付款单',
-          makingTime: '2022-04-04',
-          orderNo: 'FQ202207061423001',
-        },
-        {
-          supplierName: '农行0660',
-          displayStatus: '预付款',
-          makingTime: '2022-04-04',
-          orderNo: 'FQ202207061423001',
-        },
-        {
-          supplierName: '张先生',
-          displayStatus: '其他付款',
-          makingTime: '2022-04-04',
-          orderNo: 'FQ202207061423001',
-        }
-      ]
-    })
+
   },
 
   /**

package-accounts-manage/pages/funds-transfer/funds-transfer.wxml

@@ -1,212 +1,23 @@
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 <van-sticky scroll-top="0">
-  <van-search model:value="{{ searchText }}" bind:change="onSearchText" bind:search="doSearch" placeholder="输入单号/账户"> </van-search>
-  <van-dropdown-menu active-color="#1B365D">
-    <!-- 创建时间 -->
-    <van-dropdown-item id="create-time-type" title="{{createTimeType.text}}">
-      <dk-dropdown-date id="createtime" dateType="createtime" blankFlag="{{false}}" defaultValue='{{createTimeType.value}}' bind:dateCommit='dateCommit'></dk-dropdown-date>
-    </van-dropdown-item>
-
-    <!-- 筛选 -->
-    <van-dropdown-item id='pick' title="{{'筛选'+ (searchFormNumber ? '['+searchFormNumber+']' : '')}}" bind:open='openSearchPop' bind:close='closeSearchPop' data-type="pick" />
-
-  </van-dropdown-menu>
-
+  <!-- 查询条件 -->
+  <dk-dropdown-menu model:searchForm="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','telephone'])}}">
+  </dk-dropdown-menu>
 </van-sticky>
-
-
+<!-- 暂无数据 -->
 <van-empty wx:if="{{tableData.length<=0}}" description="暂无数据" />
-
-<view wx:for="{{tableData}}" data-item="{{item}}" wx:key="index" class="main-class">
-  <!-- 列表上半部分 -->
-  <view class="main-foot" style="position: relative;border-radius: 15rpx;">
-
-    <view class="table-content" bind:tap="toDetail" data-item="{{item}}">
-      <view class="table-content-row">
-        <view class="order-and-status">
-          <view catchtap="toCustomer" style="width: 39rpx;height: 39rpx;background-color: #95A8CB;border-radius:50%;margin-top: 5rpx;">
-            <view style="width: 39rpx; height: 39rpx;text-align: center;">
-              <van-image round width="28rpx" height="28rpx" src="/static/img/purchase-order-icon.png" />
-            </view>
-          </view>
-          <!-- 供应商 -->
-          <view catchtap="toCustomer" data-item="{{item}}" style="width:calc(70% - 39rpx);display:flex;padding-left: 14rpx;font-size: 30rpx;">
-            <dk-text bind:tap="toCustomer" data-item="{{item}}" textDecoration="underline" fontSize="15px" value="{{item.supplierName ? item.supplierName : ''}}"></dk-text>
-          </view>
-
-
-          <!-- 状态 -->
-          <view style="width: calc(20%); height: 49rpx;padding-right:0rpx;" data-item="{{item}}" >
-            <view style="{{item.displayStatus == '暂存'  ?  'height: 49rpx;border-radius: 6rpx;background-color: #E4002B;text-align: center;' : 'height: 49rpx;border-radius: 6rpx;background-color:#9FAEE5;text-align: center;'}}">
-              <text style=" font-size: 13px;color:  #FFFFFF;">{{item.displayStatus }}</text>
-            </view>
-          </view>
-          <!-- 三个小点 -->
-          <view class="oas-title-value" data-item="{{item}}" catchtap="onclik">
-            <van-icon size="25" name="ellipsis" color="#1B365D" />
-          </view>
-        </view>
-      </view>
-
-
-      <!-- 订单单号 -->
-      <view class="table-content-row">
-        <view style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="调整单号" copyValue="{{item.orderNo}}"></dk-text>
-          </view>
-          <view class="table-content-class" style="display: flex; width: 100%;justify-content: space-between;">
-            {{item.orderNo}}
-          </view>
-        </view>
-      </view>
- 
-
-
-
-      <!-- 收货地址 -->
-      <view class="table-content-row">
-        <view style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="转入账户" copyValue="{{ '建行0002'}}"></dk-text>
-          </view>
-          <view class="table-content-class">
- 
-            {{ '建行0002'}}
-          </view>
-        </view>
-      </view>
-
-      <!-- 预计收货日期 -->
-      <view class="table-content-row">
-        <view style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="转账日期"></dk-text>
-          </view>
-          <view class="table-content-class">
-            {{item.makingTime}}
-          </view>
-        </view>
-      </view>
-
-
-      <view class="table-content-row">
-        <view style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="责任信息"></dk-text>
-          </view>
-          <view class="table-content-class">
-            {{'沈河家天下店 丨 李佳佳'}}
-          </view>
-        </view>
-      </view>
-
-      
-
-    <!-- 收款状态和收款 -->
-    <view class="bottom-bar" style="background-color:white;border-radius: 0px  0px 15rpx 15rpx;">
-    <view style="display: flex;width: 100%;height: 115rpx;background: #FBF6EF;border-radius: 0px  0px 12rpx 12rpx;align-items: center;">
-
-      <view style="width: 100%;padding-top: 5px; ">
-
-
-      </view>
-
-      <view style=" width: 100%;padding-top: 5px;text-align: right; ">
-      
-        <view style="height: 35px; width: 281.3rpx;background: #F2E0BC;border-radius: 10px; text-align: center;margin : auto;">
-          <view style="color: #A5814A;padding-top:7px;font-size: 26rpx;align-items: center;">
-            <view style="width: 50%;text-align: right;">
-
-            </view>
-            <dk-cell height="46rpx" spaceWidth="15rpx" fontSize="15" contentColor="#CAA977" fontWeight="" title="金额" content="{{2000}}"></dk-cell>
-         
-          </view>
-        </view>
-      </view>
-    </view>
-
-  </view>
-
-
-    </view>
-  </view>
-</view>
+<!-- 列表区 -->
+<dk-list list="{{tableData}}" titleCorner="" title="supplierName" status="displayStatus" content="{{contentList}}" collectCol="sumAccount" collectName="金额" 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>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>
-<view style="height: 220rpx;"></view>
-
-<!-- 卡片右上角 -->
-<van-popup show="{{showShare}}" position="bottom" bind:close="onCloseShare" custom-class="function-pop-class">
-  <van-cell-group border="{{false}}" custom-class="function-cell-group">
-    <van-grid square border="{{false}}" icon-size="42px">
-
-  
-     
-
-      <!--采购退货-->
-      <van-grid-item  use-slot catchtap="toPurchaseReturns" data-item="{{bottomItem}}">
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/return.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="取消转账"></dk-text>
-        </view>
-      </van-grid-item>
-
-
-    <!--订单打印-->
-    <van-grid-item use-slot catchtap="toOrderPrint" data-item="{{bottomItem}}" 
-  >
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/purchase-order-print.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="打印票据"></dk-text>
-        </view>
-      </van-grid-item>
-
-
-
-
-
-
-
 
+<view style="height: 200rpx;"></view>
 
 
-    </van-grid>
-
-
-
-
-  </van-cell-group>
-  <view class="popup-button">
-    <van-button type="default" custom-class="pop-button-class" size="large" catchtap="onCloseShare">取消
-    </van-button>
-  </view>
-</van-popup>
 
 <!-- 新建按钮 -->
 <dk-save-bottom purchasePriceFlag="{{false}}" flagTypeName="funds-transfer" selectTotallength="{{selectTotallength}}" selectlength="{{selectlength}}" totallength="{{totallength}}" bind:submit="toAdd" submitFlag="{{true}}" />
 
 
-<!-- 筛选抽屉 -->
-<dk-side-pull-menu show_p="{{show}}" searchForm="{{searchForm}}" bind:clearSearchForm="clearSearchForm" bind:doSearchData="doSearchData" bind:onClose="onClose">
-
-  <van-cell-group>
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}"  border="{{ false }}" label="收款单号" placeholder="请输入收款单号" data-key="customerPhone"color="#95A8CB" bind:change="onChangeField"></van-field>
-
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}"  border="{{ false }}" label="客户名称" placeholder="请输入客户名称" data-key="customerPhone"color="#95A8CB" bind:change="onChangeField"></van-field>
-
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}"  border="{{ false }}" label="客户电话" placeholder="请输入客户电话" data-key="customerPhone"color="#95A8CB" bind:change="onChangeField"></van-field>
-
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}"  border="{{ false }}" label="业务员" placeholder="请输入业务员" data-key="customerPhone"color="#95A8CB" bind:change="onChangeField"></van-field>
-
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}"  border="{{ false }}" label="业务部门" placeholder="请输入业务部门" data-key="customerPhone"color="#95A8CB" bind:change="onChangeField"></van-field>
-
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}"  border="{{ false }}" label="收款日期" placeholder="请输入收款日期" data-key="customerPhone"color="#95A8CB" bind:change="onChangeField"></van-field>
-
-    <van-field title-width="150rpx" input-align="right" label-class="title-class" input-class="time-value-class" value="{{searchForm.contactPhones}}"  border="{{ false }}" label="可用金额排序" placeholder="请输入可用金额排序" data-key="customerPhone"color="#95A8CB" bind:change="onChangeField"></van-field>
-  </van-cell-group>
-
-</dk-side-pull-menu>

package-accounts-manage/pages/funds-transfer/funds-transfer.wxss

@@ -1,394 +0,0 @@
-page {
-  background: #F5F5F5;
-}
-
-.list {
-  width: calc(100%-20rpx);
-  padding: 20rpx;
-}
-
-.van-cell__value {
-  width: 72% !important;
-  text-align: left !important;
-  -webkit-flex: auto !important;
-  flex: auto !important;
-}
-
-.van-cell__title {
-  width: 28% !important;
-  -webkit-flex: auto !important;
-  flex: auto !important;
-  color: #6f7071 !important;
-}
-
-.date-and-amount {
-  margin-top: 7rpx;
-  display: flex;
-  width: 100%;
-  justify-content: space-around;
-}
-
-.daa-date {
-  width: 45%;
-  margin-top: 7rpx;
-  font-size: 3.5vw;
-  color: #808080;
-  line-height: 60rpx;
-  text-align: right;
-}
-
-.order-and-status {
-  display: flex;
-  width: 100%;
-  justify-content: space-around;
-}
-
-.order-and-status-sales{
-  display: flex;
-  margin-left: 70rpx;
-  width: calc(100% - 70rpx);
-  justify-content: space-around;
-}
-
-.oas-no {
-  width: 50%;
-  font-size: 3.8vw;
-  color: #3b3b3b;
-  text-align: left;
-}
-
-.oas-status {
-  width: 30%;
-  font-size: 3.5vw;
-  color: #1989fa;
-  text-align: right;
-
-}
-
-.daa-amount {
-  margin-top: 7rpx;
-  width: 75%;
-  font-size: 4vw;
-  color: #e97e04;
-  text-align: right;
-  line-height: 60rpx;
-}
-
-.daa-amount-cun {
-  margin-top: 7rpx;
-  width: 40%;
-  font-size: 4vw;
-  color: #1989FA;
-  text-align: right;
-  line-height: 60rpx;
-}
-
-.horizontal-bar {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-}
-
-.customer-name {
-  width: 80% !important;
-  font-size: 3.5vw;
-  line-height: 50rpx;
-  margin-top: 7rpx;
-  color: #323233;
-}
-
-.btn-to-cun {
-  margin-top: 7rpx;
-  width: 50%;
-  text-align: right;
-}
-
-
-.van-picker__toolbar {
-  display: none !important;
-}
-
-/*新加的弹窗样式*/
-.van-field__label {
-  color: #6f7071 !important;
-}
-
-.van-field__input {
-  color: #6f7071 !important;
-}
-
-.pop-search-view {
-  float: right;
-  margin-right: 20rpx;
-  color: #ffffff;
-  font-size: 44rpx;
-}
-
-.pop-search-item-content {
-  padding: 0 3% 0 3%;
-}
-
-.pop-search-item-content-button {
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
-}
-
-.pop-search-item-content-button-custom {
-  border: 0 !important;
-  margin: 0 !important;
-  color: #CC3333;
-  background-color: white;
-}
-
-.pop-search-item-content-button-custom::after {
-  border: 1rpx solid #CC3333 !important;
-  background: transparent !important;
-}
-
-.pop-search-item-content-button-custom-gray {
-  border: 0 !important;
-  margin: 0 !important;
-  color: #c1c1c1;
-  background-color: white;
-}
-
-.pop-search-item-content-button-custom-gray::after {
-  border: 1rpx solid #c1c1c1 !important;
-  background: transparent !important;
-}
-
-.scroll {
-  height: calc(100%);
-}
-
-.table-row-custom {
-  display: flex;
-  width: 100%;
-  flex-direction: row;
-  margin-top: 1px;
-
-}
-
-.cn-a-b {
-  display: flex;
-  justify-content: space-between;
-  width: 100%;
-}
-
-.customer-name {
-  width: 50%;
-  font-size: 4vw;
-  line-height: 50rpx;
-  color: #323233;
-  word-break: break-all;
-}
-
-.customer-name2 {
-  width: 100%;
-  font-size: 4vw;
-  line-height: 50rpx;
-  color: #323233;
-  word-break: break-all;
-}
-
-.btn-to-cun {
-  display: inline;
-  width: 100%;
-  text-align: right;
-
-}
-
-.telephone {
-  display: flex;
-  margin-top: 7rpx;
-  font-size: 3.5vw;
-  line-height: 50rpx;
-  color: #323233;
-  width: 55%;
-
-}
-
-.category {
-  display: flex;
-  margin-top: 7rpx;
-  font-size: 3.5vw;
-  line-height: 50rpx;
-  color: #323233;
-  width: 45%;
-}
-
-.address {
-  margin-top: 7rpx;
-  word-break: break-all;
-  white-space: pre-wrap;
-  font-size: 3.5vw;
-  line-height: 50rpx;
-  color: #323233;
-  width: 89%;
-}
-
-.staffname {
-  margin-top: 7rpx;
-  font-size: 3.5vw;
-  line-height: 50rpx;
-  color: #323233;
-  width: 100%;
-  text-align: right;
-}
-
-.address-staffname {
-  display: flex;
-  margin-top: 7rpx;
-  width: 100%;
-}
-
-.image-small {
-  color: #b3b3b3;
-  font-size: 14px;
-}
-
-.hr {
-  width: 100%;
-  height: 2rpx;
-  margin-top: 15rpx;
-  margin-bottom: 15rpx;
-  /* margin-left: 37.5rpx; */
-  background-color: var(--divider-text-color, #e0e1e2);
-}
-
-
-
-
-
-
-
-
-.oas-title-value {
-  width: 80rpx;
-  font-size: 5px;
-  text-align: right;
-  padding-left: 5rpx;
-  color: #1989fa;
-}
-
-
-.value-class {
-  text-align: right !important;
-  font-size: 26rpx !important;
-}
-
-.title-class .van-field__label{
-  font-size: 14px;
-  color:#2E3853 !important;
-  font-weight: 500;
-}
-
-.oas-status-two {
-  width: 40%;
-  font-size: 3.8vw;
-  color: #1989fa;
-  text-align: center;
-}
-
-.time-value-class {
-  color: #1B365D !important;
-  font-weight: 400;
-}
-
-
-
-/* 字体设置 */
-.font-setting {
-  font-size: 3.9vw;
-}
-.bottom-bar{
-  border-radius: 15px;
-  display: flex;
-}
-
-
-
-
-/* 2022/07/25 样式引用*/
-
-
-.van-tabs__scroll{
-  background-color: #F5F5F5 !important;
-}
-
-.van-dropdown-menu__title{
-  color: #1B365D !important;
-}
-
-.van-tabs-class{
-  background: #fff !important;
-}
-
-.dk-font{
-  font-size: 13px;
-  color: #1B365D;
-  font-weight: bold;
-}
-
-/**品类*/
-.category-class{
-  width: 40%;
-  font-size: 15px;
-  color: #95A8CB;
-  align-items: center;
-  display: flex;
-}
-/**合计金额*/
-.totalamount-class{
-  width: 60%;
-  text-align: right !important;
-}
-.modal-app {
-  width: 80%;
-  border-radius: 15rpx;
-}
-
-.modal-button {
-  width: 50%;
-}
-.button-pop-cell-class{
-  border-radius: 15rpx !important;
-}
-
-.button-pop-class{
-  width: 640rpx !important;
-  height: 88rpx !important;
-  background: #1B365D !important;
-  border-radius: 15rpx !important;
-  border: none !important;
-}
-
-.input-class{
-  text-align: left !important;
-  height: 70px !important;
-  color: #1B365D !important;
-}
-.corner-view {
-  position: absolute;
-  /* 扇形弧度 */
-  border-radius: 0 0 100rpx 0; 
-  /* 左上弧度 */
-  border-top-left-radius: 15rpx;
-  /* 位置 */
-  top: 0;
-  left: 0;
-  padding: 14rpx;
-  width: 70rpx;
-  height: 56rpx;
-  background-color: #E3DCD1; 
-
-}
-.corner-view-text{
-  transform: rotate(-45deg);
-    /* 字体颜色 */
-    color: #B19264;
-    font-size: 24rpx;
-    font-weight: 600;
-    font-size: 26rpx;
-}

package-accounts-manage/pages/other-expenditure-orders/other-expenditure-orders.js

@@ -26,7 +26,7 @@ Page({
       selectTotallength: 12,
       selectlength: 5,
       // 路由
-      routeObjName: 'payment-receipt',
+      routeObjName: 'other-expenditure-orders',
       tableData: [],
       active: 0,
       // statusItem: {

package-basic-data/pages/customer-list/customer-list.js

@@ -5,664 +5,298 @@
  *		2.客户资料列表
  * 编辑履历：
  *		作者				日期					版本				修改内容
- *		于继渤		        2022-0-12	            1.00		   	    
+ *		王英杰		        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 util = require('../../../utils/util.js')
-const common = require('../../../utils/common.js')
+const Constants = require('@/utils/Constants.js');
+const util = require('@/utils/util.js') 
+const mixins = require('@/mixins/index.js')
 Page({
-
+  mixins: [mixins],
   /**
-   * 页面的初始数据
+   * 页面的初始数据 
    */
   data: {
-    selectflag: false,
-    checked_1: false,
-    checked_2: false,
-    checked_3: false,
-    checked_4: false,
-    checked_5: false,
-    checked_6: false,
-    checked_7: false,
-    checked_8: false,
-    checked_9: false,
-    checked_10: false,
-    checked_11: false,
-    show: false,
-    showTime: false,
+    tagList:[{title:"潜在客户"},{title:"公海客户"},{title:"邀约进店"},{title:"预约量尺"}],
+     // 查询条件
+     searchContent: [{
+      code: 'createtime',
+      title: '近30天',
+      defaultValue: 5,
+      searchType: Constants.searchType.date
+    }, {
+      code: 'staff',
+      title: '业务员',
+      dropType: 'staff'
+    }, {
+      code: 'orderStatus',
+      title: '订单状态',
+      searchType: Constants.searchType.switch,
+      list: [
+        {
+          checked: true,
+          text: "异常",
+          value: "审-异常"
+        },
+        {
+          checked: true,
+          text: "待审",
+          value: "审-待审"
+        },
+        {
+          checked: true,
+          text: "审批中",
+          value: "审-审中"
+        },
+        {
+          checked: true,
+          text: "通过",
+          value: "审-通过"
+        },
+        {
+          checked: true,
+          text: "拒绝",
+          value: "审-拒绝"
+        },
+        {
+          checked: false,
+          text: "冲正",
+          value: "订单状态-冲正"
+        }
+      ]
+      
+    }, {
+      code: 'choose',
+      title: '筛选',
+      searchType: Constants.searchType.pick
+    }],
+
+    // 查询条件-筛选
+    pullMenuList: [{
+      code: 'customerFrom',
+      pullType: 'mSelect',
+      typeName: 'customerFrom'
+    }, {
+      code: 'fitupType',
+      pullType: 'mSelect',
+      typeName: 'fitupType'
+    }, {
+      code: 'houseType',
+      pullType: 'mSelect',
+      typeName: 'houseType'
+    }, {
+      code: 'ageComposition',
+      pullType: 'mSelect',
+      typeName: 'ageComposition'
+    } ],
+
+    // 假数据
+    dataList: [{
+      salesChannelName: '',
+      customerId: 11,
+      customerName: '张三',
+      displayStatus: '成交客户',
+      orderNo: 'SA-LWYD-ZOO-202401300SBG',
+      customerPhone: '15659741980',
+      addressFull: '辽宁省沈阳市浑南区沈阳市浑南区人民政府(新聪街西)1',
+      orgName: '零售部',
+      staffName: '薛玉',
+      tsumAmount: 3000,
+      categoryQuantity: '',
+      tsumQuantity: 1,
+      data:'2024-03-12',
+      amont:1009,
+      makeTime: '' ,
+      customerForm:'自然进店',tags:['ff','ddd']
+    }, {
+      salesChannelName: '',
+      customerName: '李四',
+      displayStatus: '潜在客户', 
+      orderNo: 'SA-LWYD-ZOO-202401300SBD',
+      customerPhone: '15659741980',
+      addressFull: '辽宁省沈阳市浑南区沈阳市浑南区人民政府(新聪街西)2',
+      orgName: '零售部',
+      staffName: '薛玉',
+      tsumAmount: 4000,
+      categoryQuantity: '',
+      tsumQuantity: 2,
+      data:'2024-03-12',
+      amont:1009,
+      makeTime: '' 
+    }],
 
-    active: 0,
-    noMore: false,
-    loading: false,
-    pageInfo: {
-      pageSize: 6,
-      currentPage: 1
+ 
+    // 列表区（脚部信息）
+    footerInfo: [{
+      name: 'categoryQuantity',
+      title: '跟进'
+    }, {
+      name: 'tsumQuantity',
+      title: '件'
+    }],
+    // 列表区（内容）
+    contentList: [{
+      name: 'orderNo',
+      title: '出库单号'
+    },{
+      name: 'customerPhone',
+      title: '客户电话',
+      phone:true
+    }, {
+      name: 'addressFull',
+      title: '客户地址'
+    }, {
+      name: [{
+        name: 'orgName',
+        title: ''
+      }, {
+        name: 'staffName',
+        title: '业务员'
+      }],
+      title: '门店信息'
+    },  {
+      name: 'data',
+      title: '提醒时间'
+    }],
+
+    contentObj: {
+      '成交': [{
+        name: 'orderNo',
+        title: '订单单号'
+      } , {
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: '业务员'
+        }],
+        title: '客户地址'
+      }],
+      '未成交': [{
+        name: 'orderNo',
+        title: '订单单号'
+      }, {
+        name: 'customerPhone',
+        title: '客户电话'
+      }, {
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: '业务员'
+        }],
+        title: '客户地址'
+      }]
     },
-    list: [],
-    totallength: 0, //视图下方提醒数量
 
-    createTimeType: {
-      text: '近30天',
-      value: 5
-    },
+    // 弹出按钮
+    buttonList: [{
+      name: 'customerRefund',
+      title: '出库办理'
+      }, {
+        name: 'customerRefundList',
+        title: '作废'
+      } , {
+        name: 'customerRefundList',
+        title: '打印票据'
+      } 
+     
+    ],
 
-    statusItem_org: {
-      text: '业务部门',
-      value: -1
-    },
-    columns: ['0-10分钟', '10-20分钟', '20-40分钟', '40-60分钟', '60分钟以上'],
-    currentDate: new Date().getTime() + 100,
-    // staffNames: '业务员',
-    form: {
-      saleStatus: '客成状态-潜客', //成交状态
-      customerFromName: '',
-      LeaveTime: '请选择',
-      OtherName: '其他',
+    totallength: 0, //视图下方提醒数量
 
-    },
-    staffIds: [],
-    searchForm: {
-      nextFollowTimeList: [],
-      followCount: null,
-      customerFroms: [],
-      toiletCounts: [],
-      fitupTypes: [],
-      houseTypes: [],
-      fitupStyles: [],
-      ageCompositions: [],
-      decisionMakers: [],
-      keyTypeList: [],
-    },
-    nextFollowTime: '',
-    list: [],
-    searchText: ''
+    // 路由
+    routeObjName: 'customer',
+    active:0
   },
-  /**
-   * @desc : 筛选数据源组件点击事件
-   * @author : 于继渤
-   * @date : 2022/5/31 08:59
+   /**
+   * 切换 已出库 未出库
    */
-  onClickTag(e) {
-    let key = e.detail.key
-    let dataList = e.detail.dataList
-    let searchForm = this.data.searchForm
-    if (key === 'customerFrom') {
-      searchForm.customerFroms = dataList
-    }
-    if (key === 'toiletCount') {
-      searchForm.toiletCounts = dataList
-    }
-    if (key === 'fitupType') {
-      searchForm.fitupTypes = dataList
-    }
-    if (key === 'houseType') {
-      searchForm.houseTypes = dataList
-    }
-    if (key === 'fitupStyle') {
-      searchForm.fitupStyles = dataList
-    }
-    if (key === 'ageComposition') {
-      searchForm.ageCompositions = dataList
-    }
-    if (key === 'decisionMaker') {
-      searchForm.decisionMakers = dataList
-    }
-    if (key === 'keyType') {
-      let tempList = []
-      //客意品类-智能,客意品类-定制
-      dataList.forEach(res => {
-        if (res == 0) {
-          tempList.push('客意品类-定制')
-        }
-        if (res == 1) {
-          tempList.push('客意品类-智能')
-        }
-
-      })
-      searchForm.keyTypeList = tempList
-    }
-    this.setData({
-      searchForm: searchForm
-    })
-  },
-  //量尺回执
-  measure() {
+  onChangeTabs(e) {
+      let index =   e.detail.detail.index
+      console.log("qeaqwewa", index)
+    console.log("qeaqwewa", e)
     this.setData({
-      showShare: false
-    })
-    wx.navigateTo({
-      url: '/package3/pages/customer-follow-up/measure-to/measure-to?item=' + encodeURIComponent(JSON.stringify(this.data.onclikItem)),
+      active:index, 
     })
+     
   },
   /**
    * 跳转客户详细
    */
   toDetail(e) {
-    let ID = e.currentTarget.dataset.item.customerId
-    this.setData({
-      selectflag: true
-    })
-    wx.navigateTo({
-      url: './detail/detail?ID=' + ID,
-    })
-  },
-  /**
- * 跳转客户新建
- */
-  toAdd() {
-    wx.navigateTo({
-      url: './add/add',
-    })
-  },
-  /**
-   * 留店时长 
-   */
-  showPopup() {
-    this.setData({
-      selectflag: true
-    });
-  },
-  /**
-   * @desc : 打电话
-   * @date : 2022/5/18 15:49
-   * @author : 于继渤
-   */
-  openTelPhone(e) {
-    let tel = e.currentTarget.dataset.item.customerPhone
-    if (tel) {
-      wx.makePhoneCall({
-        phoneNumber: tel,
-      })
-    } else {
-      wx.showModal({
-
-        title: '手机号不正确',
-        message: ''
-      })
-
-    }
-
-  },
-  /**
-   * 获取意向品类数据源
-   */
-  getGoodsSpecs() {
-    let param = {
-      dataSourceCode: "商品规格分类"
-    }
-    param.cpId = app.globalData.user.cpId
-    api.request(Constants.BASIC_COMMON_API + 'get_wx_init_data', 'POST', param).then(res => {
-
-      if (res.data.code === 200) {
-        let specsList = []
-        specsList = res.data.data
-        specsList.forEach(element => {
-          element.checked = false
-        });
-        this.setData({
-          specsList,
-          specsList_center: specsList
-        })
-      }
-    })
-  },
-  /**
-   *手风琴 复选框 数据源监听事件
-   */
-  onDataChange(e) {
-    this.setData({
-      specsList_: e.detail.dataList
-    })
-  },
-  //抽屉打开
-  openSearchPop() {
-    this.setData({
-      show: true,
-    })
-
-
-  },
-  //筛选框关闭
-  closeSearchPop() {
-    this.selectComponent("#pick").toggle(false) //取消选中样式
-    this.setData({
-      show: false
-    })
-  },
-
-  /**
-   * @desc : 下拉多选事件
-   * @author : 于继渤
-   * @date : 2022/5/26 12:16
-   */
-  openDropdown(e) {
-    this.setData({
-      staffFlag: true
-    })
-  },
-  /**
-   * @desc : 下拉多选事件
-   * @author : 于继渤
-   * @date : 2022/5/26 12:16
-   */
-  dropdowncommit(e) {
-    this.setData({
-      orgFlag: true
-    })
-  },
-  /**
-   * @desc : 下拉多选确定
-   * @author : 于继渤
-   * @date : 2022/5/26 12:16
-   */
-  mutiSearchAll(e) {
-    let id = e.currentTarget.id
-    if (id === 'staff') {
-      this.setData({
-        staffIds: e.detail.idList,
-        staffNames: e.detail.names,
-        staffFlag: false
-      })
-      this.selectComponent("#statusItemStaff").toggle(false)
-      this.doSearch()
-    }
-    if (id === 'org') {
-      this.setData({
-        orgIds: e.detail.idList,
-        orgNames: e.detail.names,
-        orgFlag: false
+   
+      wx.navigateTo({
+        url: './detail/detail?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=outbound-processing',
       })
-      this.selectComponent("#statusItemOrg").toggle(false)
-      this.doSearch()
-    }
+  
   },
-  /**
-   * @desc : 下拉多选关闭
-   * @author : 于继渤
-   * @date : 2022/5/26 12:16
-   */
-  muticloseAll(e) {
-    let id = e.currentTarget.id
-    if (id === 'staff') {
-      this.setData({
-        staffFlag: false
-      })
-      this.selectComponent("#statusItemStaff").toggle(false)
-    }
-    if (id === 'org') {
-      this.setData({
-        orgFlag: false
-      })
-      this.selectComponent("#statusItemOrg").toggle(false)
-    }
-  },
-  /**
-   * @desc : 筛选选择跟进提醒时间
-   * @author : 于继渤
-   * @date : 2022/6/8 9:16
-   */
-  onClickTime(e) {
-
-    this.setData({
-      defaultValue: new Date().getTime() + 100,
-      nextFollowTimeFlag: true
-    })
-
-  },
-  /**
-   * @desc : 筛选选择跟进提醒时间确认事件
-   * @author : 于继渤
-   * @date : 2022/7/5 18:16
-   */
-  nextFollowTimeDateCommit(e) {
-    let searchForm = this.data.searchForm
-    let nextFollowTime = this.data.nextFollowTime
-    searchForm.nextFollowTimeList = e.detail.date
-
-    nextFollowTime = e.detail.date[0] + '-' + e.detail.date[1]
-    this.setData({
-      searchForm: searchForm,
-      nextFollowTime: nextFollowTime
-    })
-    //调查询
-  },
-
-  /**
-   * @desc : 筛选输入事件
-   * @author : 于继渤
-   * @date : 2022/6/7 19:16
-   */
-  onChangeField(e) {
-    let key = e.currentTarget.dataset.key
-    let searchForm = this.data.searchForm
-    searchForm[key] = e.detail
-    this.setData({
-      searchForm: searchForm
-    })
-  },
-
-  /**
-   * @desc : 一览类别切换事件
-   * @author : 于继渤
-   * @date : 2022/6/7 19:16
-   */
-  onChange(e) {
-    this.setData({
-      active: e.detail.name
-    })
-    let that = this
-    that.doSearch()
-  },
-
-
-  /**
-   * @desc : 抽屉确定
-   * @author : 于继渤
-   * @date : 2022/6/7 19:16
-   */
-  doSearchData(e) {
-    this.selectComponent("#pick").toggle(false) //取消选中样式
-    this.setData({
-      show: false,
-      searchFormNumber: e.detail.searchFormNumber
-    })
-    this.doSearch()
+  toTitle(e) {
+    console.log('t1', e);
   },
-  /**
-   * @desc : 抽屉确定
-   * @author : 于继渤
-   * @date : 2022/6/7 19:16
-   */
-  onTimeClose() {
-    this.setData({
-      selectflag: false,
-    })
+  toStatus(e) {
+    console.log('t2', e);
   },
-
-  /**
-   * @desc : 抽屉重置
-   * @author : 于继渤
-   * @date : 2022/6/7 19:16
-   */
-  clearSearchForm() {
-    let searchForm = this.data.searchForm
-    searchForm = {
-      deliveryTimeList: [],
-      installTimeList: [],
-      deliveryTime: '',
-      installTime: '',
-      customerFroms: [],
-      toiletCounts: [],
-      fitupTypes: [],
-      houseTypes: [],
-      fitupStyles: [],
-      ageCompositions: [],
-      decisionMakers: [],
-      keyTypeList: [],
-    }
-    this.selectComponent("#customerFrom").clearForm()
-    this.selectComponent("#toiletCount").clearForm()
-    this.selectComponent("#fitupType").clearForm()
-    this.selectComponent("#houseType").clearForm()
-    this.selectComponent("#fitupStyle").clearForm()
-    this.selectComponent("#ageComposition").clearForm()
-    this.selectComponent("#decisionMaker").clearForm()
-    this.selectComponent("#keyType").clearForm()
-    this.setData({
-      searchForm: searchForm
-    })
-
+  toPoint(e) {
+    console.log('t3', e);
     this.setData({
-      form: {
-        saleStatus: '客成状态-潜客', //成交状态
-        customerFromName: '',
-        customerFrom: '',
-        specsList_: this.data.specsList_center
-      },
-      searchForm: {
-        customerFrom: null,
-        nextFollowTimeList: [],
-      },
-      nextFollowTime: '',
+      showShare: true
     })
   },
-
-  //抽屉离焦关闭
-  onClose() {
-    this.setData({
-      showShare: false,
-      selectflag: false,
+  toAdd() {
+    wx.navigateTo({
+      url: './add/add',
     })
-    this.selectComponent("#pick").toggle(false) //取消选中样式
   },
-
-
-
   /**
-   * @desc : 组件单选下拉打开事件
-   * @author : 于继渤
-   * @date : 2022/5/26 17:16
+   * @desc : 右上角三个小点 点击回调事件
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
    */
-  openSingle(e) {
-    let type = e.currentTarget.dataset.type
-    if (type === 'customerFrom') {
-      this.setData({
-        customerSourceFlag: true
+  open(e) {
+     let name = e.detail.name
+     let item = e.detail.item 
+     if(name == 'customerRefund'){  //客户收款
+      wx.navigateTo({
+        url: '/package-sales/pages/order-billing/customer-collection-refund/customer-collection-refund?form='+ encodeURIComponent(JSON.stringify(item)) +'&page=customer-collection' + '&pageIndex=customer-collection',
       })
-    }
-  },
-
-  /**
-   * @desc : 组件单选确定
-   * @author : 于继渤
-   * @date : 2022/5/26 17:16
-   */
-  mutiSearch(e) {
-    let id = e.target.id
-
-    let searchForm = this.data.searchForm
-    if (id === 'customerFrom') {
-      // searchForm.customerFromName = e.detail.name
-      searchForm.customerFrom = e.detail.id
-      this.setData({
-        form: {
-          customerFromName: e.detail.name
-        }
+     }
+     if(name == 'customerRefundList'){  //客户退款
+      wx.navigateTo({
+        url: '/package-sales/pages/order-billing/customer-collection/refund-record/refund-record?form='+ encodeURIComponent(JSON.stringify(item)) +'&page=customer-collection',
       })
-    }
-    this.setData({
-      searchForm: searchForm
-    })
+     }
+   
+       
+  
   },
   /**
-   * @desc : 日期组件后的回调
-   * @author : 于继渤
-   * @date : 2022/5/24 12:16
+   * @desc : 校验
+   * @date : 2024/2/1 15:49
+   * @author : 周兴
    */
-  dateCommit(e) {
-    let dateType = e.detail.dateType
-    if (dateType === 'createtime') {
-
-      let data = e.detail.date
-
-      this.setData({
-        createTimeSearch: data,
-        createTimeType: e.detail.dateDefault
-      })
-      this.selectComponent('#create-time-type').toggle();
-    }
-    this.doSearch()
-  },
-  /**
-   * @desc : 调取企业微信会话
-   * @date : 2022/5/18 15:49
-   * @author : 于继渤
-   */
-  openWeChat(e) {
-    if (!app.globalData.SystemInfo.environment) {
+  openValidData(item, name) {
+    console.log('item', item, name, item.customerId);
+    if (!item.customerId) {
       wx.showToast({
-        title: '请在企业微信模式下运行',
+        title: '无此联系人,或陌生接待',
         icon: 'none'
       })
-      return
+      return false;
     }
-    let item = e.currentTarget.dataset.item
-
-    wx.qy.openEnterpriseChat({
-      // 注意：userIds和externalUserIds至少选填一个，且userIds+externalUserIds总数不能超过2000，如果externalUserIds有微信联系人，则总数不能超过40人。
-      userIds: '', //参与会话的企业成员列表，格式为userid1;userid2;...，用分号隔开。
-      // 参与会话的外部联系人列表，格式为userId1;userId2;…，用分号隔开。
-      externalUserIds: item.qvExternalUserid,
-      groupName: '', // 必填，会话名称。单聊时该参数传入空字符串""即可。
-      chatId: "", //新建会话时，chatId必须为空串
-      success: function (res) {
-        // 回调
-        var chatId = res.chatId; //返回chatId仅在企业微信3.0.36及以后版本支持；
-      },
-      fail: function (res) {
-        // 失败处理
-        wx.showToast({
-          title: res.data.message,
-          icon: 'none'
-        })
-      }
-    });
-  },
-
-  onSearchText(e) {
-
-    this.setData({
-      searchText: e.detail,
-      searchTextFlag: e.detail ? true : false//TOP搜索输入标识
-    })
-
-  },
-
-
-
-  /**
-   * @desc : 小程序客户列表分页查询
-   * @author : 于继渤
-   * @date : 2022/6/8 9:16
-   */
-  getData(e) {
- 
-    let data = {
-        addressArea: {province: "广东省", city: "深圳市", district: "福田区"},
-        addressFull: "广东省深圳市福田区这是啥科技(赛格康乐大厦店)88888888888",
-        addressGcj02: {latitude: 22.542325, longitude: 114.08747},
-        addressName: "这是啥科技(赛格康乐大厦店)",
-        addressNo: "88888888888",
-        ageComposition: 97,
-        ageCompositionName: null,
-        annexPathsList: null,
-        contactName: "88888888888",
-        contactPhones: ["88888888888"],
-        customerClassified: null,
-        customerClassifiedName: null,
-        customerCode: "18888888881-10030T", 
-        customerFrom: 29,
-        customerFromName: "选用1",
-        customerId: 3917,
-        customerName: "88888888888",
-        customerPhone: "18888888881",
-        customerStatusName: "成交",
-        customerTagsName: null,
-        decisionMaker: 103,
-        decisionMakerName: null,
-        estateId: null,
-        estateName: null,
-        fitupStyle: 90,
-        fitupStyleName: null,
-        fitupType: 88,
-        fitupTypeName: null,
-        followCount: 0, 
-        gender: "性别-男",
-        houseType: 85,
-        houseTypeName: null,
-        intentionInfo: null,
-        intentionTags: ["客意品类-智能"],
-        intentionTagsName: "智能",
-        lastFollowStatus: null,
-        lastFollowTime: null,
-        lastFollowUser: null,
-        lastFollowUserName: null,
-        nextFollowPlan: null,
-        nextFollowTime: null,
-        orgId: 32402,
-        orgName: "北海富安居店",
-        qvChatId: null,
-        qvCorpid: null,
-        qvExternalUserid: null,
-        remarks: "",
-        reportAscpId: null,
-        reportAscpName: null,
-        reportOrgId: null,
-        reportSale2Id: null,
-        reportSale2Name: null,
-        reportSalesChannel: null,
-        reportSalesChannelName: null,
-        reportTime: "2023-12-29",
-        reportUser: 1005,
-        reportUserName: "无库无ERP00001",
-        saleStatus: "客成状态-成交",
-        salesChannel: null,
-        salesChannelName: null,
-        storeName: null,
-        tagName: [],
-        toiletCount: 9,
-        toiletCountName: null,
-        userName: "无库无ERP00001"
-      };
-      
-      let list = [data];
-    this.setData({
-        list
-    })
+    return true;
   },
 
   /**
    * @desc : 查询
-   * @author : 于继渤
-   * @date : 2022/5/24 08:49
-   */
-  doSearch() {
-    let pageInfo = this.data.pageInfo;
-    pageInfo.pageSize = 6;
-    pageInfo.currentPage = 1;
-    this.setData({
-      show: false,
-      noMore: false,
-      pageInfo: pageInfo,
-      list: []
-    })
-    this.getData()
-  },
-
-  /**
-   * @desc : 页面上拉触底事件的处理函数
-   * @author : 于继渤
-   * @date : 2022/5/24 08:49
+   * @date : 2024/2/1 15:49
+   * @author : 周兴
    */
-  onReachBottom: function () {
-    if (this.data.loading || this.data.noMore) {
-      return;
-    }
-    this.setData({
-      pageInfo: {
-        pageSize: this.data.pageInfo.pageSize,
-        currentPage: this.data.pageInfo.currentPage + 1
-      }
-    })
-    this.getData('more')
+  getData(params) {
+    console.log('fff', params);
   },
 
-
   /**
    * 生命周期函数--监听页面加载
    */
@@ -683,9 +317,9 @@ Page({
       Customer_Add: true
 
     })
- 
 
- 
+
+
 
     if (JSON.stringify(options) !== '{}') {
 
@@ -709,7 +343,9 @@ Page({
           moreList: keyTypeList
         })
 
-        let searchForm = { ...this.data.searchForm }
+        let searchForm = {
+          ...this.data.searchForm
+        }
         searchForm.keyTypeList = frommine.keyTypeNameList
 
         this.setData({
@@ -723,12 +359,9 @@ Page({
         })
 
         createtime.init()
-        if (frommine.active === 0) {
-          this.doSearch()
-        }
       }
     } else {
-      this.doSearch()
+      // this.searchData()
     }
   },
   /**
@@ -736,107 +369,7 @@ Page({
    */
   onShow: function () {
     if (this.data.selectflag) {
-      this.doSearch()
+      // this.searchData()
     }
   },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-    let that = this
-    //调用刷新时将执行的方法
-    that.setData({
-      loadingShow: true,
-    })
-    this.doSearch()
-    //隐藏导航条加载动画
-    wx.hideNavigationBarLoading();
-    setTimeout(function () {
-      that.setData({
-        loadingShow: false,
-      })
-      //停止下拉刷新
-      wx.stopPullDownRefresh();
-    }, 800)
-
-  },
-
-
-  //3点
-  onclik(e) {
-    this.setData({
-      showShare: true,
-      customerName: e.currentTarget.dataset.item.customerName,
-      onclikItem: e.currentTarget.dataset.item
-    })
-  },
-
-  follow() {
-    wx.navigateTo({
-    url: '/package-basic-data/pages/customer-follow-up/customer-follow-up' ,
-  }) 
-  },
-  followtask() {
-    this.setData({
-      showShare: false
-    })
-    wx.navigateTo({
-      // url: '/package-basic-data/pages/follow-up-tasks/follow-up-tasks',
-      url: '/package-basic-data/pages/customer-follow-up/follow-up-tasks/follow-up-tasks' ,
-    
-      
-    }) 
-  },
-  /**
-   * @desc : 跳转预算报价新建
-   * @date : 2022/7/7 14:12
-   * @author : 于继渤
-   */
-  toOrderAdd(e) {
-    let customerItem = e.currentTarget.dataset.item
-    if (!customerItem.customerId) {
-      wx.showToast({
-        title: '无此联系人,或陌生接待',
-        icon: 'none'
-      })
-      return
-    }
-    this.setData({
-      showShare: false
-    })
-    wx.navigateTo({
-      url: '/package4/pages/order-billing/choose-goods/choose-goods?orderType=1&customerItem=' + encodeURIComponent(JSON.stringify(customerItem)),
-    })
-  },
-
-  /**
-   * @desc : 跳转客户收款新建
-   * @date : 2022/7/9 15:01
-   * @author : 常皓宁
-   */
-  toCollectionAdd(e) {
-    let customerItem = e.currentTarget.dataset.item
-    if (!customerItem.customerId) {
-      wx.showToast({
-        title: '无此联系人,或陌生接待',
-        icon: 'none'
-      })
-      return
-    }
-    this.setData({
-      showShare: false
-    })
-    wx.navigateTo({
-      url: '/package4/pages/order-billing/customer-collection/add/add?customerItem=' + encodeURIComponent(JSON.stringify(customerItem)),
-    })
-  },
-
-
-  toCustomerConsolidation(e) {
-    console.log(e)
-    wx.navigateTo({
-      url: './customer-consolidation/customer-consolidation?item='+encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) ,
-    })
-  },
 })

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

@@ -1,271 +1,24 @@
 <!-- 前台导入wxmlUtil.wxs -->
-<wxs src='../../../utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
-<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<loading wx:if="{{loading}}" ></loading>
 <van-sticky scroll-top="0">
-  <van-search model:value="{{ searchText }}" bind:change="onSearchText" bind:search="doSearch" use-action-slot placeholder="搜索 客户名称/地址/标签/电话/备注">
-  </van-search>
-
-  <van-dropdown-menu active-color="#1B365D">
-    <!-- 创建时间 -->
-    <van-dropdown-item id="create-time-type" title="{{createTimeType.text}}">
-
-      <dk-dropdown-date id="createtime" dateType="createtime" blankFlag="{{false}}" defaultValue='{{createTimeType.value}}' bind:dateCommit='dateCommit'></dk-dropdown-date>
-
-    </van-dropdown-item>
-
-
-    <van-dropdown-item id="statusItemStaff" title="{{staffNames?staffNames:'业务员' }}" bind:open="openDropdown">
-    </van-dropdown-item>
-
-    <van-dropdown-item id="statusItemOrg" title="{{ orgNames?orgNames:'业务部门' }}" bind:open="dropdowncommit">
-    </van-dropdown-item>
-    <!-- 筛选 -->
-    <van-dropdown-item id='pick' title="{{'筛选'+ (searchFormNumber ? '['+searchFormNumber+']' : '')}}" bind:open='openSearchPop' bind:close='closeSearchPop' data-type="pick" />
-
-  </van-dropdown-menu>
-
-  <van-tabs color="#1989FD" active="{{ active }}" bind:change="onChange" color="#DEC9A3;" title-active-color="#1B365D" title-inactive-color=" #96A7C5;">
-    <van-tab title="潜在客户">
-    </van-tab>
-    <van-tab title="公海客户">
-    </van-tab>
-    <van-tab title="成交客户">
-    </van-tab>
-    <van-tab title="全部客户">
-    </van-tab>
-  </van-tabs>
-
+  <!-- 查询条件 -->
+  <dk-dropdown-menu model:searchForm="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress','contractNumber'])}}">
+  </dk-dropdown-menu>
+ 
+  <dk-tabs active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>
 </van-sticky>
 
 <!-- 暂无数据 -->
-<van-empty wx:if="{{list.length<=0}}" description="暂无数据" />
-<!-- 列表 -->
-<view wx:for="{{list}}" bindtap="toDetail" data-item="{{item}}" wx:key="index" class="main-class">
-  <view class="main-foot" style="border-radius:15rpx;">
-    <view class="table-content">
-      <view class="table-content-row">
-        <view class="customer-and-status">
-          <view catchtap="toCustomer">
-            <van-icon name="/package-basic-data/static/image/KHCFDC.png" size="35rpx" />
-          </view>
-          <view catchtap="toCustomer" data-item="{{item}}" style="width:70%;display:flex;font-size: 15px;">
-            <!-- <text user-select>{{item.customerName}}</text> -->
-            <dk-text style="font-size:30rpx;" fontWeight="nomal" value="{{item.customerName}}"></dk-text>
-
-            <!--客户标签-->
-            <view style="display: flex;margin-left: 20rpx;">
-              <view wx:for-item="item_a" wx:if="{{item.intentionTagsName}}">
-                <dk-van-tag border="1rpx solid #606EB2" height="32rpx" color="transparent" textColor="#606EB2" radius="5rpx" roundFlag="{{true}}" value="{{item.intentionTagsName}}"></dk-van-tag>
-              </view>
-              <view style="padding-left: 10rpx;"></view>
-              <view wx:for-item="item_a" wx:if="{{item.customerFromName}}">
-                <dk-van-tag border="1rpx solid #606EB2" height="32rpx" color="transparent" textColor="#606EB2" radius="5rpx" roundFlag="{{true}}" value="{{item.customerFromName}}"></dk-van-tag>
-              </view>
-            </view>
-          </view>
-
-          <view class="oas-title-value" data-item="{{item}}" catchtap="onclik">
-            <van-icon size="25" name="ellipsis" />
-          </view>
-        </view>
-      </view>
-
-      <view class="table-row">
-        <!-- 客户电话 -->
-        <view class="table-content-row">
-          <view style="display: flex;">
-            <view class="table-content-row-font">
-              <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="客户电话" copyValue="{{item.customerPhone}}"></dk-text>
-            </view>
-            <view class="table-content-class">
-              {{item.customerPhone?item.customerPhone:''}}
-            </view>
-          </view>
-        </view>
-
-        <!--标签-->
-        <view style="width: 10%; height: 49rpx;padding-right:34rpx;">
-          <dk-van-tag color="#EAF1FF" textColor="#606EB2" radius="3rpx" roundFlag="{{true}}" value="{{item.customerStatusName}}"></dk-van-tag>
-        </view>
-      </view>
-
-      <!-- 客户地址 -->
-      <view class="table-row">
-        <view class="table-content-row">
-          <view style="display: flex;">
-            <view class="table-content-row-font">
-              <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="客户地址" copyValue="{{item.addressFull}}"></dk-text>
-            </view>
-            <view class="table-content-class">
-              {{ wxmlUtil.addressToIndexOf(item.addressFull)}}
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 门店信息 -->
-      <view class="table-content-row">
-        <view style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="门店信息" copyValue="{{item.orgName}} | 业务员 {{item.userName}}"></dk-text>
-          </view>
-          <view class="table-content-class">
-            {{item.orgName?item.orgName:''}} | 业务员 {{item.userName}}
-          </view>
-        </view>
-      </view>
-
-      <view class="table-content-row">
-        <view style="display: flex;">
-          <view class="table-content-row-font">
-            接待时间
-          </view>
-          <view style="font-size: 13px;color: #1B365D;">
-            {{wxmlUtil.format(item.reportTime?item.reportTime:item.lastFollowTime)}}
-          </view>
-        </view>
-      </view>
-
-      <!--提醒时间：下一次的跟进时间  -->
-      <view class="table-content-row">
-        <view style="display: flex;">
-          <view class="table-content-row-font">
-            提醒时间
-          </view>
-
-          <view style="font-size: 13px;color: #1B365D;">
-            {{item.nextFollowTime ? item.nextFollowTime : '' }}
-          </view>
-        </view>
-      </view>
-      <view style="display: flex;margin: 12rpx 32rpx;">
-        <view style="font-size: 13px;" wx:for="{{item.tagName}}" wx:key="indext" wx:for-index="indext" wx:for-item="itemt">
-          <dk-van-tag border="1rpx solid #606EB2" height="32rpx" color="transparent" textColor="#606EB2" radius="5rpx" roundFlag="{{true}}" marginRight="12rpx" value="{{item.tagName[indext]}}"></dk-van-tag>
-        </view>
-      </view>
-      <!-- 分割线 -->
-      <dk-divider marginTop="20rpx"></dk-divider>
+<van-empty wx:if="{{dataList.length<=0}}" description="{{$t['nodata']}}" />
 
-      <!-- 下半部分 -->
-      <view class="table-content-row" style="padding-top: 0;">
-        <view class="bottom-bar">
-          <view>
-            <view wx:if="{{!item.followCount}}">
-              <dk-text fontSize="13px" color="#E4002B" fontWeight="nomal" value="从未跟进 | 逾期未跟进"></dk-text>
-            </view>
-            <view wx:else>
-              <dk-text fontSize="13px" fontWeight="nomal" value="跟进{{item.followCount}}次"></dk-text>
-            </view>
-          </view>
+<!-- 列表区 -->
+<dk-list  list="{{dataList}}" footerTag="customerForm" titleCorner="salesChannelName" title="customerName"collectCol="collectAmount"  status="displayStatus" subTitle="makeTime" content="{{contentList}}" contentObj="{{contentObj}}"  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="display: flex; text-align: center; z-index: 2;">
-            <van-button round wx:if="{{item.qvExternalUserid}}" custom-class="button-class" type="default" plain size="small" data-item="{{item}}" catchtap="openWeChat">微信</van-button>
-            <van-button round wx:if="{{item.customerPhone}}" custom-class="button-class" custom-style="margin-left:30rpx !important" type="default" plain size="small" catchtap="openTelPhone" data-item="{{item}}">打电话</van-button>
-          </view>
-        </view>
-      </view>
-
-
-    </view>
-
-  </view>
-
-</view>
-
-<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">到底了~</van-divider>
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 <view style="height: 135rpx;"></view>
 
-<!-- 筛选抽屉 -->
-<dk-side-pull-menu show_p="{{show}}" searchForm="{{searchForm}}" bind:clearSearchForm="clearSearchForm" bind:doSearchData="doSearchData" bind:onClose="onClose">
-  <dk-label-multiple-select show="{{show}}" id="customerFrom" typeName="customerFrom" bind:onClickTag="onClickTag"></dk-label-multiple-select>
-  <dk-label-multiple-select show="{{show}}" id="toiletCount" typeName="toiletCount" bind:onClickTag="onClickTag"></dk-label-multiple-select>
-  <dk-label-multiple-select show="{{show}}" id="fitupType" typeName="fitupType" bind:onClickTag="onClickTag"></dk-label-multiple-select>
-  <dk-label-multiple-select show="{{show}}" id="houseType" typeName="houseType" bind:onClickTag="onClickTag"></dk-label-multiple-select>
-  <dk-label-multiple-select show="{{show}}" id="fitupStyle" typeName="fitupStyle" bind:onClickTag="onClickTag"></dk-label-multiple-select>
-  <dk-label-multiple-select show="{{show}}" id="ageComposition" typeName="ageComposition" bind:onClickTag="onClickTag"></dk-label-multiple-select>
-  <dk-label-multiple-select show="{{show}}" id="decisionMaker" typeName="decisionMaker" bind:onClickTag="onClickTag"></dk-label-multiple-select>
-  <dk-label-multiple-select show="{{show}}" id="keyType" typeName="keyType" bind:onClickTag="onClickTag"></dk-label-multiple-select>
-  <van-cell-group>
-  <van-field border="{{ false }}" input-align="right" value="{{ searchForm.followCount }}" label-class="title-class" type="number" input-class="value-class" label="跟进次数" data-key="followCount" placeholder="请输入跟进次数" bind:change="onChangeField" right-icon="arrow" />
-
-  <van-cell title-width="150rpx" value-class="{{nextFollowTime?'cell-value-class':'cell-value-class-no-select'}}" value="{{nextFollowTime ? nextFollowTime :'请选择跟进提醒' }}" is-link border="{{ false }}" title-class="title-class" title="跟进提醒" data-key="nextFollowTime" bind:click="onClickTime"></van-cell>
-
-  </van-cell-group>
-
-</dk-side-pull-menu>
-
-
-
-<!-- 卡片右上角 -->
-<van-popup show="{{showShare}}" position="bottom" bind:close="onClose" custom-class="function-pop-class" custom-style="height: 35% !important;">
-  <van-cell-group border="{{false}}" custom-class="function-cell-group">
-    <van-grid square border="{{false}}" icon-size="42px">
-      <!--客户跟进-->
-      <van-grid-item use-slot data-item="{{bottomItem}}" catchtap="follow" wx:if="{{Customer_Follow}}">
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/package-basic-data/static/image/customerFollow.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="客户跟进"></dk-text>
-        </view>
-      </van-grid-item>
-      <!--跟进任务-->
-      <van-grid-item use-slot catchtap="followtask" data-item="{{bottomItem}}" wx:if="{{Customer_Follow_Task}}">
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/package-basic-data/static/image/followTask.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="跟进任务"></dk-text>
-        </view>
-      </van-grid-item>
-      <!--销售订单-->
-      <van-grid-item use-slot catchtap="toOrderAdd" data-item="{{onclikItem}}" wx:if="{{Customer_Order}}">
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/package-basic-data/static/image/order.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="销售订单"></dk-text>
-        </view>
-      </van-grid-item>
-      <!--客户收款-->
-      <van-grid-item use-slot catchtap="toCollectionAdd" data-item="{{onclikItem}}" wx:if="{{Customer_Receive}}">
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/package-basic-data/static/image/receive.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="客户收款"></dk-text>
-        </view>
-      </van-grid-item>
-
-      <!-- 客户合并 -->
-      <van-grid-item use-slot data-item="{{onclikItem}}" catchtap="toCustomerConsolidation" >
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/package-basic-data/static/image/customerFollow.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="客户合并"></dk-text>
-        </view>
-      </van-grid-item>
-    </van-grid>
-
-  </van-cell-group>
-  <view class="popup-button">
-    <van-button type="default" custom-class="pop-button-class" size="large" catchtap="onClose">取消
-    </van-button>
-  </view>
-</van-popup>
-
 
 
 <!-- 新建按钮 -->
-<dk-save-bottom flagTypeName="customers"  submitFlag="{{Customer_Add}}"  totallength="{{totallength}}" bind:submit="toAdd" />
-
-<!-- 多选 -->
-<dk-muti-dropdown-item docName="客户资料" show="{{staffFlag}}" id='staff' ids="{{staffIds}}" typeName='staff' bind:muticommit='mutiSearchAll' bind:muticlose='muticloseAll'></dk-muti-dropdown-item>
-<!-- 多选 -->
-<dk-muti-dropdown-item show="{{orgFlag}}" docName="客户资料" id='org' typeName='org' bind:muticommit='mutiSearchAll' bind:muticlose='muticloseAll'></dk-muti-dropdown-item>
-<!-- 客户来源 -->
-<dk-single-dropdown-item show="{{customerSourceFlag}}" id='customerFrom' typeName='customerFrom' bind:muticommit='mutiSearch' bind:muticlose='muticlose'></dk-single-dropdown-item>
-
-
-<dk-dropdown-date-day show="{{nextFollowTimeFlag}}" defaultValue="{{defaultValue}}" bind:dateCommit="nextFollowTimeDateCommit"></dk-dropdown-date-day>
+<dk-save-bottom   flagTypeName="customer-collection" totallength="{{totallength}}" bind:submit="toAdd" />

package-basic-data/pages/customer-list/customer-list.wxss

@@ -1,87 +1,4 @@
-.create-time{
-    color: darkorange;
-  }
-  
-  .table-row {
-    display: flex;
-    width: 100%;
-    flex-direction: row;
-    justify-content: space-between;
-  }
-  
-  .oas-title-value {
-    width: 50px; 
-    font-size: 5px;
-    text-align: right;
-    color: #1989fa;   
-  }
-  
-  .popup-button {
-    position: fixed;
-    width: 100%;
-    bottom: 0;
-    display: flex;
-    align-items: center; 
-  }
-  .van-field__label{
-    color:black !important;
-  }
-  .customer-and-status {
-    display: flex;
-    width: 100%;
-    justify-content: space-around;
-  }
-  .bottom-bar{
-    border-radius: 15px;
-    display: flex;
-    justify-content: space-between;
-  }
-  .van-button--round {
-    border-radius: 10rpx !important;
-  }
-   
-  
-  .van-tabs__scroll{
+.van-tabs__scroll{
     background-color: #F5F5F5 !important;
   }
-  
-  .van-dropdown-menu__title{
-    color: #1B365D !important;
-  }
-  .van-search__content {
-    background: #F8F9FD;
-    border: 1px solid #D6E4FF;
-    border-radius: 15rpx !important;
-  }
-  .van-field__placeholder{
-    color: #95A8CB !important;
-  }
-  
-  .title-class .van-field__label{
-    font-size: 14px;
-    color:#2E3853 !important;
-    font-style: normal;
-    font-weight: 500;
-  }
-  
-  .title-class{
-    font-size: 14px;
-    color:#2E3853 !important;
-    font-style: normal;
-    font-weight: 500;
-  }
-  
-  .van-field__placeholder{
-  font-style: normal;
-  font-weight: 400;
-  font-size: 14px;
-  color: #95A8CB !important;
-  }
-  
-  
-  
-  /**打电话的样式*/
-  .button-class{
-    border: 1px solid #00A7B5 !important;
-    color:#00A7B5 !important;
-  }
+  

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

@@ -1,992 +1,386 @@
-const app = getApp();
-const api = require('../../../utils/api.js');
-const Constants = require('../../../utils/Constants.js');
-const util = require('../../../utils/util.js')
-const common = require('../../../utils/common.js')
-import Dialog from '../../../dist/dialog/dialog.js';
+/*******************************************************************************
+ * Copyright(c) 2022 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：
+ *		2.客户资料列表
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		王英杰		        2022-0-12	            1.00		   	    
+ *******************************************************************************/
+const Constants = require('@/utils/Constants.js');
+const util = require('@/utils/util.js') 
+const mixins = require('@/mixins/index.js')
 Page({
-
+  mixins: [mixins],
   /**
-   * 页面的初始数据
+   * 页面的初始数据 
    */
   data: {
-    statusItem_org: {
-      text: '业务部门',
-      value: -1
-    },
-    staffIds: [],
-    selectflag: false,
-    checked_1: false,
-    checked_2: false,
-    checked_3: false,
-    checked_4: false,
-    checked_5: false,
-    checked_6: false,
-    checked_7: false,
-    checked_8: false,
-    checked_9: false,
-    checked_10: false,
-    checked_11: false,
-    checked_12: false,
-    show: false,
-    showTime: false,
-    activeboxNames: [],
-    customerName: '',
-    noMore: false,
-    loading: false,
-    pageInfo: {
-      pageSize: 6,
-      currentPage: 1
+    tagList:[{title:"潜在客户"},{title:"公海客户"},{title:"邀约进店"},{title:"预约量尺"}],
+     // 查询条件
+     searchContent: [{
+      code: 'createtime',
+      title: '近30天',
+      defaultValue: 5,
+      searchType: Constants.searchType.date
+    }, {
+      code: 'staff',
+      title: '业务员',
+      dropType: 'staff'
+    }, {
+      code: 'orderStatus',
+      title: '订单状态',
+      searchType: Constants.searchType.switch,
+      list: [
+        {
+          checked: true,
+          text: "异常",
+          value: "审-异常"
+        },
+        {
+          checked: true,
+          text: "待审",
+          value: "审-待审"
+        },
+        {
+          checked: true,
+          text: "审批中",
+          value: "审-审中"
+        },
+        {
+          checked: true,
+          text: "通过",
+          value: "审-通过"
+        },
+        {
+          checked: true,
+          text: "拒绝",
+          value: "审-拒绝"
+        },
+        {
+          checked: false,
+          text: "冲正",
+          value: "订单状态-冲正"
+        }
+      ]
+      
+    }, {
+      code: 'choose',
+      title: '筛选',
+      searchType: Constants.searchType.pick
+    }],
+
+    // 查询条件-筛选
+    pullMenuList: [{
+      code: 'customerFrom',
+      pullType: 'mSelect',
+      typeName: 'customerFrom'
+    }, {
+      code: 'fitupType',
+      pullType: 'mSelect',
+      typeName: 'fitupType'
+    }, {
+      code: 'houseType',
+      pullType: 'mSelect',
+      typeName: 'houseType'
+    }, {
+      code: 'ageComposition',
+      pullType: 'mSelect',
+      typeName: 'ageComposition'
+    } ],
+
+    // 假数据
+    dataList: [{
+      salesChannelName: '',
+      customerId: 11,
+      customerName: '张三',
+      displayStatus: '成交客户',
+      orderNo: 'SA-LWYD-ZOO-202401300SBG',
+      customerPhone: '15659741980',
+      addressFull: '辽宁省沈阳市浑南区沈阳市浑南区人民政府(新聪街西)1',
+      orgName: '零售部',
+      staffName: '薛玉',
+      tsumAmount: 3000,
+      categoryQuantity: '',
+      tsumQuantity: 1,
+      data:'2024-03-12',
+      amont:1009,
+      makeTime: '' ,
+      customerForm:'自然进店',tags:['ff','ddd']
+    }, {
+      salesChannelName: '',
+      customerName: '李四',
+      displayStatus: '潜在客户', 
+      orderNo: 'SA-LWYD-ZOO-202401300SBD',
+      customerPhone: '15659741980',
+      addressFull: '辽宁省沈阳市浑南区沈阳市浑南区人民政府(新聪街西)2',
+      orgName: '零售部',
+      staffName: '薛玉',
+      tsumAmount: 4000,
+      categoryQuantity: '',
+      tsumQuantity: 2,
+      data:'2024-03-12',
+      amont:1009,
+      makeTime: '' 
+    }],
+
+ 
+    // 列表区（脚部信息）
+    footerInfo: [{
+      name: 'categoryQuantity',
+      title: '跟进'
+    }, {
+      name: 'tsumQuantity',
+      title: '件'
+    }],
+    // 列表区（内容）
+    contentList: [{
+      name: 'orderNo',
+      title: '出库单号'
+    },{
+      name: 'customerPhone',
+      title: '客户电话',
+      phone:true
+    }, {
+      name: 'addressFull',
+      title: '客户地址'
+    }, {
+      name: [{
+        name: 'orgName',
+        title: ''
+      }, {
+        name: 'staffName',
+        title: '业务员'
+      }],
+      title: '门店信息'
+    },  {
+      name: 'data',
+      title: '提醒时间'
+    }],
+
+    contentObj: {
+      '成交': [{
+        name: 'orderNo',
+        title: '订单单号'
+      } , {
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: '业务员'
+        }],
+        title: '客户地址'
+      }],
+      '未成交': [{
+        name: 'orderNo',
+        title: '订单单号'
+      }, {
+        name: 'customerPhone',
+        title: '客户电话'
+      }, {
+        name: [{
+          name: 'orgName',
+          title: ''
+        }, {
+          name: 'staffName',
+          title: '业务员'
+        }],
+        title: '客户地址'
+      }]
     },
-    list: [],
+
+    // 弹出按钮
+    buttonList: [{
+      name: 'customerRefund',
+      title: '出库办理'
+      }, {
+        name: 'customerRefundList',
+        title: '作废'
+      } , {
+        name: 'customerRefundList',
+        title: '打印票据'
+      } 
+     
+    ],
+
     totallength: 0, //视图下方提醒数量
-    active: 0,
-    createTimeType: {
-      text: '近30天',
-      value: 5
-    },
-    followUpPerson: {
-      text: '张三',
-      value: -1
-    },
-    followUpOrg: {
-      text: '佛山居然店',
-      value: -1
-    },
-    columns: [],
-    currentDate: new Date().getTime() + 100,
-    formatter(type, value) {
-      if (type === 'year') {
-        return `${value}年`;
-      }
-      if (type === 'month') {
-        return `${value}月`;
-      }
-      if (type === 'day') {
-        return `${value}日`;
-      }
-      if (type === 'hour') {
-        return `${value}时`;
-      }
-      if (type === 'minute') {
-        return `${value}分`;
-      }
-      return value;
-    },
-    form: {
-      LeaveTime: '请选择',
-      LeaveTime_: '请选择',
-      OtherName: '其他',
-      remindTime: '',
-      followCount: '',
-      followCount_: '',
-      nextFollowTimeList: [],
-      nextFollowTime: '',
-      nextFollowTime_: '',
 
-    },
-    list: [],
-    searchText: '',
-    searchFormNumber: 0,
-    //筛选字段
-    searchForm: {
-      overDueStatus:0,
-      followStatusList: [],
-      nextFollowTimeList: [],
-    },
-    nextFollowTime: '',
+    // 路由
+    routeObjName: 'customer',
+    active:0
   },
-  toAdd() {
-    wx.navigateTo({
-      url: './add/add?type=add',
-    })
-  },
-  onChangePickDate() {
-    this.setData({
-      showTime: true
-    })
-  },
-
-  /**
-   * @desc : 跳转客户收款新建
-   * @date : 2022/7/9 15:01
-   * @author : 常皓宁
+   /**
+   * 切换 已出库 未出库
    */
-  toCollectionAdd(e) {
-    let customerItem = e.currentTarget.dataset.item
-    if (!customerItem.customerId) {
-      wx.showToast({
-        title: '无此联系人,或陌生接待',
-        icon: 'none'
-      })
-      return
-    }
+  onChangeTabs(e) {
+      let index =   e.detail.detail.index
+      console.log("qeaqwewa", index)
+    console.log("qeaqwewa", e)
     this.setData({
-      showShare: false
-    })
-    wx.navigateTo({
-      url: '/package4/pages/order-billing/customer-collection/add/add?customerItem=' + encodeURIComponent(JSON.stringify(customerItem)),
+      active:index, 
     })
+     
   },
   /**
-   * 跳转
+   * 跳转客户详细
    */
   toDetail(e) {
+   
     let item = e.currentTarget.dataset.item
-   if(this.data.active ==1 ){  
-
-    wx.navigateTo({
-      url: '/package-basic-data/pages/customer-follow-up/detail/detail?item=' + encodeURIComponent(JSON.stringify(item)),
-    }) 
-
-     return
-   }
-
-
-
-    wx.navigateTo({
-      url: './detail/detail?item=' + encodeURIComponent(JSON.stringify(item)),
-    })
-
-
-
-  },
-  onCloseChooseDate() {
-    this.setData({
-      showTime: false
-    })
-  },
-  /**
-   * 留店时长 
-   */
-  showPopup() {
-    this.setData({
-      LeaveTimeFlag: true
-    });
-  },
-  /**
-   * @desc : 打电话
-   * @date : 2022/5/18 15:49
-   * @author : 于继渤
-   */
-  openTelPhone(e) {
-
-    let tel = e.currentTarget.dataset.item.customerPhone
-    if (tel) {
-      wx.makePhoneCall({
-        phoneNumber: tel,
-      })
-    } else {
-      wx.showModal({
-
-        title: '手机号不正确',
-        message: ''
-      })
-
-    }
-
-  },
-  //抽屉打开
-  openSearchPop() {
-    this.setData({
-      show: true,
-    })
-    let that = this
-    setTimeout(function () {
-      that.setData({
-        activeboxNames: ['1', '2'],
-      })
-
-    }, 100)
-
-  },
-  closeSearchPop() {
-    this.selectComponent("#pick").toggle(false) //取消选中样式
-    this.setData({
-      show: false
-    })
-
-  },
-
-  onChangefollowCount(e) {
-
-    let form = this.data.form
-    form.followCount_ = e.detail
-    this.setData({
-      form: form
-    })
-  },
-  onChangebox(e) {
-  
-    this.setData({
-      activeboxNames: e.detail
-    })
-
-  },
-
-  //抽屉确定
-  doSearchData(e) {
-    this.selectComponent("#pick").toggle(false) //取消选中样式
-
-
-    let form = this.data.form
-    let searchFormNumber = 0
-    form.followCount = this.data.form.followCount_
-    form.nextFollowTime = this.data.nextFollowTime
-    form.LeaveTime = this.data.form.LeaveTime_
-    let specsList_ = this.data.specsList_
-    let specsList_flag = false
-    specsList_.forEach(element => {
-      if (element.checked) {
-        specsList_flag = true
-      }
-    });
-    let receptionStatusList_ = this.data.receptionStatusList_
-    let receptionStatusList_flag = false
-    receptionStatusList_.forEach(element => {
-      if (element.checked) {
-        receptionStatusList_flag = true
-      }
-    });
-    if (this.data.form.LeaveTime_ != '请选择') {
-      searchFormNumber++
-    }
-    if (this.data.form.followCount_ != '') {
-      searchFormNumber++
-    }
-    if (this.data.form.nextFollowTime_ != '') {
-      searchFormNumber++
-    }
-    if (specsList_flag) {
-      searchFormNumber++
-    }
-    if (receptionStatusList_flag) {
-      searchFormNumber++
+    if(this.data.active ==1 ){  
+ 
+     wx.navigateTo({
+       url: '/package-basic-data/pages/customer-follow-up/detail/detail?item=' + encodeURIComponent(JSON.stringify(item)),
+     }) 
+ 
+      return
     }
-    this.setData({
-      show: false,
-      specsList: this.data.specsList_,
-      receptionStatusList: this.data.receptionStatusList_,
-      form,
-      searchFormNumber
-    })
-    this.doSearch()
-  },
-  onTimeClose() {
-    this.setData({
-      LeaveTimeFlag: false,
-    })
+ 
+ 
+ 
+     wx.navigateTo({
+       url: './detail/detail?item=' + encodeURIComponent(JSON.stringify(item)),
+     })
   },
-
-  /**
-   * @desc : 抽屉重置
-   * @author : 于继渤
-   * @date : 2022/6/7 19:16
-   */
-  clearSearchForm() {
-
-    let searchForm = this.data.searchForm
-    searchForm = {
-      followStatusList: [],
-      nextFollowTimeList: [],
-    }
-    let form = this.data.form
-    form.LeaveTime_ = '请选择',
-      form.followCount_ = '',
-      form.nextFollowTime_ = '',
-      this.setData({
-        specsList_: this.data.specsList_center,
-        receptionStatusList_: this.data.receptionStatusList_center,
-        form,
-        searchFormNumber: 0
-      })
-    this.selectComponent("#followStatus").clearForm()
-    this.setData({
-      searchForm: searchForm,
-      nextFollowTime: '',
-    })
+  toTitle(e) {
+    console.log('t1', e);
   },
-  /**
-   * @desc : 跟进时间确认事件
-   * @author : 于继渤
-   * @date : 2022/5/26 17:16
-   */
-  onConfirmChooseDate(e) {
-    let key = e.currentTarget.dataset.key
-    //跟进时间
-    if (key === 'nextFollowTime') {
-      let form = this.data.form
-      form.nextFollowTimeList = [util.formatDayTime(new Date(this.data.nextFollowTimeDefaultSearch)) + ' 00:00:00', util.formatDayTime(new Date(this.data.nextFollowTimeDefaultSearch)) + ' 23:59:59'],
-        form.nextFollowTime_ = util.formatDayTime(new Date(this.data.nextFollowTimeDefaultSearch)),
-        this.setData({
-          form: form,
-          nextFollowTimeFlag: false,
-        })
-    } else if (key === 'leaveTime') {
-
-      let form = this.data.form
-      let columns = this.data.columns
-      form.LeaveTime_ = this.data.form.LeaveTime_ == "请选择" ? columns[0] : this.data.form.LeaveTime_
-      this.setData({
-        form: form,
-        LeaveTimeFlag: false
-      })
-    }
-
+  toStatus(e) {
+    console.log('t2', e);
   },
-
-  /**
-   * 留店时长
-   * @param {*} e 
-   */
-  onChange(e) {
-    let form = this.data.form
-    form.LeaveTime_ = e.detail.value
+  toPoint(e) {
+    console.log('t3', e);
     this.setData({
-      form: form,
+      showShare: true
     })
   },
-
-  onCloseChooseDate() {
-    this.setData({
-      showTime: false
+  toAdd() {
+    wx.navigateTo({
+      url: './add/add',
     })
   },
   /**
-   * @desc :跟进时间变化事件
-   * @author : 于继渤
-   * @date :2022/6/8 9:16
+   * @desc : 右上角三个小点 点击回调事件
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
    */
-  changeDate(e) {
-    let key = e.currentTarget.dataset.key
-    //跟进时间
-    if (key === 'nextFollowTime') {
-      this.setData({
-        nextFollowTimeDefaultSearch: e.detail
+  open(e) {
+     let name = e.detail.name
+     let item = e.detail.item 
+     if(name == 'customerRefund'){  //客户收款
+      wx.navigateTo({
+        url: '/package-sales/pages/order-billing/customer-collection-refund/customer-collection-refund?form='+ encodeURIComponent(JSON.stringify(item)) +'&page=customer-collection' + '&pageIndex=customer-collection',
       })
-    }
-
-  },
-  /**
-   * @desc : 筛选选择跟进提醒时间
-   * @author : 于继渤
-   * @date : 2022/6/8 9:16
-   */
-  onClickTime(e) {
-    let key = e.currentTarget.dataset.key
-
-    if (key === 'nextFollowTime') {
-      this.setData({
-        nextFollowTimeDefaultSearch: new Date().getTime() + 100,
-        nextFollowTimeFlag: true
+     }
+     if(name == 'customerRefundList'){  //客户退款
+      wx.navigateTo({
+        url: '/package-sales/pages/order-billing/customer-collection/refund-record/refund-record?form='+ encodeURIComponent(JSON.stringify(item)) +'&page=customer-collection',
       })
-    }
-  },
-  //抽屉离焦关闭
-  onClose() {
-    this.setData({
-      showShare: false,
-      LeaveTimeFlag: false,
-      show: false
-    })
-    this.selectComponent("#pick").toggle(false) //取消选中样式
+     }
+   
+       
+  
   },
   /**
-   * @desc : 调取企业微信会话
-   * @date : 2022/5/18 15:49
-   * @author : 于继渤
+   * @desc : 校验
+   * @date : 2024/2/1 15:49
+   * @author : 周兴
    */
-  openWeChat(e) {
-
-    if (!app.globalData.SystemInfo.environment) {
+  openValidData(item, name) {
+    console.log('item', item, name, item.customerId);
+    if (!item.customerId) {
       wx.showToast({
-        title: '请在企业微信模式下运行',
+        title: '无此联系人,或陌生接待',
         icon: 'none'
       })
-      return
-    }
-    let item = e.currentTarget.dataset.item
-
-    wx.qy.openEnterpriseChat({
-      // 注意：userIds和externalUserIds至少选填一个，且userIds+externalUserIds总数不能超过2000，如果externalUserIds有微信联系人，则总数不能超过40人。
-      userIds: '', //参与会话的企业成员列表，格式为userid1;userid2;...，用分号隔开。
-      // 参与会话的外部联系人列表，格式为userId1;userId2;…，用分号隔开。
-      externalUserIds: item.qvExternalUserid,
-      groupName: '', // 必填，会话名称。单聊时该参数传入空字符串""即可。
-      chatId: "", //新建会话时，chatId必须为空串
-      success: function (res) {
-        // 回调
-        var chatId = res.chatId; //返回chatId仅在企业微信3.0.36及以后版本支持；
-      },
-      fail: function (res) {
-        // 失败处理
-        wx.showToast({
-          title: res.data.message,
-          icon: 'none'
-        })
-      }
-    });
-  },
-  /**
-   * tabs切换
-   * @param {*} e 
-   */
-  onChangeTabs(e) {
-    this.setData({
-      list: []
-    })
-    let title = e.detail.title
-    if (title === '所有接待') {
-      this.setData({
-        active: 0
-      })
-    }
-    if (title === '跟进任务') {
-      this.setData({
-        active: 1
-      })
-    }
-    if (title === '邀约进店') {
-      this.setData({
-        active: 2
-      })
-    }
-    if (title === '预约量尺') {
-      this.setData({
-        active: 3
-      })
-    }
-    // this.getData()
-    this.doSearch()
-
-  },
-  /**
-   * @desc : 日期组件后的回调
-   * @author : 于继渤
-   * @date : 2022/5/24 12:16
-   */
-  dateCommit(e) {
-    let dateType = e.detail.dateType
-    if (dateType === 'createtime') {
-
-      let data = e.detail.date
-
-      this.setData({
-        createTimeSearch: data,
-        createTimeType: e.detail.dateDefault
-      })
-      this.selectComponent('#create-time-type').toggle();
-    }
-    this.doSearch()
-  },
-  /**
-   * @desc : 下拉多选关闭
-   * @author : 于继渤
-   * @date : 2022/5/26 12:16
-   */
-  muticloseAll(e) {
-    let id = e.currentTarget.id
-    if (id === 'staff') {
-      this.setData({
-        staffFlag: false
-      })
-      this.selectComponent("#statusItemStaff").toggle()
-    }
-    if (id === 'org') {
-      this.setData({
-        orgFlag: false
-      })
-      this.selectComponent("#statusItemOrg").toggle()
+      return false;
     }
-  },
-
-  onSearchText(e) {
-  
-    this.setData({
-      searchText: e.detail,
-      searchTextFlag: e.detail ? true : false//TOP搜索输入标识
-    })
-
-  },
-  /**
-   * @desc : 获取数据
-   * @author : 于继渤
-   * @date : 2022/5/23 15:16
-   */
-  getData(e) {
-   
-
-    let list = [{
-        "addressArea": {
-          "province": "辽宁省",
-          "city": "沈阳市",
-          "district": "铁西区"
-        },
-        "addressFull": "辽宁省沈阳市铁西区小四川水煮鱼(鑫丰中心里店)12313123122",
-        "addressGcj02": {
-          "latitude": 41.810535,
-          "longitude": 123.38065
-        },
-        "addressName": "小四川水煮鱼(鑫丰中心里店)",
-        "addressNo": "12313123122",
-        "annexCount": 0,
-        "annexPaths": [],
-        "competitiveBrands": "",
-        "cpId": 20760,
-        "createTime": "2024-01-23",
-        "customerCode": "12313123122-100310",
-        "customerId": 3924,
-        "customerName": "12313123122",
-        "customerPhone": "13112122111",
-        "designName": null,
-        "designUser": null,
-        "flgAgainMeasure": null,
-        "flgValid": true,
-        "followCount": 1,
-        "followData": "11",
-        "followId": 1928,
-        "followQvRecord": null,
-        "followStatus": "跟进状态-报备",
-        "followStatusName": "留资接待",
-        "followTime": "2024-01-23 16:07",
-        "followTimeLen": null,
-        "followType": "跟进方式-进店",
-        "followTypeName": "进店",
-        "followUser": 643,
-        "followUserName": "王英杰",
-        "hourTime": null,
-        "intention": "客户意向-有意向",
-        "intentionInfo": [],
-        "intentionName": "有意向",
-        "intentionTags": [],
-        "intentionTagsName": null,
-        "inviteResult": null,
-        "inviteTime": null,
-        "loseReasonName": null,
-        "measureAnnex": null,
-        "measureRemarks": null,
-        "measureStatus": null,
-        "measureTime": null,
-        "nextFollowPlan": "",
-        "nextFollowTime": null,
-        "orgName": "北海富安居店",
-        "qvChatId": null,
-        "qvExternalUserid": null,
-        "remarks": null,
-        "saleStatus": "客成状态-成交",
-        "saleStatusName": "成交",
-        "stayTimeLen": "留店时长-0-10分钟",
-        "tagName": [],
-        "weekTime": null
-      }];
-    this.setData({
-        list
-    })  
-     
+    return true;
   },
 
   /**
    * @desc : 查询
-   * @author : 于继渤
-   * @date : 2022/5/24 08:49
-   */
-  doSearch() {
-    let pageInfo = this.data.pageInfo;
-    pageInfo.pageSize = 6;
-    pageInfo.currentPage = 1;
-    this.setData({
-      show: false,
-      noMore: false,
-      pageInfo: pageInfo,
-      list: []
-    })
-    this.getData()
-  },
-
-  /**
-   * @desc : 页面上拉触底事件的处理函数
-   * @author : 于继渤
-   * @date : 2022/5/24 08:49
+   * @date : 2024/2/1 15:49
+   * @author : 周兴
    */
-  onReachBottom: function () {
-    if (this.data.loading || this.data.noMore) {
-      return;
-    }
-    this.setData({
-      pageInfo: {
-        pageSize: this.data.pageInfo.pageSize,
-        currentPage: this.data.pageInfo.currentPage + 1
-      }
-    })
-    this.getData('more')
+  getData(params) {
+    console.log('fff', params);
   },
 
-
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
     //按钮权限
-    // let Receive_Customer_Add = common.hasButtonRight(Constants.Receive_Customer_Add) //新建
 
-    // let Receive_Customer_Follow = common.hasButtonRight(Constants.Receive_Customer_Follow) //跟进
-    // let Receive_Customer_Task = common.hasButtonRight(Constants.Receive_Customer_Task) //跟进任务
-    // let Receive_Customer_Order = common.hasButtonRight(Constants.Receive_Customer_Order) //销售订单
-    // let Receive_Customer_Receive = common.hasButtonRight(Constants.Receive_Customer_Receive) //客户收款
-    // let Receive_Customer_Measure = common.hasButtonRight(Constants.Receive_Customer_Measure) //量尺回执
+    // let Customer_Follow = common.hasButtonRight(Constants.Customer_Follow) //跟进
+    // let Customer_Follow_Task = common.hasButtonRight(Constants.Customer_Follow_Task) //跟进任务
+    // let Customer_Order = common.hasButtonRight(Constants.Customer_Order) //销售订单
+    // let Customer_Receive = common.hasButtonRight(Constants.Customer_Receive) //客户收款
+    // let Customer_Add = common.hasButtonRight(Constants.Customer_Add) //客户新建
 
     this.setData({
-      Receive_Customer_Add: true,
-      Receive_Customer_Follow: true,
-      Receive_Customer_Task: true,
-      Receive_Customer_Order: true,
-      Receive_Customer_Receive: true,
-      Receive_Customer_Measure: true,
+      Customer_Follow: true,
+      Customer_Follow_Task: true,
+      Customer_Order: true,
+      Customer_Receive: true,
+      Customer_Add: true
+
     })
 
- 
-      this.doSearch()
-    
-  },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-    if (this.data.selectflag) {
-      this.doSearch()
-      this.followTime_init_base()
-    }
-  },
 
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+    if (JSON.stringify(options) !== '{}') {
 
-    let that = this
-    //调用刷新时将执行的方法
-    that.setData({
-      loadingShow: true,
-    })
-    this.doSearch()
-    this.followTime_init_base()
-    //隐藏导航条加载动画
-    wx.hideNavigationBarLoading();
-    setTimeout(function () {
-      that.setData({
-        loadingShow: false,
-      })
-      //停止下拉刷新
-      wx.stopPullDownRefresh();
-    }, 800)
+      if (options.frommine) {
 
-  },
+        let frommine = JSON.parse(options.frommine)
+        var createtime = this.selectComponent('#createtime');
+        createtime.data.dataDefaultSearch = util.jumpPageDate(frommine.date.value)
+        createtime.data.createTimeType = frommine.date
 
-  /**
-   * 获取接待时常数据
-   */
-  followTime_init_base() {
-      return
-    let param = {
-      dataSourceCode: 'followTime'
-    }
-    api.request(Constants.BASIC_COMMON_API + 'get_wx_init_data', 'POST', param).then(res => {
+        let keyType = this.selectComponent('#keyType')
+        let keyTypeList = keyType.data.moreList
+        keyTypeList.forEach(kIt => {
+          if (frommine.keyTypeList) {
+            if (frommine.keyTypeList.some(it => kIt.id === it)) {
+              kIt.infotype = 'info'
+            }
+          }
+        })
+        keyType.setData({
+          moreList: keyTypeList
+        })
 
-      if (res.data.code === 200) {
+        let searchForm = {
+          ...this.data.searchForm
+        }
+        searchForm.keyTypeList = frommine.keyTypeNameList
 
-        let followTime = []
-        let columns = []
-        followTime = res.data.data
-        followTime.forEach(element => {
-          columns.push(element.name)
-        });
         this.setData({
-          columns
-        })
-      }
-    })
-  },
-  /**
-   * @desc : 下拉多选确定
-   * @author : 于继渤
-   * @date : 2022/5/26 12:16
-   */
-  mutiSearchAll(e) {
-    let id = e.currentTarget.id
-    if (id === 'staff') {
-      this.setData({
-        staffIds: e.detail.idList,
-        staffNames: e.detail.names,
-        staffFlag: false
-      })
-      this.selectComponent("#statusItemStaff").toggle(false)
-      this.doSearch()
-    }
-    if (id === 'org') {
-      this.setData({
-        orgIds: e.detail.idList,
-        orgNames: e.detail.names,
-        orgFlag: false
-      })
-      this.selectComponent("#statusItemOrg").toggle(false)
-      this.doSearch()
-    }
-  },
-  /**
-   * @desc : 下拉多选事件
-   * @author : 于继渤
-   * @date : 2022/5/26 12:16
-   */
-  openDropdown(e) {
-    this.setData({
-      staffFlag: true
-    })
-  },
-  /**
-   * @desc : 下拉多选事件
-   * @author : 于继渤
-   * @date : 2022/5/26 12:16
-   */
-  dropdowncommit(e) {
-    this.setData({
-      orgFlag: true
-    })
-  },
-  /**
-   * 获取意向品类数据源
-   */
-  getGoodsSpecs() {
-    let param = {
-      dataSourceCode: "商品规格分类"
-    }
-    param.cpId = app.globalData.user.cpId
-    api.request(Constants.BASIC_COMMON_API + 'get_wx_init_data', 'POST', param).then(res => {
-      if (res.data.code === 200) {
-        let specsList = []
-        specsList = res.data.data
-        specsList.forEach(element => {
-          element.checked = false
-        });
-        this.setData({
-          specsList,
-          specsList_: specsList,
-          specsList_center: specsList
+          active: frommine.active,
+          createTimeType: frommine.date,
+          searchForm: searchForm,
+          searchFormNumber: (frommine.keyTypeNameList && frommine.keyTypeNameList.length > 0) ? 1 : null,
+          createTimeSearch: util.jumpPageDate(frommine.date.value),
+          staffIds: frommine.staffId ? [frommine.staffId] : [],
+          staffNames: frommine.staffNames,
         })
+
+        createtime.init()
       }
-    })
-  },
-  /**
-   * 获取接待状态数据源
-   */
-  getReceptionStatus() {
-    let param = {
-      dataSourceCode: "接待状态"
+    } else {
+      // this.searchData()
     }
-    param.cpId = app.globalData.user.cpId
-    api.request(Constants.BASIC_COMMON_API + 'get_wx_init_data', 'POST', param).then(res => {
-      if (res.data.code === 200) {
-        let receptionStatusList = []
-        receptionStatusList = res.data.data
-        receptionStatusList.forEach(element => {
-          element.checked = false
-          element.id = element.code
-        });
-        this.setData({
-          receptionStatusList,
-          receptionStatusList_: receptionStatusList,
-          receptionStatusList_center: receptionStatusList
-        })
-      }
-    })
-  },
-  /**
-   *手风琴 复选框 数据源监听事件 ---接待状态
-   */
-  onReceptionStatusDataChange(e) {
-    this.setData({
-      receptionStatusList_: e.detail.dataList
-    })
-  },
-  /**
-   *手风琴 复选框 数据源监听事件 ---意向品类
-   */
-  onSpecsDataChange(e) {
-    this.setData({
-      specsList_: e.detail.dataList
-    })
-  },
-  //3点
-  onclik(e) {
-    this.setData({
-      showShare: true,
-      bottomItem: e.currentTarget.dataset.item,
-      customerName: e.currentTarget.dataset.item.customerName,
-      onclikItem: e.currentTarget.dataset.item
-    })
-  },
-  follow() {
-    wx.navigateTo({
-    url: '/package-basic-data/pages/customer-follow-up/customer-follow-up' ,
-  }) 
-  },
-  followtask() {
-    this.setData({
-      showShare: false
-    })
-    wx.navigateTo({
-      // url: '/package-basic-data/pages/follow-up-tasks/follow-up-tasks',
-      url: '/package-basic-data/pages/customer-follow-up/follow-up-tasks/follow-up-tasks' ,
-    
-      
-    }) 
-  },
-  //量尺回执
-  measure() {
-    this.setData({
-      showShare: false
-    })
-    wx.navigateTo({
-      url: '/package3/pages/customer-follow-up/measure-to/measure-to?item=' + encodeURIComponent(JSON.stringify(this.data.onclikItem)),
-    })
   },
-
-
-
   /**
-   * @desc : 跳转预算报价新建
-   * @date : 2022/7/7 14:12
-   * @author : 于继渤
+   * 生命周期函数--监听页面显示
    */
-  toOrderAdd(e) {
-    let customerItem = e.currentTarget.dataset.item
-    if (!customerItem.customerId) {
-      wx.showToast({
-        title: '无此联系人,或陌生接待',
-        icon: 'none'
-      })
-      return
-    }
-    this.setData({
-      showShare: false
-    })
-    wx.navigateTo({
-      url: '/package4/pages/order-billing/choose-goods/choose-goods?orderType=1&customerItem=' + encodeURIComponent(JSON.stringify(customerItem)),
-    })
-  },
-  /**
-* @desc : 筛选数据源组件点击事件
-* @author : 于继渤
-* @date : 2022/5/31 08:59
-*/
-  onClickTag(e) {
-    let key = e.detail.key
-    let dataList = e.detail.dataList
-    let searchForm = this.data.searchForm
-    if (key === 'followStatus') {
- 
-      let tempList = []
-      //客意品类-智能,客意品类-定制
-      dataList.forEach(res => {
-        if (res == 0) {
-          tempList.push('跟进状态-报备')
-        }
-        if (res == 1) {
-          tempList.push('跟进状态-接待')
-        }
-      })
-      searchForm.followStatusList = tempList
-    }
-
-    if (key === 'overDueStatus') {
-      let tempList = []
-      let overDueStatus = 0
-      dataList.forEach(res => {
-        if (res == 0) {
-          tempList.push('逾期状态-未逾期')
-          overDueStatus = 0
-        }
-        if (res == 1) {
-          tempList.push('逾期状态-逾期')
-          overDueStatus = 1
-        }
-        if (res == 2) {
-          tempList.push('逾期状态-完结')
-          overDueStatus = 2
-        }
-        if (res == 3) {
-          tempList.push('逾期状态-全部')
-          overDueStatus = 3
-        }
-      })
-    //  searchForm.overdueStatusList = tempList
-      searchForm.overDueStatus = overDueStatus
+  onShow: function () {
+    if (this.data.selectflag) {
+      // this.searchData()
     }
-    this.setData({
-      searchForm: searchForm
-    })
-  },
-
-  /**
-* @desc : 筛选选择跟进提醒时间确认事件
-* @author : 于继渤
-* @date : 2022/7/5 18:16
-*/
-  nextFollowTimeDateCommit(e) {
-    let searchForm = this.data.searchForm
-    let nextFollowTime = this.data.nextFollowTime
-    searchForm.nextFollowTimeList = e.detail.date
-
-    nextFollowTime = e.detail.date[0] + '-' + e.detail.date[1]
-    this.setData({
-      searchForm: searchForm,
-      nextFollowTime: nextFollowTime
-    })
-    //调查询
-  },
-
-
-
-  toOk() {
-    this.setData({
-      showShare: false
-    })
-    let _this = this
-    Dialog.confirm({
-      message: '确认完成跟进任务吗？',
-    }).then(() => {
-      let bottomItem = this.data.bottomItem
-      _this.isFlgvaild(bottomItem.planId)
-      instance.close();
-    }).catch(() => {
-      // _this.setData({
-      //   showShare: true
-      // })
-    });
-  },
-
-
-
-  isFlgvaild(planId) {
-    this.setData({
-      loading: true
-    })
-
-    api.request(Constants.SALE_CUSTOMERFOLLOW_PLAN_API + 'update_by_follow_plan_id' , 'POST', {
-      planId:planId
-    }).then(res => {
-      this.setData({
-        loading: false
-      })
-      if (res.data.code === 200) {
-        wx.showToast({
-          title: '操作成功',
-          image: '/static/image/success.png',
-          duration: 1000
-        })
-        this.doSearch()
-      }
-    })
   },
 })

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

@@ -1,389 +1,24 @@
-<wxs src='../../../utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
-<van-dialog id="van-dialog" />
-<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<loading wx:if="{{loading}}" ></loading>
 <van-sticky scroll-top="0">
-  <van-search model:value="{{searchText}}" bind:search="doSearch"  bind:change="onSearchText" use-action-slot placeholder="搜索 客户名称/联系人/电话">
-  </van-search>
-
-  <van-dropdown-menu>
-    <!-- 创建时间 -->
-    <van-dropdown-item id="create-time-type" title="{{createTimeType.text}}">
-      <dk-dropdown-date id="createtime" dateType="createtime" blankFlag="{{false}}" defaultValue='{{createTimeType.value}}' bind:dateCommit='dateCommit'></dk-dropdown-date>
-    </van-dropdown-item>
-
-
-    <van-dropdown-item id="statusItemStaff" title="{{staffNames?staffNames:'全部业务员' }}" bind:open="openDropdown">
-    </van-dropdown-item>
-
-    <!-- <van-dropdown-item id="statusItemOrg" title="{{orgNames?orgNames:'业务部门' }}" bind:open="dropdowncommit">
-    </van-dropdown-item> -->
-    <!-- 筛选 -->
-    <van-dropdown-item id='pick' title="{{'筛选'+ (searchFormNumber!=0 ? '['+searchFormNumber+']' : '')}}" bind:open='openSearchPop' bind:close='closeSearchPop' data-type="pick" />
-  </van-dropdown-menu>
-
-  <van-tabs color="#1989FD" active="{{ active }}" bind:change="onChangeTabs" color="#DEC9A3;" title-active-color="#1B365D" title-inactive-color=" #96A7C5;">
-    <van-tab title="所有接待">
-    </van-tab>
-    <van-tab title="跟进任务">
-    </van-tab>
-    <van-tab title="邀约进店">
-    </van-tab>
-    <van-tab title="预约量尺">
-    </van-tab>
-  </van-tabs>
-
+  <!-- 查询条件 -->
+  <dk-dropdown-menu model:searchForm="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress','contractNumber'])}}">
+  </dk-dropdown-menu>
+ 
+  <dk-tabs active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>
 </van-sticky>
 
-<!-- 抽屉 -->
-
-<dk-side-pull-menu show_p="{{show}}" bind:clearSearchForm="clearSearchForm" bind:doSearchData="doSearchData" bind:onClose="onClose">
-
-  <!-- 查询区域 -->
-
-  <!-- 手风琴,复选框输入 -->
-  <van-collapse value="{{ activeboxNames }}" bind:change="onChangebox" border="{{false}}">
-    <!-- 手风琴,复选框输入 showOtherFlag ：是否显示其他分类    showFieldFlag：是否显示输入框 
-          disabledFlag:输入框是否输入 checkboxClinkFlag:box能否点动-->
-
-
-
-
-          <!-- 接待状态的查询条件先注掉，以后可能会用到 -->
-    <!-- <dk-accordion-box id="dk-box" titleName="接待状态" dataList="{{receptionStatusList_}}" bind:onDataChange="onReceptionStatusDataChange" showOtherFlag="{{false}}" showFieldFlag="{{false}}" disabledFlag="{{false}}" checkboxClinkFlag="{{true}}">
-    </dk-accordion-box> -->
-
-
-
-
-    <!-- 手风琴,复选框输入 showOtherFlag ：是否显示其他分类    showFieldFlag：是否显示输入框 
-          disabledFlag:输入框是否输入 checkboxClinkFlag:box能否点动-->
-    <dk-accordion-box id="dk-box" titleName="意向品类" dataList="{{specsList_}}" bind:onDataChange="onSpecsDataChange" showOtherFlag="{{false}}" showFieldFlag="{{false}}" disabledFlag="{{false}}" checkboxClinkFlag="{{true}}">
-    </dk-accordion-box>
-  </van-collapse>
-<view style="margin-left:10rpx;margin-top:10rpx;">
-
-  <dk-label-multiple-select oneSelectFlag="{{true}}" show="{{show}}" id="overDueStatus" typeName="overDueStatus" bind:onClickTag="onClickTag"></dk-label-multiple-select>
-  <dk-label-multiple-select show="{{show}}" id="followStatus" typeName="followStatus" bind:onClickTag="onClickTag"></dk-label-multiple-select>
-</view>
-
-  <van-cell is-link border="{{ false }}" title-width="180rpx" title="留店时长" value="{{form.LeaveTime_}}" is-link bind:click="showPopup" />
-
-
-  <!-- <view style="height:1px;background: #f3f3f3;"></view> -->
-
-  <!-- <van-field input-align="right" value="{{ searchForm.OrderNo }}" label-class="title-class" input-class="value-class" 
-        label="客户标签" data-title="OrderNo" placeholder="请输入客户标签" bind:change="onChange" /> -->
-  <van-field input-align="right" border="{{ false }}" value="{{ form.followCount_ }}" label-class="title-class" input-class="value-class" label="跟进次数" data-title="OrderNo" placeholder="请输入跟进次数" bind:change="onChangefollowCount" type="number" />
-  <!-- <van-cell is-link border="{{ false }}" title="跟进提醒" data-key="nextFollowTime" value="{{form.nextFollowTime_ ? form.nextFollowTime_ :'请选择提醒时间'}}" bind:click="onClickTime"></van-cell> -->
-
-  <van-cell title-width="150rpx" value-class="{{nextFollowTime?'cell-value-class':'cell-value-class-no-select'}}" value="{{nextFollowTime ? nextFollowTime :'请选择跟进提醒' }}" is-link border="{{ false }}" title-class="title-class" title="跟进提醒" data-key="nextFollowTime" bind:click="onClickTime"></van-cell>
-
-  <!-- </van-cell-group> -->
-
-</dk-side-pull-menu>
-
-<van-popup position="bottom" show="{{ LeaveTimeFlag }}" bind:close="onTimeClose" class="popup" style="width:100%">
-  <view style="display:flex;justify-content: space-around;height:80rpx;">
-    <view style="width:45%;text-align: left;color:#b6b6b6;line-height:80rpx;" data-key="leaveTime" catchtap="onConfirmChooseDate">取消</view>
-    <view style="width:45%;text-align: right;color:#00A7B5;line-height:80rpx;" data-key="leaveTime" catchtap="onConfirmChooseDate">确定</view>
-  </view>
-  <van-picker columns="{{ columns }}" bind:change="onChange" />
-</van-popup>
-
-<!-- <van-popup show="{{ nextFollowTimeFlag }}" data-key="nextFollowTime" position="bottom" bind:close="onConfirmChooseDate" bind:click-overlay="onCloseChooseDate">
-  <view style="display:flex;justify-content: space-around;height:80rpx;">
-    <view style="width:45%;text-align: left;color:#b6b6b6;line-height:80rpx;" data-key="nextFollowTime" catchtap="onConfirmChooseDate">取消</view>
-    <view style="width:45%;text-align: right;color:#00A7B5;line-height:80rpx;" data-key="nextFollowTime" catchtap="onConfirmChooseDate">确定</view>
-  </view>
-  <van-datetime-picker show-toolbar="{{false}}" data-key="nextFollowTime" bindonlyinput="changeDate" data-index="0" type="date" loading="{true}" value="{{ nextFollowTimeDefaultSearch }}" />
-</van-popup> -->
-
-<dk-dropdown-date-day show="{{nextFollowTimeFlag}}" defaultValue="{{defaultValue}}" bind:dateCommit="nextFollowTimeDateCommit"></dk-dropdown-date-day>
-
-
 <!-- 暂无数据 -->
-<van-empty wx:if="{{list.length<=0}}" description="暂无数据" />
-<!-- 列表 -->
-<view wx:for="{{list}}" bindtap="toDetail" data-item="{{item}}" wx:key="index" class="main-class">
-  <view class="main-foot" style="border-radius:15rpx;">
-    <view class="table-content">
-      <view class="table-content-row">
-        <view class="customer-and-status">
-          <view catchtap="toCustomer">
-            <van-icon wx:if="{{item.customerName!='无联系人'}}" name="/package-basic-data/static/image/KHCFDC.png" size="38rpx" />
-
-            <van-icon wx:if="{{item.customerName =='无联系人'}}" name="https://b.yzcdn.cn/vant/icon-demo-1126.png" size="42rpx" />
-
-          </view>
-          <view catchtap="toCustomer" class="oas-title" style="width:70%;display:flex;font-size: 30rpx;">
-            <text>{{item.customerName}}</text>
-            <view style="width: 55px; display: flex;margin-left: 20rpx;">
-              <view wx:for-item="item_a" wx:if="{{item.intentionTagsName}}">
-                <dk-van-tag border="1rpx solid #606EB2" height="32rpx" color="transparent" textColor="#606EB2" radius="5rpx" roundFlag="{{true}}" value="{{item.intentionTagsName}}"></dk-van-tag>
-              </view>
-            </view>
-            <!-- <view wx:if="{{item.intentionTagsName}}" style="font-size: 13px;width: 55px; display: flex;margin-left: 10px;" wx:for-item="item_a">
-              <van-tag size="mini" plain round type="{{'primary'}}">{{item.intentionTagsName}}</van-tag>
-            </view> -->
-          </view>
+<van-empty wx:if="{{dataList.length<=0}}" description="{{$t['nodata']}}" />
 
-          <view class="oas-title-value" data-item="{{item}}" catchtap="onclik">
-            <van-icon wx:if="{{item.customerName !='无联系人'}}" size="25" name="ellipsis" />
-          </view>
-        </view>
+<!-- 列表区 -->
+<dk-list  list="{{dataList}}" footerTag="customerForm" titleCorner="salesChannelName" title="customerName"collectCol="collectAmount"  status="displayStatus" subTitle="makeTime" content="{{contentList}}" contentObj="{{contentObj}}"  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>
-      <view wx:if="{{item.customerName!='无联系人'}}" class="table-row">
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
+<view style="height: 135rpx;"></view>
 
-        <!-- 客户电话 -->
-        <view class="table-content-row">
-          <view style="display: flex;">
-            <view class="table-content-row-font">
-              <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="客户电话" copyValue="{{item.customerPhone}}"></dk-text>
-            </view>
-            <view class="table-content-class">
-              {{item.customerPhone}}
-            </view>
-          </view>
-        </view>
-
-        <!-- 客成状态 -->
-        <view style="width: 10%; height: 49rpx;padding-right:34rpx;" wx:if="{{item.saleStatusName}}">
-          <dk-van-tag color="#EAF1FF" textColor="#606EB2" radius="3rpx" roundFlag="{{true}}" value="{{item.saleStatusName}}"></dk-van-tag>
-        </view>
-      </view>
-      <view wx:if="{{item.customerName!='无联系人'}}">
-
-        <!-- 客户地址 -->
-        <view class="table-content-row">
-          <view style="display: flex;">
-            <view class="table-content-row-font">
-              <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="客户地址" copyValue="{{item.addressFull}}">
-              </dk-text>
-            </view>
-            <view class="table-content-class">
-              {{ wxmlUtil.addressToIndexOf(item.addressFull)}}
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <view class="table-row" wx:if="{{active == 0}}">
-
-        <view class="table-content-row">
-          <view style="display: flex;">
-            <view class="table-content-row-font">
-              <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="接待时间" copyValue="{{item.followTime}}">
-              </dk-text>
-            </view>
-            <view class="table-content-class">
-              {{item.followTime}}
-            </view>
-          </view>
-        </view>
-        <view wx:if="{{(item.customerName =='无联系人')&&item.saleStatusName}}" style="font-size: 13px;">
-          <van-tag size="mini" plain round type="{{item.saleStatus!='客成状态-潜客'?'default':'primary'}}">
-            {{item.saleStatusName?item.saleStatusName:''}}</van-tag>
-        </view>
-      </view>
-
-      <!-- 门店信息 -->
-      <view class="table-content-row">
-        <view style="display: flex;">
-          <view class="table-content-row-font">
-            <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="门店信息" copyValue="{{item.orgName}} | 业务员 {{item.followUserName}}"></dk-text>
-          </view>
-          <view class="table-content-class">
-            {{item.orgName?item.orgName:''}} | 业务员 {{item.followUserName}}
-          </view>
-        </view>
-      </view>
-
-      <view wx:if="{{active == 3}}" class="table-row">
-        <view class="table-content-row">
-          <view style="display: flex;">
-            <view class="table-content-row-font">
-              <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="设计师" copyValue="{{item.designName}}">
-              </dk-text>
-            </view>
-
-            <view class="table-content-class">
-              {{item.designName?item.designName:''}}
-            </view>
-          </view>
-        </view>
-      </view>
-      <view wx:if="{{item.customerName!='无联系人'}}" style="display: flex;justify-content:space-between;">
-        <view class="table-content-row" wx:if="{{!item.inviteflg && item.nextFollowTime != null}}">
-          <view style="display: flex;">
-            <view class="table-content-row-font">
-              <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="跟进提醒" copyValue="{{item.nextFollowTime}}">
-              </dk-text>
-            </view>
-
-            <view class="table-content-class">
-              {{item.nextFollowTime}}
-            </view>
-          </view>
-        </view>
-        <!-- <view wx:if="{{item.inviteflg || item.nextFollowTime == null}}" style="font-size: 13px;"></view> -->
-        <view class="table-content-row" wx:if="{{item.inviteflg && active == 2}}">
-          <view style="display: flex;">
-            <view class="table-content-row-font">
-              <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="到店时间" copyValue="{{item.followTime}}">
-              </dk-text>
-            </view>
-
-            <view class="table-content-class">
-              {{item.followTime}}
-            </view>
-          </view>
-        </view>
-        <view class="table-content-row" wx:if="{{item.inviteflg && active == 3}}">
-          <view style="display: flex;">
-            <view class="table-content-row-font">
-              <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="服务时间" copyValue="{{item.followTime}}">
-              </dk-text>
-            </view>
-
-            <view class="table-content-class">
-              {{item.followTime}}
-            </view>
-          </view>
-        </view>
-      </view>
-<view style="display:flex;justify-content: space-between;">
-
-  <view style="display: flex;margin-left: 30rpx;">
-        <view style="font-size: 13px;" wx:for="{{item.tagName}}" wx:key="indext" wx:for-index="indext" wx:for-item="itemt">
-          <dk-van-tag border="1rpx solid #606EB2" height="32rpx" color="transparent" textColor="#606EB2" radius="5rpx" roundFlag="{{true}}" marginRight="12rpx" value="{{item.tagName[indext]}}"></dk-van-tag>
-        </view>
-      </view>
-
-      <view wx:if="{{(active == 2 || active == 3) && item.inviteResult=='邀约结果-拒绝'}}" style="display: flex;margin-right: 12px;">
-        <dk-van-tag border="1rpx solid #606EB2" height="32rpx" color="transparent" textColor="#606EB2" radius="5rpx" roundFlag="{{true}}" marginRight="12rpx" value="拒绝邀约"></dk-van-tag>
-      </view>
-
-      <view wx:if="{{(active == 2 || active == 3) && item.inviteResult=='邀约结果-接受'}}" style="display: flex;margin-right: 12px;">
-        <dk-van-tag border="1rpx solid #606EB2" height="32rpx" color="transparent" textColor="#606EB2" radius="5rpx" roundFlag="{{true}}" marginRight="12rpx" value="接受邀约"></dk-van-tag>
-      </view>
-</view>
-
-
-      <!-- 分割线 -->
-      <dk-divider marginTop="20rpx"></dk-divider>
-
-      <!-- 下半部分 -->
-      <view class="table-content-row" style="padding-top: 0;">
-        <view class="bottom-bar">
-          <view>
-            <view wx:if="{{item.followCount}}">
-              <dk-text fontSize="13px" fontWeight="nomal" value="第{{item.followCount}}次跟进"></dk-text>
-            </view>
-          </view>
-
-          <view style="display: flex; text-align: center;z-index: 2;">
-            <van-button round wx:if="{{item.qvExternalUserid}}" custom-class="button-class" type="primary" plain size="small" data-item="{{item}}" catchtap="openWeChat">微信</van-button>
-            <van-button round wx:if="{{item.customerPhone}}" custom-class="button-class" custom-style="margin-left:30rpx !important" type="primary" plain size="small" catchtap="openTelPhone" data-item="{{item}}">打电话</van-button>
-          </view>
-        </view>
-      </view>
-
-    </view>
-
-  </view>
-
-</view>
-<view style="height: 70px;"></view>
-
-<!-- item。三个小点 -->
-
-
-<van-popup style="z-index: 999;" show="{{showShare}}" position="bottom" bind:close="onClose" custom-class="function-pop-class">
-  <van-cell-group border="{{false}}" custom-class="function-cell-group">
-    <van-grid square border="{{false}}" icon-size="42px">
-      <!--客户跟进-->
-      <van-grid-item use-slot catchtap="follow" wx:if="{{Receive_Customer_Follow}}" >
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/customerFollow.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="客户跟进"></dk-text>
-        </view>
-      </van-grid-item>
-      <!--跟进任务-->
-      <van-grid-item use-slot catchtap="followtask" wx:if="{{Receive_Customer_Task}}" >
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/followTask.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="跟进任务"></dk-text>
-        </view>
-      </van-grid-item>
-      <!--销售订单-->
-      <van-grid-item use-slot  catchtap="toOrderAdd" data-item="{{bottomItem}}" wx:if="{{Receive_Customer_Order}}">
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/order.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="销售订单"></dk-text>
-        </view>
-      </van-grid-item>
-      <!--客户收款-->
-      <van-grid-item use-slot catchtap="toCollectionAdd" data-item="{{bottomItem}}"  wx:if="{{Receive_Customer_Receive}}">
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/receive.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="客户收款"></dk-text>
-        </view>
-      </van-grid-item>
-
-      <!--量尺回执--> 
-      <van-grid-item use-slot catchtap="measure" wx:if="{{onclikItem.followStatus == '跟进状态-约尺' && Receive_Customer_Measure&&(onclikItem.measureStatus != '量尺状态-已量尺')}}" >
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/lchz.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="量尺回执"></dk-text>
-        </view>
-      </van-grid-item>
-
-      <van-grid-item use-slot catchtap="toOk" wx:if="{{active == 1}}" >
-        <view>
-          <van-image custom-class="function-pop-image" fit="fill" src="/static/img/spzx.png"></van-image>
-        </view>
-        <view style="margin-top: -18rpx;">
-          <dk-text fontSize="12px" fontWeight="400" value="完成"></dk-text>
-        </view>
-      </van-grid-item>
-
-      
-    </van-grid>
-
-
-
-
-  </van-cell-group>
-  <view class="popup-button">
-    <van-button type="default" custom-class="pop-button-class" size="large" catchtap="onClose">取消
-      </van-button>
-  </view>
-</van-popup>
 
 
 <!-- 新建按钮 -->
-<dk-save-bottom wx:if="{{Receive_Customer_Add}}" flagTypeName="receive-customers" totallength="{{totallength}}" bind:submit="toAdd" />
-
-<van-popup position="bottom" show="{{ showTime }}" bind:close="onCloseChooseDate" class="popup" style="width:100%">
-  <view style="display:flex;justify-content: space-around;height:80rpx;">
-    <view style="width:45%;text-align: left;color:#b6b6b6;line-height:80rpx;" catchtap="onCloseChooseDate">取消</view>
-    <view style="width:45%;text-align: right;color:#1989fa;line-height:80rpx;" catchtap="onConfirmChooseDate">确定</view>
-  </view>
-  <van-datetime-picker type="datetime" value="{{ currentDate }}" bind:input="onInput" show-toolbar="{{false}}" min-date="{{ minDate }}" formatter="{{formatter}}" />
-</van-popup>
-
-<!-- 多选 -->
-<dk-muti-dropdown-item docName="客户资料" show="{{staffFlag}}" ids="{{staffIds}}" id='staff' typeName='staff' bind:muticommit='mutiSearchAll' bind:muticlose='muticloseAll'></dk-muti-dropdown-item>
-<!-- 多选 -->
-<dk-muti-dropdown-item show="{{orgFlag}}" docName="客户资料" id='org' typeName='org' bind:muticommit='mutiSearchAll' bind:muticlose='muticloseAll'></dk-muti-dropdown-item>
+<dk-save-bottom   flagTypeName="customer-collection" totallength="{{totallength}}" bind:submit="toAdd" />

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

@@ -1,92 +1,3 @@
-.create-time{
-    color: darkorange;
-  }
-  
-  .table-row {
-    display: flex;
-    width: 100%;
-    flex-direction: row;
-    justify-content: space-between;
-  }
-  
-  .oas-title {
-    width: 75%;
-    font-size: 15px;
-    color: #3b3b3b;
-    text-align: left;
-    font-weight: bold
-  }
-  
-  .oas-title-value {
-    width: 50px; 
-    font-size: 5px;
-    text-align: right;
-    color: #1989fa;   
-  }
-  
-  .oas-status {
-    width: 25%;
-    font-size: 20px;
-    color: #1989fa;
-    text-align: right;
-  }
-  
-  .popup-button {
-    position: fixed;
-    width: 100%;
-    bottom: 0;
-    display: flex;
-    align-items: center; 
-  }
-  .address{
-
-    word-break: break-all;
-    white-space: pre-wrap;
-    font-size: 13px;
-
-    color:black;
-    width: 89%;
-  }
-  .image-small {
-    color: #b3b3b3;
-    font-size: 15px;
-  }
-  .image-small-phone {
-    color: #b3b3b3;
-    font-size: 15px;
-    padding-right: 15rpx;
-  }
-  
-  .van-tabs__scroll{
-    background-color: #F5F5F5 !important;
-  }
-  
-  .van-dropdown-menu__title{
-    color: #1B365D !important;
-  }
-  .van-search__content {
-    background: #F8F9FD;
-    border: 1px solid #D6E4FF;
-    border-radius: 15rpx !important;
-  }
-  .van-field__placeholder{
-    color: #95A8CB !important;
-  }
-  .customer-and-status {
-    display: flex;
-    width: 100%;
-    justify-content: space-around;
-  }
-  .bottom-bar{
-    border-radius: 15px;
-    display: flex;
-    justify-content: space-between;
-  }
-  /**打电话的样式*/
-.button-class{
-  border: 1px solid #00A7B5 !important;
-  color:#00A7B5 !important;
+.van-tabs__scroll{
+  background-color: #F5F5F5 !important;
 }
-.van-cell__value{
-  color:#95A8CB !important;
-}

package-sales/pages/order-return/order-return.js

@@ -16,39 +16,18 @@ Page({
    * 页面的初始数据 
    */
   data: {
-    tagList:[{title:"待出库"},{title:"已出库"}],
+    tagList:[{title:"全部单据"},{title:"待出库"},{title:"已出库"}],
     // 查询条件
-    searchContent: [{
+     // 查询条件
+     searchContent: [{
       code: 'createtime',
       title: '近30天',
       defaultValue: 5,
       searchType: Constants.searchType.date
-    }, {
-      code: 'staff',
-      title: '业务员',
-      dropType: 'staff'
-    }, {
-      code: 'orderStatus',
-      title: '状态',
-      searchType: Constants.searchType.switch,
-      list: [
-        {
-          checked: true,
-          text: "客户收款",
-          value: "0"
-        },
-        {
-          checked: false,
-          text: "使用收款",
-          value: "1"
-        },
-      ]
-      
-    }, {
+    } , {
       code: 'choose',
-      title: '类型',
-      searchType: Constants.searchType.switch,
-   
+      title: '筛选',
+      searchType: Constants.searchType.pick
     }],
 
     // 查询条件-筛选
@@ -82,7 +61,8 @@ Page({
       salesChannelName: '',
       customerId: 11,
       customerName: '张三',
-      displayStatus: '已收款',
+      displayStatus: '待入库',
+      backgroundColor:'red',
       orderNo: 'SA-LWYD-ZOO-202401300SBG',
       customerPhone: '15659741980',
       addressFull: '辽宁省沈阳市浑南区沈阳市浑南区人民政府(新聪街西)1',
@@ -97,8 +77,7 @@ Page({
     }, {
       salesChannelName: '',
       customerName: '李四',
-      displayStatus: '取消',
-      backgroundColor:'red',
+      displayStatus: '已入库', 
       orderNo: 'SA-LWYD-ZOO-202401300SBD',
       customerPhone: '15659741980',
       addressFull: '辽宁省沈阳市浑南区沈阳市浑南区人民政府(新聪街西)2',
@@ -128,23 +107,23 @@ Page({
     // 列表区（内容）
     contentList: [{
       name: 'orderNo',
-      title: '出库单号'
-    },{
-      name: 'customerPhone',
-      title: '客户电话'
-    }, {
-      name: 'addressFull',
-      title: '客户地址'
+      title: '订单编号'
     }, {
       name: [{
-        name: 'orgName',
-        title: ''
-      }, {
         name: 'staffName',
-        title: '业务员'
-      }],
-      title: '门店信息'
-    }, ],
+        title: ''
+      },{
+        name: 'customerPhone',
+        title: ''
+      }, ],
+      title: '收获信息'
+    }, {
+      name: 'addressFull',
+      title: '客户地址'
+    },  {
+      name: 'makeTime',
+      title: '预计收获日期'
+    },],
 
     contentObj: {
       '成交': [{
@@ -180,11 +159,11 @@ Page({
 
     // 弹出按钮
     buttonList: [{
-      name: 'customerRefund',
-      title: '客户收款'
-      }, {
-        name: 'customerRefundList',
-        title: '客户退款'
+      name: 'warehousingProcessing',
+      title: '入库办理'
+      }, , {
+        name: 'salesReturnReversal',
+        title: '销售退货冲正'
       } 
      
     ],
@@ -211,16 +190,12 @@ Page({
    * 跳转客户详细
    */
   toDetail(e) {
-    if (this.data.active == 0) { // 待出库 明细今入
+    
     
       wx.navigateTo({
-        url: './detail/not-outbound-detail?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=outbound-processing',
-      })
-    } else { //已出库明细
-      wx.navigateTo({
-        url: './detail/outbound-detail?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)),
+        url: './detail/detail?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=outbound-processing',
       })
-    }
+   
   },
   toTitle(e) {
     console.log('t1', e);
@@ -236,7 +211,7 @@ Page({
   },
   toAdd() {
     wx.navigateTo({
-      url: './add/add',
+      url: './select-original-order/select-original-order',
     })
   },
   /**
@@ -247,15 +222,13 @@ Page({
   open(e) {
      let name = e.detail.name
      let item = e.detail.item 
-     if(name == 'customerRefund'){  //客户收款
+     if(name == 'warehousingProcessing'){  //入库办理
       wx.navigateTo({
-        url: '/package-sales/pages/order-billing/customer-collection-refund/customer-collection-refund?form='+ encodeURIComponent(JSON.stringify(item)) +'&page=customer-collection' + '&pageIndex=customer-collection',
+        url: '/package-sales/pages/sales-return-reversal/sales-return-reversal?item=' + encodeURIComponent(JSON.stringify(e.currentTarget.dataset.item)) + '&sourcePage=sales-return-reversal-add',
       })
      }
-     if(name == 'customerRefundList'){  //客户退款
-      wx.navigateTo({
-        url: '/package-sales/pages/order-billing/customer-collection/refund-record/refund-record?form='+ encodeURIComponent(JSON.stringify(item)) +'&page=customer-collection',
-      })
+     if(name == 'salesReturnReversal'){  //salesReturnReversal
+   
      }
    
        

package-sales/pages/order-return/order-return.wxml

@@ -21,4 +21,4 @@
 
 
 <!-- 新建按钮 -->
-<dk-save-bottom   flagTypeName="customer-collection" totallength="{{totallength}}" bind:submit="toAdd" />
+<dk-save-bottom flagTypeName="order-add" selectTotallength="{{selectTotallength}}" selectlength="{{selectlength}}" totallength="{{numberFormat.toThousandCents(totallength)}}" bind:submit="toAdd"   submitFlag="{{true}}" />

package-sales/pages/sales-outbound/sales-outbound.js

@@ -181,10 +181,13 @@ Page({
     // 弹出按钮
     buttonList: [{
       name: 'customerRefund',
-      title: '客户收款'
+      title: '出库办理'
       }, {
         name: 'customerRefundList',
-        title: '客户退款'
+        title: '作废'
+      } , {
+        name: 'customerRefundList',
+        title: '打印票据'
       } 
      
     ],
@@ -247,7 +250,7 @@ Page({
   open(e) {
      let name = e.detail.name
      let item = e.detail.item 
-     if(name == 'customerRefund'){  //客户收款
+     if(name == 'customerRefund'){  //出库办理
       wx.navigateTo({
         url: '/package-sales/pages/order-billing/customer-collection-refund/customer-collection-refund?form='+ encodeURIComponent(JSON.stringify(item)) +'&page=customer-collection' + '&pageIndex=customer-collection',
       })