From d52b2bdc62a5722a96d3999a9ed96640f3945f91 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 八月 2023 18:14:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web_standard/src/components/business/OperaWorkPlansWindow.vue | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/web_standard/src/components/business/OperaWorkPlansWindow.vue b/web_standard/src/components/business/OperaWorkPlansWindow.vue
index b7aa52f..e198f7d 100644
--- a/web_standard/src/components/business/OperaWorkPlansWindow.vue
+++ b/web_standard/src/components/business/OperaWorkPlansWindow.vue
@@ -5,8 +5,8 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <el-form :model="form" ref="form" :rules="rules">
- <el-form-item label="宸ュ巶锛�" prop="factoryId">
+ <el-form :model="form" ref="form" label-suffix="锛�" :rules="rules">
+ <el-form-item label="宸ュ巶" prop="factoryId">
<el-select v-model="form.factoryId" placeholder="璇烽�夋嫨宸ュ巶" :disabled="isEdit" filterable clearable @change="selectFactoey(form.factoryId, false)">
<el-option
v-for="item in factories()"
@@ -17,7 +17,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐗╂枡淇℃伅锛�" prop="materialId">
+ <el-form-item label="鐗╂枡淇℃伅" prop="materialId">
<!-- @change="selectMaterial(form.materialId, false)" -->
<el-select v-model="form.materialId" clearable filterable placeholder="璇烽�夋嫨">
<el-option
@@ -28,21 +28,32 @@
></el-option>
</el-select>
</el-form-item>
- <el-form-item label="璁″垝鏃ユ湡锛�" prop="planDate">
+ <el-form-item label="璁″垝寮�濮嬫棩鏈�" prop="planDate">
<el-date-picker
v-model="form.planDate"
value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨璁″垝鏃ユ湡"
+ placeholder="璇烽�夋嫨璁″垝寮�濮嬫棩鏈�"
:picker-options="pickerOptions"
></el-date-picker>
</el-form-item>
- <el-form-item label="璁″垝鏁伴噺:" prop="num">
+ <el-form-item label="璁″垝缁撴潫鏃ユ湡" prop="planDate">
+ <el-date-picker
+ v-model="form.planDate"
+ value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨璁″垝缁撴潫鏃ユ湡"
+ :picker-options="pickerOptions"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item label="璁″垝鏁伴噺" prop="num">
<el-input v-model="form.num" placeholder="璇疯緭鍏�" max="10" v-trim/>
</el-form-item>
<el-form-item label="鐢熶骇鎵规鍙�" prop="batch">
<el-input v-model="form.batch" placeholder="璇疯緭鍏�" max="30" v-trim/>
</el-form-item>
- <el-form-item label="浼樺厛绾э細" prop="urgent">
+ <el-form-item label="閿�鍞鍗�" prop="urgent">
+ <el-input v-model="form.urgent" placeholder="璇疯緭鍏�" max="4" v-trim/>
+ </el-form-item>
+ <el-form-item label="浼樺厛绾�" prop="urgent">
<el-input v-model="form.urgent" placeholder="璇疯緭鍏�" max="4" v-trim/>
</el-form-item>
</el-form>
@@ -108,6 +119,7 @@
api: '/business/workPlans',
'field.id': 'id'
})
+ this.form.planDate = new Date()
this.pickerOptions.disabledDate = (time) => {
// 涓�澶�
let tempTime = 3600 * 1000 * 24
@@ -237,4 +249,7 @@
}
}
}
+/**
+ *
+ */
</script>
--
Gitblit v1.9.3