diff --git a/src/api/firstOrder/inbound.js b/src/api/firstOrder/inbound.js
index 237c9f1..1a31f50 100644
--- a/src/api/firstOrder/inbound.js
+++ b/src/api/firstOrder/inbound.js
@@ -61,11 +61,22 @@ export const getDetailList = (id) => {
cryptoData: false
})
}
-export const submitData = (formData) => {
+export const submitData = (sizeForm) => {
+ console.log('api中的数据',sizeForm)
return request({
url: '/smartpark/onePutStorage/submit',
method: 'post',
- data: formData ,
+ data: sizeForm ,
+ cryptoToken: false,
+ cryptoData: false
+ })
+}
+export const editList = (onePutStorageId) => {
+ console.log('api中的数据',onePutStorageId)
+ return request({
+ url: '/smartpark/onePutStorage/detail',
+ method: 'get',
+ params: { onePutStorageId } ,
cryptoToken: false,
cryptoData: false
})
diff --git a/src/api/firstOrder/list.js b/src/api/firstOrder/list.js
index 12cf269..edf1eb1 100644
--- a/src/api/firstOrder/list.js
+++ b/src/api/firstOrder/list.js
@@ -25,4 +25,4 @@ export const recordList = (current, size, params) => {
cryptoToken: false,
cryptoData: false
})
-}
\ No newline at end of file
+}
diff --git a/src/api/materials/list.js b/src/api/materials/list.js
index 4612ae4..a9a1746 100644
--- a/src/api/materials/list.js
+++ b/src/api/materials/list.js
@@ -40,3 +40,11 @@ export const remove = (ids) => {
cryptoData: false
})
}
+export const getCode = () => {
+ return request({
+ url: '/smartpark/material/getMaterialEnumList',
+ method: 'get',
+ cryptoToken: false,
+ cryptoData: false
+ })
+}
diff --git a/src/views/firstOrder/components/inDialog copy 2.vue b/src/views/firstOrder/components/inDialog copy 2.vue
new file mode 100644
index 0000000..40eeea8
--- /dev/null
+++ b/src/views/firstOrder/components/inDialog copy 2.vue
@@ -0,0 +1,709 @@
+
+
+
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 批量选择
+ 单项选择
+
+
+
+
+
+
+
+
+
+ {{ inDate }}
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.requiredQuantity || 0 }}
+
+
+
+
+ {{ scope.row.inboundQuantity || 0 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.requiredQuantity || 0 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 入库账目表格：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ Number(scope.row.inboundQuantity || 0) + Number(scope.row.theInboundQuantity || 0) }}
+
+
+
+
+
+
+
+
+ {{ scope.row.userInfoVO ? scope.row.userInfoVO.name : sizeForm.userInfoVO.name }}
+
+
+
+
+ {{ inDate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }}
+
+
+
+
+
+
+
+ {{ scope.row.unitPrice || 0 }}
+
+
+
+
+
+
+
+
+ {{ scope.row.unitPrice }}
+
+
+
+
+
+
+ {{ Number(scope.row.inboundQuantity || 0) + Number(scope.row.theInboundQuantity || 0) }}
+
+
+
+
+ {{ scope.row.unitPrice || 0 }}
+
+
+
+
+
+
+ {{ scope.row.userInfoVO ? scope.row.userInfoVO.name : sizeForm.userInfoVO.name }}
+
+
+
+
+ {{ inDate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
入库账目表格：
@@ -171,7 +154,7 @@
@@ -394,7 +377,6 @@ export default {
console.log(row, "row",row.materialId)
if (!row.materialId) {
this.$message.warning("请选择物资名称");
- console.log(1)
return
}
try {
@@ -442,7 +424,7 @@ export default {
this.handleCloseDetail()
},
// 提交
- sumbit() {
+ submit() {
// status ==1 展示入库
let flag = this.sizeForm.inTableData.some(item => item.status == 1)
if (flag) {
diff --git a/src/views/firstOrder/components/inDialog.vue b/src/views/firstOrder/components/inDialog.vue
index 8996723..421d109 100644
--- a/src/views/firstOrder/components/inDialog.vue
+++ b/src/views/firstOrder/components/inDialog.vue
@@ -1,16 +1,11 @@
+ :append-to-body="true" width="70%" @close="handleCloseDetail" fullscreen>
基本信息
-
-
-
-
-
@@ -18,55 +13,37 @@
-
+
-
+
-
+
-
-
-
-
-
+
+
-
+
-
+
批量选择
单项选择
@@ -83,19 +60,9 @@
v-if="!allDisabled && sizeForm.option == 2">新增
-
-
-
+
-
-
-
-
-
-
-
+
@@ -104,10 +71,12 @@
-
-
+ :disabled="inDialogType == 'details'" @change="handleTypeChange(scope.row)"
+ v-if='inDialogType != "details"'>
+
+
+ {{ scope.row.type == 'NY' ? '耐用品' : '易耗品' }}
@@ -115,63 +84,48 @@
{{ scope.row.requiredQuantity || 0 }}
-
-
-
+
+ @change="syncInboundQuantity(scope.row)" v-if='inDialogType != "details"'>
+ {{ scope.row.theInboundQuantity || 0}}
-
-
-
-
-
-
+
+
+ @change="handleMaterialChange(scope.row)" v-if='inDialogType != "details"'>
+ {{ scope.row.materialName }}
-
-
-
+
+
-
-
+ @change="handleTypeChange(scope.row)"
+ v-if='inDialogType !== "details"'>
+
+
+ {{ scope.row.type == 'NY' ? '耐用品' : '易耗品' }}
-
-
- {{ scope.row.unit || '' }}
-
-
+
{{ scope.row.requiredQuantity || 0 }}
@@ -179,40 +133,30 @@
-
+ @change="syncInboundQuantity(scope.row)" v-if='inDialogType != "details"'>
+ {{ scope.row.theInboundQuantity || 0 }}
+ @change="syncUnitPrice(scope.row)" v-if='inDialogType != "details"'>
+ {{ scope.row.unitPrice || 0 }}
-
-
-
-
-
-
- 入库账目表格：
+ 入库账目表格：
-
+
-
+
-
+
@@ -222,10 +166,13 @@
- {{ scope.row.type === "ny" ? "耐用品" : (scope.row.type === "yh" ? "易耗品" : "") }}
+ {{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }}
+
+ {{ scope.row.inboundQuantity || 0 }}
+
@@ -248,7 +195,7 @@
- {{ scope.row.userInfoVO ? scope.row.userInfoVO.name : (sizeForm.submitName || '') }}
+ {{ scope.row.userInfoVO ? scope.row.userInfoVO.name : sizeForm.userInfoVO.name }}
@@ -258,24 +205,22 @@
-
-
+
-
+
-
+
-
-
-
+
+
- {{ scope.row.type === "1" ? "耐用品" : (scope.row.type === "2" ? "易耗品" : "") }}
+ {{ scope.row.type === "NY" ? "耐用品" : (scope.row.type === "YH" ? "易耗品" : "") }}
-
-
+
@@ -289,7 +234,7 @@
- {{ scope.row.unitPrice || 0 }}
+ {{ scope.row.unitPrice }}
@@ -308,7 +253,7 @@
- {{ scope.row.userInfoVO ? scope.row.userInfoVO.name : (sizeForm.submitName || '') }}
+ {{ scope.row.userInfoVO ? scope.row.userInfoVO.name : sizeForm.userInfoVO.name }}
@@ -317,14 +262,12 @@
-
-
@@ -343,7 +286,7 @@