From a6acf1f8924a8fabaa4b74f6771ddbe41ab6b204 Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期一, 20 十一月 2023 18:47:09 +0800
Subject: [PATCH] 盘点编辑
---
admin-web/src/views/stock/inventorycount/inventorytask/index.vue | 11 ++++-
admin-web/src/views/stock/inventorycount/inventorytask/edit.vue | 10 +++-
admin-web/src/api/stock/inventory.js | 36 ++++++++++++++++++
admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue | 2
admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue | 30 ++++++++------
5 files changed, 70 insertions(+), 19 deletions(-)
diff --git a/admin-web/src/api/stock/inventory.js b/admin-web/src/api/stock/inventory.js
index 239c74c..d66e130 100644
--- a/admin-web/src/api/stock/inventory.js
+++ b/admin-web/src/api/stock/inventory.js
@@ -32,6 +32,24 @@
});
}
+// 缂栬緫
+export function inventoryDetail(params) {
+ return request({
+ url: '/pc/l/wh/form/inventory/detail',
+ method: 'get',
+ params,
+ });
+}
+
+// 鐩樼偣鏆傚瓨
+export function inventoryTemporaryStorage(data) {
+ return request({
+ url: '/pc/l/wh/form/inventory/temporaryStorage',
+ method: 'post',
+ data,
+ });
+}
+
// 瀹屾垚鐩樼偣
export function inventoryFinish(data) {
return request({
@@ -40,3 +58,21 @@
data,
});
}
+
+// 寮傚父鏄庣粏鍒楄〃鏌ヨ
+export function inventoryListPdDetail(params) {
+ return request({
+ url: '/pc/l/wh/form/inventory/list/PdDetail',
+ method: 'get',
+ params,
+ });
+}
+
+// 鐩樼偣
+export function inventorySelectPdList(params) {
+ return request({
+ url: '/pc/l/wh/form/inventory/select/pdList',
+ method: 'get',
+ params,
+ });
+}
diff --git a/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue b/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue
index 27f95d1..a13fad2 100644
--- a/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue
+++ b/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue
@@ -142,7 +142,7 @@
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/inventory/list/PdDetail', // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
columnsCtrl: {
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue b/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
index 4d9bc93..7708d9f 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
@@ -1,5 +1,5 @@
<template>
- <win-sm :title="setting.title" @close="close" :width="'800px'">
+ <win-sm :title="`${setting.title}鐩樼偣`" @close="close" :width="'800px'">
<el-form ref="ruleForm" :model="formData" :rules="rules" class="demo-ruleForm" label-width="100px">
<el-form-item label="鐩樼偣鍗曞悕" prop="businessFormName">
<el-input
@@ -62,6 +62,7 @@
},
data() {
return {
+ loading:true,
checkAll: false,
checkedList: [],
warehouseOptions: [], // 浠撳簱鍒楄〃
@@ -80,8 +81,11 @@
...mapGetters(['userInfo']),
},
created() {
- if (this.setting.info) {
- // this.formData = Object.assign({}, JSON.parse(this.setting.info));
+ if (this.setting.id) {
+ this.formData = Object.assign({}, JSON.parse(this.setting.info));
+ this.$set(this.formData,'operatorUserId',this.formData.operatorId)
+ this.$set(this.formData,'monitorUserId',this.formData.operatorId2)
+ this.$set(this.formData,'remark',this.formData.beiz1)
} else {
this.formData.businessFormName = formatDate(new Date(), 'yyyy骞碝M鏈堜唤鐩樼偣');
}
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
index 6ffd187..dbe6bdf 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
@@ -77,13 +77,13 @@
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeStart',
+ dataIndex: 'startTime',
label: '鐩樼偣鏃堕棿',
defaultValue: '',
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeEnd',
+ dataIndex: 'endTime',
label: '鑷�',
defaultValue: '',
},
@@ -314,6 +314,13 @@
},
fifterForm(params) {
this.filterFrom = Object.assign(this.filterFrom, params);
+
+ if (this.filterFrom.startTime) {
+ this.filterFrom.startTime = this.filterFrom.startTime.replace(/\-/g, '');
+ }
+ if (this.filterFrom.endTime) {
+ this.filterFrom.endTime = this.filterFrom.endTime.replace(/\-/g, '');
+ }
this.search(1);
},
},
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue b/admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue
index ff242e6..4d91a20 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue
@@ -33,6 +33,7 @@
<script>
import winMd from '@/components/win/win-md';
import myButton from '@/components/myButton/myButton';
+import { inventorySelectPdList,inventoryTemporaryStorage,inventoryFinish } from '@/api/stock/inventory';
export default {
components: { winMd, myButton },
props: {
@@ -53,25 +54,28 @@
};
},
created() {
- for (let i = 0; i < 10; i++) {
- this.formData.tableData.push({
- goodsTemplateName: '鏂戒箰榛戣壊纰崇矇',
- baseGoodsModelsId: '鏂戒箰c2201',
- classification: 'A',
- unit: '濂�',
- kc: 10,
- price: 20,
- inventoryResult: 200,
- inventoryCounts: 0,
- });
- }
+ // for (let i = 0; i < 10; i++) {
+ // this.formData.tableData.push({
+ // goodsTemplateName: '鏂戒箰榛戣壊纰崇矇',
+ // baseGoodsModelsId: '鏂戒箰c2201',
+ // classification: 'A',
+ // unit: '濂�',
+ // kc: 10,
+ // price: 20,
+ // inventoryResult: 200,
+ // inventoryCounts: 0,
+ // });
+ // }
+ inventorySelectPdList({id:this.setting.id}).then(res=>{
+ this.formData = res
+ })
},
methods: {
close() {
this.$emit('close');
},
save() {
-
+
}
},
};
--
Gitblit v1.9.1