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-03 20:13:13 +08:00
parent 03bc3efdf7
commit b68ec574a1
21 changed files with 265 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
View File

@ -109,6 +109,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/arrivalScan.vue
View File

@ -108,6 +108,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue
View File

@ -109,6 +109,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

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

@ -114,6 +114,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue
View File

@ -109,6 +109,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

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

@ -101,6 +101,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/loadingScan.vue
View File

@ -106,6 +106,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

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

@ -109,6 +109,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/positionScanning.vue
View File

@ -112,6 +112,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

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

@ -108,6 +108,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

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

@ -186,6 +186,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

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

@ -159,6 +159,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/unloadingScan.vue
View File

@ -102,6 +102,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/unpackScan.vue
View File

@ -100,6 +100,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">

276
src/views/emis/emisTmsSiteBatch/emisTmsSiteBatchForm.vue
View File

@ -1,152 +1,135 @@
<template> <template>
<div > <div >
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8"> <el-col :span="12">
<el-form-item label="批次号" prop="batchNo"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-input v-model="form.batchNo" placeholder="请输入批次号" /> <el-col :span="12">
</el-form-item> <el-form-item label="批次号" prop="batchNo">
</el-col> <el-input v-model="form.batchNo" placeholder="请输入批次号" disabled/>
<el-col :span="8"> </el-form-item>
<el-form-item label="批次名称" prop="batchName"> </el-col>
<el-input v-model="form.batchName" placeholder="请输入批次名称" /> <el-col :span="12">
</el-form-item> <el-form-item label="批次名称" prop="batchName">
</el-col> <el-input v-model="form.batchName" placeholder="请输入批次名称" />
<el-col :span="8"> </el-form-item>
<el-form-item label="批次时间" prop="batchDate"> </el-col>
<el-date-picker clearable <el-col :span="12">
v-model="form.batchDate" <el-form-item label="运输方式" prop="transType">
type="date" <el-select v-model="form.transType" placeholder="运输方式" clearable filterable>
value-format="yyyy-MM-dd" <el-option
placeholder="请选择批次时间"> v-for="item in dict.type.emis_biz_shipping_method"
</el-date-picker> v-bind:key="item.value"
</el-form-item> v-bind:label="item.label"
</el-col> v-bind:value="item.value"
<el-col :span="8"> />
<el-form-item label="批次类型" prop="batchType"> </el-select>
<el-input v-model="form.batchType" placeholder="请输入批次类型" /> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="12">
<el-col :span="8"> <el-form-item label="起始网点" prop="startSiteCode">
<el-form-item label="运输方式:" prop="transType"> <EmisSiteSimplePicker1 v-model="form.startSiteCode" :placeholder="$t('起始网点')" isInitiated="true" @onChange="onDestSiteChange"></EmisSiteSimplePicker1>
<el-input v-model="form.transType" placeholder="请输入运输方式:" /> </el-form-item>
</el-form-item> </el-col>
</el-col> <el-col :span="8">
<el-col :span="8"> <el-form-item :label="$t('下一网点')" prop="nextSiteCode">
<el-form-item label="起始网点" prop="startSiteCode"> <span slot="label">
<el-input v-model="form.startSiteCode" placeholder="请输入起始网点" /> <span style="color: red">{{ $t('下一网点') }}</span>
</el-form-item> </span>
</el-col> <EmisGetNextSitePicker :placeholder="$t('请选择')" v-model="form.destSite" ></EmisGetNextSitePicker>
<el-col :span="8"> </el-form-item>
<el-form-item label="航空单号" prop="airBilllNo"> </el-col>
<el-input v-model="form.airBilllNo" placeholder="请输入航空单号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="预计出发时间" prop="etd">
<el-date-picker clearable
v-model="form.etd"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择预计出发时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="预计到达时间" prop="eta">
<el-date-picker clearable
v-model="form.eta"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择预计到达时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="包数" prop="packNum">
<el-input v-model="form.packNum" placeholder="请输入包数" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="车牌号" prop="carNo">
<el-input v-model="form.carNo" placeholder="请输入车牌号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="船次号" prop="shipNo">
<el-input v-model="form.shipNo" placeholder="请输入船次号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="清关资料状态" prop="clearanceResStatus">
<el-input v-model="form.clearanceResStatus" placeholder="请输入清关资料状态" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报关资料状态" prop="declareResStatus">
<el-input v-model="form.declareResStatus" placeholder="请输入报关资料状态" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="目的国家" prop="destCountry">
<el-input v-model="form.destCountry" placeholder="请输入目的国家" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="目的国家名称" prop="destCountryName">
<el-input v-model="form.destCountryName" placeholder="请输入目的国家名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总件数" prop="totalParcelQty">
<el-input v-model="form.totalParcelQty" placeholder="请输入总件数" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总运单数" prop="totalWaybillQty">
<el-input v-model="form.totalWaybillQty" placeholder="请输入总运单数" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总体积" prop="totalVolume">
<el-input v-model="form.totalVolume" placeholder="请输入总体积" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总重量" prop="totalWeight">
<el-input v-model="form.totalWeight" placeholder="请输入总重量" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作员" prop="opMan">
<el-input v-model="form.opMan" placeholder="请输入操作员" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="删除标志（0代表存在" prop="delFlag">
<el-input v-model="form.delFlag" placeholder="请输入删除标志（0代表存在" />
</el-form-item>
</el-col>
<!-- <el-col :span="8" v-if="form.transType==1">
<el-form-item label="上级字典"> <el-form-item label="航空单号" prop="airBilllNo">
<treeselect <el-input v-model="form.airBilllNo" placeholder="请输入航空单号" />
ref="tree" </el-form-item>
v-model="form.parentId" </el-col>
:options="emisTmsSiteBatchOptions" <el-col :span="8" v-if="form.transType==2">
:normalizer="normalizer" <el-form-item label="车牌号" prop="carNo">
:default-expand-level="1" <el-input v-model="form.carNo" placeholder="请输入车牌号" />
:show-count="true" </el-form-item>
placeholder="选择上级" </el-col>
/> <el-col :span="8" v-if="form.transType==3">
</el-form-item> <el-form-item label="船次号" prop="shipNo">
--> <el-input v-model="form.shipNo" placeholder="请输入船次号" />
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="预计发出时间" prop="etd">
<el-date-picker clearable
v-model="form.etd"
type="date"
value-format="yyyy-MM-dd"
placeholder="预计发出时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="预计到达时间" prop="eta">
<el-date-picker clearable
v-model="form.eta"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择预计到达时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="目的国家" prop="destCountry">
<el-input v-model="form.destCountry" placeholder="请输入目的国家" />
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="目的国家名称" prop="destCountryName">
<el-input v-model="form.destCountryName" placeholder="请输入目的国家名称" />
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="包数" prop="packNum">
<el-input v-model="form.packNum" placeholder="请输入包数" />
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="总件数" prop="totalParcelQty">
<el-input v-model="form.totalParcelQty" placeholder="请输入总件数" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总运单数" prop="totalWaybillQty">
<el-input v-model="form.totalWaybillQty" placeholder="请输入总运单数" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总体积" prop="totalVolume">
<el-input v-model="form.totalVolume" placeholder="请输入总体积" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="总重量" prop="totalWeight">
<el-input v-model="form.totalWeight" placeholder="请输入总重量" />
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item label="操作员" prop="opMan">
<el-input v-model="form.opMan" placeholder="请输入操作员" />
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="12">
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div style="text-align: center;margin-bottom: 10px;"> <div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
@ -158,6 +141,7 @@
<script> <script>
import { getTmsGroupBatchNo,listEmisTmsSiteBatch, getEmisTmsSiteBatch, delEmisTmsSiteBatch, addEmisTmsSiteBatch, updateEmisTmsSiteBatch } from "@/api/emis/emisTmsSiteBatch"; import { getTmsGroupBatchNo,listEmisTmsSiteBatch, getEmisTmsSiteBatch, delEmisTmsSiteBatch, addEmisTmsSiteBatch, updateEmisTmsSiteBatch } from "@/api/emis/emisTmsSiteBatch";
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
export default { export default {
name: "emisTmsSiteBatchForm", name: "emisTmsSiteBatchForm",
@ -166,8 +150,8 @@ export default {
type:Number type:Number
} }
}, },
components: { }, components: { EmisGetNextSitePicker },
dicts: [ dicts: ['emis_biz_shipping_method'
], ],
data() { data() {
return { return {

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

@ -329,7 +329,7 @@
</el-table-column> </el-table-column>
</XdTable> </XdTable>
<el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body> <el-dialog :title="titleForm" :visible.sync="openForm" width="80%" :destroy-on-close="true" v-dialogDrag append-to-body>
<emisTmsSiteBatchForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsSiteBatchForm> <emisTmsSiteBatchForm :id="currentId" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTmsSiteBatchForm>
</el-dialog> </el-dialog>

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

@ -167,11 +167,7 @@
<el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100" /> <el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100" />
<el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="100" /> <el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="100" />
<el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="100" /> <el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" width="200"> <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<template slot-scope="scope">
<span class="ellipsis">{{scope.row.remark}}</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" />
</xd-table> </xd-table>
</div> </div>
@ -729,10 +725,4 @@ export default {
margin-right: 0; margin-right: 0;
} }
} }
.ellipsis {
width:200px;
overflow: hidden; /* 确保超出容器的内容被裁剪 */
white-space: nowrap; /* 确保文本在一行内显示 */
text-overflow: ellipsis; /* 超出部分显示省略号 */
}
</style> </style>

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

@ -7,7 +7,7 @@
<span slot="label"> <span slot="label">
<span style="color: red">扫描单号</span> <span style="color: red">扫描单号</span>
</span> </span>
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" > <el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<i slot="suffix" class="iconfont">&#xe656;</i> <i slot="suffix" class="iconfont">&#xe656;</i>
</el-input> </el-input>
</el-form-item> </el-form-item>
@ -16,10 +16,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('通知网点')" prop="notifySite" label-width="80px"> <el-form-item :label="$t('通知网点')" prop="notifySite" label-width="80px">
<!-- <EmisSiteSimplePicker v-model="form.notifySite" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker> --> <EmisSiteSimplePicker v-model="form.notifySite" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
<el-select v-model="form.notifySiteCode" @change="onScanSiteSelect">
<el-option v-for="item in notifySiteDataSource" :key="item.siteCode" :value="item" :label="item.siteName" ></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -41,6 +38,16 @@
<ImageUpload v-model="form.picUrl" @input="handleInput" :isShowTip="false" ></ImageUpload> <ImageUpload v-model="form.picUrl" @input="handleInput" :isShowTip="false" ></ImageUpload>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-button
type="primary"
plain
icon=""
size="mini"
@click="handleScanInput"
>登记</el-button>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -59,15 +66,6 @@
> >
<div slot="toolbar"> <div slot="toolbar">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon=""
size="mini"
@click="handleRegister"
>登记</el-button>
</el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
@ -127,13 +125,13 @@
</div> </div>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" /> <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
<el-table-column :label="$t('状态')" align="center" prop="currentStatus" min-width="100" />
<el-table-column :label="$t('通知网点')" align="center" prop="notifySiteName" min-width="100" /> <el-table-column :label="$t('通知网点')" align="center" prop="notifySiteName" min-width="100" />
<el-table-column :label="$t('登记网点')" align="center" prop="scanSite" min-width="100" /> <el-table-column :label="$t('登记网点')" align="center" prop="scanSite" min-width="100" />
<el-table-column :label="$t('登记日期')" align="center" prop="scanDate" min-width="100"> <el-table-column :label="$t('登记日期')" align="center" prop="scanDate" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.scanDate) }}</span> <span>{{ parseTime(scope.row.scanDate) }}</span>
</template> </template>
</el-table-column>
</el-table-column> </el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="problemType" min-width="100" /> <el-table-column :label="$t('问题件类型')" align="center" prop="problemType" min-width="100" />
<el-table-column :label="$t('登记人')" align="center" prop="scanMan" min-width="100" /> <el-table-column :label="$t('登记人')" align="center" prop="scanMan" min-width="100" />
@ -175,6 +173,9 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" /> <el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align:center"> <div slot="footer" class="dialog-footer" style="text-align:center">
@ -217,8 +218,6 @@ export default {
// 问题件表格数据 // 问题件表格数据
emisWaybillList: [], emisWaybillList: [],
notifySiteDataSource:[],
title: "", title: "",
open: false, open: false,
titleBatch:"", titleBatch:"",
@ -228,9 +227,10 @@ export default {
problemType:null, problemType:null,
openForm: false, openForm: false,
titleForm: "", titleForm: "",
tempRecord:{},
titleEmisWaybillProblemInfo: "", titleEmisWaybillProblemInfo: "",
openEmisWaybillProblemInfo: false, openEmisWaybillProblemInfo: false,
// 显示编辑框更多 // 显示编辑框更多
moreInputVisible: false, moreInputVisible: false,
@ -286,14 +286,13 @@ export default {
this.multiple = !selection.length this.multiple = !selection.length
}, },
onScanSiteSelect(item){ onScanSiteSelect(item){
// debugger
if(!item){ if(!item){
this.form.notifySiteCode = null; this.form.modifyNotifySite = null;
this.form.notifySiteName = null; this.form.modifyNotifySiteName = null;
return; return;
} }
this.form.notifySiteCode=item.siteCode; this.form.notifySite=item && item.siteCode;
this.form.notifySiteName=item.siteName; this.form.notifySiteName=item && item.siteName;
}, },
onproblemTypeSelect(item){ onproblemTypeSelect(item){
// debugger; // debugger;
@ -346,68 +345,22 @@ export default {
this.$message.error("输入单号后回车"); this.$message.error("输入单号后回车");
return; return;
} }
// this.getWaybill(this.form.billCode) // if(this.form.notifySite==null || this.form.notifySite==''){
this.loading = true; // this.$message.error("请选择通知网点");
listEmisWaybill({billCode:this.form.billCode}).then(response => { // return;
this.loading = false; // }
let scanDate = new Date();
if(response.code != 200){
this.$message.error(response.msg);
return;
}
let rows = response.rows;
if(!rows || rows.length == 0){
this.$message.error("未查到单号");
this.form.billCode=null;
return;
}
if(rows.length>0) {
let rsItem = rows[0];
console.log(rsItem);
this.tempRecord =Object.assign({}, rsItem)
// tempRecord.notifySite = tempRecord.sendSiteCode;
// tempRecord.notifySiteName = tempRecord.sendSiteName;
this.tempRecord.scanSiteCode=this.form.scanSiteCode;
this.tempRecord.scanSite=this.form.scanSite;
this.tempRecord.scanDate=scanDate;
this.tempRecord.scanMan=this.form.scanMan;
this.tempRecord.scanManCode=this.form.scanManCode;
this.tempRecord.dataFrom="PC";
this.notifySiteDataSource=[
{
siteCode:this.tempRecord.sendSiteCode,
siteName:this.tempRecord.sendSiteName,
},
{
siteCode:this.tempRecord.dispatchUnderlingSiteCode,
siteName:this.tempRecord.dispatchUnderlingSiteName,
}
]
// this.billInputDisabled = true;
// this.emisWaybillList.push(tempRecord);
// this.dataMap[this.form.billCode]=tempRecord;
}
// this.form.billCode=null;
})
},
handleRegister(){
this.tempRecord.notifySiteCode = this.form.notifySiteCode; // if(this.form.problemType==null || this.form.problemType==''){
this.tempRecord.notifySiteName = this.form.notifySiteName; // this.$message.error("请选择问题类型");
this.tempRecord.problemType = this.form.problemType; // return;
this.tempRecord.problemId = this.form.problemId; // }
this.tempRecord.remark = this.form.remark;
this.tempRecord.picUrl=this.form.picUrl;
this.emisWaybillList.push(this.tempRecord);
this.dataMap[this.form.billCode]=this.tempRecord;
//清理数据 // if(this.dataMap[this.form.billCode]){
this.form.notifySiteCode=""; // this.$message.error("重复登记");
this.form.notifySiteName=""; // this.playNoticeTone(1);
this.tempRecord=null; // return;
this.form.billCode=null; // }
this.notifySiteDataSource=[]; this.getWaybill(this.form.billCode)
console.log(this.emisWaybillList)
}, },
getWaybill(billCode){ getWaybill(billCode){
this.loading = true; this.loading = true;
@ -427,13 +380,12 @@ export default {
let rsItem = rows[index]; let rsItem = rows[index];
console.log(rsItem); console.log(rsItem);
let record =Object.assign({}, rsItem) let record =Object.assign({}, rsItem)
record.notifySiteCode = recs; record.notifySite = this.form.notifySite;
record.notifySiteName = record.sendSiteName; record.notifySiteName = this.form.notifySiteName;
record.scanSiteCode=this.form.scanSiteCode; record.scanSiteCode=this.form.scanSiteCode;
record.scanSite=this.form.scanSite; record.scanSite=this.form.scanSite;
record.scanDate=scanDate; record.scanDate=scanDate;
record.problemType=this.form.problemType; record.problemType=this.form.problemType;
record.problemId=this.form.problemId;
record.scanMan=this.form.scanMan; record.scanMan=this.form.scanMan;
record.scanManCode=this.form.scanManCode; record.scanManCode=this.form.scanManCode;
record.picUrl=this.form.picUrl; record.picUrl=this.form.picUrl;
@ -447,49 +399,48 @@ export default {
}, },
handleUpload(){ handleUpload(){
let scanData=[]; let scanData=[];
// let problemInfoList=[]; let problemInfoList=[];
this.emisWaybillList.forEach(item=>{ this.emisWaybillList.forEach(item=>{
// item.currentStatus="已上传";
if(this.ids.indexOf(item.id) > -1){ if(this.ids.indexOf(item.id) > -1){
scanData.push( scanData.push(
{ {
billCode:item.billCode, billCode:item.billCode,
problemType:item.problemId, problemType:item.problemType,
notifySite:item.notifySiteCode, notifySite:item.notifySite,
picUrl:item.picUrl, picUrl:item.picUrl,
remark:item.remark, remark:item.remark,
scanWeight:item.scanWeight, scanWeight:item.scanWeight,
scanDate:item.scanDate scanDate:item.scanDate
} }
) )
// problemInfoList.push({ problemInfoList.push({
// billCode: item.billCode, billCode: item.billCode,
// problemType: item.problemType, problemType: item.problemType,
// problemTitle: null, problemTitle: null,
// problemCause: item.remark, problemCause: item.remark,
// sendSite: item.sendSiteName, sendSite: item.sendSiteName,
// sendSiteCode: item.sendSiteCode, sendSiteCode: item.sendSiteCode,
// registerManCode: item.registerManCode, registerManCode: item.registerManCode,
// registerManDept: null, registerManDept: null,
// registerSiteCode: item.registerSiteCode, registerSiteCode: item.registerSiteCode,
// registerDate: item.registerDate, registerDate: item.registerDate,
// registerSaveDate: null, registerSaveDate: null,
// dataFrom: item.dataFrom, dataFrom: item.dataFrom,
// status: null,//item.waybillStatus,//？？？？？？？？是否正确 status: null,//item.waybillStatus,//？？？？？？？？是否正确
// isSendSiteRegister: null, isSendSiteRegister: null,
// // blReversion: false,//？？？？？？？？是否正确 // blReversion: false,//？？？？？？？？是否正确
// blReversion: null, blReversion: null,
// reversionStr: null, reversionStr: null,
// reversionMan: null, reversionMan: null,
// reversionManCode: null, reversionManCode: null,
// reversionDate: null, reversionDate: null,
// blCheckok: null, blCheckok: null,
// blSee: null, blSee: null,
// filePath: item.picUrl, filePath: item.picUrl,
// modifySiteCode: null, modifySiteCode: null,
// delFlag: item.delFlag,//？？？？？？？？是否正确 delFlag: item.delFlag,//？？？？？？？？是否正确
// remark: item.remark,//？？？？？？？？是否正确 remark: item.remark,//？？？？？？？？是否正确
// }) })
} }
}); });
@ -499,8 +450,6 @@ export default {
scanData:scanData scanData:scanData
}; };
let newList = [];
doScan(scanProblemInfo).then(response => { doScan(scanProblemInfo).then(response => {
let scanRstItem = response.data.scanResult[0]; let scanRstItem = response.data.scanResult[0];
console.log(scanRstItem); console.log(scanRstItem);
@ -508,29 +457,24 @@ export default {
this.$modal.msgError(scanRstItem.message); this.$modal.msgError(scanRstItem.message);
return; return;
} }
this.emisWaybillList.forEach(item=>{
if(this.ids.indexOf(item.id) > -1){
item.currentStatus="已上传";
}
newList.push(item);
})
this.emisWaybillList = newList;
this.$modal.msgSuccess(scanRstItem.message); this.$modal.msgSuccess(scanRstItem.message);
}); });
// problemInfoList.forEach(item => { problemInfoList.forEach(item => {
// addEmisWaybillProblemInfo(item).then(response => { addEmisWaybillProblemInfo(item).then(response => {
// // debugger; // debugger;
// if(response.code != "200"){ if(response.code != "200"){
// this.$modal.msgError(response.msg); this.$modal.msgError(response.msg);
// return; return;
// } }
// this.$modal.msgSuccess(response.msg); this.$modal.msgSuccess(response.msg);
// }) })
// }) })
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
let newList = []; let newList = [];
debugger
for(let i = 0; i< this.emisWaybillList.length;i++){ for(let i = 0; i< this.emisWaybillList.length;i++){
let waybill = {...this.emisWaybillList[i]}; let waybill = {...this.emisWaybillList[i]};
if(this.ids.indexOf(waybill.id) > -1){ if(this.ids.indexOf(waybill.id) > -1){

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

@ -131,11 +131,7 @@
<el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100" /> <el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100" />
<el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="100" /> <el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="100" />
<el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="100" /> <el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" width="200"> <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<template slot-scope="scope">
<span class="ellipsis">{{scope.row.remark}}</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" />
</xd-table> </xd-table>
<el-divider class="divider"></el-divider> <el-divider class="divider"></el-divider>
@ -884,11 +880,4 @@ export default {
padding: 0 12px 0 0; padding: 0 12px 0 0;
box-sizing: border-box; box-sizing: border-box;
} }
.ellipsis {
width:200px;
overflow: hidden; /* 确保超出容器的内容被裁剪 */
white-space: nowrap; /* 确保文本在一行内显示 */
text-overflow: ellipsis; /* 超出部分显示省略号 */
}
</style> </style>

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

@ -126,11 +126,7 @@
<el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100" /> <el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100" />
<el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="100" /> <el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="100" />
<el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="100" /> <el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" width="200"> <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<template slot-scope="scope">
<span class="ellipsis">{{scope.row.remark}}</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" />
</xd-table> </xd-table>
<el-divider class="divider"></el-divider> <el-divider class="divider"></el-divider>
@ -834,10 +830,4 @@ export default {
padding: 0 12px 0 0; padding: 0 12px 0 0;
box-sizing: border-box; box-sizing: border-box;
} }
.ellipsis {
width:200px;
overflow: hidden; /* 确保超出容器的内容被裁剪 */
white-space: nowrap; /* 确保文本在一行内显示 */
text-overflow: ellipsis; /* 超出部分显示省略号 */
}
</style> </style>

24
src/views/emis/emisWaybillTransfer/waybillTransfer.vue
View File

@ -50,7 +50,7 @@
</el-col> </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="80px">
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker> <elDateAdvPicker clearable v-model="queryParams.dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-col> </el-col>
@ -156,23 +156,18 @@
<el-table-column :label="$t('目的城市')" align="center" prop="transferCity" min-width="100" /> <el-table-column :label="$t('目的城市')" align="center" prop="transferCity" min-width="100" />
<el-table-column :label="$t('物流公司联系人')" align="center" prop="linkMan" min-width="100" /> <el-table-column :label="$t('物流公司联系人')" align="center" prop="linkMan" min-width="100" />
<el-table-column :label="$t('电话')" align="center" prop="linkPhone" min-width="100" /> <el-table-column :label="$t('电话')" align="center" prop="linkPhone" 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" />
<template slot-scope="scope">
<el-tag v-if="scope.row.waybillDetail.waybillStatus=='50'" type="success">已签收</el-tag>
<el-tag v-else type="danger">未签收</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('转件重量')" align="center" prop="transferWeight" min-width="100" /> <el-table-column :label="$t('转件重量')" align="center" prop="transferWeight" min-width="100" />
<el-table-column :label="$t('转件体积')" align="center" prop="transferVolume" min-width="100" /> <el-table-column :label="$t('转件体积')" align="center" prop="transferVolume" min-width="100" />
<el-table-column :label="$t('转件网点')" align="center" prop="createSiteName" min-width="100" /> <el-table-column :label="$t('转件网点')" align="center" prop="xxxx" min-width="100" />
<el-table-column :label="$t('操作人')" align="center" prop="createByName" min-width="100" /> <el-table-column :label="$t('操作人')" align="center" prop="xxxx" min-width="100" />
<el-table-column :label="$t('转件原因')" align="center" prop="transferResean" min-width="100" /> <el-table-column :label="$t('转件原因')" align="center" prop="transferResean" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
</xd-table> </xd-table>
<!-- 添加或修改转件对话框 --> <!-- 添加或修改转件对话框 -->
<el-dialog :title="titleForm" :visible.sync="openForm" width="800px" v-dialogDrag :close-on-click-modal="false" append-to-body> <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
<el-form ref="form" :model="form" size="mini" label-width="80px" :rules="rules"> <el-form ref="form" :model="form" size="mini" label-width="80px" :rules="rules">
<el-row :gutter="0"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="8"> <el-col :span="8">
<el-form-item :label="$t('运单编号')" prop="billCode" label-width="80px"> <el-form-item :label="$t('运单编号')" prop="billCode" label-width="80px">
<el-input v-model="form.billCode"></el-input> <el-input v-model="form.billCode"></el-input>
@ -371,13 +366,6 @@ export default {
}); });
// this.getList(); // this.getList();
}, },
mounted() {
const end = new Date()
const start = new Date()
start.setHours(0,0,0,0)
end.setHours(23,59,59,0)
this.dateTimeRange=[start,end];
},
methods: { methods: {
/** 查询运单转件表列表 */ /** 查询运单转件表列表 */
getList() { getList() {