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

Merge pull request '财务驳回原因、重量计提' (#33) from master-员工提成 into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/33
This commit is contained in:
wuteng 2025-07-19 16:39:13 +08:00
commit cc5be85410
6 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/views/emis/emisCommissionQuote/batchCommissionQuotePriceUpdateForm.vue
View File

@ -26,6 +26,25 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="计算类型" prop="calcType">
<el-radio-group v-model="form.calcType" @change="calcTypeChange">
<el-radio label="1">按票计算</el-radio>
<el-radio label="2">重量计算</el-radio>
<el-radio label="3">体积计算</el-radio>
<el-radio label="4">包裹数</el-radio>
<el-radio label="5">按柜计算</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" v-show="form.calcType == '2'">
<el-form-item label="重量计算" prop="calcWeightType">
<el-radio-group v-model="form.calcWeightType">
<el-radio label="1">结算重量计提</el-radio>
<el-radio label="2">实际重量计提</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-col>
<el-col :span="18">
<el-row>
@ -164,6 +183,8 @@ export default {
empCode:this.form.empCode,
empName:this.form.empName,
blOpen:this.form.blOpen,
calcType:this.form.calcType,
calcWeightType:this.form.calcWeightType,
}
updList.push(item);
await batchUpdate(updList);
@ -178,6 +199,8 @@ export default {
empCode:this.form.empCode,
empName:this.form.empName,
blOpen:this.form.blOpen,
calcType:this.form.calcType,
calcWeightType:this.form.calcWeightType,
}
updList.push(item);
}
@ -231,7 +254,7 @@ export default {
cancelBatchEmp(){
this.openForm=false;
},
async getStaffUser(name){
async getStaffUser(name){
let qParams={
searchValue:name,
pageNum: 1,
@ -250,6 +273,11 @@ export default {
}
return null;
},
calcTypeChange(val){
if(val!=='2'){
this.form.calcWeightType=null;
}
}
}
};
</script>

19
src/views/emis/emisCommissionQuote/emisCommissionQuoteForm.vue
View File

@ -80,7 +80,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="计算类型" prop="calcType">
<el-radio-group v-model="form.calcType">
<el-radio-group v-model="form.calcType" @change="calcTypeChange">
<el-radio label="1">按票计算</el-radio>
<el-radio label="2">重量计算</el-radio>
<el-radio label="3">体积计算</el-radio>
@ -89,6 +89,14 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" v-show="form.calcType == '2'">
<el-form-item label="重量计算" prop="calcWeightType">
<el-radio-group v-model="form.calcWeightType">
<el-radio label="1">结算重量计提</el-radio>
<el-radio label="2">实际重量计提</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="24">
<el-form-item label="优先级" prop="priorityLevel">
<el-input v-model="form.priorityLevel" placeholder="优先级" style="width:100px" />
@ -444,7 +452,8 @@ export default {
updateBy: null,
updateTime: null,
createSite: null,
updateSite: null
updateSite: null,
calcWeightType:null,
};
this.resetForm("form");
},
@ -478,7 +487,11 @@ export default {
}
});
},
calcTypeChange(val){
if(val!=='2'){
this.form.calcWeightType=null;
}
}
}
};
</script>

4
src/views/emis/emisCommissionQuote/index.vue
View File

@ -184,13 +184,13 @@
<dict-tag :options="dict.type.emis_commission_fee_type" :value="scope.row.feeType"/>
</template>
</el-table-column>
<el-table-column :label="$t('计算类型')" align="center" prop="calcType" min-width="100" >
<el-table-column :label="$t('计算类型')" align="center" prop="calcType" min-width="130" >
<template slot-scope="scope">
<div v-if="scope.row.calcType == 1" >
<span>按票计算</span>
</div>
<div v-if="scope.row.calcType == 2" >
<span>重量计算</span>
<span>重量计算</span><span>({{scope.row.calcWeightType==='1'?'结算重量':'实际重量'}})</span>
</div>
<div v-if="scope.row.calcType == 3" >
<span>体积计算</span>

4
src/views/emis/emisWaybillAjustApply/WaybillAjustApplyList.vue
View File

@ -191,9 +191,9 @@
<div v-if="scope.row.blDestConfirmed==2" >{{ scope.row.destConfirmManName }}</div>
</template>
</el-table-column>
<el-table-column :label="$t('驳回原因')" align="center" prop="destConfirmNote" min-width="100" :show-overflow-tooltip="true" >
<el-table-column :label="$t('财务驳回原因')" align="center" prop="centerConfirmNote" min-width="110" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<div v-if="scope.row.blDestConfirmed==2" >{{ scope.row.destConfirmNote }}</div>
<div v-if="scope.row.blCenterConfirmed==2" >{{ scope.row.centerConfirmNote }}</div>
</template>
</el-table-column>
<el-table-column :label="$t('中心审核时间')" align="center" prop="centerConfirmDate" min-width="170" />

4
src/views/emis/emisWaybillAjustApply/WaybillAjustCenterConfirm.vue
View File

@ -209,9 +209,9 @@
<div v-if="scope.row.blDestConfirmed==2" >{{ scope.row.destConfirmManName }}</div>
</template>
</el-table-column>
<el-table-column :label="$t('驳回原因')" align="center" prop="destConfirmNote" min-width="100" :show-overflow-tooltip="true" >
<el-table-column :label="$t('财务驳回原因')" align="center" prop="centerConfirmNote" min-width="110" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<div v-if="scope.row.blDestConfirmed==2" >{{ scope.row.destConfirmNote }}</div>
<div v-if="scope.row.blCenterConfirmed==2" >{{ scope.row.centerConfirmNote }}</div>
</template>
</el-table-column>
<el-table-column :label="$t('中心审核时间')" align="center" prop="centerConfirmDate" min-width="170" />

4
src/views/emis/emisWaybillAjustApply/WaybillAjustDestConfirm.vue
View File

@ -196,9 +196,9 @@
<div v-if="scope.row.blDestConfirmed==2" >{{ scope.row.destConfirmManName }}</div>
</template>
</el-table-column>
<el-table-column :label="$t('驳回原因')" align="center" prop="destConfirmNote" min-width="100" :show-overflow-tooltip="true" >
<el-table-column :label="$t('财务驳回原因')" align="center" prop="centerConfirmNote" min-width="110" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<div v-if="scope.row.blDestConfirmed==2" >{{ scope.row.destConfirmNote }}</div>
<div v-if="scope.row.blCenterConfirmed==2" >{{ scope.row.centerConfirmNote }}</div>
</template>
</el-table-column>
<el-table-column :label="$t('中心审核时间')" align="center" prop="centerConfirmDate" min-width="170" />