From 295bdcf5c1c434604d35bdb592660284870014d7 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 18 三月 2026 13:36:58 +0800
Subject: [PATCH] feat: 1.新增判定规程明细项目维护 2.新增储丝单柜产量报表 3.新增exceljs、dompdf等文件导出工具 4.修改启动loading、icon、fav
---
ruoyi-plus-soybean/src/views/analy/feed-match/modules/feed-match-operate-drawer.vue | 252 ++++++++++++++++++++++++++++----------------------
1 files changed, 141 insertions(+), 111 deletions(-)
diff --git a/ruoyi-plus-soybean/src/views/analy/feed-match/modules/feed-match-operate-drawer.vue b/ruoyi-plus-soybean/src/views/analy/feed-match/modules/feed-match-operate-drawer.vue
old mode 100644
new mode 100755
index 77b0221..e8bd128
--- a/ruoyi-plus-soybean/src/views/analy/feed-match/modules/feed-match-operate-drawer.vue
+++ b/ruoyi-plus-soybean/src/views/analy/feed-match/modules/feed-match-operate-drawer.vue
@@ -45,45 +45,41 @@
function createDefaultModel(): Model {
return {
- time: null,
- key: '',
- dacUpTime: '',
- fs11: '',
- fs12: '',
- fs21: '',
- fs22: '',
- fs31: '',
- fs32: '',
- fs41: '',
- fs42: '',
- pipe01: null,
- pipe02: null,
- pipe03: null,
- pipe04: null,
- pipe05: null,
- pipe06: null,
- pipe07: null,
- pipe08: null,
- pipe09: null,
- pipe10: null,
- pipe11: null,
- pipe12: null,
- wsjState: null,
- shift: null,
- equNo: null,
- remark: ''
+ time: null,
+ key: '',
+ dacUpTime: '',
+ fs11: '',
+ fs12: '',
+ fs21: '',
+ fs22: '',
+ fs31: '',
+ fs32: '',
+ fs41: '',
+ fs42: '',
+ pipe01: null,
+ pipe02: null,
+ pipe03: null,
+ pipe04: null,
+ pipe05: null,
+ pipe06: null,
+ pipe07: null,
+ pipe08: null,
+ pipe09: null,
+ pipe10: null,
+ pipe11: null,
+ pipe12: null,
+ wsjState: null,
+ shift: null,
+ equNo: null,
+ remark: ''
};
}
-type RuleKey = Extract<
- keyof Model,
- | 'time'
- | 'key'
->;
+type RuleKey = Extract<keyof Model, 'time' | 'key'>;
const rules: Record<RuleKey, App.Global.FormRule> = {
time: createRequiredRule('鏃堕棿鎴充笉鑳戒负绌�'),
- key: createRequiredRule('鐝+鏈哄彴涓嶈兘涓虹┖'),
+ key: createRequiredRule('鐝+鏈哄彴涓嶈兘涓虹┖')
};
function handleUpdateModelWhenEdit() {
@@ -101,16 +97,100 @@
async function handleSubmit() {
await validate();
- const { time, key, dacUpTime, fs11, fs12, fs21, fs22, fs31, fs32, fs41, fs42, pipe01, pipe02, pipe03, pipe04, pipe05, pipe06, pipe07, pipe08, pipe09, pipe10, pipe11, pipe12, wsjState, shift, equNo, remark } = model.value;
+ const {
+ time,
+ key,
+ dacUpTime,
+ fs11,
+ fs12,
+ fs21,
+ fs22,
+ fs31,
+ fs32,
+ fs41,
+ fs42,
+ pipe01,
+ pipe02,
+ pipe03,
+ pipe04,
+ pipe05,
+ pipe06,
+ pipe07,
+ pipe08,
+ pipe09,
+ pipe10,
+ pipe11,
+ pipe12,
+ wsjState,
+ shift,
+ equNo,
+ remark
+ } = model.value;
// request
if (props.operateType === 'add') {
- const { error } = await fetchCreateFeedMatch({ time, key, dacUpTime, fs11, fs12, fs21, fs22, fs31, fs32, fs41, fs42, pipe01, pipe02, pipe03, pipe04, pipe05, pipe06, pipe07, pipe08, pipe09, pipe10, pipe11, pipe12, wsjState, shift, equNo, remark });
+ const { error } = await fetchCreateFeedMatch({
+ time,
+ key,
+ dacUpTime,
+ fs11,
+ fs12,
+ fs21,
+ fs22,
+ fs31,
+ fs32,
+ fs41,
+ fs42,
+ pipe01,
+ pipe02,
+ pipe03,
+ pipe04,
+ pipe05,
+ pipe06,
+ pipe07,
+ pipe08,
+ pipe09,
+ pipe10,
+ pipe11,
+ pipe12,
+ wsjState,
+ shift,
+ equNo,
+ remark
+ });
if (error) return;
}
if (props.operateType === 'edit') {
- const { error } = await fetchUpdateFeedMatch({ time, key, dacUpTime, fs11, fs12, fs21, fs22, fs31, fs32, fs41, fs42, pipe01, pipe02, pipe03, pipe04, pipe05, pipe06, pipe07, pipe08, pipe09, pipe10, pipe11, pipe12, wsjState, shift, equNo, remark });
+ const { error } = await fetchUpdateFeedMatch({
+ time,
+ key,
+ dacUpTime,
+ fs11,
+ fs12,
+ fs21,
+ fs22,
+ fs31,
+ fs32,
+ fs41,
+ fs42,
+ pipe01,
+ pipe02,
+ pipe03,
+ pipe04,
+ pipe05,
+ pipe06,
+ pipe07,
+ pipe08,
+ pipe09,
+ pipe10,
+ pipe11,
+ pipe12,
+ wsjState,
+ shift,
+ equNo,
+ remark
+ });
if (error) return;
}
@@ -140,129 +220,79 @@
/>
</NFormItem>
<NFormItem label="鐝+鏈哄彴" path="key">
- <NInput
- v-model:value="model.key"
- :rows="3"
- type="textarea"
- placeholder="璇疯緭鍏ョ彮娆�+鏈哄彴"
- />
+ <NInput v-model:value="model.key" :rows="3" type="textarea" placeholder="璇疯緭鍏ョ彮娆�+鏈哄彴" />
</NFormItem>
<NFormItem label="鏁版嵁鏇存柊鏃堕棿" path="dacUpTime">
- <NInput
- v-model:value="model.dacUpTime"
- :rows="3"
- type="textarea"
- placeholder="璇疯緭鍏ユ暟鎹洿鏂版椂闂�"
- />
+ <NInput v-model:value="model.dacUpTime" :rows="3" type="textarea" placeholder="璇疯緭鍏ユ暟鎹洿鏂版椂闂�" />
</NFormItem>
<NFormItem label="1#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖" path="fs11">
- <NInput
- v-model:value="model.fs11"
- :rows="3"
- type="textarea"
- placeholder="璇疯緭鍏�1#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖"
- />
+ <NInput v-model:value="model.fs11" :rows="3" type="textarea" placeholder="璇疯緭鍏�1#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖" />
</NFormItem>
<NFormItem label="1#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖" path="fs12">
- <NInput
- v-model:value="model.fs12"
- :rows="3"
- type="textarea"
- placeholder="璇疯緭鍏�1#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖"
- />
+ <NInput v-model:value="model.fs12" :rows="3" type="textarea" placeholder="璇疯緭鍏�1#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖" />
</NFormItem>
<NFormItem label="2#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖" path="fs21">
- <NInput
- v-model:value="model.fs21"
- :rows="3"
- type="textarea"
- placeholder="璇疯緭鍏�2#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖"
- />
+ <NInput v-model:value="model.fs21" :rows="3" type="textarea" placeholder="璇疯緭鍏�2#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖" />
</NFormItem>
<NFormItem label="2#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖" path="fs22">
- <NInput
- v-model:value="model.fs22"
- :rows="3"
- type="textarea"
- placeholder="璇疯緭鍏�2#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖"
- />
+ <NInput v-model:value="model.fs22" :rows="3" type="textarea" placeholder="璇疯緭鍏�2#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖" />
</NFormItem>
<NFormItem label="3#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖" path="fs31">
- <NInput
- v-model:value="model.fs31"
- :rows="3"
- type="textarea"
- placeholder="璇疯緭鍏�3#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖"
- />
+ <NInput v-model:value="model.fs31" :rows="3" type="textarea" placeholder="璇疯緭鍏�3#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖" />
</NFormItem>
<NFormItem label="3#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖" path="fs32">
- <NInput
- v-model:value="model.fs32"
- :rows="3"
- type="textarea"
- placeholder="璇疯緭鍏�3#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖"
- />
+ <NInput v-model:value="model.fs32" :rows="3" type="textarea" placeholder="璇疯緭鍏�3#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖" />
</NFormItem>
<NFormItem label="4#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖" path="fs41">
- <NInput
- v-model:value="model.fs41"
- :rows="3"
- type="textarea"
- placeholder="璇疯緭鍏�4#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖"
- />
+ <NInput v-model:value="model.fs41" :rows="3" type="textarea" placeholder="璇疯緭鍏�4#鍠備笣鏈哄搴旂殑绗竴涓偍涓濇煖" />
</NFormItem>
<NFormItem label="4#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖" path="fs42">
- <NInput
- v-model:value="model.fs42"
- :rows="3"
- type="textarea"
- placeholder="璇疯緭鍏�4#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖"
- />
+ <NInput v-model:value="model.fs42" :rows="3" type="textarea" placeholder="璇疯緭鍏�4#鍠備笣鏈哄搴旂殑绗簩涓偍涓濇煖" />
</NFormItem>
<NFormItem label="1#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" path="pipe01">
- <NInput v-model:value="model.pipe01" placeholder="璇疯緭鍏�1#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" />
+ <NInputNumber v-model:value="model.pipe01" placeholder="璇疯緭鍏�1#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" class="w-full" />
</NFormItem>
<NFormItem label="2#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" path="pipe02">
- <NInput v-model:value="model.pipe02" placeholder="璇疯緭鍏�2#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" />
+ <NInputNumber v-model:value="model.pipe02" placeholder="璇疯緭鍏�2#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" class="w-full" />
</NFormItem>
<NFormItem label="3#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" path="pipe03">
- <NInput v-model:value="model.pipe03" placeholder="璇疯緭鍏�3#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" />
+ <NInputNumber v-model:value="model.pipe03" placeholder="璇疯緭鍏�3#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" class="w-full" />
</NFormItem>
<NFormItem label="4#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" path="pipe04">
- <NInput v-model:value="model.pipe04" placeholder="璇疯緭鍏�4#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" />
+ <NInputNumber v-model:value="model.pipe04" placeholder="璇疯緭鍏�4#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" class="w-full" />
</NFormItem>
<NFormItem label="5#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" path="pipe05">
- <NInput v-model:value="model.pipe05" placeholder="璇疯緭鍏�5#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" />
+ <NInputNumber v-model:value="model.pipe05" placeholder="璇疯緭鍏�5#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" class="w-full" />
</NFormItem>
<NFormItem label="6#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" path="pipe06">
- <NInput v-model:value="model.pipe06" placeholder="璇疯緭鍏�6#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" />
+ <NInputNumber v-model:value="model.pipe06" placeholder="璇疯緭鍏�6#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" class="w-full" />
</NFormItem>
<NFormItem label="7#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" path="pipe07">
- <NInput v-model:value="model.pipe07" placeholder="璇疯緭鍏�7#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" />
+ <NInputNumber v-model:value="model.pipe07" placeholder="璇疯緭鍏�7#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" class="w-full" />
</NFormItem>
<NFormItem label="8#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" path="pipe08">
- <NInput v-model:value="model.pipe08" placeholder="璇疯緭鍏�8#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" />
+ <NInputNumber v-model:value="model.pipe08" placeholder="璇疯緭鍏�8#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" class="w-full" />
</NFormItem>
<NFormItem label="9#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" path="pipe09">
- <NInput v-model:value="model.pipe09" placeholder="璇疯緭鍏�9#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" />
+ <NInputNumber v-model:value="model.pipe09" placeholder="璇疯緭鍏�9#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" class="w-full" />
</NFormItem>
<NFormItem label="10#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" path="pipe10">
- <NInput v-model:value="model.pipe10" placeholder="璇疯緭鍏�10#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" />
+ <NInputNumber v-model:value="model.pipe10" placeholder="璇疯緭鍏�10#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" class="w-full" />
</NFormItem>
<NFormItem label="11#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" path="pipe11">
- <NInput v-model:value="model.pipe11" placeholder="璇疯緭鍏�11#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" />
+ <NInputNumber v-model:value="model.pipe11" placeholder="璇疯緭鍏�11#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" class="w-full" />
</NFormItem>
<NFormItem label="12#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" path="pipe12">
- <NInput v-model:value="model.pipe12" placeholder="璇疯緭鍏�12#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" />
+ <NInputNumber v-model:value="model.pipe12" placeholder="璇疯緭鍏�12#鏈虹粍瀵瑰簲鐨勫杺涓濇満鍜岀閬�" class="w-full" />
</NFormItem>
<NFormItem label="鍠備笣鏈虹姸鎬� 1-杩炴帴 0-鏂紑" path="wsjState">
- <NInput v-model:value="model.wsjState" placeholder="璇疯緭鍏ュ杺涓濇満鐘舵�� 1-杩炴帴 0-鏂紑" />
+ <NInputNumber v-model:value="model.wsjState" placeholder="璇疯緭鍏ュ杺涓濇満鐘舵�� 1-杩炴帴 0-鏂紑" class="w-full" />
</NFormItem>
<NFormItem label="鐝" path="shift">
- <NInput v-model:value="model.shift" placeholder="璇疯緭鍏ョ彮娆�" />
+ <NInputNumber v-model:value="model.shift" placeholder="璇疯緭鍏ョ彮娆�" class="w-full" />
</NFormItem>
<NFormItem label="鏈哄彴" path="equNo">
- <NInput v-model:value="model.equNo" placeholder="璇疯緭鍏ユ満鍙�" />
+ <NInputNumber v-model:value="model.equNo" placeholder="璇疯緭鍏ユ満鍙�" class="w-full" />
</NFormItem>
<NFormItem label="澶囨敞" path="remark">
<NInput v-model:value="model.remark" placeholder="璇疯緭鍏ュ娉�" />
--
Gitblit v1.9.3