|  | @@ -185,11 +185,8 @@
 | 
	
		
			
				|  |  |          <el-form-item label="联系电话" prop="contactPhone">
 | 
	
		
			
				|  |  |            <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
		
			
				|  |  | -<!--        <el-form-item label="是否启用" prop="isActive">-->
 | 
	
		
			
				|  |  | -<!--          <el-input v-model="form.isActive" placeholder="请输入是否启用" />-->
 | 
	
		
			
				|  |  | -<!--        </el-form-item>-->
 | 
	
		
			
				|  |  |          <el-form-item label="是否启用" prop="isActive">
 | 
	
		
			
				|  |  | -          <el-select   v-model="form.isActive" placeholder="请选择" clearable size="small" >
 | 
	
		
			
				|  |  | +          <el-select v-model="isActiveComputed" placeholder="请选择" clearable size="small" >
 | 
	
		
			
				|  |  |              <el-option
 | 
	
		
			
				|  |  |                v-for="item in enableOptions"
 | 
	
		
			
				|  |  |                :key="item.dictValue"
 | 
	
	
		
			
				|  | @@ -198,22 +195,6 @@
 | 
	
		
			
				|  |  |              />
 | 
	
		
			
				|  |  |            </el-select>
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
		
			
				|  |  | -        <el-form-item label="创建时间" prop="createdAt">
 | 
	
		
			
				|  |  | -          <el-date-picker clearable size="small" style="width: 200px"
 | 
	
		
			
				|  |  | -            v-model="form.createdAt"
 | 
	
		
			
				|  |  | -            type="date"
 | 
	
		
			
				|  |  | -            value-format="yyyy-MM-dd"
 | 
	
		
			
				|  |  | -            placeholder="选择创建时间">
 | 
	
		
			
				|  |  | -          </el-date-picker>
 | 
	
		
			
				|  |  | -        </el-form-item>
 | 
	
		
			
				|  |  | -        <el-form-item label="更新时间" prop="updatedAt">
 | 
	
		
			
				|  |  | -          <el-date-picker clearable size="small" style="width: 200px"
 | 
	
		
			
				|  |  | -            v-model="form.updatedAt"
 | 
	
		
			
				|  |  | -            type="date"
 | 
	
		
			
				|  |  | -            value-format="yyyy-MM-dd"
 | 
	
		
			
				|  |  | -            placeholder="选择更新时间">
 | 
	
		
			
				|  |  | -          </el-date-picker>
 | 
	
		
			
				|  |  | -        </el-form-item>
 | 
	
		
			
				|  |  |          <el-form-item label="备注" prop="remark">
 | 
	
		
			
				|  |  |            <el-input v-model="form.remark" placeholder="请输入备注" />
 | 
	
		
			
				|  |  |          </el-form-item>
 | 
	
	
		
			
				|  | @@ -228,6 +209,7 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  <script>
 | 
	
		
			
				|  |  |  import { listWarehouses, getWarehouses, delWarehouses, addWarehouses, updateWarehouses, exportWarehouses } from "@/api/store/warehouses";
 | 
	
		
			
				|  |  | +import {getDicts} from "../../../api/system/dict/data";
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  export default {
 | 
	
		
			
				|  |  |    name: "Warehouses",
 | 
	
	
		
			
				|  | @@ -247,6 +229,7 @@ export default {
 | 
	
		
			
				|  |  |        total: 0,
 | 
	
		
			
				|  |  |        // 仓库表格数据
 | 
	
		
			
				|  |  |        warehousesList: [],
 | 
	
		
			
				|  |  | +      enableOptions: [],
 | 
	
		
			
				|  |  |        // 弹出层标题
 | 
	
		
			
				|  |  |        title: "",
 | 
	
		
			
				|  |  |        // 是否显示弹出层
 | 
	
	
		
			
				|  | @@ -274,8 +257,23 @@ export default {
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      };
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  | +  computed:{
 | 
	
		
			
				|  |  | +    isActiveComputed: {
 | 
	
		
			
				|  |  | +      get() {
 | 
	
		
			
				|  |  | +        return String(this.form.isActive);
 | 
	
		
			
				|  |  | +      },
 | 
	
		
			
				|  |  | +      set(newValue) {
 | 
	
		
			
				|  |  | +        this.form.isActive = parseInt(newValue, 10);
 | 
	
		
			
				|  |  | +      },
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +  },
 | 
	
		
			
				|  |  |    created() {
 | 
	
		
			
				|  |  |      this.getList();
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    getDicts('enable_options').then(response=>{
 | 
	
		
			
				|  |  | +      this.enableOptions = response.data;
 | 
	
		
			
				|  |  | +    })
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    methods: {
 | 
	
		
			
				|  |  |      /** 查询仓库列表 */
 |