This commit is contained in:
linfso 2024-06-24 22:36:04 +08:00
parent 47a6013aba
commit 7b887ae32c
11 changed files with 53 additions and 72 deletions

View File

@ -105,8 +105,8 @@ export default {
thisPageCount:1,
scale: 20,
preScale: 20,
scale: 50,
preScale: 50,
pdfUtils:new PdfUtils(),
@ -133,7 +133,7 @@ export default {
},
thisPageCount(value) {
if(this.isA4){
this.doScale(75);
this.doScale(50);
}else{
this.doScale(20);
}

View File

@ -72,6 +72,10 @@
pageNum:1,
pageSize:20,
packNo:this.value,
packStatus:0,
params:{
blValid:1,
}
}
};
},

View File

@ -80,14 +80,6 @@
v-hasPermi="['emis:emisTmsPack:query']"
@click="getQuery"
>查询</el-button>
<el-button style="margin-right: 5px;"
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['emis:emisTmsPack:add']"
>去组包</el-button>
<!-- <el-button style="margin-right: 5px;"
type="primary"
plain
@ -95,17 +87,17 @@
size="mini"
@click="handleAdd"
v-hasPermi="['emis:emisTmsPack:add']"
>新增合包</el-button> -->
<el-button style="margin-right: 5px;"
>去组包</el-button> -->
<!-- <el-button style="margin-right: 5px;"
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['emis:emisTmsPack:remove']"
>修改</el-button>
<el-button style="margin-right: 5px;"
>查看</el-button> -->
<!-- <el-button style="margin-right: 5px;"
type="danger"
plain
icon="el-icon-delete"
@ -113,7 +105,7 @@
:disabled="multiple"
@click="handleDeleteCoPack"
v-hasPermi="['emis:emisTmsPack:remove']"
>删除</el-button>
>删除</el-button> -->
</div>
<el-tabs v-model="activeName" style="margin-top: 10px;" @tab-click="getQuery">
@ -126,7 +118,10 @@
:showSearch.sync="showSearch"
:queryParams="queryWaitParams"
:total="waitTotal"
:showRightButton="false"
:showOperateButton="false"
@queryTable="handleQueryWait"
@selection-change="handleWaitSelectionChange"
@sort-change="handleSortChange"
@ -285,7 +280,10 @@
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
:showRightButton="false"
:showOperateButton="false"
@queryTable="handleQuery"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
@ -406,7 +404,7 @@
</div>
<el-dialog :title="titleForm" :visible.sync="openForm" width="80%" style="height: 80%" :destroy-on-close="true" @close="handleCancelCo" v-dialogDrag append-to-body>
<el-form ref="formCo" size="mini" :model="coData" label-width="100px" class="overflowhidden" >
<el-form ref="formCo" size="mini" :model="coData" label-width="100px" class="overflowhidden" disabled >
<el-row :gutter="20">
<el-col :span="16">
<el-col :span="12">
@ -1627,7 +1625,7 @@ export default {
this.computeTotal();
this.currentId=null;
this.openForm= true;
this.titleForm = "修改合包";
this.titleForm = "查看";
},
handleView(row) {
this.id=row.id;

View File

@ -3,20 +3,20 @@
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0">
<el-col :span="8">
<el-form-item label="扫描单号" prop="billCode" label-width="70px">
<el-form-item label="扫描包号" prop="billCode" label-width="70px">
<span slot="label">
<span style="color: red">{{$t('扫描单号')}}</span>
<span style="color: red">{{$t('扫描包号')}}</span>
</span>
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<i slot="suffix" class="iconfont">&#xe656;</i>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item :label="$t('上一站')" prop="preOrNextStation" label-width="100px">
<EmisGetPreSitePicker v-model="form.preOrNextStation" @onChange="onSiteSelect" ></EmisGetPreSitePicker>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
</el-form>

View File

@ -847,8 +847,8 @@ export default {
timezoneOffset: null,
delFlag: null,
remark: null,
blSign:null,
params:{
blSign:null,
expireNotSign:null,
problemQueryType:null,
}

View File

@ -73,7 +73,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="报关方式" prop="customsEclaration">
<el-select v-model="form.customsEclaration" placeholder="请选择">
<el-select v-model="form.customsEclaration" placeholder="请选择" @change="calcBillFee">
<el-option
v-for="dict in dict.type.emis_declare_mode"
:key="dict.value"

View File

@ -73,7 +73,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="报关方式" prop="customsEclaration">
<el-select v-model="form.customsEclaration" placeholder="请选择">
<el-select v-model="form.customsEclaration" placeholder="请选择" @change="calcBillFee">
<el-option
v-for="dict in dict.type.emis_declare_mode"
:key="dict.value"

View File

@ -3,9 +3,9 @@
<el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="24">
<el-form-item label="处理状态" prop="status">
<el-form-item label="处理状态" prop="dealResult">
<!-- <el-input v-model="form.status" placeholder="" /> -->
<el-select v-model="form.status" :placeholder="$t('全部')">
<el-select v-model="form.dealResult" :placeholder="$t('全部')">
<el-option :label="$t('未处理')" value="0"></el-option>
<el-option :label="$t('处理中')" value="1"></el-option>
<el-option :label="$t('处理完毕')" value="2"></el-option>
@ -26,7 +26,7 @@
</div>
<el-scrollbar class="kr-designer-tool_con">
<!-- <Panel class="control-panel" /> -->
<CommentPanel ref="comment" :billCode="billCode" ></CommentPanel>
<CommentPanel ref="comment" :probId="probId" ></CommentPanel>
</el-scrollbar>
</div>
@ -58,7 +58,7 @@ export default {
form: {
// status: "2"
},
billCode: '',
probId: this.promInfo.id,
// 表单校验
rules: {
id: [
@ -79,8 +79,8 @@ export default {
watch: {
"promInfo": {
handler (newValue, oldValue) {
this.promInfo = newValue;
this.billCode = this.promInfo.billCode;
this.promInfo=newValue;
this.probId = this.promInfo.id;
this.initData();
},
deep: true
@ -94,8 +94,6 @@ export default {
initData() {
this.reset();
// if(this.id !=null) {
// this.loading = true;
// getEmisWaybillProblemFaq(this.id).then(response => {
@ -126,7 +124,7 @@ export default {
billCode: null,
title: null,
content: null,
// status: null,
dealResult: null,
showFlag: null,
replayId: null,
delFlag: null,
@ -157,6 +155,7 @@ export default {
title: this.promInfo.problemTitle,
content: this.form.content,//具体内容
status: this.form.status,//状态
dealResult: this.form.dealResult,//状态
replayId: this.$store.getters.empCode,//针对的回复的ID
createBy: this.$store.getters.empName,
createTime: parseTime(new Date()),
@ -173,32 +172,7 @@ export default {
}
});
},
// /** 转换菜单数据结构 */
// normalizer(node) {
// if (node.children && !node.children.length) {
// delete node.children;
// }
// return {
// id: node.id,
// label: node.idName,
// children: node.children
// };
// },
// /** 查询菜单下拉树结构 */
// getTreeselect() {
// const queryParams = {}
// listEmisWaybillProblemFaq(queryParams).then(response => {
// this.emisWaybillProblemFaqOptions = [];
// const rootItem = { idId: 0, emisWaybillProblemFaqName: '-', children: [] };
// rootItem.children = this.handleTree(response.data, "id");
// this.emisWaybillProblemFaqOptions.push(rootItem);
// if(this.parentId != undefined) {
// this.form.parentId = this.parentId;
// }
// });
// },
}
};
</script>

View File

@ -24,8 +24,8 @@ import { listEmisWaybillProblemFaq } from "@/api/emis/emisWaybillProblemFaq";
export default {
name:'CommentPanel',
props:{
billCode:{
type:String
probId:{
type:[String,Number]
},
},
data(){
@ -47,19 +47,14 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 20,
billCode: this.billCode
probId: this.probId
},
}
},
watch: {
"billCode": {
"probId": {
handler (newValue, oldValue) {
this.billCode = newValue;
this.queryParams = {
pageNum: 1,
pageSize: 20,
billCode: newValue
}
this.queryParams.probId =newValue;
this.getList();
},
deep: true
@ -70,6 +65,9 @@ export default {
},
methods: {
getList() {
if(!this.probId){
return;
}
listEmisWaybillProblemFaq(this.queryParams).then(response => {
this.emisWaybillProblemFaqList = response.rows;
});

View File

@ -62,7 +62,7 @@
<xd-table v-loading="loading"
:row-class-name="tableRowClassName"
border
border
ref="singleSelectTable"
size="small"
:data="emisElectronicPagApplyList"
@ -173,7 +173,7 @@
<span>{{ parseTime(scope.row.reversionDate) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('回复网点')" align="center" prop="reversionManCode" min-width="100" />
<el-table-column :label="$t('回复网点')" align="center" prop="reversionSiteName" min-width="100" />
<el-table-column :label="$t('处理状态')" align="center" prop="dealResult" min-width="100">
<template slot-scope="scope">
<span v-if="scope.row.dealResult=='2'" style="background-color: #f0e68c;">处理完毕</span>

View File

@ -395,6 +395,13 @@ export default {
}
let record =Object.assign({}, response.data);
if(record.blDispFd=='1'){
this.$message.error("已转件,不允许录入");
this.form.billCode=null;
return;
}
this.form.transferWeight=record.billWeight;
this.form.transferVolume=record.totalVolume;