确认开单新增字段itemId、供货商小程序端发货新增客户名称、客户手机号

ghsApp/src/admin/billing/affirm.vue

@@ -239,7 +239,7 @@ export default {
 				let formData = this.form;
 
 				const product = this.selectList.map(ele => {
-					return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount };
+					return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount,classId:ele.classId,itemId:ele.itemId };
 				});
 				formData.product = JSON.stringify(product);
 				if (!this.getMerchantInfo) {

ghsApp/src/components/app-address-group.vue

@@ -1,11 +1,6 @@
 <template>
 	<view>
-		<tui-list-cell
-			class="line-cell"
-			:hover="false"
-			:arrow="false"
-			@click="openAddres"
-		>
+		<tui-list-cell class="line-cell" :hover="false" :arrow="false" @click="openAddres">
 			<view class="tui-title ">{{ cityTitle }}</view>
 			<view class="tui-input" v-if="form.province || form.city">
 				{{ form.province + "-" + form.city }}
@@ -13,12 +8,15 @@
 			<view class="tui-input" v-else>请选择</view>
 			<input v-model="form.province" name="province" hidden />
 		</tui-list-cell>
-		<tui-list-cell
-			class="line-cell"
-			:hover="false"
-			:arrow="true"
-			@click="selRegionFn"
-		>
+		<tui-list-cell v-if="isFloor" class="line-cell" :hover="false">
+			<view class="tui-title ">客户名称</view>
+			<input v-model="form.customName" placeholder-class="phcolor" class="tui-input" name="floor" @input="changeFloor" placeholder="客户名称"/>
+		</tui-list-cell>
+		<tui-list-cell v-if="isFloor" class="line-cell" :hover="false">
+			<view class="tui-title ">客户手机</view>
+			<input v-model="form.customMobile" placeholder-class="phcolor" class="tui-input" name="floor" @input="changeFloor" placeholder="客户手机"/>
+		</tui-list-cell>
+		<tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selRegionFn">
 			<view class="tui-title ">{{ detailTitle }}</view>
 			<view class="tui-input" v-if="form.address">{{ form.address }}</view>
 			<view class="tui-placeholder" v-else>请填写详细地址</view>
@@ -26,21 +24,10 @@
 		</tui-list-cell>
 		<tui-list-cell v-if="isFloor" class="line-cell" :hover="false">
 			<view class="tui-title ">门牌号</view>
-			<input
-				v-model="form.floor"
-				placeholder-class="phcolor"
-				class="tui-input"
-				name="floor"
-				@input="changeFloor"
-				placeholder="楼号门牌号（选填）"
-			/>
+			<input v-model="form.floor" placeholder-class="phcolor" class="tui-input" name="floor" @input="changeFloor" placeholder="楼号门牌号（选填）"/>
 		</tui-list-cell>
 		<!-- 选择地区 -->
-		<app-area-sel
-			:show.sync="showRegion"
-			@change="changeAreaFn"
-			:city="form.city"
-		/>
+		<app-area-sel :show.sync="showRegion" @change="changeAreaFn" :city="form.city"/>
 		<!-- 省市联动 -->
 		<!-- <simple-address
 			ref="simpleAddress"
@@ -89,6 +76,8 @@ export default {
 			cityPickerValueDefault: [0, 0],
 			form: {
 				province: "",
+				customMobile: "",
+				customName: "",
 				city: "",
 				address: "",
 				floor: "",
@@ -114,13 +103,15 @@ export default {
           this.form.address = res.data.address;
           this.form.latitude = res.data.lat;
           this.form.longitude = res.data.long;
+          this.form.customMobile = res.data.name;
+          this.form.customName = res.data.mobile;
           this.$emit("selectAdress", this.form);
         })
       } else {
         this.form.province = this.getMyShopInfo.province;
         this.form.city = this.getMyShopInfo.city;
       }
-			
+
 		},
 		formatForm() {
 			Object.keys(this.form).forEach(i => {
@@ -151,9 +142,9 @@ export default {
 			this.form.longitude = e.location.lng;
 			this.$emit("selectAdress", this.form);
 		},
-		changeFloor(e) {
-			this.$emit("selectAdress", this.form);
-		}
+		// changeFloor(e) {
+		// 	this.$emit("selectAdress", this.form);
+		// }
 	},
 	watch: {
 		getFormObj() {

ghsApp/src/components/app-form-send1.vue

@@ -12,8 +12,8 @@
 		</tui-list-cell>
 		<!-- 门店送或快递送需要设置地址 -->
 		<appAddressGroup :customId="customId" cityTitle="配送城市" @selectAdress="selectAdress" ></appAddressGroup>
-		<!-- <appSendTime @alterTime="selectAdress('')" :sendDate.sync="formData.sendDate" :sendTime.sync="formData.sendTime"></appSendTime> -->  
-    	<appTimer :sendTime="formData.sendTime" @confirm="onConfirm"></appTimer>
+		<!-- <appSendTime @alterTime="selectAdress('')" :sendDate.sync="formData.sendDate" :sendTime.sync="formData.sendTime"></appSendTime> -->
+		<appTimer :sendTime="formData.sendTime" @confirm="onConfirm"></appTimer>
 		<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 			<view class="tui-title">运费</view>
 			<view v-if="formData.sendCost" class="tui-input">
@@ -52,6 +52,8 @@ export default {
 		return {
 			formData: {
 				sendCost: "",
+				customName: "",
+				customMobile: "",
 				receiveProvince: "",
 				receiveCity: "",
 				receiveFloor: "",
@@ -112,12 +114,16 @@ export default {
 				this.formData.receiveAddress = info.address;
 				this.formData.receiveLong = info.longitude;
 				this.formData.receiveLat = info.latitude;
+				this.formData.customName = info.customName;
+				this.formData.customMobile = info.customMobile;
 			}
 
 			console.log('this.formData',this.formData)
 			this.$nextTick(() => {
 				let params = {
 					id: this.orderid,
+					customName: this.formData.customName,
+					customMobile: this.formData.customMobile,
 					province: this.formData.receiveProvince,
 					city:this.formData.receiveCity,
 					address:this.formData.receiveAddress,

ghsApp/src/pagesOrder/shipInfo.vue

@@ -82,14 +82,12 @@ export default {
 		this.orderId = e.orderId;
 		if (!this.getMerchantInfo && this.customId != '0') {
 			this.initMerchantInfo().then(data => {
-				uni.setNavigationBarTitle({
-					title: data.name
-				});
+				// uni.setNavigationBarTitle({title: data.name});
+				uni.setNavigationBarTitle({title: '确认客户地址'});
 			});
 		} else {
-			uni.setNavigationBarTitle({
-				title: this.getMerchantInfo.name
-			});
+			// uni.setNavigationBarTitle({title: this.getMerchantInfo.name});
+			uni.setNavigationBarTitle({title: '确认客户地址'});
 		}
 	},
 	computed: {

ghsApp/src/pagesPurchase/details.vue

@@ -305,6 +305,7 @@ export default {
 						productId: ele.id,
 						bigNum: ele.bigCount,
 						smallNum: ele.smallCount,
+						itemId:ele.itemId,
 						itemPrice: ele.itemPrice || this.getSelectItemPrice(ele)
 					};
 				});

ghsApp/src/pagesStorehouse/inventory/update.vue

@@ -286,7 +286,7 @@ export default {
 					return {
 						bigNum: ele.bigCount,
 						smallNum: ele.smallCount,
-						productId: ele.id
+						productId: ele.id,classId:ele.classId,itemId:ele.itemId
 					};
 				});
 				params.itemInfo = JSON.stringify(formatList);

hdApp/src/admin/billing/affirm.vue

@@ -167,7 +167,7 @@ export default {
 			if(this.packingMoney==''){uni.showToast({title:'请输入包装费！',icon:'none'});return;}
 			if(this.payType==null){uni.showToast({title:'请选择结算方式！',icon:'none'});return;}
 			const product = this.selectList.map(ele => {
-				return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount };
+				return { productId: ele.id, bigNum: ele.bigCount, smallNum: ele.smallCount,classId:ele.classId,itemId:ele.itemId };
 			});
 			let options = {
 				orderType:2,// 开单类型，1成品开单 2花材开单

hdApp/src/pagesStorehouse/inventory/update.vue

@@ -309,7 +309,8 @@ export default {
 					return {
 						bigNum: ele.bigCount,
 						smallNum: ele.smallCount,
-						productId: ele.id
+						productId: ele.id,
+						classId:ele.classId,itemId:ele.itemId
 					};
 				});
 				params.itemInfo = JSON.stringify(formatList);