From 2fbce7d8c0b7e5b055bb7ab77e58b1ec9ce61885 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期一, 24 六月 2024 19:00:22 +0800
Subject: [PATCH] 1，优化人工工位参数采集temp表删除方法 pushGeelycvMesFeedback 2，优化人工工位更新过站记录方法 workpieceRelease 3，优化未绑定小车码弹框提示 4，优化人工工位扫码重复会添加参数采集记录的问题及拧紧数据会添加上物料采集上的问题
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 133 +++++++++++++++++++++++++++++---------------
1 files changed, 88 insertions(+), 45 deletions(-)
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index ddb4020..6d25ebd 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -102,15 +102,15 @@
>淇敼</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="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"
@@ -137,6 +137,26 @@
@click="getWorkOrders"
>鎺ユ敹</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ :disabled="single"
+ @click="patchwork"
+ >琛ユ墦</el-button>
+ </el-col>
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="warning"-->
+<!-- plain-->
+<!-- icon="el-icon-download"-->
+<!-- size="mini"-->
+<!-- :disabled="single"-->
+<!-- @click="jieBang"-->
+<!-- >瑙ｇ粦</el-button>-->
+<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -151,7 +171,7 @@
</el-table-column>
<!-- <el-table-column label="璁㈠崟缂栧彿" width="140" align="center" prop="salesOrderCode">-->
<!-- </el-table-column>-->
- <el-table-column :show-overflow-tooltip='true' label="pack鐮�" width="160" align="center" prop="productNum">
+ <el-table-column :show-overflow-tooltip='true' label="pack鐮�" width="220" align="center" prop="productNum">
</el-table-column>
<el-table-column :show-overflow-tooltip='true' label="灏忚溅鐮�" width="160" align="center" prop="trolleyYard">
</el-table-column>
@@ -159,33 +179,31 @@
</el-table-column>
<el-table-column label="浜у搧鍚嶇О" width="120" align="center" prop="productName">
</el-table-column>
- <el-table-column label="浜у搧搴忓垪鍙�" width="110" align="center" prop="productNum">
- </el-table-column>
<el-table-column label="浜у搧鍨嬪彿" align="center" prop="productModel">
</el-table-column>
- <el-table-column label="宸ュ崟鐘舵��" width="100" align="center" prop="orderStatus">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.order_state" :value="scope.row.orderStatus"/>
- </template>
- </el-table-column>
+<!-- <el-table-column label="宸ュ崟鐘舵��" width="100" align="center" prop="orderStatus">-->
+<!-- <template slot-scope="scope">-->
+<!-- <dict-tag :options="dict.type.order_state" :value="scope.row.orderStatus"/>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<!-- <el-table-column label="宸ュ巶缂栧彿" align="center" prop="siteCode">-->
<!-- </el-table-column>-->
<el-table-column label="宸ョ珯缂栧彿" align="center" prop="stationCode">
</el-table-column>
- <el-table-column label="鎶ュ伐淇℃伅缁撴灉" width="110" align="center" prop="resultText">
- </el-table-column>
- <el-table-column label="鎶ュ伐缁撴灉浠ｇ爜" width="110" align="center" prop="resultCode">
- </el-table-column>
- <el-table-column label="鏄惁鎶ュ伐" width="80" align="center" prop="sfResult">
- </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 label="鍒涘缓浜�" width="80" align="center" prop="createUser">
- </el-table-column>
- <el-table-column label="澶囨敞" width="100" align="center" prop="remarks">
- </el-table-column>
+<!-- <el-table-column label="鎶ュ伐淇℃伅缁撴灉" width="110" align="center" prop="resultText">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鎶ュ伐缁撴灉浠ｇ爜" width="110" align="center" prop="resultCode">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鏄惁鎶ュ伐" width="80" align="center" prop="sfResult">-->
+<!-- </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 label="鍒涘缓浜�" width="80" align="center" prop="createUser">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="澶囨敞" width="100" align="center" prop="remarks">-->
+<!-- </el-table-column>-->
</el-table>
</el-card>
@@ -278,7 +296,7 @@
import { getToken } from "@/utils/auth";
import { listLineInfo } from "@/api/main/bs/lineInfo/lineInfo";
import { listWorkshop } from "@/api/main/bs/workshop/workshop";
-import { listProductBom } from "@/api/main/bs/ProductBom/ProductBom";
+import {getProductBom, listProductBom} from "@/api/main/bs/ProductBom/ProductBom";
import { listTechnologyRoute} from "@/api/main/bs/technologyRoute/technologyRoute";
import ItemSelect from "@/components/itemSelect/single.vue";
import {
@@ -289,7 +307,7 @@
delProductionOrde,
addProductionOrde,
updateProductionOrde,
- receivingWorkOrders
+ receivingWorkOrders, jieBang
} from "@/api/main/om/productionOrde/productionOrde";
import QRCode from "qrcodejs2";
@@ -398,7 +416,26 @@
this.test1()
},
methods: {
- async getWorkOrders(){
+ jieBang(row){
+ const id = row.id || this.ids
+ jieBang(id).then(response => {
+ this.getList()
+ this.$modal.msgSuccess("瑙ｇ粦鎴愬姛");
+ });
+ },
+ patchwork(row){
+ const id = row.id || this.ids
+ getProductionOrde(id).then(response => {
+ console.log(response.data)
+ this.packCode = response.data.productNum
+ console.log(this.packCode)
+ this.test1()
+ setTimeout(() => {
+ this.print()
+ },50)
+ });
+ },
+ async getWorkOrders(){
await receivingWorkOrders().then(response => {
this.getList()
this.packCode = response.msg;
@@ -588,19 +625,25 @@
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
+ // handleSelectionChange(selection) {
+ // this.ids = selection.map(item => item.id)
+ // this.move = selection.length!==1
+ // if(!selection.length){
+ // this.single = true
+ // this.multiple = true
+ // }else {
+ // if(selection[0].orderStatus === '1' && selection.length === 1){
+ // this.single = false
+ // this.multiple = false
+ // }
+ // }
+ //
+ // },
+ // 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.move = selection.length!==1
- if(!selection.length){
- this.single = true
- this.multiple = true
- }else {
- if(selection[0].orderStatus === '1' && selection.length === 1){
- this.single = false
- this.multiple = false
- }
- }
-
+ this.single = selection.length!==1
+ this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
--
Gitblit v1.9.3