diff --git a/src/api/community/communityApi.js b/src/api/community/communityApi.js index edbf219..81fe41e 100644 --- a/src/api/community/communityApi.js +++ b/src/api/community/communityApi.js @@ -14,7 +14,7 @@ export function _loadCommunityInfo(_param) { let _communityInfos = res.communitys; if (_communityInfos && _communityInfos.length > 0) { setCommunitys(_communityInfos); - let _currentCommunity = getCurrentCommunity() + let _currentCommunity = JSON.parse(window.localStorage.getItem('hc_currentCommunityInfo')); if(_currentCommunity){ resolve(res) return ; diff --git a/src/components/resource/chooseResourceStore2.vue b/src/components/resource/chooseResourceStore2.vue index 04a7203..20e1137 100644 --- a/src/components/resource/chooseResourceStore2.vue +++ b/src/components/resource/chooseResourceStore2.vue @@ -3,47 +3,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ $t('common.search') }} - - - - {{ $t('common.reset') }} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('common.search') }} + + + + {{ $t('common.reset') }} + + + @@ -51,51 +51,51 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + -
- - - {{ $t('common.submit') }} - - - - {{ $t('common.cancel') }} - -
+
+ + + {{ $t('common.submit') }} + + + + {{ $t('common.cancel') }} + +
@@ -161,15 +161,15 @@ export default { try { const res = await listResourceStores({ - page: _page, - row: _row, - communityId: "", - resOrderType: _resOrderType, - shType: _shType, - resName: this.chooseResourceStoreInfo2._currentResourceStoreName, - parentRstId: this.chooseResourceStoreInfo2.parentRstId, - rstId: this.chooseResourceStoreInfo2.rstId, - shId: this.chooseResourceStoreInfo2.shId + page: _page, + row: _row, + communityId: "", + resOrderType: _resOrderType, + shType: _shType, + resName: this.chooseResourceStoreInfo2._currentResourceStoreName, + parentRstId: this.chooseResourceStoreInfo2.parentRstId, + rstId: this.chooseResourceStoreInfo2.rstId, + shId: this.chooseResourceStoreInfo2.shId }) const _resourceStoreInfo = res this.chooseResourceStoreInfo2.resourceStores = _resourceStoreInfo.resourceStores diff --git a/src/views/layout/layout.vue b/src/views/layout/layout.vue index 772173d..0a0d1d4 100644 --- a/src/views/layout/layout.vue +++ b/src/views/layout/layout.vue @@ -125,6 +125,8 @@ export default { async loadCommunity() { const { communitys } = await _loadCommunityInfo() this.communitys = communitys + this.curCommunityName = getCommunityName() + }, async _loadStoreInfo() { this.loading = true diff --git a/src/views/resource/addItemOutLang.js b/src/views/resource/addItemOutLang.js index 3c6fb8b..068953a 100644 --- a/src/views/resource/addItemOutLang.js +++ b/src/views/resource/addItemOutLang.js @@ -40,29 +40,7 @@ export const messages = { contactPhone: 'Contact Phone', applicationNote: 'Application Note' }, - chooseResourceStore2: { - title: 'Select Items (Collection/Purchase/Direct Outbound)', - warehouse: 'Warehouse', - warehousePlaceholder: 'Please select warehouse', - itemType: 'Item Type', - itemTypePlaceholder: 'Please select item type', - subType: 'Sub Type', - subTypePlaceholder: 'Please select sub type', - itemName: 'Item Name', - itemNamePlaceholder: 'Enter item name', - search: 'Search', - reset: 'Reset', - submit: 'Submit', - cancel: 'Cancel', - selectItemWarning: 'Please select at least one item', - fetchWarehouseError: 'Failed to fetch warehouses', - fetchItemTypeError: 'Failed to fetch item types', - fetchSubItemTypeError: 'Failed to fetch sub item types', - fetchItemListError: 'Failed to fetch item list', - itemCode: 'Item Code', - fixedItem: 'Fixed Item', - stock: 'Stock' - }, + }, zh: { addItemOut: { @@ -105,28 +83,6 @@ export const messages = { contactPhone: '联系电话', applicationNote: '申请说明' }, - chooseResourceStore2: { - title: '【物品领用/采购申请/直接出库】选择物品', - warehouse: '仓库', - warehousePlaceholder: '请选择仓库', - itemType: '物品类型', - itemTypePlaceholder: '请选择物品类型', - subType: '二级分类', - subTypePlaceholder: '请选择二级分类', - itemName: '物品名称', - itemNamePlaceholder: '输入物品管理名称', - search: '查询', - reset: '重置', - submit: '提交', - cancel: '取消', - selectItemWarning: '请选择需要采购的物品', - fetchWarehouseError: '获取仓库列表失败', - fetchItemTypeError: '获取物品类型失败', - fetchSubItemTypeError: '获取二级分类失败', - fetchItemListError: '获取物品列表失败', - itemCode: '物品编码', - fixedItem: '固定物品', - stock: '物品库存' - }, + } } \ No newline at end of file diff --git a/src/views/resource/addPurchaseApplyList.vue b/src/views/resource/addPurchaseApplyList.vue index b3e2468..ce3acc4 100644 --- a/src/views/resource/addPurchaseApplyList.vue +++ b/src/views/resource/addPurchaseApplyList.vue @@ -50,59 +50,62 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{{ $t('addPurchaseApply.itemType') }}{{ $t('addPurchaseApply.itemNameCode') }}{{ $t('addPurchaseApply.itemSpec') }}{{ $t('addPurchaseApply.price') }}{{ $t('addPurchaseApply.itemStock') }}{{ $t('addPurchaseApply.applyQuantity') }}{{ $t('addPurchaseApply.remark') }}{{ $t('addPurchaseApply.operation') }}
+ {{ item.parentRstName ? item.parentRstName : '-' }} > + {{ item.rstName ? item.rstName : '-' }} + + {{ item.resName }}({{ item.resCode }}) + + {{ item.rssName ? item.rssName : '-' }} + + + + {{ _getTimesStock(item) }}{{ item.unitCodeName }} + + +   {{ item.unitCodeName }} + + + + + {{ $t('addPurchaseApply.remove') }} + +
+
@@ -333,6 +336,10 @@ export default { this.addPurchaseApplyInfo.resourceStores[index].selectedStock = item.stock } }) + // 强制更新视图 + this.$nextTick(() => { + this.$forceUpdate() + }) }, _getTimesStock(_resourceStore) { if (!_resourceStore.timesId) { @@ -344,9 +351,9 @@ export default { _stock = _item.stock } }) - if (!_resourceStore.quantity) { - _resourceStore.quantity = '' - } + // if (!_resourceStore.quantity) { + // _resourceStore.quantity = '' + // } return _stock }, async _loadStaffOrg(_flowId) { @@ -425,7 +432,6 @@ export default { } } - \ No newline at end of file diff --git a/src/views/resource/purchaseApplyManageList.vue b/src/views/resource/purchaseApplyManageList.vue index e536535..ac5f9f8 100644 --- a/src/views/resource/purchaseApplyManageList.vue +++ b/src/views/resource/purchaseApplyManageList.vue @@ -4,21 +4,17 @@
- -
-
-
    -
  • - {{ item.name }} -
    • -
-
+
+
+
    +
  • + {{ item.name }} +
    • +
- +
@@ -74,7 +70,8 @@
- + {{ scope.row.warehousingWay == 10000 - ? $t('purchaseApplyManage.warehousingWay.direct') - : scope.row.warehousingWay == 20000 - ? $t('purchaseApplyManage.warehousingWay.purchase') - : $t('purchaseApplyManage.warehousingWay.urgent') + ? $t('purchaseApplyManage.warehousingWay.direct') + : scope.row.warehousingWay == 20000 + ? $t('purchaseApplyManage.warehousingWay.purchase') + : $t('purchaseApplyManage.warehousingWay.urgent') }} @@ -101,18 +98,18 @@ + " @click="_openRunWorkflowImage(scope.row)"> {{ $t('purchaseApplyManage.button.flowChart') }} + " @click="_openDeletePurchaseApplyModel(scope.row)"> {{ $t('purchaseApplyManage.button.cancelApply') }} + " @click="_openDeletePurchaseApplyModel(scope.row)"> {{ $t('purchaseApplyManage.button.cancelApply') }} @@ -323,25 +320,6 @@ export default { margin-right: 5px; } - .list-group { - padding: 0; - margin: 0; - list-style: none; - - .list-group-item { - padding: 10px; - border: 1px solid #ebeef5; - cursor: pointer; - - &:hover { - background-color: #f5f7fa; - } - - &.vc-node-selected { - background-color: #409eff; - color: #fff; - } - } - } + } \ No newline at end of file