Mes
/
middle-admin-ant
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能修改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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue
View File

@ -172,15 +172,10 @@ export default {
// 表单项 // 表单项
items: [ items: [
// =============================== 表单项 自动生成 Start =============================== // =============================== 表单项 自动生成 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, title: '部门', span: 12,
field: 'base_department', field: 'base_department',
dataRule: { dataRule: {
@ -212,17 +207,26 @@ export default {
{ field: 'is_piecework', title: '是否计件', span: 12, itemRender: { name: '$select', props: { options: settings.options_yesorno } } }, { 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: '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' } }, { field: 'remark', title: '备注', span: 24, itemRender: { name: '$input' } },
] // {
}, // title: '左侧',
{ // span: 19,
title: '右侧', // children: [
span: 5,
children: [
{ field: 'avatar', span: 12, itemRender: { name: 'MkFormCropper' } },
] // ]
}, // },
// {
// title: '右侧',
// span: 5,
// children: [
// ]
// },
@ -289,6 +293,7 @@ export default {
this.$forceUpdate() this.$forceUpdate()
} else { } else {
console.log( this.addModeItems)
// 如果没有id参数，说明是新增模式 // 如果没有id参数，说明是新增模式
this.addModeItems.forEach(item => { this.addModeItems.forEach(item => {
this.pageOptions.formOptions.items.push(item); this.pageOptions.formOptions.items.push(item);

8
src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue
View File

@ -114,13 +114,13 @@ export default {
}, },
// 搜索区配置 // 搜索区配置
searchRules: [ searchRules: [
{key: "title", mode: "like"}, {key: "code", mode: "like"},
{key: "desc", mode: "like"} {key: "name", mode: "like"}
], ],
//搜索区 //搜索区
searchFormItems: [ // 子项 searchFormItems: [ // 子项
{field: 'title', title: '标题', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入标题'}}}, {field: 'code', title: '编码', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}},
{field: 'desc', title: '描述', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}}, {field: 'name', title: '品名', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入标题'}}},
{span: 8, slots: {default: 'date'}}, // 自定义列 {span: 8, slots: {default: 'date'}}, // 自定义列
{ {
align: 'right', span: 4, itemRender: { // 按钮列 align: 'right', span: 4, itemRender: { // 按钮列

10
src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
View File

@ -194,6 +194,7 @@ export default {
is_need_outbound: 0, is_need_outbound: 0,
truck_name: "", truck_name: "",
truck_id: 0, truck_id: 0,
driver_name:'',
driver_id: 0, driver_id: 0,
outbound_date: new Date(2100, 1, 1).getTime() / 10000, outbound_date: new Date(2100, 1, 1).getTime() / 10000,
return_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, { field: 'driver_name',title: '司机', span: 6,
dataRule: {
fromField: "id",
saveField: "driver_id"
},
itemRender: { itemRender: {
name: 'MkFormDataSelector', props: { name: 'MkFormDataSelector', props: {
params: { params: {
@ -716,9 +714,7 @@ export default {
this.formOptions.data.other_expenses_log.forEach(item => { this.formOptions.data.other_expenses_log.forEach(item => {
console.log(item)
item.other_expenses_amount = Number(item.other_expenses_amount) item.other_expenses_amount = Number(item.other_expenses_amount)
console.log("item.driver_id",item.driver_id)
}) })
let postdata = Object.assign({}, this.formOptions.data); let postdata = Object.assign({}, this.formOptions.data);
// 如果是编辑模式 // 如果是编辑模式