别名,修改成永久显示

This commit is contained in:
ljx 2024-05-16 15:12:52 +08:00
parent 207dd06b49
commit e79fb2bc7a
2 changed files with 103 additions and 76 deletions

View File

@ -189,7 +189,6 @@ export default {
this.actionParams = params.actionParams; this.actionParams = params.actionParams;
} }
} }
if (params.dataType == "string") { if (params.dataType == "string") {
this.textboxValue = this.value || ""; this.textboxValue = this.value || "";
} else if (params.dataType == "object") { } else if (params.dataType == "object") {
@ -219,8 +218,6 @@ export default {
getData(key) { // getData(key) { //
var params = JSON.parse(JSON.stringify(this.params.actionParams || {})) var params = JSON.parse(JSON.stringify(this.params.actionParams || {}))
params.page = this.tablePage.currentPage; // params.page = this.tablePage.currentPage; //
params.limit = this.tablePage.pageSize; // params.limit = this.tablePage.pageSize; //
params.order_bys = params.order_bys || []; // params.order_bys = params.order_bys || []; //
@ -228,6 +225,7 @@ export default {
if (key) { if (key) {
key = this.$mk.trim(key); key = this.$mk.trim(key);
} }
if (key) { if (key) {
for (let i = 0; i < this.searchFieldNames.length; i++) { for (let i = 0; i < this.searchFieldNames.length; i++) {
let field = this.searchFieldNames[i]; let field = this.searchFieldNames[i];
@ -333,7 +331,9 @@ export default {
return false; return false;
} }
const cellValue = this.textboxValue; const cellValue = this.textboxValue;
console.log('+++',cellValue)
if (!cellValue) { if (!cellValue) {
console.log('---',cellValue)
if (params.dataType == "string") { if (params.dataType == "string") {
this.$emit('input', ""); this.$emit('input', "");
if (params.onDataChanged) { if (params.onDataChanged) {
@ -353,6 +353,7 @@ export default {
} }
console.log(cellValue,'zheli')
this.loading = true // this.loading = true //
let f = params.listdataFieldName || "Records"; let f = params.listdataFieldName || "Records";
this.getData(cellValue).then(data => { this.getData(cellValue).then(data => {
@ -425,7 +426,6 @@ export default {
if (params.onDataChanged) { if (params.onDataChanged) {
console.log(e)
params.onDataChanged({value: [e.row.id, e.row[textField]], data: e.row}) params.onDataChanged({value: [e.row.id, e.row[textField]], data: e.row})
} }
this.$refs.xDown.hidePanel() this.$refs.xDown.hidePanel()

View File

@ -499,7 +499,10 @@ export default {
textField: "name", textField: "name",
listdataFieldName: 'Truck', listdataFieldName: 'Truck',
dataUrl: `${BASE_URL.BASE_URL}/Truck/v1/truck/list`, dataUrl: `${BASE_URL.BASE_URL}/Truck/v1/truck/list`,
onDataChanged: ({data}) => { onDataChanged: ({value,data}) => {
if(value == ''){
return
}
this.formOptions.data.truck_id = data.id; this.formOptions.data.truck_id = data.id;
this.formOptions.data.current_distance = data.current_distance; this.formOptions.data.current_distance = data.current_distance;
this.formOptions.data.end_mileage = data.current_distance; this.formOptions.data.end_mileage = data.current_distance;
@ -518,7 +521,10 @@ export default {
textField: "name", textField: "name",
listdataFieldName: 'MesStaff', listdataFieldName: 'MesStaff',
dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`, dataUrl: `${BASE_URL.BASE_URL}/MesStaff/v1/mes/staff/list`,
onDataChanged: ({data}) => { onDataChanged: ({value,data}) => {
if(value == ''){
return
}
this.formOptions.data.driver_id = data.id; this.formOptions.data.driver_id = data.id;
} }
} }
@ -550,30 +556,6 @@ export default {
// {field: 'outbound_mileage',isNeedOutbound:true,title: '',span: 6,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}}, // {field: 'outbound_mileage',isNeedOutbound:true,title: '',span: 6,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
{field:'',title:'',span:24,isTitle:true,needAdd:true,Htitle:'车次信息',itemRender:{}},//线 {field:'',title:'',span:24,isTitle:true,needAdd:true,Htitle:'车次信息',itemRender:{}},//线
{field: 'custom_name', title: '选择客户', span: 8, itemRender: {
name: 'MkFormDataSelector', props: {
params: {
dataType: "string",
valueField: "id",
textField: "name",
listdataFieldName: 'Custom',
dataUrl: `${BASE_URL.BASE_URL}/Custom/v1/custom/list`,
actionParams:{
search_rules: [
{
"column": "type",
"mode": "=",
"value": "0"
}
],
},
onDataChanged: ({data}) => {
this.formOptions.data.custom_id = data.id;
this.handleSoilName();
}
}
}
}},
{field: 'supplier_name', title: '选择供应商', span: 8, itemRender: { {field: 'supplier_name', title: '选择供应商', span: 8, itemRender: {
name: 'MkFormDataSelector', props: { name: 'MkFormDataSelector', props: {
params: { params: {
@ -591,13 +573,44 @@ export default {
], ],
}, },
dataUrl: `${BASE_URL.BASE_URL}/Custom/v1/custom/list`, dataUrl: `${BASE_URL.BASE_URL}/Custom/v1/custom/list`,
onDataChanged: ({data}) => { onDataChanged: ({value,data}) => {
if(value == ''){
return
}
this.formOptions.data.supplier_id = data.id; this.formOptions.data.supplier_id = data.id;
this.handleSoilName(); this.handleSoilName();
} }
} }
} }
}}, }},
{field: 'custom_name', title: '选择客户', span: 8, itemRender: {
name: 'MkFormDataSelector', props: {
params: {
dataType: "string",
valueField: "id",
textField: "name",
listdataFieldName: 'Custom',
dataUrl: `${BASE_URL.BASE_URL}/Custom/v1/custom/list`,
actionParams:{
search_rules: [
{
"column": "type",
"mode": "=",
"value": "0"
}
],
},
onDataChanged: ({value,data}) => {
if(value == ''){
return
}
this.formOptions.data.custom_id = data.id;
this.handleSoilName();
}
}
}
}},
{field: 'soil_quality_material', title: '选择运输物品', span: 8, itemRender: { {field: 'soil_quality_material', title: '选择运输物品', span: 8, itemRender: {
name: 'MkFormDataSelector', props: { name: 'MkFormDataSelector', props: {
params: { params: {
@ -615,7 +628,10 @@ export default {
// ], // ],
// }, // },
dataUrl: `${BASE_URL.BASE_URL}/SoilQualityMaterial/v1/soil/quality/material/list`, dataUrl: `${BASE_URL.BASE_URL}/SoilQualityMaterial/v1/soil/quality/material/list`,
onDataChanged: ({data}) => { onDataChanged: ({value,data}) => {
if(value == ''){
return
}
this.formOptions.data.soil_quality_material_id = data.id; this.formOptions.data.soil_quality_material_id = data.id;
this.formOptions.data.buy_unit_price = data.price; this.formOptions.data.buy_unit_price = data.price;
this.formOptions.data.unit_price = data.price; this.formOptions.data.unit_price = data.price;
@ -624,21 +640,21 @@ export default {
} }
} }
}}, }},
{field: 'soil_name_1', title: '物料别名(客户)', span: 8,isSoil1:true, itemRender: {name: '$input', props: {type: "",readonly:true}}},
{field: 'soil_name_2', title: '物料别名(供应商)', span: 8,isSoil2:true, itemRender: {name: '$input', props: {type: "",readonly:true}}}, {field: 'soil_name_2', title: '物料别名(供应商)', span: 6,itemRender: {name: '$input', props: {type: "",readonly:true}}},
// {field: 'outbound_soil_quality_material_id', title: '', span: 8, itemRender: {name: '$input'}}, // {field: 'outbound_soil_quality_material_id', title: '', span: 8, itemRender: {name: '$input'}},
{field: 'supplier_outbound_tonnage',title: '供应商出库吨位',span: 8,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleBuyTotalPrice }}}, {field: 'supplier_outbound_tonnage',title: '供应商出库吨位',span: 6,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleBuyTotalPrice }}},
{field: 'buy_unit_price', title: '购入单价', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleBuyTotalPrice } }}, {field: 'buy_unit_price', title: '购入单价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleBuyTotalPrice } }},
{field: 'buy_total_price', title: '购入总价', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber}}}, {field: 'buy_total_price', title: '购入总价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber}}},
{field: 'soil_name_1', title: '物料别名(客户)', span: 6, itemRender: {name: '$input', props: {type: "",readonly:true}}},
// {field: 'warehousing_soil_quality_material_id',title: '',span: 8, itemRender: {name: '$input'}}, // {field: 'warehousing_soil_quality_material_id',title: '',span: 8, itemRender: {name: '$input'}},
{field: 'customer_warehousing_tonnage',title: '客户入库吨位',span: 8,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleTotalPrice }}}, {field: 'customer_warehousing_tonnage',title: '客户入库吨位',span: 6,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleTotalPrice }}},
{field: 'unit_price', title: '单价', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleTotalPrice } }}, {field: 'unit_price', title: '单价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleTotalPrice } }},
{field: 'total_price', title: '总价', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}}, {field: 'total_price', title: '总价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
// {field: 'is_customer_settlement', title: '', span: 24, itemRender: { name: '$switch', props: { openLabel: '', openValue: 1, closeValue: 0, closeLabel: '' } }}, // {field: 'is_customer_settlement', title: '', span: 24, itemRender: { name: '$switch', props: { openLabel: '', openValue: 1, closeValue: 0, closeLabel: '' } }},
// {field: 'is_supplier_settlement', title: '', span: 24, itemRender: { name: '$switch', props: { openLabel: '', openValue: 1, closeValue: 0, closeLabel: '' } }}, // {field: 'is_supplier_settlement', title: '', span: 24, itemRender: { name: '$switch', props: { openLabel: '', openValue: 1, closeValue: 0, closeLabel: '' } }},
@ -685,30 +701,6 @@ export default {
}, },
train_numberOptions: { train_numberOptions: {
items: [ items: [
{field: 'custom_name', title: '选择客户', span: 8, itemRender: {
name: 'MkFormDataSelector', props: {
params: {
dataType: "string",
valueField: "id",
textField: "name",
listdataFieldName: 'Custom',
dataUrl: `${BASE_URL.BASE_URL}/Custom/v1/custom/list`,
actionParams:{
search_rules: [
{
"column": "type",
"mode": "=",
"value": "0"
}
],
},
onDataChanged: ({data}) => {
this.formOptions.data.train_number[this.nowIndex].custom_id = data.id;
this.handleSoilName1();
}
}
}
}},
{field: 'supplier_name', title: '选择供应商', span: 8, itemRender: { {field: 'supplier_name', title: '选择供应商', span: 8, itemRender: {
name: 'MkFormDataSelector', props: { name: 'MkFormDataSelector', props: {
params: { params: {
@ -726,13 +718,44 @@ export default {
], ],
}, },
dataUrl: `${BASE_URL.BASE_URL}/Custom/v1/custom/list`, dataUrl: `${BASE_URL.BASE_URL}/Custom/v1/custom/list`,
onDataChanged: ({data}) => { onDataChanged: ({value,data}) => {
if(value == ''){
return
}
this.formOptions.data.train_number[this.nowIndex].supplier_id = data.id; this.formOptions.data.train_number[this.nowIndex].supplier_id = data.id;
this.handleSoilName1(); this.handleSoilName1();
} }
} }
} }
}}, }},
{field: 'custom_name', title: '选择客户', span: 8, itemRender: {
name: 'MkFormDataSelector', props: {
params: {
dataType: "string",
valueField: "id",
textField: "name",
listdataFieldName: 'Custom',
dataUrl: `${BASE_URL.BASE_URL}/Custom/v1/custom/list`,
actionParams:{
search_rules: [
{
"column": "type",
"mode": "=",
"value": "0"
}
],
},
onDataChanged: ({value,data}) => {
if(value == ''){
return
}
this.formOptions.data.train_number[this.nowIndex].custom_id = data.id;
this.handleSoilName1();
}
}
}
}},
{field: 'soil_quality_material', title: '选择运输物品', span: 8, itemRender: { {field: 'soil_quality_material', title: '选择运输物品', span: 8, itemRender: {
name: 'MkFormDataSelector', props: { name: 'MkFormDataSelector', props: {
params: { params: {
@ -741,7 +764,10 @@ export default {
textField: "name", textField: "name",
listdataFieldName: 'SoilQualityMaterial', listdataFieldName: 'SoilQualityMaterial',
dataUrl: `${BASE_URL.BASE_URL}/SoilQualityMaterial/v1/soil/quality/material/list`, dataUrl: `${BASE_URL.BASE_URL}/SoilQualityMaterial/v1/soil/quality/material/list`,
onDataChanged: ({data}) => { onDataChanged: ({value,data}) => {
if(value == ''){
return
}
this.formOptions.data.train_number[this.nowIndex].soil_quality_material_id = data.id; this.formOptions.data.train_number[this.nowIndex].soil_quality_material_id = data.id;
this.formOptions.data.train_number[this.nowIndex].buy_unit_price = data.price; this.formOptions.data.train_number[this.nowIndex].buy_unit_price = data.price;
this.formOptions.data.train_number[this.nowIndex].unit_price = data.price; this.formOptions.data.train_number[this.nowIndex].unit_price = data.price;
@ -750,15 +776,16 @@ export default {
} }
} }
}}, }},
{field: 'soil_name_1', title: '物料别名(客户)', span: 8,isSoil1:true, itemRender: {name: '$input', props: {type: "",readonly:true} }},
{field: 'soil_name_2', title: '物料别名(供应商)', span: 8,isSoil2:true, itemRender: {name: '$input', props: {type: "",readonly:true}}}, {field: 'soil_name_2', title: '物料别名(供应商)', span: 6, itemRender: {name: '$input', props: {type: "",readonly:true}}},
{field: 'supplier_outbound_tonnage',title: '供应商出库吨位',span: 8,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleBuyTotalPrice1 }}}, {field: 'supplier_outbound_tonnage',title: '供应商出库吨位',span: 6,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleBuyTotalPrice1 }}},
{field: 'buy_unit_price', title: '购入单价', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleBuyTotalPrice1 } }}, {field: 'buy_unit_price', title: '购入单价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleBuyTotalPrice1 } }},
{field: 'buy_total_price', title: '购入总价', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}}, {field: 'buy_total_price', title: '购入总价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
{field: 'customer_warehousing_tonnage',title: '客户入库吨位',span: 8,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleTotalPrice1}}}, {field: 'soil_name_1', title: '物料别名(客户)', span: 6, itemRender: {name: '$input', props: {type: "",readonly:true} }},
{field: 'unit_price', title: '单价', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleTotalPrice1 } }}, {field: 'customer_warehousing_tonnage',title: '客户入库吨位',span: 6,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleTotalPrice1}}},
{field: 'total_price', title: '总价', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}}, {field: 'unit_price', title: '单价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber,blur:this.handleTotalPrice1 } }},
{field: 'freight', title: '运费', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}}, {field: 'total_price', title: '总价', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
{field: 'freight', title: '运费', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
]}, ]},
// //
driver_subsidyOptions: { driver_subsidyOptions: {