记录

ghs/src/views/order/add-live.vue

@@ -6,7 +6,8 @@
 			:remote-method="searchItem" style="width:280px;margin-left:30px;margin-top:15px;">
 				<el-option v-for="item in itemList" :key="item.id" :label="`${item.name}（ ${item.stock?parseFloat(item.stock):0} ）`" :value="item.id"> </el-option>
 			</el-select>
-			<el-input v-model="price" placeholder="请输入价格" style="width:130px;margin-left:10px;"></el-input>
+			<el-input v-model="price" placeholder="请填写价格" style="width:130px;margin-left:10px;"></el-input>
+			<el-input v-model="remark" placeholder="请填写备注" style="width:300px;margin-left:10px;"></el-input>
 		</div>
 
 		<div>
@@ -64,6 +65,7 @@ export default {
 			itemList: [],
 			customList:[],
 			price:'',
+			remark:'',
 			currentItemId:0,
 			currentCustomName:'',
 			selectCustomList:[],
@@ -126,13 +128,13 @@ export default {
 				return false
 			}
 			let json  = JSON.stringify(this.selectCustomList)
-			let params = {selectCustom:json,itemId:this.currentItemId}
+			let params = {selectCustom:json,itemId:this.currentItemId,itemRemark:this.remark,itemPrice:this.price}
 			this.$confirm('确认提交', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
 				that.$service.liveOrder.addOrder(params).then(data => {
 					this.$message.success('添加成功')
 					setTimeout(() => {
-						that.clearData()
-					}, 1000);
+						that.$router.push({path:'/order/live-list'})
+					}, 900);
 				})
 			})
 		},

ghs/src/views/order/live-list.vue

@@ -276,7 +276,7 @@ export default {
                 prop: 'orderSn',
                 label: '单号',
                 align: 'center',
-                width: '130'
+                width: '100'
               },
               {
                 prop: 'itemCover',
@@ -294,31 +294,37 @@ export default {
                 prop: 'customNum',
                 label: '客户数',
                 align: 'center',
-                width: '100'
+                width: '70'
               },
               {
                 prop: 'itemAmount',
-                label: '金额',
+                label: '总计',
                 align: 'center',
-                width: '100'
+                width: '80'
               },
               {
                 prop: 'itemNum',
                 label: '花材数',
                 align: 'center',
-                width: '100'
+                width: '70'
+              },
+              {
+                prop: 'itemPrice',
+                label: '单价',
+                align: 'center',
+                width: '70'
               },
               {
                 prop: 'stock',
                 label: '库存',
                 align: 'center',
-                width: '100'
+                width: '80'
               },
               {
                 prop: 'switchOrder',
                 label: '已转订单',
                 align: 'center',
-                width: '100'
+                width: '90'
               },
               {
                 prop: 'staffName',
@@ -330,7 +336,7 @@ export default {
                 prop: 'printOrder',
                 label: '打印',
                 align: 'center',
-                width: '90'
+                width: '70'
               },
               {
                 prop: 'addTime',
@@ -338,6 +344,12 @@ export default {
                 align: 'center',
                 width: 210
               },
+              {
+                prop: 'itemRemark',
+                label: '备注',
+                align: 'center',
+                width: '130'
+              },
               {
                 prop: 'updateTime',
                 label: '修改时间',
@@ -361,7 +373,7 @@ export default {
             op: {
               visible: true,
               props: {
-                width: 150,
+                width: 130,
                 align: 'center',
                 fixed: 'right',
                 label: '操作'