功能修改3.26

This commit is contained in:
ljx 2024-03-26 16:45:36 +08:00
parent b821dabcb9
commit 008a267cb1
3 changed files with 29 additions and 28 deletions

View File

@ -172,15 +172,10 @@ export default {
//
items: [
// =============================== Start ===============================
{field:'',title:'',span:24,isTitle:true,Htitle:'员工信息',itemRender:{}},//线
{ field: 'name', title: '员工姓名', span: 12, itemRender: { name: '$input' } },
{ field: 'code', title: '员工工号', span: 12, itemRender: { name: '$input' } },
{
title: '左侧',
span: 19,
children: [
{ field: 'name', title: '员工姓名', span: 12, itemRender: { name: '$input' } },
{ field: 'code', title: '员工工号', span: 12, itemRender: { name: '$input' } },
{
title: '部门', span: 12,
field: 'base_department',
dataRule: {
@ -212,17 +207,26 @@ export default {
{ field: 'is_piecework', title: '是否计件', span: 12, itemRender: { name: '$select', props: { options: settings.options_yesorno } } },
{ field: 'status', title: '状态', span: 12, itemRender: { name: '$select', props: { options: settings.options_status_staff } } },
{ field: 'avatar',title: '头像', span: 12, itemRender: { name: 'MkFormCropper' } },
{ field: 'remark', title: '备注', span: 24, itemRender: { name: '$input' } },
]
},
{
title: '右侧',
span: 5,
children: [
{ field: 'avatar', span: 12, itemRender: { name: 'MkFormCropper' } },
]
},
// {
// title: '',
// span: 19,
// children: [
// ]
// },
// {
// title: '',
// span: 5,
// children: [
// ]
// },
@ -289,6 +293,7 @@ export default {
this.$forceUpdate()
} else {
console.log( this.addModeItems)
// id
this.addModeItems.forEach(item => {
this.pageOptions.formOptions.items.push(item);

View File

@ -114,13 +114,13 @@ export default {
},
//
searchRules: [
{key: "title", mode: "like"},
{key: "desc", mode: "like"}
{key: "code", mode: "like"},
{key: "name", mode: "like"}
],
//
searchFormItems: [ //
{field: 'title', title: '标题', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入标题'}}},
{field: 'desc', title: '描述', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}},
{field: 'code', title: '编码', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}},
{field: 'name', title: '品名', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入标题'}}},
{span: 8, slots: {default: 'date'}}, //
{
align: 'right', span: 4, itemRender: { //

View File

@ -194,6 +194,7 @@ export default {
is_need_outbound: 0,
truck_name: "",
truck_id: 0,
driver_name:'',
driver_id: 0,
outbound_date: new Date(2100, 1, 1).getTime() / 10000,
return_date: new Date(2100, 1, 1).getTime() / 10000,
@ -386,11 +387,8 @@ export default {
}
}
}},
{ field: 'driver_id',title: '司机', span: 6,
dataRule: {
fromField: "id",
saveField: "driver_id"
},
{ field: 'driver_name',title: '司机', span: 6,
itemRender: {
name: 'MkFormDataSelector', props: {
params: {
@ -716,9 +714,7 @@ export default {
this.formOptions.data.other_expenses_log.forEach(item => {
console.log(item)
item.other_expenses_amount = Number(item.other_expenses_amount)
console.log("item.driver_id",item.driver_id)
})
let postdata = Object.assign({}, this.formOptions.data);
//