java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修复bug

fix_bug_pro20231227
13208366016 1 year ago
parent
9ad589a34a b03d088923
commit
a2308e5617
14 changed files with 39 additions and 122 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/components/edittablehead/index.vue
  2. 2
      src/components/lodop/LodopFuncs.js
  3. 7
      src/page/index/index.vue
  4. 3
      src/router/views/index.js
  5. 1
      src/store/modules/user.js
  6. 1
      src/utils/functions.js
  7. 1
      src/views/basicdata/warehouse/warehouse/basicdataWarehouse3.vue
  8. 1
      src/views/distribution/inventory/delivery/distributionStockArticle.vue
  9. 6
      src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
  10. 1
      src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
  11. 1
      src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue
  12. 120
      src/views/distribution/inventory/distrilbutionBillLading.vue
  13. 12
      src/views/system/user.vue
  14. 4
      vite.config.js

1
src/components/edittablehead/index.vue
Unescape View File

@ -265,7 +265,6 @@ let headtop = ref<headtoptype[]>([
]);
setTimeout(() => {
console.log(props.columnList, '---------------------');
}, 2000);
</script>
<style lang="scss"></style>

2
src/components/lodop/LodopFuncs.js
Unescape View File

@ -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;

7
src/page/index/index.vue
Unescape View File

@ -15,7 +15,9 @@
<!-- 主体视图层 -->
<div id="avue-view" v-show="!isSearch" v-if="isRefresh">
<router-view #="{ Component }">
<keep-alive :include="$store.getters.tagsKeep">
<!-- <keep-alive :include="$store.getters.tagsKeep" :max="20"> -->
<keep-alive :max="20">
<component :is="Component" />
</keep-alive>
</router-view>
@ -70,6 +72,7 @@ export default {
(this.$route.meta || {}).menu === false || (this.$route.query || {}).menu === 'false'
);
},
},
data(){
return{
@ -93,6 +96,8 @@ export default {
obj.debug = false;
this.$store.commit('SERTING', obj);
}
// 加入需要不刷新的页面
// $store.getters.tagsKeep.push("")
// console.log(obj)
},
props: [],

3
src/router/views/index.js
Unescape View File

@ -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,

1
src/store/modules/user.js
Unescape View File

@ -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');

1
src/utils/functions.js
Unescape View File

@ -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
},

1
src/views/basicdata/warehouse/warehouse/basicdataWarehouse3.vue
Unescape View File

@ -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 => {

1
src/views/distribution/inventory/delivery/distributionStockArticle.vue
Unescape View File

@ -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 => {

6
src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
Unescape View File

@ -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 => {

1
src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
Unescape View File

@ -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 => {

1
src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue
Unescape View File

@ -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 => {

120
src/views/distribution/inventory/distrilbutionBillLading.vue
Unescape View File

@ -1615,39 +1615,6 @@ export default {
sortable: true,
head: false,
},
{
label: '主键',
prop: 'id',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
label: '租户号',
prop: 'tenantId',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
label: '创建人',
prop: 'createUser',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
label: '创建时间',
prop: 'createTime',
@ -1659,61 +1626,6 @@ export default {
sortable: true,
head: false,
},
{
label: '更新人',
prop: 'updateUser',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
label: '更新时间',
prop: 'updateTime',
type: 4,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
label: '状态',
prop: 'status',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
label: '是否已删除',
prop: 'isDeleted',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
label: '创建部门',
prop: 'createDept',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
label: '仓库',
prop: 'warehouse',
@ -1813,17 +1725,6 @@ export default {
sortable: true,
head: false,
},
{
label: '转库存品数量',
prop: 'inventoryQuantity',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
label: '车次号',
prop: 'trainNumber',
@ -1835,17 +1736,6 @@ export default {
sortable: true,
head: false,
},
{
label: '在库订单ID',
prop: 'stockArticleId',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
],
// 列表数据
orderDetails: [],
@ -2308,6 +2198,7 @@ export default {
return {
parceListId: val.id,
stockArticleId: val.stockArticleId,
packetBarCode: val.orderPackageCode,
};
});
this.dialogChooseOrderVisible = false;
@ -2848,6 +2739,7 @@ export default {
},
//库存品
onLoadList(page, params = {}) {
console.log('111 :>> ', 111);
this.loading = true;
let a = {};
if (this.$route.query.type == '1') {
@ -2855,8 +2747,10 @@ export default {
} else if (this.$route.query.type === '2') {
a = this.dataList[0];
} else if (this.$route.query.type == '3') {
a = this.dataOrder[0];
a = this.dataList[0];
}
console.log('a :>> ', a);
console.log(' this.dataOrder :>> ', this.dataOrder);
// let a = this.dataList[0];
if (!!a.mallId) {
params.marketId = a.mallId;
@ -2872,6 +2766,10 @@ export default {
this.selectionClear();
});
} else {
this.$message({
type: 'warning',
message: '无法获取商场信息',
});
this.loading = false;
this.pageStock.total = 0;
}

12
src/views/system/user.vue
Unescape View File

@ -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),
};
},

4
vite.config.js
Unescape View File

@ -23,7 +23,11 @@ export default ({ mode, command }) => {
target: 'http://192.168.10.75:8777',
// tjj
// target: 'http://192.168.10.29:13000',
<<<<<<< HEAD
// target: 'http://test.api.huitongys.com',
=======
target: 'http://test.api.huitongys.com',
>>>>>>> b03d088923c558e796ad872d1c718c34ccd5d8be
// target: 'http://h5uapi.huitongys.com',
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, ''),

Write Preview
Loading…
Cancel
Save