From 706d57aa682845cf1bc01cbfd1087c4c0f33093f Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 12 十一月 2024 09:46:48 +0800
Subject: [PATCH] 优化
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 176 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 9450447..6d309f4 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -2,14 +2,14 @@
<div class="app-container">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <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-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="productCode">
<el-input
v-model="queryParams.productCode"
@@ -18,42 +18,42 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label-width="80" label="PACK鐮�" prop="productNum">
+ <el-form-item label-width="100" label="浜у搧搴忓垪鍙�" prop="productNum">
<el-input
v-model="queryParams.productNum"
- placeholder="璇疯緭鍏ACK鐮�"
+ placeholder="璇疯緭鍏ヤ骇鍝佸簭鍒楀彿鐮�"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="灏忚溅鐮�" prop="trolleyYard">
+ <el-form-item label="澹充綋鏉＄爜" prop="trolleyYard">
<el-input
v-model="queryParams.trolleyYard"
- placeholder="璇疯緭鍏ュ皬杞︾爜"
+ placeholder="璇疯緭鍏ュ３浣撴潯鐮�"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label-width="1" label="涓婄嚎鎶ュ伐鐘舵��" prop="onlineCompletionMark">
- <el-select v-model="queryParams.onlineCompletionMark" placeholder="璇烽�夋嫨涓婄嚎鎶ュ伐鐘舵��" clearable>
- <el-option
- v-for="dict in dict.type.work_reporting_status"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label-width="1" label="涓嬬嚎鎶ュ伐鐘舵��" prop="sfResult">
- <el-select v-model="queryParams.sfResult" placeholder="璇烽�夋嫨涓嬬嚎鎶ュ伐鐘舵��" clearable>
- <el-option
- v-for="dict in dict.type.work_reporting_status"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
+<!-- <el-form-item label-width="1" label="涓婄嚎鎶ュ伐鐘舵��" prop="onlineCompletionMark">-->
+<!-- <el-select v-model="queryParams.onlineCompletionMark" placeholder="璇烽�夋嫨涓婄嚎鎶ュ伐鐘舵��" clearable>-->
+<!-- <el-option-->
+<!-- v-for="dict in dict.type.work_reporting_status"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.label"-->
+<!-- :value="dict.value"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label-width="1" label="涓嬬嚎鎶ュ伐鐘舵��" prop="sfResult">-->
+<!-- <el-select v-model="queryParams.sfResult" placeholder="璇烽�夋嫨涓嬬嚎鎶ュ伐鐘舵��" clearable>-->
+<!-- <el-option-->
+<!-- v-for="dict in dict.type.work_reporting_status"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.label"-->
+<!-- :value="dict.value"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<div style="display: none">
<div id="printMe" style="width: 500px;">
@@ -107,37 +107,37 @@
<el-card style="margin-top: 10px" class="box-card">
<el-row :gutter="10" class="mb8">
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="primary"-->
-<!-- plain-->
-<!-- icon="el-icon-plus"-->
-<!-- size="mini"-->
-<!-- @click="handleAdd"-->
-<!-- v-hasPermi="['om:productionOrde:add']"-->
-<!-- >鏂板</el-button>-->
-<!-- </el-col>-->
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="success"-->
-<!-- plain-->
-<!-- icon="el-icon-edit"-->
-<!-- size="mini"-->
-<!-- :disabled="single"-->
-<!-- @click="handleUpdate"-->
-<!-- v-hasPermi="['om:productionOrde:edit']"-->
-<!-- >淇敼</el-button>-->
-<!-- </el-col>-->
-<!-- <el-col :span="1.5">-->
-<!--<!– <el-button–>-->
-<!--<!– type="danger"–>-->
-<!--<!– plain–>-->
-<!--<!– icon="el-icon-delete"–>-->
-<!--<!– size="mini"–>-->
-<!--<!– :disabled="multiple"–>-->
-<!--<!– @click="handleDelete"–>-->
-<!--<!– v-hasPermi="['om:productionOrde:remove']"–>-->
-<!--<!– >鍒犻櫎</el-button>–>-->
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['om:productionOrde:add']"
+ >鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="success"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleUpdate"
+ v-hasPermi="['om:productionOrde:edit']"
+ >淇敼</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['om:productionOrde:remove']"
+ >鍒犻櫎</el-button>
<!-- <el-button-->
<!-- type="info"-->
<!-- icon="el-icon-upload2"-->
@@ -155,7 +155,7 @@
<!-- v-hasPermi="['om:productionOrde:export']"-->
<!-- >瀵煎嚭</el-button>-->
<!-- </el-col>-->
- <el-col :span="1.5">
+<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@@ -173,8 +173,8 @@
:disabled="single"
@click="patchwork"
>琛ユ墦</el-button>
- </el-col>
- <el-col :span="1.5">
+ </el-col>-->
+<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@@ -193,7 +193,7 @@
:disabled="offlineSingle"
@click="offlineWorkReporting"
>涓嬬嚎鎶ュ伐</el-button>
- </el-col>
+ </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
@@ -203,7 +203,7 @@
<!-- :disabled="single"-->
<!-- @click="jieBang"-->
<!-- >瑙ｇ粦</el-button>-->
-<!-- </el-col>-->
+ </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -219,11 +219,11 @@
<!-- <el-table-column label="璁㈠崟缂栧彿" width="140" align="center" prop="salesOrderCode">-->
<!-- </el-table-column>-->
- <el-table-column :show-overflow-tooltip='true' label="浜у搧搴忓垪鍙�" width="220" align="center" prop="productNum">
+ <el-table-column :show-overflow-tooltip='true' label="浜у搧搴忓垪鍙�" width="200" align="center" prop="productNum">
</el-table-column>
<el-table-column label="鐢熶骇宸ュ崟鍙�" width="160" align="center" prop="workOrderNo">
</el-table-column>
- <el-table-column :show-overflow-tooltip='true' label="澹充綋鏉＄爜" width="180" align="center" prop="trolleyYard">
+ <el-table-column :show-overflow-tooltip='true' label="澹充綋鏉＄爜" width="250" align="center" prop="trolleyYard">
</el-table-column>
<el-table-column label="浜у搧缂栫爜" width="110" align="center" prop="productCode">
</el-table-column>
@@ -233,11 +233,11 @@
</el-table-column>
<el-table-column label="浜у搧鍚嶇О" width="120" align="center" prop="productName">
</el-table-column>
- <el-table-column label="瀹為檯寮�濮嬫椂闂�" width="160" align="center" prop="actualStartTime">
+ <el-table-column label="寮�濮嬫椂闂�" width="160" align="center" prop="actualStartTime">
</el-table-column>
- <el-table-column label="瀹為檯寮�濮嬫椂闂�" width="160" align="center" prop="actualEndTime">
+ <el-table-column label="缁撴潫鏃堕棿" width="160" align="center" prop="actualEndTime">
</el-table-column>
- <el-table-column label="涓婄嚎鏄惁鎶ュ伐" align="center" width="120">
+<!-- <el-table-column label="涓婄嚎鏄惁鎶ュ伐" align="center" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.work_reporting_status" :value="scope.row.onlineCompletionMark"/>
</template>
@@ -246,7 +246,7 @@
<template slot-scope="scope">
<dict-tag :options="dict.type.work_reporting_status" :value="scope.row.sfResult"/>
</template>
- </el-table-column>
+ </el-table-column>-->
<el-table-column label="鍒涘缓鏃堕棿" width="160" align="center" prop="createTime">
</el-table-column>
<!-- <el-table-column width="240" fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">-->
@@ -288,23 +288,23 @@
{{titleName}}
</span>
<el-form ref="form" inline :model="form" :rules="rules" label-width="100px">
- <el-form-item label="鐢熶骇宸ュ崟鍙�" prop="workOrderNo">
- <el-input style="width: 265px" v-model="form.workOrderNo" placeholder="璇疯緭鍏ョ敓浜у伐鍗曞彿" />
- </el-form-item>
- <el-form-item label="璁㈠崟缂栧彿" prop="salesOrderCode">
- <el-input style="width: 265px" v-model="form.salesOrderCode" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" />
+ <el-form-item label="鐢熶骇璁㈠崟鍙�" prop="workOrderNo">
+ <el-input style="width: 265px" v-model="form.workOrderNo" placeholder="璇疯緭鍏ョ敓浜ц鍗曞彿" />
</el-form-item>
<el-form-item label="浜у搧搴忓垪鍙�" prop="productNum">
- <el-input v-model="form.productCode" placeholder="璇烽�夋嫨浜у搧" >
- <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
- </el-input>
- <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
+ <el-input style="width: 265px" v-model="form.productNum" placeholder="璇疯緭鍏ヤ骇鍝佸簭鍒楀彿" />
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О" prop="productName">
- <el-input style="width: 265px" v-model="form.productName" disabled placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
- </el-form-item>
- <el-form-item label="浜у搧鍨嬪彿" prop="productModel">
- <el-input v-model="form.productModel" placeholder="璇疯緭鍏ヤ骇鍝佸瀷鍙�" />
+<!-- <el-form-item label="浜у搧搴忓垪鍙�" prop="productNum">-->
+<!-- <el-input v-model="form.productCode" placeholder="璇烽�夋嫨浜у搧" >-->
+<!-- <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>-->
+<!-- </el-input>-->
+<!-- <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="浜у搧鍚嶇О" prop="productName">-->
+<!-- <el-input style="width: 265px" v-model="form.productName" disabled placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />-->
+<!-- </el-form-item>-->
+ <el-form-item label="浜у搧鍨嬪彿" prop="productCode">
+ <el-input v-model="form.productCode" placeholder="璇疯緭鍏ヤ骇鍝佸瀷鍙�" />
</el-form-item>
<el-form-item label="宸ュ巶缂栧彿" prop="siteCode">
<el-input style="width: 265px" v-model="form.siteCode" placeholder="璇疯緭鍏ュ伐鍘傜紪鍙�" />
--
Gitblit v1.9.3