From db96301a4715b1c4f1180095441963ed6f430797 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 17 一月 2025 11:02:41 +0800
Subject: [PATCH] 开发功能

---
 admin/src/views/stock/components/newInventory.vue |   70 +++++++++++++++++++++++++---------
 1 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/admin/src/views/stock/components/newInventory.vue b/admin/src/views/stock/components/newInventory.vue
index eb57f94..dd2be3e 100644
--- a/admin/src/views/stock/components/newInventory.vue
+++ b/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>

--
Gitblit v1.9.3