Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-06-06 77946261ec663aa1fe7f6f97e550532ed879f982

 admin/src/views/stock/components/newWarehouse.vue

@@ -9,30 +9,33 @@
            <el-form-item label="仓库名称" prop="name">
                <el-input v-model="form.name" placeholder="请输入" v-trim />
            </el-form-item>
            <el-form-item label="所在位置" prop="name">
                <el-input v-model="form.name" placeholder="请输入" v-trim />
            <el-form-item label="所在位置" prop="position">
                <el-input v-model="form.position" placeholder="请输入" v-trim />
            </el-form-item>
            <el-form-item label="负责人" prop="name">
                <el-select v-model="form.name" placeholder="请选择">
                    <el-option label="张三" :value="1"></el-option>
                    <el-option label="李四" :value="1"></el-option>
                    <el-option label="王二" :value="1"></el-option>
            <el-form-item label="负责人" prop="userId">
                <el-select v-model="form.userId" filterable placeholder="请选择">
                    <el-option
                        v-for="item in userList"
                        :key="item.id"
                        :label="item.realname"
                        :value="item.id">
                    </el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="排序码(升序)" prop="name">
                <el-input v-model="form.name" placeholder="请输入排序码" v-trim />
                <el-form-item label="排序码(升序)" prop="sortnum">
                <el-input v-model="form.sortnum" placeholder="请输入排序码" v-trim />
            </el-form-item>
            <el-form-item label="状态" prop="name">
            <el-form-item label="状态" prop="status">
                <el-switch
                    v-model="form.name"
                    v-model="form.status"
                    active-color="#13ce66"
                    inactive-color="#ff4949"
                    active-value="100"
                    inactive-value="0">
                    :active-value="0"
                    :inactive-value="1">
                </el-switch>
            </el-form-item>
            <el-form-item label="备注" prop="name">
                <el-input v-model="form.name" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="请输入" v-trim />
            <el-form-item label="备注" prop="remark">
                <el-input v-model="form.remark" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="请输入" v-trim />
            </el-form-item>
        </el-form>
    </GlobalWindow>
@@ -41,6 +44,7 @@
<script>
  import BaseOpera from '@/components/base/BaseOpera'
  import GlobalWindow from '@/components/common/GlobalWindow'
  import { getUserList } from '@/api/system/user'
  export default {
    name: 'newWarehouse',
    extends: BaseOpera,
@@ -51,18 +55,33 @@
        form: {
          id: '',
          name: '',
          position: '',
          userId: '',
          sortnum: '',
          remark: '',
          status: 0
        },
        // 验证规则
        rules: {
          name: [{ required: true, message: '请输入项目名称', trigger: 'blur' }]
          name: [{ required: true, message: '仓库名称不能为空', trigger: 'blur' }],
          userId: [{ required: true, message: '负责人不能为空', trigger: 'blur' }]
        },
        userList: []
      }
    },
    created() {
      this.config({
        api: '/project/ywProject',
        'field.id': 'id'
        api: '/ywWarehouse'
      })
      this.getUser()
    },
    methods: {
      getUser() {
        getUserList({})
            .then(res => {
              this.userList = res
            })
      }
    }
  }
</script>