shish il y a 1 an
Parent
commit
b48063b77b

+ 3 - 1
ghsApp/src/api/purchase/index.js

@@ -6,7 +6,9 @@ export const assignSeat = data => {
 
 export const modifyEntryTime = data => {
 	return https.get("/purchase-order/modify-entry-time", data);
-};export const batchConfirm = data => {
+};
+
+export const batchConfirm = data => {
 	return https.post("/purchase/batch-confirm", data);
 };
 

+ 21 - 12
ghsApp/src/pagesOrder/detail.vue

@@ -39,13 +39,16 @@
 				<view class="order-info_box" v-if="detailInfo.payStatus == 1">
 					<view>确认时间:</view>
 					<view>
-
-						<picker mode="date" :value="payDate" @change="updateConfirmTime" style="width:500upx;">
-							<view class="uni-input">{{ detailInfo.payTime?detailInfo.payTime.substr(5,11):'' }}</view>
-						</picker>
-
+						{{ detailInfo.payTime?detailInfo.payTime.substr(5,11):'' }}
+					</view>
+					<view class="price">
+						<button @click="openPicker" class="admin-button-com default">修改</button>
 					</view>
 				</view>
+				<view class="order-info_box">
+					<view>客户单号:</view>
+					<view>{{ detailInfo.cgInfo.orderSn }}</view>
+				</view>
 				<view class="order-info_box">
 					<view>订单编号:</view>
 					<view>{{ detailInfo.orderSn }}</view>
@@ -53,10 +56,6 @@
 						<button @click="copy(detailInfo.orderSn)" class="admin-button-com default">复制</button>
 					</view>
 				</view>
-				<view class="order-info_box">
-					<view>客户单号:</view>
-					<view>{{ detailInfo.cgInfo.orderSn }}</view>
-				</view>
 				<view class="order-info_box" v-if="detailInfo.book == 1">
 					<view>订单类型:</view>
 					<view>
@@ -452,6 +451,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>
 <script>
@@ -471,16 +472,20 @@ import { partItem } from "@/api/part"
 import { delItem,updateRemarkItemFn } from "@/api/order-item";
 import { getAllStaff } from "@/api/shop-admin"
 import ModalModule from "@/components/plugin/modal"
+import MxDatePicker from '@/components/mx-datepicker/mx-datepicker.vue';
 export default {
 	name: "orderDetail",
 	components: {
 		stepStatus,
 		TuiListCell,
-		ModalModule
+		ModalModule,
+		MxDatePicker
 	},
 	mixins: [productMins,BLE],
 	data() {
 		return {
+			defaultPickerDate:'',
+			showPicker: false,
 			ORDER_STATUS,
 			orderId:'',
 			selectJobType: "order_change",
@@ -566,10 +571,14 @@ export default {
 		getBookChange(){
 			this.$util.pageTo({url: '/pagesOrder/bookChange?orderId='+this.detailInfo.id})
 		},
-		updateConfirmTime(e){
+		openPicker(){
+			this.showPicker = true
+		},
+		confirmPicker(e) {
 			let that = this
-			this.payDate = e.detail.value
+			this.payDate = e.value
 			that.$util.confirmModal({content:'确认修改?'},() => {
+				that.showPicker = false
 				modifyOrderConfirmTimeFn({id:that.detailInfo.id,date:that.payDate}).then(res=>{
 					if(res.code == 1){
 						that.$msg(res.msg)

+ 34 - 13
ghsApp/src/pagesPurchase/info.vue

@@ -24,17 +24,11 @@
 				<view class="order-info_box">
 					<view>入库日期:</view>
 					<view>
-						<picker mode="date" :value="entryTime" @change="updateEntryTime" style="width:500upx;">
-							<view v-if="detailInfo.status==4">{{ detailInfo.entryTime?detailInfo.entryTime.substr(2,14):'' }}</view>
-							<view v-else>待入库</view>
-						</picker>
-					</view>				
-				</view>
-				<view class="order-info_box">
-					<view>订单编码:</view>
-					<view>{{ detailInfo.orderSn }}</view>
+						<text v-if="detailInfo.status==4">{{ detailInfo.entryTime?detailInfo.entryTime.substr(2,14):'' }}</text>
+						<text v-else>待入库</text>
+					</view>	
 					<view class="price">
-						<button @click="copy(detailInfo.orderSn)" class="admin-button-com default" > 复制 </button>
+						<button @click="openPicker" class="admin-button-com default" >修改</button>
 					</view>
 				</view>
 				<view class="order-info_box">
@@ -45,6 +39,13 @@
 					<view>录入人员:</view>
 					<view>{{ detailInfo.adminName }}</view>
 				</view>
+				<view class="order-info_box">
+					<view>订单编码:</view>
+					<view>{{ detailInfo.orderSn }}</view>
+					<view class="price">
+						<button @click="copy(detailInfo.orderSn)" class="admin-button-com default" > 复制 </button>
+					</view>
+				</view>
 				<view class="order-info_box">
 					<view>核销编码:</view>
 					<view>{{ detailInfo.checkCode }}</view>
@@ -291,6 +292,8 @@
 		</template>
 		</modal-module>
 
+		<mx-date-picker :show="showPicker" format="yyyy-mm-dd" type="date" :value="defaultPickerDate" :show-tips="true" @confirm="confirmPicker" @cancel="showPicker = false" />
+
 	</view>
 </template>
 <script>
@@ -302,11 +305,13 @@ import { print } from '@/api/product';
 import { getPrint } from "@/api/shop";
 import { mapGetters } from "vuex";
 import { IMGHOST } from '@/config'
+import MxDatePicker from '@/components/mx-datepicker/mx-datepicker.vue';
 export default {
 	name: "info",
 	components: {
 		TuiListCell,
-		ModalModule
+		ModalModule,
+		MxDatePicker
 	},
 	computed: {
     	...mapGetters(["getLoginInfo"]),
@@ -315,6 +320,8 @@ export default {
 	mixins: [productMins],
 	data() {
 		return {
+			defaultPickerDate:'',
+			showPicker: false,
 			selectJobType: "order_change",
 			autoLoad: false,
 			stepActive: 0,
@@ -358,8 +365,6 @@ export default {
 	},
 	onUnload(){
 		clearInterval(this.T)
-
-
 	},
 	onShareAppMessage(res) {
 		console.log("pagesPurchase/info?orderSn="+this.detailInfo.orderSn+'&salt='+this.detailInfo.salt)
@@ -371,6 +376,22 @@ export default {
 		}
 	},	
 	methods: {
+		openPicker(){
+			this.showPicker = true
+		},
+		confirmPicker(e) {
+			let that = this
+			let currentDate = e.value
+			that.$util.confirmModal({content:'确认修改?'},() => {
+				that.showPicker = false
+				modifyEntryTime({id:that.detailInfo.id,date:currentDate}).then(res=>{
+					if(res.code == 1){
+						that.$msg(res.msg)
+						that.initCgData()
+					}
+				})
+			})
+		},
 		changeView(){
 			if(this.showSeat == 0){
 				if(this.detailInfo.status == 4){