Merge remote-tracking branch 'origin/master'

王震

2023-10-25 6e91eb03317c5d2832ecb98c6bcd3b635029b971

Merge remote-tracking branch 'origin/master'

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

@@ -15,7 +15,7 @@
      <el-row>
        <el-col :span="12">
          <el-form-item label="工厂" prop="factoryId">
            <el-select disabled
            <el-select 
              v-model="dataForm.factoryId"
              filterable
              placeholder="请选择工厂"
@@ -222,7 +222,7 @@
      visible: false,
      dataForm: {
        id: 0,
        factoryId: 117,
        factoryId: '',
        pType: '',
        locNo: '',
        locName: '',

 src/views/basic/part/index.vue

@@ -364,7 +364,7 @@
            fun: this.addOrUpdateHandle
          },
          {
            text: '同步IFS',
            text: '获取IFS零件',
            type: 'primary',
            fun: this.syncISDate,
            loading: false

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

@@ -20,12 +20,12 @@
              placeholder="零件号"
              :disabled="(dataForm.id != null && dataForm.id > 0) || status"
            >
              <el-button
              <!-- <el-button
                slot="append"
                icon="el-icon-search"
                @click="openPartDialog()"
                v-show="!dataForm.id"
              ></el-button>
              ></el-button> -->
            </el-input>
          </el-form-item>
        </el-col>

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

@@ -60,7 +60,7 @@
      <el-row>
        <el-col :span="12">
          <el-form-item label="工厂" prop="factoryId">
            <el-select disabled
            <el-select 
              v-model="dataForm.factoryId"
              filterable
              placeholder="请选择"
@@ -187,7 +187,7 @@
        warehouseName: '',
        warehouseDesc: '',
        warehouseType: '',
        factoryId: 117,
        factoryId: '',
        warehouseAddr: '',
        warehouseMap: '',
        warehouseStatus: '',

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

@@ -64,7 +64,7 @@
            </el-select>
          </el-form-item>
          <el-form-item label="工厂" prop="factoryId">
            <el-select disabled
            <el-select 
              v-model="dataForm.factoryId"
              placeholder="工厂"
              filterable
@@ -221,7 +221,7 @@
        workstationNo: '',
        name: '',
        type: '',
        factoryId: 117,
        factoryId: '',
        remark: '',
        artificialType: '',
        workCenter: '',