pc开单

ghs/src/service/custom/index.js

@@ -2,6 +2,11 @@ import { BaseService, Service } from '@/cool';
 
 @Service('custom')
 export class CustomService extends BaseService {
+	shopListAll(data) {//姜枫 2021.04.26
+		return this.request({
+			url: '/list',
+		});
+	}
 
 }
 export default new CustomService();

ghs/src/views/order/add.vue

@@ -142,7 +142,7 @@
     <div class="bottom_input">
       <el-form ref="form" label-width="80px" style="display: inline-block">
         <el-form-item label="花材">
-        <el-input style="width: 200px" @keyup.enter.native="enterSeekFun()" placeholder="请输入名称，支持拼音首字母，按Esc取消" type="text" ref="commodityInput" v-model="seekVal"></el-input></el-form-item>
+          <el-input style="width: 200px" @keyup.enter.native="enterSeekFun()" placeholder="请输入名称，支持拼音首字母，按Esc取消" type="text" ref="commodityInput" v-model="seekVal"></el-input></el-form-item>
       </el-form>
       <div style="display: inline-block;" class="allPrice">总金额: {{ totalMoney.toFixed(2) }}</div>
       <div style="display: inline-block;" class="allPrice">总数量: {{tableData.length}}</div>
@@ -306,7 +306,7 @@ export default {
       remark:'',//备注
       printSelectList:'',
       orderMsg:'',
-  };
+    };
   },
   created() {
     this.$nextTick(()=>{
@@ -374,9 +374,6 @@ export default {
             self.$refs['priceInput'].focus();
           })
         }
-        // console.log('f8')
-        // alert('f8')
-        // self.escFun();
         //要做的事情
       }
       if( e && e.keyCode==120 ){   //按下f9
@@ -406,13 +403,11 @@ export default {
       }else if(type=='time'){
         todaty = myDate.getHours()+':'+myDate.getMinutes();
       }else{
-        // todaty = myDate.getFullYear()+'-'+parseInt(myDate.getMonth()+1)+'-'+myDate.getDate()
         let getDate = myDate.getDate()>9?myDate.getDate():'0'+myDate.getDate()
         let getDateMonth = parseInt(myDate.getMonth()+1)>9?parseInt(myDate.getMonth()+1):'0'+parseInt(myDate.getMonth()+1)
         todaty = myDate.getFullYear()+'-'+getDateMonth+'-'+getDate
       }
       return todaty
-      // console.log(myDate.getFullYear())
     },
     /**拿到所有数据*/
     getAllList(){
@@ -422,8 +417,8 @@ export default {
     },
     /**获取客户列表**/
     getShopAll(){
-      this.$service.shop.shopAll().then(res => {
-        this.allShopList = res;
+      this.$service.custom.shopListAll().then(res => {
+        this.allShopList = res.list;
         this.$refs['selectShopListInput'].focus();
       });
     },
@@ -531,23 +526,23 @@ export default {
           this.tableData.splice(i,1)
         }
       }
-        this.tableData.push(
-            {
-              index:'001',
-              id:selectList.id,
-              name:selectList.itemName,
-              lv:selectList.rank,
-              unit:selectList.bigUnit+'/'+selectList.smallUnit,
-              count:Number(big)+'/'+Number(small),
-              big:Number(big),
-              small:Number(small),
-              ratio:Number(selectList.ratio),
-              stock:Number(selectList.stock),
-              price:selectList.price,
-              commodityMoney:money.toFixed(2),
-              money:money,
-            }
-        )
+      this.tableData.push(
+          {
+            index:'001',
+            id:selectList.id,
+            name:selectList.itemName,
+            lv:selectList.rank,
+            unit:selectList.bigUnit+'/'+selectList.smallUnit,
+            count:Number(big)+'/'+Number(small),
+            big:Number(big),
+            small:Number(small),
+            ratio:Number(selectList.ratio),
+            stock:Number(selectList.stock),
+            price:selectList.price,
+            commodityMoney:money.toFixed(2),
+            money:money,
+          }
+      )
       this.tableDataIndex = this.tableData.length-1;
       this.$refs.singleTable.setCurrentRow(this.tableData[this.tableData.length-1]);
       this.$nextTick(()=>{
@@ -570,11 +565,11 @@ export default {
       // if(this.isSelectNumber){ }
       this.isAmendPrice = false;
       this.seekVal = '';
-        this.seekList = [];
-        this.isSelectNumber = false
-        this.$nextTick(()=>{
-          this.$refs['commodityInput'].focus();
-        })
+      this.seekList = [];
+      this.isSelectNumber = false
+      this.$nextTick(()=>{
+        this.$refs['commodityInput'].focus();
+      })
 
     },
     /**清空扎、支值**/
@@ -582,7 +577,7 @@ export default {
       switch (type){
         case 'big':
           this.big = null;
-        break;
+          break;
         case 'small':
           this.small = null;
           break;
@@ -613,7 +608,8 @@ export default {
       let money = Number(selectList.price) * (Number(selectList.big) + Number(selectList.small) / Number(selectList.ratio));
       this.tableData[this.tableDataIndex].count = this.tableData[this.tableDataIndex].big+'/'+Number(this.tableData[this.tableDataIndex].small);
       this.tableData[this.tableDataIndex].money = money;
-      this.getAllTableDataMoney();
+      this.tableData[this.tableDataIndex].commodityMoney = money.toFixed(2),
+          this.getAllTableDataMoney();
       setTimeout(()=>{
         this.seekVal = '';
       },100)
@@ -635,7 +631,8 @@ export default {
       let money = Number(selectList.price) * (Number(selectList.big) + Number(selectList.small) / Number(selectList.ratio));
       this.tableData[this.tableDataIndex].count = this.tableData[this.tableDataIndex].big+'/'+Number(this.tableData[this.tableDataIndex].small);
       this.tableData[this.tableDataIndex].money = money;
-      this.getAllTableDataMoney();
+      this.tableData[this.tableDataIndex].commodityMoney = money.toFixed(2),
+          this.getAllTableDataMoney();
       setTimeout(()=>{
         this.seekVal = '';
       },100)