界面修改

master
anthonyywj2 3 years ago
parent 6c863f47e5
commit 20a1f295bb

@ -7,35 +7,36 @@
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>扫码单据类型:&nbsp;</span>
<span>委托仓库:&nbsp;</span>
</div>
<el-select v-model="inputQuery.action" placeholder="请选择" clearable>
<el-select v-model="inputQuery.curInv" placeholder="当前仓库" @change="invChange" clearable>
<el-option
v-for="item in busTypes"
:key="item.localAction"
v-for="item in storageList"
:key="item.code"
:label="item.name"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
:value="item.code">
<span style="float: left">{{ item.name }}</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>
<span>扫码单据类型:&nbsp;</span>
</div>
<el-select v-model="inputQuery.curInv" placeholder="当前仓库" @change="invChange" clearable>
<el-select v-model="inputQuery.action" placeholder="请选择" clearable>
<el-option
v-for="item in storageList"
:key="item.code"
v-for="item in busTypes"
:key="item.localAction"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
</el-option>
</el-select>
</div>
</el-col>
@ -46,7 +47,8 @@
<div class="itemTag">
<span>接受委托仓库:&nbsp;</span>
</div>
<el-select v-model="inputQuery.entrustInv" placeholder="接受委托仓库" @change="entrustInvChange" clearable>
<el-select v-model="inputQuery.entrustInv" placeholder="接受委托仓库" @change="entrustInvChange"
clearable>
<el-option
v-for="item in entrustStorageList"
:key="item.code"
@ -206,19 +208,21 @@ export default {
.catch(() => {
});
},
getOrderType() {
filterNoUseBusType().then((response) => {
getOrderType(code) {
let query = {
locInvCode: code
}
filterNoUseBusType(query).then((response) => {
this.busTypes = response.data || [];
}).catch(() => {
})
},
invChange(code) {
let query = {
code: code
}
this.$set(this.inputQuery, "entrustUser","");
this.$set(this.inputQuery, "entrustInv","");
this.getOrderType(code);
this.$set(this.inputQuery, "entrustUser", "");
this.$set(this.inputQuery, "entrustInv", "");
this.getEntrustStorage();
},
@ -232,7 +236,7 @@ export default {
this.$forceUpdate();
//
warehouseUserList(query).then((res) => {
this.entrustUserArray=[];
this.entrustUserArray = [];
this.entrustUserArray = res.data;
if (this.inputQuery.entrustUser != null && this.inputQuery.entrustUser != '') {
this.inputQuery.entrustUser = Number(this.inputQuery.entrustUser);
@ -249,7 +253,6 @@ export default {
});
},
},

@ -841,6 +841,20 @@ export default {
let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end];
// let d = new Date
// let year1,month1,day1;
// [year1,month1,day1] = [d.getFullYear(),d.getMonth(),d.getDate()]
// let date1 = new Date(year1, month1, day1,7)
// this.actDateRange.push(date1)
// //
// let year2,month2,day2
// d.setTime(d.getTime()-7*24*60*60*1000);
// [year2,month2,day2] = [d.getFullYear(),d.getMonth(),d.getDate()]
// let date2 = new Date(year2,month2,day2,7)
// this.actDateRange.unshift(date2)
},
};
</script>

@ -43,7 +43,8 @@
v-model="configQuery.syncIp" :disabled="configQuery.downstreamEnable"
splaceholder="请输入内容"
></el-input>
<el-button type="primary" size="small" @click="testConnect()" style="margin-left: 20px;" :disabled="configQuery.downstreamEnable"
<el-button type="primary" size="small" @click="testConnect()" style="margin-left: 20px;"
:disabled="configQuery.downstreamEnable"
:loading="testLoading">测试连通
</el-button>
@ -52,6 +53,9 @@
</el-row>
</el-descriptions-item>
</el-descriptions>
<el-descriptions class="margin-top" title="上传至UDI自助平台基础数据" :column="1" :size="100" style="margin-top: 40px"
border>
<el-descriptions-item>
<template slot="label">
@ -84,30 +88,33 @@
</el-row>
</el-descriptions-item>
</el-descriptions>
<el-descriptions class="margin-top" title="上传至UDI自助平台基础数据" :column="1" :size="100" style="margin-top: 40px"
border>
<el-descriptions-item>
<template slot="label">
运行参数
</template>
<el-checkbox v-model="configQuery.entrustAction" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.entrustAction" :disabled="configQuery.downstreamEnable">
</el-checkbox>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
单据类型
</template>
<el-checkbox v-model="configQuery.typeBus" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.typeScan" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.typeThird" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.typeScan" :disabled="configQuery.downstreamEnable">
</el-checkbox>
<el-checkbox v-model="configQuery.typeThird" :disabled="configQuery.downstreamEnable">
</el-checkbox>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
基础信息
</template>
<el-checkbox v-model="configQuery.basicProducts" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.basicCorp" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.basicProducts" :disabled="configQuery.downstreamEnable">
</el-checkbox>
<el-checkbox v-model="configQuery.basicCorp" :disabled="configQuery.downstreamEnable">
</el-checkbox>
<el-checkbox v-model="configQuery.basicInv" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.sysUser" :disabled="configQuery.downstreamEnable"></el-checkbox>
</el-descriptions-item>
@ -115,10 +122,14 @@
<template slot="label">
第三方基础信息
</template>
<el-checkbox v-model="configQuery.basicThirdProducts" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.basicThirdCorp" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.basicThirdInv" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.basicThirdBusOrder" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.basicThirdProducts" :disabled="configQuery.downstreamEnable">
</el-checkbox>
<el-checkbox v-model="configQuery.basicThirdCorp" :disabled="configQuery.downstreamEnable">
</el-checkbox>
<el-checkbox v-model="configQuery.basicThirdInv" :disabled="configQuery.downstreamEnable">
</el-checkbox>
<el-checkbox v-model="configQuery.basicThirdBusOrder" :disabled="configQuery.downstreamEnable">
</el-checkbox>
</el-descriptions-item>
<!-- <el-descriptions-item>-->
@ -133,13 +144,49 @@
<el-descriptions class="margin-top" title="上传至UDI自助平台单据" :column="1" :size="100" style="margin-top: 40px"
border>
<el-descriptions-item>
<template slot="label">
参数设置
</template>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="20" class="el-col">
<div>
<span>单据上传时间间隔(单位:分钟):&nbsp;</span>
<el-input
style="width: 100px"
size="small"
type="number"
v-model="configQuery.orderSyncTime" :disabled="configQuery.downstreamEnable"
splaceholder="请输入内容"
></el-input>
<span style="margin-left: 30px;">单据下载时间间隔(单位:分钟):&nbsp;</span>
<el-input
style="width: 100px"
size="small"
type="number"
v-model="configQuery.orderSyncDlTime" :disabled="configQuery.downstreamEnable"
splaceholder="请输入内容"
></el-input>
</div>
</el-col>
</el-row>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
单据(单据状态)
</template>
<el-checkbox v-model="configQuery.orderUnCheck" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.orderUnReceive" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.orderScanFinish" :disabled="configQuery.downstreamEnable"></el-checkbox>
<el-checkbox v-model="configQuery.orderUnCheck" :disabled="configQuery.downstreamEnable">
</el-checkbox>
<el-checkbox v-model="configQuery.orderUnReceive" :disabled="configQuery.downstreamEnable">
</el-checkbox>
<el-checkbox v-model="configQuery.orderScanFinish" :disabled="configQuery.downstreamEnable">
</el-checkbox>
</el-descriptions-item>
<el-descriptions-item label="单据(单据类型)" label-style="width: 150px">
@ -253,6 +300,8 @@ export default {
orderUnCheck: null,
orderUnReceive: null,
sysUser: null,
orderSyncTime: null,
orderSyncDlTime: null,
busTypes: [],
},
checkedBusTypes: [],

Loading…
Cancel
Save