Home Esplora Aiuto
Registrati Accedi
zhh
/
front-end
1
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

发快递流程

shish 5 anni fa
parent
3441386ead
commit
85bd96d69d
7 ha cambiato i file con 78 aggiunte e 71 eliminazioni
Visualizzazione unificata Mostra Diff Stats
  1. 0 0
      ghs/dist/shop/css/chunk-d549990c.46c9d5da.css
  2. 1 1
      ghs/dist/shop/index.html
  3. 0 0
      ghs/dist/shop/js/app.a719ac03.js
  4. 0 0
      ghs/dist/shop/js/chunk-06a50ac6.a5c860da.js
  5. 0 0
      ghs/dist/shop/js/chunk-d549990c.12ebd793.js
  6. 70 60
      ghs/src/views/order/components/sel-order.vue
  7. 7 10
      ghsApp/src/admin/billing/affirm.vue

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/css/chunk-d549990c.46c9d5da.css


+ 1 - 1
ghs/dist/shop/index.html
Vedi File 

@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				color: #ababab;
 
 				font-size: 12px;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.4f2cf5a8.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.4f2cf5a8.js"></script></body></html>
 
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.a719ac03.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="http://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="http://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="http://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="http://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="http://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="http://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="http://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="http://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="http://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="http://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="http://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="http://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.a719ac03.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/app.a719ac03.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-06a50ac6.a5c860da.js


File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/chunk-d549990c.12ebd793.js


+ 70 - 60
ghs/src/views/order/components/sel-order.vue
Vedi File 

@@ -92,7 +92,7 @@
 
                           </div>
 
                           </div>
 
                           <el-button type="primary" slot="reference">本店送</el-button>
 
                           <el-button type="primary" slot="reference">本店送</el-button>
 
                         </el-popover>
 
                         </el-popover>
 
-                        <el-button style="margin-left: 20px" @click="fillFormFn" type="primary" >发货</el-button>
 
+                        <el-button style="margin-left: 20px" @click="fillFormFn" type="primary" >发快递</el-button>
 
 
 
 										</div>
 
 										</div>
 
 									</template>
 
 									</template>
 
@@ -141,7 +141,7 @@
 
 			</div>
 
 			</div>
 
 		</el-drawer>
 
 		</el-drawer>
 
 		<!-- 填单 -->
 
 		<!-- 填单 -->
 
-		<el-dialog title="填单" :visible.sync="orderDialog" :close-on-click-modal="false" width="30%">
 
+		<el-dialog title="确认客户地址" :visible.sync="orderDialog" :close-on-click-modal="false" width="30%">
 
 			<div class="order-modal-content">
 
 			<div class="order-modal-content">
 
 				<el-form
 
 				<el-form
 
 					:model="orderForm"
 
 					:model="orderForm"
 
@@ -153,19 +153,27 @@
 
 					<div class="form-wrap">
 
 					<div class="form-wrap">
 
 						<!-- 左侧 -->
 
 						<!-- 左侧 -->
 
 						<div class="form-left-wrap">
 
 						<div class="form-left-wrap">
 
-              <el-form-item label="配送方" prop="sendSide">
 
-                <el-select v-model="orderForm.sendSide" placeholder="请选择" size="small" @change="selectSendSide" style="width: 100%">
 
-                  <el-option
 
-                      v-for="item in sendSideOpt"
 
-                      :key="item.value"
 
-                      :label="item.label"
 
-                      :value="item.value"
 
-                  ></el-option>
 
-                </el-select>
 
-              </el-form-item>
 
-							<el-form-item label="配送城市" prop="receiveMobile" style="margin-bottom: 8px;">
 
-								<el-input v-model="orderForm.receiveCity" :disabled="true" placeholder="配送城市" size="mini"></el-input>
 
+							<el-form-item label="配送方" prop="sendSide">
 
+								<el-select v-model="orderForm.sendSide" placeholder="请选择" size="small" @change="selectSendSide" style="width: 100%">
 
+								<el-option
 
+									v-for="item in sendSideOpt"
 
+									:key="item.value"
 
+									:label="item.label"
 
+									:value="item.value"
 
+								></el-option>
 
+								</el-select>
 
 							</el-form-item>
 
 							</el-form-item>
 
+							<el-form-item label="城市" prop="receiveMobile" style="margin-bottom: 8px;">
 
+								<el-input v-model="orderForm.receiveCity" :disabled="true" placeholder="城市" size="mini"></el-input>
 
+							</el-form-item>
 
+
 
+							<el-form-item label="客户名称" prop="customName" style="margin-bottom: 8px;">
 
+								<el-input v-model="orderForm.customName" placeholder="请填写" size="mini"></el-input>
 
+							</el-form-item>
 
+							<el-form-item label="客户手机" prop="customMobile" style="margin-bottom: 8px;">
 
+								<el-input v-model="orderForm.customMobile" placeholder="请填写" size="mini"></el-input>
 
+							</el-form-item>
 
+
 
 							<el-form-item label="详细地址" prop="receiveAddress" style="margin-bottom: 8px;">
 
 							<el-form-item label="详细地址" prop="receiveAddress" style="margin-bottom: 8px;">
 
 								<el-autocomplete
 
 								<el-autocomplete
 
 									v-model="orderForm.receiveAddress"
 
 									v-model="orderForm.receiveAddress"
 
@@ -185,10 +193,11 @@
 
 								<el-input v-model="orderForm.receiveFloor" placeholder="楼号门牌号（选填）" size="mini"></el-input>
 
 								<el-input v-model="orderForm.receiveFloor" placeholder="楼号门牌号（选填）" size="mini"></el-input>
 
 							</el-form-item>
 
 							</el-form-item>
 
 							<el-form-item label="配送时间" prop="reachTime" style="margin-bottom: 8px;">
 
 							<el-form-item label="配送时间" prop="reachTime" style="margin-bottom: 8px;">
 
-                <el-time-picker format='HH:mm' value-format="HH:mm" v-model="orderForm.reachTime" @change="freight" placeholder="任意时间点" style="width: 100%" size="mini"></el-time-picker>
 
+							<el-time-picker format='HH:mm' value-format="HH:mm" v-model="orderForm.reachTime" @change="freight" placeholder="任意时间点" style="width: 100%" size="mini">
 
+							</el-time-picker>
 
 							</el-form-item>
 
 							</el-form-item>
 
 							<el-form-item label="运费" prop="remark" style="margin-bottom: 8px;">
 
 							<el-form-item label="运费" prop="remark" style="margin-bottom: 8px;">
 
-								<el-input v-model="orderForm.sedCost" :disabled="true" placeholder="留空表示免运费" size="mini"></el-input>
 
+								<el-input v-model="orderForm.sedCost" :disabled="true" placeholder="" size="mini"></el-input>
 
 							</el-form-item>
 
 							</el-form-item>
 
 						</div>
 
 						</div>
 
 					</div>
 
 					</div>
 
@@ -360,20 +369,22 @@ export default {
 
 			relateData: {},
 
 			relateData: {},
 
 			confirmSendVisit: false,
 
 			confirmSendVisit: false,
 
 			orderDialog: false,
 
 			orderDialog: false,
 
-      freightInfo:{
 
-        id: '',
 
-        floor:'',
 
-        province: '',
 
-        city: '',
 
-        address: '',
 
-        expressId: '',
 
-        long: '',
 
-        lat: '',
 
-        sendTime: '',
 
-      },
 
+			freightInfo:{
 
+				id: '',
 
+				floor:'',
 
+				province: '',
 
+				city: '',
 
+				address: '',
 
+				expressId: '',
 
+				long: '',
 
+				lat: '',
 
+				customName:'',
 
+				customMobile:'',
 
+				sendTime: '',
 
+			},
 
 			orderForm: {
 
 			orderForm: {
 
-        sendSide:'',//配送方
 
-        sedCost:'',//运费
 
+				sendSide:'',//配送方
 
+				sedCost:'',//运费
 
 				receiveUserName: '', // 收花人姓名；到店自提的姓名
 
 				receiveUserName: '', // 收花人姓名；到店自提的姓名
 
 				receiveMobile: '', // 收花人手机；到店自提的电话；
 
 				receiveMobile: '', // 收花人手机；到店自提的电话；
 
 				receiveProvince: '', // 收花人省份
 
 				receiveProvince: '', // 收花人省份
 
@@ -381,7 +392,6 @@ export default {
 
 				receiveAddress: '', // 收花人地址
 
 				receiveAddress: '', // 收花人地址
 
 				receiveFloor: '', // 收花人门楼号和牌号
 
 				receiveFloor: '', // 收花人门楼号和牌号
 
 				receiveFullAddress: '', // 收花人完整地址，从腾讯地图接口获取
 
 				receiveFullAddress: '', // 收花人完整地址，从腾讯地图接口获取
 
-				// bookName: '', // 订花人姓名
 
 				bookMobile: '', // 订花人手机号
 
 				bookMobile: '', // 订花人手机号
 
 				reachTime: '', // 配送时间
 
 				reachTime: '', // 配送时间
 
 				reachPeriod: '0', // 配送时段，0上午1下午2晚上
 
 				reachPeriod: '0', // 配送时段，0上午1下午2晚上
 
@@ -510,27 +520,26 @@ export default {
 
 			this.orderForm.longitude = item.location.lng;
 
 			this.orderForm.longitude = item.location.lng;
 
 			this.orderForm.receiveAddress = item.title;
 
 			this.orderForm.receiveAddress = item.title;
 
 			this.orderForm.receiveFullAddress = item.address;
 
 			this.orderForm.receiveFullAddress = item.address;
 
-
 
-      this.freightInfo.address = item.address;
 
-      this.freightInfo.long = item.location.lng;
 
-      this.freightInfo.lat = item.location.lat;
 
-      this.freight()
 
+			this.freightInfo.address = item.address;
 
+			this.freightInfo.long = item.location.lng;
 
+			this.freightInfo.lat = item.location.lat;
 
+			this.freight()
 
 		},
 
 		},
 
 		submitOrderFn() {
 
 		submitOrderFn() {
 
-      if(this.$util.isEmpty(this.freightInfo.expressId)){this.$message({message: '请选择配送方',type: 'warning'});return};
 
-      if(this.$util.isEmpty(this.orderForm.reachTime)){this.$message({message: '请选择配时间',type: 'warning'});return};
 
-      let parameter = {
 
-        id:this.id,
 
-        sendCost:this.orderForm.sedCost,
 
-        expressId:this.freightInfo.expressId,
 
-        sendTime:this.orderForm.reachTime,
 
-      }
 
+			if(this.$util.isEmpty(this.freightInfo.expressId)){this.$message({message: '请选择配送方',type: 'warning'});return};
 
+			if(this.$util.isEmpty(this.orderForm.reachTime)){this.$message({message: '请选择配时间',type: 'warning'});return};
 
+			let parameter = {
 
+				id:this.id,
 
+				sendCost:this.orderForm.sedCost,
 
+				expressId:this.freightInfo.expressId,
 
+				sendTime:this.orderForm.reachTime,
 
+			}
 
 			this.$service.order.sendExpressage(parameter)
 
 			this.$service.order.sendExpressage(parameter)
 
-				.then(res => {
 
-          this.init();
 
-					// this.getDet();
 
-					this.resetForm();
 
-				});
 
+			.then(res => {
 
+			this.init();
 
+				// this.getDet();
 
+				this.resetForm();
 
+			});
 
 		},
 
 		},
 
 		handleChange(value) {
 
 		handleChange(value) {
 
 			console.log('value', value);
 
 			console.log('value', value);
 
@@ -581,20 +590,21 @@ export default {
 
 				this.printOrder();
 
 				this.printOrder();
 
 			});
 
 			});
 
 		},
 
 		},
 
-		// 填单
 
+		//发快递
 
 		fillFormFn() {
 
 		fillFormFn() {
 
 			this.orderDialog = true;
 
 			this.orderDialog = true;
 
-      this.freightInfo.id = this.id;
 
-      this.$service.custom.clientInfo({ id: this.orderData.customId}).then(res => {
 
-        this.orderForm.receiveCity = `${res.province}-${res.city}`
 
-        this.orderForm.receiveAddress = `${res.address}`
 
-
 
-        this.freightInfo.province = res.province;
 
-        this.freightInfo.city = res.city;
 
-        this.freightInfo.address = res.address;
 
-        this.freightInfo.long = res.long;
 
-        this.freightInfo.lat = res.lat;
 
-      });
 
+			this.freightInfo.id = this.id;
 
+			this.$service.custom.clientInfo({ id: this.orderData.customId}).then(res => {
 
+				this.orderForm.receiveCity = `${res.province}-${res.city}`
 
+				this.orderForm.receiveAddress = `${res.address}`
 
+				this.orderForm.customName = `${res.name}`
 
+				this.orderForm.customMobile = `${res.mobile}`
 
+				this.freightInfo.province = res.province;
 
+				this.freightInfo.city = res.city;
 
+				this.freightInfo.address = res.address;
 
+				this.freightInfo.long = res.long;
 
+				this.freightInfo.lat = res.lat;
 
+			})
 
 		},
 
 		},
 
     freight(){
 
     freight(){
 
       this.freightInfo.floor = this.orderForm.receiveFloor;
 
       this.freightInfo.floor = this.orderForm.receiveFloor;

+ 7 - 10
ghsApp/src/admin/billing/affirm.vue
Vedi File 

@@ -59,7 +59,7 @@
 
 					</tui-list-cell>
 
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 
 						<view class="tui-title ">送货</view>
 
 						<view class="tui-title ">送货</view>
 
-						<button @tap="form.sendType=2" class="admin-button-com mini-btn" :class="form.sendType==2?'blue':'default'">自取</button>
 
+						<button @tap="form.sendType=2;form.sendCost=''" class="admin-button-com mini-btn" :class="form.sendType==2?'blue':'default'">自取</button>
 
 						<button @click="form.sendType=1" class="admin-button-com mini-btn" :class="form.sendType==1?'blue':'default'">配送</button>
 
 						<button @click="form.sendType=1" class="admin-button-com mini-btn" :class="form.sendType==1?'blue':'default'">配送</button>
 
 					</tui-list-cell>
 
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="form.sendType == 1">
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="form.sendType == 1">
 
@@ -67,13 +67,11 @@
 
 						<input type="number" placeholder="留空表示免运费" @input="countAllPrices" v-model="form.sendCost" placeholder-class="tui-placeholder">
 
 						<input type="number" placeholder="留空表示免运费" @input="countAllPrices" v-model="form.sendCost" placeholder-class="tui-placeholder">
 
 					</tui-list-cell>
 
 					</tui-list-cell>
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
 
-						<view class="tui-title ">结算方式</view>
 
-						<button @tap="form.debt=1" class="admin-button-com mini-btn" :class="form.debt==1?'blue':'default'">欠款</button>
 
+						<view class="tui-title ">付款方式</view>
 
+						<button v-if="form.customId" @tap="form.debt=1" class="admin-button-com mini-btn" :class="form.debt==1?'blue':'default'">欠款</button>
 
 						<button @click="form.debt=0" class="admin-button-com mini-btn" :class="form.debt==0?'blue':'default'">已收款</button>
 
 						<button @click="form.debt=0" class="admin-button-com mini-btn" :class="form.debt==0?'blue':'default'">已收款</button>
 
 					</tui-list-cell>
 
 					</tui-list-cell>
 
 
 
-
 
-<!--					<appFormSend :form.sync="form"> </appFormSend>-->
 
 				</view>
 
 				</view>
 
 			</form>
 
 			</form>
 
 		</view>
 
 		</view>
 
@@ -127,7 +125,7 @@ export default {
 
 		return {
 
 		return {
 
 			autoLoad: false,
 
 			autoLoad: false,
 
 			form: {
 
 			form: {
 
-				debt:0,//结算方式 1欠款订单 0正常订单
 
+				debt:0,//付款方式 1欠款订单 0正常订单
 
 				shopId: "",
 
 				shopId: "",
 
 				shopName: "",
 
 				shopName: "",
 
 				receiveProvince: "",
 
 				receiveProvince: "",
 
@@ -187,7 +185,6 @@ export default {
 
 		},
 
 		},
 
 
 
 		changeCustomerFn(info) {
 
 		changeCustomerFn(info) {
 
-			console.log("changeCustomerFn", info);
 
 			let params = {
 
 			let params = {
 
 				province: info.province,
 
 				province: info.province,
 
 				city:info.city,
 
 				city:info.city,
 
@@ -199,9 +196,9 @@ export default {
 
 			freight(params).then(res => {
 
 			freight(params).then(res => {
 
 				this.form.sendCost = res.data.sedCost;
 
 				this.form.sendCost = res.data.sedCost;
 
 			});
 
 			});
 
-			this.form.customId = info.id;
 
-			this.form.customName = info.name;
 
-      this.dorm.debt = 0
 
+			this.form.customId = info.id
 
+			this.form.customName = info.name
 
+      		this.form.debt = 1
 
 		},
 
 		},
 
 		confirmFn(options) {
 
 		confirmFn(options) {
 
 			if(options.sendType==2){
 
 			if(options.sendType==2){

Some files were not shown because too many files changed in this diff