shish 5 жил өмнө
parent
commit
65a6e539aa

+ 13 - 0
ghsApp/src/admin/billing/affirm.vue

@@ -220,6 +220,19 @@ export default {
 			});
 			});
 		},
 		},
 		affirmFormSubmit(){
 		affirmFormSubmit(){
+
+			let rules = [
+			{
+				name: "customId",
+				rule: ["required"],
+				msg: ["请选择客户"]
+			}];
+			let checkRes = formUtil.validation(this.form, rules)
+			if (checkRes) {
+				this.$msg(checkRes)
+				return false
+			}
+
 			let self = this;
 			let self = this;
 			uni.showModal({
 			uni.showModal({
 				title: '提示',
 				title: '提示',

+ 8 - 2
ghsApp/src/pagesOrder/detail.vue

@@ -43,12 +43,18 @@
 					</view>
 					</view>
 				</view>
 				</view>
 				<view class="order-info_box">
 				<view class="order-info_box">
-					<view>开单:</view>
+					<view>开单:</view>
 					<view>{{ detailInfo.shopAdminName }}</view>
 					<view>{{ detailInfo.shopAdminName }}</view>
 				</view>
 				</view>
 				<view class="order-info_box">
 				<view class="order-info_box">
 					<view>出货日期:</view>
 					<view>出货日期:</view>
-					<view>{{ detailInfo.outTime }}</view>
+					<view v-if="detailInfo.outTime == '0000-00-00 00:00:00'">-</view>
+					<view v-else>{{ detailInfo.outTime }}</view>
+				</view>
+				<view class="order-info_box">
+					<view>客户下单:</view>
+					<view v-if="detailInfo.customShopAdminId == 0">-</view>
+					<view v-else>✔</view>
 				</view>
 				</view>
 				<view class="order-info_box">
 				<view class="order-info_box">
 					<view>欠款:</view>
 					<view>欠款:</view>