Commit 1f24c6c6 authored by TZW's avatar TZW

Merge branch 'master' of http://47.100.234.193:9527/wuhao/ems3.3

parents d5337983 bea19842
...@@ -28,7 +28,7 @@ const keepalive = getList(authRoutes) ...@@ -28,7 +28,7 @@ const keepalive = getList(authRoutes)
//console.log(keepalive); //console.log(keepalive);
export default defineConfig({ export default defineConfig({
outputPath: 'package', outputPath: 'static',
hash: true, hash: true,
antd: { antd: {
compact: true, compact: true,
......
...@@ -168,6 +168,7 @@ function Plan(props) { ...@@ -168,6 +168,7 @@ function Plan(props) {
item: row, item: row,
title: '调整日期', title: '调整日期',
val: 'detailaddon', val: 'detailaddon',
type: "delay",
id: row?.id id: row?.id
})); }));
} }
...@@ -511,7 +512,7 @@ function Plan(props) { ...@@ -511,7 +512,7 @@ function Plan(props) {
fields={editDateColumns} fields={editDateColumns}
defaultFormValue={{ checkCycle: drawer?.item?.checkCycle }} defaultFormValue={{ checkCycle: drawer?.item?.checkCycle }}
onFinish={async (vals) => { onFinish={async (vals) => {
await runAsync({ url: "/check/umEquipmentCheckPlan/adjustDate", params: { ...vals, id: drawer?.item?.id } }); await runAsync({ url: drawer?.type == "delay" ? "/check/umEquipmentCheckPlan/enable" : "/check/umEquipmentCheckPlan/adjustDate", params: { ...vals, id: drawer?.item?.id, checkEnable: 1 } });
}} }}
/> />
......
...@@ -201,7 +201,7 @@ function Task(props) { ...@@ -201,7 +201,7 @@ function Task(props) {
: :
<InputNumber onChange={(value) => { <InputNumber onChange={(value) => {
row.result = value; row.result = value;
}} min={row.lowerLimit} max={row.upperLimit} /> }} />
} }
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment