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

md

Browse Source
This commit is contained in:
linfso 2024-06-05 11:31:04 +08:00
parent b80392560c
commit 681fcbd837
9 changed files with 54 additions and 34 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);
// }

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

@ -96,8 +96,9 @@
countryCode:this.countryCode,
siteCode:null,
siteName:null,
parentSiteCode:this.parentSiteCode,
params:{
needPriv:this.needPriv
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);

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 => {

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">

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">

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;