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

Merge pull request 'master-xjkh' (#179) from master-xjkh into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/179
This commit is contained in:
wuteng 2025-12-31 15:39:16 +08:00
commit 6bb5d9cdfe
5 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
View File

@ -414,6 +414,14 @@ export default {
components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView,EmisSupplierPicker,EmisTmsSiteBatchSupplierPicker,EmisTmsSiteBatchNextSitePicker},
dicts: ['emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status','emis_declare_mode','emis_customs_clear','emis_big_batch_type'],
data() {
//自定义校验方法 校验运输号
var checkCarNo = (rule, value, callback) => {
if (value.trim() !== value) {
callback(new Error('运输号前后不能有空格'));// 关联主单和运单线路不一致
} else {
callback();
}
}
return {
// 遮罩层
loading: false,
@ -485,6 +493,8 @@ export default {
// ],
carNo: [
{ required: true, message: "车牌号不能为空", trigger: ["blur","change"] },
//运输号首位不能有空格
{ validator: checkCarNo, trigger: ["blur","change"] },
],
carTime: [
{ required: true, message: "发车时间不能为空", trigger: ["blur","change"] },

5
src/views/emis/emisWaybill/centerWaybillList.vue
View File

@ -399,12 +399,17 @@
已签收
</div>
<div v-else >
<div v-if="[150,151,170,173].includes(scope.row.problemType)">
<span style="color: red">{{ scope.row.problemTypeName }}</span>
</div>
<div v-else>
<span v-if="calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)>2" style="color: red" >
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}} 天
</span>
<span v-else >
{{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}}天
</span>
</div>
</div>
</div>
</template>

5
src/views/emis/emisWaybill/dispatchWaybillList.vue
View File

@ -382,6 +382,10 @@
已签收
</div>
<div v-else >
<div v-if="[150,151,170,173].includes(scope.row.problemType)">
<span style="color: red">{{ scope.row.problemTypeName }}</span>
</div>
<div v-else>
<span v-if="calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)>2" style="color: red" >
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}} 天
</span>
@ -390,6 +394,7 @@
</span>
</div>
</div>
</div>
</template>
</el-table-column>

5
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -386,6 +386,10 @@
已签收
</div>
<div v-else >
<div v-if="[150,151,170,173].includes(scope.row.problemType)" >
<span style="color: red">{{ scope.row.problemTypeName }}</span>
</div>
<div v-else>
<span v-if="calcDeliveryTime(new Date(),scope.row.lastScanDate)>2" style="color: red" >
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanDate)}} 天
</span>
@ -394,6 +398,7 @@
</span>
</div>
</div>
</div>
</template>
</el-table-column>

5
src/views/emis/emisWaybill/sendWaybillListNew.vue
View File

@ -378,6 +378,10 @@
已签收
</div>
<div v-else >
<div v-if="[150,151,170,173].includes(scope.row.problemType)" >
<span style="color: red">{{ scope.row.problemTypeName }}</span>
</div>
<div v-else>
<span v-if="calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)>2" style="color: red" >
轨迹异常:停留超时{{calcDeliveryTime(new Date(),scope.row.lastScanRecord.scanDate)}} 天
</span>
@ -386,6 +390,7 @@
</span>
</div>
</div>
</div>
</template>
</el-table-column>