From 9d5d85f299bd14f5a510abf0b120c4ef873addac Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sat, 13 Aug 2022 23:25:14 +0800
Subject: [PATCH 1/2] =?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

---
 .../common/addResourceStoreType/addResourceStoreType.html     | 2 +-
 .../common/addResourceStoreType/addResourceStoreType.js       | 2 +-
 .../addResourceStoreSpecification.html                        | 4 ++--
 .../resourceStoreSpecificationManage.html                     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/components/common/addResourceStoreType/addResourceStoreType.html b/public/components/common/addResourceStoreType/addResourceStoreType.html
index e43cf8d5e..fcfa7aeb6 100644
--- a/public/components/common/addResourceStoreType/addResourceStoreType.html
+++ b/public/components/common/addResourceStoreType/addResourceStoreType.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="addResourceStoreType"></vc:i18n></span>
+                    <span><vc:i18n name="添加类型" namespace="addResourceStoreType"></vc:i18n></span>
                 </h3>
                 <div class="ibox-content">
                     <div>
diff --git a/public/components/common/addResourceStoreType/addResourceStoreType.js b/public/components/common/addResourceStoreType/addResourceStoreType.js
index d77b47731..28d47b2bc 100644
--- a/public/components/common/addResourceStoreType/addResourceStoreType.js
+++ b/public/components/common/addResourceStoreType/addResourceStoreType.js
@@ -57,7 +57,7 @@
                     function(json, res) {
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
                         let _json = JSON.parse(json)
-                        if (_json.code != 0) {
+                        if (_json.code == 0) {
                             //关闭model
                             $('#addResourceStoreTypeModel').modal('hide');
                             if (vc.component.addResourceStoreTypeInfo.parentId != null && vc.component.addResourceStoreTypeInfo.parentId != '' &&
diff --git a/public/components/property/addResourceStoreSpecification/addResourceStoreSpecification.html b/public/components/property/addResourceStoreSpecification/addResourceStoreSpecification.html
index 7e319a38d..2490d6bd0 100644
--- a/public/components/property/addResourceStoreSpecification/addResourceStoreSpecification.html
+++ b/public/components/property/addResourceStoreSpecification/addResourceStoreSpecification.html
@@ -1,9 +1,9 @@
-<div id="addResourceStoreSpecificationModel" class="modal fade" tabindex="-1" role="dialog"
+<div id="addResourceStoreSpecificationModel" class="modal fade" role="dialog"
      aria-labelledby="exampleModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
-                <h3 class="m-t-none m-b "><span><vc:i18n name="添加物品规格" namespace="addResourceStoreSpecification"></vc:i18n></span></h3>
+                <h3 class="m-t-none m-b "><span><vc:i18n name="添加规格" namespace="addResourceStoreSpecification"></vc:i18n></span></h3>
                 <div class="ibox-content">
                     <div>
                         <div>
diff --git a/public/pages/common/resourceStoreSpecificationManage/resourceStoreSpecificationManage.html b/public/pages/common/resourceStoreSpecificationManage/resourceStoreSpecificationManage.html
index e4de8a3b7..f3e4c0502 100644
--- a/public/pages/common/resourceStoreSpecificationManage/resourceStoreSpecificationManage.html
+++ b/public/pages/common/resourceStoreSpecificationManage/resourceStoreSpecificationManage.html
@@ -63,12 +63,12 @@
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
-                    <h5><span><vc:i18n name="物品规格信息" namespace="resourceStoreSpecificationManage"></vc:i18n></span></h5>
+                    <h5><span><vc:i18n name="物品规格" namespace="resourceStoreSpecificationManage"></vc:i18n></span></h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm"
                                 v-on:click="_openAddResourceStoreSpecificationModal()">
                             <i class="fa fa-plus"></i>
-                            添加物品规格
+                            添加
                         </button>
                     </div>
                 </div>

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 2/2] =?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>