Merge remote-tracking branch 'origin/master'

王震

2023-10-25 6e91eb03317c5d2832ecb98c6bcd3b635029b971

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