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

界面修改

Browse Source
master
anthonyywj2 3 years ago
parent f93e457a46
commit 8d242ea503
16 changed files with 68 additions and 58 deletions
Show Stats Download Patch File Download Diff File

8
public/config.json
Unescape Escape View File

@ -1,6 +1,6 @@
{
"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/"
"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/"
}

2
src/router/index.js
Unescape Escape View File

@ -907,7 +907,7 @@ export const asyncRouterMap = [
component: Home,
icon: "tongyong",
name: "内部码管理",
hidden: false,
hidden: true,
noDropdown: false,
meta: {
authRule: ["myCode"]

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

@ -4,13 +4,19 @@
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.action"
v-model="filterQuery.name"
placeholder="业务类型"
style="width: 400px"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.enabled" placeholder="状态">
<el-select v-model="filterQuery.mainAction" placeholder="出入库类型">
<el-option label="全部" value=""></el-option>
<el-option label="入库" value="WareHouseIn"></el-option>
<el-option label="出库" value="WareHouseOut"></el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.enabled" placeholder="是否启用">
<el-option label="全部" value=""></el-option>
<el-option label="已启用" value=1></el-option>
<el-option label="未启用" value=0></el-option>
@ -19,7 +25,7 @@
<el-form-item>
<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="getList">查询</el-button>
<el-button type="primary" icon="search" @click="handleAddClick"
>新增
</el-button
@ -42,11 +48,14 @@
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" width="120" fixed></el-table-column>
<el-table-column label="序号" type="index" width="60" fixed></el-table-column>
<el-table-column label="扫码单据类型" prop="name" fixed></el-table-column>
<!-- <el-table-column label="出入库类型代码" prop="mainAction" fixed></el-table-column>-->
<el-table-column label="扫码单据类型代码" prop="action" fixed></el-table-column>
<el-table-column label="出入库类型" prop="mainAction" fixed>
<template slot-scope="scope">
<span>{{ mainActionMap[scope.row.mainAction] }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="扫码单据类型代码" prop="action" fixed></el-table-column>-->
<el-table-column label="是否启用" prop="enable" fixed>
<template slot-scope="scope">
<span>{{ enableMap[scope.row.enable] }}</span>
@ -208,9 +217,9 @@ export default {
true: "是",
false: "否",
},
formMap: {
mainActionMap: {
WareHouseIn: "入库",
WareHouseOut: "出库",
WareHouseOut: "出库"
},
fileList: [],
total: 0,
@ -326,7 +335,7 @@ export default {
handleAddClick() {
this.inputQuery = {};
this.inputQuery = {enable: true};
this.addDialogVisible = true;
},

23
src/views/basic/BussinessTypeLocl.vue
Unescape Escape View File

@ -4,18 +4,18 @@
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.action"
v-model="filterQuery.name"
placeholder="业务类型"
style="width: 400px"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.enabled" placeholder="状态">
<el-option label="全部" value=""></el-option>
<el-option label="已启用" value=1></el-option>
<el-option label="未启用" value=0></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.enabled" placeholder="状态">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="已启用" value=1></el-option>-->
<!-- <el-option label="未启用" value=0></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
@ -45,7 +45,7 @@
<span>{{ enableMap[scope.row.advanceType] }}</span>
</template>
</el-table-column>
<el-table-column label="是否自动补单" prop="advanceType" fixed>
<el-table-column label="缺量自动补单" prop="advanceType" fixed>
<template slot-scope="scope">
<span>{{ enableMap[scope.row.changeEnable] }}</span>
</template>
@ -130,6 +130,7 @@ export default {
thirdType: "",
page: 1,
limit: 20,
name:null,
},
addDialogVisible: false,
modifyDialogVisible: false,
@ -247,9 +248,9 @@ export default {
name: "",
enable: "",
remark: "",
mainAction: "",
mainAction: null,
thirdSysFk: "",
id: "",
id: null,
advanceType: null,
localAction: null,
changeEnable: null,

4
src/views/basic/BussinessTypeLoclModify.vue
Unescape Escape View File

@ -84,7 +84,7 @@
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.changeEnable" @change="isChangeOrder"
:disabled="!changeEnable || inputQuery.mainAction=='WareHouseIn'">
:disabled="!changeEnable || inputQuery.mainAction=='WareHouseIn' || inputQuery.id == null || inputQuery.mainAction==null">
缺量自动补单
</el-checkbox>
</div>
@ -108,7 +108,7 @@
<!-- >-->
<!-- </div>-->
<el-table border style="margin-bottom: 20px;margin-top: 10px" :data="changeList">
<el-table-column label="序号" prop="index" width="55"></el-table-column>
<el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="补单说明" prop="intro"></el-table-column>
<!-- <el-table-column label="补单单据类型代码" prop="action"></el-table-column>-->
<el-table-column label="补单扫码单据类型" prop="name"></el-table-column>

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

@ -211,7 +211,7 @@
this.getList();
},
deleteDialog(rowId) {
this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", {
this.$confirm("此操作将删除该往来单位信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",

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

@ -204,7 +204,7 @@
this.getList();
},
deleteDialog(rowId) {
this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", {
this.$confirm("此操作将删除该往来单位信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",

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

@ -198,7 +198,7 @@ export default {
this.getList();
},
deleteDialog(rowId) {
this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", {
this.$confirm("此操作将删除该往来单位信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",

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

@ -534,7 +534,7 @@
},
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
this.$confirm("此操作将永久删除该往来单位信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",

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

@ -520,7 +520,7 @@
},
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
this.$confirm("此操作将永久删除该往来单位信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",

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

@ -218,7 +218,7 @@ export default {
this.getList();
},
deleteDialog(rowId) {
this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", {
this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",

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

@ -212,7 +212,7 @@
this.getList();
},
deleteDialog(rowId) {
this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", {
this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",

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

@ -197,7 +197,7 @@ export default {
this.getList();
},
deleteDialog(rowId) {
this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", {
this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",

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

@ -213,7 +213,7 @@
this.getList();
},
deleteDialog(rowId) {
this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", {
this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",

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

@ -209,7 +209,7 @@
this.getList();
},
deleteDialog(rowId) {
this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", {
this.$confirm("此操作将删除该产品信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",

16
src/views/userManage/admin/authRole.vue
Unescape Escape View File

@ -4,13 +4,13 @@
<el-form-item class="query-form-item">
<el-input v-model="query.name" placeholder="角色名称"></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.status" placeholder="状态">
<el-option label="全部" value=""></el-option>
<el-option label="禁用" value="0"></el-option>
<el-option label="正常" value="1"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.status" placeholder="状态">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="禁用" value="0"></el-option>-->
<!-- <el-option label="正常" value="1"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button-group>
@ -130,7 +130,7 @@
></el-input>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio-group v-model="formData.status" :disabled="true">
<el-radio :label="0">禁用</el-radio>
<el-radio :label="1">正常</el-radio>
</el-radio-group>

Write Preview
Loading…
Cancel
Save