diff --git a/pages/.DS_Store b/pages/.DS_Store
index d7153e4..8e5dbf0 100644
Binary files a/pages/.DS_Store and b/pages/.DS_Store differ
diff --git a/pages/index/.DS_Store b/pages/index/.DS_Store
deleted file mode 100644
index 90b5d9e..0000000
Binary files a/pages/index/.DS_Store and /dev/null differ
diff --git a/pages/index/order.vue b/pages/index/order.vue
index b47a83d..907bf9e 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -17,7 +17,7 @@
订单状态:{{item.status == 0 ?'待抢单' :item.status == 1 ?'待取货' :item.status == 3 ?'待送达' :item.status == 4 ?'已完成' :item.status == 5 ?'下游客户待退货' :item.status == 00 ?'退货待抢单' :item.status == 01 ?'退货待取货' :item.status == 03 ?'退货待送达' :item.status == 04 ?'待确认退货' :item.status == 6 ?'待配货' :'挂单'}}
- 去开单
+ 去开单
@@ -93,7 +93,39 @@
}
}).catch((res) => {})
},
-
+ //带参数跳转到开单页
+ goSaleGoods(item) {
+ let obj = {
+ id:'',
+ lsprice:0,
+ num:0,
+ price:0,
+ productName:'',
+ producticture:'',
+ productSn:'',
+ saleDetailQueryDTO:[],
+ supplierName:'',
+ wholesalePrice:0,
+ remark:item.remark
+ },
+ dataList = []
+ for (let i=0;i
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index 58d0b7e..2e3d316 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -147,7 +147,7 @@
备注
-
+
@@ -210,7 +210,7 @@
拼包地址
-
+
@@ -516,6 +516,12 @@
}
}
},
+ changeRemark(e){
+ this.remark = e.detail.value
+ },
+ changePbAddress(e){
+ this.pbAddress = e.detail.value
+ },
//整体折扣数字框改变
change(e){
console.log(e)
@@ -587,7 +593,7 @@
createByName:this.createByName,
remark: this.remark,
otherExpense:this.otherExpense, //其他费用
- pbAddress:this.pbAddress,
+ shareAddress:this.pbAddress,
transCompany: this.wlName.id,
companyName:this.wlName.companyName,
orderByWorker: this.lbgName.workerId,