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

renkang

2025-01-24 d492850f1cc64ddcfaf43798af9c76c2505414fd

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

@@ -6,29 +6,35 @@
        :confirm-working="isWorking"
        @confirm="confirm">
        <el-form :model="form" ref="form" :rules="rules">
            <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-form-item label="盘点日期" prop="planDate">
                <el-date-picker
                    v-model="form.name"
                    v-model="form.planDate"
                    @change="getName"
                    type="date"
                    value-format="yyyy-MM-dd"
                    placeholder="选择日期">
                </el-date-picker>
            </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="warehouseId">
                <el-select v-model="form.warehouseId" @change="getName" placeholder="请选择">
                    <el-option
                        v-for="(item, index) in warehouseList"
                        :key="index"
                        :label="item.name"
                        :value="item.id" />
                </el-select>
            </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" @change="getName" placeholder="请选择">
                    <el-option
                        v-for="(item, index) in userList"
                        :key="index"
                        :label="item.realname"
                        :value="item.id" />
                </el-select>
            </el-form-item>
            <el-form-item label="盘点单名称" prop="name">
                <el-input v-model="form.name" placeholder="请输入" v-trim />
            </el-form-item>
        </el-form>
    </GlobalWindow>
@@ -37,6 +43,8 @@
<script>
  import BaseOpera from '@/components/base/BaseOpera'
  import GlobalWindow from '@/components/common/GlobalWindow'
  import { list } from '@/api/ywWarehouse'
  import { getUserList } from '@/api/system/user'
  export default {
    name: 'newInventory',
    extends: BaseOpera,
@@ -47,21 +55,45 @@
        form: {
          id: '',
          name: '',
          planDate: '',
          warehouseId: '',
          userId: ''
        },
        // 验证规则
        rules: {
          name: [{ required: true, message: '请输入项目名称', trigger: 'blur' }]
          planDate: [{ required: true, message: '请选择盘点日期', trigger: 'blur' }],
          warehouseId: [{ required: true, message: '请选择盘点仓库', trigger: 'blur' }],
          userId: [{ required: true, message: '请选择盘点员', trigger: 'blur' }],
          name: [{ required: true, message: '请输入盘点单名称', trigger: 'blur' }]
        },
        warehouseList: [],
        userList: []
      }
    },
    created() {
      this.config({
        api: '/project/ywProject',
        'field.id': 'id'
        api: '/ywStocktaking'
      })
      this.getList()
    },
    methods: {
    
        getList() {
          list({})
            .then(res => {
              this.warehouseList = res
            })
          getUserList({})
            .then(res => {
              this.userList = res
            })
        },
      getName(e) {
          if (this.form.warehouseId && this.form.userId && this.form.planDate) {
            let userName = this.userList.filter(item => item.id === this.form.userId)[0].realname
            let warehouseName = this.warehouseList.filter(item => item.id === this.form.warehouseId)[0].name
            this.form.name = warehouseName + '-' + userName + '-' + this.form.planDate
          }
      }
    }
  }
</script>