开单增加备注

ghs/src/mixins/product2.js

@@ -18,7 +18,7 @@ export default {
 			globalCheckStock:true,// 考虑库存，盘点不需要考虑库存
 			isAddModel:false,
 			isAddInputFocus:false,
-			customData: { bigCount: 0, smallCount: 0, userPrice: 0, totalPrice:0, aboutPrice:0},//aboutPrice 0 单价是确定值 1 单价是约等于值
+			customData: { bigCount: 0, smallCount: 0, userPrice: 0, totalPrice:0, aboutPrice:0, remark:''},//aboutPrice 0 单价是确定值 1 单价是约等于值
 			globalItemList:[],
 			globalUnitType:0,
 			globalAllProduct:[],

ghs/src/views/item/list.vue

@@ -27,7 +27,7 @@
 
       <template #table-column-status="{scope}">
 		<i class="el-icon-success" v-if="scope.row.status == 1" style="color:#67C23A;font-size:19px;"></i>
-		<i class="el-icon-success" v-else style="color:#D1D1D1;font-size:19px;"></i>
+		<span v-else>-</span>
       </template>
 
       <template #table-column-unit="{scope}">
@@ -636,7 +636,7 @@ export default {
             },
 			{
               prop: 'status',
-              label: '上下架',
+              label: '上架',
               align: 'center',
               minWidth: 60
             },

ghs/src/views/order/confirm.vue

@@ -103,10 +103,11 @@
 
     <el-dialog :title="currentItem.name" v-if="showConfirmNum" :visible.sync="showConfirmNum" width="30%" center>
       <div class="el-dialog-center">
-        <el-input ref="bigInput" style="width: 130px;margin-left: 15px" placeholder="数量" @keyup.enter.native="confirmNumPrice()" type="number" v-model="customData.bigCount"></el-input>
+        <el-input ref="bigInput" style="width: 90px;margin-left: 15px" placeholder="数量" @keyup.enter.native="confirmNumPrice()" type="number" v-model="customData.bigCount"></el-input>
         <span>{{currentItem.bigUnit}}</span>
-        <el-input style="width: 130px;margin-left: 15px" placeholder="价格" @keyup.enter.native="confirmNumPrice()" type="number" v-model="customData.userPrice"></el-input>
+        <el-input style="width: 90px;margin-left: 15px" placeholder="价格" @keyup.enter.native="confirmNumPrice()" type="number" v-model="customData.userPrice"></el-input>
         <span>元</span>
+        <el-input style="width: 90px;margin-left: 15px" placeholder="备注" @keyup.enter.native="confirmNumPrice()" type="text" v-model="customData.remark"></el-input>
       </div>
       <div style="margin:15px 0 5px 100px;font-weight:bold;font-size:18px;">剩 {{ currentItem.stock ? parseFloat(currentItem.stock) : 0 }} {{ currentItem.bigUnit}}</div>
       <div class="remark">Enter 确定，Esc 取消</div>
@@ -546,7 +547,7 @@ export default {
 
       let formData = this.form;
       const product = this.selectList.map(ele => {
-        return { productId: ele.id, bigNum: ele.bigCount, smallNum: 0,itemId:ele.itemId,price:ele.userPrice };
+        return {productId: ele.id, bigNum: ele.bigCount, smallNum: 0,itemId:ele.itemId,price:ele.userPrice,remark:ele.remark};
       });
       formData.product = JSON.stringify(product)
       if(Number(this.modifyPrice) <= 0){
@@ -719,7 +720,7 @@ export default {
         }
       }
 
-      currentItem = {...currentItem,bigCount:this.customData.bigCount,userPrice:this.customData.userPrice,smallCount:this.customData.smallCount}
+      currentItem = {...currentItem,bigCount:this.customData.bigCount,userPrice:this.customData.userPrice,smallCount:this.customData.smallCount,remark:this.customData.remark}
       this.replaceItemFn(currentItem,1,'add')
       this.backToSearchItem();
     },