From 105d6b807d69eb95b3426f5cf6e87a8ff7b0611c Mon Sep 17 00:00:00 2001
From: 吴健 <14790700720@163.com>
Date: 星期三, 14 五月 2025 10:34:45 +0800
Subject: [PATCH] first-add
---
billion-ui/src/views/main/om/info/index.vue | 324 ++++++++++++++++++++++++++++-------------------------
1 files changed, 170 insertions(+), 154 deletions(-)
diff --git a/billion-ui/src/views/main/om/info/index.vue b/billion-ui/src/views/main/om/info/index.vue
index 567066b..b6010cb 100644
--- a/billion-ui/src/views/main/om/info/index.vue
+++ b/billion-ui/src/views/main/om/info/index.vue
@@ -2,22 +2,22 @@
<div class="app-container">
<div>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
- <el-form-item label="宸ュ崟缂栧彿" prop="workOrderNo">
- <el-input
- v-model="queryParams.workOrderNo"
- 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="workOrderNo">-->
+<!-- <el-input-->
+<!-- v-model="queryParams.workOrderNo"-->
+<!-- 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="productCode">
<el-input
v-model="queryParams.productCode"
@@ -26,16 +26,16 @@
@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_status"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </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_status"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.label"-->
+<!-- :value="dict.value"-->
+<!-- />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item style="float: right; margin-right: 90px">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -88,25 +88,25 @@
v-hasPermi="['main:info:export']"
>瀵煎嚭</el-button>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-receiving"
- size="mini"
- @click="handleReceive"
- >鎺ユ敹宸ュ崟</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- :disabled="multiple"
- icon="el-icon-magic-stick"
- size="mini"
- @click="handleCreate"
- >鐢熸垚</el-button>
- </el-col>
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="primary"-->
+<!-- plain-->
+<!-- icon="el-icon-receiving"-->
+<!-- size="mini"-->
+<!-- @click="handleReceive"-->
+<!-- >鎺ユ敹宸ュ崟</el-button>-->
+<!-- </el-col>-->
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="primary"-->
+<!-- plain-->
+<!-- :disabled="multiple"-->
+<!-- icon="el-icon-magic-stick"-->
+<!-- size="mini"-->
+<!-- @click="handleCreate"-->
+<!-- >鐢熸垚</el-button>-->
+<!-- </el-col>-->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
</el-row>
</div>
@@ -114,32 +114,32 @@
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo" width="120">
- <template slot-scope="scope">
- <a style="color: #7099F9" @click="orderDetail(scope.row.workOrderNo)" >{{scope.row.workOrderNo}}
- </a>
-<!-- <div @click="orderDetail(scope.row.workOrderNo)">{{scope.row.workOrderNo}}</div>-->
- </template>
- </el-table-column>
- <el-table-column label="璁㈠崟缂栧彿" align="center" prop="salesOrderCode" width="120"/>
+<!-- <el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo" width="120">-->
+<!-- <template slot-scope="scope">-->
+<!-- <a style="color: #7099F9" @click="orderDetail(scope.row.workOrderNo)" >{{scope.row.workOrderNo}}-->
+<!-- </a>-->
+<!--<!– <div @click="orderDetail(scope.row.workOrderNo)">{{scope.row.workOrderNo}}</div>–>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="璁㈠崟缂栧彿" align="center" prop="salesOrderCode" width="120"/>-->
<el-table-column label="浜у搧缂栧彿" align="center" prop="productCode" width="180"/>
- <el-table-column label="浜х嚎缂栧彿" align="center" prop="lineCode" />
+<!-- <el-table-column label="浜х嚎缂栧彿" align="center" prop="lineCode" />-->
<el-table-column label="璁″垝鏁伴噺" align="center" prop="planQty" />
<el-table-column label="璁″垝寮�濮嬫椂闂�" align="center" prop="planStartTime" width="120">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
- <el-table-column label="璁″垝缁撴潫鏃堕棿" align="center" prop="planEndTime" width="120">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="宸ュ崟鐘舵��" align="center" prop="orderStatus">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>
- </template>
- </el-table-column>
+<!-- <el-table-column label="璁″垝缁撴潫鏃堕棿" align="center" prop="planEndTime" width="120">-->
+<!-- <template slot-scope="scope">-->
+<!-- <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="宸ュ崟鐘舵��" align="center" prop="orderStatus">-->
+<!-- <template slot-scope="scope">-->
+<!-- <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -160,20 +160,29 @@
<!-- 娣诲姞鎴栦慨鏀圭敓浜у伐鍗曞璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-form-item label="宸ュ崟缂栧彿" prop="workOrderNo">
- <el-input v-model="form.workOrderNo" placeholder="璇疯緭鍏ュ伐鍗曠紪鍙�" />
- </el-form-item>
- <el-form-item label="璁㈠崟缂栧彿" prop="salesOrderCode">
- <el-input v-model="form.salesOrderCode" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" />
- </el-form-item>
+<!-- <el-form-item label="宸ュ崟缂栧彿" prop="workOrderNo">-->
+<!-- <el-input v-model="form.workOrderNo" placeholder="璇疯緭鍏ュ伐鍗曠紪鍙�" />-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="璁㈠崟缂栧彿" prop="salesOrderCode">-->
+<!-- <el-input v-model="form.salesOrderCode" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" />-->
+<!-- </el-form-item>-->
+
<el-form-item label="浜у搧缂栧彿" prop="productCode">
- <el-input v-model="form.productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" />
+ <el-select v-model="form.productCode" placeholder="璇烽�夋嫨浜у搧缂栧彿" clearable>
+ <el-option
+ v-for="dict in dict.type.product_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
- <el-form-item label="浜х嚎缂栧彿" prop="lineCode">
- <el-input v-model="form.lineCode" placeholder="璇疯緭鍏ヤ骇绾跨紪鍙�" />
- </el-form-item>
+<!-- <el-form-item label="浜х嚎缂栧彿" prop="lineCode">-->
+<!-- <el-input v-model="form.lineCode" placeholder="璇疯緭鍏ヤ骇绾跨紪鍙�" />-->
+<!-- </el-form-item>-->
+
<el-form-item label="璁″垝鏁伴噺" prop="planQty">
- <el-input v-model="form.planQty" placeholder="璇疯緭鍏ヨ鍒掓暟閲�" />
+ <el-input-number v-model="form.planQty" controls-position="right" :min="1" :max="10000"></el-input-number>
</el-form-item>
<el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planStartTime">
<el-date-picker clearable
@@ -183,23 +192,23 @@
placeholder="璇烽�夋嫨璁″垝寮�濮嬫椂闂�">
</el-date-picker>
</el-form-item>
- <el-form-item label="璁″垝缁撴潫鏃堕棿" prop="planEndTime">
- <el-date-picker clearable
- v-model="form.planEndTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨璁″垝缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="宸ュ崟鐘舵��" prop="orderStatus" v-if = updateFlag>
- <el-radio-group v-model="form.orderStatus">
- <el-radio
- v-for="dict in dict.type.order_status"
- :key="dict.value"
- :label="dict.value"
- >{{dict.label}}</el-radio>
- </el-radio-group>
- </el-form-item>
+<!-- <el-form-item label="璁″垝缁撴潫鏃堕棿" prop="planEndTime">-->
+<!-- <el-date-picker clearable-->
+<!-- v-model="form.planEndTime"-->
+<!-- type="date"-->
+<!-- value-format="yyyy-MM-dd"-->
+<!-- placeholder="璇烽�夋嫨璁″垝缁撴潫鏃堕棿">-->
+<!-- </el-date-picker>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="宸ュ崟鐘舵��" prop="orderStatus" v-if = updateFlag>-->
+<!-- <el-radio-group v-model="form.orderStatus">-->
+<!-- <el-radio-->
+<!-- v-for="dict in dict.type.order_status"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.value"-->
+<!-- >{{dict.label}}</el-radio>-->
+<!-- </el-radio-group>-->
+<!-- </el-form-item>-->
<el-form-item label="澶囨敞" prop="remarks">
<el-input
type="textarea"
@@ -216,56 +225,56 @@
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
- <el-dialog
- title="宸ュ崟璇︽儏"
- :visible.sync="detailVisible"
- width="80%"
- center>
- <el-table v-loading="detailLoading" :data="schedulingList">
- <el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo" />
- <el-table-column label="鎬绘垚搴忓垪鍙�" width="180px" align="center" prop="sfcCode" />
- <el-table-column label="浜у搧缂栫爜" align="center" prop="productCode" />
- <el-table-column label="涓婄嚎鏃堕棿" align="center" prop="onlineTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.onlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="涓嬬嚎鏃堕棿" align="center" prop="offlineTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.offlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="璐ㄩ噺鐘舵��" align="center" prop="qualityStatus">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.product_status" :value="scope.row.qualityStatus"/>
- </template>
- </el-table-column>
- <el-table-column label="鐘舵��" align="center" prop="status">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.status" :value="scope.row.status"/>
- </template>
- </el-table-column>
- <el-table-column label="鏇存柊鐢ㄦ埛" align="center" prop="updateBy" />
- <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- </template>
- </el-table-column>
- <el-table-column label="澶囨敞" width="180px" show-overflow-tooltip align="center" prop="remarks" />
- </el-table>
+<!-- <el-dialog-->
+<!-- title="宸ュ崟璇︽儏"-->
+<!-- :visible.sync="detailVisible"-->
+<!-- width="80%"-->
+<!-- center>-->
+<!-- <el-table v-loading="detailLoading" :data="schedulingList">-->
+<!-- <el-table-column label="宸ュ崟缂栧彿" align="center" prop="workOrderNo" />-->
+<!-- <el-table-column label="鎬绘垚搴忓垪鍙�" width="180px" align="center" prop="sfcCode" />-->
+<!-- <el-table-column label="浜у搧缂栫爜" align="center" prop="productCode" />-->
+<!-- <el-table-column label="涓婄嚎鏃堕棿" align="center" prop="onlineTime" width="180">-->
+<!-- <template slot-scope="scope">-->
+<!-- <span>{{ parseTime(scope.row.onlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="涓嬬嚎鏃堕棿" align="center" prop="offlineTime" width="180">-->
+<!-- <template slot-scope="scope">-->
+<!-- <span>{{ parseTime(scope.row.offlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="璐ㄩ噺鐘舵��" align="center" prop="qualityStatus">-->
+<!-- <template slot-scope="scope">-->
+<!-- <dict-tag :options="dict.type.product_status" :value="scope.row.qualityStatus"/>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鐘舵��" align="center" prop="status">-->
+<!-- <template slot-scope="scope">-->
+<!-- <dict-tag :options="dict.type.status" :value="scope.row.status"/>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鏇存柊鐢ㄦ埛" align="center" prop="updateBy" />-->
+<!-- <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="180">-->
+<!-- <template slot-scope="scope">-->
+<!-- <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="澶囨敞" width="180px" show-overflow-tooltip align="center" prop="remarks" />-->
+<!-- </el-table>-->
- <pagination
- v-show="detailTotal>0"
- :total="detailTotal"
- :page.sync="queryDetailParams.pageNum"
- :limit.sync="queryDetailParams.pageSize"
- @pagination="getDetail"
- />
- <span slot="footer" class="dialog-footer">
-<!-- <el-button @click="detailVisible = false">鍙� 娑�</el-button>-->
-<!-- <el-button type="primary" @click="detailVisible = false">纭� 瀹�</el-button>-->
- </span>
- </el-dialog>
+<!-- <pagination-->
+<!-- v-show="detailTotal>0"-->
+<!-- :total="detailTotal"-->
+<!-- :page.sync="queryDetailParams.pageNum"-->
+<!-- :limit.sync="queryDetailParams.pageSize"-->
+<!-- @pagination="getDetail"-->
+<!-- />-->
+<!-- <span slot="footer" class="dialog-footer">-->
+<!--<!– <el-button @click="detailVisible = false">鍙� 娑�</el-button>–>-->
+<!--<!– <el-button type="primary" @click="detailVisible = false">纭� 瀹�</el-button>–>-->
+<!-- </span>-->
+<!-- </el-dialog>-->
</div>
</template>
@@ -276,7 +285,7 @@
export default {
name: "Info",
- dicts: ['order_status','product_status', 'status'],
+ dicts: ['order_status','product_status', 'status', 'product_type'],
data() {
return {
schedulingList: [],
@@ -321,27 +330,27 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
- workOrderNo: [
- { required: true, message: "宸ュ崟缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
- ],
- salesOrderCode: [
- { required: true, message: "璁㈠崟缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
- ],
+ // workOrderNo: [
+ // { required: true, message: "宸ュ崟缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
+ // ],
+ // salesOrderCode: [
+ // { required: true, message: "璁㈠崟缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
+ // ],
productCode: [
{ required: true, message: "浜у搧缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
],
- lineCode: [
- { required: true, message: "浜х嚎缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
- ],
+ // lineCode: [
+ // { required: true, message: "浜х嚎缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
+ // ],
planQty: [
{ required: true, message: "璁″垝鏁伴噺涓嶈兘涓虹┖", trigger: "blur" }
],
planStartTime: [
{ required: true, message: "璁″垝寮�濮嬫椂闂翠笉鑳戒负绌�", trigger: "blur" }
],
- planEndTime: [
- { required: true, message: "璁″垝缁撴潫鏃堕棿涓嶈兘涓虹┖", trigger: "blur" }
- ],
+ // planEndTime: [
+ // { required: true, message: "璁″垝缁撴潫鏃堕棿涓嶈兘涓虹┖", trigger: "blur" }
+ // ],
}
};
},
@@ -449,6 +458,13 @@
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
+ if (this.form.planQty !== null && this.form.planQty !== ''){
+ var p = /^\d+$/
+ if (!p.test(this.form.planQty)){
+ this.$modal.msgError("鏁伴噺璇疯緭鍏ユ鏁存暟");
+ return
+ }
+ }
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
--
Gitblit v1.9.3