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

Merge pull request 'master-dev' (#124) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/124
This commit is contained in:
wuteng 2025-10-27 13:50:29 +08:00
commit 60ece11ef4
7 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/emis/emisWaybill/UserOrderList.vue
View File

@ -1113,6 +1113,24 @@ export default {
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v[j]);
}
if (j === 'orderStatus') {
return this.selectDictLabel(this.dict.type.emis_order_status,v[j]);
}
if (j === 'orderType') {
if(v[j] == 1){
return '客户下单';
}else{
return '业务开单';
}
}
//是否是问题件
if(j=='blIsQuestion'){
if(v[j] == 1){
return '是';
}else{
return '否';
}
}
return v[j]
}))
},

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

@ -193,7 +193,9 @@
<el-option label="未签收" :value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="始发网点" prop="startSiteCode">
<EmisSiteSimplePicker3 v-model="queryParams.startSiteCode" :placeholder="$t('始发网点')" ></EmisSiteSimplePicker3>
</el-form-item>
</el-col>
<el-col :span="6">
@ -636,6 +638,7 @@ import EmisSiteMutiSelectPicker from '@/views/emis/EmisBaseTools/EmisSiteMutiSel
import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker3 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'
import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue';
@ -668,6 +671,7 @@ export default {
EmisSiteMutiSelectPicker,
EmisSiteSimplePicker1,
EmisSiteSimplePicker2,
EmisSiteSimplePicker3,
ProblemTypeMultiplePicker,
TraceWaybillDetailView,
@ -863,6 +867,7 @@ export default {
takePieceEmployeeCode: null,
sendSiteCode: null,
sendDate: null,
startSiteCode:null,
dispatchManCode: null,
dispatchDate: null,
dispatchSiteCode: null,

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

@ -10,7 +10,7 @@
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderType">
<el-radio :key="1" label="1">运单号</el-radio>
<!-- <el-radio :key="0" label="0">订单号</el-radio> -->
<!-- <el-radio :key="0" label="0">订单号</el-radio> -->
</el-radio-group>
</div>
<XdTextareaInput
@ -170,7 +170,9 @@
<el-option label="未签收" :value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="始发网点" prop="startSiteCode">
<EmisSiteSimplePicker3 v-model="queryParams.startSiteCode" :placeholder="$t('始发网点')" ></EmisSiteSimplePicker3>
</el-form-item>
</el-col>
<el-col :span="6">
@ -613,6 +615,7 @@ import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker3 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'
import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue';
@ -644,6 +647,7 @@ export default {
EmisSiteSimplePicker1,
EmisSiteSimplePicker2,
EmisSiteSimplePicker3,
ProblemTypeMultiplePicker,
TraceWaybillDetailView,
@ -819,6 +823,7 @@ export default {
takePieceEmployeeCode: null,
sendSiteCode: null,
sendDate: null,
startSiteCode: null,
dispatchManCode: null,
dispatchDate: null,
dispatchSiteCode: null,

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

@ -52,14 +52,15 @@
</el-row >
</el-form>
<xd-table v-loading="loading"
border
border
size="small"
storageName="orderEntryAndReceiptPictureManagement_main"
:data="attachmentList"
:showSearch.sync="showSearch"
:queryParams="queryParams"
:total="attachmentList.length"
:total="total"
@queryTable="getList"
@selection-change="handleSelectionChange"
v-if="tableHeight" :max-height="tableHeight + 'px'"
>

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

@ -185,7 +185,9 @@
<el-option label="未签收" :value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="始发网点" prop="startSiteCode">
<EmisSiteSimplePicker3 v-model="queryParams.startSiteCode" :placeholder="$t('始发网点')" ></EmisSiteSimplePicker3>
</el-form-item>
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
@ -601,6 +603,7 @@ import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker3 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'
import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue';
@ -642,6 +645,7 @@ export default {
EmisSiteSimplePicker1,
EmisSiteSimplePicker2,
EmisSiteSimplePicker3,
ProblemTypeMultiplePicker,
TraceDetail,
@ -821,6 +825,7 @@ export default {
takePieceEmployeeCode: null,
sendSiteCode: null,
sendDate: null,
startSiteCode: null,
dispatchManCode: null,
dispatchDate: null,
dispatchSiteCode: null,

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

@ -190,7 +190,9 @@
<el-option label="未签收" :value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="始发网点" prop="startSiteCode">
<EmisSiteSimplePicker3 v-model="queryParams.startSiteCode" :placeholder="$t('始发网点')" ></EmisSiteSimplePicker3>
</el-form-item>
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
@ -611,6 +613,7 @@ import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
import EmisSiteSimplePicker3 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'
// import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue';
@ -658,6 +661,7 @@ export default {
EmisSiteSimplePicker1,
EmisSiteSimplePicker2,
EmisSiteSimplePicker3,
ProblemTypeMultiplePicker,
TraceDetail,
@ -840,6 +844,7 @@ export default {
takePieceEmployeeCode: null,
sendSiteCode: null,
sendDate: null,
startSiteCode: null,
dispatchManCode: null,
dispatchDate: null,
dispatchSiteCode: null,

3
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -2813,6 +2813,9 @@ methods: {
},
//根据寄件国家处理单号格式
autoAjustBillCodeSender(code) {
if (!this.form.billCode) {
return;
}
if (code === '0095' || code === '0855') {
//如果单号是否包含7080 去掉首字母的T 否则保持不变
if (this.form.billCode.includes('7080')) {