Merge remote-tracking branch 'origin/master'

王震

2023-10-25 6e91eb03317c5d2832ecb98c6bcd3b635029b971

 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: '',