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-06-11 19:49:09 +08:00
commit 2e1069dba7
3 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -104,7 +104,7 @@
"vuex": "3.6.0",
"watermark-dom": "2.3.0",
"xd-pdf": "./libs/XdPdf",
"xd-vue-pdf": "./libs/XdVuePdf",
"xd-vue-pdf": "file:libs/XdVuePdf",
"xlsx": "^0.17.5"
},
"devDependencies": {

69
src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
View File

@ -49,11 +49,11 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="寄件国" prop="destCountry">
<el-form-item label="寄件国" prop="sendCountry">
<CountryPicker :placeholder="$t('寄件国')" v-model="queryParams.sendCountry" ></CountryPicker>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8"> 经确认：这张表不用付款方式，列表中去除
<el-form-item label="付款方式" prop="paymentType" >
<el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
<el-option
@ -64,7 +64,7 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<!-- <el-form-item label="签收时间" prop="dateTimeRange">
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
@ -150,7 +150,7 @@
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
<el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" 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="currentSiteName" min-width="100" />
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
<el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
@ -227,7 +227,7 @@
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
<el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" 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="currentSiteName" min-width="100" />
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
<el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
@ -305,9 +305,9 @@
<el-table-column :label="$t('报关资料状态')" align="center" prop="declareResStatus" min-width="170" />
<el-table-column :label="$t('清关资料状态')" align="center" prop="clearanceResStatus" min-width="170" />
<el-table-column :label="$t('航空提单号')" align="center" prop="airBilllNo" min-width="170" />
<el-table-column :label="$t('异常信息')" align="center" prop="xxx" min-width="170">
<el-table-column :label="$t('异常信息')" align="center" prop="remark" min-width="170">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.xxx }}</span>
<span class="ellipsis">{{ scope.row.remark }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('目的国家')" align="center" prop="destCountryName" min-width="100">
@ -325,7 +325,7 @@
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('操作员')" align="center" prop="createBy" min-width="150" />
<el-table-column :label="$t('操作员')" align="center" prop="createByName" min-width="150" />
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -357,7 +357,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="运输方式" prop="transType">
<el-select v-model="coData.transType" placeholder="运输方式" clearable filterable>
<el-select v-model="coData.transType" placeholder="运输方式" clearable filterable >
<el-option
v-for="item in dict.type.emis_biz_shipping_method"
v-bind:key="item.value"
@ -372,8 +372,9 @@
<span slot="label">
<span style="color: red">{{ $t('起始网点') }}</span>
</span>
<EmisSiteSimplePicker :placeholder="$t('请选择')" @change="onSiteSelect" v-model="coData.startSiteCode" v-if="$store.getters.ownerSiteCode== '88888'" ></EmisSiteSimplePicker>
<el-input v-else v-model="coData.startSiteName" placeholder="" disabled />
<!-- <EmisSiteSimplePicker :placeholder="$t('请选择')" @change="onSiteSelect" v-model="coData.startSiteCode" v-if="$store.getters.ownerSiteCode== '88888'" ></EmisSiteSimplePicker>
<el-input v-else v-model="coData.startSiteName" placeholder="" disabled /> -->
<EmisSiteSimplePicker :placeholder="$t('请选择')" @change="onSiteSelect" v-model="coData.startSiteCode" :disabled="$store.getters.ownerSiteCode != '88888'" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
@ -384,12 +385,12 @@
<EmisSiteSimplePicker :placeholder="$t('请选择')" v-model="coData.nextSiteCode" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" v-if="coData.transType == 2">
<el-form-item :label="$t('航空单号')" prop="airBilllNo">
<el-input v-model="coData.airBilllNo" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" v-if="coData.transType == 2">
<el-form-item label="起飞时间" prop="airTime">
<el-date-picker clearable
v-model="coData.airTime"
@ -399,27 +400,12 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('车牌号')" prop="carNo">
<el-input v-model="coData.carNo" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发车时间" prop="carTime">
<el-date-picker clearable
v-model="coData.carTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择发车时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" v-if="coData.transType == 4">
<el-form-item :label="$t('船次号')" prop="shipNo">
<el-input v-model="coData.shipNo" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" v-if="coData.transType == 4">
<el-form-item label="开船时间" prop="shipTime">
<el-date-picker clearable
v-model="coData.shipTime"
@ -429,14 +415,29 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="8" v-if="['1','3','5'].indexOf(coData.transType) > -1">
<el-form-item :label="$t('车牌号')" prop="carNo">
<el-input v-model="coData.carNo" />
</el-form-item>
</el-col>
<el-col :span="8" v-if="['1','3','5'].indexOf(coData.transType) > -1">
<el-form-item label="发车时间" prop="carTime">
<el-date-picker clearable
v-model="coData.carTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择发车时间">
</el-date-picker>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item :label="$t('配载文件')" prop="loadingFile">
<span slot="label">
<span style="color: red">{{ $t('配载文件') }}</span>
</span>
<ImageUpload v-model="coData.loadingFile" :isShowTip="false" ></ImageUpload>
</el-form-item>
</el-col>
</el-col> -->
</el-col>
<el-col :span="8">
<el-col :span="24">
@ -543,7 +544,7 @@
<dict-tag :options="dict.type.emis_pack_status" :value="coData.packStatus"/>
</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="currentSiteName" min-width="100" />
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
<el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
@ -705,7 +706,7 @@
<dict-tag :options="dict.type.emis_pack_status" :value="coData.packStatus"/>
</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="currentSiteName" min-width="100" />
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
<el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">

4
src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
View File

@ -102,8 +102,8 @@
<ImagePreview height="50px" v-for="pic in (scope.row.fileUrl||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
</template>
</el-table-column>
<el-table-column :label="$t('上传网点')" align="center" prop="createSite" min-width="100" />
<el-table-column :label="$t('上传人')" align="center" prop="createBy" min-width="150" />
<el-table-column :label="$t('上传网点')" align="center" prop="createSiteName" min-width="100" />
<el-table-column :label="$t('上传人')" align="center" prop="createByName" min-width="150" />
<el-table-column :label="$t('上传时间')" align="center" prop="createTime" min-width="170" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>