From 6cfff55d44314e88fefd6e3adb290ec16b303f89 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期五, 05 一月 2024 10:42:53 +0800
Subject: [PATCH] 1、供产品导数据临时用(用户,机构,部门,仓库,库管员 可删) 2、选择库管员增加过滤参数

---
 admin-web/src/views/departmentitem/itemret/returnNote/edit.vue |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
index 28a1bf7..69e1bac 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
@@ -149,6 +149,7 @@
                         ]"
                   >
                     <el-input
+                      clearable
                       type="number"
                       v-model.number="row.counts"
                     ></el-input>
@@ -264,7 +265,7 @@
       fenfaData: [],
       formData: {
         departmentId: '', // 閫�鍥為儴闂╥d
-        dealTime: '', // 閫�鍥炴椂闂�
+        dealTime: DateFormatter.formatDate(new Date(), 'yyyyMMddhhmmss'), // 閫�鍥炴椂闂�
         procureDoc: '',
         goods: [],
       },
@@ -302,12 +303,10 @@
         title: '涓婁紶',
         max: 20, // 鏈�澶уぇ灏忥紝鍗曚綅M
         num: 10, // 鏀寔涓婁紶鍥剧墖涓暟
-        accept: '.jpg,.png', // 闄愬埗鏍煎紡
         tip: '', // 鎻愮ず 榛樿锛歚鍙兘涓婁紶${this.defaultSettings.num}涓�${this.defaultSettings.accept}鏂囦欢锛屼笖涓嶈秴杩�${this.defaultSettings.max}kb`
         uploadUrl: getUploadUrl(), // 涓婁紶璺緞
         multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
         disabled: false, // 鏄惁绂佺敤
-        type: 'picture', // text/picture
       },
     };
   },
@@ -405,7 +404,7 @@
       }).then(res => {
         this.loading = false
         if (!res || res.length === 0) {
-          this.$message.error('鏈煡璇㈠埌鍒嗗彂鍗�');
+          this.$message.error('鏈煡璇㈠埌闇�瑕侀��鍥炵殑鍒嗗彂鍗�');
           return
         }
         this.fenfaSetting.show = true
@@ -471,14 +470,23 @@
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
           let params = JSON.parse(JSON.stringify(this.formData))
-          params.goods.map((g, gid) => {
+          params.goods.map(g => {
             delete g.goodsOptions
             let arr = []
             g.models.map(m => {
-              arr = arr.concat(m)
+              m.map(item=>{
+                if(item.counts&&item.counts>0){
+                  arr.push(item)
+                }
+              })
             })
             g.models = arr
           })
+          params.goods = params.goods.filter(g=>g.models.length>0)
+          if(params.goods.length===0){
+            this.$message.error('璇疯嚦灏戝~鍐欎竴涓��鍥炵墿鍝�');
+            return;
+          }
           if (this.loading) return
           this.loading = true
           returnAdd(params)

--
Gitblit v1.9.1