|
|
@@ -208,10 +208,13 @@
|
|
|
</div>
|
|
|
<div style="text-align:center;margin-top:10px;font-size:16px;" v-if="!$util.isEmpty(diffList)">
|
|
|
<div style="font-size:16px;margin-bottom:10px;color:red;font-weight:bold;">
|
|
|
- 以下花材，开单价和系统售价不一样，确认要提交吗？ <el-button type="primary" @click="diffConfirm" size="mini">确认</el-button>
|
|
|
+ <div>以下花材，开单价和系统售价不一样，确认要提交吗？</div>
|
|
|
+ <el-button type="primary" @click="diffConfirm" size="mini">确认（Ctrl+Alt+Enter）</el-button>
|
|
|
</div>
|
|
|
<div v-for="(item, index) in diffList" :key="index" style="color:blue;margin-bottom:4px;">
|
|
|
- {{ item.name }} 系统售价¥{{ item.price }} 你开价<span style="color:red;font-weight:bold;">¥{{ item.kdPrice }}</span>
|
|
|
+ {{ item.name }}
|
|
|
+ 系统售价<span style="color:green;font-weight:bold;margin-left:3px;">¥{{ item.price?parseFloat(item.price):0 }}</span>
|
|
|
+ 你开价<span style="color:red;font-weight:bold;margin-left:3px;">¥{{ item.kdPrice?parseFloat(item.kdPrice):0 }}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -329,6 +332,13 @@ export default {
|
|
|
let that = this;
|
|
|
document.onkeydown=function(e) {
|
|
|
console.log(e)
|
|
|
+ if(e && e.key == 'Enter' && e.ctrlKey && e.altKey){
|
|
|
+ if(that.showCommitPop == true){
|
|
|
+ that.diffConfirm()
|
|
|
+ }else{
|
|
|
+ that.$message({message: '不在结算页',type: 'warning'})
|
|
|
+ }
|
|
|
+ }
|
|
|
if(e && e.key == 'Enter' && e.ctrlKey){
|
|
|
if(that.showCommitPop == true){
|
|
|
that.createOrder()
|
|
|
@@ -352,10 +362,14 @@ export default {
|
|
|
that.goDown();
|
|
|
}
|
|
|
if(e && e.key=='='){
|
|
|
- that.form.needPrint = 2
|
|
|
+ if(that.showCommitPop == true){
|
|
|
+ that.form.needPrint = 2
|
|
|
+ }
|
|
|
}
|
|
|
if( e && e.key=='-'){
|
|
|
- that.form.needPrint = 1
|
|
|
+ if(that.showCommitPop == true){
|
|
|
+ that.form.needPrint = 1
|
|
|
+ }
|
|
|
}
|
|
|
if(e && e.key=='Delete'){
|
|
|
if(that.selectList[that.selectIndex]){
|
