From 5679afc6e018ac08d5cdbfbe5bd2204724664729 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 13 一月 2026 13:38:19 +0800
Subject: [PATCH] 1.递交
---
src/views/produceManager/workOrder.vue | 2 +-
src/views/deviceManager/deviceList.vue | 18 ++++--------------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/src/views/deviceManager/deviceList.vue b/src/views/deviceManager/deviceList.vue
index 7936d4c..763bfc9 100644
--- a/src/views/deviceManager/deviceList.vue
+++ b/src/views/deviceManager/deviceList.vue
@@ -6,7 +6,7 @@
<el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<div style="display: flex">
<el-button v-waves icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
- <el-button v-waves icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
+<!-- <el-button v-waves icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>-->
<el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>
</div>
@@ -685,7 +685,7 @@
DeviceMangerSearch,
DeviceTypeSearch,
DeviceTypeSelect,
- DeviceTypeSelectGroup,
+
WorkShopSelect, WorkShopSelectLine
} from '@/api/deviceManager'
import { handleDatetime, validateCode } from '@/utils/global'
@@ -986,12 +986,7 @@
const { data: res } = await DeviceTypeSelect()
this.DeviceTypeArr = res
},
- // 璁惧绫诲瀷鏀瑰彉鏃�
- async deviceTypeChange(val) {
- this.form.DeviceGroup = ''
- const { data: res } = await DeviceTypeSelectGroup({ eqptypecode: val })
- this.DeviceGroupArr = res
- },
+
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
@@ -1085,12 +1080,7 @@
this.WorkLineArr = res
// this.dialogForm.linecode = ''
},
- // 瀵硅瘽妗嗚澶囩被鍨嬩笅鎷夐�夋嫨鏀瑰彉鏃�
- async devicetypecodeChange(val) {
- const { data: res } = await DeviceTypeSelectGroup({ eqptypecode: val })
- this.DeviceGroupDialogArr = res
- this.dialogForm.devicegroupcode = ''
- },
+
// 瀵硅瘽妗嗗彇娑�
dialogVisibleCancel() {
this.dialogVisible = false
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index a9908d3..f3ecfe1 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -1399,7 +1399,7 @@
</div>
<!-- 瑕佹墦鍗扮殑鍖哄煙 -->
<!-- <div id="printMe2" :style="{paddingLeft:'10px',paddingTop: '5px'}">-->
- <div v-if="!isLastPrint" :style="printMe2StylePadding(printSize)">
+ <div v-if="!isLastPrint" id="printMe2" :style="printMe2StylePadding(printSize)">
<!-- 80 * 50-->
<div
v-if="printSize===0"
--
Gitblit v1.9.3