From 80004530f9a99f3b423168700268bd265789d76d Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期一, 15 一月 2024 14:35:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 158 +++++++++++++++++++++++++++++-----------------------
1 files changed, 87 insertions(+), 71 deletions(-)
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 2910162..4f1359c 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -2,12 +2,15 @@
<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 label-width="100" label="鐢熶骇閫氱煡鍗�" prop="productName">
+ <el-input v-model="queryParams.productionNotice" 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 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
@@ -18,6 +21,7 @@
</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>
@@ -129,20 +133,20 @@
<el-table border v-loading="loading" :data="productionOrdeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鐢熶骇宸ュ崟鍙�" width="160" 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>
- <el-table-column label="璁㈠崟缂栧彿" width="140" align="center" prop="salesOrderCode">
+ <el-table-column label="鏈哄瀷" width="160" align="center" prop="typeZ">
</el-table-column>
- <el-table-column label="浜у搧缂栧彿" width="140" align="center" prop="productCode">
+ <el-table-column label="闇�姹傛暟閲�" align="center" prop="planQty">
</el-table-column>
- <el-table-column label="浜у搧鍚嶇О" width="160" align="center" prop="productName">
- </el-table-column>
- <el-table-column label="绉嶇被" width="160" align="center" prop="typeZ">
+ <el-table-column label="鐗╂枡绫诲瀷" width="140" align="center" prop="productCode">
</el-table-column>
<el-table-column label="瀹為檯鏁伴噺" width="160" align="center" prop="actualQty">
</el-table-column>
@@ -151,65 +155,74 @@
<dict-tag :options="dict.type.order_state" :value="scope.row.orderStatus"/>
</template>
</el-table-column>
- <el-table-column label="杞﹂棿缂栧彿" align="center" prop="workshopCode">
+ <el-table-column label="宸ュ巶" align="center" prop="workshopCode">
</el-table-column>
- <el-table-column label="浜х嚎缂栧彿" align="center" prop="lineCode">
+ <el-table-column label="浠撳簱" align="center">
</el-table-column>
- <el-table-column label="宸ヨ壓娴佺▼" width="140" align="center" prop="routeCode">
+ <el-table-column label="浜х嚎" align="center" prop="lineCode">
</el-table-column>
- <el-table-column label="浜у搧BOM" width="140" align="center" prop="bomCode">
+ <el-table-column label="璁㈠崟绫诲瀷" align="center">
</el-table-column>
- <el-table-column label="宸ヨ壓閰嶆柟" width="140" align="center" prop="recipeCode">
+ <el-table-column label="ZWS" align="center">
</el-table-column>
- <el-table-column label="璁″垝鏁伴噺" align="center" prop="planQty">
+
+<!-- <el-table-column label="宸ヨ壓娴佺▼" width="140" align="center" prop="routeCode">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="浜у搧BOM" width="140" align="center" prop="bomCode">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="宸ヨ壓閰嶆柟" width="140" align="center" prop="recipeCode">-->
+<!-- </el-table-column>-->
+
+<!-- <el-table-column label="瀹為檯鏁伴噺" align="center" prop="actualQty">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="瀹為檯涓婄嚎鏁伴噺" width="100" align="center" prop="actualOnlineQty">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="闇�姹傛棩鏈�" align="center" prop="demandDate" width="180">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="璁″垝寮�濮嬫椂闂�" width="160" align="center" prop="planStartTime">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="璁″垝缁撴潫鏃堕棿" width="160" align="center" prop="planEndTime">-->
+<!-- </el-table-column>-->
+<!-- <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>-->
+
+<!-- <el-table-column width="160" label="鏇存柊鏃堕棿" align="center" prop="updateTime">-->
+<!-- </el-table-column>-->
+ <el-table-column label="閫氱煡鍗曞埗鍗曚汉" width="80" align="center" prop="createUser">
</el-table-column>
- <el-table-column label="瀹為檯鏁伴噺" align="center" prop="actualQty">
+ <el-table-column width="160" label="閫氱煡鐢熸垚鏃ユ湡" align="center" prop="createTime">
</el-table-column>
- <el-table-column label="瀹為檯涓婄嚎鏁伴噺" width="100" align="center" prop="actualOnlineQty">
+ <el-table-column label="鎴愬搧鎻忚堪" width="160" align="center" prop="productName">
</el-table-column>
- <el-table-column label="闇�姹傛棩鏈�" align="center" prop="demandDate" width="180">
- </el-table-column>
- <el-table-column label="璁″垝寮�濮嬫椂闂�" width="160" align="center" prop="planStartTime">
- </el-table-column>
- <el-table-column label="璁″垝缁撴潫鏃堕棿" width="160" align="center" prop="planEndTime">
- </el-table-column>
- <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>
- <el-table-column width="160" label="鍒涘缓鏃堕棿" align="center" prop="createTime">
- </el-table-column>
- <el-table-column width="160" label="鏇存柊鏃堕棿" align="center" prop="updateTime">
- </el-table-column>
- <el-table-column label="鍒涘缓浜�" width="80" align="center" prop="createUser">
- </el-table-column>
- <el-table-column label="淇敼浜�" width="80" align="center" prop="updateUser">
- </el-table-column>
- <el-table-column label="澶囨敞" width="100" align="center" prop="remarks">
- </el-table-column>
- <el-table-column label="娴佹按鍙�" align="center" prop="streamNumber">
- </el-table-column>
- <el-table-column label="瀹㈡埛" width="80" align="center" prop="custom">
- </el-table-column>
- <el-table-column fixed="right" width="350" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <!-- 宸ュ崟鐘舵�侊紙1鍒涘缓銆�2宸插彂甯冦��3鐢熶骇涓��4宸插喕缁撱��5宸插畬宸ャ��6宸插叧闂級 -->
- <el-button type="success" :disabled="scope.row.orderStatus !== '1'" style="width: 72px" plain @click="handleCommand('3',scope.row.id)" size="mini">
- 寮�濮�</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '2' && scope.row.orderStatus !== '3'" v-if="scope.row.orderStatus !== '2'&& scope.row.orderStatus !== '4'" plain @click="handleCommand('4',scope.row.id)" type="warning" size="mini">
- 鍐荤粨</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '4'" v-if="scope.row.orderStatus === '4'" plain @click="handleCommand('3',scope.row.id)" type="warning" size="mini">
- 瑙ｅ喕</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '1'" plain @click="handleCommand('6',scope.row.id)" v-if="scope.row.orderStatus === '1'||scope.row.orderStatus === '3'||scope.row.orderStatus === '4'||scope.row.orderStatus === '5'" type="danger" size="mini">
- 鍏抽棴</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">
- 鍚敤</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus === '4'||scope.row.orderStatus === '6'" v-if="scope.row.orderStatus !== '5'" @click="handleCommand('5',scope.row.id)" type="success" size="mini">
- 瀹屾垚</el-button>
- <el-button style="width: 72px" :disabled="scope.row.orderStatus === '5'" v-if="scope.row.orderStatus === '5'" type="success" size="mini">宸插畬宸�</el-button> <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">
- 鍚敤</el-button>
- </template>
- </el-table-column>
+<!-- <el-table-column label="淇敼浜�" width="80" align="center" prop="updateUser">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="澶囨敞" width="100" align="center" prop="remarks">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="娴佹按鍙�" align="center" prop="streamNumber">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="瀹㈡埛" width="80" align="center" prop="custom">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column fixed="right" width="350" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">-->
+<!-- <template slot-scope="scope">-->
+<!-- <!– 宸ュ崟鐘舵�侊紙1鍒涘缓銆�2宸插彂甯冦��3鐢熶骇涓��4宸插喕缁撱��5宸插畬宸ャ��6宸插叧闂級 –>-->
+<!-- <el-button type="success" :disabled="scope.row.orderStatus !== '1'" style="width: 72px" plain @click="handleCommand('3',scope.row.id)" size="mini">-->
+<!-- 寮�濮�</el-button>-->
+<!-- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '2' && scope.row.orderStatus !== '3'" v-if="scope.row.orderStatus !== '2'&& scope.row.orderStatus !== '4'" plain @click="handleCommand('4',scope.row.id)" type="warning" size="mini">-->
+<!-- 鍐荤粨</el-button>-->
+<!-- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '4'" v-if="scope.row.orderStatus === '4'" plain @click="handleCommand('3',scope.row.id)" type="warning" size="mini">-->
+<!-- 瑙ｅ喕</el-button>-->
+<!-- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '1'" plain @click="handleCommand('6',scope.row.id)" v-if="scope.row.orderStatus === '1'||scope.row.orderStatus === '3'||scope.row.orderStatus === '4'||scope.row.orderStatus === '5'" type="danger" size="mini">-->
+<!-- 鍏抽棴</el-button>-->
+<!-- <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">-->
+<!-- 鍚敤</el-button>-->
+<!-- <el-button style="width: 72px" :disabled="scope.row.orderStatus === '4'||scope.row.orderStatus === '6'" v-if="scope.row.orderStatus !== '5'" @click="handleCommand('5',scope.row.id)" type="success" size="mini">-->
+<!-- 瀹屾垚</el-button>-->
+<!-- <el-button style="width: 72px" :disabled="scope.row.orderStatus === '5'" v-if="scope.row.orderStatus === '5'" type="success" size="mini">宸插畬宸�</el-button> <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">-->
+<!-- 鍚敤</el-button>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
</el-card>
@@ -230,7 +243,7 @@
</span>
<el-form ref="form" inline :model="form" :rules="rules" label-width="80px">
<el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
- <el-input v-model="form.workOrderNo" placeholder="璇疯緭鍏ョ敓浜у伐鍗曞彿" />
+ <el-input v-model="form.workOrderNo" placeholder="璇疯緭鍏ョ敓浜ц鍗�" />
</el-form-item>
<el-form-item label="璁㈠崟缂栧彿" prop="salesOrderCode">
<el-input v-model="form.salesOrderCode" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" />
@@ -378,7 +391,7 @@
import { listProductBom } from "@/api/main/bs/ProductBom/ProductBom";
import { listTechnologyRoute} from "@/api/main/bs/technologyRoute/technologyRoute";
import ItemSelect from "@/components/itemSelect/single.vue";
-import { upDownMove, listProductionOrde, getProductionOrde, delProductionOrde, addProductionOrde, updateProductionOrde } from "@/api/main/om/productionOrde/productionOrde";
+import { getProductionNotice, upDownMove, listProductionOrde, getProductionOrde, delProductionOrde, addProductionOrde, updateProductionOrde } from "@/api/main/om/productionOrde/productionOrde";
import { listOrderScheduling, getOrderScheduling, delOrderScheduling, addOrderScheduling, updateOrderScheduling,generateNumbers } from "@/api/main/bs/orderScheduling/orderScheduling";
export default {
@@ -442,6 +455,7 @@
typeZ: null,
flag: null,
adds:null,
+ productionNotice: null,
},
// 琛ㄥ崟鍙傛暟
@@ -479,10 +493,14 @@
this.initWorkshop();
},
methods: {
+ getProductionNotice(){
+ getProductionNotice(this.queryParams).then(response => {
+ this.$modal.msgSuccess("鎺ユ敹鎴愬姛");
+ this.queryParams = {}
+ this.getList();
+ });
+ },
//鏁扮粍鐢熸垚
-
-
-
changeDay(day){
this.change.day = day;
let adds =this.form.typeZ+this.change.year+this.change.month+this.change.day+this.form.actualQty;
@@ -498,8 +516,6 @@
let adds =this.form.typeZ+this.change.year+this.change.month+this.change.day+this.form.actualQty;
this.form.adds = adds
},
-
-
moveUp(row, val){
console.log(val)
const ids = row.id || this.ids
@@ -646,7 +662,7 @@
this.initWorkshop();
this.reset();
this.open = true;
- this.titleName = "娣诲姞鐢熶骇宸ュ崟";
+ this.titleName = "娣诲姞鐢熶骇璁㈠崟";
},
/** 鍚屾鎸夐挳鎿嶄綔 */
CreatehandleUpdate(Row) {
@@ -673,7 +689,7 @@
console.log(response.data)
this.form = response.data;
this.open = true;
- this.titleName = "淇敼鐢熶骇宸ュ崟";
+ this.titleName = "淇敼鐢熶骇璁㈠崟";
});
},
/** 鎻愪氦鎸夐挳 */
@@ -699,7 +715,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鐢熶骇宸ュ崟缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎鐢熶骇璁㈠崟缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
return delProductionOrde(ids);
}).then(() => {
this.getList();
--
Gitblit v1.9.3