From 2b31fa203f3435a582be51f45899d99164c9917a Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期四, 09 四月 2026 13:34:59 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/SC/gfzl
---
ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-operate-drawer.vue | 82 ++++++++++++++++++++++++++++-------------
1 files changed, 56 insertions(+), 26 deletions(-)
diff --git a/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-operate-drawer.vue b/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-operate-drawer.vue
old mode 100644
new mode 100755
index 523341c..9a43e4b
--- a/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-operate-drawer.vue
+++ b/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-operate-drawer.vue
@@ -45,31 +45,26 @@
function createDefaultModel(): Model {
return {
- id: null,
- materialname: '',
- batchcode: '',
- actualstarttime: null,
- jobinput: null,
- weightloss: null,
- slkrate: null,
- weight: null,
- distimebegin: null,
- distimeend: null,
- siloid: ''
+ id: null,
+ materialname: '',
+ batchcode: '',
+ actualstarttime: null,
+ jobinput: null,
+ weightloss: null,
+ silkrate: null,
+ weight: null,
+ distimebegin: null,
+ distimeend: null,
+ siloid: ''
};
}
-type RuleKey = Extract<
- keyof Model,
- | 'id'
- | 'materialname'
- | 'batchcode'
->;
+type RuleKey = Extract<keyof Model, 'id' | 'materialname' | 'batchcode'>;
const rules: Record<RuleKey, App.Global.FormRule> = {
id: createRequiredRule('id涓嶈兘涓虹┖'),
materialname: createRequiredRule('鐗屽彿涓嶈兘涓虹┖'),
- batchcode: createRequiredRule('鎵规鍙蜂笉鑳戒负绌�'),
+ batchcode: createRequiredRule('鎵规鍙蜂笉鑳戒负绌�')
};
function handleUpdateModelWhenEdit() {
@@ -87,16 +82,51 @@
async function handleSubmit() {
await validate();
- const { id, materialname, batchcode, actualstarttime, jobinput, weightloss, slkrate, weight, distimebegin, distimeend, siloid } = model.value;
+ const {
+ id,
+ materialname,
+ batchcode,
+ actualstarttime,
+ jobinput,
+ weightloss,
+ silkrate,
+ weight,
+ distimebegin,
+ distimeend,
+ siloid
+ } = model.value;
// request
if (props.operateType === 'add') {
- const { error } = await fetchCreateStoreSilk({ materialname, batchcode, actualstarttime, jobinput, weightloss, slkrate, weight, distimebegin, distimeend, siloid });
+ const { error } = await fetchCreateStoreSilk({
+ materialname,
+ batchcode,
+ actualstarttime,
+ jobinput,
+ weightloss,
+ silkrate,
+ weight,
+ distimebegin,
+ distimeend,
+ siloid
+ });
if (error) return;
}
if (props.operateType === 'edit') {
- const { error } = await fetchUpdateStoreSilk({ id, materialname, batchcode, actualstarttime, jobinput, weightloss, slkrate, weight, distimebegin, distimeend, siloid });
+ const { error } = await fetchUpdateStoreSilk({
+ id,
+ materialname,
+ batchcode,
+ actualstarttime,
+ jobinput,
+ weightloss,
+ silkrate,
+ weight,
+ distimebegin,
+ distimeend,
+ siloid
+ });
if (error) return;
}
@@ -132,16 +162,16 @@
/>
</NFormItem>
<NFormItem label="鎶曟枡閲嶉噺" path="jobinput">
- <NInput v-model:value="model.jobinput" placeholder="璇疯緭鍏ユ姇鏂欓噸閲�" />
+ <NInputNumber v-model:value="model.jobinput" placeholder="璇疯緭鍏ユ姇鏂欓噸閲�" class="w-full" />
</NFormItem>
<NFormItem label="鎹熻�楅噸閲�" path="weightloss">
- <NInput v-model:value="model.weightloss" placeholder="璇疯緭鍏ユ崯鑰楅噸閲�" />
+ <NInputNumber v-model:value="model.weightloss" placeholder="璇疯緭鍏ユ崯鑰楅噸閲�" class="w-full" />
</NFormItem>
- <NFormItem label="鍑哄彾涓濈巼" path="slkrate">
- <NInput v-model:value="model.slkrate" placeholder="璇疯緭鍏ュ嚭鍙朵笣鐜�" />
+ <NFormItem label="鍑哄彾涓濈巼" path="silkrate">
+ <NInputNumber v-model:value="model.silkrate" placeholder="璇疯緭鍏ュ嚭鍙朵笣鐜�" class="w-full" />
</NFormItem>
<NFormItem label="鍌ㄤ笣鏌滈噸閲�" path="weight">
- <NInput v-model:value="model.weight" placeholder="璇疯緭鍏ュ偍涓濇煖閲嶉噺" />
+ <NInputNumber v-model:value="model.weight" placeholder="璇疯緭鍏ュ偍涓濇煖閲嶉噺" class="w-full" />
</NFormItem>
<NFormItem label="鍌ㄤ笣鏌滃嚭鏂欏紑濮嬫椂闂�" path="distimebegin">
<NDatePicker
--
Gitblit v1.9.3