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-13 20:31:06 +08:00
commit 795ad66b77
4 changed files with 1356 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -82,6 +82,7 @@
"save-svg-as-png": "^1.4.17",
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
"uuid": "^9.0.1",
"vue": "2.7.0",
"vue-amap": "^0.5.10",
"vue-barcode": "^1.3.0",

571
src/views/emis/emisTmsScanRecord/signAndRecord.vue Normal file
View File

@ -0,0 +1,571 @@
<template>
<div class="app-container">
<el-row :gutter="0">
<el-form ref="form" size="mini" :model="form" :rules="rules" label-width="80px">
<el-col :span="8">
<el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
<EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onSendStaffSelect" ></EmisUserSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="签收人" prop="xxxxx" label-width="60px">
<EmisUserSimplePicker v-model="form.xxx" postCode="RSD" @onChange="onSignStaffSelect" ></EmisUserSimplePicker>
<!-- <el-input v-model="form.xxxxx" placeholder="请输入" /> -->
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="图片签收" prop="xxx">
<ImageOneUpload v-model="form.picUrl" @input="handleInput" ></ImageOneUpload>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="扫描单号" prop="billCode" label-width="70px">
<span slot="label">
<span style="color: red">扫描单号</span>
</span>
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<i slot="suffix" class="iconfont">&#xe656;</i>
</el-input>
<span style="color: gray">提示：回车保存本地</span>
</el-form-item>
</el-col>
</el-form>
</el-row>
<el-row>
<el-col class="line" :span="24">
<sapn >运单信息</sapn>
</el-col>
</el-row>
<el-row :gutter="0">
<el-form ref="form" size="mini" :model="res" :rules="rules" label-width="80px">
<el-col :span="6">
<el-form-item label="寄件日期" prop="xxx" label-width="80px">
<el-input v-model="xxx" placeholder="请输入" disabled >
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="寄件网点" prop="xxx" label-width="80px">
<el-input v-model="xxx" placeholder="请输入" disabled >
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="录单重量" prop="weight" label-width="80px">
<el-input v-model="weight" placeholder="请输入" disabled >
<span slot="suffix">KG</span>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="回单编号" prop="xxx" label-width="80px">
<el-input v-model="xxx" placeholder="请输入" disabled >
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="派件日期" prop="xxx" label-width="80px">
<el-input v-model="xxx" placeholder="请输入" disabled >
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="派件网点" prop="xxx" label-width="80px">
<el-input v-model="xxx" placeholder="请输入" disabled >
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="代收货款" prop="xxx" label-width="80px">
<el-input v-model="xxx" placeholder="请输入" disabled >
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="到付款" prop="xxx" label-width="80px">
<el-input v-model="xxx" placeholder="请输入" disabled >
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="客户名称" prop="xxx" label-width="80px">
<el-input v-model="customerName" placeholder="" disabled >
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-form>
</el-row>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
:disabled="multiple"
@click="handleScanUpload"
v-hasPermi="['emis:emisTmsScanRecord:add']"
>上传</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="clearSelectionBatch"
v-hasPermi="['emis:emisTmsScanRecord:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="handleBatchScan"
v-hasPermi="['emis:emisTmsScanRecord:add']"
>批量扫描</el-button>
</el-col>
</el-row>
</div>
<el-table ref="multipleTable" border stripe v-loading="loading" :data="emisTmsScanRecordList" @selection-change="handleSelectionChange">
<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="dispatchOrSendMan" min-width="100" />
<el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="100" />
<el-table-column :label="$t('签收网点')" align="center" prop="signSite" min-width="100" />
<el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="170" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.scanDate) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('寄件日期')" align="center" prop="xxx" min-width="170" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.xxx) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('寄件网点')" align="center" prop="signSite" min-width="100" />
<el-table-column :label="$t('到付转月结用户编号')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('到付转月结用户名称')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('派件日期')" align="center" prop="xxx" min-width="170" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.xxx) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('派件网点')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('录件重量')" align="center" prop="weight" min-width="100" />
<el-table-column :label="$t('到付款')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('代收付款')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('签收图片')" align="center" prop="scanWeight" min-width="100">
<el-table-column :label="$t('保存目录')" align="center" prop="xxxx" min-width="100" />
<el-table-column :label="$t('上传网点')" align="center" prop="xxxx" min-width="100" />
<el-table-column :label="$t('上传人')" align="center" prop="xxxx" min-width="100" />
<el-table-column :label="$t('文件大小(KB)')" align="center" prop="xxxx" min-width="120" />
</el-table-column>
</el-table>
<!-- <div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div> -->
<el-dialog :title="titleBatch" :visible.sync="openBatch" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
<el-form ref="formBatch" :model="formBatch" :rules="rulesBatch" size="mini" label-width="60px">
<el-row>
<el-col :span="24">
<el-form-item :label="$t('运单号')" prop="billCode">
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">
<el-button type="primary" @click="submitFormBatch">确 定</el-button>
<el-button @click="cancelBatch">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listEmisWaybill, getWaybillDetail,getEmisWaybill } from "@/api/emis/emisWaybill";
import { doScan } from "@/api/emis/emisTmsScanRecord";
import CustomerPicker from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
import CustomerAddressSimplePicker from '@/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue';
import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
// import FileUpload from '@/components/FileUpload/index.vue';
export default {
name: "SignAndRecord",
props:{
id:undefined
},
components: { EmisUserSimplePicker, CustomerPicker, CustomerAddressSimplePicker },
dicts: ['emis_scan_type'],
data() {
return {
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
checkedDetail:[],
// 遮罩层
loading: false,
// 表单参数
form: {},
titleBatch: "",
formBatch: {},
openBatch:false,
dataMap:new Map(),
emisTmsScanRecordList: [],
// 是否显示弹出层
open: false,
// 表单校验
rules: {
// billCode: [
// { required: true, message: "billCode不能为空", trigger: "blur" }
// ],
// id: [
// { required: true, message: "id不能为空", trigger: "blur" }
// ],
},
rulesBatch: {
// id: [
// { required: true, message: "id不能为空", trigger: "blur" }
// ],
},
//查询信息展示
res:{
xxx:"xxx"
}
};
},
watch: {
"id": {
handler (newValue, oldValue) {
this.id = newValue;
this.initData();
},
deep: true
}
},
created() {
this.reset();
this.form.scanSiteCode=this.$store.getters.ownerSiteCode;
this.form.scanSite=this.$store.getters.ownerSiteName;
this.form.scanMan=this.$store.getters.empName;
this.form.scanManCode=this.$store.getters.empCode;
this.form.recordMan=this.$store.getters.empName;
this.form.recordManCode=this.$store.getters.empCode;
this.form.dispatchOrSendMan=this.$store.getters.empName;
this.form.dispatchOrSendManCode=this.$store.getters.empCode;
// this.form.scanWeight = "1.0";
console.log(this.form)
},
methods: {
getRowSelect(row, column, event) {
// dosomething
},
handleInput(item){
debugger;
},
handleCustomerSelect(item){
// debugger
this.form.customerCode=item.customerCode;
this.form.customerName=item.name;
},
// onStaffSelect(item){
// this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
// this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
// },
onSendStaffSelect(item){
this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
},
onSignStaffSelect(item){
this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
},
getRowsSelect(arr) {
this.form.ids= arr.map(item=>item.id)
},
handleBatchScan(){
this.formBatch = {
billCode: null,
}
this.titleBatch="批量扫描";
this.openBatch=true;
},
clearSelectionBatch(){
let newList =[];
console.log(this.ids)
this.emisTmsScanRecordList.forEach(item=>{
if(this.ids.indexOf(item.billCode) == -1){
newList.push(item);
}else{
this.dataMap[item.billCode]=null;
}
});
this.emisTmsScanRecordList = newList;
},
cancelBatch(){
this.openBatch=false;
},
submitFormBatch(){
if(this.formBatch.billCode==null || this.formBatch.billCode==''){
this.$message.error("输入单号后回车");
return;
}
let bcList=this.formBatch.billCode.split(/[；\;\,\，\n]/)||[];
let scanWeight = this.form.scanWeight
let dispatchOrSendManCode = this.form.dispatchOrSendManCode;
let scList=bcList.map(function(code) {
return {
billCode:code,
scanWeight:scanWeight,
// scanWeight:null,
dispatchOrSendManCode: dispatchOrSendManCode
}
}
)
let scanInfo = {
scanType:"50",
opType:1,
scanData:scList
};
doScan(scanInfo).then(response => {
if(!response.data.scanResult || response.data.scanResult.length == 0){
this.$message.error("未查到单号");
return;
}
for (let index = 0; index < response.data.scanResult.length; index++) {
let scanRstItem = response.data.scanResult[index];
console.log(scanRstItem);
if(scanRstItem.result != 'success'){
this.$modal.msgError(scanRstItem.message);
return;
}
this.form.scanType = '50';
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
console.log(record)
let indexBillCode=record.billCode;
this.dataMap[indexBillCode]=record;
this.emisTmsScanRecordList.push(record);
}
});
this.openBatch=false;
},
// 表单重置
reset() {
this.form = {
id: null,
billCode: null,
scanType: null,
preOrNextStation: null,
preOrNextStationCode: null,
preOrNextStationPhone: null,
preOrNextManCode: null,
preOrNextManPhone: null,
scanDate: null,
scanManCode: null,
scanManPhone: null,
scanMan: null,
preOrNextMan: null,
scanSite: null,
scanSiteCode: null,
scanSitePhone: null,
scanWeight: null,
weight: null,
dispatchOrSendMan: null,
dispatchOrSendManCode: null,
dispatchOrSendManPhone: null,
signDate: null,
signMan: null,
signSite: null,
signSiteCode: null,
recordMan: null,
recordManCode: null,
recordManPhone: null,
recordSiteCode: null,
truckMan: null,
truckCode: null,
dataFrom: null,
picUrl: null,
status: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null,
updateSite: null,
createSite: null,
customerCode:null,
customerName:null
};
this.resetForm("form");
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.billCode)
this.single = selection.length!==1
this.multiple = !selection.length
// this.checkedDetail = selection;
// if (selection.length > 1) {
// this.$refs.multipleTable.clearSelection();
// this.$refs.multipleTable.toggleRowSelection(selection.pop());
// } else {
// //将选中行存入缓存中
// this.checkedDetail = selection;
// }
},
// 扫描上传
handleScanUpload(){
var selData = this.$refs.multipleTable.selection;
console.log(selData);
let scanData=[];
selData.forEach(item=>{
scanData.push(
{
billCode:item.billCode,
scanWeight:item.scanWeight,
dispatchOrSendManCode:item.dispatchOrSendManCode,
scanDate:item.scanDate
}
);
});
// 检查
let scanInfo = {scanType:"50",opType:2,scanData:scanData}
console.log(scanInfo)
doScan(scanInfo).then(response => {
console.log(response);
let scanRstItem = response.data.scanResult[0];
console.log(scanRstItem);
if(scanRstItem.result != 'success'){
this.$modal.msgError(scanRstItem.message);
return;
}
this.$modal.msgSuccess(scanRstItem.message);
// this.form.scanType = '10';
// this.form.scanDate = new Date();
// let record =Object.assign({}, this.form);
// console.log(record)
// let indexBillCode=record.billCode;
// this.dataMap[indexBillCode]=record;
// this.emisTmsScanRecordList.push(record);
// this.form.billCode =null;
});
},
handleScanInput(){
if(this.form.billCode==null || this.form.billCode==''){
this.$message.error("输入单号后回车");
return;
}
if(this.dataMap[this.form.billCode]){
this.$message.error("重复扫描");
this.playNoticeTone(1);
return;
}
// 检查
let scanInfo = {
scanType:"50",
opType:1,
scanData:[
{
billCode:this.form.billCode,
scanWeight:this.form.scanWeight,
dispatchOrSendManCode:this.form.dispatchOrSendManCode
}
]
};
doScan(scanInfo).then(response => {
console.log(response);
let scanRstItem = response.data.scanResult[0];
console.log(scanRstItem);
if(scanRstItem.result != 'success'){
this.$modal.msgError(scanRstItem.message);
return;
}
this.form.scanType = '50';
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
console.log(record)
let indexBillCode=record.billCode;
this.dataMap[indexBillCode]=record;
this.emisTmsScanRecordList.push(record);
});
this.form.billCode =null;
},
}
};
</script>
<style rel="stylesheet/scss" lang="scss">
.line{
line-height: 28px;
font-size: 16px;
color: black;
font-weight: 700;
margin-left: 10px;
margin-bottom: 20px;
border-bottom-color: gray;
border-bottom-style: solid;
border-bottom-width: 0.5px;
}
</style>

782
src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue Normal file
View File

@ -0,0 +1,782 @@
<template>
<div class="app-container">
<el-row :gutter="20">
<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 prop="applySeq">
<el-col :span="8">
<el-select v-model="queryParams.queryType" >
<el-option :label="$t('运单号')" value="1"></el-option>
<el-option :label="$t('订单号')" value="2"></el-option>
</el-select>
</el-col>
<el-col :span="16">
<el-input
v-model="queryParams.billCode"
:placeholder="$t('多个流水号逗号或换行隔开')"
clearable
type="textarea"
rows="9"
@keyup.enter.native="handleQuery"
/>
</el-col>
</el-form-item>
</el-col>
<el-col :span="16">
<el-col :span="24">
<el-form-item label="签收时间" prop="dateTimeRange">
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('录入网点')" prop="scanSiteCode" label-width="70px">
<EmisSiteSimplePicker v-model="queryParams.scanSiteCode" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('签收图片')" prop="isSignPic">
<el-select v-model="queryParams.isSignPic" :placeholder="$t('全部')" value="0">
<el-option :label="$t('未上传')" value="1"></el-option>
<el-option :label="$t('已上传')" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
<EmisUserSimplePicker v-model="queryParams.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('收件国家')" prop="countryCode" label-width="70px">
<CountryPicker v-model="queryParams.countryCode" @onChange="onCountrySelect" ></CountryPicker>
</el-form-item>
</el-col>
</el-col>
</search-form>
</el-row >
<xd-table v-loading="loading"
border stripe
size="small"
:data="emisElectronicPagApplyList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
v-if="tableHeight" :max-height="tableHeight + 'px'"
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
size="mini"
@click="getList"
>导出</el-button>
</el-col>
</el-row>
</div>
<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="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" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.scanDate) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="100" />
<el-table-column :label="$t('寄件日期')" align="center" prop="xxx" min-width="170" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.xxx) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('预计到达时间')" align="center" prop="xxx" min-width="170" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.xxx) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('线路')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('产品类型')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('时效')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('录入人')" align="center" prop="recordMan" min-width="100" />
<el-table-column :label="$t('录入网点')" align="center" prop="recordSiteCode" min-width="100" />
<el-table-column :label="$t('录入时间')" align="center" prop="xxx" min-width="170" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.xxx) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('录入网点所属省份')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('签收网点')" align="center" prop="signSite" min-width="100" />
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
<el-table-column :label="$t('到付款')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('代收付款')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('机器码/PDA编号')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('数据推送标识')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('数据产生来源')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('签收信息备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('收件国家')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('收件省份')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('签收图片')" align="center" prop="picUrl" min-width="100"/>
</xd-table>
<!-- 添加或修改网点电子面单申请对话框 -->
<el-dialog :title="title" :visible.sync="open" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
<el-row :gutter="0">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-col :span="8">
<el-form-item :label="$t('扫描网点')" prop="scanSiteCode" label-width="70px">
<EmisSiteSimplePicker key="2" v-model="modifyParams.scanSiteCode" @onChange="onModifyScanSiteSelect" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('上/下一网点')" prop="preOrNextStationCode" label-width="90px">
<EmisSiteSimplePicker key="3" v-model="modifyParams.preOrNextStationCode" @onChange="onModifyPreOrNextSiteSelect" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('扫描员工')" prop="scanManCode">
<EmisUserSimplePicker key="4" v-model="modifyParams.scanManCode" postCode="RSD" @onChange="onModifyStaffSelect" ></EmisUserSimplePicker>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listEmisElectronicPagApply, getEmisElectronicPagApply, delEmisElectronicPagApply, addEmisElectronicPagApply, updateEmisElectronicPagApply } from "@/api/emis/emisElectronicPagApply";
import { listEmisTmsScanRecord, delEmisTmsScanRecord, updateEmisTmsScanRecord } from "@/api/emis/emisTmsScanRecord";
import { doScan } from "@/api/emis/emisTmsScanRecord";
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
// import emisElectronicPagApplyView from '@/views/emis/emisElectronicPagApply/emisElectronicPagApplyView';
// import emisElectronicPagApplyForm from '@/views/emis/emisElectronicPagApply/emisElectronicPagApplyForm';
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
// import DestinationPicker from '@/views/emis/EmisBaseTools/DestinationPicker.vue';
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
// import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
import { getDateTimeToString } from '@/utils/payutils'
export default {
name: "SignatureRecordQuery",
components: { EmisUserSimplePicker,elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, CountryPicker },
dicts: ['emis_scan_type'],
data() {
return {
// 调整表格的高度，不允许滚动
tableHeight: 200,
// 遮罩层
loading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 创建时间搜索
dateTimeRange:[],
// 总条数
total: 0,
// 网点电子面单申请表格数据
emisElectronicPagApplyList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
openForm: false,
titleForm: "",
titleEmisElectronicPagApply: "",
openEmisElectronicPagApply: false,
// 显示编辑框更多
moreInputVisible: false,
dataMap:new Map(),
// 弹出展示层
currentId:null,
id:null,
titleView:"",
openView: false,
// 备注时间范围
daterangeApplyDate: [],
// 备注时间范围
daterangeCreateTime: [],
// 备注时间范围
daterangeUpdateTime: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
orderSN:null,
billCode: null,
scanType: null,
scanDate: null,
scanManCode: null,
scanManPhone: null,
scanMan: null,
scanSite: null,
scanSiteCode: null,
scanSitePhone: null,
scanWeight: null,
weight: null,
dispatchOrSendMan: null,
dispatchOrSendManCode: null,
dispatchOrSendManPhone: null,
signDate: null,
signMan: null,
signSite: null,
signSiteCode: null,
recordMan: null,
recordManCode: null,
recordManPhone: null,
recordSiteCode: null,
truckMan: null,
truckCode: null,
dataFrom: null,
picUrl: null,
status: null,
delFlag: null,
remark: null,
params:{},//扩展参数
// scanSite:null,
queryType:"1",// 选择运单类型，默认为 运单号：1,订单号：2
// scanType:"",
isSubBill:"",
},
// 修改参数
modifyParams:{
scanSite:null,
scanSiteCode:null,
scanSitePhone:null,
preOrNextStation:null,
preOrNextStationCode:null,
preOrNextStationPhone:null,
scanMan:null,
scanManCode:null,
scanManPhone:null,
},
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
],
}
};
},
created() {
// this.getList();
this.$nextTick(function() {
let queryFormEl = this.$refs.queryForm.$el;
let tableH = queryFormEl.offsetHeight+190;
this.tableHeight = window.innerHeight - tableH;
});
},
methods: {
/** 查询扫描记录列表 */
getList() {
this.loading = true;
// this.queryParams.params = {};
console.log("---->this.queryParams,", this.queryParams);
// debugger;
if (null != this.dateTimeRange && '' != this.dateTimeRange) {
// this.queryParams.params["beginScanDate"] = this.dateTimeRange[0];
// this.queryParams.params["endScanDate"] = this.dateTimeRange[1];
this.queryParams.params.beginScanDate = this.dateTimeRange[0];
this.queryParams.params.endScanDate = this.dateTimeRange[1];
}else{
this.queryParams.params.beginScanDate = null;
this.queryParams.params.endScanDate = null;
}
this.queryParams.params.queryType = this.queryParams.queryType;//1：yd;2：dd;
this.queryParams.params.isSubBill = this.queryParams.isSubBill;//1：子单；0：主单
let queryType = this.queryParams.queryType;
if(queryType == "1"){
this.queryParams.orderSN=null;
}else if(queryType == "2"){
this.queryParams.orderSN=this.queryParams.billCode;
this.queryParams.billCode=null;
}
// if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
// this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
// this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
// }
// if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
// this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
// this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
// }
// console.log(this.addDateRange(this.queryParams, this.dateTimeRange))
// listEmisTmsScanRecord(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
listEmisTmsScanRecord(this.queryParams).then(response => {
// this.emisElectronicPagApplyList = response.rows;
// this.loading = false;
this.emisElectronicPagApplyList = [];
// this.total = 0;
this.loading = false;
let rows = response.rows;
this.total = response.total;
if(!rows || rows.length == 0){
this.$message.error("未查到单号");
return;
}
for (let index = 0; index < rows.length; index++) {
let scanRstItem = rows[index];
console.log(scanRstItem);
let record =Object.assign({}, scanRstItem)
// record.carNo=scanRstItem.carNo;
// record.scanData=scanRstItem.scanData;
// record.scanType=scanRstItem.scanType;
// if(queryType == "1"){
// this.queryParams.orderSN=null;
// }
record.queryType = this.queryParams.queryType;
record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
// record.createTime=scanRstItem.createTime;
// record.scanWeight=scanRstItem.scanWeight;
// console.log(record)
// let indexBillCode=record.billCode;
// this.dataMap[indexBillCode]=record;
// this.emisTmsScanRecordList.push(record);
this.emisElectronicPagApplyList.push(record);
}
});
},
onStaffSelect(item){
this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
},
onCountrySelect(item){
this.form.countryName=item.name;
this.form.countryCode=item.code;
},
// 取消按钮
cancel() {
this.open = false;
this.resetModifyParams();
},
onScanSiteSelect(item){
this.queryParams.scanSite=item && item.siteName;
this.queryParams.scanSiteCode=item && item.siteCode;
},
onPreOrNextSiteSelect(item){
this.queryParams.preOrNextStation=item && item.siteName;
this.queryParams.preOrNextStationCode=item && item.siteCode;
},
onDestinationSelect(item){
this.queryParams.destCode=item && item.destCode;
this.queryParams.destName=item && item.destName;
},
onDateSelect(value){
console.log("date picker---->", value)
this.dateTimeRange=value;
// scanDate
},
onModifyScanSiteSelect(item){
this.modifyParams.scanSite=item.siteName;
this.modifyParams.scanSiteCode = item.siteCode
this.modifyParams.scanSitePhone = item.scanSitePhone;
},
onModifyPreOrNextSiteSelect(item){
this.modifyParams.preOrNextStation=item.siteName;
this.modifyParams.preOrNextStationCode=item.siteCode;
this.modifyParams.preOrNextStationPhone=item.preOrNextStationPhone;
},
onModifyStaffSelect(item){
this.modifyParams.scanMan=item.empName;
this.modifyParams.scanManCode=item.empCode;
// this.modifyParams.scanManPhone=item.scanManPhone;
},
//删除
clearSelectionBatch(){
let newList =[];
console.log(this.ids)
this.emisElectronicPagApplyList.forEach(item=>{
if(this.ids.indexOf(item.id) == -1){
newList.push(item);
}
});
this.emisElectronicPagApplyList = newList;
},
// 表单重置
reset() {
this.form = {
id: null,
applySeq: null,
applyDate: getDateTimeToString(new Date()),
provideType: null,
applyName: null,
applyMan: null,
applyManCode: null,
applySite: null,
applySiteCode: null,
unitMoney: null,
applyCount: null,
sumMoney: null,
blSend: null,
sendDate: null,
sendMan: null,
sendManCode: null,
sendSite: null,
sendSiteCode: null,
blCancel: null,
cancelMan: null,
cancelManCode: null,
cancelDate: null,
cancelSite: null,
cancelSiteCode: null,
userSite: null,
userSiteCode: null,
startNo: null,
endNo: null,
curStartNo: null,
hasBillCount: null,
blAllowAllocate: null,
createSiteCode: null,
modifySiteCode: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
// handleQuery() {
// this.queryParams.pageNum = 1;
// this.getList();
// },
handleTypeSelect(selection){
this.sctype = selection.value;
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
resetModifyParams(){
this.modifyParams = {
scanSite:null,
scanSiteCode:null,
scanSitePhone:null,
preOrNextStation:null,
preOrNextStationCode:null,
preOrNextStationPhone:null,
scanMan:null,
scanManCode:null,
scanManPhone:null,
}
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
this.queryParams.orderByColumn = column.prop;
this.queryParams.isAsc = column.order;
this.getList();
},
/** 新增按钮操作 */
handleAdd(row) {
this.reset();
this.open = true;
this.title = "新增";
// 子组件打开模式
// if(row != undefined){
// this.currentParentId = row.id
// }
// this.openEmisElectronicPagApply = true;
// this.titleEmisElectronicPagApply = "新增";
},
handleShowMoreInput(){
this.moreInputVisible = !this.moreInputVisible;
},
/** 修改按钮操作 */
handleUpdate() {
// this.reset();
// const id = this.ids
if(!this.ids || this.ids.length == 0){
this.$message.error("未选中数据，请先选择");
return;
}
this.open = true;
this.title = "修改";
// getEmisElectronicPagApply(id).then(response => {
// this.form = response.data;
// this.open = true;
// this.title = "修改";
// });
// 子组件打开模式
// this.currentId= row.id || this.ids;
// this.openEmisElectronicPagApply = true;
// this.titleEmisElectronicPagApply = "修改";
},
handleView(row) {
this.id=row.id;
this.titleView="查看";
this.openView=true;
// this.router.push({ path: '/emis/emisElectronicPagApply/viewDetail', query: { id: row.id }})
},
/** 提交按钮 */
submitForm() {
for(var i=0; i<this.ids.length;i++){
updateEmisTmsScanRecord({
id:this.ids[i],
...this.modifyParams
}).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.resetModifyParams();
this.getList();
});
}
// this.$refs["form"].validate(valid => {
// if (valid) {
// if (this.form.id != null) {
// updateEmisElectronicPagApply(this.form).then(response => {
// this.$modal.msgSuccess("修改成功");
// this.open = false;
// this.getList();
// });
// } else {
// addEmisElectronicPagApply(this.form).then(response => {
// this.$modal.msgSuccess("新增成功");
// this.open = false;
// this.getList();
// });
// }
// }
// });
// todo
},
handleFormChanged(){
this.openForm = false;
this.getList();
},
cancelForm(){
this.openForm = false;
},
/** 删除按钮操作 */
handleDelete() {
const ids = this.ids
this.$modal.confirm('是否确认删除').then(function() {
return delEmisTmsScanRecord(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// this.download('emis/emisElectronicPagApply/export', {
// ...this.queryParams
// }, `emisElectronicPagApply_${new Date().getTime()}.xlsx`)
const loadingInstance = this.$loading({
text: '正在导出...'
})
var qParam = {...this.queryParams};
qParam.pageNum=1;
qParam.pageSize=5000;
if (null != this.dateTimeRange && '' != this.dateTimeRange) {
this.queryParams.params["beginScanDate"] = this.dateTimeRange[0];
this.queryParams.params["endScanDate"] = this.dateTimeRange[1];
}
this.queryParams.params["queryType"] = this.queryParams.queryType;//1：yd;2：dd;
this.queryParams.params["isSubBill"] = this.queryParams.isSubBill;//1：子单；0：主单
listEmisTmsScanRecord(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
this.downloadLoading = false
if (response.code === 200) {
const curList = []
for (let index = 0; index < response.rows.length; index++) {
let scanRstItem = response.rows[index];
let record =Object.assign({}, scanRstItem)
record.orderType = this.queryParams.orderType;
record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
curList.push(record);
}
import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['id','单号','单号类型','车牌号','扫描时间','扫描类型','扫描网点','上/下一网点','扫描员','录入时间','扫描重量'];
const filterVal = ['id','billCode','orderType','carNo','scanDate','scanType','scanSite','preOrNextStation','scanMan','createTime','scanWeight'];
const data = this.formatJson(filterVal, curList, curList)
excel.export_json_to_excel({
header: tHeader,
data,
filename: '网点电子面单申请',
autoWidth: true
})
loadingInstance.close()
})
}
});
// listEmisTmsScanRecord(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
// this.emisElectronicPagApplyList = [];
// this.loading = false;
// let rows = response.rows;
// this.total = response.total;
// if(!rows || rows.length == 0){
// this.$message.error("未查到单号");
// return;
// }
// for (let index = 0; index < rows.length; index++) {
// let scanRstItem = rows[index];
// console.log(scanRstItem);
// let record =Object.assign({}, scanRstItem)
// record.orderType = this.queryParams.orderType;
// record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
// record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
// this.emisElectronicPagApplyList.push(record);
// }
// });
},
formatJson(filterVal, jsonData, resData) {
let index = 0
return jsonData.map(v => filterVal.map(j => {
if (j === 'index') {
return ++index
}
if (j === 'status') {
var statusStr='xxx'
if(v[j] == 10){
statusStr='xxx'
}
return statusStr;
}
return v[j]
}))
},
/** 列索引函数 */
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
/** 时间搜索响应函数 */
// dateTimeChange(value){
// this.dateTimeRange=value;
// },
handleQuery(){
// this.queryParams.pageNum = 1;
if(this.queryParams.billCode==null || this.queryParams.billCode==''){
this.$message.error("请输入单号");
return;
}
if(this.dataMap[this.queryParams.billCode]){
this.$message.error("重复扫描");
this.playNoticeTone(1);
return;
}
let queryType = this.queryParams.queryType;
if(queryType == "1"){
this.queryParams.orderSN=null;
}else if(queryType == "2"){
this.queryParams.orderSN=this.queryParams.billCode;
this.queryParams.billCode=null;
}
let beginSignDate=null;
let endSignDate=null;
if (null != this.dateTimeRange && '' != this.dateTimeRange) {
beginSignDate = this.dateTimeRange[0];
endSignDate = this.dateTimeRange[1];
}
// 检查
let scanInfo = {
scanType:"50",
opType:1,
scanData:[
{
billCode:this.queryParams.billCode,
orderSN:this.queryParams.orderSN,
beginSignDate:beginSignDate,
endSignDate:endSignDate,
scanSiteCode:this.queryParams.scanSiteCode,
isSignPic:this.queryParams.isSignPic,
dispatchOrSendManCode:this.queryParams.dispatchOrSendManCode,
countryCode:this.queryParams.countryCode
// scanWeight:this.form.scanWeight,
// dispatchOrSendManCode:this.form.dispatchOrSendManCode
}
]
};
doScan(scanInfo).then(response => {
console.log(response);
let scanRstItem = response.data.scanResult[0];
console.log(scanRstItem);
if(scanRstItem.result != 'success'){
this.$modal.msgError(scanRstItem.message);
return;
}
this.form.scanType = '50';
this.form.scanDate = new Date();
let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode;
console.log(record)
let indexBillCode=record.billCode;
this.dataMap[indexBillCode]=record;
this.emisElectronicPagApplyList.push(record);
});
this.form.billCode =null;
},
}
};
</script>
<style scoped>
.el-divider{
margin-top: 0px;
background: 0 0;
border-top: 1px solid #E6EBF5;
}
.el-divider__text {
color: #0955ee;
cursor: pointer;
}
</style>

4
src/views/login.vue
View File

@ -334,8 +334,8 @@ import { getLocalIp } from "@/utils/custom";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'
import FingerprintJS from '@fingerprintjs/fingerprintjs' // 引入
const uuidv4 = require("uuid/v4"); // 导入uuid生成插件
// const uuidv4 = require("uuid/v4"); // 导入uuid生成插件
const { v4: uuidv4 } = require('uuid');
export default {
name: "Login",