|
|
|
|
@ -51,14 +51,116 @@
|
|
|
|
|
<!-- @click="$refs.crud.rowAdd()">新增</el-button>--> |
|
|
|
|
<!-- </template>--> |
|
|
|
|
</avue-crud> |
|
|
|
|
<el-dialog v-model="Detailspop" title="详情" width="60%"> |
|
|
|
|
<el-form |
|
|
|
|
v-loading="Formloading" |
|
|
|
|
class="el_formInfo" |
|
|
|
|
:model="formInfo" |
|
|
|
|
label-width="300px" |
|
|
|
|
style="width: 100%" |
|
|
|
|
disabled |
|
|
|
|
> |
|
|
|
|
<div class="el_box_1"> |
|
|
|
|
<el-form-item label="客户名称"> |
|
|
|
|
<el-input v-model="formInfo.clientName" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="品牌名称"> |
|
|
|
|
<el-input v-model="formInfo.brand" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="一口价"> |
|
|
|
|
<el-input v-model="formInfo.fixedPrice" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="品类"> |
|
|
|
|
<el-input v-model="formInfo.categoryName" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</div> |
|
|
|
|
<div class="el_box_2"> |
|
|
|
|
<el-form-item label="生效时间"> |
|
|
|
|
<el-input v-model="formInfo.effectiveTime" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="截止时间"> |
|
|
|
|
<el-input v-model="formInfo.expirationTime" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="服务类型"> |
|
|
|
|
<el-input v-model="formInfo.details" /> |
|
|
|
|
</el-form-item> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<el-tabs type="border-card"> |
|
|
|
|
<el-tab-pane label="干线"> |
|
|
|
|
<div class="el_groundline" v-for="item in groundlineZd" :key="item.dictKey"> |
|
|
|
|
<div class="checkbox checked" v-if="item.cost !=null"></div> |
|
|
|
|
<el-form-item :label="item.label + '金额'"> |
|
|
|
|
<el-input :value="item.cost ? item.cost : '暂无'" disabled/> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="单位"> |
|
|
|
|
<el-input :value="item.formulaModeName ? item.formulaModeName : '暂无'" disabled/> |
|
|
|
|
</el-form-item> |
|
|
|
|
</div> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
<el-tab-pane label="仓库"> |
|
|
|
|
<div class="el_groundline_box"> |
|
|
|
|
<div class="el_groundline" v-for="item in warehouseZd" :key="item.dictKey"> |
|
|
|
|
<div class="checkbox checked" v-if="item.cost !=null"></div> |
|
|
|
|
<el-form-item :label="item.label + '金额'"> |
|
|
|
|
<el-input :value="item.cost ? item.cost : '暂无'" disabled/> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="单位"> |
|
|
|
|
<el-input :value="item.formulaModeName ? item.formulaModeName : '暂无'" disabled/> |
|
|
|
|
</el-form-item> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
<el-tab-pane label="配送"> |
|
|
|
|
<div class="el_groundline_box"> |
|
|
|
|
<div class="el_groundline" v-for="item in DeliveryZd" :key="item.dictKey"> |
|
|
|
|
<div class="checkbox checked" v-if="item.cost !=null"></div> |
|
|
|
|
<el-form-item :label="item.label + '金额'"> |
|
|
|
|
<el-input :value="item.cost ? item.cost : '暂无'" disabled/> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="单位"> |
|
|
|
|
<el-input :value="item.formulaModeName ? item.formulaModeName : '暂无'" disabled/> |
|
|
|
|
</el-form-item> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</el-tab-pane> |
|
|
|
|
</el-tabs> |
|
|
|
|
</el-form> |
|
|
|
|
<template #footer> |
|
|
|
|
<div class="dialog-footer"> |
|
|
|
|
<el-button @click="Detailspop = false">关闭</el-button> |
|
|
|
|
<!-- <el-button type="primary" @click="DetailspopFn"> |
|
|
|
|
确定 |
|
|
|
|
</el-button> --> |
|
|
|
|
</div> |
|
|
|
|
</template> |
|
|
|
|
</el-dialog> |
|
|
|
|
</basic-container> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { getList, getDetail, add, update, remove } from '@/api/basicdata/basicdataFreight'; |
|
|
|
|
import { |
|
|
|
|
getList, |
|
|
|
|
getDetail, |
|
|
|
|
add, |
|
|
|
|
update, |
|
|
|
|
remove, |
|
|
|
|
$_QueryUserName, |
|
|
|
|
$_brand, |
|
|
|
|
$_category, |
|
|
|
|
$_getDeptLazyTree, |
|
|
|
|
} from '@/api/basicdata/basicdataFreight'; |
|
|
|
|
// import option from "@/option/basicdata/basicdataFreight"; |
|
|
|
|
import { mapGetters } from 'vuex'; |
|
|
|
|
import { exportBlob } from '@/api/common'; |
|
|
|
|
import { getDictionaryBiz } from '@/api/system/dict'; //字典 |
|
|
|
|
import { getToken } from '@/utils/auth'; |
|
|
|
|
import { downloadXls } from '@/utils/util'; |
|
|
|
|
import { dateNow } from '@/utils/date'; |
|
|
|
|
@ -72,6 +174,15 @@ export default {
|
|
|
|
|
query: {}, |
|
|
|
|
search: {}, |
|
|
|
|
loading: true, |
|
|
|
|
Detailspop: false, |
|
|
|
|
Formloading:false, |
|
|
|
|
formInfo: {}, //详情弹窗表格 |
|
|
|
|
groundlineZd: [], //干线 |
|
|
|
|
warehouseZd: [], //仓库 |
|
|
|
|
DeliveryZd: [], //配送 |
|
|
|
|
groundlineInfo: [], //干线 |
|
|
|
|
warehouseInfo: [], //仓库 |
|
|
|
|
DeliveryInfo: [], //配送 |
|
|
|
|
page: { |
|
|
|
|
pageSize: 30, |
|
|
|
|
currentPage: 1, |
|
|
|
|
@ -469,7 +580,52 @@ export default {
|
|
|
|
|
data: [], |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
created() {}, |
|
|
|
|
created() { |
|
|
|
|
// 字典公共函数 |
|
|
|
|
// updateDictionary(targetArray, dictionaryType) { |
|
|
|
|
// getDictionaryBiz(dictionaryType).then(res => { |
|
|
|
|
// console.log(res, '字典'); |
|
|
|
|
// res.data.data.forEach(item => { |
|
|
|
|
// targetArray.push({ |
|
|
|
|
// value: item.dictKey, |
|
|
|
|
// label: item.dictValue, |
|
|
|
|
// }); |
|
|
|
|
// }); |
|
|
|
|
// }); |
|
|
|
|
// }; |
|
|
|
|
// groundlineZd:[],//干线 |
|
|
|
|
// warehouseZd:[],//仓库 |
|
|
|
|
// DeliveryZd:[],//配送 |
|
|
|
|
|
|
|
|
|
getDictionaryBiz('artery').then(res => { |
|
|
|
|
console.log(res, '干线字典'); |
|
|
|
|
res.data.data.forEach(item => { |
|
|
|
|
this.groundlineZd.push({ |
|
|
|
|
value: item.dictKey, |
|
|
|
|
label: item.dictValue, |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
getDictionaryBiz('entrepot').then(res => { |
|
|
|
|
console.log(res, '仓库字典'); |
|
|
|
|
res.data.data.forEach(item => { |
|
|
|
|
this.warehouseZd.push({ |
|
|
|
|
value: item.dictKey, |
|
|
|
|
label: item.dictValue, |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
getDictionaryBiz('delivery').then(res => { |
|
|
|
|
console.log(res, '配送字典'); |
|
|
|
|
res.data.data.forEach(item => { |
|
|
|
|
this.DeliveryZd.push({ |
|
|
|
|
value: item.dictKey, |
|
|
|
|
label: item.dictValue, |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
computed: { |
|
|
|
|
...mapGetters(['permission']), |
|
|
|
|
permissionList() { |
|
|
|
|
@ -611,14 +767,85 @@ export default {
|
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
enrichDictionaryWithCosts(dictionary, dataArray, itemNameField) { |
|
|
|
|
dictionary.forEach(dictItem => { |
|
|
|
|
console.log(dictItem,'dictItem'); |
|
|
|
|
dataArray.forEach(dataItem => { |
|
|
|
|
if (dictItem.label === dataItem[itemNameField]) { |
|
|
|
|
dictItem.formulaModeName = dataItem.formulaModeName; |
|
|
|
|
dictItem.cost = dataItem.cost; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
// 查看按钮 |
|
|
|
|
beforeOpen(done, type) { |
|
|
|
|
this.Detailspop = true; //开启弹窗 |
|
|
|
|
this.Formloading=true |
|
|
|
|
this.formInfo={} |
|
|
|
|
getDetail(this.form.id).then(res => { |
|
|
|
|
console.log(res, 'res'); |
|
|
|
|
this.form = res.data.data; |
|
|
|
|
this.formInfo.fixedPrice = |
|
|
|
|
this.form.fixedPrice == 1 ? '否' : this.form.fixedPrice == 2 ? '是' : '暂无'; |
|
|
|
|
this.formInfo.categoryName = this.form.categoryName; //品类 |
|
|
|
|
this.formInfo.effectiveTime = this.form.effectiveTime; //生效时间 |
|
|
|
|
this.formInfo.expirationTime = this.form.expirationTime; //截止时间 |
|
|
|
|
this.formInfo.details = res.data.data.details.map(res => res.typeName).join(','); //服务类型 |
|
|
|
|
res.data.data.details.forEach(res => { |
|
|
|
|
if (res.typeName == '干线') { |
|
|
|
|
this.groundlineInfo.push(res); |
|
|
|
|
} else if (res.typeName == '仓库') { |
|
|
|
|
this.warehouseInfo.push(res); |
|
|
|
|
} else if (res.typeName == '配送') { |
|
|
|
|
this.DeliveryInfo.push(res); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.enrichDictionaryWithCosts( this.groundlineZd,this.groundlineInfo, 'itemName'); |
|
|
|
|
this.enrichDictionaryWithCosts( this.DeliveryZd, this.DeliveryInfo,'itemName'); |
|
|
|
|
this.enrichDictionaryWithCosts(this.warehouseZd,this.warehouseInfo, 'itemName'); |
|
|
|
|
$_QueryUserName({ |
|
|
|
|
id: res.data.data.itemName, |
|
|
|
|
}).then(res => { |
|
|
|
|
this.formInfo.clientName = res.data.data.clientName; |
|
|
|
|
console.log(res, '客户名称'); |
|
|
|
|
}); |
|
|
|
|
// 查询品牌 |
|
|
|
|
$_brand({ |
|
|
|
|
brandId: this.form.brand, |
|
|
|
|
id: this.form.itemName, |
|
|
|
|
}).then(res => { |
|
|
|
|
console.log(res, '品牌'); |
|
|
|
|
this.formInfo.brand = res.data.data.brandName; |
|
|
|
|
}); |
|
|
|
|
this.Formloading=false; |
|
|
|
|
return; |
|
|
|
|
$_category({ |
|
|
|
|
id: this.form.category, |
|
|
|
|
}).then(res => { |
|
|
|
|
console.log(res, '品类'); |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
return; |
|
|
|
|
if (['edit', 'view'].includes(type)) { |
|
|
|
|
getDetail(this.form.id).then(res => { |
|
|
|
|
this.form = res.data.data; |
|
|
|
|
$_QueryUserName({ |
|
|
|
|
id: res.data.data.itemName, |
|
|
|
|
}).then(res => { |
|
|
|
|
this.formInfo.clientName = res.data.data.clientName; |
|
|
|
|
console.log(res, '客户名称'); |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
done(); |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
searchReset() { |
|
|
|
|
this.query = {}; |
|
|
|
|
this.onLoad(this.page); |
|
|
|
|
@ -684,27 +911,73 @@ export default {
|
|
|
|
|
}; |
|
|
|
|
</script> |
|
|
|
|
|
|
|
|
|
<style scoped lang='scss'> |
|
|
|
|
:deep(.el-form-item__content){ |
|
|
|
|
<style scoped lang="scss"> |
|
|
|
|
:deep(.el-form-item__content) { |
|
|
|
|
} |
|
|
|
|
:deep(.avue-form__row){ |
|
|
|
|
margin-left:10px; |
|
|
|
|
max-width:300px!important; |
|
|
|
|
:deep(.avue-form__row) { |
|
|
|
|
margin-left: 10px; |
|
|
|
|
max-width: 300px !important; |
|
|
|
|
} |
|
|
|
|
:deep(.no-print){ |
|
|
|
|
margin-left:auto; |
|
|
|
|
:deep(.no-print) { |
|
|
|
|
margin-left: auto; |
|
|
|
|
} |
|
|
|
|
:deep(.avue-form__row){ |
|
|
|
|
margin-left:0; |
|
|
|
|
:deep(.avue-form__row) { |
|
|
|
|
margin-left: 0; |
|
|
|
|
} |
|
|
|
|
:deep(.el-form-item__label){ |
|
|
|
|
padding-left:0; |
|
|
|
|
width:auto !important; |
|
|
|
|
:deep(.el-form-item__label) { |
|
|
|
|
padding-left: 0; |
|
|
|
|
width: auto !important; |
|
|
|
|
} |
|
|
|
|
:deep(.no-print){ |
|
|
|
|
.el-button{ |
|
|
|
|
margin-right:0 |
|
|
|
|
:deep(.no-print) { |
|
|
|
|
.el-button { |
|
|
|
|
margin-right: 0; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.el_formInfo { |
|
|
|
|
display: flex; |
|
|
|
|
flex-direction: column; |
|
|
|
|
.el_box_1, |
|
|
|
|
.el_box_2 { |
|
|
|
|
display: flex; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.el_groundline { |
|
|
|
|
display: flex; |
|
|
|
|
} |
|
|
|
|
.el_groundline_box{ |
|
|
|
|
display: flex; |
|
|
|
|
flex-wrap: wrap; |
|
|
|
|
.el_groundline{ |
|
|
|
|
width: 50%; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
.checkbox { |
|
|
|
|
position: relative; |
|
|
|
|
display: inline-block; |
|
|
|
|
width: 20px; |
|
|
|
|
height: 15px; |
|
|
|
|
border: 1px solid orange; |
|
|
|
|
margin-top: 8px; |
|
|
|
|
cursor: pointer; |
|
|
|
|
border-radius: 2px; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
.checkbox::after { |
|
|
|
|
content: ''; |
|
|
|
|
position: absolute; |
|
|
|
|
top: 40%; |
|
|
|
|
left: 34%; |
|
|
|
|
width: 5px; |
|
|
|
|
height: 10px; |
|
|
|
|
border-style: solid; |
|
|
|
|
border-color: orange; |
|
|
|
|
border-width: 0 2px 2px 0; |
|
|
|
|
transform: translateY(-50%) rotate(45deg); |
|
|
|
|
opacity: 0; /* 初始时勾隐藏 */ |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
.checkbox.checked::after{ |
|
|
|
|
opacity: 1; /* 勾显示 */ |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
