开单和收款流程

ghsApp/src/admin/billing/affirm.vue

@@ -115,6 +115,22 @@
             <view class="tui-title">客户</view>
             <view class="tui-input">{{ form.customName }}</view>
           </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
+            <view class="tui-title">收款方式</view>
+            <button @click="form.hasPay = 2" class="admin-button-com big" :class="form.hasPay == 2 ? 'blue' : 'default'" style="margin-right:16upx;">赊账</button>
+            <button @click="form.hasPay = 0" class="admin-button-com big" :class="form.hasPay == 0 ? 'blue' : 'default'" style="margin-right:16upx;">扫码分享</button>
+            <button @tap="form.hasPay = 1" class="admin-button-com big" :class="form.hasPay == 1 ? 'blue' : 'default'" style="margin-right:0upx;">线下</button>
+          </tui-list-cell>
+
+          <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">
+            <div class="tui-title">线下方式</div>
+            <picker mode="selector" :value="form.payWay" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input" >
+              <input v-model="form.payWay" name="payWay" type="text" hidden />
+              <div style="padding:6upx 0 6upx 0;">{{payWayList[payWayindex].name}}</div>
+            </picker>
+          </tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-show="displayPackCost == true">
             <view class="tui-title">打包费</view>
             <input type="digit" placeholder="请填写打包费" v-model="form.packCost" placeholder-class="tui-placeholder"/>
@@ -150,21 +166,6 @@
             <input type="digit" placeholder="请填写运费" v-model="form.sendCost" placeholder-class="tui-placeholder"/>
           </tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
-            <view class="tui-title">收款方式</view>
-            <button @click="form.hasPay = 2" class="admin-button-com big" :class="form.hasPay == 2 ? 'blue' : 'default'" style="margin-right:16upx;">赊账</button>
-            <button @click="form.hasPay = 0" class="admin-button-com big" :class="form.hasPay == 0 ? 'blue' : 'default'" style="margin-right:16upx;">扫码分享</button>
-            <button @tap="form.hasPay = 1" class="admin-button-com big" :class="form.hasPay == 1 ? 'blue' : 'default'" style="margin-right:0upx;">线下</button>
-          </tui-list-cell>
-
-          <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">
-            <div class="tui-title">线下方式</div>
-            <picker mode="selector" :value="form.payWay" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input" >
-              <input v-model="form.payWay" name="payWay" type="text" hidden />
-              <div style="padding:6upx 0 6upx 0;">{{payWayList[payWayindex].name}}</div>
-            </picker>
-          </tui-list-cell>
-
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">打印小票</view>
             <button @click="form.needPrint = 1" class="admin-button-com big" :class="form.needPrint == 1 ? 'blue' : 'default'">打印</button>

hdApp/src/admin/billing/affirm.vue

@@ -122,28 +122,22 @@
             </view>
           </tui-list-cell>
 
+					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+						<view class="tui-title">收款方式</view>
+            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="form.hasPay = 4" class="admin-button-com mini-btn" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
+            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="form.hasPay = 0" class="admin-button-com mini-btn" :class="form.hasPay == 0 ? 'blue' : 'default'">扫码</button>
+            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
+            <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="form.hasPay = 2" class="admin-button-com mini-btn" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
+					</tui-list-cell>
+
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
             <view class="tui-title">配送方式</view>
-            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">自取</button>
             <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(0)" class="admin-button-com mini-btn" :class="form.sendType == 0 ? 'blue' : 'default'">送货</button>
+            <button style="margin-right:16upx;height:70upx;line-height:46upx;" @tap="setSendType(1)" class="admin-button-com mini-btn" :class="form.sendType == 1 ? 'blue' : 'default'">自取</button>
             <button style="margin-right:16upx;height:70upx;line-height:46upx;" @click="setSendType(2)" class="admin-button-com mini-btn" :class="form.sendType == 2 ? 'blue' : 'default'">跑腿</button>
             <button style="margin-right:0upx;height:70upx;line-height:46upx;" @click="setSendType(3)" class="admin-button-com mini-btn" :class="form.sendType == 3 ? 'blue' : 'default'">物流</button>
           </tui-list-cell>
 
-					<tui-list-cell class="line-cell" :hover="false" :arrow="false">
-						<view class="tui-title">结账方式</view>
-						<view class="payment-buttons">
-							<view class="button-row">
-                <button @click="form.hasPay = 4" class="admin-button-com middle" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
-                <button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'">扫码分享</button>
-							</view>
-							<view class="button-row">
-                <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
-								<button @click="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">赊账</button>
-							</view>
-						</view>
-					</tui-list-cell>
-
           <tui-list-cell class="line-cell" :hover="false" :arrow="true" v-if="form.hasPay == 1">
             <view class="tui-title">线下渠道</view>
             <picker mode="selector" :value="payWayindex" :range="payWayList" range-key="name" @change="payWayChange" class="tui-input">
@@ -366,7 +360,7 @@ export default {
         receiveAddress: "",
         receiveLong: "",
         receiveLat: "",
-        sendType: 1,
+        sendType: 0,
         sendSide: "2",
         sendDate: "",
         reachDate: "",

hdApp/src/admin/goods/result.vue

@@ -5,7 +5,7 @@
 			<view class="result-view">
 			<view class="iconfont iconchenggong"></view>
 			<view class="result-title">添加成功</view>
-			<button class="admin-button-com middle blue" style="width:20vw;" @click="goBackHome">返回</button>
+			<button class="admin-button-com middle blue" style="width:20vw;" @click="goBack">返回</button>
 			<view class="form-container">
 				<form>
 					<view class="module-com input-line-wrap">
@@ -28,8 +28,10 @@
 
 						<tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3">
 							<view class="tui-title">收款方式</view>
-							<button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
-							<button @tap="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'" style="margin-left:15upx;">赊账</button>
+                			<button @click="form.hasPay = 4" class="admin-button-com middle" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
+                			<button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'" style="margin-left:6upx;">扫码</button>
+							<button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'" style="margin-left:6upx;">线下</button>
+							<button @tap="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'" style="margin-left:6upx;">赊账</button>
 						</tui-list-cell>
 
 						<tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1 && form.fromType == 3">
@@ -41,10 +43,11 @@
 						</tui-list-cell>
 
 						<tui-list-cell class="line-cell" :hover="false">
-							<view class="tui-title required">配送方式</view>
-							<button @tap="form.sendType = 3" class="admin-button-com middle" :class="form.sendType == 3 ? 'blue' : 'default'">骑手送</button>
-							<button @tap="form.sendType = 2" class="admin-button-com middle" style="margin-left:4upx;" :class="form.sendType == 2 ? 'blue' : 'default'">自己送</button>
-							<button @tap="form.sendType = 1" class="admin-button-com middle" style="margin-left:4upx;" :class="form.sendType == 1 ? 'blue' : 'default'">到店自取</button>
+							<view class="tui-title">配送方式</view>
+							<button @tap="setSendType(0)" class="admin-button-com middle" :class="form.sendType == 0 ? 'blue' : 'default'">送货</button>
+							<button @tap="setSendType(1)" class="admin-button-com middle" :class="form.sendType == 1 ? 'blue' : 'default'" style="margin-left:6upx;">自取</button>
+							<button @click="setSendType(2)" class="admin-button-com middle" :class="form.sendType == 2 ? 'blue' : 'default'" style="margin-left:6upx;">跑腿</button>
+							<button @click="setSendType(3)" class="admin-button-com middle" :class="form.sendType == 3 ? 'blue' : 'default'" style="margin-left:6upx;">物流</button>
 						</tui-list-cell>
 
 						<tui-list-cell class="line-cell" :hover="false" :arrow="true">
@@ -68,10 +71,19 @@
 							<view class="tui-title">备注内容</view>
 							<input v-model="form.remark" placeholder-class="phcolor" class="tui-input" placeholder-style="color:#ccc" name="remark" placeholder="选填" />
 						</tui-list-cell>
+
+						<tui-list-cell class="line-cell" :hover="false">
+							<view class="tui-title">客户</view>
+							<view>快捷开单</view>
+						</tui-list-cell>
+
 					</view>
 				</form>
+				<view class="button-group">
+					<button class="admin-button-com big default" @click="goBack">取消</button>
+					<button class="admin-button-com big blue" @click="handleConfirm">确认</button>
+				</view>
 			</view>
-
 		</view>
 		</view>
 	</view>
@@ -89,10 +101,10 @@ export default {
 		return {
 			form: {
 				fromType: '3',
-				hasPay: 1,
+				hasPay: 4,
 				payWay: 0,
 				num: 1,
-				sendType: 3,
+				sendType: 0,
 				reachDate: '',
 				reachPeriod: "12:00",
 				remark: ''
@@ -130,9 +142,20 @@ export default {
 		init() {
 
 		},
-		goBackHome() {
+		setSendType (type) {
+			this.form.sendType = type
+		},
+		goBack() {
+			uni.navigateBack({})
+		},
+		handleCancel() {
+			// 取消操作
 			uni.navigateBack({})
 		},
+		handleConfirm() {
+			// 确认操作
+			console.log('确认提交', this.form);
+		},
 		payWayChange(e) {
 			let index = e.detail.value;
 			this.payWayindex = index;
@@ -210,6 +233,14 @@ export default {
 				}
 			}
 		}
+		.button-group {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			gap: 60upx;
+			margin-top: 40upx;
+			padding: 0 30upx;
+		}
 	}
 }
 </style>