shish 3 سال پیش
والد
کامیت
344807ad2c
4فایلهای تغییر یافته به همراه358 افزوده شده و 1 حذف شده
  1. 4 0
      ghsApp/src/api/order/index.js
  2. 1 0
      ghsApp/src/pages.json
  3. 346 0
      ghsApp/src/pagesOrder/allot.vue
  4. 7 1
      ghsApp/src/pagesOrder/detail.vue

+ 4 - 0
ghsApp/src/api/order/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const changeWorker = data => {
+	return https.post("/order/change-worker", data);
+};
+
 //到货提交花材
 export const arrival = data => {
 	return https.post("/order/arrival", data);

+ 1 - 0
ghsApp/src/pages.json

@@ -92,6 +92,7 @@
 				{"path": "shipInfo","style": {"navigationBarTitleText": "发货"}},
 				{"path": "select","style": {"navigationBarTitleText": "重选花材"}},
 				{"path": "print","style": {"navigationBarTitleText": "连接蓝牙"}},
+				{"path": "allot","style": {"navigationBarTitleText": "分配工作"}},
 				{"path": "refundList","style": {"navigationBarTitleText": "退款记录", "enablePullDownRefresh": true}}
 			]
 		},

+ 346 - 0
ghsApp/src/pagesOrder/allot.vue

@@ -0,0 +1,346 @@
+<template>
+<view class="app-content">
+  <view class="affirm-page">
+    <view class="affirm-view overscroll">
+      <form>
+        <view class="module-com input-line-wrap">
+          <tui-list-cell class="line-cell" :arrow="true">
+            <div class="tui-title">开单人</div>
+            <picker mode="selector" :value="form.shopAdminId" :range="staffList" 
+            range-key="name" @change="kdManChange" class="tui-input" >
+              <input v-model="form.shopAdminId" name="shopAdminId" type="text" hidden />
+              <div style="padding:6upx 0 6upx 0;">{{form.shopAdminName}}</div>
+            </picker>
+          </tui-list-cell>          
+        </view>
+
+        <view class="confirm-btn">
+          <button class="admin-button-com big blue" @click="commitChange()">修改</button>
+        </view>
+
+      </form>
+    </view>
+  </view>
+</view>
+</template>
+
+<script>
+import TuiListCell from "@/components/plugin/list-cell";
+import { getDetail,changeWorker } from "@/api/order";
+import { getAllStaff } from "@/api/shop-admin";
+export default {
+  name: "allot",
+  components: { TuiListCell },
+  data () {
+    return {
+      staffList:[],
+      form{ shopAdminId:0,shopAdminName:''},
+      orderInfo:{}
+    }
+  },
+  onLoad () {
+    let that = this
+    getDetail({ id: that.option.id }).then(res=>{
+      that.orderInfo = res.data
+    })
+  },
+  onShow(){
+    getAllStaff().then(res=>{
+        if(res.code == 1){
+            this.staffList = res.data.list
+        }
+    })
+  },
+  computed: {
+  },
+  methods: {
+    kdManChange(e){
+			let index = e.detail.value
+      if(!this.$util.isEmpty(this.staffList)){
+        if(this.staffList[index]){
+          this.form.shopAdminName = this.staffList[index].name
+          this.form.shopAdminId = this.staffList[index].id
+        }
+      }
+    },
+    commitChange(){
+      changeWorker(this.form).then(res=>{
+          if(res.code == 1){
+
+          }
+      })
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.admin-button-com {
+  margin-right: 30upx;
+}
+.affirm-page {
+  position: relative;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .affirm-view {
+    flex: 1;
+    margin-bottom:90upx;
+    padding: 20upx;
+    background-color: #f0f2f6;
+
+    .commodity-view {
+      display: flex;
+      flex-direction: column;
+      .commodity-list {
+        padding: 20upx;
+        .commodity-item {
+          display: flex;
+          margin-bottom: 20upx;
+          .item-icon {
+            flex-shrink: 0;
+            width: 140upx;
+            height: 140upx;
+          }
+          .item-info {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            flex: 1;
+            margin-left: 20upx;
+            .info-line {
+              margin-bottom: 20upx;
+              display: flex;
+              justify-content: space-between;
+              align-items: flex-end;
+              .item-name {
+                color: #666;
+                font-size: 28upx;
+              }
+              .item-price {
+                color: #333;
+                font-size: 22upx;
+                .price {
+                  font-size: 32upx;
+                  font-weight: bold;
+                }
+              }
+              .item-type {
+                color: #999;
+                font-size: 24upx;
+              }
+              .item-count {
+                color: #666;
+                font-size: 24upx;
+              }
+            }
+
+& .open-bx {
+				align-items: center;
+				& .iconfont {
+					color: #3385ff;
+					font-size: 50upx;
+				}
+
+				.position{
+					display: block;
+					width: 70upx;
+					text-align: center;
+				}
+				.iconcachu {
+					margin: 0 6upx 0 20upx;
+					color: #ccc;
+					&.edit {
+						color: #3385ff;
+					}
+				}
+				& > .num {
+					display: inline-block;
+					width: 120upx;
+					height:45upx;
+					text-align:center;
+					margin: 0 8upx;
+					color: #868686;
+					border-radius: 22upx;
+					background-color: #f5f5f5;
+					padding: 3upx 0;
+					font-size: 25upx;
+				}
+				.change-input {
+					width: 164upx;
+					height: 60upx;
+					line-height: 60upx;
+					text-align: center;
+					background: #ffffff;
+					border: 1upx solid #dddddd;
+					border-radius: 4upx;
+					font-size: 25upx;
+				}
+				.btn-box{
+					width: 100upx;
+					height: 60upx;
+					line-height: 60upx;
+					color: #ffffff;
+					background: #3385ff;
+					text-align: center;
+					border-radius: 10upx;
+				}
+			}
+
+          }
+        }
+      }
+      .summary-bar {
+        padding: 0 20upx;
+        height: 90upx;
+        display: flex;
+
+        align-items: center;
+        justify-content: space-between;
+        border-top: 1upx solid #eeeeee;
+        .operate-view {
+          display: flex;
+          align-items: center;
+          color: #3385ff;
+          font-size: 26upx;
+          .iconfont {
+            margin-right: 20upx;
+            font-size: 40upx;
+          }
+        }
+        .describe-view {
+          display: flex;
+
+          align-items: center;
+          color: #333;
+          font-size: 24upx;
+          .price {
+            font-weight: bold;
+            font-size: 36upx;
+          }
+        }
+      }
+    }
+
+    .module-com {
+      background-color: #fff;
+      margin-bottom: 20upx;
+      border-radius: 10upx;
+      overflow: hidden;
+					.tab-box{
+						padding: 10upx 30upx 30upx;
+						.tab{
+							width: 49%;
+							height: 70upx;
+							color: #a2a2a2;
+							border: 1upx solid #dcdcdc;
+							border-radius: 10upx;
+							font-size: 28upx;
+							font-weight: 700;
+							&.active{
+								color: #ff4d4d;
+								border: 1upx solid #ff4d4d;
+							}
+						}
+					}
+      .member-wrap {
+        .member-det {
+          font-size: 24upx;
+          margin-left: 20upx;
+        }
+      }
+      .remark-wrap {
+        align-items: flex-start;
+        .remark {
+          height: 240upx;
+        }
+      }
+      // .tui-placeholder,
+      // .tui-input {
+      // 	padding-right: 30upx;
+      // 	width: 100%;
+      // 	text-align: right;
+      // }
+    }
+  }
+  .under-bar {
+    z-index:99999;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20upx;
+    position: fixed;
+    bottom:0;
+    /* 手机mobile屏幕小于1000px */
+    @media screen and (max-width: 1100px) {
+      width: 100%;
+    }
+    /* 收银台cashier屏幕大于1000px */
+    @media screen and (min-width:1100px) {
+      width: 40%;
+    } 
+    height: 100upx;
+    background-color: #fff;
+
+    box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
+    .price-view {
+      display: flex;
+      align-items: center;
+      font-size: 24upx;
+      .price-title {
+        color: #333;
+      }
+      .price-number {
+        margin: 0 20upx;
+        color: #ff2842;
+        .large {
+          font-size: 40upx;
+        }
+      }
+    }
+    .admin-button-com {
+      width: 200upx;
+    }
+  }
+	.select-cmd_bx {
+		& .kc {
+			color: #999999;
+			font-size: 28upx;
+			font-weight: 400;
+			margin-bottom: 40upx;
+			text-align: center;
+			margin-top: 30upx;
+			.unit_price{
+				padding-right:25upx;
+			}
+		}
+		& .num_bx {
+			display: flex;
+			align-items: center;
+			margin-bottom: 40upx;
+			& > input {
+				width: 212upx;
+				height: 80upx;
+				border: 1upx solid #dddddd;
+				border-radius: 4upx;
+				text-align: center;
+				margin-right: 24upx;
+				font-size: 40upx;
+			}
+		}
+	}
+}
+.class-popup-style{
+	z-index:99999;
+}
+.remark-class{
+  z-index:0
+}
+.confirm-btn {
+  width: calc(100% - 60upx);
+  margin: 60upx 30upx 20upx;
+  .admin-button-com {
+    width: 100%;
+  }
+}
+</style>

+ 7 - 1
ghsApp/src/pagesOrder/detail.vue

@@ -16,8 +16,11 @@
 				<i @click.stop="navigateTo(detailInfo.lat,detailInfo.long,detailInfo.customName)" class="iconfont icondianhua" style="font-size:53upx;margin-left:40upx;margin-right:25upx;color:#3385ff;"></i>
 				</view>
 			</view>
-			<view class="title">
+			<view class="flex-space title">
 				单据信息
+				<view class="flex" style="color: #3385ff;font-weight: 400">
+					<view @click.stop="allotFn()" style="margin-left: 20upx;">分配工作</view>
+				</view>
 			</view>
 			<view class="bills-info_box content-box">
 				<view class="order-info_box">
@@ -351,6 +354,9 @@ export default {
 			}
 			this.$util.pageTo({url:'/pagesOrder/refund?id='+this.option.id})
 		},
+		allotFn(){
+			this.$util.pageTo({url:'/pagesOrder/allot?id='+this.option.id})
+		},
 		navigateTo(latitude, longitude, address) {
 			// #ifdef APP-PLUS
 			let that = this