Browse Source

修复已知bug

dev-xx
马远东 6 months ago
parent
commit
7e9b5b2879
  1. 44
      src/views/basicdata/driverArtery/basicdataDriverArtery.vue
  2. 8
      src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue

44
src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@ -160,6 +160,7 @@ export default {
search: false,
query: {},
columnList: deepClone(columnList),
dataType:[],
data: [],
drawerShow: false,
page: {
@ -250,20 +251,52 @@ export default {
for (let _index = 0; _index < _value.checkarr.length; _index++) {
const item = _value.checkarr[_index];
if (Number(value[_prop]) !== Number(item.value)) continue;
value[_value.prop] = item.label;
break;
}
}
//
value.warehouseNames = value.warehouses.map(val => val.warehouseName).join(',');
}
if(!this.dataType.length){
let BizData=[]
BizData = await getDictionaryBiz('basic_driverjob_type');
if(BizData.data.code ==200 && BizData.data.data.length){
this.dataType= await BizData.data.data.map(res=>{
return{
label:res.dictValue,
value:res.dictKey
}
})
}
}
this.data.forEach(items => {
let aValues;
// items.jobType
if (typeof items.jobType === 'string') {
if (items.jobType.split(',').length > 1) {
// jobType
aValues = items.jobType.split(',').map(value => value.trim());
} else {
//
aValues = [items.jobType.trim()];
}
} else {
// items.jobType
aValues = [];
}
// aValues label
items.jobTypeName = this.dataType
.filter(item => aValues.includes(item.value)) //
.map(item => item.label) // label
.join(','); // label
});
console.log('this.data :>> ', this.data);
//
this.getVehiclede();
//
// this.getVehiclede();
} catch (error) {
console.log('error :>> ', error);
} finally {
@ -484,6 +517,7 @@ export default {
}
value.checkarr = _data;
}
}
console.log('res :>> ', res);
} catch (error) {

8
src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue

@ -644,7 +644,7 @@ export default {
this.form = {
..._data,
};
this.form.jobType= this.form.jobTypeString
this.form.bindVehicles = _data.bindVehicles && _data.bindVehicles.split(',');
this.form.warehouseIds = _data.warehouses.map(val => val.warehouseId);
console.log('_data :>> ', _data);
@ -657,7 +657,8 @@ export default {
const submitData = { ...this.form };
submitData.bindVehicles = this.form.bindVehicles && this.form.bindVehicles.join(',');
submitData.phone = this.form.phone.trim();
submitData.jobType = submitData.jobType.join(',')
const res = await add(submitData);
const { code, msg } = res.data;
if (code !== 200) return;
@ -670,6 +671,7 @@ export default {
type: 'warning',
})
.then(() => {
submitData.jobType=[]
this.$refs.formRef.resetFields();
})
.catch(() => this.back());
@ -687,7 +689,7 @@ export default {
const submitData = { ...this.form };
submitData.bindVehicles = this.form.bindVehicles && this.form.bindVehicles.join(',');
submitData.phone = this.form.phone.trim();
submitData.jobType = submitData.jobType.join(',')
const res = await update(submitData);
const { code, msg } = res.data;
if (code !== 200) return;

Loading…
Cancel
Save