From 1a18bfbeeeb42c118cef061ff8dd383c708826aa Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 13 三月 2026 16:31:14 +0800
Subject: [PATCH] fix: 设备保养：可以在app上面进行设备保养计划新增，可多选设备（不需要设备编号），计划新增后，需定时生成多条任务（根据选择的多个设备生成多个任务）
---
src/views/inventoryManagement/stockManagement/Subtract.vue | 108 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 85 insertions(+), 23 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/Subtract.vue b/src/views/inventoryManagement/stockManagement/Subtract.vue
index 1cd9b06..d23c974 100644
--- a/src/views/inventoryManagement/stockManagement/Subtract.vue
+++ b/src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -38,25 +38,71 @@
</el-form-item>
<el-form-item
- label="鏁伴噺"
- prop="qualitity"
- >
- <el-input-number v-model="formState.qualitity" :step="1" :min="1" :max="maxQuality" style="width: 100%" />
- </el-form-item>
-
- <el-form-item
- v-if="isRawMaterial"
- label="鍑�閲�"
- prop="netWeight"
- >
- <el-input-number v-model="formState.netWeight" :precision="2" :step="0.01" :min="0" style="width: 100%" />
- </el-form-item>
-
- <el-form-item
label="杞︾墝鍙�"
prop="licensePlateNo"
>
<el-input v-model="formState.licensePlateNo" />
+ </el-form-item>
+
+ <el-form-item
+ label="姣涢噸(鍚�)"
+ prop="grossWeight"
+ >
+ <el-input-number
+ v-model="formState.grossWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ @change="computeNetWeight"
+ />
+ </el-form-item>
+
+ <el-form-item
+ label="鐨噸(鍚�)"
+ prop="tareWeight"
+ >
+ <el-input-number
+ v-model="formState.tareWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ @change="computeNetWeight"
+ />
+ </el-form-item>
+
+ <el-form-item
+ label="鍑�閲�(鍚�)"
+ prop="netWeight"
+ >
+ <el-input-number
+ v-model="formState.netWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ disabled
+ />
+ </el-form-item>
+
+ <el-form-item
+ label="杩囩鏃ユ湡"
+ prop="weighingDate"
+ >
+ <el-date-picker
+ style="width: 100%"
+ v-model="formState.weighingDate"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
+ type="datetime"
+ placeholder="璇烽�夋嫨杩囩鏃ユ湡"
+ clearable
+ />
+ </el-form-item>
+
+ <el-form-item
+ label="杩囩鍛�"
+ prop="weighingOperator"
+ >
+ <el-input v-model="formState.weighingOperator" />
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
@@ -81,7 +127,7 @@
</template>
<script setup>
-import {ref, computed, getCurrentInstance} from "vue";
+import {ref, computed, getCurrentInstance, onMounted} from "vue";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import {subtractStockInventory} from "@/api/inventoryManagement/stockInventory.js";
import {subtractStockUnInventory} from "@/api/inventoryManagement/stockUninventory.js";
@@ -108,10 +154,6 @@
initFormData()
})
-const maxQuality = computed(() => {
- return props.record.unLockedQuantity ? props.record.unLockedQuantity : 0;
-})
-
const isRawMaterial = computed(() => {
return props.record.parentName === '鍘熸潗鏂�';
})
@@ -131,9 +173,13 @@
productName: "",
model: "",
unit: "",
- qualitity: 0,
+ // 杩囩鐩稿叧瀛楁
+ licensePlateNo: "",
+ grossWeight: undefined,
+ tareWeight: undefined,
netWeight: undefined,
- licensePlateNo: undefined,
+ weighingDate: undefined,
+ weighingOperator: "",
remark: '',
});
@@ -158,13 +204,29 @@
productName: "",
model: "",
unit: "",
- qualitity: 0,
+ licensePlateNo: "",
+ grossWeight: undefined,
+ tareWeight: undefined,
netWeight: undefined,
+ weighingDate: undefined,
+ weighingOperator: "",
remark: '',
};
isShow.value = false;
};
+// 鍑�閲� = 姣涢噸 - 鐨噸
+const computeNetWeight = () => {
+ const { grossWeight, tareWeight } = formState.value;
+ if (grossWeight != null && tareWeight != null) {
+ const net = Number(grossWeight) - Number(tareWeight);
+ const safeNet = Number(net.toFixed(2));
+ formState.value.netWeight = safeNet > 0 ? safeNet : 0;
+ } else {
+ formState.value.netWeight = undefined;
+ }
+};
+
// 浜у搧閫夋嫨澶勭悊
const handleProductSelect = async (products) => {
if (products && products.length > 0) {
--
Gitblit v1.9.3