From 2cc5a1afe8296d148f0a32989395d538e5323a8e Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期四, 18 一月 2024 16:22:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/om/productionOrde/planStatistics.vue | 41 +++--------------------------------------
1 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/jcdm-ui/src/views/main/om/productionOrde/planStatistics.vue b/jcdm-ui/src/views/main/om/productionOrde/planStatistics.vue
index 8971d25..3ab59dc 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/planStatistics.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/planStatistics.vue
@@ -8,17 +8,8 @@
<el-form-item label-width="80" label="鐢熶骇璁㈠崟" prop="workOrderNo">
<el-input v-model="queryParams.workOrderNo" placeholder="璇疯緭鍏ョ敓浜ц鍗�" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
-<!-- <el-form-item label="浜у搧鍚嶇О" prop="productName">-->
-<!-- <el-input v-model="queryParams.productName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" clearable @keyup.enter.native="handleQuery"/>-->
-<!-- </el-form-item>-->
- <el-form-item label="宸ュ崟鐘舵��" prop="orderStatus">
- <el-select v-model="queryParams.orderStatus" placeholder="璇烽�夋嫨宸ュ崟鐘舵��" clearable>
- <el-option
- v-for="dict in dict.type.order_state"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"/>
- </el-select>
+ <el-form-item label="鏈哄瀷" prop="typeZ">
+ <el-input v-model="queryParams.typeZ" placeholder="璇疯緭鍏ユ満鍨�" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -29,24 +20,6 @@
<el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px">
<el-form-item style="margin-left: 14px" label="浜у搧缂栧彿" prop="productCode">
<el-input v-model="queryParams.productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" clearable @keyup.enter.native="handleQuery"/>
- </el-form-item>
- <el-form-item label="璁㈠崟缂栧彿" prop="salesOrderCode">
- <el-input v-model="queryParams.salesOrderCode" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" clearable @keyup.enter.native="handleQuery"/>
- </el-form-item>
- <el-form-item label="杞﹂棿缂栧彿" prop="workshopCode">
- <el-input v-model="queryParams.workshopCode" placeholder="璇疯緭鍏ヨ溅闂寸紪鍙�" clearable @keyup.enter.native="handleQuery"/>
- </el-form-item>
- <el-form-item label="浜х嚎缂栧彿" prop="lineCode">
- <el-input v-model="queryParams.lineCode" placeholder="璇疯緭鍏ヤ骇绾跨紪鍙�" clearable @keyup.enter.native="handleQuery"/>
- </el-form-item>
- <el-form-item style="margin-left: 7px" label-width="80" label="浜у搧BOM" prop="bomCode">
- <el-input v-model="queryParams.bomCode" placeholder="璇疯緭鍏ヤ骇鍝丅OM" clearable @keyup.enter.native="handleQuery"/>
- </el-form-item>
- <el-form-item label="宸ヨ壓娴佺▼" prop="routeCode">
- <el-input v-model="queryParams.routeCode" placeholder="璇疯緭鍏ュ伐鑹烘祦绋�" clearable @keyup.enter.native="handleQuery"/>
- </el-form-item>
- <el-form-item label="宸ヨ壓閰嶆柟" prop="recipeCode">
- <el-input v-model="queryParams.recipeCode" placeholder="璇疯緭鍏ュ伐鑹洪厤鏂�" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
</el-form>
</el-card>
@@ -61,12 +34,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鐢熶骇閫氱煡鍗曞彿" width="160" align="center" prop="productionNotice">
</el-table-column>
- <el-table-column label="鐢熶骇璁㈠崟" width="160" align="center">
- <template slot-scope="scope">
- <router-link :to="{path: '/main/workReport-data/index/', query: {workOrderNo: scope.row.workOrderNo} }" class="link-type">
- <span>{{ scope.row.workOrderNo }}</span>
- </router-link>
- </template>
+ <el-table-column label="鐢熶骇璁㈠崟" width="160" align="center" prop="workOrderNo">
</el-table-column>
<el-table-column label="鏈哄瀷" width="160" align="center" prop="typeZ">
</el-table-column>
@@ -89,11 +57,8 @@
</el-table-column>
<el-table-column label="鍚堟牸鐜�" width="160" align="center">
</el-table-column>
- <el-table-column label="淇濆瓨鏃堕棿" width="160" align="center">
- </el-table-column>
</el-table>
</el-card>
-
<pagination
v-show="total>0"
--
Gitblit v1.9.3