From 2096ac6f7379d75001b610c2de1fa380abd09519 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 12 十二月 2023 16:13:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
index 69d67af..fe8b798 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
@@ -149,6 +149,7 @@
                         ]"
                   >
                     <el-input
+                      clearable
                       type="number"
                       v-model.number="row.counts"
                     ></el-input>
@@ -161,10 +162,10 @@
                     label-width="0"
                     :prop="`goods.${goodsIndex}.models.${mIndex}.scrappedCode`"
                     :rules="[
-                          {validator: checkReason,scrappedCode:row.scrappedCode, trigger: ['blur', 'change']}
+                          {validator: checkReason,counts:row.counts,scrappedCode:row.scrappedCode, trigger: ['blur', 'change']}
                         ]"
                   >
-                    <el-select v-model="row.scrappedCode" placeholder="璇烽�夋嫨">
+                    <el-select v-model="row.scrappedCode" clearable placeholder="璇烽�夋嫨">
                       <el-option
                         v-for="item in scrapReasonOptions"
                         :key="item.dict_code"
@@ -254,15 +255,11 @@
     return {
       checkCounts: (rule, value, callback) => {
         if (!rule.counts) {
-          return callback(new Error('璇疯緭鍏ユ姤搴熸暟閲�'));
+          return callback();
         }
         if (!Number.isInteger(rule.counts)) {
           // this.$message.warning('璇疯緭鍏ユ暟瀛楀��');
           return callback(new Error('璇疯緭鍏ユ暟瀛楀��'));
-        }
-        if (rule.counts < 1) {
-          // this.$message.warning('鏁板瓧鍊间笉鑳戒负0');
-          return callback(new Error('鏁板瓧鍊煎繀椤诲ぇ浜�0'));
         }
         if (rule.counts > rule.userUseCount) {
           // this.$message.warning('鍒嗗彂鏁伴噺涓嶈兘澶т簬鍓╀綑鏁伴噺');
@@ -271,7 +268,7 @@
         callback();
       },
       checkReason: (rule, value, callback) => {
-        if (!rule.scrappedCode) {
+        if (rule.counts && !rule.scrappedCode) {
           return callback(new Error('璇烽�夋嫨鎶ュ簾鍘熷洜'));
         }
         callback();
@@ -291,7 +288,7 @@
       fenfaData: [],
       formData: {
         departmentId: '', // 鎶ュ簾閮ㄩ棬id
-        dealTime: '', // 鎶ュ簾鏃堕棿
+        dealTime: DateFormatter.formatDate(new Date(), 'yyyyMMddhhmmss'), // 鎶ュ簾鏃堕棿
         procureDoc: '',
         goods: [],
       },
@@ -334,7 +331,6 @@
         uploadUrl: getUploadUrl(), // 涓婁紶璺緞
         multiple: true, // 鏄惁鏀寔鎵归噺涓婁紶
         disabled: false, // 鏄惁绂佺敤
-        type: 'picture', // text/picture
       },
       scrapReasonOptions: [] // 鎶ュ簾鍘熷洜
     };
@@ -504,15 +500,24 @@
       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
           })
-          if(this.loading) return
+          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
           scrappedAdd(params)
             .then((res) => {

--
Gitblit v1.9.1