Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

shuishen

2021-09-17 6b69b7706aaa4fa2cbc028e8704dcc312340f334

 src/views/securityGuard/data.js

@@ -398,7 +398,6 @@
    formslot: true,
}]


//表现
export var trackRecordColumn = [{
        label: "id",
@@ -407,15 +406,24 @@
        editDisplay: false,
        addDisplay: false
    }, {
        label: '工作态度',
        prop: "workingattitude",
    label: '时间',
    type: 'date',
    format: "yyyy-MM-dd",
    valueFormat: "yyyy-MM-dd",
    prop: "time",
        formslot: true,
    }, {
        label: '工作成效',
},
// {
//     label: '工作态度',
//     prop: "workingattitude",
//     formslot: true,
// }, 
{
    label: '工作表现',
        prop: "achievements",
        formslot: true,
    }, {
        label: '表现',
    label: '表现评定',
        prop: "score",
        type: "select",
        // dicUrl: "/api/blade-system/dict-biz/dictionary?code=scoreType",
@@ -447,14 +455,7 @@
            message: "请选择表现",
            trigger: "blur"
        }]
    }, {
        label: '时间',
        type: 'date',
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        prop: "time",
        formslot: true,
    },
}
    // {
    //     label: '服务公司',
    //     prop: "departmentName",