From b6c635aca8133bb846d8e251d72d7bc52211f079 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期四, 18 一月 2024 16:22:42 +0800
Subject: [PATCH] 车间导入
---
jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index aefd1b7..bffea93 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -60,6 +60,7 @@
:value="dict.value"/>
</el-select>
</el-form-item>
+ <br/>
<el-form-item label="鍚堢鎶ュ伐" prop="report10">
<el-input
v-model="queryParams.report10"
@@ -84,9 +85,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <br/>
<el-form-item label="鎿嶄綔鏃堕棿" prop="operateTime">
<el-date-picker
- v-model="queryParams.operateTime"
+ v-model="queryParams.dateConditions"
type="datetimerange"
:picker-options="pickerOptions"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -155,7 +157,9 @@
</el-table-column>
<el-table-column label="浜у搧绫诲瀷" align="center" prop="productType">
-
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.material_type" :value="scope.row.productType"/>
+ </template>
</el-table-column>
<el-table-column label="鏈哄瀷" align="center" prop="model">
@@ -368,7 +372,7 @@
export default {
name: "OrderScheduling",
- dicts: ['order_scheduling_produce_status','quality_status','print_status'],
+ dicts: ['order_scheduling_produce_status','quality_status','print_status','material_type'],
data() {
return {
// 閬僵灞�
@@ -409,7 +413,7 @@
combinedBoxTime: null,
finalAssemblyTime: null,
operator: null,
- operateTime: '',
+ operateTime: null,
status: null,
spareField1: null,
spareField2: null,
@@ -417,7 +421,8 @@
spareField4: null,
createUser: null,
updateUser: null,
- remarks: null
+ remarks: null,
+ dateConditions: [],
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -470,6 +475,7 @@
/** 鏌ヨ璁㈠崟鎺掍骇鍒楄〃 */
getList() {
this.loading = true;
+ console.log(this.queryParams)
listOrderScheduling(this.queryParams).then(response => {
this.orderSchedulingList = response.rows;
this.total = response.total;
@@ -516,8 +522,8 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- // this.queryParams.pageNum = 1;
- // this.getList();
+ this.queryParams.pageNum = 1;
+ this.getList();
this.$modal.msgSuccess(this.queryParams.operateTime);
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3