admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-06-12 10:00:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunityWeb

Browse Source
This commit is contained in:
java110 2022-08-14 15:01:31 +08:00
commit 011bd28be7
7 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/components/common/addResourceStore/addResourceStore.html
View File

@ -146,7 +146,7 @@
<div class="col-sm-10"> <div class="col-sm-10">
<select class="custom-select" v-model="addResourceStoreInfo.miniUnitCode"> <select class="custom-select" v-model="addResourceStoreInfo.miniUnitCode">
<option selected disabled value=""> <option selected disabled value="">
{{vc.i18n('必填','addResourceStore')}}，请选择物品最小计量单位 {{vc.i18n('必填，请选择物品最小计量单位','addResourceStore')}}
</option> </option>
<option v-for="(item,index) in addResourceStoreInfo.unitCodes" :key="index" <option v-for="(item,index) in addResourceStoreInfo.unitCodes" :key="index"
v-bind:value="item.statusCd"> v-bind:value="item.statusCd">

22
public/components/common/addResourceStore/addResourceStore.js
View File

@ -271,7 +271,7 @@
}, },
// 根据分类查询规格(一级分类) // 根据分类查询规格(一级分类)
_loadResourceStoreSpecificationAdd: function () { _loadResourceStoreSpecificationAdd: function () {
var param = { let param = {
params: { params: {
page: 1, page: 1,
row: 100, row: 100,
@ -312,6 +312,15 @@
); );
}, },
clearAddResourceStoreInfo: function () { 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 = { vc.component.addResourceStoreInfo = {
resName: '', resName: '',
resCode: '', resCode: '',
@ -327,15 +336,20 @@
unitCode: '', unitCode: '',
shId: '', shId: '',
isFixed: '', isFixed: '',
unitCodes: [], rssId:'',
miniUnitCode:'',
unitCodes: _unitCodes,
photos: [], photos: [],
storehouses: [], storehouses: [],
isFixeds: [], resourceStoreTypes: _resourceStoreTypes,
resourceStoreSpecifications: _resourceStoreSpecifications,
sonResourceStoreTypes:_sonResourceStoreTypes,
isFixeds: _isFixeds,
warningStock: '' warningStock: ''
}; };
}, },
_listAddStorehouses: function (_page, _rows) { _listAddStorehouses: function (_page, _rows) {
var param = { let param = {
params: { params: {
page: 1, page: 1,
row: 100, row: 100,

2
public/components/common/addResourceStoreType/addResourceStoreType.html
View File

@ -4,7 +4,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body">
<h3 class="m-t-none m-b "> <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> </h3>
<div class="ibox-content"> <div class="ibox-content">
<div> <div>

2
public/components/common/addResourceStoreType/addResourceStoreType.js
View File

@ -57,7 +57,7 @@
function(json, res) { function(json, res) {
//vm.menus = vm.refreshMenuActive(JSON.parse(json),0); //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
let _json = JSON.parse(json) let _json = JSON.parse(json)
if (_json.code != 0) { if (_json.code == 0) {
//关闭model //关闭model
$('#addResourceStoreTypeModel').modal('hide'); $('#addResourceStoreTypeModel').modal('hide');
if (vc.component.addResourceStoreTypeInfo.parentId != null && vc.component.addResourceStoreTypeInfo.parentId != '' && if (vc.component.addResourceStoreTypeInfo.parentId != null && vc.component.addResourceStoreTypeInfo.parentId != '' &&

2
public/components/common/editResourceStore/editResourceStore.html
View File

@ -4,7 +4,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body">
<h3 class="m-t-none m-b "> <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> </h3>
<div class="ibox-content"> <div class="ibox-content">
<div> <div>

4
public/components/property/addResourceStoreSpecification/addResourceStoreSpecification.html
View File

@ -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"> aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <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 class="ibox-content">
<div> <div>
<div> <div>

4
public/pages/common/resourceStoreSpecificationManage/resourceStoreSpecificationManage.html
View File

@ -63,12 +63,12 @@
<div class="col-lg-12"> <div class="col-lg-12">
<div class="ibox"> <div class="ibox">
<div class="ibox-title"> <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;"> <div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-primary btn-sm" <button type="button" class="btn btn-primary btn-sm"
v-on:click="_openAddResourceStoreSpecificationModal()"> v-on:click="_openAddResourceStoreSpecificationModal()">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
添加物品规格 添加
</button> </button>
</div> </div>
</div> </div>