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

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

Browse Source
This commit is contained in:
linfso 2024-05-28 00:50:08 +08:00
commit 53af1bfed9
6 changed files with 118 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/emis/emisTmsScanRecord/signAndRecord.vue
View File

@ -14,11 +14,11 @@
<el-input v-model="form.signMan" clearable="" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item :label="$t('客户名称')" prop="customerCode" label-width="70px">
<CustomerSimplePicker v-model="form.customerCode" postCode="RSD" @onChange="onCustomerSelect" ></CustomerSimplePicker>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="24">
<el-form-item label="扫描单号" prop="billCode" label-width="70px">
<span slot="label">

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

@ -78,7 +78,11 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="150" />
<el-table-column :label="$t('签收状态')" align="center" prop="signState" min-width="100" />
<el-table-column :label="$t('签收状态')" align="center" prop="status" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.status"/>
</template>
</el-table-column>/>
<el-table-column :label="$t('签收地址')" align="center" prop="signAddress" min-width="100" />
<el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="100" />
<el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="170" >
@ -137,7 +141,7 @@ import { getDateTimeToString } from '@/utils/payutils'
export default {
name: "SignatureRecordQuery",
components: { EmisUserSimplePicker,elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, CountryPicker },
dicts: ['emis_scan_type'],
dicts: ['emis_scan_type', 'emis_waybill_status'],
data() {
return {

85
src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-row :gutter="20">
<el-form ref="queryForm" size="mini" :model="queryParams" label-width="80px">
<el-form ref="queryForm" size="mini" :model="queryParams" label-width="90px">
<!-- <search-form :model="queryParams" ref="queryForm" size="small" :maxShow="8" label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> -->
<el-col :span="8">
<el-form-item label="" prop="billCode">
@ -22,11 +22,54 @@
</el-col>
<el-col :span="16">
<el-col :span="16">
<el-form-item label="登记时间" prop="dateTimeRange" label-width="80px">
<el-form-item label="登记时间" prop="dateTimeRange" label-width="90px">
<elDateAdvPicker clearable v-model="queryParams.dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('登记网点')" prop="registerSiteCode" label-width="90px">
<EmisSiteSimplePicker v-model="queryParams.registerSiteCode" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('通知网点')" prop="sendSiteCode" label-width="90px">
<EmisSiteSimplePicker v-model="queryParams.sendSiteCode" @onChange="onSendSiteSelect" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('问题件类型')" prop="problemType" label-width="90px">
<ProblemTypePicker v-model="queryParams.problemId" :id="queryParams.problemId" @onChange="onproblemTypeSelect" ></ProblemTypePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('登记人')" prop="registerManCode" label-width="90px">
<EmisUserSimplePicker v-model="queryParams.registerManCode" postCode="RSD" @onChange="onRegStaffSelect" ></EmisUserSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('是否回复')" prop="blReversion" label-width="90px">
<el-select v-model="queryParams.blReversion" :placeholder="$t('全部')" value="0">
<el-option :label="$t('已回复')" value="1"></el-option>
<el-option :label="$t('未回复')" value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('处理状态')" prop="status" label-width="90px">
<el-select
style="width:100%"
filterable
clearable
v-model="queryParams.status"
>
<el-option v-for="item in dict.type.emis_processing_status" :key="item.value" :label="item.label" :value="item.label" />
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item :label="$t('录入网点')" prop="registerSiteCode" label-width="80px">
<EmisSiteSimplePicker v-model="queryParams.registerSiteCode" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
</el-form-item>
@ -48,7 +91,7 @@
<el-form-item :label="$t('收件国家')" prop="receiveCountry" label-width="80px">
<CountryPicker v-model="queryParams.receiveCountry" @onChange="onCountrySelect" ></CountryPicker>
</el-form-item>
</el-col>
</el-col> -->
</el-col>
</el-form>
<!-- </search-form> -->
@ -96,17 +139,15 @@
</el-table-column>
<el-table-column :label="$t('回复状态')" align="center" prop="blReversion" min-width="100" >
<template slot-scope="scope">
<span>{{ scope.row.blReversion ? "是" : "否" }}</span>
</template>
</el-table-column>
<span>{{ scope.row.blReversion == "1" ? "是" : "否" }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('通知网点')" align="center" prop="sendSiteCode" min-width="100" />
<el-table-column :label="$t('登记网点')" align="center" prop="registerSiteCode" min-width="100" />
<el-table-column :label="$t('登记日期')" align="center" prop="registerDate" min-width="100">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.registerDate) }}</span>
</template>
</el-table-column>
<span>{{ parseTime(scope.row.registerDate) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="problemType" min-width="100" />
<el-table-column :label="$t('登记人')" align="center" prop="registerManCode" min-width="100" />
@ -142,13 +183,14 @@ import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePic
import DestinationPicker from '@/views/emis/EmisBaseTools/DestinationPicker.vue';
import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
import { getDateTimeToString } from '@/utils/payutils'
export default {
name: "CentralProblemInquiry",
// components: { elDateSimplePicker,emisElectronicPagApplyView,emisElectronicPagApplyForm },
components: { EmisUserSimplePicker, CountryPicker, elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, DestinationPicker },
dicts: ['emis_scan_type'],
components: { ProblemTypePicker, EmisUserSimplePicker, CountryPicker, elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, DestinationPicker },
dicts: ['emis_scan_type', 'emis_processing_status'],
data() {
return {
@ -325,6 +367,18 @@ export default {
// this.queryParams.scanSite=item && item.siteName;
this.queryParams.registerSiteCode=item && item.siteCode;
},
onSendSiteSelect(item){
this.queryParams.sendSiteCode=item && item.siteCode;
},
onproblemTypeSelect(item){
if(!item){
this.form.problemType = null;
this.form.problemId = null;
return;
}
this.queryParams.problemType = item.typeName;
this.queryParams.problemId=item.id;
},
onPreOrNextSiteSelect(item){
this.queryParams.preOrNextStation=item && item.siteName;
this.queryParams.preOrNextStationCode=item && item.siteCode;
@ -338,9 +392,12 @@ export default {
this.queryParams.dateTimeRange=value;
// scanDate
},
onStaffSelect(item){
// this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
this.form.dispatchManCode=item && item.empCode || null;
// onStaffSelect(item){
// // this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
// this.form.dispatchManCode=item && item.empCode || null;
// },
onRegStaffSelect(item){
this.queryParams.registerManCode = item && item.empCode || null;
},
onModifyScanSiteSelect(item){
this.modifyParams.scanSite=item.siteName;

24
src/views/emis/emisWaybillProblemInfo/problemEntry.vue
View File

@ -9,7 +9,7 @@
</el-col>
<el-col :span="8">
<el-form-item :label="$t('问题类型')" prop="problemType" label-width="80px">
<ProblemTypePicker v-model="form.problemId" :id="form.problemId" @onChange="onproblemTypeSelect" ></ProblemTypePicker>
<ProblemTypePicker v-model="form.problemId" @onChange="onproblemTypeSelect" ></ProblemTypePicker>
</el-form-item>
</el-col>
<el-col :span="8">
@ -23,7 +23,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="问题图片" prop="xxx" label-width="80px">
<ImageOneUpload v-model="form.picUrl" @input="handleInput" ></ImageOneUpload>
<ImageUpload v-model="form.picUrl" @input="handleInput" ></ImageUpload>
</el-form-item>
</el-col>
<el-col :span="8">
@ -349,11 +349,11 @@ export default {
return;
}
if(this.dataMap[this.form.billCode]){
this.$message.error("重复登记");
this.playNoticeTone(1);
return;
}
// if(this.dataMap[this.form.billCode]){
// this.$message.error("重复登记");
// this.playNoticeTone(1);
// return;
// }
this.getWaybill(this.form.billCode)
},
getWaybill(billCode){
@ -489,11 +489,11 @@ export default {
}
let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[];
bcList.forEach(code => {
if(this.dataMap[code]){
this.$message.error("重复登记："+code);
this.playNoticeTone(1);
return;
}
// if(this.dataMap[code]){
// this.$message.error("重复登记："+code);
// this.playNoticeTone(1);
// return;
// }
this.getWaybill(code)
});
this.openBatch=false;

23
src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
View File

@ -172,7 +172,7 @@
<span>处理结果：</span>
</el-col>
<el-col :span="20">
<el-select v-model="reversion.status">
<el-select v-model="reversion.status" :placeholder="$t('请选择')" value="">
<el-option :label="$t('处理中')" value="1"></el-option>
<el-option :label="$t('处理完毕')" value="2"></el-option>
</el-select>
@ -271,7 +271,7 @@ export default {
moreInputVisible: false,
reversion:{
status:"1",
status:"",
content:''
},
showProblemDetail: false,
@ -356,7 +356,7 @@ export default {
// this.getList();
this.$nextTick(function() {
let queryFormEl = this.$refs.queryForm.$el;
let tableH = queryFormEl.offsetHeight+190;
let tableH = queryFormEl.offsetHeight+260;
this.tableHeight = window.innerHeight - tableH;
});
},
@ -408,13 +408,15 @@ export default {
this.currentRow = {};
this.showProblemDetail = false;
this.reversion = {
status:1,
status:"",
content:''
}
});
},
cellClass () {
return 'selectAllbtnDis'
cellClass({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
return "seltAllbtnDis";
}
},
// 取消按钮
cancel() {
@ -569,7 +571,7 @@ export default {
}
this.reversion = {
status:1,
status:'',
content:''
}
// this.ids = selection.map(item => item.id)
@ -601,7 +603,7 @@ export default {
if(response && response.code == 200){
commentList.getList();
this.reversion = {
status:1,
status:'',
content:''
}
}else{
@ -613,7 +615,7 @@ export default {
this.currentRow = {};
this.showProblemDetail = false;
this.reversion = {
status:1,
status:'',
content:''
}
@ -816,6 +818,9 @@ export default {
</script>
<style scoped>
::v-deep .seltAllbtnDis .cell {
visibility: hidden;
}
.el-divider{
margin-top: 0px;
background: 0 0;

23
src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
View File

@ -223,7 +223,7 @@ export default {
moreInputVisible: false,
reversion:{
status:"1",
status:"",
content:''
},
showProblemDetail: false,
@ -308,7 +308,7 @@ export default {
// this.getList();
this.$nextTick(function() {
let queryFormEl = this.$refs.queryForm.$el;
let tableH = queryFormEl.offsetHeight+190;
let tableH = queryFormEl.offsetHeight+260;
this.tableHeight = window.innerHeight - tableH;
});
},
@ -360,13 +360,15 @@ export default {
this.currentRow = {};
this.showProblemDetail = false;
this.reversion = {
status:1,
status:'',
content:''
}
});
},
cellClass () {
return 'selectAllbtnDis'
cellClass({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
return "seltAllbtnDis";
}
},
// 取消按钮
cancel() {
@ -504,14 +506,12 @@ export default {
handleSelectionChange(selection,row) {
if (selection.length > 1) {
// this.$message.error("只能选择一条数据");
debugger
this.$refs.singleSelectTable.getInstance().clearSelection();
this.$refs.singleSelectTable.getInstance().toggleRowSelection(row);
this.currentRow = row;
this.showProblemDetail = true;
this.reversion = this.currentRow;
} else if(selection.length==1) {
debugger
this.currentRow = selection[0];
this.showProblemDetail = true;
this.reversion = this.currentRow;
@ -521,7 +521,7 @@ export default {
}
this.reversion = {
status:1,
status:'',
content:''
}
// this.ids = selection.map(item => item.id)
@ -553,7 +553,7 @@ export default {
if(response && response.code == 200){
commentList.getList();
this.reversion = {
status:1,
status:'',
content:''
}
}else{
@ -565,7 +565,7 @@ export default {
this.currentRow = {};
this.showProblemDetail = false;
this.reversion = {
status:1,
status:'',
content:''
}
@ -768,6 +768,9 @@ export default {
</script>
<style scoped>
::v-deep .seltAllbtnDis .cell {
visibility: hidden;
}
.el-divider{
margin-top: 0px;
background: 0 0;