From 04ecdbfb7be63ca4a3d49d3575847e728e3e9ae7 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 27 三月 2026 17:44:13 +0800
Subject: [PATCH] fix:1.耗材选择产品优化
---
src/views/inventoryManagement/stockManagement/Subtract.vue | 171 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 107 insertions(+), 64 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/Subtract.vue b/src/views/inventoryManagement/stockManagement/Subtract.vue
index 88cfad3..cc5a12b 100644
--- a/src/views/inventoryManagement/stockManagement/Subtract.vue
+++ b/src/views/inventoryManagement/stockManagement/Subtract.vue
@@ -30,80 +30,115 @@
<el-input v-model="formState.model" disabled />
</el-form-item>
+ <!-- 闈炲師鏉愭枡鏄剧ず鏁伴噺瀛楁 -->
<el-form-item
- label="鍗曚綅"
- prop="unit"
- >
- <el-input v-model="formState.unit" disabled />
- </el-form-item>
-
- <el-form-item
- label="杞︾墝鍙�"
- prop="licensePlateNo"
- >
- <el-input v-model="formState.licensePlateNo" />
- </el-form-item>
-
- <el-form-item
- label="姣涢噸(鍚�)"
- prop="grossWeight"
+ v-if="props.record.productType !== 0"
+ label="鏁伴噺"
+ prop="qualitity"
+ :rules="[
+ { required: true, message: '璇疯緭鍏ユ暟閲�', trigger: ['blur', 'change'] }
+ ]"
>
<el-input-number
- v-model="formState.grossWeight"
- :step="0.01"
+ v-model="formState.qualitity"
:min="0"
+ :step="1"
+ :precision="0"
style="width: 100%"
- @change="computeNetWeight"
+ controls-position="right"
+ placeholder="璇疯緭鍏ユ暟閲�"
/>
</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>
+ <!-- 鍘熸潗鏂欐樉绀鸿繃纾呯浉鍏冲瓧娈� -->
+ <template v-if="props.record.productType === 0">
+ <el-form-item
+ label="杞︾墝鍙�"
+ prop="licensePlateNo"
+ :rules="[{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿', trigger: ['blur','change'] }]"
+ >
+ <el-input v-model="formState.licensePlateNo" />
+ </el-form-item>
+ <el-form-item
+ label="鍗曚綅"
+ prop="unit"
+ >
+ <el-select
+ v-model="formState.unit"
+ placeholder="璇烽�夋嫨鍗曚綅"
+ style="width: 100%"
+ clearable
+ >
+ <el-option label="鍚�" value="鍚�" />
+ <el-option label="鍏枻" value="鍏枻" />
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ label="姣涢噸"
+ prop="grossWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ユ瘺閲�', trigger: ['blur','change'] }]"
+ >
+ <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="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="tareWeight"
+ :rules="[{ required: true, message: '璇疯緭鍏ョ毊閲�', trigger: ['blur','change'] }]"
+ >
+ <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="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="netWeight"
+ :rules="[{ required: true, message: '鍑�閲嶇敱姣涢噸鍜岀毊閲嶈嚜鍔ㄨ绠�', trigger: ['blur','change'] }]"
+ >
+ <el-input-number
+ v-model="formState.netWeight"
+ :step="0.01"
+ :min="0"
+ style="width: 100%"
+ disabled
+ />
+ </el-form-item>
- <el-form-item
- label="杩囩鍛�"
- prop="weighingOperator"
- >
- <el-input v-model="formState.weighingOperator" />
- </el-form-item>
+ <el-form-item
+ label="杩囩鏃ユ湡"
+ prop="weighingDate"
+ :rules="[{ required: true, message: '璇烽�夋嫨杩囩鏃ユ湡', trigger: 'change' }]"
+ >
+ <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"
+ :rules="[{ required: true, message: '璇疯緭鍏ヨ繃纾呭憳', trigger: ['blur','change'] }]"
+ >
+ <el-input v-model="formState.weighingOperator" />
+ </el-form-item>
+ </template>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formState.remark" type="textarea" />
@@ -168,6 +203,8 @@
formState.value = {
...props.record,
}
+ // 鍒濆鍖栨椂涔熻Е鍙戜竴娆″噣閲嶈绠楋紝閬垮厤鎺ュ彛鍥炲～鍚庡噣閲嶄负绌�
+ computeNetWeight()
}
}
@@ -229,7 +266,13 @@
const computedNet = safeNet > 0 ? safeNet : 0;
const maxNet = ledgerNetWeight.value;
if (Number.isFinite(maxNet) && maxNet > 0 && computedNet > maxNet) {
- formState.value.netWeight = Number(maxNet.toFixed(2));
+ const cappedNet = Number(maxNet.toFixed(2));
+ formState.value.netWeight = cappedNet;
+ // 鍚屾姣涢噸锛屼繚鎸侊細鍑�閲� = 姣涢噸 - 鐨噸
+ const tare = Number(tareWeight);
+ if (Number.isFinite(tare)) {
+ formState.value.grossWeight = Number((tare + cappedNet).toFixed(2));
+ }
proxy?.$modal?.msgWarning?.(`棰嗙敤鍑�閲嶄笉鑳借秴杩囧彴璐﹀噣閲嶏紙${maxNet.toFixed(2)} 鍚級`);
return;
}
--
Gitblit v1.9.3