Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
0c1e579e 1 parent a8c4f19e

发件人帐号字段输入最大值增加，checkbox限时固定宽。

Inline Side-by-side
Showing 3 changed files with 90 additions and 61 deletions
......@@ -64,14 +64,14 @@
</el-empty>
<el-row class="rowPadding" v-else>
<el-button type="primary" size="mini" @click="submit(idx)">保 存</el-button>
<el-button type="primary" v-if="val.status === '1'" size="mini"
icon="el-icon-video-pause" @click="changeStatus(idx)">
<el-button type="primary" v-if="val.status === '1'" size="mini" icon="el-icon-video-pause"
@click="changeStatus(idx)">
停 用</el-button>
<el-button type="primary" v-if="val.status === '3'" size="mini"
icon="el-icon-video-pause" @click="changeStatus(idx)">
<el-button type="primary" v-if="val.status === '3'" size="mini" icon="el-icon-video-pause"
@click="changeStatus(idx)">
启 用</el-button>
<el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete"
@click="del(idx)">删 除
<el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" @click="del(idx)">删
除
</el-button>
<el-divider></el-divider>
<el-col :span="24">
......@@ -83,13 +83,13 @@
</el-radio-group>
</el-col>
<el-col :span="10">
<el-input v-if="val.isLocation == '1'" v-model="val.location"
type="textarea" :rows="4" resize="none" style="width: 500px"
placeholder="站点之间用回车符分隔" @change="change" @input="change($event)">
<el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea"
:rows="4" resize="none" style="width: 500px" placeholder="站点之间用回车符分隔"
@change="change" @input="change($event)">
</el-input>
<el-input v-else v-model="val.notLocation" type="textarea" :rows="4"
resize="none" style="width: 500px" placeholder="站点之间用回车符分隔"
@change="change" @input="change($event)">
resize="none" style="width: 500px" placeholder="站点之间用回车符分隔" @change="change"
@input="change($event)">
</el-input>
</el-col>
</el-form-item>
......@@ -98,16 +98,16 @@
<el-col :span="12">
<el-form-item label="URSA包含">
<el-input v-model="val.includeUrsa" type="textarea" :rows="4" resize="none"
style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_"
@change="change" @input="change($event)">
style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_" @change="change"
@input="change($event)">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="URSA不包含">
<el-input v-model="val.notIncludeUrsa" type="textarea" :rows="4"
resize="none" style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_"
@change="change" @input="change($event)">
<el-input v-model="val.notIncludeUrsa" type="textarea" :rows="4" resize="none"
style="width:500px" placeholder="URSA之间用分号分隔，例：F2;F3;P_" @change="change"
@input="change($event)">
</el-input>
</el-form-item>
</el-col>
......@@ -153,8 +153,7 @@
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.typeOfGoods" @change="change">
<el-row>
<el-col v-for="item in checkBoxItem.cargoType" :span="2"
:key="item.id">
<el-col v-for="item in checkBoxItem.cargoType" :span="2" :key="item.id">
<el-checkbox v-if="item.status === 1" :label="item.chineseName"
:name="item.chineseName" :key="item.code">
<Tooltips :content="item.chineseName" :refName="item.code">
......@@ -189,8 +188,7 @@
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.puporpuxCode" @change="change">
<el-row>
<el-col :span="2" v-for="item in checkBoxItem.puporpux"
:key="item.id">
<el-col :span="2" v-for="item in checkBoxItem.puporpux" :key="item.id">
<el-checkbox
v-if="item.status === 1 || val.puporpuxCode.includes(item.chineseName)"
:label="item.chineseName" :name="item.chineseName"
......@@ -230,7 +228,18 @@
<el-form-item label="Handling Code">
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.handlingCode" @change="change">
<el-row>
<div class="checkboxItem" v-for="item in checkBoxItem.handlingCode"
:key="item.id">
<el-checkbox
v-if="item.status === 1 || val.handlingCode.includes(item.chineseName)"
:label="item.chineseName" :name="item.chineseName"
:disabled="val.handlingCode.includes(item.chineseName) && item.status == 0"
:key="item.code">
<Tooltips :content="item.chineseName" :refName="item.code">
</Tooltips>
</el-checkbox>
</div>
<!-- <el-row>
<el-col v-for="item in checkBoxItem.handlingCode" :span="2"
:key="item.id">
<el-checkbox
......@@ -242,7 +251,7 @@
</Tooltips>
</el-checkbox>
</el-col>
</el-row>
</el-row> -->
</el-checkbox-group>
</el-card>
</el-form-item>
......@@ -251,19 +260,23 @@
<el-form-item label="Sub Category">
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.subCategory" @change="change">
<el-row>
<div class="checkboxItem" v-for="item in checkBoxItem.subCategory"
:key="item.id">
<el-checkbox
v-if="item.status === 1 || val.subCategory.includes(item.chineseName)"
:label="item.chineseName" :name="item.chineseName"
:disabled="val.subCategory.includes(item.chineseName) && item.status == 0"
:key="item.code">
<Tooltips :content="item.chineseName" :refName="item.code">
</Tooltips>
</el-checkbox>
</div>
<!-- <el-row>
<el-col v-for="item in checkBoxItem.subCategory" :span="2"
:key="item.id">
<el-checkbox
v-if="item.status === 1 || val.subCategory.includes(item.chineseName)"
:label="item.chineseName" :name="item.chineseName"
:disabled="val.subCategory.includes(item.chineseName) && item.status == 0"
:key="item.code">
<Tooltips :content="item.chineseName" :refName="item.code">
</Tooltips>
</el-checkbox>
</el-col>
</el-row>
</el-row> -->
</el-checkbox-group>
</el-card>
</el-form-item>
......@@ -299,9 +312,9 @@
</el-radio-group>
</el-col>
<el-col :span="10">
<el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea"
:rows="4" resize="none" style="width: 500px" placeholder="站点之间用回车符分隔"
@change="change" @input="change($event)">
<el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea" :rows="4"
resize="none" style="width: 500px" placeholder="站点之间用回车符分隔" @change="change"
@input="change($event)">
</el-input>
<el-input v-else v-model="val.notLocation" type="textarea" :rows="4" resize="none"
style="width: 500px" placeholder="站点之间用回车符分隔" @change="change"
......@@ -442,18 +455,21 @@
<el-form-item label="Handling Code">
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.handlingCode" @change="change">
<el-row>
<div class="checkboxItem" v-for="item in checkBoxItem.handlingCode" :key="item.id">
<el-checkbox
v-if="item.status === 1 || val.handlingCode.includes(item.chineseName)"
:label="item.chineseName" :name="item.chineseName"
:disabled="val.handlingCode.includes(item.chineseName) && item.status == 0"
:key="item.code">
<Tooltips :content="item.chineseName" :refName="item.code">
</Tooltips>
</el-checkbox>
</div>
<!-- <el-row>
<el-col v-for="item in checkBoxItem.handlingCode" :span="2" :key="item.id">
<el-checkbox
v-if="item.status === 1 || val.handlingCode.includes(item.chineseName)"
:label="item.chineseName" :name="item.chineseName"
:disabled="val.handlingCode.includes(item.chineseName) && item.status == 0"
:key="item.code">
<Tooltips :content="item.chineseName" :refName="item.code">
</Tooltips>
</el-checkbox>
</el-col>
</el-row>
</el-row> -->
</el-checkbox-group>
</el-card>
</el-form-item>
......@@ -462,7 +478,17 @@
<el-form-item label="Sub Category">
<el-card shadow="never" style="width: 95%">
<el-checkbox-group v-model="val.subCategory" @change="change">
<el-row>
<div class="checkboxItem" v-for="item in checkBoxItem.subCategory" :key="item.id">
<el-checkbox
v-if="item.status === 1 || val.subCategory.includes(item.chineseName)"
:label="item.chineseName" :name="item.chineseName"
:disabled="val.subCategory.includes(item.chineseName) && item.status == 0"
:key="item.code">
<Tooltips :content="item.chineseName" :refName="item.code">
</Tooltips>
</el-checkbox>
</div>
<!-- <el-row>
<el-col v-for="item in checkBoxItem.subCategory" :span="2" :key="item.id">
<el-checkbox
v-if="item.status === 1 || val.subCategory.includes(item.chineseName)"
......@@ -473,7 +499,7 @@
</Tooltips>
</el-checkbox>
</el-col>
</el-row>
</el-row> -->
</el-checkbox-group>
</el-card>
</el-form-item>
......@@ -1245,7 +1271,7 @@ export default {
text-align: center;
}
}
</style>
.fontWeight {
font-size: 16px;
font-weight: 700;
......@@ -1269,3 +1295,9 @@ export default {
text-align: center;
}
}
.checkboxItem {
display: inline-block;
width: 110px;
}
</style>
\ No newline at end of file
......
<template>
<div>
<el-dialog :title="title" :visible.sync="dialogVisible" width="60%" top="8vh" :before-close="close"
append-to-body :close-on-click-modal="false" @submit.native.prevent @close="close">
<el-dialog :title="title" :visible.sync="dialogVisible" width="60%" top="8vh" :before-close="close" append-to-body
:close-on-click-modal="false" @submit.native.prevent @close="close">
<el-form class="form-header" ref="superAllocationForm" :model="formData" label-width="auto"
label-position="left" style="margin-bottom:10px" @submit.native.prevent size="small" :rules="rules">
<el-row>
<el-col :span="22">
<el-form-item label="发件人账号" prop="shipperAccount">
<el-input type="textarea" v-model="formData.shipperAccount" placeholder="请输入发件人账号，多个以“;”分割"
maxlength="50" rows="4" :disabled="disabled" />
maxlength="3000" rows="4" :disabled="disabled" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -20,8 +20,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="航班日期" prop="flightDate">
<el-date-picker class="formItem" v-model="formData.flightDate" type="date"
placeholder="选择日期" value-format="yyyy-MM-dd" @change="getRoute" :disabled="disabled">
<el-date-picker class="formItem" v-model="formData.flightDate" type="date" placeholder="选择日期"
value-format="yyyy-MM-dd" @change="getRoute" :disabled="disabled">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -30,8 +30,7 @@
<el-col :span="12">
<el-form-item label="航线" prop="flightRoute">
<el-select class="formItem" v-model="formData.flightRoute" placeholder="未设置"
:loading="routeLoading" :disabled="routeList.length == 0 || disabled"
@change="routeChange">
:loading="routeLoading" :disabled="routeList.length == 0 || disabled" @change="routeChange">
<el-option v-for="(item, index) in routeList" :label="item.route" :value="item.route"
:key="item.id">
<Tooltips :content="item.route" :refName="item.route"></Tooltips>
......@@ -50,8 +49,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="URSA包含" prop="includeUrsa">
<el-input class="formItem" v-model="formData.includeUrsa"
placeholder="URSA之间用分号分隔，例：F2;F3;P_" type="textarea" rows="3" maxlength="100">
<el-input class="formItem" v-model="formData.includeUrsa" placeholder="URSA之间用分号分隔，例：F2;F3;P_"
type="textarea" rows="3" maxlength="100">
</el-input>
</el-form-item>
</el-col>
......@@ -305,6 +304,4 @@ export default {
}
</script>
<style lang="scss" scoped>
</style>
\ No newline at end of file
<style lang="scss" scoped></style>
\ No newline at end of file
......
......@@ -6,7 +6,7 @@
<el-col :span="6">
<el-form-item label="发件人账号">
<el-input type="textarea" v-model="selectionData.shipperAccount" placeholder="请输入发件人账号，多个以“;”分割"
maxlength="50" rows="4" />
maxlength="3000" rows="4" />
</el-form-item>
</el-col>
</el-row>
......