diff --git a/manifest.json b/manifest.json
index 0f1d4a7..0e36812 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "护理单元",
"appid" : "__UNI__FB2D473",
"description" : "护理单元",
- "versionName" : "1.0.006",
- "versionCode" : 10006,
+ "versionName" : "1.0.008",
+ "versionCode" : 10008,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/procurement/api/lunpan.js b/pages/procurement/api/lunpan.js
index 67f8ed7..dfa5d58 100644
--- a/pages/procurement/api/lunpan.js
+++ b/pages/procurement/api/lunpan.js
@@ -136,6 +136,14 @@ export const updateWarehouserEnabled = (params) => {
data: params,
})
}
+//(业务)修改购物车请购信息
+export const eddShoppingCartList = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/eddShoppingCartList`,
+ method: 'post',
+ data: params,
+ })
+}
//(业务)获取物料分类树可采购的物料数量(仓库列表使用)
@@ -154,4 +162,22 @@ export const getTreeDataWlnum = (params) => {
data: params,
})
}
-
\ No newline at end of file
+
+ //(业务)库存预警添加全部物料
+ export const addWaringAll = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/addWaringAll`,
+ method: 'post',
+ data: params,
+ })
+ }
+
+
+// (业务)获取物料分类树可采购的物料数量(购物车列表使用)
+ export const getGwcTreeDataWlnum = (params) => {
+ return request({
+ url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getGwcTreeDataWlnum`,
+ method: 'get',
+ data: params,
+ })
+ }
\ No newline at end of file
diff --git a/pages/procurement/components/addall.vue b/pages/procurement/components/addall.vue
index 7e5ee24..75ca969 100644
--- a/pages/procurement/components/addall.vue
+++ b/pages/procurement/components/addall.vue
@@ -8,64 +8,29 @@
确认将所有未添加状态的库存预警物料添加至购物车中,并且物料的采购数量为物料的库存上限-库存数量吗?
取消
- 确定
+ 确定
+
+ .titletop {
+ width: 100%;
+ height: 2.5vw;
+ font-weight: 400;
+ font-size: 1.5vw;
+ color: #333333;
+ line-height: 2.5vw;
+ }
+
+ .guodu {
+ transition: .4s;
+ -webkit-transform-style: preserve-3d;
+ -webkit-overflow-scrolling: touch;
+ }
+
\ No newline at end of file
diff --git a/pages/procurement/components/default.vue b/pages/procurement/components/default.vue
new file mode 100644
index 0000000..a0dfe43
--- /dev/null
+++ b/pages/procurement/components/default.vue
@@ -0,0 +1,43 @@
+
+
+
+
+ {{cont}}
+
+
+
+
+
+
+
diff --git a/pages/procurement/components/equiment.vue b/pages/procurement/components/equiment.vue
new file mode 100644
index 0000000..cd07b09
--- /dev/null
+++ b/pages/procurement/components/equiment.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+ {{content}}
+
+
+
+
+
+
+
+
+
diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue
index 522909e..e0aed84 100644
--- a/pages/procurement/material.vue
+++ b/pages/procurement/material.vue
@@ -91,7 +91,7 @@
-
+
{
serverUrl.value = uni.getStorageSync('serverUrl') + '/sys/common/static/';
- queryInvo();
})
onShow(()=>{
- shoppcar();
- getWaringMaterial()
+ config()
})
const Material = ref([])
const getWaringMaterial=()=>{
@@ -178,18 +176,22 @@
})
}
const config = ()=>{
- warn.pageNo = 1;
- Material.value = [];
- getWaringMaterial();
- moredex.value=0
+ form.pageNo=1;
+ warn.pageNo=1;
+ Material.value=[];
+ InvoicingList.value=[];
+ shoppcar();
+ queryInvo();
+ getWaringMaterial()
+ moredex.value=0;
+ shoppcar();
}
const carnum = ref(0)
const shoppcar=()=>{
let c = {
nuId: form.nuId,
pageNo: 1,
- pageSize: 10
- }
+ pageSize: 1 }
queryShoppingCartList(c).then(resr=>{
carnum.value = resr.result.total
})
@@ -293,6 +295,7 @@
referenceUnitPrice:type.price,
dhbl:type.num
}
+ console.log(dt)
addShoppingCartList([dt]).then(res=>{
uni.showToast({
icon:res.success?'success':'none',
diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue
index fd1e122..f3b1991 100644
--- a/pages/procurement/materialcar.vue
+++ b/pages/procurement/materialcar.vue
@@ -16,7 +16,7 @@
-
+
清空
@@ -30,15 +30,33 @@
-
+
+
+
+
+
+
+
+
+
+
+
+