This commit is contained in:
linfso 2024-05-13 05:26:33 +08:00
parent 3171bac1fe
commit 102168f320
3 changed files with 35 additions and 27 deletions

View File

@ -15,20 +15,23 @@
</el-input>
</span>
<div >
<!-- class="el-table--scrollable-y" max-height="300px" -->
<el-table v-loading="loading"
<!-- class="el-table--scrollable-y" border max-height="300px" -->
<el-table
v-loading="loading"
style="width: 100%;"
:data="dataList" @row-click="onRowClick"
stripe size="mini"
:data="dataList"
@row-click="onRowClick"
stripe
size="mini"
element-loading-text="Loading" ref="comboGridTable" fit highlight-current-row>
<el-table-column label="序号" align="center" min-width="50">
<!-- <el-table-column label="序号" align="center" min-width="50">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)"> </span>
</template>
</el-table-column>
<el-table-column label="员工编号" align="center" prop="empCode" min-width="100" />
<el-table-column label="员工名称" align="center" prop="empName" min-width="100" :show-overflow-tooltip="true" />
<el-table-column label="所属网点" align="center" prop="ownerSiteName" min-width="100" :show-overflow-tooltip="true" />
</el-table-column> -->
<el-table-column label="员工编号" align="left" prop="empCode" width="100" />
<el-table-column label="员工名称" align="center" prop="empName" width="100" :show-overflow-tooltip="true" />
<el-table-column label="所属网点" align="center" prop="ownerSiteName" width="100" :show-overflow-tooltip="true" />
</el-table>
<el-pagination v-show="pagination" small

View File

@ -183,7 +183,7 @@
</XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" v-dialogDrag >
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" v-dialogDrag append-to-body>
<emisDestinationForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisDestinationForm>
</el-dialog>
<!-- append-to-body

View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" size="small" :model="form" :rules="rules" label-width="90px">
<el-row :gutter="0" >
<el-col :span="24">
<div class="form-group-title">{{ $t('发货信息') }}</div>
@ -14,20 +14,20 @@
</div>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="目的国" prop="reciever.country">
<CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
</el-form-item>
</el-col>
<el-col :span="6">
<!-- <el-col :span="6">
<el-form-item label="线路" prop="transLine">
<TransLinePicker v-model="form.transLine" :countryCode="form.reciever.country" @onChange="onTransLineChange"></TransLinePicker>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="6">
<el-form-item label="产品类型" prop="productType">
<trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker>
<TransProductCasPicker v-model="form.productType" :countryCode="form.reciever.country" ></TransProductCasPicker>
<!-- <trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker> -->
</el-form-item>
</el-col>
<el-col :span="6">
@ -82,16 +82,7 @@
<EmisUserSimplePicker1 :placeholder="$t('操作员')" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="回款联系人" prop="payee" label-width="100px">
<el-input v-model="form.payee" placeholder="回款联系人" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="销售联系人" prop="salesmen" label-width="100px">
<el-input v-model="form.salesmen" placeholder="销售联系人" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="派件方式" prop="dispatchMethod">
<el-radio-group v-model="form.dispatchMethod">
@ -442,7 +433,7 @@
<el-col :span="24">
<el-divider content-position="left"><span style="font-size: 12px;color: gray;">付款方式</span></el-divider>
<el-row>
<el-col :span="10">
<el-col :span="24">
<el-form-item label="付款方式" prop="paymentType">
<el-select v-model="form.paymentType" placeholder="请选择">
<el-option
@ -454,11 +445,21 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="14" v-show="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
<el-col :span="24" v-show="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
<el-form-item label="月结账号" prop="thirdCustomerCode" label-width="80px">
<EmisMonthpayAccountPicker v-model="form.custNo"></EmisMonthpayAccountPicker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="回款联系人" prop="payee" label-width="100px">
<el-input v-model="form.payee" placeholder="回款联系人" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="销售联系人" prop="salesmen" label-width="100px">
<el-input v-model="form.salesmen" placeholder="销售联系人" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="计费方式" prop="calcFeeType" >
@ -548,6 +549,9 @@ import AddressSelectPicker1 from '@/views/emis/EmisBaseTools/AddressSelectPicker
import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.vue';
import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
export default {
name: "WaybillEntry",
// props:{
@ -556,6 +560,7 @@ export default {
// }
// },
components: {
TransProductCasPicker,
WarehouseInNoPicker,
EmisMonthpayAccountPicker,
AddressSelectPicker0,