开单

ghs/src/service/shop-admin/index.js

@@ -10,6 +10,13 @@ export class ShopAdminService extends BaseService {
 			data: data
 		});
 	}
-}
 
-export default new ShopAdminService();
+	getAllStaff(data) {
+		return this.request({
+			url: '/get-all-staff',
+			params: data
+		});
+	}
+
+}
+export default new ShopAdminService();

ghs/src/views/order/add.vue

@@ -149,11 +149,13 @@
 
         <div class="accounts-list">
           送货日期
-          <div class="accounts-center">{{(totalMoney - modifyPrice).toFixed(2)}}</div>
+          <el-date-picker v-model="form.sendTimeWant" style="width: 80%" type="date" placeholder="请选择，默认当天或隔天"> </el-date-picker>
         </div>
         <div class="accounts-list">
           开单人员
-          <div class="accounts-center">{{(totalMoney - modifyPrice).toFixed(2)}}</div>
+          <el-select ref="kdStaffRef" style="width:80%" v-model="form.getStaffName" filterable placeholder="请选择" @change="changeKdStaff">
+            <el-option v-for="item in staffList" :key="item.id" :label="item.name" :value="item"> </el-option>
+          </el-select>
         </div>
         <div class="accounts-list">
           备注
@@ -226,6 +228,7 @@
   </div>
 </template>
 <script>
+import { mapGetters } from 'vuex';
 import productMins from "@/mixins/product2";
 export default {
   name: 'add',
@@ -254,9 +257,11 @@ export default {
         needPrint:1,//订单生成时打印订单1需要2不需要
         hasPay:0,
         getStaffName:'',
+        getStaffId:0,
         dealPrice:0,
         wlName:''
       },
+      staffList:[],
       printAmount:1,
       checked:true,
       type:'自提',//取货方式
@@ -273,7 +278,7 @@ export default {
       getIndex:0,
       getItemList:[],//搜索展示的列表
       selectIndex:0,
-      selectShopListVal:'',
+      kdStaffVal:'www',
       freight:'',//运费
       remark:'',//备注
       printSelectList:'',
@@ -288,6 +293,7 @@ export default {
   },
 	mixins: [productMins],
   computed: {
+    ...mapGetters(['shopInfo']),
     displayPackCost(){
       if(this.currentShop.pfLevel && this.currentShop.pfLevel == 1){
         return true
@@ -391,16 +397,37 @@ export default {
         }
         that.setSendType(0)
         that.setTransType(4)
+        that.form.hasPay = 2
         that.showCommitPop = true
       }
     }
 
     this.$service.common.shopInfo().then(res => {
         that.currentShop = res.shopInfo
+        let currentStaff = res.staff
+
+        that.$service.shopAdmin.getAllStaff().then(res => {
+          that.staffList = res.list
+          if(!that.$util.isEmpty(that.staffList)){
+            for(const ele of that.staffList){
+              if(currentStaff.id == ele.id){
+                that.form.getStaffId = ele.id
+                that.form.getStaffName = ele.name
+              }
+            }
+          }
+        })
+
 		})
 
+
+
   },
   methods: {
+    changeKdStaff(info){
+      this.form.getStaffId = info.id
+      this.form.getStaffName = info.name
+    },
     setTransType(type){
       this.form.transType = type
     },
@@ -461,7 +488,7 @@ export default {
         return { productId: ele.id, bigNum: ele.big, smallNum: ele.small };
       });
       let parameter = {
-        customId:this.selectShopListVal,
+        customId:this.globalCustomId,
         getType:this.type=='自提'?1:2,
         sendCost:this.freight,
         product:JSON.stringify(product),