diff --git a/pages/.DS_Store b/pages/.DS_Store
index 950ddf7..a1cf89b 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
new file mode 100644
index 0000000..2f98ba4
Binary files /dev/null and b/pages/index/.DS_Store differ
diff --git a/pages/inventory/.DS_Store b/pages/inventory/.DS_Store
index d9d014c..c6b6969 100644
Binary files a/pages/inventory/.DS_Store and b/pages/inventory/.DS_Store differ
diff --git a/pages/inventory/AIInventory.vue b/pages/inventory/AIInventory.vue
new file mode 100644
index 0000000..26b8034
--- /dev/null
+++ b/pages/inventory/AIInventory.vue
@@ -0,0 +1,1746 @@
+
+
+
+
+
+
+ 供应商
+
+
+
+
+
+
+
+
+
+ 扫一扫
+
+
+
+ 添加商品
+
+
+
+
+
+
+
+ 新
+
+
+
+
+ 删除
+ 合并
+
+
+
+
+
+
+ {{value[1].productCount}}
+
+ 品名:
+ 货号:
+
+ 分类: {{value[1].categoryName}}
+
+
+
+ 单价:
+ 添加规格
+
+
+
+
+
+
+
+
+
+ {{numData(values[0])[0]}}{{numData(values[0])[1]}}
+
+
+
+
+
+
+
+
+
+
+
+ 应付金额
+
+
+
+
+
+ 已付金额
+
+
+
+
+
+ 欠款
+
+
+
+
+
+ 其他费用
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+ 合计:{{totalAmount}}
+ ¥{{shouldPay}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/inventory/addGoods.vue b/pages/inventory/addGoods.vue
deleted file mode 100644
index 0d9f98d..0000000
--- a/pages/inventory/addGoods.vue
+++ /dev/null
@@ -1,355 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/inventory/attribute.vue b/pages/inventory/attribute.vue
deleted file mode 100644
index 6c37880..0000000
--- a/pages/inventory/attribute.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/pages/inventory/batchPrint.vue b/pages/inventory/batchPrint.vue
deleted file mode 100644
index 72690d4..0000000
--- a/pages/inventory/batchPrint.vue
+++ /dev/null
@@ -1,675 +0,0 @@
-
-
-
-
-
-
-
-
- 暂无图片
-
-
- {{item.productName}}
- {{item.productSn}}
-
-
- {{item.wholesalePrice}}
- 批发价
-
-
- {{item.lsprice}}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.categoryName}}
-
-
-
-
-
-
- 暂无图片
-
-
- {{item.productName}}
- {{item.productSn}}
-
-
- {{item.wholesalePrice}}
- 批发价
-
-
- {{item.price}}
- 零售价
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/inventory/brand.vue b/pages/inventory/brand.vue
deleted file mode 100644
index ec61daf..0000000
--- a/pages/inventory/brand.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/inventory/changeGoods1.vue b/pages/inventory/changeGoods1.vue
index d59e29e..f3e342a 100644
--- a/pages/inventory/changeGoods1.vue
+++ b/pages/inventory/changeGoods1.vue
@@ -506,7 +506,7 @@
//跳转新增商品
goAddGoods() {
uni.navigateTo({
- url: "/pages/inventory/addGoods"
+ url: "/package1/inventory/addGoods"
})
},
//弹出购物车或者商品规格选择弹窗
diff --git a/pages/inventory/getProductIdToList.vue b/pages/inventory/getProductIdToList.vue
deleted file mode 100644
index d94d057..0000000
--- a/pages/inventory/getProductIdToList.vue
+++ /dev/null
@@ -1,313 +0,0 @@
-
-
-
-
-
- 单价:{{item.saleDetailDTOList[0].discountAmount}} 数量:{{item.productCount}}
-
-
- 商品规格
- 总数量
-
-
-
-
- {{data.attributeList | sliceMsg}}
-
-
- {{data.productCount}}
-
-
-
-
-
-
-
- 采购价:{{item.purchaseDetails[0].purchasePrice?item.purchaseDetails[0].purchasePrice:'暂无'}} 总数量:{{item.purchase.totalAmount?item.purchase.totalAmount:'暂无'}}
-
-
- 商品规格
- 总数量
-
-
-
-
- {{data.attributeList | sliceMsg}}
-
-
- {{data.productCount}}
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/inventory/inventory.vue b/pages/inventory/inventory.vue
index d42b1ff..f4bad14 100644
--- a/pages/inventory/inventory.vue
+++ b/pages/inventory/inventory.vue
@@ -188,7 +188,7 @@
},
goWarnList(){
uni.navigateTo({
- url: '/pages/inventory/inventoryWarn'
+ url: '/package1/inventory/inventoryWarn'
})
},
//点击分类获取商品列表
@@ -261,13 +261,13 @@
})
} else if (target == '2') {
uni.navigateTo({
- url: "/pages/inventory/addGoods"
+ url: "/package1/inventory/addGoods"
})
}else if(target == '3'){
this.$refs.payDialog.open('center')
}else{
uni.navigateTo({
- url: "/pages/inventory/batchPrint"
+ url: "/package1/inventory/batchPrint"
})
}
}
diff --git a/pages/inventory/inventoryConfirm.vue b/pages/inventory/inventoryConfirm.vue
index 49f9cfd..b890542 100644
--- a/pages/inventory/inventoryConfirm.vue
+++ b/pages/inventory/inventoryConfirm.vue
@@ -129,7 +129,7 @@
},
batchPrint(){
uni.navigateTo({
- url: "/pages/inventory/batchPrint?purchase=" + JSON.stringify(this.purchase) + '&purchaseDetails=' + JSON.stringify(this.purchaseDetails)
+ url: "/package1/inventory/batchPrint?purchase=" + JSON.stringify(this.purchase) + '&purchaseDetails=' + JSON.stringify(this.purchaseDetails)
})
}
},
diff --git a/pages/inventory/inventoryDetail.vue b/pages/inventory/inventoryDetail.vue
index 05de795..8fdd352 100644
--- a/pages/inventory/inventoryDetail.vue
+++ b/pages/inventory/inventoryDetail.vue
@@ -189,7 +189,7 @@
//去新增商品页编辑
goToAddGoods(){
uni.navigateTo({
- url: "/pages/inventory/addGoods?dataList="+JSON.stringify(this.dataList)
+ url: "/package1/inventory/addGoods?dataList="+JSON.stringify(this.dataList)
})
},
onPrint(opt) {
@@ -221,11 +221,11 @@
trigger(e) {
if(e.index==0){ //销售明细
uni.navigateTo({
- url: '/pages/inventory/getProductIdToList?type=0&id=' + this.dataList.id
+ url: '/package1/inventory/getProductIdToList?type=0&id=' + this.dataList.id
})
}else if(e.index==1){
uni.navigateTo({
- url: '/pages/inventory/getProductIdToList?type=1&id=' + this.dataList.id
+ url: '/package1/inventory/getProductIdToList?type=1&id=' + this.dataList.id
})
}else{
this.delGoods()
@@ -241,7 +241,7 @@
if(res.confirm){
that.tui.request('/app/product/delById', "post", {
id:that.dataList.id
- }, false, false).then((res1) => {
+ }, false, true).then((res1) => {
if (res1.code == 200) {
uni.navigateBack({
delta: 1
diff --git a/pages/inventory/inventoryWarn.vue b/pages/inventory/inventoryWarn.vue
deleted file mode 100644
index c1efd7c..0000000
--- a/pages/inventory/inventoryWarn.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
-
- 暂无图片
-
- {{item.productName}}
- ({{item.productSn == null ? '暂无':item.productSn}})
-
- 库存总数:{{item.stockCount == null ? '暂无':item.stockCount}}
-
- 预警值:{{item.tailWarn == null ? '暂无':item.tailWarn}}
-
-
-
-
-
- {{item1.attributeList | sliceMsg}}
- 数量:{{item1.stockCount}}
-
-
-
-
-
-
-
-
-
\ No newline at end of file