1.递交

小小儁爺

2026-01-13 5679afc6e018ac08d5cdbfbe5bd2204724664729

1.递交

 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

 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"