From 35d1d90e4ecfbfb99e5027b0e1291288d34bf1d4 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sun, 14 Aug 2022 00:11:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addResourceStore/addResourceStore.html    |  2 +-
 .../addResourceStore/addResourceStore.js      | 22 +++++++++++++++----
 .../editResourceStore/editResourceStore.html  |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/public/components/common/addResourceStore/addResourceStore.html b/public/components/common/addResourceStore/addResourceStore.html
index b5a4981df..f13bebb69 100755
--- a/public/components/common/addResourceStore/addResourceStore.html
+++ b/public/components/common/addResourceStore/addResourceStore.html
@@ -146,7 +146,7 @@
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="addResourceStoreInfo.miniUnitCode">
                                         <option selected disabled value="">
-                                            {{vc.i18n('必填','addResourceStore')}}，请选择物品最小计量单位
+                                            {{vc.i18n('必填，请选择物品最小计量单位','addResourceStore')}}
                                         </option>
                                         <option v-for="(item,index) in addResourceStoreInfo.unitCodes" :key="index"
                                                 v-bind:value="item.statusCd">
diff --git a/public/components/common/addResourceStore/addResourceStore.js b/public/components/common/addResourceStore/addResourceStore.js
index 21828189b..3d2691ad0 100755
--- a/public/components/common/addResourceStore/addResourceStore.js
+++ b/public/components/common/addResourceStore/addResourceStore.js
@@ -271,7 +271,7 @@
             },
             // 根据分类查询规格(一级分类)
             _loadResourceStoreSpecificationAdd: function () {
-                var param = {
+                let param = {
                     params: {
                         page: 1,
                         row: 100,
@@ -312,6 +312,15 @@
                 );
             },
             clearAddResourceStoreInfo: function () {
+
+                   let _unitCodes =  vc.component.addResourceStoreInfo.unitCodes;
+               
+                   let _isFixeds = vc.component.addResourceStoreInfo.isFixeds;
+
+                  let _resourceStoreTypes = vc.component.addResourceStoreInfo.resourceStoreTypes;
+                  let _sonResourceStoreTypes = vc.component.addResourceStoreInfo.sonResourceStoreTypes;
+                  let _resourceStoreSpecifications = vc.component.addResourceStoreInfo.resourceStoreSpecifications;
+                  
                 vc.component.addResourceStoreInfo = {
                     resName: '',
                     resCode: '',
@@ -327,15 +336,20 @@
                     unitCode: '',
                     shId: '',
                     isFixed: '',
-                    unitCodes: [],
+                    rssId:'',
+                    miniUnitCode:'',
+                    unitCodes: _unitCodes,
                     photos: [],
                     storehouses: [],
-                    isFixeds: [],
+                    resourceStoreTypes: _resourceStoreTypes,
+                    resourceStoreSpecifications: _resourceStoreSpecifications,
+                    sonResourceStoreTypes:_sonResourceStoreTypes,
+                    isFixeds: _isFixeds,
                     warningStock: ''
                 };
             },
             _listAddStorehouses: function (_page, _rows) {
-                var param = {
+                let param = {
                     params: {
                         page: 1,
                         row: 100,
diff --git a/public/components/common/editResourceStore/editResourceStore.html b/public/components/common/editResourceStore/editResourceStore.html
index dc7effc1e..d0e3f34b3 100755
--- a/public/components/common/editResourceStore/editResourceStore.html
+++ b/public/components/common/editResourceStore/editResourceStore.html
@@ -4,7 +4,7 @@
         <div class="modal-content">
             <div class="modal-body">
                 <h3 class="m-t-none m-b ">
-                    <span><vc:i18n name="修改物品管理" namespace="editResourceStore"></vc:i18n></span>
+                    <span><vc:i18n name="修改物品" namespace="editResourceStore"></vc:i18n></span>
                 </h3>
                 <div class="ibox-content">
                     <div>