From ae6879a7575f79d814c70781e6efc1b6218f3732 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 14 三月 2025 14:10:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
billion-ui/src/views/main/om/info/index.vue | 246 +++++++++++++++++++++++++++++++++----------------
1 files changed, 166 insertions(+), 80 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..ff5ab08 100644
--- a/billion-ui/src/views/main/om/info/index.vue
+++ b/billion-ui/src/views/main/om/info/index.vue
@@ -26,16 +26,6 @@
@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 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>
@@ -46,16 +36,6 @@
<div style="width: 600px">
<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="['main:info:add']"
- >鏂板</el-button>
- </el-col>
<el-col :span="1.5">
<el-button
type="success"
@@ -69,17 +49,6 @@
</el-col>
<el-col :span="1.5">
<el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['main:info:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
type="warning"
plain
icon="el-icon-download"
@@ -90,62 +59,85 @@
</el-col>
<el-col :span="1.5">
<el-button
- type="primary"
+ type="success"
plain
- icon="el-icon-receiving"
+ icon="el-icon-edit"
size="mini"
- @click="handleReceive"
- >鎺ユ敹宸ュ崟</el-button>
+ :disabled="single"
+ @click="bodyStatus"
+ v-hasPermi="['main:info:edit']"
+ >缂镐綋鏆傚仠\鍚姩</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
- :disabled="multiple"
- icon="el-icon-magic-stick"
+ icon="el-icon-edit"
size="mini"
- @click="handleCreate"
- >鐢熸垚</el-button>
+ :disabled="single"
+ @click="headStatus"
+ v-hasPermi="['main:info:edit']"
+ >缂哥洊鏆傚仠\鍚姩</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="info"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="preStatus"
+ v-hasPermi="['main:info:edit']"
+ >棰勮鏆傚仠\鍚姩</el-button>
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
</el-row>
</div>
-
- <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
+ <el-table border 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="productCode" width="180"/>
- <el-table-column label="浜х嚎缂栧彿" align="center" prop="lineCode" />
+ <el-table-column label="璁㈠崟缂栧彿" align="center" prop="salesOrderCode" />
+ <el-table-column label="浜у搧缂栧彿" align="center" prop="productCode" />
<el-table-column label="璁″垝鏁伴噺" align="center" prop="planQty" />
- <el-table-column label="璁″垝寮�濮嬫椂闂�" align="center" prop="planStartTime" width="120">
+ <el-table-column label="璁″垝寮�濮嬫椂闂�" align="center" prop="planStartTime" >
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
- <el-table-column label="璁″垝缁撴潫鏃堕棿" align="center" prop="planEndTime" width="120">
+ <el-table-column label="璁″垝缁撴潫鏃堕棿" align="center" prop="planEndTime" >
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
- <el-table-column label="宸ュ崟鐘舵��" align="center" prop="orderStatus">
+<!-- <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" >-->
+<!-- <template slot-scope="scope">-->
+<!-- <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}') }}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+ <el-table-column label="缂镐綋涓婄嚎鏁伴噺" align="center" prop="bodyQty" />
+ <el-table-column label="缂哥洊涓婄嚎鏁伴噺" align="center" prop="headQty" />
+ <el-table-column label="棰勮涓婄嚎鏁伴噺" align="center" prop="preQty" />
+ <el-table-column label="缂镐綋宸ュ崟鐘舵��" align="center" prop="bodyStatus" >
<template slot-scope="scope">
- <dict-tag :options="dict.type.order_status" :value="scope.row.orderStatus"/>
+ <dict-tag :options="dict.type.order_status" :value="scope.row.bodyStatus"/>
</template>
</el-table-column>
- <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="180">
+ <el-table-column label="缂哥洊宸ュ崟鐘舵��" align="center" prop="headStatus" >
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+ <dict-tag :options="dict.type.order_status" :value="scope.row.headStatus"/>
</template>
</el-table-column>
- <el-table-column label="鏇存柊鐢ㄦ埛" align="center" prop="updateBy" />
+ <el-table-column label="棰勮宸ュ崟鐘舵��" align="center" prop="preStatus" >
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.order_status" :value="scope.row.preStatus"/>
+ </template>
+ </el-table-column>
<el-table-column label="澶囨敞" width="180px" show-overflow-tooltip align="center" prop="remarks" />
</el-table>
@@ -160,45 +152,51 @@
<!-- 娣诲姞鎴栦慨鏀圭敓浜у伐鍗曞璇濇 -->
<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 label="宸ュ崟缂栧彿" prop="workOrderNo">
+ <el-input disabled v-model="form.workOrderNo" placeholder="璇疯緭鍏ュ伐鍗曠紪鍙�" />
</el-form-item>
- <el-form-item label="璁㈠崟缂栧彿" prop="salesOrderCode">
- <el-input v-model="form.salesOrderCode" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" />
+ <el-form-item label="璁㈠崟缂栧彿" prop="salesOrderCode">
+ <el-input disabled v-model="form.salesOrderCode" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" />
</el-form-item>
- <el-form-item label="浜у搧缂栧彿" prop="productCode">
- <el-input v-model="form.productCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" />
+ <el-form-item label="浜у搧缂栧彿" prop="productCode">
+ <el-input disabled v-model="form.productCode" 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-form-item label="璁″垝鏁伴噺" prop="planQty">
+ <el-input v-model="form.planQty" placeholder="璇疯緭鍏ヨ鍒掓暟閲�" />
</el-form-item>
<el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planStartTime">
<el-date-picker clearable
v-model="form.planStartTime"
- type="date"
- value-format="yyyy-MM-dd"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
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"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
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 label="缂镐綋鏁伴噺" prop="bodyQty">
+ <el-input v-model="form.bodyQty" placeholder="璇疯緭鍏ヨ鍒掓暟閲�" />
+ </el-form-item>
+<!-- <el-form-item label="缂镐綋宸ュ崟鐘舵��" prop="bodyStatus" v-if = updateFlag>-->
+<!-- <el-radio-group v-model="form.bodyStatus">-->
+<!-- <el-radio-->
+<!-- v-for="dict in dict.type.status"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.value"-->
+<!-- >{{dict.label}}</el-radio>-->
+<!-- </el-radio-group>-->
+<!-- </el-form-item>-->
+ <el-form-item label="缂稿鏁伴噺" prop="headStatus">
+ <el-input v-model="form.headStatus" placeholder="璇疯緭鍏ヨ鍒掓暟閲�" />
+ </el-form-item>
+ <el-form-item label="棰勮鏁伴噺" prop="preStatus">
+ <el-input v-model="form.preStatus" placeholder="璇疯緭鍏ヨ鍒掓暟閲�" />
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
<el-input
@@ -330,9 +328,6 @@
productCode: [
{ required: true, message: "浜у搧缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
],
- lineCode: [
- { required: true, message: "浜х嚎缂栧彿涓嶈兘涓虹┖", trigger: "blur" }
- ],
planQty: [
{ required: true, message: "璁″垝鏁伴噺涓嶈兘涓虹┖", trigger: "blur" }
],
@@ -407,6 +402,12 @@
updateBy: null,
remarks: null,
delFlag: null,
+ bodyQty: null,
+ headQty: null,
+ preQty: null,
+ bodyStatus :null,
+ headStatus :null,
+ preStatus :null,
};
this.resetForm("form");
this.addFlag = false
@@ -447,6 +448,91 @@
this.title = "淇敼鐢熶骇宸ュ崟";
});
},
+
+ /** 淇敼缂镐綋鐘舵�佹寜閽搷浣� */
+ bodyStatus(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getInfo(id).then(response => {
+ this.form = response.data;
+ if(this.form.bodyStatus === "1"){
+ this.form.bodyStatus = "5";
+ updateInfo(this.form).then(response => {
+ this.$modal.msgSuccess("鏆傚仠鎴愬姛");
+ this.getList();});
+ }else if(this.form.bodyStatus === "2"){
+ this.$message('璁㈠崟宸插畬鎴愮姝慨鏀�');
+ }else if(this.form.bodyStatus === "3") {
+ this.$message('璁㈠崟鍏抽棴绂佹淇敼');
+ }else if(this.form.bodyStatus === "4") {
+ this.$message('璁㈠崟宸插叏閮ㄤ笂绾垮畬鎴愮姝慨鏀�');
+ }
+ else if(this.form.bodyStatus === "5") {
+ this.form.bodyStatus = "1";
+ updateInfo(this.form).then(response => {
+ this.$modal.msgSuccess("閲嶅惎鎴愬姛");
+ this.getList();});
+ }else if(this.form.bodyStatus === "0"){
+ this.$message('璁㈠崟鏈紑濮�');
+ }
+ });
+ },
+ /** 淇敼缂哥洊鐘舵�佹寜閽搷浣� */
+ headStatus(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getInfo(id).then(response => {
+ this.form = response.data;
+ if(this.form.headStatus === "1"){
+ this.form.headStatus = "5";
+ updateInfo(this.form).then(response => {
+ this.$modal.msgSuccess("鏆傚仠鎴愬姛");
+ this.getList();});
+ }else if(this.form.headStatus === "2"){
+ this.$message('璁㈠崟宸插畬鎴愮姝慨鏀�');
+ }else if(this.form.headStatus === "3") {
+ this.$message('璁㈠崟鍏抽棴绂佹淇敼');
+ }else if(this.form.headStatus === "4") {
+ this.$message('璁㈠崟宸插叏閮ㄤ笂绾垮畬鎴愮姝慨鏀�');
+ }
+ else if(this.form.headStatus === "5") {
+ this.form.headStatus = "1";
+ updateInfo(this.form).then(response => {
+ this.$modal.msgSuccess("閲嶅惎鎴愬姛");
+ this.getList();});
+ }else if(this.form.headStatus === "0"){
+ this.$message('璁㈠崟鏈紑濮�');
+ }
+ });
+ },
+ /** 淇敼棰勮鐘舵�佹寜閽搷浣� */
+ preStatus(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getInfo(id).then(response => {
+ this.form = response.data;
+ if(this.form.preStatus === "1"){
+ this.form.preStatus = "5";
+ updateInfo(this.form).then(response => {
+ this.$modal.msgSuccess("鏆傚仠鎴愬姛");
+ this.getList();});
+ }else if(this.form.preStatus === "2"){
+ this.$message('璁㈠崟宸插畬鎴愮姝慨鏀�');
+ }else if(this.form.preStatus === "3") {
+ this.$message('璁㈠崟鍏抽棴绂佹淇敼');
+ }else if(this.form.preStatus === "4") {
+ this.$message('璁㈠崟宸插叏閮ㄤ笂绾垮畬鎴愮姝慨鏀�');
+ }
+ else if(this.form.preStatus === "5") {
+ this.form.preStatus = "1";
+ updateInfo(this.form).then(response => {
+ this.$modal.msgSuccess("閲嶅惎鎴愬姛");
+ this.getList();});
+ }else if(this.form.preStatus === "0"){
+ this.$message('璁㈠崟鏈紑濮�');
+ }
+ });
+ },
/** 鎻愪氦鎸夐挳 */
submitForm() {
this.$refs["form"].validate(valid => {
--
Gitblit v1.9.3