From cd8ad50ea356f71a90df639ac8bcfd44d2b84ce7 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期六, 13 一月 2024 16:30:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 62 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 5c5df66..7628926 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -159,6 +159,18 @@
@click="moveUp(val => val, 'down')"
>涓嬬Щ</el-button>
</el-col>
+
+ <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>
+
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -176,6 +188,8 @@
<el-table-column label="浜у搧缂栧彿" width="140" align="center" prop="productCode">
</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>
<el-table-column label="宸ュ崟鐘舵��" align="center" prop="orderStatus">
<template slot-scope="scope">
@@ -225,31 +239,20 @@
<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-->
-<!-- :disabled="scope.row.orderStatus !== '1'"-->
-<!-- size="mini"-->
-<!-- type="success"-->
-<!-- style="width: 72px"-->
-<!-- icon="el-icon-edit"-->
-<!-- @click="handleUpdate(scope.row)"-->
-<!-- v-hasPermi="['om:productionOrde:edit']"-->
-<!-- >淇敼</el-button>-->
-<!-- <el-button-->
-<!-- :disabled="scope.row.orderStatus !== '1'"-->
-<!-- size="mini"-->
-<!-- type="warning"-->
-<!-- style="width: 72px"-->
-<!-- icon="el-icon-delete"-->
-<!-- @click="handleDelete(scope.row)"-->
-<!-- v-hasPermi="['om:productionOrde:remove']"-->
-<!-- >鍒犻櫎</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>
+ <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>
@@ -285,6 +288,9 @@
</el-form-item>
<el-form-item label="浜у搧鍚嶇О" prop="productName">
<el-input v-model="form.productName" disabled placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ </el-form-item>
+ <el-form-item label="浜у搧鍚嶇О" prop="productName">
+ <el-input v-model="form.typeZ" disabled placeholder="璇疯緭鍏ョ绫�" />
</el-form-item>
<el-form-item label="杞﹂棿缂栧彿" prop="workshopCode">
<el-select style="width: 93%" @change="handleSelectChange(form.workshopCode)" v-model="form.workshopCode" placeholder="璇烽�夋嫨杞﹂棿缂栧彿">
@@ -426,6 +432,7 @@
productCompanyCode: null,
frontEndId: 0,
idNums: null,
+ typeZ: null,
flag: null,
},
@@ -482,7 +489,9 @@
let productCode = obj.materialCode;
this.form.productCode = productCode;
this.form.productName = obj.materialName;
- this.queryParams.productCode = productCode
+ this.form.typeZ = obj.typeZ;
+ this.queryParams.productCode = productCode;
+ this.queryParams.typeZ = typeZ
listTechnologyRoute(this.queryParams).then(response => {
this.form.routeCode = response.rows[0].routeCode;
});
@@ -561,6 +570,7 @@
spareField1: null,
spareField2: null,
spareField3: null,
+ typeZ: null,
spareField4: null
};
this.resetForm("form");
--
Gitblit v1.9.3