Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/basic/workstation/workstation-form.vue

@@ -1,10 +1,10 @@
<template>
  <el-dialog
    v-diadrag
    :title="!dataForm.id ? '新增' : '修改'"
    :close-on-click-modal="false"
    :visible.sync="visible"
    style="min-width: 2000px"
    width="60%"
    top="5vh"
  >
    <el-row>
      <el-form
@@ -127,7 +127,7 @@
          >
          </el-transfer>
        </el-tab-pane>
        <el-tab-pane label="产出待检库位" name="inspection">
       <!--  <el-tab-pane label="产出待检库位" name="inspection">
          <el-transfer
            filterable
            v-model="inspectionLocationIds"
@@ -137,7 +137,7 @@
            @change="handleChangeInspectionLocation"
          >
          </el-transfer>
        </el-tab-pane>
        </el-tab-pane> -->
        <!-- <el-tab-pane label="产出不合格库位" name="disqualified">
          <el-transfer
            filterable
@@ -160,7 +160,7 @@
          >
          </el-transfer>
        </el-tab-pane> -->
        <el-tab-pane label="检验待处理库位" name="pending">
        <!-- <el-tab-pane label="检验待处理库位" name="pending">
          <el-transfer
            filterable
            v-model="pendingLocationIds"
@@ -170,7 +170,7 @@
            @change="handleChangePendingLocation"
          >
          </el-transfer>
        </el-tab-pane>
        </el-tab-pane> -->
        <el-tab-pane label="成品待检库位" name="product">
          <el-transfer
            filterable
@@ -416,7 +416,6 @@
        getObj(this.dataForm.id).then((response) => {
          if (this.dataForm) {
            this.dataForm = response.data.data
            console.log(this.dataForm)
            this.allEquipList = this.dataForm.equipments
            this.allFeedLocation = this.dataForm.locations
            this.allLocation = JSON.parse(