java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

优化财务

dev-xx
马远东 11 months ago
parent
ebca8a8f35
commit
07d1ae7f93
3 changed files with 67 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      src/views/Pricesystem/Price/PriceDelivery.vue
  2. 5
      src/views/Pricesystem/PricesyHome.vue
  3. 16
      src/views/financialsector/FinanceHome.vue

50
src/views/Pricesystem/Price/PriceDelivery.vue
Unescape View File

@ -59,6 +59,7 @@
:min="0"
:max="9999999"
:controls="false"
:value-on-clear="0"
placeholder="请输入价格"
/>
</el-form-item>
@ -82,6 +83,7 @@
:min="0"
:max="9999999"
:controls="false"
:value-on-clear="0"
placeholder="请输入价格"
/>
</el-form-item>
@ -107,6 +109,7 @@
:min="0"
:max="9999999"
:controls="false"
:value-on-clear="0"
placeholder="请输入价格"
/>
</el-form-item>
@ -131,6 +134,7 @@
:min="0"
:max="9999999"
:controls="false"
:value-on-clear="0"
placeholder="请输入价格"
/>
</el-form-item>
@ -147,6 +151,7 @@
:min="0"
:max="9999999"
:controls="false"
:value-on-clear="0"
placeholder="请输入价格"
/>
</el-form-item>
@ -163,6 +168,7 @@
:min="0"
:max="9999999"
:controls="false"
:value-on-clear="0"
placeholder="请输入价格"
/>
</el-form-item>
@ -238,6 +244,7 @@
:max="9999999"
:controls="false"
placeholder="请输入价格"
:value-on-clear="0"
/>
</el-form-item>
</div>
@ -253,6 +260,7 @@
:max="9999999"
:controls="false"
placeholder="请输入价格"
:value-on-clear="0"
/>
</el-form-item>
</div>
@ -268,6 +276,7 @@
:max="9999999"
:controls="false"
placeholder="请输入价格"
:value-on-clear="0"
/>
</el-form-item>
</div>
@ -282,6 +291,7 @@
:min="0"
:max="9999999"
:controls="false"
:value-on-clear="0"
placeholder="请输入价格"
/>
</el-form-item>
@ -307,6 +317,7 @@
:precision="2"
:min="0"
:max="9999999"
:value-on-clear="0"
:controls="false"
placeholder="请输入价格"
/>
@ -332,6 +343,7 @@
:min="0"
:max="9999999"
:controls="false"
:value-on-clear="0"
placeholder="请输入价格"
/>
</el-form-item>
@ -344,6 +356,7 @@
:max="9999999"
:controls="false"
placeholder="请输入价格"
:value-on-clear="0"
/>
</el-form-item>
</div>
@ -362,6 +375,7 @@
:max="9999999"
:controls="false"
placeholder="请输入价格"
:value-on-clear="0"
/>
</el-form-item>
</template>
@ -373,6 +387,7 @@
:min="0"
:max="9999999"
:controls="false"
:value-on-clear="0"
placeholder="请输入价格"
/>
</el-form-item>
@ -387,6 +402,7 @@
:min="0"
:max="9999999"
:controls="false"
:value-on-clear="0"
placeholder="请输入价格"
/>
</el-form-item>
@ -399,6 +415,7 @@
v-model="form.dispatchUpwardJudgmentCost"
:precision="2"
:min="0"
:value-on-clear="0"
:max="9999999"
:controls="false"
placeholder="请输入价格"
@ -1083,7 +1100,10 @@ const onLoad = async () => {
} else {
form.value.pieceCategory.find(res => res.prop === 'leaveBehindPrice').disabled = true;
}
if (request.value.dispatchIsStairsCarryingCharge && request.value.dispatchIsFeeFloor) {
form.value.dispatchStairsCarryingCharge = 0;
}
// (品类计费按方)是否有遗留
if (!request.value.dispatchIsLeaveBehind) {
form.value.cubeCategory.find(res => res.prop === 'leaveBehindPrice').disabled = false;
@ -1144,34 +1164,52 @@ const onLoad = async () => {
} else {
// 按件品类计费
if (form.value.dispatchPricingType.includes(1)) {
if(requestInfo.value.pieceCategory.length){
let data = requestInfo.value.pieceCategory[0] || [];
form.value.pieceCategoryInput = data.price || 0;
}
}
if (form.value.dispatchPricingType.includes(2)) {
// 按重量品类计费
if(requestInfo.value.weightCategory.length){
let data = requestInfo.value.weightCategory[0] || [];
form.value.weightCategoryInput = data.price || 0;
}
}
if (form.value.dispatchPricingType.includes(3)) {
// 按方品类计费
if( requestInfo.value.cubeCategory.length){
let data = requestInfo.value.cubeCategory[0] || [];
form.value.cubeCategoryInput = data.price || 0;
}
}
}
// 按公里
if (form.value.dispatchPricingType.includes(7)) {
if( requestInfo.value.kilometerCost.length){
form.value.kilometerCost = requestInfo.value.kilometerCost[0].price || 0;
}
}
//按吨公里
if (form.value.dispatchPricingType.includes(6)) {
if(requestInfo.value.tonKilometerCost.length){
form.value.tonKilometerCost = requestInfo.value.tonKilometerCost[0].price || 0;
}
}
//按吨
if (form.value.dispatchPricingType.includes(8)) {
if(requestInfo.value.tonCost.length){
form.value.tonCost = requestInfo.value.tonCost[0].price || 0;
}
}
//按整车
if (form.value.dispatchPricingType.includes(4)) {
if (requestInfo.value.fullVehicle && requestInfo.value.fullVehicle.length) {
@ -1212,8 +1250,11 @@ const onLoad = async () => {
form.value.sortPrice = data.sortPrice || 0;
form.value.upstairsDeliveryPrice = data.upstairsDeliveryPrice || 0;
}
// 上楼费免费楼层(缺少判断)
form.value.dispatchStairsCarryingCharge = requestInfo.value.dispatchStairsCarryingCharge;
if (request.value.dispatchIsStairsCarryingCharge && request.value.dispatchIsFeeFloor) {
console.log('有楼层',form.value.dispatchStairsCarryingCharge);
form.value.dispatchStairsCarryingCharge = requestInfo.value.dispatchStairsCarryingCharge || 0;
}
// 最低计费
if (request.value.dispatchIsMinCost) {
form.value.Minimumbilling.find(res => res.disabled).minCost =
@ -1239,11 +1280,9 @@ const onLoad = async () => {
}
}
let setTime = setTimeout(() => {
formCopy.value = deepClone(form.value);
loading.value = false;
clearTimeout(setTime);
}, 500);
};
onLoad();
@ -1377,6 +1416,7 @@ const handleSubmit = () => {
}
// 上楼费免费楼层
if (request.value.dispatchIsStairsCarryingCharge && request.value.dispatchIsFeeFloor) {
console.log('有楼层',form.value.dispatchStairsCarryingCharge);
data.dispatch.dispatchStairsCarryingCharge = form.value.dispatchStairsCarryingCharge || 0;
}
// 最低计费

5
src/views/Pricesystem/PricesyHome.vue
Unescape View File

@ -108,7 +108,7 @@ async function executeCheckedResults(results) {
await provideData();
}
pageLoading.value = false;
Tabmenu.value=results[0].label;//设置第一个菜单
}
/** 获取回显数据 */
@ -176,7 +176,7 @@ const onLoad = async () => {
const result = ServiceList.value.filter(item => form.value.ServiceType.includes(item.value));
await initData();
// 激活菜单设置为已经存在的
executeCheckedResults(result);
await executeCheckedResults(result);
await nextTick();
setTimeout(() => {
@ -188,6 +188,7 @@ const onLoad = async () => {
financialTrunkLine.value[0].initDictionaryBiz();
}
}, 1000);
Tabmenu.value=result[0].label;//设置第一个菜单
});
} catch (error) {
console.log('error :>> ', error);

16
src/views/financialsector/FinanceHome.vue
Unescape View File

@ -120,8 +120,8 @@ const templateInfo = ref({});
// 菜单列表
const ServiceList = ref([]);
// 字典公共函数
function updateDictionary(targetArray, dictionaryType) {
getDictionaryBiz(dictionaryType)
async function updateDictionary(targetArray, dictionaryType) {
await getDictionaryBiz(dictionaryType)
.then(res => {
console.log(res, '字典');
if (res.data.code == 200) {
@ -134,8 +134,6 @@ function updateDictionary(targetArray, dictionaryType) {
});
});
}
console.log('targetArray :>> ', targetArray);
}
})
.catch(() => {})
@ -152,7 +150,8 @@ async function executeCheckedResults(results) {
await provideData();
}
pageLoading.value = false;
Tabmenu.value=results[0].label;//设置第一个菜单
console.log(results,'results');
}
// 页面初始化必要请求
const onLoad = async () => {
@ -161,7 +160,7 @@ const onLoad = async () => {
let data = {
id: $route.query.id,
};
$_InfopriceTemplate(data).then(res => {
$_InfopriceTemplate(data).then(async res => {
console.log(res, '获取详情');
if (res.data.code == 200) {
request.value = res.data.data; //发送回显数据
@ -170,11 +169,12 @@ const onLoad = async () => {
form.value.ServiceType = res.data.data.serviceType.split(',') || []; //服务类型
console.log('form.value.ServiceType :>> ', form.value.ServiceType);
const result = ServiceList.value.filter(item =>
const result = await ServiceList.value.filter(item =>
form.value.ServiceType.includes(item.value)
);
// 激活菜单设置为已经存在的
executeCheckedResults(result);
await executeCheckedResults(result);
Tabmenu.value=result[0].label;//设置第一个菜单
}
});
} else {

Write Preview
Loading…
Cancel
Save