From 52108a651417e8763194c91227aafb12195b96ac Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期二, 16 一月 2024 14:07:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index fbc7e84..5bc4ecd 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -21,7 +21,6 @@
</el-select>
</el-form-item>
<el-form-item style="float: right">
- <el-button type="warning" icon="el-icon-download" size="mini" @click="getProductionNotice">鎺ユ敹</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">楂樼骇鏌ヨ</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -96,25 +95,34 @@
v-hasPermi="['om:productionOrde:export']"
>瀵煎嚭</el-button>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-upload2"
- :disabled="move"
- size="mini"
- @click="moveUp(val => val, 'up')"
- >涓婄Щ</el-button>
- </el-col>
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="warning"-->
+<!-- plain-->
+<!-- icon="el-icon-upload2"-->
+<!-- :disabled="move"-->
+<!-- size="mini"-->
+<!-- @click="moveUp(val => val, 'up')"-->
+<!-- >涓婄Щ</el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="warning"-->
+<!-- plain-->
+<!-- icon="el-icon-download"-->
+<!-- size="mini"-->
+<!-- :disabled="move"-->
+<!-- @click="moveUp(val => val, 'down')"-->
+<!-- >涓嬬Щ</el-button>-->
+<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
- :disabled="move"
- @click="moveUp(val => val, 'down')"
- >涓嬬Щ</el-button>
+ @click="getProductionNotice"
+ >鎺ユ敹</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@@ -146,7 +154,7 @@
</el-table-column>
<el-table-column label="闇�姹傛暟閲�" align="center" prop="planQty">
</el-table-column>
- <el-table-column label="浜у搧缂栧彿" width="140" align="center" prop="productCode">
+ <el-table-column label="浜у搧缂栧彿" width="150" align="center" prop="productCode">
</el-table-column>
<!-- <el-table-column label="瀹為檯鏁伴噺" width="160" align="center" prop="actualQty">-->
<!-- </el-table-column>-->
@@ -357,7 +365,7 @@
<el-input v-model="form.dateTimeRule"/>
</el-form-item>
<el-form-item label="璧峰缂栧彿" prop="startCode">
- <el-input type="number" v-model="form.startCode" placeholder="璇疯緭鍏ヨ捣濮嬬紪鍙�" @input="handleCodeChange"/>
+ <el-input type="number" :maxlength="3" :pattern="'[0-9]{3}'" v-model="form.startCode" placeholder="璇疯緭鍏ヨ捣濮嬬紪鍙�" @input="handleCodeChange"/>
</el-form-item>
<el-form-item label="璧锋缂栧彿" prop="startEndCode">
<el-input disabled v-model="form.startEndCode"/>
--
Gitblit v1.9.3