shish 2 anni fa
parent
commit
42c9b041a3
2 ha cambiato i file con 5 aggiunte e 11 eliminazioni
  1. 2 0
      ghs/src/mixins/product2.js
  2. 3 11
      ghs/src/views/order/confirm.vue

+ 2 - 0
ghs/src/mixins/product2.js

@@ -219,6 +219,7 @@ export default {
 					arr[index].bigCount = 0;
 					arr[index].bigCount = 0;
 					arr[index].smallCount = 0;
 					arr[index].smallCount = 0;
 					arr[index].userPrice = 0;
 					arr[index].userPrice = 0;
+					arr[index].remark = '';
 				})
 				})
 				this.$forceUpdate()
 				this.$forceUpdate()
 			}
 			}
@@ -311,6 +312,7 @@ export default {
 					list[index].userPrice = item.userPrice
 					list[index].userPrice = item.userPrice
 					list[index].aboutPrice = item.aboutPrice
 					list[index].aboutPrice = item.aboutPrice
 					list[index].totalPrice = item.totalPrice
 					list[index].totalPrice = item.totalPrice
+					list[index].remark = item.remark||''
 				}
 				}
 			}
 			}
 			this.hitPlay()
 			this.hitPlay()

+ 3 - 11
ghs/src/views/order/confirm.vue

@@ -341,11 +341,7 @@ export default {
 
 
   },
   },
   mounted() {
   mounted() {
-    if(this.form.customId == 0){
-      this.$nextTick(() => {
-        this.$refs.customref.focus()
-      })
-    }
+
 
 
     if (this.$route.query.customId && this.$route.query.customName) {
     if (this.$route.query.customId && this.$route.query.customName) {
       let id = this.$route.query.customId
       let id = this.$route.query.customId
@@ -376,9 +372,7 @@ export default {
           that.$message({message: '不在结算页',type: 'warning'})
           that.$message({message: '不在结算页',type: 'warning'})
         }
         }
       }
       }
-      if(e && e.key && e.key.toLowerCase() =='c' && e.ctrlKey){
-        that.$refs['customref'].focus();
-      }
+
       if(e && e.key && e.key.toLowerCase() =='q' && e.ctrlKey){
       if(e && e.key && e.key.toLowerCase() =='q' && e.ctrlKey){
         that.$refs['itemSearchRef'].focus();
         that.$refs['itemSearchRef'].focus();
       }
       }
@@ -599,9 +593,6 @@ export default {
       this.form.customName = ''
       this.form.customName = ''
       this.form.getStaffId = 0
       this.form.getStaffId = 0
       this.form.getStaffName = ''
       this.form.getStaffName = ''
-      this.$nextTick(() => {
-        this.$refs.customref.focus()
-      })
     },
     },
     clearSeachVal(){
     clearSeachVal(){
       this.searchVal = ''
       this.searchVal = ''
@@ -697,6 +688,7 @@ export default {
         this.currentItem = currentItem
         this.currentItem = currentItem
         this.customData.bigCount = currentItem.bigCount > 0 ? currentItem.bigCount : 1
         this.customData.bigCount = currentItem.bigCount > 0 ? currentItem.bigCount : 1
         this.customData.userPrice = parseFloat(this.currentItem.price)
         this.customData.userPrice = parseFloat(this.currentItem.price)
+        this.customData.remark = this.currentItem.remark||''
         this.desk = 'confirmPriceNum';
         this.desk = 'confirmPriceNum';
         this.showGetItemList = false
         this.showGetItemList = false
         this.showConfirmNum = true;
         this.showConfirmNum = true;