From 20913c80c3f5fc8e533cb92b90e6f20bcd68e032 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 17:49:32 +0800
Subject: [PATCH] feat: 1、优化导入 2、部门物品台账查询对接
---
admin-web/src/views/stock/transfer/transferissue/detail.vue | 2
admin-web/src/views/mixins/listPage.js | 5
admin-web/src/views/stock/scrap/itemScrapping/edit.vue | 18
admin-web/src/views/systemSetting/menu/index.vue | 2
admin-web/src/views/departmentitem/itemscr/scrapping/detail.vue | 4
admin-web/src/store/modules/user.js | 14
admin-web/src/api/system/sms.js | 1
admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue | 15
admin-web/src/router/index.js | 6
admin-web/src/api/foudation/classification.js | 13
admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue | 3
admin-web/src/layout/components/Sidebar/Link.vue | 2
admin-web/src/views/systemSetting/dict/index.vue | 3
admin-web/src/components/upload/index.vue | 6
admin-web/src/views/stock/procure/receiptDetails/index.vue | 3
admin-web/src/views/dashboard/components/LBJETJ.vue | 1
admin-web/src/views/departmentitem/itemdis/distribution/detail.vue | 6
admin-web/src/utils/auth.js | 2
admin-web/src/views/departmentitem/itemret/returnNote/detail.vue | 4
admin-web/src/views/systemSetting/user/authRole.vue | 2
admin-web/src/directive/index.js | 1
admin-web/src/views/stock/scrap/itemScrapping/index.vue | 4
admin-web/src/views/departmentitem/itemret/returnNote/edit.vue | 15
admin-web/src/components/HeaderSearch/index.vue | 3
admin-web/src/views/departmentitem/itemdis/distribution/edit.vue | 9
admin-web/src/views/stock/accessStock/outboundDetails/index.vue | 14
admin-web/src/libs/index.js | 3
admin-web/src/components/SvgIcon/index.vue | 2
admin-web/src/views/systemSetting/dept/index.vue | 2
admin-web/src/libs/wechat.js | 8
admin-web/src/utils/settingIplatform.js | 2
admin-web/src/views/stock/accessStock/outbound/detail.vue | 2
admin-web/src/views/departmentitem/itemscr/scrapping/index.vue | 2
admin-web/src/views/systemManger/org/index.vue | 3
admin-web/src/layout/components/Navbar.vue | 1
admin-web/src/views/stock/accessStock/outbound/edit.vue | 15
admin-web/src/utils/error-log.js | 2
admin-web/src/views/statisticalreport/itemReport/index.vue | 28 -
admin-web/src/store/modules/app.js | 1
admin-web/src/views/stock/ledger/inventoryQuery/index.vue | 100 ++--
admin-web/src/utils/index.js | 3
admin-web/src/views/stock/scrap/itemScrapping/detail.vue | 6
admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue | 142 +++++--
admin-web/src/views/stock/ledger/ledgerQuery/index.vue | 4
admin-web/src/views/departmentitem/itemdis/disDetails/edit.vue | 3
admin-web/src/components/mySearch/SearchItem.vue | 1
admin-web/src/libs/dialog.js | 10
admin-web/src/layout/components/Sidebar/index.vue | 5
admin-web/src/main.js | 19
admin-web/src/views/foundation/classification/edit.vue | 5
admin-web/src/views/systemManger/server/user/index.vue | 1
admin-web/src/views/stock/inventorycount/inventorytask/index.vue | 9
admin-web/src/views/foundation/store/edit.vue | 2
admin-web/src/components/mySearchCopy/SearchItem.vue | 2
admin-web/src/plugins/auth.js | 1
admin-web/src/views/foundation/classification/index.vue | 7
admin-web/src/views/stock/procure/purchaseOrder/detail.vue | 4
admin-web/src/directive/copy/copy.js | 2
admin-web/src/filters/wx.js | 1
admin-web/src/views/components/myImport.vue | 5
admin-web/src/components/myTable/myTable.vue | 1
admin-web/src/views/stock/inventorycount/inventorytask/edit.vue | 10
admin-web/src/plugins/modal.js | 2
admin-web/src/utils/exportExcel.js | 1
admin-web/src/views/stock/ledger/alertQuery/index.vue | 22
admin-web/src/views/systemSetting/role/authUser.vue | 2
admin-web/src/views/systemSetting/role/index.vue | 8
admin-web/src/api/system/user.js | 1
admin-web/src/views/foundation/store/person.vue | 4
admin-web/src/views/systemManger/server/user/editRole.vue | 1
admin-web/src/views/stock/transfer/transferApplication/edit.vue | 9
admin-web/src/views/stock/transfer/transferissue/index.vue | 4
admin-web/src/components/myTable/myTableV2.vue | 1
admin-web/src/vendor/Export2Excel.js | 2
admin-web/src/views/departmentitem/itemdis/disDetails/index.vue | 58 +-
admin-web/src/directive/permission/hasPermi.js | 1
admin-web/src/views/systemManger/server/user/edit.vue | 14
admin-web/src/views/systemSetting/department/data.vue | 4
admin-web/src/views/stock/procure/purchaseOrder/edit.vue | 12
admin-web/src/views/stock/scrap/scrapDetails/index.vue | 3
admin-web/src/views/departmentitem/itemdis/distribution/index.vue | 1
admin-web/src/utils/newToExcel.js | 2
admin-web/src/views/stock/transfer/transferApplication/index.vue | 3
admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue | 1
admin-web/src/views/dataV/static.vue | 2
admin-web/src/views/stock/ledger/inventoryAlert/index.vue | 97 ++--
admin-web/src/filters/commFilter.js | 3
admin-web/src/views/systemSetting/department/edit.vue | 5
admin-web/src/utils/stockType.js | 6
admin-web/src/views/systemSetting/user/index.vue | 32
admin-web/src/views/stock/accessStock/outbound/index.vue | 2
admin-web/src/views/departmentitem/ledgerquy/itemQuy/index.vue | 108 ++++-
admin-web/public/static/config.js | 4
admin-web/src/utils/eventBus.js | 1
admin-web/src/views/login/mixins.js | 2
admin-web/src/views/systemSetting/department/index.vue | 3
admin-web/src/views/stock/transfer/transferdetails/index.vue | 3
admin-web/src/directive/permission/hasRole.js | 1
admin-web/src/store/modules/settings.js | 1
admin-web/src/utils/ZBKJIutil.js | 1
admin-web/src/views/systemSetting/user/profile/userInfo.vue | 4
admin-web/src/views/stock/procure/purchaseOrder/index.vue | 4
admin-web/src/plugins/download.js | 6
admin-web/src/api/deptGoods/ledgerQuery.js | 11
admin-web/src/views/departmentitem/itemret/returnNote/index.vue | 2
admin-web/src/views/dataV/components/cityScore.vue | 1
admin-web/src/views/stock/inventorycount/inventorytask/detail.vue | 3
admin-web/src/permission.js | 4
admin-web/src/components/echartsNew/index.vue | 1
admin-web/src/vendor/Export2Zip.js | 2
admin-web/src/views/systemSetting/role/selectUser.vue | 3
admin-web/src/views/stock/ledger/inventoryAlert/edit.vue | 14
admin-web/src/views/stock/transfer/transferApplication/detail.vue | 2
admin-web/src/views/systemSetting/dict/data.vue | 4
admin-web/src/api/foudation/store.js | 3
115 files changed, 560 insertions(+), 503 deletions(-)
diff --git a/admin-web/public/static/config.js b/admin-web/public/static/config.js
index 2c5f21a..b7e2788 100644
--- a/admin-web/public/static/config.js
+++ b/admin-web/public/static/config.js
@@ -4,8 +4,8 @@
// 涓婁紶璺緞
ftpUrl: 'https://yqzx.jinmingyuan.com/lowConsum',//寮�鍙�
// 鎺ュ彛璇锋眰鍦板潃
- apiBaseURL: 'http://172.16.20.2:8083/lowConsum',//寮�鍙�
- // apiBaseURL: 'http://172.16.60.155:8083/lowConsum',//寮�鍙�
+ // apiBaseURL: 'http://172.16.20.2:8083/lowConsum',//寮�鍙�
+ apiBaseURL: 'http://172.16.60.155:8083/lowConsum',//寮�鍙�
// apiBaseURL: 'https://yqzx.jinmingyuan.com/lowConsum',//寮�鍙�
debug: false //璋冭瘯寮�鍏� true鏃朵細杈撳嚭璇锋眰鏃ュ織
};
diff --git a/admin-web/src/api/deptGoods/ledgerQuery.js b/admin-web/src/api/deptGoods/ledgerQuery.js
new file mode 100644
index 0000000..f22acd2
--- /dev/null
+++ b/admin-web/src/api/deptGoods/ledgerQuery.js
@@ -0,0 +1,11 @@
+
+import request from '@/utils/request';
+// 鐗╁搧鏌ヨ瀵煎嚭
+export function doExport(params) {
+ return request({
+ url: '/pc/fin/warehouse/ledger/getDeptListExport',
+ responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
+ method: 'post',
+ params,
+ });
+}
diff --git a/admin-web/src/api/foudation/classification.js b/admin-web/src/api/foudation/classification.js
index b2465c1..15a525d 100644
--- a/admin-web/src/api/foudation/classification.js
+++ b/admin-web/src/api/foudation/classification.js
@@ -2,12 +2,11 @@
import SettingIplatform from '@/utils/settingIplatform';
export function getTree(parameter) {
- return request.get(SettingIplatform.apiBaseURL + '/pc/base/category/select/tree', {params: parameter})
+ return request.get(SettingIplatform.apiBaseURL + '/pc/base/category/select/tree', {params: parameter})
}
+
export function getCategoryDetail(params) {
- return request({
- url: '/pc/base/category/detail',
- method: 'get',
- params
- })
-}
\ No newline at end of file
+ return request({
+ url: '/pc/base/category/detail', method: 'get', params
+ })
+}
diff --git a/admin-web/src/api/foudation/store.js b/admin-web/src/api/foudation/store.js
index a9fda17..d50eafe 100644
--- a/admin-web/src/api/foudation/store.js
+++ b/admin-web/src/api/foudation/store.js
@@ -1,5 +1,4 @@
import request from '@/utils/request'
-import SettingIplatform from '@/utils/settingIplatform';
export function userSelectDepartment(params) {
return request({
@@ -23,4 +22,4 @@
method: 'get',
params
})
-}
\ No newline at end of file
+}
diff --git a/admin-web/src/api/system/sms.js b/admin-web/src/api/system/sms.js
index e32ae38..5b52b6c 100644
--- a/admin-web/src/api/system/sms.js
+++ b/admin-web/src/api/system/sms.js
@@ -9,6 +9,7 @@
// +----------------------------------------------------------------------
import request from '@/utils/request';
+
/**
* @description 鐭俊鍙戦�佽褰� -- 鍒楄〃
*/
diff --git a/admin-web/src/api/system/user.js b/admin-web/src/api/system/user.js
index 738219e..333cb29 100644
--- a/admin-web/src/api/system/user.js
+++ b/admin-web/src/api/system/user.js
@@ -1,5 +1,4 @@
import request from '@/utils/request'
-import { isEmptyValue } from "@/utils/StringUtils";
// 鏌ヨ鐢ㄦ埛鍒楄〃
export function listUser(query) {
diff --git a/admin-web/src/components/HeaderSearch/index.vue b/admin-web/src/components/HeaderSearch/index.vue
index 9ac6577..46776c7 100644
--- a/admin-web/src/components/HeaderSearch/index.vue
+++ b/admin-web/src/components/HeaderSearch/index.vue
@@ -20,7 +20,8 @@
<script>
import Fuse from 'fuse.js';
import path from 'path';
-import { mapGetters } from 'vuex';
+import {mapGetters} from 'vuex';
+
export default {
name: 'HeaderSearch',
data() {
diff --git a/admin-web/src/components/SvgIcon/index.vue b/admin-web/src/components/SvgIcon/index.vue
index a8e75b7..38470e4 100644
--- a/admin-web/src/components/SvgIcon/index.vue
+++ b/admin-web/src/components/SvgIcon/index.vue
@@ -16,7 +16,7 @@
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
// doc: https://panjiachen.github.io/vue-element-admin-site/feature/component/svg-icon.html#usage
-import { isExternal } from '@/utils/validate';
+import {isExternal} from '@/utils/validate';
export default {
name: 'SvgIcon',
diff --git a/admin-web/src/components/echartsNew/index.vue b/admin-web/src/components/echartsNew/index.vue
index 7a60da7..7693dd0 100644
--- a/admin-web/src/components/echartsNew/index.vue
+++ b/admin-web/src/components/echartsNew/index.vue
@@ -15,6 +15,7 @@
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
import echarts from 'echarts';
+
export default {
name: 'Index',
props: {
diff --git a/admin-web/src/components/mySearch/SearchItem.vue b/admin-web/src/components/mySearch/SearchItem.vue
index 0dbda42..349caed 100644
--- a/admin-web/src/components/mySearch/SearchItem.vue
+++ b/admin-web/src/components/mySearch/SearchItem.vue
@@ -125,7 +125,6 @@
</template>
<script>
-import {formatDates} from '@/utils/index';
import request from '@/utils/request';
function trim(str) {
diff --git a/admin-web/src/components/mySearchCopy/SearchItem.vue b/admin-web/src/components/mySearchCopy/SearchItem.vue
index 30581e7..22d0370 100644
--- a/admin-web/src/components/mySearchCopy/SearchItem.vue
+++ b/admin-web/src/components/mySearchCopy/SearchItem.vue
@@ -114,7 +114,7 @@
</template>
<script>
-import { formatDates } from '@/utils/index';
+import {formatDates} from '@/utils/index';
import request from '@/utils/request';
function trim(str) {
diff --git a/admin-web/src/components/myTable/myTable.vue b/admin-web/src/components/myTable/myTable.vue
index 9fcc7ce..760e380 100644
--- a/admin-web/src/components/myTable/myTable.vue
+++ b/admin-web/src/components/myTable/myTable.vue
@@ -201,6 +201,7 @@
import mySwitch from '@/components/mySwitch/mySwitch'
import request from '@/utils/request'
import * as valid from '@/utils/validate'
+
export default {
components: { myButton, mySwitch },
props: {
diff --git a/admin-web/src/components/myTable/myTableV2.vue b/admin-web/src/components/myTable/myTableV2.vue
index be5cf3f..7932ddc 100644
--- a/admin-web/src/components/myTable/myTableV2.vue
+++ b/admin-web/src/components/myTable/myTableV2.vue
@@ -198,6 +198,7 @@
import mySwitch from '@/components/mySwitch/mySwitch'
import request from '@/utils/request'
import * as valid from '@/utils/validate'
+
export default {
components: { myButton, mySwitch },
props: {
diff --git a/admin-web/src/components/upload/index.vue b/admin-web/src/components/upload/index.vue
index cc70d3a..a670aaf 100644
--- a/admin-web/src/components/upload/index.vue
+++ b/admin-web/src/components/upload/index.vue
@@ -54,9 +54,9 @@
</template>
<script>
-import { getToken } from '@/utils/auth'
-import { sessionToken } from '@/settings'
-import { getDownUrl } from '@/utils/base'
+import {getToken} from '@/utils/auth'
+import {sessionToken} from '@/settings'
+import {getDownUrl} from '@/utils/base'
import Viewer from 'viewerjs'
import 'viewerjs/dist/viewer.css'
diff --git a/admin-web/src/directive/copy/copy.js b/admin-web/src/directive/copy/copy.js
index ae49b34..d0213be 100644
--- a/admin-web/src/directive/copy/copy.js
+++ b/admin-web/src/directive/copy/copy.js
@@ -8,7 +8,7 @@
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
-import { Message } from 'element-ui';
+import {Message} from 'element-ui';
const vCopy = {
// 鍚嶅瓧鐖卞彇鍟ュ彇鍟�
diff --git a/admin-web/src/directive/index.js b/admin-web/src/directive/index.js
index 4dbc507..faf18b8 100644
--- a/admin-web/src/directive/index.js
+++ b/admin-web/src/directive/index.js
@@ -1,4 +1,3 @@
-
import hasRole from './permission/hasRole';
import hasPermi from './permission/hasPermi';
import dialogDrag from './dialog/drag';
diff --git a/admin-web/src/directive/permission/hasPermi.js b/admin-web/src/directive/permission/hasPermi.js
index 04be248..a41fe9e 100644
--- a/admin-web/src/directive/permission/hasPermi.js
+++ b/admin-web/src/directive/permission/hasPermi.js
@@ -1,4 +1,3 @@
-
import store from '@/store';
export default {
diff --git a/admin-web/src/directive/permission/hasRole.js b/admin-web/src/directive/permission/hasRole.js
index 8a10828..7b3adab 100644
--- a/admin-web/src/directive/permission/hasRole.js
+++ b/admin-web/src/directive/permission/hasRole.js
@@ -1,4 +1,3 @@
-
import store from '@/store';
export default {
diff --git a/admin-web/src/filters/commFilter.js b/admin-web/src/filters/commFilter.js
index 0e0a7e2..ae18762 100644
--- a/admin-web/src/filters/commFilter.js
+++ b/admin-web/src/filters/commFilter.js
@@ -1,6 +1,5 @@
-
import * as constants from '@/utils/constants.js';
-import { formatDates } from '@/utils/index';
+import {formatDates} from '@/utils/index';
// 鍏叡杩囨护鍣�
export function filterEmpty(val) {
diff --git a/admin-web/src/filters/wx.js b/admin-web/src/filters/wx.js
index b3cfad8..abb0e4f 100644
--- a/admin-web/src/filters/wx.js
+++ b/admin-web/src/filters/wx.js
@@ -10,6 +10,7 @@
//灏忕▼搴� 寰俊杩囨护鍣�
import Cookies from 'js-cookie';
+
/**
* @description 灏忕▼搴忔墍灞炵被鐩�
*/
diff --git a/admin-web/src/layout/components/Navbar.vue b/admin-web/src/layout/components/Navbar.vue
index 052dffb..0e7fb81 100644
--- a/admin-web/src/layout/components/Navbar.vue
+++ b/admin-web/src/layout/components/Navbar.vue
@@ -33,6 +33,7 @@
<script>
import {mapGetters} from 'vuex'
import {getDownUrl} from "@/utils/base";
+
export default {
data() {
return {
diff --git a/admin-web/src/layout/components/Sidebar/Link.vue b/admin-web/src/layout/components/Sidebar/Link.vue
index 20f8ab3..89d8420 100644
--- a/admin-web/src/layout/components/Sidebar/Link.vue
+++ b/admin-web/src/layout/components/Sidebar/Link.vue
@@ -6,7 +6,7 @@
</template>
<script>
-import { isExternal } from '@/utils/validate';
+import {isExternal} from '@/utils/validate';
export default {
props: {
diff --git a/admin-web/src/layout/components/Sidebar/index.vue b/admin-web/src/layout/components/Sidebar/index.vue
index d6414d6..dde20a3 100644
--- a/admin-web/src/layout/components/Sidebar/index.vue
+++ b/admin-web/src/layout/components/Sidebar/index.vue
@@ -49,11 +49,12 @@
</template>
<script>
-import { mapGetters, mapState } from 'vuex';
+import {mapGetters, mapState} from 'vuex';
import Logo from './Logo';
import SidebarItem from './SidebarItem';
import variables from '@/styles/variables.scss';
-import { isEmpty, isNotEmpty } from '@/utils/validate'
+import {isEmpty, isNotEmpty} from '@/utils/validate'
+
export default {
components: { SidebarItem, Logo },
data(){
diff --git a/admin-web/src/libs/dialog.js b/admin-web/src/libs/dialog.js
index 5904ec5..da69d75 100644
--- a/admin-web/src/libs/dialog.js
+++ b/admin-web/src/libs/dialog.js
@@ -9,11 +9,11 @@
// +----------------------------------------------------------------------
import {
- Confirm as confirm,
- Alert as alert,
- Toast as toast,
- Notify as notify,
- Loading as loading,
+ Alert as alert,
+ Confirm as confirm,
+ Loading as loading,
+ Notify as notify,
+ Toast as toast,
} from 'vue-ydui/dist/lib.rem/dialog';
const dialog = {
diff --git a/admin-web/src/libs/index.js b/admin-web/src/libs/index.js
index 48e43d0..83e1a0e 100644
--- a/admin-web/src/libs/index.js
+++ b/admin-web/src/libs/index.js
@@ -18,8 +18,9 @@
import * as Auth from '@/libs/wechat';
import util from '@/utils/utils';
import schema from 'async-validator';
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from '@/utils/parsing';
+import {handleTree, parseTime, resetForm} from '@/utils/parsing';
import axios from 'axios';
+
export default {
install(Vue) {
Vue.prototype.$modalSure = modalSure;
diff --git a/admin-web/src/libs/wechat.js b/admin-web/src/libs/wechat.js
index 4b79ab5..dbc7722 100644
--- a/admin-web/src/libs/wechat.js
+++ b/admin-web/src/libs/wechat.js
@@ -9,12 +9,12 @@
// +----------------------------------------------------------------------
import WechatJSSDK from 'wechat-jssdk/dist/client.umd';
-import { getWechatConfig, wechatAuth } from '@/api/system/wxApi';
-import { getToken, removeToken, setToken } from '@/utils/auth';
-import { parseQuery } from '@/utils';
+import {getWechatConfig, wechatAuth} from '@/api/system/wxApi';
+import {getToken, setToken} from '@/utils/auth';
import Cookies from 'js-cookie';
-const STATE_KEY = 'wx_authorize_state';
import store from '@/store';
+
+const STATE_KEY = 'wx_authorize_state';
const WX_AUTH = 'wx_auth';
const BACK_URL = 'login_back_url';
const LOGINTYPE = 'loginType';
diff --git a/admin-web/src/main.js b/admin-web/src/main.js
index 7095f49..c678513 100644
--- a/admin-web/src/main.js
+++ b/admin-web/src/main.js
@@ -13,16 +13,9 @@
import VueAwesomeSwiper from 'vue-awesome-swiper';
import Cookies from 'js-cookie';
import Debounce from './libs/debounce.js'; //闃叉姈鑷畾涔夋寚浠�
-Vue.config.devtools = true;
-
import Print from '@/utils/print';
-Vue.use(Print);
// 鐧惧害鍦板浘
import BaiduMap from 'vue-baidu-map'
-Vue.use(BaiduMap,{
- ak:''
-});
-
import App from './App';
import store from './store';
import router from './router';
@@ -40,7 +33,16 @@
import './directive/num';
import searchInfo from '@/utils/changeColor';
import exportExcel from '@/utils/exportExcel'; // 瀵煎嚭
-import {previewDoc, downLoad} from '@/utils/base';
+import {downLoad, previewDoc} from '@/utils/base';
+import '@/mock'
+
+Vue.config.devtools = true;
+
+Vue.use(Print);
+Vue.use(BaiduMap,{
+ ak:''
+});
+
Vue.prototype.exportExcelUtils = exportExcel;
Vue.prototype.previewDoc = previewDoc;
Vue.prototype.downLoad = downLoad;
@@ -163,7 +165,6 @@
}, delayTime);
},
});
-import '@/mock'
new Vue({
el: '#app',
router,
diff --git a/admin-web/src/permission.js b/admin-web/src/permission.js
index 589d741..b6f2371 100644
--- a/admin-web/src/permission.js
+++ b/admin-web/src/permission.js
@@ -1,9 +1,9 @@
import router from './router';
import store from './store';
-import { Message } from 'element-ui';
+import {Message} from 'element-ui';
import NProgress from 'nprogress'; // progress bar
import 'nprogress/nprogress.css'; // progress bar style
-import { getToken, getCPass } from '@/utils/auth'; // get token from cookie
+import {getToken} from '@/utils/auth'; // get token from cookie
import getPageTitle from '@/utils/get-page-title';
NProgress.configure({ showSpinner: false }); // NProgress Configuration
diff --git a/admin-web/src/plugins/auth.js b/admin-web/src/plugins/auth.js
index 845b2e8..f470fea 100644
--- a/admin-web/src/plugins/auth.js
+++ b/admin-web/src/plugins/auth.js
@@ -1,4 +1,3 @@
-
import store from '@/store';
function authPermission(permission) {
diff --git a/admin-web/src/plugins/download.js b/admin-web/src/plugins/download.js
index 107363f..7355203 100644
--- a/admin-web/src/plugins/download.js
+++ b/admin-web/src/plugins/download.js
@@ -8,10 +8,10 @@
// | Author: CRMEB Team <admin@crmeb.com>
// +---------------------------------------------------------------------
-import { saveAs } from 'file-saver';
+import {saveAs} from 'file-saver';
import axios from 'axios';
-import { getToken } from '@/utils/auth';
-import { Message } from 'element-ui';
+import {getToken} from '@/utils/auth';
+import {Message} from 'element-ui';
const baseURL = process.env.VUE_APP_BASE_API;
diff --git a/admin-web/src/plugins/modal.js b/admin-web/src/plugins/modal.js
index bcd71e8..11e9684 100644
--- a/admin-web/src/plugins/modal.js
+++ b/admin-web/src/plugins/modal.js
@@ -8,7 +8,7 @@
// | Author: CRMEB Team <admin@crmeb.com>
// +---------------------------------------------------------------------
-import { Message, MessageBox, Notification, Loading } from 'element-ui';
+import {Loading, Message, MessageBox, Notification} from 'element-ui';
let loadingInstance;
diff --git a/admin-web/src/router/index.js b/admin-web/src/router/index.js
index 1af6e2b..4f075bd 100644
--- a/admin-web/src/router/index.js
+++ b/admin-web/src/router/index.js
@@ -1,12 +1,10 @@
-
import Vue from 'vue';
import Router from 'vue-router';
-
-Vue.use(Router);
-
/* Layout */
import Layout from '@/layout';
+Vue.use(Router);
+
/**
* Note: sub-menu only appear when route children.length >= 1
diff --git a/admin-web/src/store/modules/app.js b/admin-web/src/store/modules/app.js
index f49977b..4dae0b5 100644
--- a/admin-web/src/store/modules/app.js
+++ b/admin-web/src/store/modules/app.js
@@ -1,4 +1,3 @@
-
import Cookies from 'js-cookie';
const state = {
diff --git a/admin-web/src/store/modules/settings.js b/admin-web/src/store/modules/settings.js
index 08db1e5..75085bc 100644
--- a/admin-web/src/store/modules/settings.js
+++ b/admin-web/src/store/modules/settings.js
@@ -10,6 +10,7 @@
import defaultSettings from '@/settings';
import Cache from '@/plugins/cache';
+
const { showSettings, tagsView, fixedHeader, sidebarLogo, topNav, sideTheme, navIcon } = defaultSettings;
const storageSetting = Cache.local.has('layout-setting') ? Cache.local.getJSON('layout-setting') : '';
const state = {
diff --git a/admin-web/src/store/modules/user.js b/admin-web/src/store/modules/user.js
index 4910810..4a42577 100644
--- a/admin-web/src/store/modules/user.js
+++ b/admin-web/src/store/modules/user.js
@@ -1,12 +1,20 @@
-import {getInfo, login, logout,getCurInfo} from '@/api/user';
-import {getToken, removeToken,setUserInfo, setToken,getUser,getUserDetail,setUserDetail,setCPass} from '@/utils/auth';
+import {getCurInfo, getInfo, login, logout} from '@/api/user';
+import {
+ getToken,
+ getUser,
+ getUserDetail,
+ removeToken,
+ setCPass,
+ setToken,
+ setUserDetail,
+ setUserInfo
+} from '@/utils/auth';
import router, {resetRouter} from '@/router';
import {isLoginApi} from '@/api/system/sms';
import Cookies from 'js-cookie';
import {getQueryString} from '@/libs/wechat';
import {Loading} from 'element-ui';
import {encrypt} from '@/utils/jsencrypt'
-import store from "@/store";
const state = {
info: getUser(),
diff --git a/admin-web/src/utils/ZBKJIutil.js b/admin-web/src/utils/ZBKJIutil.js
index bd7be94..da75003 100644
--- a/admin-web/src/utils/ZBKJIutil.js
+++ b/admin-web/src/utils/ZBKJIutil.js
@@ -1,4 +1,3 @@
-
import store from '@/store';
/**
diff --git a/admin-web/src/utils/auth.js b/admin-web/src/utils/auth.js
index 3f77cc6..7607ab9 100644
--- a/admin-web/src/utils/auth.js
+++ b/admin-web/src/utils/auth.js
@@ -1,5 +1,5 @@
-import Cookies from 'js-cookie';
import storage from 'store';
+
const TokenKey = 'iplatform_token';
const userKey = 'user'
const userInfo = 'userInfo'
diff --git a/admin-web/src/utils/error-log.js b/admin-web/src/utils/error-log.js
index 3a04713..ce14e8d 100644
--- a/admin-web/src/utils/error-log.js
+++ b/admin-web/src/utils/error-log.js
@@ -10,7 +10,7 @@
import Vue from 'vue';
import store from '@/store';
-import { isString, isArray } from '@/utils/validate';
+import {isArray, isString} from '@/utils/validate';
import settings from '@/settings';
// you can set in settings.js
diff --git a/admin-web/src/utils/eventBus.js b/admin-web/src/utils/eventBus.js
index b0230b5..8853b4d 100644
--- a/admin-web/src/utils/eventBus.js
+++ b/admin-web/src/utils/eventBus.js
@@ -1,2 +1,3 @@
import Vue from 'vue'
+
export default new Vue()
diff --git a/admin-web/src/utils/exportExcel.js b/admin-web/src/utils/exportExcel.js
index 761a31f..dbb0871 100644
--- a/admin-web/src/utils/exportExcel.js
+++ b/admin-web/src/utils/exportExcel.js
@@ -1,5 +1,6 @@
import FileSaver from 'file-saver';
import * as XLSX from 'xlsx'
+
export default {
// 瀵煎嚭Excel琛ㄦ牸
exportExcel(excelName, tableName) {
diff --git a/admin-web/src/utils/index.js b/admin-web/src/utils/index.js
index c57d51a..30177ab 100644
--- a/admin-web/src/utils/index.js
+++ b/admin-web/src/utils/index.js
@@ -1,4 +1,5 @@
import Cookies from 'js-cookie';
+
/**
* Created by PanJiaChen on 16/11/18.
*/
@@ -439,4 +440,4 @@
}
return parentIds; // 杩斿洖鎵�鏈夌埗鑺傜偣ID鐨勬暟缁�
-}
\ No newline at end of file
+}
diff --git a/admin-web/src/utils/newToExcel.js b/admin-web/src/utils/newToExcel.js
index 79bbb8d..efe1b58 100644
--- a/admin-web/src/utils/newToExcel.js
+++ b/admin-web/src/utils/newToExcel.js
@@ -7,7 +7,7 @@
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
-import { export_json_to_excel } from '../vendor/Export1Excel';
+import {export_json_to_excel} from '../vendor/Export1Excel';
/**
* @method exportExcel
diff --git a/admin-web/src/utils/settingIplatform.js b/admin-web/src/utils/settingIplatform.js
index f568428..ed61262 100644
--- a/admin-web/src/utils/settingIplatform.js
+++ b/admin-web/src/utils/settingIplatform.js
@@ -1,5 +1,5 @@
-
import config from '../../public/static/config.js'
+
const SettingIplatform = {
// 涓婁紶璺緞
ftpUrl: config.ftpUrl,
diff --git a/admin-web/src/utils/stockType.js b/admin-web/src/utils/stockType.js
index 16a5eef..50de0ef 100644
--- a/admin-web/src/utils/stockType.js
+++ b/admin-web/src/utils/stockType.js
@@ -13,12 +13,6 @@
} else {
result = '璋冩嫧鍑哄簱';
}
- } else if (row.businessType == 4) {
- if (row.thisType == 1) {
- result = '閫�杩樺叆搴�';
- } else {
- result = '鐢抽鍑哄簱';
- }
} else {
result = arr[row.businessType - 1];
}
diff --git a/admin-web/src/vendor/Export2Excel.js b/admin-web/src/vendor/Export2Excel.js
index c64f4ed..d4ef139 100644
--- a/admin-web/src/vendor/Export2Excel.js
+++ b/admin-web/src/vendor/Export2Excel.js
@@ -9,7 +9,7 @@
// +----------------------------------------------------------------------
/* eslint-disable */
-import { saveAs } from 'file-saver';
+import {saveAs} from 'file-saver';
import XLSX from 'xlsx';
function generateArray(table) {
diff --git a/admin-web/src/vendor/Export2Zip.js b/admin-web/src/vendor/Export2Zip.js
index b0d8368..b1474af 100644
--- a/admin-web/src/vendor/Export2Zip.js
+++ b/admin-web/src/vendor/Export2Zip.js
@@ -9,7 +9,7 @@
// +---------------------------------------------------------------------
/* eslint-disable */
-import { saveAs } from 'file-saver';
+import {saveAs} from 'file-saver';
import JSZip from 'jszip';
export function export_txt_to_zip(th, jsonData, txtName, zipName) {
diff --git a/admin-web/src/views/components/myImport.vue b/admin-web/src/views/components/myImport.vue
index 48f95a1..be54c03 100644
--- a/admin-web/src/views/components/myImport.vue
+++ b/admin-web/src/views/components/myImport.vue
@@ -45,8 +45,9 @@
</el-dialog>
</template>
<script>
-import { getToken } from '@/utils/auth'
-import { sessionToken } from '@/settings'
+import {getToken} from '@/utils/auth'
+import {sessionToken} from '@/settings'
+
export default {
props: {
importSetting: {
diff --git a/admin-web/src/views/dashboard/components/LBJETJ.vue b/admin-web/src/views/dashboard/components/LBJETJ.vue
index a2b2956..afffacb 100644
--- a/admin-web/src/views/dashboard/components/LBJETJ.vue
+++ b/admin-web/src/views/dashboard/components/LBJETJ.vue
@@ -10,7 +10,6 @@
</template>
<script>
import * as echarts from 'echarts';
-import * as dash from "@/api/dashboard/dash";
export default {
name: 'LBJETJ',
diff --git a/admin-web/src/views/dataV/components/cityScore.vue b/admin-web/src/views/dataV/components/cityScore.vue
index 1d921d1..55ed985 100644
--- a/admin-web/src/views/dataV/components/cityScore.vue
+++ b/admin-web/src/views/dataV/components/cityScore.vue
@@ -14,6 +14,7 @@
<script>
import echarts from 'echarts';
+
let cityChart = null;
export default {
name: 'city-score',
diff --git a/admin-web/src/views/dataV/static.vue b/admin-web/src/views/dataV/static.vue
index 1e9747a..d1a6f14 100644
--- a/admin-web/src/views/dataV/static.vue
+++ b/admin-web/src/views/dataV/static.vue
@@ -168,7 +168,7 @@
<script>
import MyMap from '@/views/dataV/components/map';
-import { formatDate } from '@/utils/DateFormatter';
+import {formatDate} from '@/utils/DateFormatter';
import ProjectYear from './components/projectYear.vue';
import ProjectType from './components/projectType.vue';
import BatchPlan from './components/batchPlan.vue';
diff --git a/admin-web/src/views/departmentitem/itemdis/disDetails/edit.vue b/admin-web/src/views/departmentitem/itemdis/disDetails/edit.vue
index 8314d8e..3bddc58 100644
--- a/admin-web/src/views/departmentitem/itemdis/disDetails/edit.vue
+++ b/admin-web/src/views/departmentitem/itemdis/disDetails/edit.vue
@@ -128,8 +128,7 @@
<script>
import myButton from '@/components/myButton/myButton';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
-import {transferDetail, useInfoUpdate, useRecord} from "@/api/stock/transfer";
+import {useInfoUpdate, useRecord} from "@/api/stock/transfer";
export default {
components: {myButton},
diff --git a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
index ce87e36..e65a243 100644
--- a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
@@ -28,10 +28,7 @@
import SettingIplatform from '@/utils/settingIplatform';
import edit from './edit';
import detail from '../distribution/detail';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
-import {getBaseUrl} from '@/utils/base';
import * as DateFormatter from "@/utils/DateFormatter";
-import {getUserDetail} from "@/utils/auth";
export default {
name: 'index',
@@ -46,6 +43,32 @@
label: '鍗曞彿',
placeholder: '璇疯緭鍏�',
defaultValue: '',
+ },
+ {
+ type: 'cascader',
+ dataIndex: 'agencyId',
+ label: '鏈烘瀯',
+ placeholder: '璇烽�夋嫨',
+ cascader: [
+ {key: 'inWarehouseId', queryKey: 'tenantId'},
+ {key: 'goodsTemplateId', queryKey: 'agencyId'}
+ ],
+ optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
+ defaultValue: '',
+ options: [],
+ },
+ {
+ type: 'select',
+ dataIndex: 'inWarehouseId',
+ label: '閮ㄩ棬',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: {
+ url: `/pc/fin/sys/tenant/department/list/all`,
+ label: 'name',
+ value: 'id',
+ },
+ defaultValue: '',
+ options: [],
},
{
type: 'select',
@@ -73,29 +96,6 @@
value: 'id',
url: SettingIplatform.apiBaseURL + '/pc/base/goods/models/query/goodsModel',
},
- },
- {
- type: 'cascader',
- dataIndex: 'agencyId',
- label: '鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- cascader: [{key: 'inWarehouseId', queryKey: 'tenantId'}],
- optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
- defaultValue: '',
- options: [],
- },
- {
- type: 'select',
- dataIndex: 'inWarehouseId',
- label: '閮ㄩ棬',
- placeholder: '璇烽�夋嫨',
- optionsConfig: {
- url: `/pc/fin/sys/tenant/department/list/all`,
- label: 'name',
- value: 'id',
- },
- defaultValue: '',
- options: [],
},
{
type: 'text',
@@ -157,7 +157,7 @@
// 鍒椾俊鎭�
columns: [
{title: '鍗曞彿', field: 'businessFormCode', align: 'center', width: 130},
- {title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left', minWidth: 140},
+ {title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left', minWidth: 140},
{
title: '绫诲埆', field: 'type', align: 'center', formatter: (row) => {
return {value: row.type + '绫�'};
@@ -184,8 +184,8 @@
{
title: '浣跨敤浜�',
type: 'primary',
- hidden: (row) => {
- return row.type!=='A'
+ hidden: (row) => {
+ return row.type !== 'A'
},
events: (row) => {
this.handleEdit(row);
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/detail.vue b/admin-web/src/views/departmentitem/itemdis/distribution/detail.vue
index a655472..8b45618 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/detail.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/detail.vue
@@ -71,7 +71,7 @@
</el-col>
<!--A绫诲晢鍝� -->
<el-col :span="24" v-if="goodsItem.type==='A'">
- <el-row v-for="(user, u) in mItem.useInfo">
+ <el-row v-for="(user, u) in mItem.useInfo" :key="u">
<el-col :span="6">
<el-form-item label="鍒嗗彂鏁伴噺:" style="margin-bottom: 0" label-width="80">
{{user.num}}
@@ -113,10 +113,10 @@
</win-lg>
</template>
<script>
-import { transferDetail } from '@/api/stock/transfer';
+import {transferDetail} from '@/api/stock/transfer';
import winLg from '@/components/win/win-lg';
import * as DateFormatter from '@/utils/DateFormatter';
-import { getDownUrl } from '@/utils/base';
+import {getDownUrl} from '@/utils/base';
import Viewer from 'viewerjs';
import 'viewerjs/dist/viewer.css';
import de from "element-ui/src/locale/lang/de";
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue b/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
index d94d5c4..cee9fc9 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/edit.vue
@@ -227,13 +227,8 @@
</win-md>
</template>
<script>
-import {
- goodsTemplate,
- goodsModel,
-} from '@/api/stock/procure/purchaseOrder';
-import {
- transferAdd
-} from '@/api/stock/transfer';
+import {goodsModel, goodsTemplate,} from '@/api/stock/procure/purchaseOrder';
+import {transferAdd} from '@/api/stock/transfer';
import {departmentListAll} from '@/api/system/deptment';
import {getTree} from '@/api/foudation/classification';
import MyButton from '@/components/myButton/myButton';
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
index ec48b4d..384d525 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
@@ -91,7 +91,6 @@
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
-import {getBaseUrl} from '@/utils/base';
import listPage from '../../../mixins/listPage';
import {getUserDetail} from "@/utils/auth";
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue b/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
index e63d8f9..914c6ae 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/detail.vue
@@ -95,10 +95,10 @@
</win-lg>
</template>
<script>
-import { procureDetail } from '@/api/stock/procure/purchaseOrder';
+import {procureDetail} from '@/api/stock/procure/purchaseOrder';
import winLg from '@/components/win/win-lg';
import * as DateFormatter from '@/utils/DateFormatter';
-import { getDownUrl } from '@/utils/base';
+import {getDownUrl} from '@/utils/base';
import Viewer from 'viewerjs';
import 'viewerjs/dist/viewer.css';
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
index 1b439af..182a915 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/edit.vue
@@ -188,20 +188,15 @@
</win-md>
</template>
<script>
-import {
- goodsTemplate,
- goodsModel,
- selectTenantWarehouse,
- warehouseSelectNumber,
-} from '@/api/baseSetting/finsystenant';
-import { outputAdd } from '@/api/stock/accessStock';
-import { getTree } from '@/api/foudation/classification';
+import {goodsTemplate, selectTenantWarehouse,} 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 winSm from '@/components/win/win-sm';
import upload from '@/components/upload/index';
-import { getUploadUrl } from '@/utils/base';
-import { mapGetters } from 'vuex';
+import {getUploadUrl} from '@/utils/base';
+import {mapGetters} from 'vuex';
export default {
components: { MyButton, winMd, winSm, upload },
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/index.vue b/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
index 47b57af..150e3e6 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
@@ -72,7 +72,7 @@
</template>
<script>
-import { outputList } from '@/api/stock/accessStock';
+import {outputList} from '@/api/stock/accessStock';
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import edit from './edit';
diff --git a/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue b/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue
index 528af3f..d21f265 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrappDetails/index.vue
@@ -31,7 +31,6 @@
import MyButton from "@/components/myButton/myButton";
import SettingIplatform from '@/utils/settingIplatform';
import detail from '@/views/departmentitem/itemscr/scrapping/detail'
-import * as finsystenant from '@/api/baseSetting/finsystenant'
import myImport from '@/views/components/myImport'
import {getBaseUrl} from '@/utils/base';
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/detail.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/detail.vue
index 2ad40fd..ec9785e 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/detail.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/detail.vue
@@ -100,10 +100,10 @@
</win-lg>
</template>
<script>
-import { procureDetail } from '@/api/stock/procure/purchaseOrder';
+import {procureDetail} from '@/api/stock/procure/purchaseOrder';
import winLg from '@/components/win/win-lg';
import * as DateFormatter from '@/utils/DateFormatter';
-import { getDownUrl } from '@/utils/base';
+import {getDownUrl} from '@/utils/base';
import Viewer from 'viewerjs';
import 'viewerjs/dist/viewer.css';
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
index eeea99d..f2a78ba 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
@@ -208,20 +208,15 @@
</win-md>
</template>
<script>
-import {
- goodsTemplate,
- goodsModel,
- selectTenantWarehouse,
- warehouseSelectNumber,
-} from '@/api/baseSetting/finsystenant';
-import { outputAdd } from '@/api/stock/accessStock';
-import { getTree } from '@/api/foudation/classification';
+import {goodsTemplate, selectTenantWarehouse,} 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 winSm from '@/components/win/win-sm';
import upload from '@/components/upload/index';
-import { getUploadUrl } from '@/utils/base';
-import { mapGetters } from 'vuex';
+import {getUploadUrl} from '@/utils/base';
+import {mapGetters} from 'vuex';
export default {
components: { MyButton, winMd, winSm, upload },
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
index 63dc197..9decc9f 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
@@ -77,7 +77,7 @@
</template>
<script>
-import { outputList } from '@/api/stock/accessStock';
+import {outputList} from '@/api/stock/accessStock';
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import edit from './edit';
diff --git a/admin-web/src/views/departmentitem/ledgerquy/itemQuy/index.vue b/admin-web/src/views/departmentitem/ledgerquy/itemQuy/index.vue
index 9778858..df104d3 100644
--- a/admin-web/src/views/departmentitem/ledgerquy/itemQuy/index.vue
+++ b/admin-web/src/views/departmentitem/ledgerquy/itemQuy/index.vue
@@ -23,8 +23,7 @@
import MyTableV2 from "@/components/myTable/myTableV2";
import MyButton from "@/components/myButton/myButton";
import SettingIplatform from '@/utils/settingIplatform';
-import * as finsystenant from '@/api/baseSetting/finsystenant'
-import {getBaseUrl} from '@/utils/base';
+import {doExport} from '@/api/deptGoods/ledgerQuery';
export default {
name: "index",
@@ -38,40 +37,66 @@
dataIndex: 'agencyId',
label: '鏈烘瀯',
placeholder: '璇烽�夋嫨',
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
defaultValue: '',
options: [],
},
{
type: 'select',
- dataIndex: 'name',
+ dataIndex: 'departmentId',
label: '閮ㄩ棬',
placeholder: '璇烽�夋嫨',
defaultValue: '',
+ optionsConfig: {
+ url: `/pc/fin/sys/tenant/department/list/all`,
+ label: 'name',
+ value: 'id',
+ },
options: [],
},
{
- type: 'text',
- dataIndex: 'name',
+ type: 'select',
+ dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
placeholder: '璇疯緭鍏�',
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+ },
+ options: [],
defaultValue: ''
},
{
- type: 'select',
- dataIndex: 'name',
+ type: 'cascader',
+ dataIndex: 'categoryId',
label: '鍒嗙被',
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [],
+ optionsConfig: {
+ label: 'label',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/category/select/tree',
+ props: {checkStrictly: false, emitPath: false, value: 'id'}
+ },
},
{
type: 'select',
- dataIndex: 'name',
+ dataIndex: 'costType',
label: '绫诲埆',
placeholder: '璇烽�夋嫨',
defaultValue: '',
- options: [],
+ options: [{
+ label: 'A',
+ value: '1'
+ }, {
+ label: 'B',
+ value: '2'
+ }, {
+ label: 'C',
+ value: '3'
+ }],
},
],
// 鏍戞暟鎹�
@@ -93,29 +118,36 @@
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + '/pc/fin/warehouse/ledger/getDeptLedgerList', // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
columnsCtrl: {// 鍒楁帶鍒舵寜閽�
show: false
},
generalExport: {// 閫氱敤瀵煎嚭鎸夐挳
- show: true
+ show: false
},
// 鑷畾涔夊伐鍏锋潯鎸夐挳
custom: [
- ]
+ {
+ name: '瀵煎嚭',
+ icon: 'el-icon-download',
+ click: () => {
+ this.handleExport();
+ },
+ },
+ ],
},
// 鍒椾俊鎭�
columns: [
- {title: '鏈烘瀯', field: 'name', align: 'left',},
- {title: '閮ㄩ棬', field: 'code', align: 'center'},
- {title: '鍒嗙被', field: 'lv', align: 'center', },
- {title: '鎵�灞炵被鍒�', field: 'lv', align: 'center', },
- {title: '鐗╁搧鍚嶇О', field: 'summary', align: 'left',},
- {title: '瑙勬牸鍨嬪彿', field: 'summary', align: 'left',},
- {title: '鍗曚綅', field: 'summary', align: 'left',},
- {title: '鍦ㄧ敤鏁伴噺', field: 'summary', align: 'left',},
+ {title: '鏈烘瀯', field: 'agencyName', align: 'left', minWidth: 130},
+ {title: '閮ㄩ棬', field: 'departName', align: 'left', minWidth: 130},
+ {title: '鍒嗙被', field: 'categoryName', align: 'left', minWidth: 130},
+ {title: '鎵�灞炵被鍒�', field: 'costType', align: 'center', width: 80},
+ {title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', minWidth: 130},
+ {title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', minWidth: 130},
+ {title: '鍗曚綅', field: 'unit', align: 'center', width: 80},
+ {title: '鍦ㄧ敤鏁伴噺', field: 'kucun', align: 'center', width: 80},
],
// 鎿嶄綔淇℃伅
operation: {
@@ -137,6 +169,40 @@
created() {
},
methods: {
+ // 瀵煎嚭
+ handleExport() {
+ let loading = this.$loading({
+ lock: true,
+ text: '瀵煎嚭涓紝璇风◢鍊�...',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)',
+ });
+ // 鍒ゆ柇鎬绘潯鏁版槸鍚﹀ぇ浜庢渶澶ф敮鎸佹潯鏁�
+ doExport({...this.filterFrom})
+ .then((res) => {
+ const blob = new Blob([res], {type: 'application/vnd.ms-excel'});
+ const fileName = `閮ㄩ棬鐗╁搧鏌ヨ.xls`;
+ if ('download' in document.createElement('a')) {
+ // 闈濱E涓嬭浇
+ const elink = document.createElement('a');
+ elink.download = fileName;
+ elink.style.display = 'none';
+ elink.href = URL.createObjectURL(blob);
+ document.body.appendChild(elink);
+ elink.click();
+ URL.revokeObjectURL(elink.href);
+ document.body.removeChild(elink);
+ } else {
+ // IE10+涓嬭浇
+ navigator.msSaveBlob(blob, fileName);
+ }
+ this.$message.success('瀵煎嚭鎴愬姛锛�');
+ loading.close();
+ })
+ .catch(() => {
+ loading.close();
+ });
+ },
// 鏌ヨtable鍒楄〃
search(pageNum) {
if (pageNum != undefined) {
diff --git a/admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue b/admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue
index 793de65..bd7ea12 100644
--- a/admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue
+++ b/admin-web/src/views/departmentitem/ledgerquy/ledQuy/index.vue
@@ -16,6 +16,11 @@
</el-card>
</el-container>
</el-container>
+ <my-import
+ :import-setting="importSetting"
+ :dialog-show="importSetting.dialogShow"
+ :dialog-title="importSetting.dialogTitle"
+ />
</div>
</template>
@@ -24,11 +29,14 @@
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
import * as finsystenant from '@/api/baseSetting/finsystenant';
-import { getBaseUrl } from '@/utils/base';
+import myImport from '@/views/components/myImport';
+import {getBaseUrl} from '@/utils/base';
+import * as DateFormatter from '@/utils/DateFormatter';
+import stockType from '@/utils/stockType'
export default {
name: 'index',
- components: { MyButton, MyTableV2 },
+ components: { MyButton, MyTableV2, myImport },
data() {
return {
// 鎼滅储妗�
@@ -38,61 +46,71 @@
dataIndex: 'agencyId',
label: '鏈烘瀯',
placeholder: '璇烽�夋嫨',
+ defaultValue: '',
+ options: [],
+ cascader: [
+ { key: 'inWarehouseId', queryKey: 'tenantId' },
+ { key: 'goodsTemplateId', queryKey: 'agencyId' },
+ ],
optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ },
+ {
+ type: 'select',
+ dataIndex: 'inWarehouseId',
+ label: '閮ㄩ棬',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: {
+ url: `/pc/fin/sys/tenant/department/list/all`,
+ label: 'name',
+ value: 'id',
+ },
defaultValue: '',
options: [],
},
{
type: 'select',
- dataIndex: 'name',
- label: '閮ㄩ棬',
- placeholder: '璇疯緭鍏�',
- defaultValue: '',
- options: [],
- },
- {
- type: 'text',
- dataIndex: 'name',
+ dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
placeholder: '璇疯緭鍏�',
defaultValue: '',
+ options: [],
+ cascader: [{ key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId' }],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+ },
},
{
type: 'select',
- dataIndex: 'name',
+ dataIndex: 'baseGoodsModelsId',
label: '瑙勬牸鍨嬪彿',
placeholder: '璇疯緭鍏�',
defaultValue: '',
options: [],
+ optionsConfig: {
+ label: 'modelName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/models/query/goodsModel',
+ },
},
{
type: 'select',
- dataIndex: 'status',
+ dataIndex: 'flowType',
label: '绫诲瀷',
placeholder: '璇烽�夋嫨',
- defaultValue: '1',
- options: [
- {
- label: '鍚敤',
- value: '1',
- },
- {
- label: '绂佺敤',
- value: '0',
- },
- ],
- },
- {
- type: 'text',
- dataIndex: 'name',
- label: '鍗曞彿',
- placeholder: '璇疯緭鍏�',
defaultValue: '',
+ options: [],
+ optionsConfig: {
+ label: 'dict_label',
+ value: 'dict_value',
+ url: SettingIplatform.apiBaseURL + '/permit/dict/data/type/FLOW_TYPE',
+ },
},
{
type: 'text',
- dataIndex: 'name',
- label: '鎿嶄綔浜�',
+ dataIndex: 'businessFormCode',
+ label: '鍗曞彿',
placeholder: '璇疯緭鍏�',
defaultValue: '',
},
@@ -118,6 +136,24 @@
userPhone: null,
status: 1,
},
+ // 瀵煎叆
+ importSetting: {
+ dialogTitle: '瀵煎叆',
+ dialogShow: false,
+ fileSettings: {
+ data: {},
+ uploadUrl: getBaseUrl() + '/pc/fin/sys/tenant/import', // 涓婁紶鍦板潃
+ accept: '.xls', // 鏍煎紡
+ type: 'text', // 鍥炴樉褰㈠紡
+ loading: false, // 瀵煎叆鏁堟灉
+ },
+ /* 妯℃澘涓嬭浇 */
+ templateSettings: {
+ templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
+ templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate', // 涓嬭浇鍦板潃
+ },
+ onSuccess: null,
+ },
editSetting: {
title: '',
id: '',
@@ -128,7 +164,7 @@
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + '/pc/warehouse/flow/getTaiZhangList', // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
columnsCtrl: {
@@ -137,36 +173,40 @@
},
generalExport: {
// 閫氱敤瀵煎嚭鎸夐挳
- show: true,
+ show: false,
},
// 鑷畾涔夊伐鍏锋潯鎸夐挳
custom: [],
},
// 鍒椾俊鎭�
columns: [
- { title: '鏈烘瀯', field: 'name', align: 'left' },
- { title: '閮ㄩ棬', field: 'code', align: 'center' },
- { title: '鐗╁搧鍚嶇О', field: 'lv', align: 'center' },
- { title: '瑙勬牸鍨嬪彿', field: 'lv', align: 'center' },
- { title: '绫诲瀷', field: 'summary', align: 'left' },
- { title: '鍗曞彿', field: 'summary', align: 'left' },
- { title: '鏁伴噺', field: 'summary', align: 'left' },
- { title: '鎿嶄綔鍓嶆暟閲�', field: 'summary', align: 'left' },
- { title: '鎿嶄綔鍚庢暟閲�', field: 'summary', align: 'left' },
+ { title: '鏈烘瀯', field: 'agencyName', align: 'left', width: 130 },
+ { title: '閮ㄩ棬', field: 'departName', align: 'left', width: 130 },
+ { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', minWidth: 130 },
+ { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', width: 130 },
+ {
+ title: '绫诲瀷',
+ field: 'summary',
+ align: 'center',
+ formatter: (row) => {
+ let result = stockType(row)
+ return { value: result };
+ },
+ },
+ { title: '鍗曞彿', field: 'businessFormCode', align: 'center', width: 130 },
+ { title: '鏁伴噺', field: 'thisCount', align: 'center', width: 100 },
+ { title: '鎿嶄綔鍓嶆暟閲�', field: 'initialCount', align: 'center', width: 100 },
+ { title: '鎿嶄綔鍚庢暟閲�', field: 'endCount', align: 'center', width: 100 },
{
title: '鎿嶄綔鏃堕棿',
- field: 'summary',
- align: 'left',
+ field: 'dealTime',
+ align: 'center',
width: 160,
formatter: (row) => {
- return { value: DateFormatter.LongToDateTime(row.procureTime) };
+ return { value: DateFormatter.LongToDateTime(row.dealTime) };
},
},
],
- // 鎿嶄綔淇℃伅
- operation: {
- show: false // 鏄剧ず鎿嶄綔鍒�
- },
paging: {
show: true, // 鏄剧ず鍒嗛〉
// 鍒嗛〉淇℃伅
@@ -197,5 +237,3 @@
},
};
</script>
-
-<style scoped></style>
diff --git a/admin-web/src/views/foundation/classification/edit.vue b/admin-web/src/views/foundation/classification/edit.vue
index 2669df8..f73ff82 100644
--- a/admin-web/src/views/foundation/classification/edit.vue
+++ b/admin-web/src/views/foundation/classification/edit.vue
@@ -48,8 +48,9 @@
import winSm from '@/components/win/win-sm';
import myButton from '@/components/myButton/myButton';
import * as finsystenant from '@/api/baseSetting/finsystenant';
-import { getDicts } from '@/api/system/dict/data';
-import { getCategoryDetail } from '@/api/foudation/classification';
+import {getDicts} from '@/api/system/dict/data';
+import {getCategoryDetail} from '@/api/foudation/classification';
+
export default {
components: { winSm, myButton },
props: {
diff --git a/admin-web/src/views/foundation/classification/index.vue b/admin-web/src/views/foundation/classification/index.vue
index 59bf55a..46e7eb7 100644
--- a/admin-web/src/views/foundation/classification/index.vue
+++ b/admin-web/src/views/foundation/classification/index.vue
@@ -42,11 +42,10 @@
import items from './items';
import edit from './edit';
import * as finsystenant from '@/api/baseSetting/finsystenant';
-import { getTree } from '@/api/foudation/classification';
+import {getTree} from '@/api/foudation/classification';
import myImport from '@/views/components/myImport';
-import { getBaseUrl } from '@/utils/base';
-import { getType } from '@/api/system/dict/type';
-import { getDicts } from '@/api/system/dict/data';
+import {getBaseUrl} from '@/utils/base';
+import {getDicts} from '@/api/system/dict/data';
export default {
name: 'index',
diff --git a/admin-web/src/views/foundation/store/edit.vue b/admin-web/src/views/foundation/store/edit.vue
index 5a23abe..f4f8a08 100644
--- a/admin-web/src/views/foundation/store/edit.vue
+++ b/admin-web/src/views/foundation/store/edit.vue
@@ -41,7 +41,7 @@
import winSm from '@/components/win/win-sm';
import myButton from '@/components/myButton/myButton';
import * as finsystenant from '@/api/baseSetting/finsystenant';
-import { findParentIds } from '@/utils/index';
+import {findParentIds} from '@/utils/index';
export default {
components: { winSm, myButton },
diff --git a/admin-web/src/views/foundation/store/person.vue b/admin-web/src/views/foundation/store/person.vue
index 9c153c4..dc647b3 100644
--- a/admin-web/src/views/foundation/store/person.vue
+++ b/admin-web/src/views/foundation/store/person.vue
@@ -35,11 +35,9 @@
</template>
<script>
-import { departmentListAll } from '@/api/system/deptment';
-import { userSelectDepartment, warehouseManagerAdd, warehouseManagerList } from '@/api/foudation/store';
+import {userSelectDepartment, warehouseManagerList} from '@/api/foudation/store';
import winMd from '@/components/win/win-md';
import myButton from '@/components/myButton/myButton';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
export default {
name: 'person',
diff --git a/admin-web/src/views/login/mixins.js b/admin-web/src/views/login/mixins.js
index 11918f0..3ab6e00 100644
--- a/admin-web/src/views/login/mixins.js
+++ b/admin-web/src/views/login/mixins.js
@@ -9,7 +9,7 @@
// +---------------------------------------------------------------------
// import iHeaderI18n from '@/layouts/basic-layout/header-i18n';
-import { mapState } from 'vuex';
+import {mapState} from 'vuex';
export default {
// components: { iHeaderI18n },
diff --git a/admin-web/src/views/mixins/listPage.js b/admin-web/src/views/mixins/listPage.js
index 48fc6e0..be556bc 100644
--- a/admin-web/src/views/mixins/listPage.js
+++ b/admin-web/src/views/mixins/listPage.js
@@ -1,5 +1,6 @@
import * as DateFormatter from '@/utils/DateFormatter';
-import { mapGetters } from 'vuex';
+import {mapGetters} from 'vuex';
+
export default {
data() {
return {
@@ -87,4 +88,4 @@
this.search(1);
},
}
-}
\ No newline at end of file
+}
diff --git a/admin-web/src/views/statisticalreport/itemReport/index.vue b/admin-web/src/views/statisticalreport/itemReport/index.vue
index f205b0d..8d136da 100644
--- a/admin-web/src/views/statisticalreport/itemReport/index.vue
+++ b/admin-web/src/views/statisticalreport/itemReport/index.vue
@@ -4,49 +4,43 @@
<div class="filter-container" style="margin-bottom: 10px">
<my-search ref="searchBar" :items="items" @search="filterForm"></my-search>
</div>
- <div class="title" align="center">鐗╁搧缁熻琛�</div>
+ <div class="title">鐗╁搧缁熻琛�</div>
<el-table
v-loading="loading"
:data="tableData"
border
style="width: 100%">
<el-table-column
- fixed="left"
align="center"
prop="orgName"
label="鏈烘瀯"
- width="150">
+ min-width="150">
</el-table-column>
<el-table-column
- fixed="left"
align="center"
prop="warehouseName"
label="浠撳簱/閮ㄩ棬"
- width="150">
+ min-width="150">
</el-table-column>
<el-table-column
- fixed="left"
align="center"
prop="goodsCode"
label="鐗╁搧缂栫爜"
width="150">
</el-table-column>
<el-table-column
- fixed="left"
align="center"
prop="goodsTemplateName"
label="鐗╁搧鍚嶇О"
- width="150">
+ min-width="150">
</el-table-column>
<el-table-column
- fixed="left"
align="center"
prop="baseGoodsModelsName"
label="瑙勬牸鍨嬪彿"
- width="150">
+ min-width="150">
</el-table-column>
<el-table-column
- fixed="left"
align="center"
prop="zaiKuNum"
label="鍦ㄥ簱/鍦ㄧ敤鏁伴噺"
@@ -54,21 +48,18 @@
</el-table-column>
<el-table-column
- fixed="left"
align="center"
prop="baoFeiNum"
label="鎶ュ簾鏁�"
width="150">
</el-table-column>
<el-table-column
- fixed="left"
align="center"
prop="diaoBoNum"
label="璋冩嫧鏁�"
width="150">
</el-table-column>
<el-table-column
- fixed="left"
align="center"
prop="totalNum"
label="鎬绘暟閲�"
@@ -80,12 +71,11 @@
</template>
<script>
- import {getGoodsStatistics} from '@/api/dashboard/goodsStatis.js'
- import {formatDate,LongToDate} from "@/utils/DateFormatter";
- import {downLoad} from "@/utils/base";
- import SettingIplatform from '@/utils/settingIplatform';
+import {getGoodsStatistics} from '@/api/dashboard/goodsStatis.js'
+import {formatDate} from "@/utils/DateFormatter";
+import SettingIplatform from '@/utils/settingIplatform';
- export default {
+export default {
data() {
return {
items: [
diff --git a/admin-web/src/views/stock/accessStock/outbound/detail.vue b/admin-web/src/views/stock/accessStock/outbound/detail.vue
index 0cd965a..0f6f7c3 100644
--- a/admin-web/src/views/stock/accessStock/outbound/detail.vue
+++ b/admin-web/src/views/stock/accessStock/outbound/detail.vue
@@ -67,7 +67,7 @@
</win-md>
</template>
<script>
-import { outputDetail } from '@/api/stock/accessStock';
+import {outputDetail} from '@/api/stock/accessStock';
import winMd from '@/components/win/win-md';
import * as DateFormatter from '@/utils/DateFormatter';
diff --git a/admin-web/src/views/stock/accessStock/outbound/edit.vue b/admin-web/src/views/stock/accessStock/outbound/edit.vue
index 2146305..cf58bde 100644
--- a/admin-web/src/views/stock/accessStock/outbound/edit.vue
+++ b/admin-web/src/views/stock/accessStock/outbound/edit.vue
@@ -174,19 +174,14 @@
</win-md>
</template>
<script>
-import {
- goodsTemplate,
- goodsModel,
- selectTenantWarehouse,
- warehouseSelectNumber,
-} from '@/api/baseSetting/finsystenant';
-import { outputAdd } 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';
export default {
components: { MyButton, winMd, upload },
diff --git a/admin-web/src/views/stock/accessStock/outbound/index.vue b/admin-web/src/views/stock/accessStock/outbound/index.vue
index 88d81f8..b7202d7 100644
--- a/admin-web/src/views/stock/accessStock/outbound/index.vue
+++ b/admin-web/src/views/stock/accessStock/outbound/index.vue
@@ -80,7 +80,7 @@
</template>
<script>
-import { outputList } from '@/api/stock/accessStock';
+import {outputList} from '@/api/stock/accessStock';
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import edit from './edit';
diff --git a/admin-web/src/views/stock/accessStock/outboundDetails/index.vue b/admin-web/src/views/stock/accessStock/outboundDetails/index.vue
index 002dd06..85757c2 100644
--- a/admin-web/src/views/stock/accessStock/outboundDetails/index.vue
+++ b/admin-web/src/views/stock/accessStock/outboundDetails/index.vue
@@ -31,13 +31,13 @@
import * as DateFormatter from '@/utils/DateFormatter';
import stockType from '@/utils/stockType';
import detail from '../outbound/detail';
-import purchaseDetail from '@/views/stock/procure/purchaseOrder/detail.vue';// 閲囪喘鍗曡鎯�
-import transferDetail from '@/views/stock/transfer/transferissue/detail.vue';// 璋冩嫧鍗曡鎯�
-import inventoryDetail from '@/views/stock/inventorycount/inventorytask/detail.vue';// 鐩樼偣鍗曡鎯�
-import scrapDetail from '@/views/stock/scrap/itemScrapping/detail.vue';// 鎶ュ簾鍗曡鎯�
-import distributionDetail from '@/views/departmentitem/itemdis/distribution/detail.vue';// 鍒嗗彂鍗曡鎯�
-import itemscrDetail from '@/views/departmentitem/itemscr/scrapping/detail.vue';// 閮ㄩ棬鎶ュ簾鍗曡鎯�
-import returnNoteDetail from '@/views/departmentitem/itemret/returnNote/detail.vue';// 閮ㄩ棬閫�杩樺崟璇︽儏
+import purchaseDetail from '@/views/stock/procure/purchaseOrder/detail.vue'; // 閲囪喘鍗曡鎯�
+import transferDetail from '@/views/stock/transfer/transferissue/detail.vue'; // 璋冩嫧鍗曡鎯�
+import inventoryDetail from '@/views/stock/inventorycount/inventorytask/detail.vue'; // 鐩樼偣鍗曡鎯�
+import scrapDetail from '@/views/stock/scrap/itemScrapping/detail.vue'; // 鎶ュ簾鍗曡鎯�
+import distributionDetail from '@/views/departmentitem/itemdis/distribution/detail.vue'; // 鍒嗗彂鍗曡鎯�
+import itemscrDetail from '@/views/departmentitem/itemscr/scrapping/detail.vue'; // 閮ㄩ棬鎶ュ簾鍗曡鎯�
+import returnNoteDetail from '@/views/departmentitem/itemret/returnNote/detail.vue'; // 閮ㄩ棬閫�杩樺崟璇︽儏
export default {
name: 'index',
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/detail.vue b/admin-web/src/views/stock/inventorycount/inventorytask/detail.vue
index 589680a..09d0090 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/detail.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/detail.vue
@@ -22,7 +22,8 @@
<script>
import winMd from '@/components/win/win-md';
import myButton from '@/components/myButton/myButton';
-import { inventoryDetail } from '@/api/stock/inventory';
+import {inventoryDetail} from '@/api/stock/inventory';
+
export default {
components: { winMd, myButton },
props: {
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue b/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
index 7a661e7..449175e 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/edit.vue
@@ -44,13 +44,13 @@
</template>
<script>
-import { selectTenantWarehouse, tenantUserQueryUser } from '@/api/baseSetting/finsystenant';
-import { inventoryAdd, inventoryEdit } from '@/api/stock/inventory';
-import { warehouseManagerList } from '@/api/foudation/store';
+import {selectTenantWarehouse, tenantUserQueryUser} from '@/api/baseSetting/finsystenant';
+import {inventoryAdd, inventoryEdit} from '@/api/stock/inventory';
+import {warehouseManagerList} from '@/api/foudation/store';
import winSm from '@/components/win/win-sm';
import myButton from '@/components/myButton/myButton';
-import { formatDate } from '@/utils/DateFormatter';
-import { mapGetters } from 'vuex';
+import {formatDate} from '@/utils/DateFormatter';
+import {mapGetters} from 'vuex';
export default {
components: { winSm, myButton },
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
index 28cfe68..59eb80b 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
@@ -40,13 +40,12 @@
import edit from './edit';
import inventory from './inventory';
import detail from './detail';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
+import {selectTenantWarehouse} from '@/api/baseSetting/finsystenant';
import myImport from '@/views/components/myImport';
-import { getBaseUrl } from '@/utils/base';
-import { selectTenantWarehouse } from '@/api/baseSetting/finsystenant';
-import { inventoryListApi, inventoryDel } from '@/api/stock/inventory';
+import {getBaseUrl} from '@/utils/base';
+import {inventoryDel, inventoryListApi} from '@/api/stock/inventory';
import * as DateFormatter from '@/utils/DateFormatter';
-import { mapGetters } from 'vuex';
+import {mapGetters} from 'vuex';
export default {
name: 'index',
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue b/admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue
index 4fa870b..2c5e717 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/inventory.vue
@@ -46,7 +46,8 @@
<script>
import winMd from '@/components/win/win-md';
import myButton from '@/components/myButton/myButton';
-import { inventoryQuery, inventoryTemporaryStorage, inventoryFinish, inventoryDetail } from '@/api/stock/inventory';
+import {inventoryDetail, inventoryFinish, inventoryQuery, inventoryTemporaryStorage} from '@/api/stock/inventory';
+
export default {
components: { winMd, myButton },
props: {
diff --git a/admin-web/src/views/stock/ledger/alertQuery/index.vue b/admin-web/src/views/stock/ledger/alertQuery/index.vue
index c1f3529..bb2c3eb 100644
--- a/admin-web/src/views/stock/ledger/alertQuery/index.vue
+++ b/admin-web/src/views/stock/ledger/alertQuery/index.vue
@@ -45,7 +45,7 @@
label: 'label',
value: 'id',
url: SettingIplatform.apiBaseURL + '/pc/base/category/select/tree',
- props: {checkStrictly: false}
+ props: {checkStrictly: false, emitPath: false, value: 'id'}
},
},
{
@@ -174,17 +174,17 @@
methods: {
del(row) {
this.$modal
- .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�')
- .then(function () {
- finsystenant.del({id: row.id}).then((res) => {
+ .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�')
+ .then(function () {
+ finsystenant.del({id: row.id}).then((res) => {
+ });
+ })
+ .then((res) => {
+ this.$message.success('鍒犻櫎鎴愬姛锛�');
+ this.search();
+ })
+ .catch(() => {
});
- })
- .then((res) => {
- this.$message.success('鍒犻櫎鎴愬姛锛�');
- this.search();
- })
- .catch(() => {
- });
},
// 鏌ヨtable鍒楄〃
search(pageNum) {
diff --git a/admin-web/src/views/stock/ledger/inventoryAlert/edit.vue b/admin-web/src/views/stock/ledger/inventoryAlert/edit.vue
index e23fe53..37e396f 100644
--- a/admin-web/src/views/stock/ledger/inventoryAlert/edit.vue
+++ b/admin-web/src/views/stock/ledger/inventoryAlert/edit.vue
@@ -122,19 +122,13 @@
import {
getCategorySelectTree,
goodsModel,
- warehouseSelectNumber,
goodsTemplate,
- selectTenantWarehouse,
queryGoodsModelInfo,
+ selectTenantWarehouse,
} from '@/api/baseSetting/finsystenant';
-import {
- warningConfigAdd,
- warningConfigUpd,
- warningConfigGetById,
- warningConfigGetConfigList,
-} from '@/api/stock/ledger';
-import { mapGetters } from 'vuex';
-import { findParentIds } from '@/utils/index';
+import {warningConfigAdd, warningConfigGetById, warningConfigUpd,} from '@/api/stock/ledger';
+import {mapGetters} from 'vuex';
+import {findParentIds} from '@/utils/index';
export default {
components: { winMd, myButton },
diff --git a/admin-web/src/views/stock/ledger/inventoryAlert/index.vue b/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
index 2b38e4b..034560a 100644
--- a/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
+++ b/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
@@ -10,18 +10,18 @@
<el-row style="margin-top: 15px">
<el-col>
<!--鍒楄〃-->
- <my-table-v2 ref="myTable" :filter="filterFrom" :table="table" />
+ <my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
</el-col>
</el-row>
<!--娣诲姞/缂栬緫寮圭獥-->
- <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search" />
+ <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search"/>
</el-card>
</el-container>
</el-container>
<my-import
- :import-setting="importSetting"
- :dialog-show="importSetting.dialogShow"
- :dialog-title="importSetting.dialogTitle"
+ :import-setting="importSetting"
+ :dialog-show="importSetting.dialogShow"
+ :dialog-title="importSetting.dialogTitle"
/>
</div>
</template>
@@ -32,15 +32,13 @@
import SettingIplatform from '@/utils/settingIplatform';
import edit from './edit';
import myImport from '@/views/components/myImport';
-import { getBaseUrl } from '@/utils/base';
-import { selectTenantWarehouse, treeList } from '@/api/baseSetting/finsystenant';
-import { warningConfigGetDel } from '@/api/stock/ledger';
-import { getDicts } from '@/api/system/dict/data';
-import { mapGetters } from 'vuex';
+import {getBaseUrl} from '@/utils/base';
+import {warningConfigGetDel} from '@/api/stock/ledger';
+import {mapGetters} from 'vuex';
export default {
name: 'index',
- components: { MyButton, MyTableV2, edit,myImport },
+ components: {MyButton, MyTableV2, edit, myImport},
data() {
return {
// 鎼滅储妗�
@@ -53,10 +51,10 @@
defaultValue: '',
options: [],
cascader: [
- { key: 'warehouseId', queryKey: 'agencyId' },
- { key: 'goodsTemplateId', queryKey: 'agencyId' },
+ {key: 'warehouseId', queryKey: 'agencyId'},
+ {key: 'goodsTemplateId', queryKey: 'agencyId'},
],
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
},
{
type: 'select',
@@ -78,7 +76,7 @@
placeholder: '璇疯緭鍏�',
defaultValue: '',
options: [],
- cascader: [{ key: 'categoryId', queryKey: 'goodsTemplatesId' }],
+ cascader: [{key: 'categoryId', queryKey: 'goodsTemplatesId'}],
optionsConfig: {
label: 'goodsName',
value: 'id',
@@ -96,7 +94,7 @@
label: 'label',
value: 'id',
url: SettingIplatform.apiBaseURL + '/pc/base/category/select/tree',
- props: { checkStrictly: false },
+ props: {checkStrictly: false, emitPath: false, value: 'id'}
},
},
{
@@ -106,34 +104,34 @@
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [{
- label:'A',
- value:'1'
- },{
- label:'B',
- value:'2'
- },{
- label:'C',
- value:'3'
+ label: 'A',
+ value: '1'
+ }, {
+ label: 'B',
+ value: '2'
+ }, {
+ label: 'C',
+ value: '3'
}],
},
],
// 瀵煎叆
importSetting: {
- dialogTitle: '瀵煎叆',
- dialogShow: false,
- fileSettings: {
- data: {},
- uploadUrl: getBaseUrl()+"/pc/fin/sys/tenant/import", // 涓婁紶鍦板潃
- accept: '.xls', // 鏍煎紡
- type: 'text', // 鍥炴樉褰㈠紡
- loading: false // 瀵煎叆鏁堟灉
- },
- /* 妯℃澘涓嬭浇 */
- templateSettings: {
- templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 涓嬭浇鍦板潃
- },
- onSuccess: null
+ dialogTitle: '瀵煎叆',
+ dialogShow: false,
+ fileSettings: {
+ data: {},
+ uploadUrl: getBaseUrl() + "/pc/fin/sys/tenant/import", // 涓婁紶鍦板潃
+ accept: '.xls', // 鏍煎紡
+ type: 'text', // 鍥炴樉褰㈠紡
+ loading: false // 瀵煎叆鏁堟灉
+ },
+ /* 妯℃澘涓嬭浇 */
+ templateSettings: {
+ templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
+ templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 涓嬭浇鍦板潃
+ },
+ onSuccess: null
},
// 鎼滅储鏉′欢
filterFrom: {
@@ -178,14 +176,14 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '鏈烘瀯', field: 'agencyName', align: 'left', minWidth: 130 },
- { title: '浠撳簱', field: 'warehouseName', align: 'left', minWidth: 130 },
- { title: '鍒嗙被', field: 'categoryName', align: 'left', minWidth: 130 },
- { title: '鎵�灞炵被鍒�', field: 'costType', align: 'center', width: 80 },
- { title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left', minWidth: 130 },
- { title: '瑙勬牸鍨嬪彿', field: 'modelName', align: 'left', minWidth: 130 },
- { title: '淇濆簳搴撳瓨', field: 'lowerLimit', align: 'center', width: 100 },
- { title: '灏侀《搴撳瓨', field: 'upperLimit', align: 'center', width: 100 },
+ {title: '鏈烘瀯', field: 'agencyName', align: 'left', minWidth: 130},
+ {title: '浠撳簱', field: 'warehouseName', align: 'left', minWidth: 130},
+ {title: '鍒嗙被', field: 'categoryName', align: 'left', minWidth: 130},
+ {title: '鎵�灞炵被鍒�', field: 'costType', align: 'center', width: 80},
+ {title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left', minWidth: 130},
+ {title: '瑙勬牸鍨嬪彿', field: 'modelName', align: 'left', minWidth: 130},
+ {title: '淇濆簳搴撳瓨', field: 'lowerLimit', align: 'center', width: 100},
+ {title: '灏侀《搴撳瓨', field: 'upperLimit', align: 'center', width: 100},
],
// 鎿嶄綔淇℃伅
operation: {
@@ -222,11 +220,12 @@
computed: {
...mapGetters(['userInfo']),
},
- created() {},
+ created() {
+ },
methods: {
del(row) {
this.$modal.confirm('鏄惁纭鍒犻櫎姝ゆ潯鐨勬暟鎹悧锛�').then(() => {
- warningConfigGetDel({ id: row.id }).then((res) => {
+ warningConfigGetDel({id: row.id}).then((res) => {
this.$message.success('鍒犻櫎鎴愬姛锛�');
this.search();
});
diff --git a/admin-web/src/views/stock/ledger/inventoryQuery/index.vue b/admin-web/src/views/stock/ledger/inventoryQuery/index.vue
index f24b0c8..6f5f6d8 100644
--- a/admin-web/src/views/stock/ledger/inventoryQuery/index.vue
+++ b/admin-web/src/views/stock/ledger/inventoryQuery/index.vue
@@ -10,7 +10,7 @@
<el-row style="margin-top: 15px">
<el-col>
<!--鍒楄〃-->
- <my-table-v2 ref="myTable" :filter="filterFrom" :table="table" />
+ <my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
</el-col>
</el-row>
</el-card>
@@ -24,15 +24,11 @@
import MyTableV2 from '@/components/myTable/myTableV2';
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
-import { getBaseUrl } from '@/utils/base';
-import { selectTenantWarehouse, getCategorySelectTree, treeList } from '@/api/baseSetting/finsystenant';
-import { getDicts } from '@/api/system/dict/data';
-import { doExport } from '@/api/stock/ledger';
+import {doExport} from '@/api/stock/ledger';
export default {
name: 'index',
- components: { MyButton, MyTableV2 },
+ components: {MyButton, MyTableV2},
data() {
return {
// 鎼滅储妗�
@@ -44,8 +40,8 @@
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [],
- cascader: [{key:'warehouseId',queryKey: 'agencyId'},{key:'goodsTemplateId',queryKey: 'agencyId'}],
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ cascader: [{key: 'warehouseId', queryKey: 'agencyId'}, {key: 'goodsTemplateId', queryKey: 'agencyId'}],
+ optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
},
{
type: 'select',
@@ -67,7 +63,7 @@
placeholder: '璇疯緭鍏�',
defaultValue: '',
options: [],
- cascader: [{key:'categoryId',queryKey: 'goodsTemplatesId'}],
+ cascader: [{key: 'categoryId', queryKey: 'goodsTemplatesId'}],
optionsConfig: {
label: 'goodsName',
value: 'id',
@@ -85,7 +81,7 @@
label: 'label',
value: 'id',
url: SettingIplatform.apiBaseURL + '/pc/base/category/select/tree',
- props:{checkStrictly:false}
+ props: {checkStrictly: false, emitPath: false, value: 'id'}
},
},
{
@@ -95,14 +91,14 @@
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [{
- label:'A',
- value:'1'
- },{
- label:'B',
- value:'2'
- },{
- label:'C',
- value:'3'
+ label: 'A',
+ value: '1'
+ }, {
+ label: 'B',
+ value: '2'
+ }, {
+ label: 'C',
+ value: '3'
}],
},
],
@@ -110,7 +106,7 @@
treeDataList: [],
// 鎼滅储鏉′欢
filterFrom: {
- warehouseType:0
+ warehouseType: 0
},
// 琛ㄦ牸鏁版嵁
table: {
@@ -140,14 +136,14 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '鏈烘瀯', field: 'agencyName', align: 'left', minWidth: 130 },
- { title: '浠撳簱', field: 'warehouseName', align: 'left', minWidth: 130 },
- { title: '鍒嗙被', field: 'categoryName', align: 'left', minWidth: 130 },
- { title: '鎵�灞炵被鍒�', field: 'costType', align: 'center', width:80 },
- { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', minWidth: 140 },
- { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', minWidth: 130 },
- { title: '鍗曚綅', field: 'unit', align: 'center', width:80 },
- { title: '褰撳墠搴撳瓨', field: 'kucun', align: 'center' },
+ {title: '鏈烘瀯', field: 'agencyName', align: 'left', minWidth: 130},
+ {title: '浠撳簱', field: 'warehouseName', align: 'left', minWidth: 130},
+ {title: '鍒嗙被', field: 'categoryName', align: 'left', minWidth: 130},
+ {title: '鎵�灞炵被鍒�', field: 'costType', align: 'center', width: 80},
+ {title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', minWidth: 140},
+ {title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', minWidth: 130},
+ {title: '鍗曚綅', field: 'unit', align: 'center', width: 80},
+ {title: '褰撳墠搴撳瓨', field: 'kucun', align: 'center'},
],
paging: {
show: true, // 鏄剧ず鍒嗛〉
@@ -174,30 +170,30 @@
background: 'rgba(0, 0, 0, 0.7)',
});
// 鍒ゆ柇鎬绘潯鏁版槸鍚﹀ぇ浜庢渶澶ф敮鎸佹潯鏁�
- doExport({ ...this.filterFrom })
- .then((res) => {
- const blob = new Blob([res], { type: 'application/vnd.ms-excel' });
- const fileName = `搴撳瓨鏌ヨ.xls`;
- if ('download' in document.createElement('a')) {
- // 闈濱E涓嬭浇
- const elink = document.createElement('a');
- elink.download = fileName;
- elink.style.display = 'none';
- elink.href = URL.createObjectURL(blob);
- document.body.appendChild(elink);
- elink.click();
- URL.revokeObjectURL(elink.href);
- document.body.removeChild(elink);
- } else {
- // IE10+涓嬭浇
- navigator.msSaveBlob(blob, fileName);
- }
- this.$message.success('瀵煎嚭鎴愬姛锛�');
- loading.close();
- })
- .catch(() => {
- loading.close();
- });
+ doExport({...this.filterFrom})
+ .then((res) => {
+ const blob = new Blob([res], {type: 'application/vnd.ms-excel'});
+ const fileName = `搴撳瓨鏌ヨ.xls`;
+ if ('download' in document.createElement('a')) {
+ // 闈濱E涓嬭浇
+ const elink = document.createElement('a');
+ elink.download = fileName;
+ elink.style.display = 'none';
+ elink.href = URL.createObjectURL(blob);
+ document.body.appendChild(elink);
+ elink.click();
+ URL.revokeObjectURL(elink.href);
+ document.body.removeChild(elink);
+ } else {
+ // IE10+涓嬭浇
+ navigator.msSaveBlob(blob, fileName);
+ }
+ this.$message.success('瀵煎嚭鎴愬姛锛�');
+ loading.close();
+ })
+ .catch(() => {
+ loading.close();
+ });
},
// 鏌ヨtable鍒楄〃
diff --git a/admin-web/src/views/stock/ledger/ledgerQuery/index.vue b/admin-web/src/views/stock/ledger/ledgerQuery/index.vue
index 5bf9cd5..b1e2ef9 100644
--- a/admin-web/src/views/stock/ledger/ledgerQuery/index.vue
+++ b/admin-web/src/views/stock/ledger/ledgerQuery/index.vue
@@ -30,9 +30,7 @@
import SettingIplatform from '@/utils/settingIplatform';
import * as finsystenant from '@/api/baseSetting/finsystenant';
import myImport from '@/views/components/myImport';
-import { getBaseUrl } from '@/utils/base';
-import { getCategorySelectTree, goodsModel } from '@/api/baseSetting/finsystenant';
-import { getDicts } from '@/api/system/dict/data';
+import {getBaseUrl} from '@/utils/base';
import * as DateFormatter from '@/utils/DateFormatter';
import stockType from '@/utils/stockType'
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/detail.vue b/admin-web/src/views/stock/procure/purchaseOrder/detail.vue
index 480d5fc..8ff6b0c 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/detail.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/detail.vue
@@ -99,10 +99,10 @@
</win-md>
</template>
<script>
-import { procureDetail } from '@/api/stock/procure/purchaseOrder';
+import {procureDetail} from '@/api/stock/procure/purchaseOrder';
import winMd from '@/components/win/win-md';
import * as DateFormatter from '@/utils/DateFormatter';
-import { getDownUrl } from '@/utils/base';
+import {getDownUrl} from '@/utils/base';
import Viewer from 'viewerjs';
import 'viewerjs/dist/viewer.css';
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/edit.vue b/admin-web/src/views/stock/procure/purchaseOrder/edit.vue
index e5afac4..bca8123 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/edit.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/edit.vue
@@ -191,20 +191,20 @@
</template>
<script>
import {
+ goodsModel,
goodsTemplate,
procureAdd,
+ procureDetail,
procureEdit,
selectTenantWarehouse,
- goodsModel,
- procureDetail,
} from '@/api/stock/procure/purchaseOrder';
-import { getTree } from '@/api/foudation/classification';
+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, getDownUrl } from '@/utils/base';
-import { findParentIds } from '@/utils/index';
-import { mapGetters } from 'vuex';
+import {getUploadUrl} from '@/utils/base';
+import {findParentIds} from '@/utils/index';
+import {mapGetters} from 'vuex';
export default {
components: { MyButton, winMd, upload },
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/index.vue b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
index 12f33ee..814d1d5 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/index.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
@@ -116,13 +116,13 @@
</template>
<script>
-import { procureList, procureDel, procureIncome } from '@/api/stock/procure/purchaseOrder';
+import {procureDel, procureIncome, procureList} from '@/api/stock/procure/purchaseOrder';
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
-import { getBaseUrl } from '@/utils/base';
+import {getBaseUrl} from '@/utils/base';
import listPage from '../../../mixins/listPage';
export default {
diff --git a/admin-web/src/views/stock/procure/receiptDetails/index.vue b/admin-web/src/views/stock/procure/receiptDetails/index.vue
index 902be8f..761db8c 100644
--- a/admin-web/src/views/stock/procure/receiptDetails/index.vue
+++ b/admin-web/src/views/stock/procure/receiptDetails/index.vue
@@ -33,9 +33,8 @@
import SettingIplatform from '@/utils/settingIplatform';
import detail from '../purchaseOrder/detail';
import * as finsystenant from '@/api/baseSetting/finsystenant';
-import { goodsModel } from '@/api/stock/procure/purchaseOrder';
import myImport from '@/views/components/myImport';
-import { getBaseUrl } from '@/utils/base';
+import {getBaseUrl} from '@/utils/base';
export default {
name: 'index',
diff --git a/admin-web/src/views/stock/scrap/itemScrapping/detail.vue b/admin-web/src/views/stock/scrap/itemScrapping/detail.vue
index 938b3ad..7806613 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/detail.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/detail.vue
@@ -64,13 +64,13 @@
</win-md>
</template>
<script>
-import { scrappedDetail } from '@/api/stock/scrap';
+import {scrappedDetail} from '@/api/stock/scrap';
import winMd from '@/components/win/win-md';
import * as DateFormatter from '@/utils/DateFormatter';
-import { getDownUrl } from '@/utils/base';
+import {getDownUrl} from '@/utils/base';
import Viewer from 'viewerjs';
import 'viewerjs/dist/viewer.css';
-import { getDicts } from '@/api/system/dict/data';
+import {getDicts} from '@/api/system/dict/data';
let viewer = null;
diff --git a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
index ea65c12..98b1f00 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/edit.vue
@@ -177,21 +177,15 @@
</win-md>
</template>
<script>
-import { scrappedAdd } from '@/api/stock/scrap';
-import {
- goodsTemplate,
- selectTenantWarehouse,
- goodsModel,
- warehouseSelectNumber,
-} from '@/api/baseSetting/finsystenant';
-import { getTree } from '@/api/foudation/classification';
+import {scrappedAdd} from '@/api/stock/scrap';
+import {goodsModel, goodsTemplate, selectTenantWarehouse, warehouseSelectNumber,} from '@/api/baseSetting/finsystenant';
+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 SettingIplatform from '../../../../../public/static/config';
-import { getDicts } from '@/api/system/dict/data';
+import {getUploadUrl} from '@/utils/base';
+import {mapGetters} from 'vuex';
+import {getDicts} from '@/api/system/dict/data';
export default {
components: { MyButton, winMd, upload },
diff --git a/admin-web/src/views/stock/scrap/itemScrapping/index.vue b/admin-web/src/views/stock/scrap/itemScrapping/index.vue
index 97373c7..c710ae4 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/index.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/index.vue
@@ -88,13 +88,11 @@
</template>
<script>
-import { scrappedList, } from '@/api/stock/scrap';
-import { getTree } from '@/api/baseSetting/finsystenant';
+import {scrappedList,} from '@/api/stock/scrap';
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
import edit from './edit';
import detail from './detail';
-import { getBaseUrl } from '@/utils/base';
import * as DateFormatter from '@/utils/DateFormatter';
export default {
diff --git a/admin-web/src/views/stock/scrap/scrapDetails/index.vue b/admin-web/src/views/stock/scrap/scrapDetails/index.vue
index 235d732..7a267ae 100644
--- a/admin-web/src/views/stock/scrap/scrapDetails/index.vue
+++ b/admin-web/src/views/stock/scrap/scrapDetails/index.vue
@@ -34,10 +34,9 @@
import MyTableV2 from '@/components/myTable/myTableV2';
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
import myImport from '@/views/components/myImport';
import detail from '../itemScrapping/detail';
-import { getBaseUrl } from '@/utils/base';
+import {getBaseUrl} from '@/utils/base';
import * as DateFormatter from '@/utils/DateFormatter';
export default {
diff --git a/admin-web/src/views/stock/transfer/transferApplication/detail.vue b/admin-web/src/views/stock/transfer/transferApplication/detail.vue
index db84e75..aa1a128 100644
--- a/admin-web/src/views/stock/transfer/transferApplication/detail.vue
+++ b/admin-web/src/views/stock/transfer/transferApplication/detail.vue
@@ -75,7 +75,7 @@
</win-md>
</template>
<script>
-import { transferDetail } from '@/api/stock/transfer';
+import {transferDetail} from '@/api/stock/transfer';
import * as DateFormatter from '@/utils/DateFormatter';
import winMd from '@/components/win/win-md';
import transfer from '../../../mixins/transfer';
diff --git a/admin-web/src/views/stock/transfer/transferApplication/edit.vue b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
index 2921487..94e6779 100644
--- a/admin-web/src/views/stock/transfer/transferApplication/edit.vue
+++ b/admin-web/src/views/stock/transfer/transferApplication/edit.vue
@@ -169,14 +169,13 @@
</win-md>
</template>
<script>
-import { transferAdd } from '@/api/stock/transfer';
-import { getCategorySelectTree, goodsModel, warehouseSelectNumber } from '@/api/baseSetting/finsystenant';
-import { getParentTenant, queryWarehouseGoods } from '@/api/stock/transfer';
+import {getParentTenant, queryWarehouseGoods, transferAdd} from '@/api/stock/transfer';
+import {getCategorySelectTree, goodsModel, warehouseSelectNumber} from '@/api/baseSetting/finsystenant';
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';
export default {
components: { MyButton, winMd, upload },
diff --git a/admin-web/src/views/stock/transfer/transferApplication/index.vue b/admin-web/src/views/stock/transfer/transferApplication/index.vue
index 93b9412..3b02061 100644
--- a/admin-web/src/views/stock/transfer/transferApplication/index.vue
+++ b/admin-web/src/views/stock/transfer/transferApplication/index.vue
@@ -121,14 +121,13 @@
</template>
<script>
-import { transferList, transferUpdStatus, transfeIncome, transferExport } from '@/api/stock/transfer';
+import {transfeIncome, transferExport, transferList, transferUpdStatus} from '@/api/stock/transfer';
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
import listPage from '../../../mixins/listPage';
import transfer from '../../../mixins/transfer';
-import { commonsApi } from '@/api/commonsApi';
import SettingIplatform from '@/utils/settingIplatform';
export default {
diff --git a/admin-web/src/views/stock/transfer/transferdetails/index.vue b/admin-web/src/views/stock/transfer/transferdetails/index.vue
index b630062..5195f99 100644
--- a/admin-web/src/views/stock/transfer/transferdetails/index.vue
+++ b/admin-web/src/views/stock/transfer/transferdetails/index.vue
@@ -31,10 +31,7 @@
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
import detail from '../transferApplication/detail';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
import myImport from '@/views/components/myImport';
-import { getBaseUrl } from '@/utils/base';
-import { goodsModel } from '@/api/baseSetting/finsystenant';
import * as DateFormatter from '@/utils/DateFormatter';
export default {
diff --git a/admin-web/src/views/stock/transfer/transferissue/detail.vue b/admin-web/src/views/stock/transfer/transferissue/detail.vue
index 99fff27..0294b76 100644
--- a/admin-web/src/views/stock/transfer/transferissue/detail.vue
+++ b/admin-web/src/views/stock/transfer/transferissue/detail.vue
@@ -83,7 +83,7 @@
</win-md>
</template>
<script>
-import { transferDetail } from '@/api/stock/transfer';
+import {transferDetail} from '@/api/stock/transfer';
import * as DateFormatter from '@/utils/DateFormatter';
import winMd from '@/components/win/win-md';
import transfer from '../../../mixins/transfer';
diff --git a/admin-web/src/views/stock/transfer/transferissue/index.vue b/admin-web/src/views/stock/transfer/transferissue/index.vue
index e75533f..264ae5a 100644
--- a/admin-web/src/views/stock/transfer/transferissue/index.vue
+++ b/admin-web/src/views/stock/transfer/transferissue/index.vue
@@ -102,13 +102,13 @@
</template>
<script>
-import { transferList, transferOutput } from '@/api/stock/transfer';
+import {transferList, transferOutput} from '@/api/stock/transfer';
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import detail from './detail';
import listPage from '../../../mixins/listPage';
import transfer from '../../../mixins/transfer';
-import { commonsApi } from '@/api/commonsApi';
+import {commonsApi} from '@/api/commonsApi';
import SettingIplatform from '@/utils/settingIplatform';
export default {
diff --git a/admin-web/src/views/systemManger/org/index.vue b/admin-web/src/views/systemManger/org/index.vue
index 11d81b3..10a61eb 100644
--- a/admin-web/src/views/systemManger/org/index.vue
+++ b/admin-web/src/views/systemManger/org/index.vue
@@ -38,8 +38,7 @@
import edit from './edit'
import * as finsystenant from '@/api/baseSetting/finsystenant'
import myImport from '@/views/components/myImport'
-import {updStatus} from "@/api/baseSetting/finsystenant";
-import {getBaseUrl, getUploadUrl} from '@/utils/base';
+import {getBaseUrl} from '@/utils/base';
export default {
name: "index",
diff --git a/admin-web/src/views/systemManger/server/user/edit.vue b/admin-web/src/views/systemManger/server/user/edit.vue
index a97169d..395ee74 100644
--- a/admin-web/src/views/systemManger/server/user/edit.vue
+++ b/admin-web/src/views/systemManger/server/user/edit.vue
@@ -66,14 +66,14 @@
</template>
<script>
- import winSm from '@/components/win/win-sm'
- import myButton from '@/components/myButton/myButton'
- import * as DateFormatter from '@/utils/DateFormatter'
- import * as role from "@/api/system/role";
- import * as user from "@/api/user";
- import {departmentListAll} from "@/api/system/deptment";
+import winSm from '@/components/win/win-sm'
+import myButton from '@/components/myButton/myButton'
+import * as DateFormatter from '@/utils/DateFormatter'
+import * as role from "@/api/system/role";
+import * as user from "@/api/user";
+import {departmentListAll} from "@/api/system/deptment";
- export default {
+export default {
components: {winSm, myButton},
props: {
// setting 涓』鑷冲皯鍖呭惈鎺у埗dialog鏄剧ず鎴栭殣钘忕殑灞炴��,鍏朵綑灞炴�у彲鎷撳睍
diff --git a/admin-web/src/views/systemManger/server/user/editRole.vue b/admin-web/src/views/systemManger/server/user/editRole.vue
index 8f98e4f..c20acc0 100644
--- a/admin-web/src/views/systemManger/server/user/editRole.vue
+++ b/admin-web/src/views/systemManger/server/user/editRole.vue
@@ -21,6 +21,7 @@
import myButton from '@/components/myButton/myButton'
import * as role from "@/api/system/role";
import * as user from "@/api/user";
+
export default {
components: { win, myButton },
props: {
diff --git a/admin-web/src/views/systemManger/server/user/index.vue b/admin-web/src/views/systemManger/server/user/index.vue
index c562be2..2271281 100644
--- a/admin-web/src/views/systemManger/server/user/index.vue
+++ b/admin-web/src/views/systemManger/server/user/index.vue
@@ -44,7 +44,6 @@
import edit from './edit';
import editRole from './editRole';
import * as finsystenant from '@/api/baseSetting/finsystenant';
-import * as DateFormatter from '@/utils/DateFormatter';
import * as user from '@/api/user';
export default {
diff --git a/admin-web/src/views/systemSetting/department/data.vue b/admin-web/src/views/systemSetting/department/data.vue
index b0836af..83d925a 100644
--- a/admin-web/src/views/systemSetting/department/data.vue
+++ b/admin-web/src/views/systemSetting/department/data.vue
@@ -197,8 +197,8 @@
</template>
<script>
-import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
-import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
+import {addData, delData, getData, listData, updateData} from "@/api/system/dict/data";
+import {getType, optionselect as getDictOptionselect} from "@/api/system/dict/type";
export default {
name: "Data",
diff --git a/admin-web/src/views/systemSetting/department/edit.vue b/admin-web/src/views/systemSetting/department/edit.vue
index 4e2b1b4..d23bddf 100644
--- a/admin-web/src/views/systemSetting/department/edit.vue
+++ b/admin-web/src/views/systemSetting/department/edit.vue
@@ -44,12 +44,11 @@
</template>
<script>
-import { departmentAdd, departmentEdit, departmentDetail } from '@/api/system/deptment';
+import {departmentAdd, departmentDetail, departmentEdit} from '@/api/system/deptment';
import winSm from '@/components/win/win-sm';
import myButton from '@/components/myButton/myButton';
import * as finsystenant from '@/api/baseSetting/finsystenant';
-import { findParentIds } from '@/utils/index';
-import { mapGetters } from 'vuex';
+import {findParentIds} from '@/utils/index';
export default {
components: { winSm, myButton },
diff --git a/admin-web/src/views/systemSetting/department/index.vue b/admin-web/src/views/systemSetting/department/index.vue
index 41c30b7..676cb7d 100644
--- a/admin-web/src/views/systemSetting/department/index.vue
+++ b/admin-web/src/views/systemSetting/department/index.vue
@@ -30,12 +30,11 @@
<script>
import myTree from '@/components/myTree/index';
-import { listType, getType, delType, addType, updateType, refreshCache } from '@/api/system/dict/type';
-import * as DateFormatter from '@/utils/DateFormatter';
import MyTableV2 from '@/components/myTable/myTableV2';
import SettingIplatform from '@/utils/settingIplatform';
import edit from './edit';
import * as finsystenant from '@/api/baseSetting/finsystenant';
+
export default {
name: 'Dict',
components: { MyTableV2, myTree, edit },
diff --git a/admin-web/src/views/systemSetting/dept/index.vue b/admin-web/src/views/systemSetting/dept/index.vue
index 7f933c1..e7556d0 100644
--- a/admin-web/src/views/systemSetting/dept/index.vue
+++ b/admin-web/src/views/systemSetting/dept/index.vue
@@ -186,7 +186,7 @@
</template>
<script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
+import {addDept, delDept, getDept, listDept, updateDept} from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
diff --git a/admin-web/src/views/systemSetting/dict/data.vue b/admin-web/src/views/systemSetting/dict/data.vue
index b0836af..83d925a 100644
--- a/admin-web/src/views/systemSetting/dict/data.vue
+++ b/admin-web/src/views/systemSetting/dict/data.vue
@@ -197,8 +197,8 @@
</template>
<script>
-import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
-import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
+import {addData, delData, getData, listData, updateData} from "@/api/system/dict/data";
+import {getType, optionselect as getDictOptionselect} from "@/api/system/dict/type";
export default {
name: "Data",
diff --git a/admin-web/src/views/systemSetting/dict/index.vue b/admin-web/src/views/systemSetting/dict/index.vue
index 0a98279..59b6327 100644
--- a/admin-web/src/views/systemSetting/dict/index.vue
+++ b/admin-web/src/views/systemSetting/dict/index.vue
@@ -128,12 +128,13 @@
<script>
import myTree from '@/components/myTree/index';
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
+import {addType, delType, getType, listType, refreshCache, updateType} from "@/api/system/dict/type";
import * as DateFormatter from "@/utils/DateFormatter";
import MyTableV2 from "@/components/myTable/myTableV2";
import SettingIplatform from '@/utils/settingIplatform';
import items from './items'
import * as finsystenant from '@/api/baseSetting/finsystenant';
+
export default {
name: "Dict",
components: { MyTableV2, myTree },
diff --git a/admin-web/src/views/systemSetting/menu/index.vue b/admin-web/src/views/systemSetting/menu/index.vue
index 3eb9a7d..d7533f3 100644
--- a/admin-web/src/views/systemSetting/menu/index.vue
+++ b/admin-web/src/views/systemSetting/menu/index.vue
@@ -279,7 +279,7 @@
</template>
<script>
-import {listMenu, getMenu, delMenu, addMenu, updateMenu} from "@/api/system/menu";
+import {addMenu, delMenu, getMenu, listMenu, updateMenu} from "@/api/system/menu";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
// import IconSelect from "@/components/RuoYi/IconSelect";
diff --git a/admin-web/src/views/systemSetting/role/authUser.vue b/admin-web/src/views/systemSetting/role/authUser.vue
index 8646e69..efc412c 100644
--- a/admin-web/src/views/systemSetting/role/authUser.vue
+++ b/admin-web/src/views/systemSetting/role/authUser.vue
@@ -109,7 +109,7 @@
</template>
<script>
-import { allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/role";
+import {allocatedUserList, authUserCancel, authUserCancelAll} from "@/api/system/role";
import selectUser from "./selectUser";
export default {
diff --git a/admin-web/src/views/systemSetting/role/index.vue b/admin-web/src/views/systemSetting/role/index.vue
index 8431088..1abea4d 100644
--- a/admin-web/src/views/systemSetting/role/index.vue
+++ b/admin-web/src/views/systemSetting/role/index.vue
@@ -176,9 +176,9 @@
</template>
<script>
-import {listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus} from "@/api/system/role";
-import {treeselect as menuTreeselect, roleMenuTreeselect} from "@/api/system/menu";
-import {treeselect as deptTreeselect, roleDeptTreeselect, listOrgRoot} from "@/api/system/dept";
+import {addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole} from "@/api/system/role";
+import {roleMenuTreeselect, treeselect as menuTreeselect} from "@/api/system/menu";
+import {listOrgRoot, roleDeptTreeselect, treeselect as deptTreeselect} from "@/api/system/dept";
import MyTableV2 from "@/components/myTable/myTableV2";
import SettingIplatform from '@/utils/settingIplatform';
import items from './items'
@@ -291,7 +291,7 @@
{title: '鏉冮檺瀛楃', field: 'role_key', align: 'center',},
{title: '椤哄簭鍙�', field: 'role_sort', align: 'center',},
{
- title: '鐘舵��', field: 'status', align: 'center',
+ title: '鐘舵��', field: 'status', align: 'center',
switch: row => {
const result = {}
if (row.status == 0) {
diff --git a/admin-web/src/views/systemSetting/role/selectUser.vue b/admin-web/src/views/systemSetting/role/selectUser.vue
index 3a3b121..31401e2 100644
--- a/admin-web/src/views/systemSetting/role/selectUser.vue
+++ b/admin-web/src/views/systemSetting/role/selectUser.vue
@@ -65,7 +65,8 @@
</template>
<script>
-import { unallocatedUserList, authUserSelectAll } from "@/api/system/role";
+import {authUserSelectAll, unallocatedUserList} from "@/api/system/role";
+
export default {
props: {
// 瑙掕壊缂栧彿
diff --git a/admin-web/src/views/systemSetting/user/authRole.vue b/admin-web/src/views/systemSetting/user/authRole.vue
index 5397cc0..fdc8a9e 100644
--- a/admin-web/src/views/systemSetting/user/authRole.vue
+++ b/admin-web/src/views/systemSetting/user/authRole.vue
@@ -46,7 +46,7 @@
</template>
<script>
-import { getAuthRole, updateAuthRole } from "@/api/system/user";
+import {getAuthRole, updateAuthRole} from "@/api/system/user";
export default {
name: "AuthRole",
diff --git a/admin-web/src/views/systemSetting/user/index.vue b/admin-web/src/views/systemSetting/user/index.vue
index eea60e2..7e40560 100644
--- a/admin-web/src/views/systemSetting/user/index.vue
+++ b/admin-web/src/views/systemSetting/user/index.vue
@@ -312,23 +312,23 @@
</template>
<script>
- import {
- addUser,
- changeUserStatus,
- delUser,
- getNewUserRoles,
- getUser,
- listUser,
- resetUserPwd,
- updateUser
- } from "@/api/system/user";
- import {getToken} from "@/utils/auth";
- import {listOrgRootTree, treeselect} from "@/api/system/dept";
- import Treeselect from "@riophae/vue-treeselect";
- import "@riophae/vue-treeselect/dist/vue-treeselect.css";
- import {apiBaseURL} from "@/settings";
+import {
+ addUser,
+ changeUserStatus,
+ delUser,
+ getNewUserRoles,
+ getUser,
+ listUser,
+ resetUserPwd,
+ updateUser
+} from "@/api/system/user";
+import {getToken} from "@/utils/auth";
+import {listOrgRootTree, treeselect} from "@/api/system/dept";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {apiBaseURL} from "@/settings";
- export default {
+export default {
name: "User",
// dicts: ['sys_normal_disable', 'sys_user_sex'],
components: { Treeselect },
diff --git a/admin-web/src/views/systemSetting/user/profile/userInfo.vue b/admin-web/src/views/systemSetting/user/profile/userInfo.vue
index 15362aa..46f218a 100644
--- a/admin-web/src/views/systemSetting/user/profile/userInfo.vue
+++ b/admin-web/src/views/systemSetting/user/profile/userInfo.vue
@@ -34,8 +34,8 @@
</template>
<script>
-import { mapGetters } from "vuex";
-import {updatePerson,getCurInfo} from "@/api/user";
+import {mapGetters} from "vuex";
+import {getCurInfo, updatePerson} from "@/api/user";
import {getDownUrl, upLoadFile} from "@/utils/base";
export default {
--
Gitblit v1.9.1