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

Merge pull request 'develop' (#185) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/185
This commit is contained in:
wuteng 2026-01-05 14:46:18 +08:00
commit 66e0c90caa
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@
<el-col :span="5">
<el-form-item label="寄件网点" prop="productType">
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='')" ></EmisSiteSimplePicker1>
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='') &&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='')" ></EmisSiteSimplePicker1>
</el-form-item>
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
@ -249,7 +249,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('现金客户')" prop="moneyUserId">
<EmisMoneyUserPicker v-model="queryParams.params.moneyUserId" :placeholder="$t('现金客户')" ></EmisMoneyUserPicker>
<EmisMoneyUserPicker v-model="queryParams.params.moneyUserId" :placeholder="$t('现金客户')" @onChange="onMoneyUserChange"></EmisMoneyUserPicker>
</el-form-item>
</el-col>
@ -1053,7 +1053,7 @@ export default {
}
}else{
if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.salesmen=='') ){
if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.salesmen=='') &&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='')){
this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
}
@ -1297,6 +1297,9 @@ export default {
...qExportParam
}, `出口清单.xlsx`)
},
onMoneyUserChange(){
this.queryParams.sendSiteCode=null;
}
}
};
</script>

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

@ -46,7 +46,7 @@
<el-col :span="5">
<el-form-item label="寄件网点" prop="productType">
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='')" ></EmisSiteSimplePicker1>
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="$store.getters.ownerSiteCode !='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='')&&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='')" ></EmisSiteSimplePicker1>
</el-form-item>
@ -254,7 +254,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('现金客户')" prop="moneyUserId">
<EmisMoneyUserPicker v-model="queryParams.params.moneyUserId" :placeholder="$t('现金客户')" ></EmisMoneyUserPicker>
<EmisMoneyUserPicker v-model="queryParams.params.moneyUserId" :placeholder="$t('现金客户')" @onChange="onMoneyUserChange"></EmisMoneyUserPicker>
</el-form-item>
</el-col>
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
@ -999,7 +999,7 @@ export default {
}
}else{
if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='') ){
if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='')&&(this.queryParams.custNo==null||this.queryParams.custNo=='') &&(this.queryParams.params.moneyUserId==null||this.queryParams.params.moneyUserId=='')){
this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
}
@ -1239,7 +1239,9 @@ export default {
getIndex($index) {
return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
},
onMoneyUserChange(){
this.queryParams.sendSiteCode=null;
}
}
};
</script>