优化

ghsApp/src/admin/billing/affirm.vue

@@ -196,10 +196,8 @@
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
 						<view class="tui-title">账单日期</view>
-						<picker mode="date" :value="form.historyDate" @change="bindHistoryDateChange" style="width:400upx;">
-							<view class="uni-input" v-if="form.historyDate==''" style="color:#CCCCCC;">请选择，默认当天</view>
-							<view class="uni-input">{{form.historyDate}}</view>
-						</picker>
+            <view class="uni-input" v-if="form.historyDate==''" style="color:#CCCCCC;" @click="bindHistoryDateChange">请选择，默认当天</view>
+            <view class="uni-input" @click="bindHistoryDateChange">{{form.historyDate}}</view>
 					</tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
@@ -261,6 +259,8 @@
        </view>
 		</uni-popup>
 
+    <mx-date-picker :show="showPicker" format="yyyy-mm-dd" type="date" :value="defaultPickerDate" :show-tips="true" @confirm="confirmPicker" @cancel="showPicker = false" />
+
     </view>
   </view>
 </template>
@@ -282,6 +282,7 @@ import { mapActions, mapGetters } from "vuex";
 import { getUserDet} from "@/api/member"
 import ModalModule from "@/components/plugin/modal"
 import { getAllWl } from "@/api/shop"
+import MxDatePicker from '@/components/mx-datepicker/mx-datepicker.vue';
 export default {
   name: "affirm",
   components: {
@@ -293,11 +294,14 @@ export default {
     appAddressGroup,
     appSendTime,
     appFormSend,
-    ModalModule
+    ModalModule,
+    MxDatePicker
   },
   mixins: [productMins],
   data () {
     return {
+			defaultPickerDate:'',
+			showPicker: false,
       discountList:[{name:'1折',value:0.1},{name:'2折',value:0.2},{name:'3折',value:0.3},{name:'4折',value:0.4},{name:'5折',value:0.5},{name:'6折',value:0.6},{name:'7折',value:0.7},{name:'8折',value:0.8},{name:'9折',value:0.9},{name:'不打折',value:1}],
       discountValue:0,
       autoLoad: false,
@@ -464,10 +468,13 @@ export default {
   },
   methods: {
     ...mapActions(["initMerchantInfo"]),
-    bindHistoryDateChange(e){
-			let date = e.detail.value
-			this.form.historyDate = date
+    bindHistoryDateChange(){
+			this.showPicker = true
     },
+		confirmPicker(e) {
+			this.form.historyDate = e.value
+      this.showPicker = false
+		},
 		bindDateChange(e){
 			let date = e.detail.value
 			this.form.sendTimeWant = date

ghsApp/src/admin/home/workbench.vue

@@ -78,7 +78,7 @@
 						{{ $util.numberFormat(data.todayData.wastage) || 0 }}
 					</div>
 				</navigator>
-				<navigator url="/admin/stat/wastage" class="info-list">
+				<navigator url="/admin/stat/kdIncome" class="info-list">
 					<div class="info-list-name">昨日</div>
 					<div class="info-list-value">
 						{{ $util.numberFormat(yesterdayIncome) }}

ghsApp/src/pagesPurchase/details.vue

@@ -51,12 +51,8 @@
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
 						<view class="tui-title ">入库日期</view>
-
-						<picker mode="date" :value="form.entryTime" @change="bindEntryTimeChange" style="width:400upx;">
-							<view class="uni-input" v-if="form.entryTime==''" style="color:#CCCCCC;">请选择，默认当天</view>
-							<view class="uni-input">{{form.entryTime}}</view>
-						</picker>
-
+						<view class="uni-input" v-if="form.entryTime==''" style="color:#CCCCCC;" @click="bindEntryTimeChange">请选择，默认当天</view>
+						<view class="uni-input" @click="bindEntryTimeChange">{{form.entryTime}}</view>
 					</tui-list-cell>
 
 					<block v-if="location == 1">
@@ -201,6 +197,8 @@
 			</view>
     </uni-popup>
 
+    <mx-date-picker :show="showPicker" format="yyyy-mm-dd" type="date" :value="defaultPickerDate" :show-tips="true" @confirm="confirmPicker" @cancel="showPicker = false" />
+
 </view>
 </template>
 
@@ -217,16 +215,20 @@ import AppDatePicker from "@/components/app-date-picker";
 import { getPrint } from "@/api/shop";
 import { getAllStaff } from "@/api/shop-admin"
 import { getShopInfoApi } from "@/api/common"
+import MxDatePicker from '@/components/mx-datepicker/mx-datepicker.vue';
 export default {
 	components: {
 		TuiListCell,
 		AppAvatarModule,
 		AppCustomerSel,
-		AppDatePicker
+		AppDatePicker,
+		MxDatePicker
 	},
 	mixins: [productMins],
 	data() {
 		return {
+			defaultPickerDate:'',
+			showPicker: false,
 			PURCHASE_ORDER_STATUS,
 			autoLoad: false,
 			selectJobType: "purchase",
@@ -399,9 +401,13 @@ export default {
 			this.form.cgStaffName = staffName
 			this.form.cgStaffId = staffId
 		},
-		bindEntryTimeChange(e){
-			let date = e.detail.value
+		bindEntryTimeChange(){
+			this.showPicker = true
+		},
+		confirmPicker(e){
+			let date = e.value
 			this.form.entryTime = date
+			this.showPicker = false
 		},
 		isCostChange(e){
 			this.form.isCost = e.detail.value