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/stock/accessStock/outbound/edit.vue |  190 ++++++++++++++++++++++++++---------------------
 1 files changed, 106 insertions(+), 84 deletions(-)

diff --git a/admin-web/src/views/stock/accessStock/outbound/edit.vue b/admin-web/src/views/stock/accessStock/outbound/edit.vue
index 064fcf2..dc4bd7a 100644
--- a/admin-web/src/views/stock/accessStock/outbound/edit.vue
+++ b/admin-web/src/views/stock/accessStock/outbound/edit.vue
@@ -1,12 +1,17 @@
 <template>
-  <win-md class="stock-edit" :title="`${setting.title}鍑哄簱鍑哄簱`" @close="close" :width="'800px'">
-    <el-form class="form" ref="ruleForm" :model="formData" :rules="rules" label-width="120px">
+  <win-md class="stock-edit" :title="`${setting.title}鍑哄簱`" @close="close" :width="'800px'">
+    <el-form v-loading="loading" class="form" ref="ruleForm" :model="formData" :rules="rules" label-width="120px">
       <div class="main-w">
         <el-row :gutter="24" class="headerHeight">
           <el-col :span="12">
             <el-form-item label="鍑哄簱浠撳簱" prop="warehouseId">
-              <el-select v-model="formData.warehouseId" placeholder="璇烽�夋嫨" style="width: 100%">
-                <el-option v-for="item in warehouseOptions" :key="item.id" :label="item.warehouseName" :value="item.id" />
+              <el-select v-model="formData.warehouseId" placeholder="璇烽�夋嫨" clearable style="width: 100%">
+                <el-option
+                  v-for="item in warehouseOptions"
+                  :key="item.id"
+                  :label="item.warehouseName"
+                  :value="item.id"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -15,6 +20,7 @@
               <el-date-picker
                 v-model="formData.dealTime"
                 type="datetime"
+                clearable
                 value="yyyy-MM-dd HH:mm:ss"
                 value-format="yyyyMMddHHmmss"
                 placeholder="璇烽�夋嫨鏃ユ湡"
@@ -26,7 +32,7 @@
         </el-row>
         <el-row :gutter="24" class="headerHeight">
           <el-col :span="24">
-            <el-form-item label="鍑哄簱鎵嬬画" prop="procureDoc">
+            <el-form-item label="鍑哄簱鎵嬬画" prop="doc">
               <upload ref="uploadRef" :settings="uploadSettings" @on-change="uploadChange"></upload>
             </el-form-item>
           </el-col>
@@ -36,7 +42,7 @@
             <el-col :span="12">
               <el-form-item
                 label="鐗╁搧鍒嗙被"
-                :prop="`goods[${goodsIndex}].baseCategoryIds`"
+                :prop="`goods.${goodsIndex}.baseCategoryId`"
                 :rules="{
                   required: true,
                   message: '璇烽�夋嫨',
@@ -44,9 +50,13 @@
                 }"
               >
                 <el-cascader
-                  v-model="goodsItem.baseCategoryIds"
+                  v-model="goodsItem.baseCategoryId"
                   :options="categoryOptions"
-                  :props="{ value: 'id' }"
+                  placeholder="璇烽�夋嫨鐗╁搧鍒嗙被"
+                  :props="{ value: 'id',emitPath: false }"
+                  :show-all-levels="false"
+                  filterable
+                  clearable
                   @change="categoryChange($event, goodsIndex)"
                   style="width: 100%"
                 ></el-cascader>
@@ -55,13 +65,14 @@
             <el-col :span="12">
               <el-form-item
                 label="鐗╁搧鍚嶇О"
-                :prop="`goods[${goodsIndex}].baseGoodsTemplateId`"
+                :prop="`goods.${goodsIndex}.baseGoodsTemplateId`"
                 :rules="rules.baseGoodsTemplateId"
               >
                 <el-select
                   v-model="goodsItem.baseGoodsTemplateId"
-                  placeholder="璇峰厛鎷╃墿鍝佸垎绫�"
+                  :placeholder="goodsItem.baseCategoryId?'璇烽�夋嫨鐗╁搧':'璇峰厛閫夋嫨鐗╁搧鍒嗙被'"
                   filterable
+                  clearable
                   :disabled="!goodsItem.baseCategoryId"
                   style="width: 100%"
                   @change="goodsTemplateChange($event, goodsIndex)"
@@ -80,20 +91,22 @@
             <el-col :span="12">
               <el-form-item
                 label="瑙勬牸鍨嬪彿"
-                :prop="`goods[${goodsIndex}].modelsIds`"
+                :prop="`goods.${goodsIndex}.modelsIds`"
                 :rules="{
                   required: true,
-                  message: '璇烽�夋嫨',
+                  message: '璇烽�夋嫨瑙勬牸鍨嬪彿',
                   trigger: 'change',
                 }"
               >
                 <el-select
                   v-model="goodsItem.modelsIds"
                   multiple
-                  placeholder="璇峰厛鎷╃墿鍝佸悕绉�"
-                  :disabled="!goodsItem.baseCategoryId"
+                  clearable
+                  :placeholder="goodsItem.baseGoodsTemplateId?'璇烽�夋嫨瑙勬牸鍨嬪彿':'璇峰厛閫夋嫨鐗╁搧鍚嶇О'"
+                  :disabled="!goodsItem.baseGoodsTemplateId"
                   @change="modelChange($event, goodsIndex)"
                   @remove-tag="modelRemoveTag($event, goodsIndex)"
+                  @clear="modelRemoveTag(-1, goodsIndex)"
                   style="width: 100%"
                 >
                   <el-option
@@ -118,7 +131,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="price" label="鐜版湁搴撳瓨" align="center">
-              <template slot-scope="scope">{{  }}
+              <template slot-scope="scope">
                 {{ scope.row.worehouseCount }}
               </template>
             </el-table-column>
@@ -126,15 +139,14 @@
               <template slot-scope="scope">
                 <el-form-item
                   label-width="0"
-                  style="margin-bottom: 0"
-                  :prop="`goods[${goodsIndex}].models[${scope.$index}].counts`"
+                  :prop="`goods.${goodsIndex}.models.${scope.$index}.counts`"
                   :rules="rules.counts"
                 >
-                <el-input
-                  type="number"
-                  v-model="scope.row.counts"
-                  @change="countsChange($event, goodsIndex,scope.$index)"
-                ></el-input>
+                  <el-input
+                    type="number"
+                    v-model="scope.row.counts"
+                    @change="countsChange($event, goodsIndex, scope.$index)"
+                  ></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -164,26 +176,20 @@
     </el-form>
     <div slot="footer" align="center" class="dialog-footer">
       <my-button name="鍙栨秷" site="form" @click="close" />
-      <my-button name="淇濆瓨" site="form" @click="handleSubmit" />
+      <el-button name="淇濆瓨" type="primary" size="medium" :loading="btnloading" @click="handleSubmit">淇濆瓨</el-button>
     </div>
   </win-md>
 </template>
 <script>
-import {
-  goodsTemplate,
-  goodsModel,
-  selectTenantWarehouse,
-} from '@/api/baseSetting/finsystenant';
-import {
-  outputAdd,
-  outputSelectNumber
-} from '@/api/stock/accessStock';
-import { getTree } from '@/api/foudation/classification';
+import {goodsModel, goodsTemplate, selectTenantWarehouse, warehouseSelectNumber,} from '@/api/baseSetting/finsystenant';
+import {outputAdd} from '@/api/stock/accessStock';
+import {getTree} from '@/api/foudation/classification';
 import MyButton from '@/components/myButton/myButton';
 import winMd from '@/components/win/win-md';
 import upload from '@/components/upload/index';
-import { getUploadUrl } from '@/utils/base';
-import {mapGetters} from 'vuex'
+import {getUploadUrl} from '@/utils/base';
+import {mapGetters} from 'vuex';
+import * as DateFormatter from "@/utils/DateFormatter";
 
 export default {
   components: { MyButton, winMd, upload },
@@ -201,20 +207,21 @@
         return callback(new Error('璇烽�夋嫨'));
       }
       let temp = this.formData.goods.filter((v) => v.baseGoodsTemplateId == value);
-      if (!temp || temp.length!=1) {
+      if (!temp || temp.length != 1) {
         return callback(new Error('宸查�夎繃姝ょ墿鍝�'));
       }
       callback();
     };
     return {
-      loading: false,
+      loading: true,
+      btnloading: false,
       warehouseOptions: [], // 鍑哄簱浠撳簱鍒楄〃
       categoryOptions: [], // 鐗╁搧鍒嗙被鍒楄〃
       modelList: [], //鍨嬪彿鍒楄〃
       formData: {
         warehouseId: '', // 鍑哄簱浠撳簱id
-        dealTime: '', // 鍑哄簱鏃堕棿
-        procureDoc: '',
+        dealTime: DateFormatter.formatDate(new Date(), 'yyyyMMddhhmmss'), // 鍑哄簱鏃堕棿
+        doc: '',
         goods: [],
       },
       goodsItem: {
@@ -232,15 +239,15 @@
         worehouseCount: 0,
         counts: null, // 鎿嶄綔鏁伴噺
         unit: null, //鍗曚綅
+        totalAmount: 0, //鍗曚綅
       },
       rules: {
-        warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
-        dealTime: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
-        buyType: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
-
-        baseCategoryIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
-        baseGoodsTemplateId: [{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
-        modelsIds: [{ required: true, message: '璇烽�夋嫨', trigger: 'change' }],
+        warehouseId: [{ required: true, message: '璇烽�夋嫨浠撳簱', trigger: 'change' }],
+        dealTime: [{ required: true, message: '璇烽�夋嫨鏃堕棿', trigger: 'change' }],
+        doc: [{required: true, message: '璇蜂笂浼犲鎵规墜缁�', trigger: 'change'}],
+        baseCategoryId: [{ required: true, message: '璇烽�夋嫨鐗╁搧鍒嗙被', trigger: 'change' }],
+        baseGoodsTemplateId: [{ required: true, message: '璇烽�夋嫨鐗╁搧', trigger: 'change' },{ validator: checkGoodsTemplateId, trigger: ['blur', 'change'] }],
+        modelsIds: [{ required: true, message: '璇烽�夋嫨瑙勬牸鍨嬪彿', trigger: 'change' }],
         counts: [{ required: true, message: '璇疯緭鍏�', trigger: 'change' }],
       },
 
@@ -248,37 +255,36 @@
         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
       },
     };
   },
-  computed:{
-    ...mapGetters(['userInfo'])
+  computed: {
+    ...mapGetters(['userInfo']),
   },
   created() {
     this.init();
   },
   methods: {
     async init() {
-      this.getWarehouseList();
-      this.getgoodsTemplate();
-      this.getgoodsModel();
+      await this.getWarehouseList();
+      await this.getgoodsTemplate();
+      await this.getgoodsModel();
       // 鑾峰彇鐗╁搧鍒嗙被鍒楄〃
       const treeRes = await getTree();
       this.categoryOptions = this.removeEmptyChildren(treeRes);
+      this.loading = false
     },
 
     // 鑾峰彇鍑哄簱浠撳簱鍒楄〃
-    getWarehouseList() {
-      selectTenantWarehouse({agencyId:this.userInfo.tenantId})
+    async getWarehouseList() {
+      await selectTenantWarehouse({ agencyId: this.userInfo.tenantId })
         .then((res) => {
-          this.warehouseOptions = res
-          if(res.length) {
+          this.warehouseOptions = res;
+          if (res.length) {
             this.formData.goods.push(JSON.parse(JSON.stringify(this.goodsItem)));
           }
           if (this.warehouseOptions.length && !this.formData.warehouseId) {
@@ -303,8 +309,8 @@
     },
 
     // 鑾峰彇鐗╁搧鍚嶇О鍒楄〃
-    getgoodsTemplate(id, index) {
-      goodsTemplate({ categoryId: id || '' }).then((res) => {
+    async getgoodsTemplate(id, index) {
+      await goodsTemplate({ agencyId: this.userInfo.tenantId, categoryId: id || '' }).then((res) => {
         if (index || index == 0) {
           this.$set(this.formData.goods[index], 'goodsOptions', res);
         } else {
@@ -314,8 +320,8 @@
     },
 
     // 瑙勬牸鍨嬪彿
-    getgoodsModel(id, index) {
-      goodsModel({ goodsTemplatesId: id || '' }).then((res) => {
+    async getgoodsModel(id, index) {
+      await goodsModel({ goodsTemplatesId: id || '' }).then((res) => {
         if (index || index == 0) {
           this.$set(this.formData.goods[index], 'modelsOptions', res);
         } else {
@@ -350,10 +356,8 @@
       this.formData.goods[index].modelsOptions = [];
       this.formData.goods[index].modelsIds = [];
       this.formData.goods[index].models = [];
-
-      this.formData.goods[index].baseCategoryId = e[e.length - 1];
       // 鏍规嵁閫変腑鍒嗙被璇锋眰鐗╁搧鍚嶇О鍒楄〃
-      this.getgoodsTemplate(e[e.length - 1], index);
+      this.getgoodsTemplate(e, index);
     },
 
     // 鐗╁搧鍚嶇О鍒楄〃閫夋嫨
@@ -371,12 +375,18 @@
     async modelChange(e, index) {
       let arr = [...this.formData.goods[index].models];
       let str = JSON.stringify(arr);
-      for(let item of e) {
+      for (let item of e) {
         if (str.indexOf(item) == -1) {
           let temp = this.goodsModelAll.find((v) => v.id == item);
           // 鑾峰彇搴撳瓨
-          let num = await outputSelectNumber({warehouseId:this.formData.warehouseId,baseGoodsModelsId:item})
-          arr.push({ ...this.modelsItem, baseGoodsModelsId: item, unit: temp.unit,worehouseCount: num});
+          let num = await warehouseSelectNumber({
+            warehouseId: this.formData.warehouseId,
+            baseGoodsModelsId: item,
+            warehouseType: 0,
+            states: 1,
+            buyType: null,
+          });
+          arr.push({ ...this.modelsItem, baseGoodsModelsId: item, unit: temp.unit, worehouseCount: num });
         }
       }
       this.formData.goods[index].models = arr;
@@ -384,6 +394,10 @@
 
     // 瑙勬牸鍨嬪彿绉婚櫎
     modelRemoveTag(e, index) {
+      if(e===-1){
+        this.formData.goods[index].models = []
+        return
+      }
       let arr = this.formData.goods[index].models;
       let delIndex = arr.findIndex((v) => v.baseGoodsModelsId == e);
       this.formData.goods[index].models.splice(delIndex, 1);
@@ -391,8 +405,8 @@
 
     // 涓婁紶
     uploadChange() {
-      let arr = this.$refs.uploadRef.fileList
-      this.formData.procureDoc = JSON.stringify(arr)
+      let arr = this.$refs.uploadRef.fileList;
+      this.formData.doc = JSON.stringify(arr);
     },
 
     // 鐐瑰嚮鏂板鐗╁搧
@@ -406,16 +420,16 @@
     },
 
     // 鍑哄簱鏁伴噺鏍¢獙
-    countsChange(e, goodsIndex,index) {
-      const curItem = this.formData.goods[goodsIndex].models[index]
-      const worehouseCount = curItem.worehouseCount
+    countsChange(e, goodsIndex, index) {
+      const curItem = this.formData.goods[goodsIndex].models[index];
+      const worehouseCount = curItem.worehouseCount;
       if (e == 0) {
         this.$message.warning('鏁伴涓嶈兘涓�0');
-        curItem.counts = null
+        curItem.counts = null;
       }
       if (e > worehouseCount) {
         this.$message.warning('鏁伴瓒呰繃鐜版湁搴撳瓨');
-        curItem.counts = worehouseCount > 0 ? worehouseCount : null
+        curItem.counts = worehouseCount > 0 ? worehouseCount : null;
       }
     },
 
@@ -423,19 +437,27 @@
     handleSubmit() {
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
+          if (this.loading) return
+          this.loading = true;
+          this.btnloading = true;
           console.log('this.formData', this.formData);
-            outputAdd(this.formData)
-              .then((res) => {
-                this.$message.success('淇濆瓨鎴愬姛锛�');
-                this.close();
-                this.$emit('search');
-              })
-              .catch((err) => {
-                console.log('edit err', err);
-                this.$message.error('淇濆瓨澶辫触');
-              });
+          outputAdd(this.formData)
+            .then((res) => {
+              this.$message.success('淇濆瓨鎴愬姛锛�');
+              this.btnloading = false;
+              this.loading = false;
+              this.close();
+              this.$emit('search');
+            })
+            .catch((err) => {
+              console.log('edit err', err);
+              this.btnloading = false;
+              this.loading = false;
+              this.$message.error('淇濆瓨澶辫触');
+            });
         } else {
           this.$message.error('鏍¢獙鏈�氳繃锛岃妫�鏌ャ��');
+          this.btnloading = false;
         }
       });
     },

--
Gitblit v1.9.1