diff --git a/nx/api/material.js b/nx/api/material.js
index 64422e3..4d81915 100644
--- a/nx/api/material.js
+++ b/nx/api/material.js
@@ -81,5 +81,39 @@ export default {
url: '/qms/resource/material-use-end-reuse/reuse',
method: 'PUT',
data
+ }),
+ // 流程列表
+ getLifecycleList: params =>
+ request({
+ url: '/qms/resource/material-lifecycle/page',
+ method: 'GET',
+ params
+ }),
+ // 获取流程明细
+ getLifecycleDetail: params =>
+ request({
+ url: '/qms/resource/material-lifecycle/get',
+ method: 'GET',
+ params
+ }),
+ // 存盘点明细
+ inventoryCheckDetails: params =>
+ request({
+ url: '/qms/resource/material-inventory-check-detail/page',
+ method: 'GET',
+ params
+ }),
+ inventoryCheckInf: data =>
+ request({
+ url: '/qms/resource/material-lifecycle/inventory-inf',
+ method: 'PUT',
+ data
+ }),
+ // 盘点执行人提交盘点
+ submitInventoryCheck: params =>
+ request({
+ url: '/qms/resource/material-lifecycle/operator-submit',
+ method: 'PUT',
+ params
})
}
diff --git a/pages.json b/pages.json
index 92bbea9..43bf647 100644
--- a/pages.json
+++ b/pages.json
@@ -351,6 +351,27 @@
"navigationStyle": "custom"
}
},
+ {
+ "path": "pages/material/inventoryCheck/index",
+ "style": {
+ "navigationBarTitleText": "库存盘点",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/material/inventoryCheck/check",
+ "style": {
+ "navigationBarTitleText": "库存单",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/material/inventoryCheck/detailList",
+ "style": {
+ "navigationBarTitleText": "盘点明细",
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "pages/setting/UrlConfig",
"style": {
diff --git a/pages/material/inventoryCheck/check.vue b/pages/material/inventoryCheck/check.vue
new file mode 100644
index 0000000..dcd8bc8
--- /dev/null
+++ b/pages/material/inventoryCheck/check.vue
@@ -0,0 +1,177 @@
+
+
+
+
+
+ 盘点库:{{ formData.warehouseName }}
+
+
+ 库管员:{{ checkInfo.operatorName }}
+
+
+ 标题:{{ checkInfo.title }}
+
+
+
+
+
+
+
+
+ 物料名称:{{ item.productName }}
+
+ 规格:{{ item.productSpecification }}
+ 型号:{{ item.productModelNo }}
+ 单位:{{ item.unit }}
+
+ 库存数量:{{ item.expected }}
+
+
+ 实际数量:{{ item.actual }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/material/inventoryCheck/detailList.vue b/pages/material/inventoryCheck/detailList.vue
new file mode 100644
index 0000000..8e565c8
--- /dev/null
+++ b/pages/material/inventoryCheck/detailList.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+ 批次号:{{ item.batchNo }}
+ 物料编号:{{ item.infomationCode }}
+ 存放位置:{{ item.locationCode }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/material/inventoryCheck/index.vue b/pages/material/inventoryCheck/index.vue
new file mode 100644
index 0000000..782ec43
--- /dev/null
+++ b/pages/material/inventoryCheck/index.vue
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+ 标题:{{ item.title }}
+ 盘点人:{{ item.operatorName }}
+ 盘点时间:{{ nx.$dayjs(item.applyTime).format('YYYY-MM-DD HH:mm:ss') }}
+ 盘点部门:{{ deptName(item) }}
+ 盘点事由:{{ item.reason }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/material/openMark/index.vue b/pages/material/openMark/index.vue
index fcb6ab8..3908b7a 100644
--- a/pages/material/openMark/index.vue
+++ b/pages/material/openMark/index.vue
@@ -63,7 +63,8 @@ const debouncedHandleScan = debounce(val => {
scanQRInfo.value = ''
if (nx.$router.getCurrentPage().route !== 'pages/material/openMark/index') return
try {
- materialCode.value = val
+ const {code} = JSON.parse(val)
+ materialCode.value = code
getMaterialList()
} catch (error) {
uni.showToast({
diff --git a/pages/material/outbound/index.vue b/pages/material/outbound/index.vue
index 57cf27e..b954cfa 100644
--- a/pages/material/outbound/index.vue
+++ b/pages/material/outbound/index.vue
@@ -109,7 +109,8 @@ const debouncedHandleScan = debounce(val => {
scanQRInfo.value = ''
if (nx.$router.getCurrentPage().route !== 'pages/material/outbound/index') return
try {
- materialCode.value = val
+ const {code} = JSON.parse(val)
+ materialCode.value = code
getMaterialList()
} catch (error) {
uni.showToast({
diff --git a/pages/material/useRecord/useForm.vue b/pages/material/useRecord/useForm.vue
index 7708024..bcb2f79 100644
--- a/pages/material/useRecord/useForm.vue
+++ b/pages/material/useRecord/useForm.vue
@@ -81,7 +81,8 @@ const debouncedHandleScan = debounce(val => {
scanQRInfo.value = ''
if (nx.$router.getCurrentPage().route !== 'pages/material/useRecord/index') return
try {
- materialCode.value = val
+ const {code} = JSON.parse(val)
+ materialCode.value = code
getMaterialInfo()
} catch (error) {
uni.showToast({
diff --git a/pages/material/useUpMark/index.vue b/pages/material/useUpMark/index.vue
index 952ab26..973c395 100644
--- a/pages/material/useUpMark/index.vue
+++ b/pages/material/useUpMark/index.vue
@@ -59,7 +59,8 @@ const debouncedHandleScan = debounce(val => {
scanQRInfo.value = ''
if (nx.$router.getCurrentPage().route !== 'pages/material/useUpMark/index') return
try {
- materialCode.value = val
+ const {code} = JSON.parse(val)
+ materialCode.value = code
getMaterialList()
} catch (error) {
uni.showToast({
diff --git a/static/images/menus/inventoryCheck .png b/static/images/menus/inventoryCheck .png
new file mode 100644
index 0000000..0929f48
Binary files /dev/null and b/static/images/menus/inventoryCheck .png differ