|
@@ -56,7 +56,7 @@
|
|
|
bottom: 70px;
|
|
bottom: 70px;
|
|
|
right: 20%;
|
|
right: 20%;
|
|
|
width: 70%;
|
|
width: 70%;
|
|
|
- //height: 310px;
|
|
|
|
|
|
|
+ max-height: 310px;
|
|
|
overflow: hidden;
|
|
overflow: hidden;
|
|
|
//overflow-y: scroll;
|
|
//overflow-y: scroll;
|
|
|
}
|
|
}
|
|
@@ -66,10 +66,13 @@
|
|
|
right: 20%;
|
|
right: 20%;
|
|
|
// transform: translateX(-50%);
|
|
// transform: translateX(-50%);
|
|
|
.allPrice {
|
|
.allPrice {
|
|
|
- margin-left: 20px;
|
|
|
|
|
|
|
+ margin-left: 80px;
|
|
|
// color: #606266;
|
|
// color: #606266;
|
|
|
font-size: 16px;
|
|
font-size: 16px;
|
|
|
font-weight: 700;
|
|
font-weight: 700;
|
|
|
|
|
+ &.active{
|
|
|
|
|
+ margin-left: 200px;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
.el-dialog-center{
|
|
.el-dialog-center{
|
|
@@ -141,12 +144,12 @@
|
|
|
</div>
|
|
</div>
|
|
|
<div class="bottom_input">
|
|
<div class="bottom_input">
|
|
|
<el-form ref="form" label-width="80px" style="display: inline-block">
|
|
<el-form ref="form" label-width="80px" style="display: inline-block">
|
|
|
- <el-form-item label="花材">
|
|
|
|
|
|
|
+ <el-form-item label="花材" style="font-weight: 700;">
|
|
|
<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>
|
|
</el-form>
|
|
|
<div style="display: inline-block;" class="allPrice">总金额: {{ totalMoney.toFixed(2) }}</div>
|
|
<div style="display: inline-block;" class="allPrice">总金额: {{ totalMoney.toFixed(2) }}</div>
|
|
|
<div style="display: inline-block;" class="allPrice">总数量: {{tableData.length}}</div>
|
|
<div style="display: inline-block;" class="allPrice">总数量: {{tableData.length}}</div>
|
|
|
- <div style="display: inline-block;" class="allPrice">
|
|
|
|
|
|
|
+ <div style="display: inline-block;" class="allPrice active">
|
|
|
<el-checkbox v-model="checked"></el-checkbox>
|
|
<el-checkbox v-model="checked"></el-checkbox>
|
|
|
结账后自动打印
|
|
结账后自动打印
|
|
|
<el-input style="width: 50px;" type="text" v-model="printAmount"></el-input></el-form-item>
|
|
<el-input style="width: 50px;" type="text" v-model="printAmount"></el-input></el-form-item>
|
|
@@ -178,7 +181,7 @@
|
|
|
<el-option
|
|
<el-option
|
|
|
v-for="item in allShopList"
|
|
v-for="item in allShopList"
|
|
|
:key="item.id"
|
|
:key="item.id"
|
|
|
- :label="item.shopName"
|
|
|
|
|
|
|
+ :label="item.name"
|
|
|
:value="item.id">
|
|
:value="item.id">
|
|
|
</el-option>
|
|
</el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
@@ -216,7 +219,7 @@
|
|
|
<div class="accounts-list">
|
|
<div class="accounts-list">
|
|
|
{{ payType }}
|
|
{{ payType }}
|
|
|
<div class="accounts-center">
|
|
<div class="accounts-center">
|
|
|
- ¥{{ totalMoney }}
|
|
|
|
|
|
|
+ ¥{{ totalMoney.toFixed(2) }}
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="accounts-list">
|
|
<div class="accounts-list">
|
|
@@ -259,6 +262,12 @@
|
|
|
<td style="padding: 10px;width: 100px;text-align: center;">{{ res.money }}</td>
|
|
<td style="padding: 10px;width: 100px;text-align: center;">{{ res.money }}</td>
|
|
|
<td style="padding: 10px;width: 100px;text-align: center;"></td>
|
|
<td style="padding: 10px;width: 100px;text-align: center;"></td>
|
|
|
</tr>
|
|
</tr>
|
|
|
|
|
+ <tr>
|
|
|
|
|
+ <td style="padding: 10px;width: 100px;" colspan="2">合计:{{totalMoney.toFixed(2)}}</td>
|
|
|
|
|
+ <td style="padding: 10px;width: 100px;" colspan="2">实收:{{payType=='已收款'?totalMoney.toFixed(2):'0.00'}}</td>
|
|
|
|
|
+ <td style="padding: 10px;width: 100px;" colspan="2">欠款:{{payType=='欠款'?totalMoney.toFixed(2):'0.00'}}</td>
|
|
|
|
|
+ <td style="padding: 10px;width: 100px;"></td>
|
|
|
|
|
+ </tr>
|
|
|
<tr>
|
|
<tr>
|
|
|
<td style="padding: 10px;width: 100px;">其他说明:</td>
|
|
<td style="padding: 10px;width: 100px;">其他说明:</td>
|
|
|
<td style="padding: 10px;width: 100px;" colspan="6">{{remark}}</td>
|
|
<td style="padding: 10px;width: 100px;" colspan="6">{{remark}}</td>
|
|
@@ -433,7 +442,7 @@ export default {
|
|
|
sendCost:this.freight,
|
|
sendCost:this.freight,
|
|
|
product:JSON.stringify(product),
|
|
product:JSON.stringify(product),
|
|
|
remark:this.remark,
|
|
remark:this.remark,
|
|
|
- clearType:this.payType='欠款'?1:2,
|
|
|
|
|
|
|
+ clearType:this.payType=='欠款'?1:2,
|
|
|
}
|
|
}
|
|
|
this.$service.order.orderCreate(parameter).then(res => {
|
|
this.$service.order.orderCreate(parameter).then(res => {
|
|
|
this.orderMsg = res;
|
|
this.orderMsg = res;
|
|
@@ -473,10 +482,10 @@ export default {
|
|
|
async enterSeekFun(){
|
|
async enterSeekFun(){
|
|
|
if(this.seekVal==''){this.isSeek = false;return;}
|
|
if(this.seekVal==''){this.isSeek = false;return;}
|
|
|
if(this.seekVal==this.seekOldVal&&this.seekList!=''){
|
|
if(this.seekVal==this.seekOldVal&&this.seekList!=''){
|
|
|
- if(Number(this.seekList[this.seekListIndex].stock)==0){
|
|
|
|
|
- this.$message({message: '库存不足',type: 'warning'});
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // if(Number(this.seekList[this.seekListIndex].stock)==0){
|
|
|
|
|
+ // this.$message({message: '库存不足',type: 'warning'});
|
|
|
|
|
+ // return;
|
|
|
|
|
+ // }
|
|
|
this.isSeek = false;
|
|
this.isSeek = false;
|
|
|
this.isSelectNumber = true;
|
|
this.isSelectNumber = true;
|
|
|
console.log(this.seekList[this.seekListIndex])
|
|
console.log(this.seekList[this.seekListIndex])
|