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

基础价格列表优化

pre-production
马远东 1 year ago
parent
84a15d6a29
commit
6087b471c8
4 changed files with 170 additions and 140 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. 44
      src/views/aftersales/aftersalesWorkOrder.vue
  2. 241
      src/views/basicdata/brand/basicdataFreight.vue
  3. 21
      src/views/basicdata/brand/basicdataFreightFrom.vue
  4. 4
      vite.config.js

44
src/views/aftersales/aftersalesWorkOrder.vue
Unescape View File

@ -181,9 +181,9 @@
>批量删除</el-button
> -->
<el-button v-if="ButtonPermissions.appeal" type="primary" @click="appeal"
>申诉</el-button
>
<!-- <el-button v-if="ButtonPermissions.appeal" type="primary" @click="appealAll"
>批量申诉</el-button
> -->
<!-- 财务入账 -->
<el-button
type="primary"
@ -1671,6 +1671,7 @@ const TransportLossNode = ref([
]);
const Statusprocessing = val => {
console.log(val,'状态处理的值');
val.forEach(item => {
// 对为null的数据进行处理
// for (const property in item) {
@ -1694,6 +1695,7 @@ const Statusprocessing = val => {
// 提货环节下拉赋值
if (item.discoveryNode == 1) {
item.discoveryNodeNameS = columnList[3].checkarr[0].label; //提货环节
} else if (item.discoveryNode == 2) {
item.discoveryNodeNameS = columnList[3].checkarr[1].label; //发货环节
} else if (item.discoveryNode == 3) {
@ -1709,6 +1711,8 @@ const Statusprocessing = val => {
} else if (item.discoveryNode == 8) {
item.discoveryNodeNameS = columnList[3].checkarr[7].label; //安装环节
}
if (item.workOrderStatus == 10) {
item.workOrderStatusNameS = columnList[10].checkarr[0].label; //待处理
} else if (item.workOrderStatus == 20) {
@ -1729,11 +1733,12 @@ const Statusprocessing = val => {
item.workOrderStatusNameS = columnList[10].checkarr[8].label; //理赔金未出
} else if (item.workOrderStatus == 21) {
item.workOrderStatusNameS = columnList[10].checkarr[9].label; //处理结果已提交
} else if (item.workOrderStatus == 100) {
item.workOrderStatusNameS = columnList[10].checkarr[10].label; //已结束
} else if (item.workOrderStatus == 110) {
item.workOrderStatusNameS = columnList[10].checkarr[11].label; //已结束
}
// } else if (item.workOrderStatus == 100) {
// item.workOrderStatusNameS = columnList[10].checkarr[10].label; //申诉中
// } else if (item.workOrderStatus == 110) {
// item.workOrderStatusNameS = columnList[10].checkarr[11].label; //已结束
// }
});
};
// 页面初始化数据
@ -1803,21 +1808,18 @@ const IndexTable = (val, Refresh) => {
details.loadingObj.list = false; //关闭动画加载
if (res.data.data) {
console.log(res.data.data, '初始化返回值===>');
console.log(res.data.data.records.length, 'res.data.data.records');
console.log(TabList.value, 'TabList.value===>');
// page.value.total = res.data.data.total; //总页数
if (res.data.data.records.length) {
Statusprocessing(res.data.data.records);
console.log(res.data.data.records, 'res.data.data.records有值');
TabList.value.find(res => res.name == TabPermissions.value).DataList =
res.data.data.records;
TabList.value.find(res => res.name == TabPermissions.value).DataList =res.data.data.records;
TabList.value.find(res => res.name == TabPermissions.value).total = res.data.data.total;
TabList.value.find(res => res.name == TabPermissions.value).request = false;
console.log(TabList.value, '当前存储的值');
// details.data = res.data.data.records;
details.data = TabList.value.find(res => res.name == TabPermissions.value).DataList;
page.value.total = TabList.value.find(res => res.name == TabPermissions.value).total;
console.log(TabList.value, 'TabList.value===>');
Statusprocessing(res.data.data.records);
} else {
TabList.value.find(res => res.name == TabPermissions.value).DataList = [];
TabList.value.find(res => res.name == TabPermissions.value).total = 0;
@ -2257,14 +2259,14 @@ const CancelappealFn = val => {
// 工单申诉按钮
const appeal = (val, state) => {
console.log(state,'state');
AppealAttachment.value = []; //清空图片
Appealselection.value = ''; //清空责任人
Reasonforappeal.value = ''; //清空申诉内容
console.log(state);
console.log(val.row, '申诉当前点击的按钮');
console.log(val, '申诉当前点击的按钮');
if (state == 'edit') {
// 当前是编辑申诉
details.selectionList.push(val.row);
AppealeditorState.value = true; //开启申诉编辑状态
if (val.row) {
@ -2295,13 +2297,19 @@ const appeal = (val, state) => {
}
if (!state) {
console.log('当前是申诉');
// 单条申诉
AppealeditorState.value = false; //开启申诉编辑状态
if (val.row) {
details.selectionList.push(val.row);
}
dialogappeal.value = true; //展开申诉弹窗
} else {
}
};
// 批量申诉
const appealAll=()=>{
// 批量申诉
console.log(details.selectionList, 'details.selectionList');
if (!details.selectionList.length) {
@ -2319,8 +2327,7 @@ const appeal = (val, state) => {
return;
}
dialogappeal.value = true; //展开申诉弹窗
}
};
}
// 确定理赔金额
const DetermineClaims = val => {
console.log(val.row);
@ -2466,6 +2473,7 @@ const Appealbutton = state => {
message: res.data.msg,
type: 'success',
});
DataRendering(TabPermissions.value, details.query, true);
}
})
.finally(res => {

241
src/views/basicdata/brand/basicdataFreight.vue
Unescape View File

@ -348,36 +348,36 @@ export default {
hide: true,
width: 'fit-content',
},
// {
// label: '计算方式', //;1件 2方 3公斤
// prop: 'formulaMode',
// type: 'select',
// dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_freight_formulamode',
// width: '100px',
// span: 12,
// props: {
// label: 'dictValue',
// value: 'dictKey',
// },
// search: true,
// rules: [
// {
// required: true,
// message: '请选择计算方式',
// trigger: 'blur',
// },
// ],
// },
{
label: '计算方式', //;1件 2方 3公斤
prop: 'formulaMode',
type: 'select',
dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_freight_formulamode',
width: '100px',
span: 12,
props: {
label: 'dictValue',
value: 'dictKey',
},
search: true,
rules: [
{
required: true,
message: '请选择计算方式',
trigger: 'blur',
},
],
},
{
label: '物品名称',
prop: 'itemName',
label: '客户名称',
prop: 'name',
type: 'input',
width: '150px',
span: 12,
rules: [
{
required: true,
message: '请填写物品名称',
message: '请填写客户名称',
trigger: 'blur',
},
],
@ -432,57 +432,57 @@ export default {
//
// },
{
label: '门店',
prop: 'shop',
type: 'select',
search: false,
dicData: [],
disabled: true,
},
// {
// label: '门店',
// prop: 'shop',
// type: 'select',
// search: false,
// dicData: [],
// disabled: true,
// },
{
label: '品牌',
prop: 'brand',
prop: 'brandName',
type: 'select',
search: false,
dicData: [],
disabled: true,
},
{
label: '服务类型', //;1 干 2干仓 3干仓配 4干配
prop: 'typeService',
type: 'select',
width: '150px',
span: 12,
dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_freight_type',
props: {
label: 'dictValue',
value: 'dictKey',
},
search: true,
rules: [
{
required: true,
message: '请选择服务类型',
trigger: 'blur',
},
],
},
// {
// label: '服务类型', //;1 干 2干仓 3干仓配 4干配
// prop: 'typeService',
// type: 'select',
// width: '150px',
// span: 12,
// dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_freight_type',
// props: {
// label: 'dictValue',
// value: 'dictKey',
// },
// search: true,
// rules: [
// {
// required: true,
// message: '请选择服务类型',
// trigger: 'blur',
// },
// ],
// },
{
label: '一级品类',
prop: 'firstClassCategory',
type: 'input',
width: '150px',
span: 12,
rules: [
{
required: true,
message: '请填写一级品类',
trigger: 'blur',
},
],
},
// {
// label: '一级品类',
// prop: 'firstClassCategory',
// type: 'input',
// width: '150px',
// span: 12,
// rules: [
// {
// required: true,
// message: '请填写一级品类',
// trigger: 'blur',
// },
// ],
// },
{
label: '一口价',
prop: 'fixedPrice',
@ -541,40 +541,40 @@ export default {
// type: "input",
//
// },
{
label: '时间段', //;1 0-30天 2 0-60天 3 60天以上
prop: 'warehousingTimeCharge',
type: 'select',
width: '150px',
span: 12,
dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_freight_timecharge',
props: {
label: 'dictValue',
value: 'dictKey',
},
search: true,
rules: [
{
required: true,
message: '请选择时间段',
trigger: 'blur',
},
],
},
{
label: '时间段费用',
prop: 'warehousingTimeStatus',
type: 'input',
width: '150px',
span: 12,
rules: [
{
required: true,
message: '请填写时间段费用',
trigger: 'blur',
},
],
},
// {
// label: '时间段', //;1 0-30天 2 0-60天 3 60天以上
// prop: 'warehousingTimeCharge',
// type: 'select',
// width: '150px',
// span: 12,
// dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_freight_timecharge',
// props: {
// label: 'dictValue',
// value: 'dictKey',
// },
// search: true,
// rules: [
// {
// required: true,
// message: '请选择时间段',
// trigger: 'blur',
// },
// ],
// },
// {
// label: '时间段费用',
// prop: 'warehousingTimeStatus',
// type: 'input',
// width: '150px',
// span: 12,
// rules: [
// {
// required: true,
// message: '请填写时间段费用',
// trigger: 'blur',
// },
// ],
// },
],
},
data: [],
@ -788,12 +788,14 @@ export default {
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 => {
this.form.fixedPrice == 0 ? '否' : this.form.fixedPrice == 1 ? '是' : '暂无';
this.formInfo.categoryName = this.form.categoryName?this.form.categoryName:'暂无'; //品类
this.formInfo.effectiveTime = this.form.effectiveTime?this.form.effectiveTime:'暂无'; //生效时间
this.formInfo.expirationTime = this.form.expirationTime?this.form.expirationTime:'暂无'; //截止时间
this.formInfo.brand=this.form.brandName?this.form.brandName:'暂无'; //品牌
this.formInfo.details = res.data.data.details?res.data.data.details.map(res => res.typeName).join(','):'未选择'; //服务类型
if(res.data.data.details){
res.data.data.details.forEach(res => {
if (res.typeName == '干线') {
this.groundlineInfo.push(res);
} else if (res.typeName == '仓库') {
@ -802,6 +804,8 @@ export default {
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');
@ -810,16 +814,17 @@ export default {
}).then(res => {
this.formInfo.clientName = res.data.data.clientName;
console.log(res, '客户名称');
this.Formloading=false;
});
// 查询品牌
$_brand({
brandId: this.form.brand,
id: this.form.itemName,
}).then(res => {
console.log(res, '品牌');
this.formInfo.brand = res.data.data.brandName;
});
this.Formloading=false;
// $_brand({
// brandId: this.form.brand,
// id: this.form.itemName,
// }).then(res => {
// console.log(res, '品牌');
// this.formInfo.brand = res.data.data.brandName;
// });
return;
$_category({
id: this.form.category,
@ -903,6 +908,14 @@ export default {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.data.forEach(res=>{
res.fixedPrice
if(res.fixedPrice==0){
res.fixedPrice='否'
}else if(res.fixedPrice==1)(
res.fixedPrice='是'
)
})
this.loading = false;
this.selectionClear();
});

21
src/views/basicdata/brand/basicdataFreightFrom.vue
Unescape View File

@ -50,8 +50,8 @@
<el-col :span="10" v-if="eachRide">
<el-form-item label="一口价" prop="goalGranary">
<el-select style="width: 100%" clearable v-model="form.fixedPrice" @change="choice">
<el-option label="是" value="2"> 是 </el-option>
<el-option label="否" value="1"> 否 </el-option>
<el-option label="是" value="1"> 是 </el-option>
<el-option label="否" value="0"> 否 </el-option>
</el-select>
</el-form-item>
</el-col>
@ -314,6 +314,8 @@ export default {
DryWarehouseDistributionAID: '', //干线ID
DryWarehouseDistributionBID: '', //仓库ID
DryWarehouseDistributionCID: '', //配送ID
CustomerName:[],//客户名称
brandList:[],//品牌集合
clientOptions: [], //客户集合
categoryData:[],//品类数据
categoryDataID:[],//品类数据的ID
@ -505,8 +507,11 @@ export default {
}).filter(item => item !== null); // 过滤掉任何未匹配的值（null）
console.log(matchedData,'筛选出来的值');
this.form.categoryName = matchedData.map(res=>res.name).join(',')
this.form.name = this.CustomerName.find(res=>res.id==this.form.clientIds).clientName;//客户名称
this.form.brandName= this.brandList.find(res=>res.brandId==this.form.brand).brandName;//品牌名称
console.log('提交的数据》》》', this.form);
// return
add(this.form).then(() => {
this.$store.commit('DEL_TAG_CURRENT'); //关闭当前页面
this.$router.push('/basicdata/brand/basicdataFreight'); //添加成功跳转到列表
@ -584,7 +589,7 @@ export default {
choice(a) {
//一口价选择
console.log(a);
if (a == '2') {
if (a == '1') {
this.buyNow = false;
} else {
this.buyNow = true;
@ -593,7 +598,7 @@ export default {
choiceRide(a) {
//一口价选择
console.log(a);
if (a == '2') {
if (a == '1') {
this.eachRide = false;
} else {
this.eachRide = true;
@ -614,6 +619,7 @@ export default {
ids: this.form.clientIds,
});
console.log('>>>>>>>>>>', a.data.data);
this.brandList = a.data.data;
this.options = a.data.data.filter(item => {
return item.brandName.toLowerCase().includes(query.toLowerCase());
});
@ -634,7 +640,10 @@ export default {
let a = await selectName(this.page.currentPage, this.page.pageSize, {
clientName: query,
});
console.log('>>>>>>>>>>', a.data.data.records);
console.log('>>>>>>>>>>客户名称', a.data.data.records);
this.CustomerName=a.data.data.records
console.log(this.CustomerName,'当前客户');
console.log(this.form.clientIds,'当前选中客户');
this.clientOptions = a.data.data.records.filter(item => {
return item.clientName.toLowerCase().includes(query.toLowerCase());
});

4
vite.config.js
Unescape View File

@ -25,7 +25,7 @@ export default ({ mode, command }) => {
// 新zyc
// target: 'http://192.168.6.116:8777',
// target: 'http://192.168.6.122:8777',
target: 'http://192.168.3.14:13000',
// target: 'http://192.168.3.14:13000',
// target: 'http://192.168.10.25:2888',
// target: 'http://192.168.6.161:9777',//CY
// target: 'http://192.168.10.57:13000',
@ -33,7 +33,7 @@ export default ({ mode, command }) => {
// target: 'http://192.168.10.29:13000',
// target: 'http://192.168.3.5:13000',//？
// target: 'http://h5uapi.huitongys.com',
// target: 'http://test.api.huo5you.com',
target: 'http://test.api.huo5you.com',
changeOrigin: true,
rewrite: path => path.replace(/^\/api/, ''),
},

Write Preview
Loading…
Cancel
Save