UDI
/
udiwms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复，界面修复

Browse Source
master
anthonyywj2 3 years ago
parent c37424db14
commit 4031a48358
14 changed files with 114 additions and 104 deletions

8
public/config.json
Unescape Escape View File

@ -1,6 +1,6 @@
{
"UDI_SYNC_SERVER_IP": "http://127.0.0.1:9995/",
"BASE_URL":"http://127.0.0.1:9991/",
"SERVER_IP": "http://127.0.0.1:9991/",
"WEBSOCKET_URL": "ws://127.0.0.1:9991/UDI_WMS_MC/api/websocket/"
"UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
"BASE_URL":"http://192.168.0.109:9991/",
"SERVER_IP": "http://192.168.0.109:9991/",
"WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/"
}

7
src/store/modules/admin.js
Unescape Escape View File

@ -11,11 +11,13 @@ import {
} from "../../utils/auth";
// import { $NOT_NETWORK } from '../../utils/errorCode'
import { Message } from "element-ui";
import {RECEIVE_ADMIN_EMPLOY_NAME} from "../mutation-types";
// initial state
const state = {
adminId: getAdminId(), // id
userName: "", // 昵称
employeeName:null,
avatar: "", // 头像
token: getToken(), // 登录token
authRules: [], // 权限列表
@ -26,6 +28,7 @@ const state = {
const getters = {
adminId: state => state.adminId,
userName: state => state.userName,
employeeName: state => state.employeeName,
avatar: state => state.avatar,
token: state => state.token,
authRules: state => state.authRules,
@ -72,6 +75,7 @@ const actions = {
const data = response.data || {};
console.log(data.userName + "--" + data.authRules);
commit(types.RECEIVE_ADMIN_NAME, data.userName);
commit(types.RECEIVE_ADMIN_EMPLOY_NAME, data.employeeName);
commit(types.RECEIVE_ADMIN_AVATAR, data.avatar);
commit(types.RECEIVE_ADMIN_AUTH_RULES, data.authRules);
resolve(data);
@ -147,6 +151,9 @@ const mutations = {
[types.RECEIVE_ADMIN_AUTH_RULES](state, authRules) {
state.authRules = authRules;
},
[types.RECEIVE_ADMIN_EMPLOY_NAME](state, employeeName) {
state.employeeName = employeeName;
},
[types.RECEIVE_ROUTERS](state, routers) {
const tempRm = constantRouterMap.concat(routers);
state.routers = JSON.parse(JSON.stringify(tempRm));

3
src/store/mutation-types.js
Unescape Escape View File

@ -7,7 +7,8 @@ export const DEL_VISITED_VIEWS = "DEL_VISITED_VIEWS";
// user（用户）相关
export const RECEIVE_ADMIN_ID = "RECEIVE_ADMIN_ID"; // 用户ID
export const RECEIVE_ADMIN_TOKEN = "RECEIVE_ADMIN_TOKEN"; // token
export const RECEIVE_ADMIN_NAME = "RECEIVE_ADMIN_NAME"; // 昵称
export const RECEIVE_ADMIN_NAME = "RECEIVE_ADMIN_NAME"; //账号
export const RECEIVE_ADMIN_EMPLOY_NAME = "RECEIVE_ADMIN_EMPLOY_NAME"; //账号
export const RECEIVE_ADMIN_AVATAR = "RECEIVE_ADMIN_AVATAR"; // 头像
export const RECEIVE_ADMIN_AUTH_RULES = "RECEIVE_ADMIN_AUTH_RULES"; // 权限列表
export const RECEIVE_ROUTERS = "RECEIVE_ROUTERS"; // 初始化路由表

2
src/views/basic/BussinessType.vue
Unescape Escape View File

@ -20,7 +20,7 @@
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="getListhandleAddClick">查询</el-button>
<el-button type="primary" icon="search" @click=""
<el-button type="primary" icon="search" @click="handleAddClick"
>新增
</el-button
>

89
src/views/basic/BussinessTypeModify.vue
Unescape Escape View File

@ -43,6 +43,25 @@
</div>
</el-col>
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>关联业务单据:&nbsp;</span>
</div>
<el-select v-model="inputQuery.localAction" placeholder="请选择" clearable="true">
<el-option
v-for="item in localTypes"
:key="item.localAction"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
</el-option>
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
</el-select>
</div>
</el-col>
<!-- <el-col :span="10" class="el-col">-->
<!-- <div class="text item">-->
<!-- <div class="itemTag">-->
@ -60,28 +79,28 @@
<!-- </el-select>-->
<!-- </div>-->
<!-- </el-col>-->
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>第三方单据类型:&nbsp;</span>
</div>
<el-select v-model="inputQuery.thirdAction" placeholder="请选择业务类型" clearable="true">
<el-option
v-for="item in originTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left;font-size: 13px">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
item.thirdSysName
}}</span>
<!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
</el-option>
</el-select>
</div>
</el-col>
<!-- <el-col :span="10" class="el-col">-->
<!-- <div class="text item">-->
<!-- <div class="itemTag">-->
<!-- <span>第三方单据类型:&nbsp;</span>-->
<!-- </div>-->
<!-- <el-select v-model="inputQuery.thirdAction" placeholder="请选择业务类型" clearable="true">-->
<!-- <el-option-->
<!-- v-for="item in originTypes"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.action">-->
<!-- <span style="float: left;font-size: 13px">{{ item.name }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
<!-- item.thirdSysName-->
<!-- }}</span>-->
<!-- &lt;!&ndash;<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>&ndash;&gt;-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </div>-->
<!-- </el-col>-->
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
@ -142,41 +161,19 @@
<!-- </el-col>-->
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>关联业务单据:&nbsp;</span>
</div>
<el-select v-model="inputQuery.localAction" placeholder="请选择" clearable="true">
<el-option
v-for="item in localTypes"
:key="item.localAction"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
</el-option>
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
</el-select>
</div>
</el-col>
<el-col :span="10" class="el-col">
<el-col :span="20" class="el-col">
<div class="text item">
<div class="itemTag">
<span>备注:&nbsp;</span>
</div>
<el-input
style="width: 70%"
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="inputQuery.remark"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">

2
src/views/basic/BussinessTypeThird.vue
Unescape Escape View File

@ -42,7 +42,7 @@
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" width="55" ></el-table-column>
<el-table-column label="单据名称" prop="name" ></el-table-column>
<el-table-column label="单据类型名称" prop="name" ></el-table-column>
<el-table-column label="单据类型代码" prop="action" ></el-table-column>
<!-- <el-table-column label="是否启用" prop="enable" fixed>-->
<!-- <template slot-scope="scope">-->

4
src/views/business/selectThrOrder.vue
Unescape Escape View File

@ -31,7 +31,7 @@
<!-- </el-option>-->
<!-- </el-select>-->
<el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
<el-select v-model="listQuery.thirdAction" placeholder="请选择第三方系统单据类型" clearable="true">
<el-option
v-for="item in originTypes"
:key="item.name"
@ -144,7 +144,7 @@ export default {
listQuery: {
billNo: "",
thirdSysFk: "",
billAction: null,
thirdAction: null,
originType: null,
page: 1,
limit: 10,

39
src/views/business/stockOrderNewDistribution.vue
Unescape Escape View File

@ -62,25 +62,29 @@
</el-row>
<el-row :gutter="20" style="margin-top: -10px">
<el-col :span="3">
<div class="ao-text">
<span>业务类型：</span>
<span>当前仓库：</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="billType">
<el-select v-model="formData.billType" placeholder="请选择业务类型" @change="actionChange"
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
clearable>
<el-option
v-for="item in busTypes"
:key="item.localAction"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="ao-text">
<span>往来单位：</span>
@ -147,26 +151,25 @@
<el-row :gutter="20" style="margin-top: -10px">
<el-col :span="3">
<div class="ao-text">
<span>当前仓库：</span>
<span>业务类型：</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
<el-form-item prop="billType">
<!-- @change="actionChange"-->
<el-select v-model="formData.billType" placeholder="请选择业务类型"
clearable>
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
v-for="item in busTypes"
:key="item.localAction"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="ao-text">
<span></span>

5
src/views/home/index.vue
Unescape Escape View File

@ -84,7 +84,7 @@
</div>
<div class="header-right">
<span style="margin-right: 10px; margin-top: 2px">{{ company }}</span>
<span style="margin-right: 10px; margin-top: 2px">{{ employName }}</span>
<el-dropdown trigger="click">
<!--<i class="el-icon-setting" style="margin-right: 15px"></i>-->
<span
@ -254,7 +254,6 @@ export default {
},
username() {
let username = this.$store.state.admin.userName;
this.employName = username;
let rUserName = !username ? this.name : username;
return "(" + username + ")";
},
@ -280,6 +279,8 @@ export default {
this.levelList = matched;
},
getCompanyData() {
this.employName = this.$store.state.admin.employeeName;
console.log( this.employName +"--------------");
this.loading = true;
let tquery = {
customerId: store.getters.customerId,

4
src/views/inout/DialogImportErpOrder.vue
Unescape Escape View File

@ -142,7 +142,7 @@
filterQuery: {
billNo: "",
billFlag: null,
billAction: "PurchaseWareHouseIn",
billAction: null,
startDate: null,
endDate: null,
page: 1,
@ -205,7 +205,7 @@
this.filterQuery = {
billcode: "",
fbillflag: null,
billAction: "PurchaseWareHouseIn",
billAction: null,
startDate: null,
endDate: null,
page: 1,

9
src/views/inout/DialogSelectErpOrder.vue
Unescape Escape View File

@ -15,7 +15,7 @@
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.billAction" placeholder="请选择业务类型">
<el-select v-model="filterQuery.localAction" placeholder="请选择业务类型">
<el-option
v-for="item in busTypes"
:key="item.name"
@ -171,7 +171,7 @@ export default {
filterQuery: {
billcode: "",
billFlag: null,
billAction: null,
localAction: null,
startDate: null,
endDate: null,
status: 3,
@ -181,6 +181,7 @@ export default {
value: "",
total: 0,
list: [],
busTypes:[],
loading: false,
detailLoading: false,
detailList: [],
@ -235,7 +236,7 @@ export default {
this.filterQuery = {
billNo: "",
billFlag: null,
billAction: null,
localAction: null,
startDate: null,
endDate: null,
page: 1,
@ -370,7 +371,7 @@ export default {
}
filterByBus(tQuery)
.then((response) => {
this.filterQuery.billAction = response.data;
this.filterQuery.localAction = response.data;
this.getList();
})
.catch(() => {

28
src/views/inout/IONewOrder.vue
Unescape Escape View File

@ -14,7 +14,7 @@
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.action" placeholder="请选择业务类型">
<el-select v-model="filterQuery.action" placeholder="请选择扫码单据类型">
<el-option
v-for="item in busTypes"
:key="item.name"
@ -56,19 +56,19 @@
</el-button-group>
</el-form-item>
<el-form-item>
<el-upload
:action="uploadFileUrl"
multiple
:limit="3"
:data="uploadData"
:show-file-list="false"
:on-success="handleChange"
:file-list="fileList"
>
<el-button size="mini" type="primary">导入单据</el-button>
</el-upload>
</el-form-item>
<!-- <el-form-item>-->
<!-- <el-upload-->
<!-- :action="uploadFileUrl"-->
<!-- multiple-->
<!-- :limit="3"-->
<!-- :data="uploadData"-->
<!-- :show-file-list="false"-->
<!-- :on-success="handleChange"-->
<!-- :file-list="fileList"-->
<!-- >-->
<!-- <el-button size="mini" type="primary">导入单据</el-button>-->
<!-- </el-upload>-->
<!-- </el-form-item>-->
</el-row>
</el-form>

6
src/views/smp/ErpOrderSmpUpload.vue
Unescape Escape View File

@ -11,7 +11,7 @@
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.billAction" placeholder="请选择业务类型">
<el-select v-model="filterQuery.action" placeholder="请选择业务类型">
<el-option
v-for="item in busTypes"
:key="item.name"
@ -127,7 +127,7 @@
billNo: "",
thirdSysFk: "",
billFlag: null,
billAction: "PurchaseWareHouseIn",
action: null,
startDate: null,
endDate: null,
page: 1,
@ -236,7 +236,7 @@
getBussinessType(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action;
this.filterQuery.action = this.busTypes[0].action;
})
.catch(() => {
});

12
src/views/thrsys/ThrOrder.vue
Unescape Escape View File

@ -116,14 +116,14 @@
<el-table-column label="往来单位ID" prop="corpId"></el-table-column>
<el-table-column label="往来单位" prop="corpName"
show-overflow-tooltip="true"></el-table-column>
<el-table-column label="第三方单据类型" prop="originType"></el-table-column>
<el-table-column label="扫码单据类型" prop="billType">
<el-table-column label="第三方单据类型" prop="billType"></el-table-column>
<!-- <el-table-column label="扫码单据类型" prop="billType">-->
<template slot-scope="scope">
<span>{{ geActionName(scope.row.billType) }}</span>
</template>
<!-- <template slot-scope="scope">-->
<!-- <span>{{ geActionName(scope.row.billType) }}</span>-->
<!-- </template>-->
</el-table-column>
<!-- </el-table-column>-->
<el-table-column label="单据状态" prop="billFlag"></el-table-column>
<el-table-column label="单据日期" prop="billdate"></el-table-column>

Write Preview
Loading…
Cancel
Save