aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

Browse Source
This commit is contained in:
liuyp 2024-06-05 16:34:29 +08:00
commit 18458871da
25 changed files with 1382 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/DatePickerAdv/elDateSimplePicker.vue
View File

@ -42,7 +42,11 @@
<script>
export default {
props: {
placeholder: "",
value: {
type: [Array],
required: false
},
placeholder: "",
},
data() {
return {
@ -51,14 +55,16 @@
dateTimeRange: [],
optionsFilter: [],
valueStr: undefined,
value: [],
}
},
watch: {
// dateTimeRange(newVal){
// this.$emit('input',this.dateTimeRange)
// this.$emit('change',this.dateTimeRange)
// }
value(newVal){
if(!this.value||this.value==''){
this.valueStr=null;
this.daySelectValue=null;
this.dateTimeRange=[] ;
}
}
},
created() {
this.initDateSelector();

3
src/views/emis/EmisBaseTools/CountryPicker.vue
View File

@ -9,8 +9,6 @@
v-model="svalue"
:placeholder="placeholder"
no-data-text=""
@blur="onBlur"
@change="onChange"
@click.native="onClick"
@ -51,6 +49,7 @@
value(newVal,oldVal) {
// 逻辑 有初始值先查询初值
// if(this.value!=null){
this.svalue=this.value;
this.queryData(null,this.svalue);
// }

142
src/views/emis/EmisBaseTools/EmisPackNoPicker.vue Normal file
View File

@ -0,0 +1,142 @@
<template>
<!-- :loading="loading" -->
<!-- v-el-select-loadmore="loadmore" -->
<!-- <i class="el-icon-arrow-down select-down" :class="visible&&'rotate180'"></i> -->
<el-select
filterable
clearable
autocomplete="false"
ref="selectDom"
v-model="svalue"
remote
:remote-method="queryData"
:placeholder="placeholder"
style="width: 100%;"
:disabled="disabled"
@focus="onFocus"
class="remote-select"
@change="onChange"
@clear="onClear"
@visible-change="reverseArrow"
>
<el-option v-for="item in dataList" :key="item.packNo" :label="item.packNo" :value="item.packNo" ></el-option>
</el-select>
</template>
<script>
import { listEmisTmsPack } from "@/api/emis/emisTmsPack";
export default {
name: "EmisPackNoPicker",
components: {
},
dicts: [],
props: {
value: {
type: String,
required: false
},
placeholder: {
type: String,
required: false
},
countryCode: {
type: String,
required: false
},
// siteType:{
// type: [String,Number],
// required: false
// },
isInitiated:{
type: [Boolean,String],
required: false,
default:false
},
disabled:{
type: [Boolean,String],
required: false
},
},
data() {
return {
loading:false,
visible:false,
dataList: [],
svalue: this.value,
firstFlag:true,
queryParams:{
pageNum:1,
pageSize:20,
packNo:this.value,
}
};
},
watch: {
value(newVal) {
this.svalue = newVal;
this.queryData(this.svalue);
},
},
created() {
this.queryData();
},
beforeDestroy(){
this.firstFlag = true;
},
methods: {
onChange() {
this.$emit("input", this.svalue);
this.$emit("onChange",this.svalue);
},
onClear(){
this.queryParams.packNo=null;
this.queryData();
},
onFocus(){
this.queryData();
},
queryData(val) {
if(val && this.queryParams.pageNum == 1){
this.dataList=[];
}
this.queryParams.packNo=val;
listEmisTmsPack(this.queryParams).then(response => {
this.dataList=response.rows;
});
},
reverseArrow(flag) {
let rulesDom = this.$refs["selectDom"].$el.querySelector(
".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"
); // 找到dom
if (flag) {
rulesDom.classList.add("is-reverse"); // 对dom新增class
} else {
rulesDom.classList.remove("is-reverse"); // 对dom新增class
}
},
}
};
</script>
<style lang="scss" scoped>
// right: 30px;
// cursor: pointer;
:deep .el-select.remote-select{
.el-select__caret::before{
content: '\e6e1';
}
.is-focus{
.el-select__caret{
transform: rotateZ(0deg);
}
}
}
</style>

16
src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
View File

@ -64,6 +64,16 @@
type: [String,Number],
required: false
},
parentSiteCode:{
type: [String],
required: false,
defaultValue:null
},
blIncludeChildSite:{
type: [String],
required: false,
defaultValue:null
},
disabled:{
type: [Boolean,String],
required: false
@ -85,7 +95,11 @@
siteType:this.siteType,
countryCode:this.countryCode,
siteCode:null,
siteName:null
siteName:null,
parentSiteCode:this.parentSiteCode,
params:{
blIncludeChildSite:this.blIncludeChildSite
}
}
};
},

7
src/views/emis/EmisBaseTools/TransProductCasPicker.vue
View File

@ -1,5 +1,6 @@
<template>
<el-cascader
ref="selectRef"
:size="size"
:props="props"
:key="resetCascader"
@ -95,6 +96,11 @@ export default {
this.lineCode=this.svalue[0];
this.prodCode=this.svalue[1];
this.resetCascader++
}else{
this.$refs.selectRef.handleClear()
this.lineCode=null;
this.prodCode=null;
this.resetCascader++
}
},
countryCode(newVal) {
@ -113,6 +119,7 @@ export default {
this.searchVal = val;
},
onClear(){
console.log("=======333=>"+this.svalue)
this.svalue = null;
this.$emit("input", this.svalue);
this.$emit("onChange", this.svalue);

2
src/views/emis/emisCustomerUser/moneyUserForm.vue
View File

@ -1,6 +1,6 @@
<template>
<div >
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="100px">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="100px" disabled>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8">

8
src/views/emis/emisCustomerUser/moneyUserList.vue
View File

@ -71,7 +71,7 @@
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
@ -80,7 +80,7 @@
@click="handleAdd"
v-hasPermi="['emis:emisCustomerUser:add']"
>新增客户</el-button>
</el-col>
</el-col> -->
<!--
<el-col :span="1.5">
<el-button
@ -145,7 +145,7 @@
<!-- <el-table-column :label="$t('月结卡号')" align="center" prop="monthlyPayCode" min-width="100" /> -->
<!-- <el-table-column :label="$t('登录账号')" align="center" prop="userName" min-width="100" /> -->
<!-- <el-table-column :label="$t('登录密码')" align="center" prop="password" min-width="100" /> -->
<el-table-column :label="$t('所属站点')" align="center" prop="ownerSiteName" min-width="100" />
<!-- <el-table-column :label="$t('所属站点')" align="center" prop="ownerSiteName" min-width="100" /> -->
<el-table-column :label="$t('国家')" align="left" prop="countryName" min-width="100" />
<el-table-column :label="$t('省份')" align="left" prop="provinceName" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('城市')" align="left" prop="citeName" min-width="130" :show-overflow-tooltip="true" >
@ -156,7 +156,7 @@
</template>
</el-table-column>
<el-table-column :label="$t('主归属网点')" align="center" prop="ownerSiteName" min-width="100" />
<el-table-column :label="$t('初次登记网点')" align="center" prop="ownerSiteName" min-width="150" />
<el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
<el-table-column label="启用状态" align="center" prop="status" min-width="100" >

3
src/views/emis/emisCustomerUser/monthUserList.vue
View File

@ -19,6 +19,9 @@
@input="handleQuery"
/>
</el-form-item>
<el-form-item label="所属网点" prop="parentSiteCode">
<EmisSiteSimplePicker :placeholder="$t('所属网点')" v-model="queryParams.ownerSite" @onChange="handleQuery"></EmisSiteSimplePicker>
</el-form-item>
<el-form-item label="联系人" prop="contact">
<el-input

39
src/views/emis/emisNotCalcAging/index.vue
View File

@ -1,12 +1,16 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<div class="app-container">
<el-row :gutter="20" type='flex'>
<!-- <el-col :span="4" :xs="4" style="border-right:1px solid rgb(248 249 251);">
<CountryTreePicker placeholder="所属国家" v-model="queryParams.country"></CountryTreePicker>
</el-col> -->
<el-col :span="24" :xs="24">
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="3" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="国家" prop="country" label-width="40px">
<CountryPicker :placeholder="$t('国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
</el-form-item>
<el-form-item label="时效不计算日期" label-width="150px" prop="noCalcDay">
<elDateSimplePicker placeholder="日期范围" v-model="daterangeNoCalcDay"></elDateSimplePicker>
<el-form-item label="时效不计算日期" label-width="150px" prop="daterangeNoCalcDay">
<elDateSimplePicker placeholder="日期范围" v-model="queryParams.daterangeNoCalcDay"></elDateSimplePicker>
</el-form-item>
</SearchForm>
@ -14,10 +18,6 @@
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
stripe
@ -110,11 +110,11 @@
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" min-width="100" />
<el-table-column label="创建人" align="center" prop="createByName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建网点" align="center" prop="createSiteName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建人" align="center" prop="createBy" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建网点" align="center" prop="createSite" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="170"/>
<el-table-column label="修改人" align="center" prop="updateByName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改网点" align="center" prop="updateSiteName" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改人" align="center" prop="updateBy" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改网点" align="center" prop="updateSite" width="80" :show-overflow-tooltip="true"/>
<el-table-column label="修改时间" align="center" prop="updateTime" width="170"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -134,7 +134,11 @@
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" append-to-body>
<emisNotCalcAgingForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisNotCalcAgingForm>
</el-dialog>
</XdPageContainer>
</el-col>
</el-row>
</div>
</template>
<script>
@ -207,6 +211,7 @@ export default {
noCalcDay: null,
status: null,
remark: null,
daterangeNoCalcDay:null,
},
countryName:null,
// 表单参数
@ -252,9 +257,9 @@ export default {
this.queryParams.params = {};
console.log(this.daterangeNoCalcDay);
if (null != this.daterangeNoCalcDay && '' != this.daterangeNoCalcDay) {
this.queryParams.params["beginNoCalcDay"] = this.daterangeNoCalcDay[0];
this.queryParams.params["endNoCalcDay"] = this.daterangeNoCalcDay[1];
if (null != this.queryParams.daterangeNoCalcDay && '' != this.queryParams.daterangeNoCalcDay) {
this.queryParams.params["beginNoCalcDay"] = this.queryParams.daterangeNoCalcDay[0];
this.queryParams.params["endNoCalcDay"] = this.queryParams.daterangeNoCalcDay[1];
}
listEmisNotCalcAging(this.queryParams).then(response => {

10
src/views/emis/emisQuotePrice/specialQuotePriceList.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<XdPageContainer class="app-container">
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> -->
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="small" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="报价名称" prop="quoteName" span="8">
<el-input
@ -72,6 +72,10 @@
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
stripe
@ -234,7 +238,7 @@
<specialQuotePriceForm :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType" @on-changed="handleFormChanged" @on-cancel="cancelForm"></specialQuotePriceForm>
</el-dialog>
</div>
</XdPageContainer>
</template>
<script>

10
src/views/emis/emisQuotePrice/transQuotePriceList.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<XdPageContainer class="app-container">
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> -->
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="small" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="报价名称" prop="quoteName" span="8">
<el-input
@ -72,6 +72,10 @@
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
stripe
@ -235,7 +239,7 @@
<emisQuotePriceForm :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisQuotePriceForm>
</el-dialog>
</div>
</XdPageContainer>
</template>
<script>

10
src/views/emis/emisQuotePrice/vipSpecialQuotePriceList.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<XdPageContainer class="app-container">
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> -->
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="small" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="报价名称" prop="quoteName" span="8">
<el-input
@ -75,6 +75,10 @@
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
stripe
@ -238,7 +242,7 @@
<vipSpecialQuotePriceForm :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType" @on-changed="handleFormChanged" @on-cancel="cancelForm"></vipSpecialQuotePriceForm>
</el-dialog>
</div>
</XdPageContainer>
</template>
<script>

11
src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<XdPageContainer class="app-container">
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> -->
<SearchForm :model="queryParams" ref="queryForm" size="small" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" :model="queryParams" ref="queryForm" size="small" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="报价名称" prop="quoteName" span="8">
<el-input
@ -75,6 +75,11 @@
<XdTable
slot="pageContent"
slot-scope="slotProps"
:height="(slotProps.contentHeight)+'px'"
v-loading="loading"
border
stripe
@ -240,7 +245,7 @@
<vipTransQuotePriceForm :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType" @on-changed="handleFormChanged" @on-cancel="cancelForm"></vipTransQuotePriceForm>
</el-dialog>
</div>
</XdPageContainer>
</template>
<script>

2
src/views/emis/emisSpecialCalcWeight/index.vue
View File

@ -11,7 +11,7 @@
<!-- @onChange="handleQuery" -->
<!-- @change="handleQuery" -->
<el-form-item label="产品类型" prop="prodCode">
<el-form-item label="产品类型" prop="prodCodeSelArr">
<TransProductCasPicker placeholder="产品类型" v-model="queryParams.prodCodeSelArr" :countryCode="queryParams.country" ></TransProductCasPicker>
</el-form-item>
<el-form-item label="取重方式" prop="carryType">

10
src/views/emis/emisTmsScanRecord/coPackageScanning.vue
View File

@ -15,8 +15,10 @@
<span slot="label">
<span style="color: red">{{$t('合包号')}}</span>
</span>
<el-input v-model="form.bagNo" placeholder="请输入" >
</el-input>
<!-- <el-input v-model="form.bagNo" placeholder="请输入" >
</el-input> -->
<EmisPackNoPicker v-model="form.bagNo" ></EmisPackNoPicker>
</el-form-item>
</el-col>
</el-row>
@ -128,13 +130,15 @@
<script>
import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
import EmisPackNoPicker from '@/views/emis/EmisBaseTools/EmisPackNoPicker.vue';
export default {
name: "CoPackageScanning",
props:{
id:undefined
},
components: { EmisGetNextSitePicker },
components: { EmisGetNextSitePicker,EmisPackNoPicker },
dicts: ['emis_scan_type'],
data() {
return {

14
src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue → src/views/emis/emisTmsScanRecord/customsClearScan.vue
View File

@ -12,6 +12,13 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('下一站')" prop="preOrNextStation">
<EmisGetNextSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetNextSitePicker>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="重量" prop="scanWeight" label-width="60px">
<el-input v-model="form.scanWeight" placeholder="扫描重量" >
@ -19,11 +26,6 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('下一站')" prop="preOrNextStation">
<EmisGetNextSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetNextSitePicker>
</el-form-item>
</el-col>
</el-form>
</el-row>
@ -125,7 +127,7 @@ import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
export default {
name: "CustomsClearanceScanning",
name: "CustomsClearScan",
props:{
id:undefined
},

13
src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue → src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
View File

@ -12,6 +12,12 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('下一站')" prop="preOrNextStation">
<EmisGetNextSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetNextSitePicker>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="重量" prop="scanWeight" label-width="60px">
<el-input v-model="form.scanWeight" placeholder="扫描重量" >
@ -19,11 +25,6 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('下一站')" prop="preOrNextStation">
<EmisGetNextSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetNextSitePicker>
</el-form-item>
</el-col>
</el-form>
</el-row>
@ -125,7 +126,7 @@ import { doScan } from "@/api/emis/emisTmsScanRecord";
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
export default {
name: "ClearanceScanUnderDevelopment",
name: "CustomsDeclearScan",
props:{
id:undefined
},

11
src/views/emis/emisTmsScanRecord/deliveryScan.vue
View File

@ -12,6 +12,11 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
<EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="重量" prop="scanWeight" label-width="60px">
<el-input v-model="form.scanWeight" placeholder="扫描重量" >
@ -19,11 +24,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
<EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker>
</el-form-item>
</el-col>
</el-form>
</el-row>

15
src/views/emis/emisTmsScanRecord/outgoingScan.vue
View File

@ -12,13 +12,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="重量" prop="scanWeight" label-width="60px">
<el-input v-model="form.scanWeight" placeholder="扫描重量" >
<span slot="suffix">KG</span>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('下一站')" prop="preOrNextStation">
<span slot="label">
@ -27,6 +21,13 @@
<EmisGetNextSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetNextSitePicker>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="重量" prop="scanWeight" label-width="60px">
<el-input v-model="form.scanWeight" placeholder="扫描重量" >
<span slot="suffix">KG</span>
</el-input>
</el-form-item>
</el-col>
</el-form>
</el-row>

10
src/views/emis/emisTmsScanRecord/scanRecord.vue
View File

@ -12,6 +12,11 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('取件员')" prop="dispatchOrSendManCode">
<EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="重量" prop="scanWeight" label-width="60px">
<el-input v-model="form.scanWeight" placeholder="扫描重量" >
@ -19,11 +24,6 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('取件员')" prop="dispatchOrSendManCode">
<EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker>
</el-form-item>
</el-col>
</el-form>
</el-row>

8
src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue
View File

@ -11,7 +11,7 @@
</el-col>
<el-col :span="8">
<el-form-item :label="$t('扫描站点')" prop="scanSiteCode" label-width="70px">
<EmisSiteSimplePicker v-model="queryParams.scanSiteCode" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
<EmisSiteSimplePicker v-model="queryParams.scanSiteCode" :parentSiteCode="$store.getters.ownerSiteCode" :blIncludeChildSite="1" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
@ -145,17 +145,17 @@
</el-table-column>
<el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="100">
<template slot-scope="scope">
<span>{{ (scope.row.destinationName) }}</span>
<span>{{ (scope.row.waybillDetail.destinationName) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('寄件网点')" align="center" prop="registerSiteName" min-width="100">
<template slot-scope="scope">
<span>{{ (scope.row.registerSiteName) }}</span>
<span>{{ (scope.row.waybillDetail.sendSiteName) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="100">
<template slot-scope="scope">
<span>{{ (scope.row.dispatchUnderlingSiteName) }}</span>
<span>{{ (scope.row.waybillDetail.dispatchUnderlingSiteName) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100">

15
src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
View File

@ -12,13 +12,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="重量" prop="scanWeight" label-width="100px">
<el-input v-model="form.scanWeight" placeholder="扫描重量" >
<span slot="suffix">KG</span>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('取件员')" prop="dispatchOrSendManCode">
<EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker>
@ -29,6 +23,13 @@
<EmisGetNextSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetNextSitePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="重量" prop="scanWeight" label-width="100px">
<el-input v-model="form.scanWeight" placeholder="扫描重量" >
<span slot="suffix">KG</span>
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="清单编号" prop="listNo" label-width="100px">
<el-input v-model="form.listNo" placeholder="请输入" >

1087
src/views/emis/emisTmsSiteBatch/waitGenBatchWaybillList.vue Normal file
View File

File diff suppressed because it is too large Load Diff

7
src/views/emis/emisUser/index.vue
View File

@ -8,7 +8,7 @@
<!--用户数据-->
<el-col :span="24" :xs="24" >
<SearchForm :model="queryParams" ref="queryForm" size="mini" :maxShow="20" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-form-item label="所属国家" prop="countryCode">
<el-form-item label="所属国家" prop="params.countryCode">
<CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.params.countryCode" @onChange="handleQuery"></CountryPicker>
</el-form-item>
<el-form-item label="员工名称" prop="empName">
@ -17,7 +17,7 @@
<el-form-item label="员工编号" prop="empCode">
<el-input v-model="queryParams.empCode" placeholder="员工编号" clearable @keyup.enter.native="handleQuery" @input="handleQuery"/>
</el-form-item>
<el-form-item label="网点类型" prop="siteType">
<el-form-item label="网点类型" prop="params.siteType">
<el-select v-model="queryParams.params.siteType" placeholder="网点类型" clearable filterable>
<el-option
v-for="dict in dict.type.emis_site_type"
@ -385,7 +385,8 @@ export default {
deptId: undefined,
postIds: undefined,
params:{
siteType:'4',
countryCode:null,
siteType:null,
parentSiteCode:null,
blIncludeChildSite:'1',
}

1
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -1233,6 +1233,7 @@ methods: {
},
initData() {
this.reset();
this.form.productTypeSelArr=null;
if(this.billCode && this.billCode!=undefined) {
this.loading = true;