diff --git a/src/components/edittablehead/index.vue b/src/components/edittablehead/index.vue index 80d67806..e21f8183 100644 --- a/src/components/edittablehead/index.vue +++ b/src/components/edittablehead/index.vue @@ -265,7 +265,6 @@ let headtop = ref([ ]); setTimeout(() => { - console.log(props.columnList, '---------------------'); }, 2000); diff --git a/src/components/lodop/LodopFuncs.js b/src/components/lodop/LodopFuncs.js index b19b0a7f..29f9cd3c 100644 --- a/src/components/lodop/LodopFuncs.js +++ b/src/components/lodop/LodopFuncs.js @@ -50,7 +50,7 @@ export function needCLodop() { } //==检查加载成功与否，如没成功则用http(s)再试== //==低版本CLODOP6.561/Lodop7.043及前)用本方法== -function checkOrTryHttp() { +export function checkOrTryHttp() { if (window.getCLodop) { LoadJsState = "complete"; return true; diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 16c38d5c..15ed11c3 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -15,7 +15,9 @@
- + + + @@ -69,6 +71,7 @@ export default { (this.$route.meta || {}).menu === false || (this.$route.query || {}).menu === 'false' ); }, + }, mounted() { if (this.userInfo.tenant_id == '000000') { @@ -80,6 +83,8 @@ export default { obj.debug = false; this.$store.commit('SERTING', obj); } + // 加入需要不刷新的页面 + // $store.getters.tagsKeep.push("") // console.log(obj) }, props: [], diff --git a/src/router/views/index.js b/src/router/views/index.js index ce6ac0be..d71adfef 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -758,6 +758,7 @@ export default [ name: '转库存品', meta: { i18n: 'dict', + }, props: route => ({ name: route.query.name, @@ -777,6 +778,8 @@ export default [ name: '查询订单详情', meta: { i18n: 'dict', + keepAlive: true + }, props: route => ({ name: route.query.name, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 082d42d8..bb2403a7 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -194,7 +194,6 @@ const user = { const data = res.data.data; let menu = deepClone(data); menu.forEach(ele => formatPath(ele, true)); - console.log(menu); commit('SET_MENU', menu); commit('SET_MENU_ALL', menu); dispatch('GetButtons'); diff --git a/src/utils/functions.js b/src/utils/functions.js index de15e3f1..23691bb2 100644 --- a/src/utils/functions.js +++ b/src/utils/functions.js @@ -7,7 +7,6 @@ const utils = { setStorage: (key, data) => { let tenant_id = JSON.parse(localStorage.getItem('TWMS-userInfo')).content.tenant_id let newdata = JSON.stringify(data) - console.log(tenant_id + '' + key, newdata) sessionStorage.setItem(tenant_id + '' + key, newdata) return true }, diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse3.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse3.vue index c0208382..6f3b3c3a 100644 --- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse3.vue +++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse3.vue @@ -1259,7 +1259,6 @@ export default { this.query.genre = 1; getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; - console.log('>>>>>>>', data.records); this.page.total = data.total; this.data = data.records; this.data = this.data.map(i => { diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index b2f8275f..b13d70eb 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -1017,7 +1017,7 @@ export default { handleEdit(scope) { const { row } = scope; this.$router.push({ - path: '/distribution/turndelivery/devtmp', + path: '/distribution/turndelivery/deliveryDiscuss', query: { id: row.id, name: row.trainNumber + '-编辑配送', diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue index c2595125..d718929c 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue @@ -1749,7 +1749,6 @@ export default { this.query.genre = 1; getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; - console.log('>>>>>>>', data.records); this.page.total = data.total; this.data = data.records; this.data = this.data.map(i => { diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue index 186f2737..3fe8538a 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue @@ -968,6 +968,7 @@ export default { }, computed: { ...mapGetters(['permission']), + permissionList() { return { addBtn: this.validData(this.permission.basicdataBrandCategory_add, false), @@ -983,6 +984,7 @@ export default { }); return ids.join(','); }, + }, methods: { //导出 @@ -1533,6 +1535,9 @@ export default { return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + s; }, onLoad(page, params = {}) { + + + this.loading = true; if (this.stockupDate.length > 0) { let startDate = this.stockupDate[0]; @@ -1544,7 +1549,6 @@ export default { this.query.typeService = 1; getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; - console.log('>>>>>>>', data.records); this.page.total = data.total; this.data = data.records; this.data = this.data.map(i => { diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue index 6f4261fe..81ddbd24 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue @@ -1920,7 +1920,6 @@ export default { this.query.typeService = 3; getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; - console.log('>>>>>>>', data.records); this.page.total = data.total; this.data = data.records; this.data = this.data.map(i => { diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue b/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue index 6ea366b4..2815244d 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue @@ -1655,7 +1655,6 @@ export default { Object.assign(params, this.query) ).then(res => { const data = res.data.data; - console.log('>>>>>>>', data.records); this.page.total = data.total; this.data = data.records; this.data = this.data.map(i => { diff --git a/src/views/distribution/turndelivery/devtmp.vue b/src/views/distribution/turndelivery/devtmp.vue index 6a3eea1a..eaf6dcca 100644 --- a/src/views/distribution/turndelivery/devtmp.vue +++ b/src/views/distribution/turndelivery/devtmp.vue @@ -274,7 +274,7 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ 搜索 + + 清空 + +
+ +
+ + + + + + +
+
+
@@ -608,7 +697,7 @@ @@ -2164,6 +2330,7 @@ const moveUpVehictle = row => { top: 24px; } .el-dialog__body { + padding: 8px; .el-form { width: 100%; display: flex; @@ -2172,12 +2339,13 @@ const moveUpVehictle = row => { } .el-form-item { width: 276px; + flex-direction: row; .el-form-item__label { - font-family: '黑体'; + justify-content: flex-start; } } /* 去掉第三个、第六个、第九个div的右外边距 */ - .el-form-item:nth-child(3n) { + .el-form-item:nth-child(2n) { margin-right: 0; } } @@ -2393,12 +2561,12 @@ const moveUpVehictle = row => { transition: all 0.5s; display: flex; justify-content: space-between; - + flex-direction: column; .el-form { display: flex; flex-wrap: wrap; .el-form-item { - width: auto; + width: 360px; display: flex; align-items: center; justify-items: center; @@ -2416,6 +2584,8 @@ const moveUpVehictle = row => { // 右侧搜索清空按钮样式 .SoBtn { display: flex; + margin-left: auto; + margin-bottom: 8px; .SoEmpty { background-color: transparent; color: #000; diff --git a/src/views/system/user.vue b/src/views/system/user.vue index 71fb5ce4..42dd1b98 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -711,20 +711,30 @@ export default { }, }, computed: { - ...mapGetters(['userInfo', 'permission']), + ...mapGetters(['userInfo', 'permission']), + // 权限列表 permissionList() { return { + // 添加按钮 addBtn: this.validData(this.permission.user_add, false), + // 查看按钮 viewBtn: this.validData(this.permission.user_view, false), + // 删除按钮 delBtn: this.validData(this.permission.user_delete, false), + // 编辑按钮 editBtn: this.validData(this.permission.user_edit, false), }; }, + // 平台权限列表 platformPermissionList() { return { + // 添加按钮 addBtn: false, + // 查看按钮 viewBtn: false, + // 删除按钮 delBtn: false, + // 编辑按钮 editBtn: this.validData(this.permission.user_edit, false), }; }, diff --git a/vite.config.js b/vite.config.js index c74cba5a..f84500a1 100644 --- a/vite.config.js +++ b/vite.config.js @@ -20,8 +20,8 @@ export default ({ mode, command }) => { // target: 'http://192.168.10.101:8888', // target: 'http://192.168.10.75:8777', // tjj - // target: 'http://192.168.10.29:13000', - target: 'http://test.api.huitongys.com', + target: 'http://192.168.10.29:13000', + // target: 'http://test.api.huitongys.com', // target: 'http://h5uapi.huitongys.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''),