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

修复回显问题

dev-xx
qb 12 months ago
parent
18c367906b
commit
0636ddad33
3 changed files with 106 additions and 92 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. 172
      src/views/financialsector/FinanceHome.vue
  2. 20
      src/views/financialsector/Financialse/FinancialBill.vue
  3. 6
      src/views/financialsector/Financialse/FinancialTrunkLine.vue

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

@ -1,5 +1,5 @@
<template>
<div class="content_box" v-loading='pageLoading'>
<div class="content_box" v-loading="pageLoading">
<div class="header">
<!-- 模板名称 -->
<div class="el_Template">
@ -7,7 +7,6 @@
<el-input v-model="form.TemplateName" style="width: 240px" placeholder="请输入模板名称" />
</div>
<!-- 品牌 -->
<div class="el_Service">
<span class="name">品牌</span>
@ -38,8 +37,9 @@
:popper-append-to-body="false"
style="width: 340px"
multiple
@change="handleChange"
@remove-tag="removeTag"
:loading='ServiceTypeLoading'
:loading="ServiceTypeLoading"
>
<el-option
v-for="item in ServiceList"
@ -47,7 +47,7 @@
:label="item.label"
:value="item.value"
>
<el-checkbox v-model="item.check" @change="isChecked(item)">
<el-checkbox v-model="item.check" @change="() => isChecked(item, true)">
{{ item.label }}
</el-checkbox>
</el-option>
@ -56,16 +56,22 @@
</div>
<!-- 模板内容 -->
<div class="content" >
<div class="content">
<el-tabs type="border-card" v-model="Tabmenu">
<template v-for="item in ServiceList" :key="item.label">
<el-tab-pane :name="item.label" v-if="item.state" :label="item.label">
<span v-if="item.label == '提货'"><FinancialBill @request-data="provideData" :templateData="templateInfo"/></span>
<span v-if="item.label == '干线'"><FinancialTrunkLine @request-data="provideData" :templateData="templateInfo"/></span>
<span v-if="item.label == '提货'"
><FinancialBill @request-data="provideData" :templateData="templateInfo"
/></span>
<span v-if="item.label == '干线'"
><FinancialTrunkLine @request-data="provideData" :templateData="templateInfo"
/></span>
<span v-if="item.label == '仓储'"
><FinancialWarehousing @request-data="provideData" :templateData="templateInfo"
/></span>
<span v-if="item.label == '配送'"><FinancialDelivery @request-data="provideData" :templateData="templateInfo"/></span>
<span v-if="item.label == '配送'"
><FinancialDelivery @request-data="provideData" :templateData="templateInfo"
/></span>
<span v-if="item.label == '安装'">安装</span>
</el-tab-pane>
</template>
@ -75,11 +81,15 @@
</template>
<script setup>
import { ref, defineAsyncComponent,reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
import { ref, defineAsyncComponent, getCurrentInstance } from 'vue';
import { getDictionaryBiz } from '@/api/system/dict'; //字典
import { $_basicdataBrande,$_InfopriceTemplate} from '@/api/financialsector/index'; //价格模板
import { $_basicdataBrande, $_InfopriceTemplate } from '@/api/financialsector/index'; //价格模板
import { ElMessage } from 'element-plus';
const $route = useRoute(); //获取地址栏参数
const pageLoading=ref(true);//页面加载效果
const pageLoading = ref(true); //页面加载效果
// vue实例
const instance = getCurrentInstance();
//仓储模板
const FinancialWarehousing = defineAsyncComponent(() =>
import('@/views/financialsector/Financialse/FinancialWarehousing.vue')
@ -96,85 +106,93 @@ const FinancialTrunkLine = defineAsyncComponent(() =>
const FinancialDelivery = defineAsyncComponent(() =>
import('@/views/financialsector/Financialse/FinancialDelivery.vue')
);
const ServiceTypeLoading=ref(true);//菜单加载
const ServiceTypeLoading = ref(true); //菜单加载
const form = ref({});
const brand=ref([]);//品牌
const brand = ref([]); //品牌
const Tabmenu = ref('仓储');
const request=ref({});//用于保存会显的值
const request = ref({}); //用于保存会显的值
const templateInfo = ref({});
// 菜单列表
const ServiceList = ref([]);
// 字典公共函数
function updateDictionary(targetArray, dictionaryType) {
getDictionaryBiz(dictionaryType).then(res => {
console.log(res, '字典');
if(res.data.code ==200){
if(res.data.data.length){
res.data.data.forEach(item => {
targetArray.push({
value: item.dictKey,
label: item.dictValue,
id:item.id,
});
getDictionaryBiz(dictionaryType)
.then(res => {
console.log(res, '字典');
if (res.data.code == 200) {
if (res.data.data.length) {
res.data.data.forEach(item => {
targetArray.push({
value: item.dictKey,
label: item.dictValue,
id: item.id,
});
});
}
console.log('targetArray :>> ', targetArray);
}
})
.catch(() => {})
.finally(() => {
ServiceTypeLoading.value = false;
});
}
}
}).catch(()=>{
}).finally(()=>{
ServiceTypeLoading.value=false;
});
}
// 循环渲染菜单
async function executeCheckedResults(results) {
async function executeCheckedResults(results) {
for (const res of results) {
await new Promise(resolve => setTimeout(resolve, 500));
await isChecked(res);
await provideData()
await new Promise(resolve => setTimeout(resolve, 500));
await isChecked(res);
await provideData();
}
pageLoading.value=false;
pageLoading.value = false;
}
// 页面初始化必要请求
const onLoad= async()=>{
await updateDictionary(ServiceList.value,'service_type');//菜单加载
if($route.query.id){
let data={
id:$route.query.id
}
$_InfopriceTemplate(data).then(res=>{
console.log(res,'获取详情');
if(res.data.code == 200){
request.value=res.data.data;//发送回显数据
form.value.brand=res.data.data.brandId||'';//品牌
form.value.TemplateName=res.data.data.name||'';//模板名称
form.value.ServiceType= res.data.data.serviceType.split(",")||[];//服务类型
const result = ServiceList.value.filter(item => form.value.ServiceType.includes(item.value));
const onLoad = async () => {
await updateDictionary(ServiceList.value, 'service_type'); //菜单加载
if ($route.query.id) {
let data = {
id: $route.query.id,
};
$_InfopriceTemplate(data).then(res => {
console.log(res, '获取详情');
if (res.data.code == 200) {
request.value = res.data.data; //发送回显数据
form.value.brand = res.data.data.brandId || ''; //品牌
form.value.TemplateName = res.data.data.name || ''; //模板名称
form.value.ServiceType = res.data.data.serviceType.split(',') || []; //服务类型
console.log('form.value.ServiceType :>> ', form.value.ServiceType);
const result = ServiceList.value.filter(item =>
form.value.ServiceType.includes(item.value)
);
// 激活菜单设置为已经存在的
executeCheckedResults(result);
}
})
}else{
pageLoading.value=false
}
let data={
current:1,
size:1000,
});
} else {
pageLoading.value = false;
}
$_basicdataBrande(data).then(res=>{
console.log(res,'品牌');
if(res.data.code == 200){
brand.value=res.data.data
let data = {
current: 1,
size: 1000,
};
$_basicdataBrande(data).then(res => {
console.log(res, '品牌');
if (res.data.code == 200) {
brand.value = res.data.data;
}
})
}
onLoad()
});
};
onLoad();
// 点击菜单
const isChecked = val => {
console.log(val,'val');
const isChecked = (val, isChecked = false) => {
console.log(val, 'val');
//菜单隐藏/显示
val.state = !val.state;
if($route.query.id){
val.check=!val.check;
if ($route.query.id && !isChecked) {
val.check = !val.check;
}
// 激活菜单设置为已经存在的
//设置激活菜单
@ -195,17 +213,23 @@ const removeTag = value => {
};
// 给子页面传递数据
const provideData = (data) => {
console.log(data,'来自子页面的数据');
console.log(form.value,'form.value');
const provideData = data => {
console.log(data, '来自子页面的数据');
console.log(form.value, 'form.value');
templateInfo.value = form.value;
if(data){
templateInfo.value.code=data;//接收来自子页面第一次保存的返回值
if (data) {
templateInfo.value.code = data; //接收来自子页面第一次保存的返回值
}
if($route.query.id){
templateInfo.value.request=request.value;//发送回显数据
if ($route.query.id) {
templateInfo.value.request = request.value; //发送回显数据
}
};
const handleChange = () => {
console.log('instance :>> ', instance);
instance.ctx.$forceUpdate();
};
</script>
<style scoped lang="scss">

20
src/views/financialsector/Financialse/FinancialBill.vue
Unescape View File

@ -173,9 +173,6 @@ const props = defineProps({
templateData: Object,
});
console.log('props.templateData :>> ', props.templateData);
console.log(props, '来自父页面参数');
const instance = getCurrentInstance();
/** 表单实例 */
@ -294,8 +291,6 @@ const goriesloading = ref(false);
/** 计价方式改变时 */
const handleChangePrcieMethod = value => {
console.log('value :>> ', value);
let activeItem: any = {};
for (let i = 0; i < details.lowestType.length; i++) {
const item = details.lowestType[i];
@ -338,12 +333,10 @@ const handleTrunkLinePricingType = response => {
};
if (!props.templateData.request) {
console.log('123123 :>> ', 123123);
_billTemplateDetailArr.push(_itemObj);
continue;
}
console.log('222 :>> ', 222);
const _arr = [];
// 按件
@ -418,13 +411,11 @@ const handleTrunkLinePricingType = response => {
}
}
console.log('_billTemplateDetailArr :>> ', _billTemplateDetailArr);
details.form.billTemplateDetail = _billTemplateDetailArr;
};
/** 处理最低计费价格 */
const handleLowestPrice = response => {
console.log('response :>> ', response);
const { code, data } = response.data;
if (code !== 200) return;
@ -448,20 +439,19 @@ const initDictionaryBiz = async () => {
const [trunkLineResult, minCostResult] = await Promise.all([trunkLinePromise, minCostPromise]);
await nextTick();
console.log('props.templateData.request :>> ', props.templateData.request);
if (Object.keys(props.templateData).length !== 0) {
details.form = props.templateData.request;
details.form = deepClone(props.templateData.request);
details.form.pickupPricingType = details.form.pickupPricingType.split(',');
details.form.pickupPricingType = details.form.pickupPricingType
? details.form.pickupPricingType.split(',')
: [];
details.form.pickupIsByCategory += '';
details.form.pickupMinCostType += '';
details.form.pickupIsUnifyAreaBill += '';
details.form.pickupIsMinCost += '';
}
console.log('details.form :>> ', details.form);
// 处理干线
handleTrunkLinePricingType(trunkLineResult);
handleLowestPrice(minCostResult);
@ -496,7 +486,6 @@ const handlePlus = async (value: any, index: number) => {
await nextTick();
instance.ctx.$refs[value.title + (index + 1)][0].focus();
console.log('instance :>> ', instance.ctx);
};
/** 删除品类 */
@ -567,7 +556,6 @@ const handleSubmit = async () => {
formRef.value.validate(async valid => {
if (!valid) return;
await emit('request-data'); //通知父页面传递数据
console.log(props, 'props');
if (!props.templateData.TemplateName) {
ElMessage({
message: '请输入模板名称',

6
src/views/financialsector/Financialse/FinancialTrunkLine.vue
Unescape View File

@ -468,9 +468,11 @@ const initDictionaryBiz = async () => {
console.log('props.templateData.request :>> ', props.templateData.request);
if (Object.keys(props.templateData).length !== 0) {
details.form = props.templateData.request;
details.form = deepClone(props.templateData.request);
details.form.trunklinePricingType = details.form.trunklinePricingType.split(',');
details.form.trunklinePricingType = details.form.trunklinePricingType
? details.form.trunklinePricingType.split(',')
: [];
details.form.trunklineIsUnifyAreaBill += '';
details.form.trunklineIsByCategory += '';
details.form.trunklineIsPeculiarSetup += '';

Write Preview
Loading…
Cancel
Save