Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
This commit is contained in:
commit
625df22d50
|
|
@ -58,8 +58,15 @@ export default {
|
|||
name: "导出",
|
||||
req: async function(data){
|
||||
return await http.get(
|
||||
`${config.API_URL}/hrm/employee/export_excel/`,
|
||||
data
|
||||
`${config.API_URL}/hrm/employee/export_excel/`, data
|
||||
);
|
||||
}
|
||||
},
|
||||
import_excel: {
|
||||
name: "导入",
|
||||
req: async function(data){
|
||||
return await http.post(
|
||||
`${config.API_URL}/hrm/employee/import_excel/`, data
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -266,6 +273,41 @@ export default {
|
|||
}
|
||||
},
|
||||
},
|
||||
empperson: {
|
||||
list: {
|
||||
name: "人员入职信息",
|
||||
req: async function(data){
|
||||
return await http.get(
|
||||
`${config.API_URL}/hrm/empperson/`,
|
||||
data
|
||||
);
|
||||
}
|
||||
},
|
||||
item: {
|
||||
name: "人员申请",
|
||||
req: async function(id){
|
||||
return await http.get(
|
||||
`${config.API_URL}/hrm/empperson/${id}/`,
|
||||
);
|
||||
}
|
||||
},
|
||||
create: {
|
||||
name: "人员新增",
|
||||
req: async function(data){
|
||||
return await http.post(
|
||||
`${config.API_URL}/hrm/empperson/`,
|
||||
data);
|
||||
}
|
||||
},
|
||||
delete: {
|
||||
name: "人员删除",
|
||||
req: async function(id){
|
||||
return await http.delete(
|
||||
`${config.API_URL}/hrm/empperson/${id}/`
|
||||
);
|
||||
}
|
||||
},
|
||||
},
|
||||
leave: {
|
||||
list: {
|
||||
name: "人员请假",
|
||||
|
|
@ -336,4 +378,39 @@ export default {
|
|||
}
|
||||
},
|
||||
},
|
||||
probation: {
|
||||
list: {
|
||||
name: "人员转正",
|
||||
req: async function(data){
|
||||
return await http.get(
|
||||
`${config.API_URL}/hrm/probation/`,
|
||||
data
|
||||
);
|
||||
}
|
||||
},
|
||||
item: {
|
||||
name: "人员转正申请",
|
||||
req: async function(id){
|
||||
return await http.get(
|
||||
`${config.API_URL}/hrm/probation/${id}/`,
|
||||
);
|
||||
}
|
||||
},
|
||||
create: {
|
||||
name: "人员转正新增",
|
||||
req: async function(data){
|
||||
return await http.post(
|
||||
`${config.API_URL}/hrm/probation/`,
|
||||
data);
|
||||
}
|
||||
},
|
||||
delete: {
|
||||
name: "人员转正删除",
|
||||
req: async function(id){
|
||||
return await http.delete(
|
||||
`${config.API_URL}/hrm/probation/${id}/`
|
||||
);
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,66 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<el-button type="primary" @click="handleAdd">新增</el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable
|
||||
ref="table"
|
||||
:apiObj="API.hrm.transfer.list"
|
||||
row-key="id"
|
||||
stripe
|
||||
:query="query"
|
||||
@row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
|
||||
>
|
||||
<el-table-column label="员工" prop="employee_name" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="岗位" prop="post_name" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="原部门" prop="original_dept" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="入职部门" prop="new_dept" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="跨部门调动" prop="is_change" width="80" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
{{scope.row.is_change?'是':'否'}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="跨部门调动" prop="is_change" width="80" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
{{scope.row.is_promotion?'是':'否'}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="原岗位" prop="original_post" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="入职岗位" prop="new_post" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="调岗日期" prop="transfer_date" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="个人工作内容" prop="content" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="调岗原因" prop="transfer_reason" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="调岗日期" prop="transfer_date" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="审批状态" width="200" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<el-tag :type="actStateEnum[scope.row.ticket_?.act_state]?.type">
|
||||
{{ actStateEnum[scope.row.ticket_?.act_state]?.text }}
|
||||
</el-tag>
|
||||
<el-tag type="info" effect="plain">{{ scope.row.ticket_?.state_.name }}</el-tag>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
<el-drawer title="人员调岗审核" v-model="drawerVisible" :size="'80%'" destroy-on-close>
|
||||
<transfer_form :mode="mode" :t_id="t_id"></transfer_form>
|
||||
</el-drawer>
|
||||
</template>
|
||||
<script setup>
|
||||
import { ref } from 'vue'
|
||||
import API from '@/api'
|
||||
import transfer_form from './transfer_form.vue'
|
||||
import { actStateEnum } from "@/utils/enum.js";
|
||||
const query = ref({});
|
||||
const drawerVisible = ref(false);
|
||||
const mode = ref('add');
|
||||
const t_id = ref(null);
|
||||
const handleAdd = () => {
|
||||
mode.value = 'add';
|
||||
drawerVisible.value = true;
|
||||
}
|
||||
</script>
|
||||
|
|
@ -0,0 +1,311 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-main class="nopadding">
|
||||
<el-form label-width="130px" :model="formData" style="padding: 20px;" :disabled="localMode === 'show'">
|
||||
<el-form-item label="员工信息" required>
|
||||
<xtSelect
|
||||
v-model="formData.employee"
|
||||
style="width: 230px;"
|
||||
:apiObj = "$API.hrm.employee.list"
|
||||
v-model:label="formData.employee_name"
|
||||
:edit="localMode === 'add'"
|
||||
@change="handleChange">
|
||||
<el-table-column prop="name" label="姓名"></el-table-column>
|
||||
<el-table-column prop="belong_dept_name" label="部门"></el-table-column>
|
||||
<el-table-column prop="post_name" label="岗位"></el-table-column>
|
||||
</xtSelect>
|
||||
</el-form-item>
|
||||
<el-row :gutter="12">
|
||||
<el-col :span="6" style="display: flex">
|
||||
<el-form-item label="性别">
|
||||
<el-input v-model="formData.gender" disabled style="width: 140px;"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="工号">
|
||||
<el-input v-model="formData.number" disabled style="width: 140px;"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="6">
|
||||
<el-form-item label="联系方式">
|
||||
<el-input v-model="formData.phone" disabled style="width: 140px;"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="6">
|
||||
<el-form-item label="身份证号">
|
||||
<el-input v-model="formData.id_number" disabled style="width: 150px;"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="6">
|
||||
<el-form-item label=" 部门">
|
||||
<el-input v-model="formData.belong_dept_name" disabled style="width: 140px;"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="6">
|
||||
<el-form-item label="岗位">
|
||||
<el-input v-model="formData.post_name" disabled style="width: 140px;"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="6">
|
||||
<el-form-item label="入职时间">
|
||||
<el-input v-model="formData.start_date" disabled style="width: 140px;"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item label="原部门" required>
|
||||
<el-cascader
|
||||
v-model="formData.original_dept"
|
||||
:options="group"
|
||||
:props="groupsProps"
|
||||
:show-all-levels="false"
|
||||
clearable
|
||||
style="width: 230px"
|
||||
></el-cascader>
|
||||
</el-form-item>
|
||||
<el-form-item label="原职务" required>
|
||||
<xtSelect
|
||||
:apiObj="apiObjPost"
|
||||
v-model="formData.original_post"
|
||||
v-model:label="formData.original_post_name"
|
||||
style="width: 230px"
|
||||
>
|
||||
<el-table-column label="名称" prop="name"></el-table-column>
|
||||
</xtSelect>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否跨部门调动" required>
|
||||
<el-radio-group v-model="formData.is_change">
|
||||
<el-radio :label="false">否</el-radio>
|
||||
<el-radio :label="true">是</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="是否晋升" required>
|
||||
<el-radio-group v-model="formData.is_promotion">
|
||||
<el-radio :label="false">否</el-radio>
|
||||
<el-radio :label="true">是</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="调岗部门" required>
|
||||
<el-cascader
|
||||
v-model="formData.new_dept"
|
||||
:options="group"
|
||||
:props="groupsProps"
|
||||
:show-all-levels="false"
|
||||
clearable
|
||||
style="width: 230px"
|
||||
></el-cascader>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="调岗职务" required>
|
||||
<xtSelect
|
||||
:apiObj="apiObjPost"
|
||||
v-model="formData.new_post"
|
||||
v-model:label="formData.new_post_name"
|
||||
style="width: 230px"
|
||||
>
|
||||
<el-table-column label="名称" prop="name"></el-table-column>
|
||||
</xtSelect>
|
||||
</el-form-item>
|
||||
<el-form-item label="调岗时间" required>
|
||||
<el-date-picker
|
||||
v-model="formData.transfer_date"
|
||||
type="date"
|
||||
placeholder="日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width: 230px;"
|
||||
:readonly="localMode === 'show'"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="个人工作内容">
|
||||
<el-input v-model="formData.content" type="textarea" :rows="3" style="width: 300px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="调岗原因">
|
||||
<el-input v-model="formData.reason" type="textarea" :rows="2" style="width: 300px;"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="原岗位薪资">
|
||||
<el-input-number
|
||||
v-model="formData.original_slary"
|
||||
style="width: 200px;"
|
||||
:precision="2"
|
||||
:step="0.01"
|
||||
:min="2000"
|
||||
v-if="formData.ticket_?.state_?.name !== '分管副总审批'"/>
|
||||
<span style="margin-left:6px;">元</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="调岗后岗位薪资">
|
||||
<el-input-number
|
||||
v-model="formData.new_slary"
|
||||
style="width: 200px;"
|
||||
:precision="2"
|
||||
:step="0.01"
|
||||
:min="2000"
|
||||
v-if="formData.ticket_?.state_?.name !== '分管副总审批'"/>
|
||||
<span style="margin-left:6px;">元</span>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-footer>
|
||||
<el-button type="danger"
|
||||
v-if="localMode=='edit'"
|
||||
style="margin-right: 4px;"
|
||||
@click="handleDel"
|
||||
:loading="saveLoading"
|
||||
>删除</el-button>
|
||||
<ticketd_b
|
||||
v-if = "formData.ticket_ && localMode=='show'"
|
||||
:t_id="formData.id"
|
||||
:ticket_="formData.ticket_"
|
||||
:ticket_data="ticket_data"
|
||||
@success="$emit('success', localMode)"
|
||||
ref="ticketd_b"
|
||||
></ticketd_b>
|
||||
<el-button
|
||||
v-if="localMode!='show'"
|
||||
type="primary"
|
||||
style="margin-right: 4px;"
|
||||
@click="handleSave"
|
||||
:loading="saveLoading"
|
||||
>提交审批</el-button>
|
||||
</el-footer>
|
||||
</el-main>
|
||||
<el-aside width="20%" v-if="formData.ticket_">
|
||||
<ticketd :ticket_="formData.ticket_" @success="$emit('success')"></ticketd>
|
||||
</el-aside>
|
||||
</el-container>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ticketd_b from "@/views/wf/ticketd_b.vue";
|
||||
import ticketd from '@/views/wf/ticketd.vue';
|
||||
import { genTree } from "@/utils/verificate";
|
||||
|
||||
export default {
|
||||
name: 'EnpJoinForm',
|
||||
components: {
|
||||
ticketd_b,
|
||||
ticketd
|
||||
},
|
||||
props: {
|
||||
mode: {
|
||||
type: String,
|
||||
default: 'show'
|
||||
},
|
||||
t_id: {
|
||||
type: String,
|
||||
default: ""
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
formData: {
|
||||
is_change: false,
|
||||
is_promotion: false,
|
||||
},
|
||||
ticket_data: {},
|
||||
localMode: this.mode,
|
||||
saveLoading: false,
|
||||
group:[],
|
||||
apiObjPost: this.$API.system.post.list,
|
||||
hideAdd:false,
|
||||
hideDelete:false,
|
||||
addTemplate: {
|
||||
name: "",
|
||||
gender: "",
|
||||
age: "",
|
||||
phone: "",
|
||||
note: "",
|
||||
},
|
||||
groupsProps: {
|
||||
multiple: false,
|
||||
emitPath: false,
|
||||
checkStrictly: true,
|
||||
},
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
formData: {
|
||||
handle(val){
|
||||
Object.assign(this.ticket_data,{
|
||||
original_slary: val.original_slary,
|
||||
new_slary: val.new_slary,
|
||||
original_post: val.original_post,
|
||||
new_post: val.new_post,
|
||||
is_change: val.is_change,
|
||||
is_promotion: val.is_promotion
|
||||
})
|
||||
},
|
||||
deep: true,
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getGroup();
|
||||
if (this.t_id) {
|
||||
this.getTid();
|
||||
} else {
|
||||
this.localMode = "add";
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
async getTid() {
|
||||
try {
|
||||
let res = await this.$API.hrm.transfer.item.req(this.t_id);
|
||||
this.formData = res;
|
||||
if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) {
|
||||
this.localMode = "edit";
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取数据失败:', error);
|
||||
}
|
||||
},
|
||||
async getGroup() {
|
||||
let res = await this.$API.system.dept.list.req({ page: 0 });
|
||||
this.group = genTree(res);
|
||||
},
|
||||
handleDel() {
|
||||
this.$confirm(`确定删除吗？`, "提示", {
|
||||
type: "warning",
|
||||
})
|
||||
.then(()=>{
|
||||
this.$API.hrm.transfer.delete.req(this.formData.id).then(res=>{
|
||||
this.$message.success("删除成功");
|
||||
this.$emit('success');
|
||||
})
|
||||
})
|
||||
},
|
||||
async handleSave() {
|
||||
if (this.localMode == "add") {
|
||||
try {
|
||||
let res = await this.$API.hrm.transfer.create.req(this.formData);
|
||||
this.$message.success("提交成功");
|
||||
this.$emit('success', this.localMode);
|
||||
} catch (error) {
|
||||
console.error('提交申请失败:', error);
|
||||
throw error;
|
||||
}
|
||||
} else if (this.localMode == "edit") {
|
||||
this.$message.error("不支持编辑");
|
||||
}
|
||||
},
|
||||
handleQuery() {
|
||||
this.$refs.table.queryData(this.query);
|
||||
},
|
||||
handleChange(obj) {
|
||||
if (obj) {
|
||||
this.formData.employee_name = obj.name;
|
||||
this.formData.belong_dept_name = obj.belong_dept_name;
|
||||
this.formData.post_name = obj.post_name;
|
||||
this.formData.gender = obj.gender;
|
||||
this.formData.id_number = obj.id_number;
|
||||
this.formData.phone = obj.phone;
|
||||
this.formData.number = obj.number;
|
||||
this.formData.start_date = obj.start_date;
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
@ -73,6 +73,43 @@
|
|||
icon="el-icon-download"
|
||||
@click="exportExcel"
|
||||
>导出</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
:loading = 'cLoading'
|
||||
icon="el-icon-upload"
|
||||
@click="importVisible = true"
|
||||
>导入</el-button>
|
||||
<el-dialog
|
||||
title="导入员工信息"
|
||||
v-model="importVisible"
|
||||
width="480px"
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<sc-upload-file
|
||||
:limit="1"
|
||||
v-model="importFilePath"
|
||||
:auto-upload="true"
|
||||
accept=".xls,.xlsx"
|
||||
tip="最多上传1个文件单个文件不要超过10M"
|
||||
>
|
||||
<el-button type="primary" icon="el-icon-upload">
|
||||
选择文件
|
||||
</el-button>
|
||||
</sc-upload-file>
|
||||
|
||||
<template #footer>
|
||||
<span class="dialog-footer">
|
||||
<el-button @click="importVisible = false">取 消</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
:loading="cLoading"
|
||||
@click="submitImport"
|
||||
>
|
||||
开始导入
|
||||
</el-button>
|
||||
</span>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
|
|
@ -278,8 +315,14 @@ export default {
|
|||
save: false,
|
||||
permission: false,
|
||||
},
|
||||
importFilePath:'',
|
||||
deptData: [],
|
||||
apiObj: this.$API.hrm.employee.list,
|
||||
importApiObj: {
|
||||
post: (formData) => {
|
||||
return this.$API.hrm.employee.import_excel.req(formData)
|
||||
}
|
||||
},
|
||||
query: {},
|
||||
tdevice: [],
|
||||
selection: [],
|
||||
|
|
@ -288,6 +331,8 @@ export default {
|
|||
},
|
||||
dis: false,
|
||||
showBindBlt: false,
|
||||
importVisible: false,
|
||||
cLoading: false,
|
||||
bltList: [],
|
||||
bindName: "",
|
||||
bindType: 10,
|
||||
|
|
@ -338,6 +383,25 @@ export default {
|
|||
});
|
||||
this.deptData = genTree(res);
|
||||
},
|
||||
submitImport() {
|
||||
if (!this.importFilePath) {
|
||||
this.$message.warning('请先选择并上传文件')
|
||||
return
|
||||
}
|
||||
this.cLoading = true
|
||||
this.$API.hrm.employee.import_excel.req({
|
||||
file_path: this.importFilePath
|
||||
})
|
||||
.then(() => {
|
||||
this.$message.success('导入成功')
|
||||
this.importVisible = false
|
||||
this.$refs.table.refresh()
|
||||
this.importFilePath = '' // 可选：清空
|
||||
})
|
||||
.finally(() => {
|
||||
this.cLoading = false
|
||||
})
|
||||
},
|
||||
//人员证书添加
|
||||
// Addcertificate(row) {
|
||||
// this.$router.push({
|
||||
|
|
@ -480,6 +544,7 @@ export default {
|
|||
console.log(that.bltList);
|
||||
});
|
||||
},
|
||||
|
||||
handleBindBlt(type, row) {
|
||||
// this.dis = false;
|
||||
debugger;
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
:query="query"
|
||||
@row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
|
||||
>
|
||||
<el-table-column label="部门" prop="dept_need_name" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="部门" prop="belong_dept_name" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="姓名" prop="employee_name" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="岗位" prop="post_name" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="审批状态" width="200" show-overflow-tooltip>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,119 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header>
|
||||
<div class="left-panel">
|
||||
<el-button type="primary" @click="handleAdd">新增</el-button>
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-input
|
||||
v-model="query.search"
|
||||
placeholder="姓名/手机号"
|
||||
clearable
|
||||
@keyup.enter="handleQuery"
|
||||
style="margin-left: 4px; width: 150px"
|
||||
></el-input>
|
||||
<el-cascader
|
||||
v-model="query.reg_dept"
|
||||
:options="deptData"
|
||||
clearable
|
||||
placeholder="部门/单位"
|
||||
@change="handleQuery"
|
||||
:show-all-levels="false"
|
||||
:props="{ emitPath: false, checkStrictly: true }"
|
||||
style="margin-left: 4px; width: 150px"
|
||||
/>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
></el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<scTable
|
||||
ref="table"
|
||||
:apiObj="this.$API.hrm.probation.list"
|
||||
row-key="id"
|
||||
stripe
|
||||
:query="query"
|
||||
@row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
|
||||
>
|
||||
<el-table-column label="部门" prop="reg_dept_name" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="姓名" prop="employee_name" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="岗位" prop="post_name" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="审批状态" width="200" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<el-tag :type="actStateEnum[scope.row.ticket_?.act_state]?.type">
|
||||
{{ actStateEnum[scope.row.ticket_?.act_state]?.text }}
|
||||
</el-tag>
|
||||
<el-tag type="info" effect="plain">{{ scope.row.ticket_?.state_.name }}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="身份证号" prop="IDcard" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="试用日期" prop="trial_date" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="转正日期" prop="regular_date" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="转正申请" prop="content" width="80" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="应聘人员登记表" prop="record_file" width="150" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="员工转正申请表" prop="apply_file" width="150" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="PPT 汇报考核" prop="ppt_file" width="150" show-overflow-tooltip></el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
<el-drawer title="转正审批" v-model="drawerVisible" :size="'50%'" destroy-on-close>
|
||||
<div style="display: flex; height: calc(100% - 60px);">
|
||||
<div style="flex: 1; padding-right: 20px; overflow-y: auto;">
|
||||
<probation_form
|
||||
:mode="mode"
|
||||
:t_id="t_id"
|
||||
@success="()=>{handleQuery(); drawerVisible = false}"
|
||||
@closed="drawerVisible = false"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</el-drawer>
|
||||
</template>
|
||||
<script>
|
||||
|
||||
import probation_form from './probation_form.vue'
|
||||
import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
|
||||
import { genTree } from "@/utils/verificate";
|
||||
|
||||
export default {
|
||||
name: "hrm.probation",
|
||||
components: {
|
||||
probation_form,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
actStateEnum, interveneTypeEnum,
|
||||
drawerVisible: false,
|
||||
mode: 'show',
|
||||
t_id: null,
|
||||
deptData: [],
|
||||
query: {},
|
||||
nameList:[],
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getDept();
|
||||
},
|
||||
methods: {
|
||||
handleAdd() {
|
||||
this.mode = 'add';
|
||||
this.t_id = null;
|
||||
this.drawerVisible = true;
|
||||
},
|
||||
handleQuery() {
|
||||
this.$refs.table.queryData(this.query);
|
||||
},
|
||||
async getDept() {
|
||||
let res = await this.$API.system.dept.list.req({
|
||||
page: 0,
|
||||
type__in: "dept,rparty",
|
||||
});
|
||||
this.deptData = genTree(res);
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
</script>
|
||||
|
|
@ -0,0 +1,239 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-main class="nopadding">
|
||||
<el-form label-width="100px" :rules="rules" :model="formData" style="padding: 20px;" :disabled="localMode === 'show'">
|
||||
<el-form-item label="员工信息" required>
|
||||
<xtSelect
|
||||
v-model="formData.empperson"
|
||||
style="width: 230px;"
|
||||
:apiObj = "$API.hrm.empperson.list"
|
||||
v-model:label="formData.employee_name"
|
||||
:edit="localMode === 'add'"
|
||||
@change="handleChange">
|
||||
<el-table-column prop="name" label="姓名"></el-table-column>
|
||||
</xtSelect>
|
||||
</el-form-item>
|
||||
<el-form-item label="部门" required>
|
||||
<el-cascader
|
||||
v-model="formData.reg_dept"
|
||||
:options="group"
|
||||
:props="groupsProps"
|
||||
:show-all-levels="false"
|
||||
clearable
|
||||
style="width: 230px"
|
||||
></el-cascader>
|
||||
</el-form-item>
|
||||
<el-form-item label="岗位" required>
|
||||
<xtSelect
|
||||
:apiObj="apiObjPost"
|
||||
v-model="formData.reg_post"
|
||||
v-model:label="formData.reg_post_name"
|
||||
style="width: 230px"
|
||||
>
|
||||
<el-table-column label="名称" prop="name"></el-table-column>
|
||||
</xtSelect>
|
||||
</el-form-item>
|
||||
<el-form-item label="试用日期" required>
|
||||
<el-date-picker
|
||||
v-model="formData.start_date"
|
||||
type="datetime"
|
||||
placeholder="试用日期"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
:readonly="localMode === 'show'"
|
||||
style="width: 200px"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="转正日期" required>
|
||||
<el-date-picker
|
||||
v-model="formData.end_date"
|
||||
type="datetime"
|
||||
placeholder="转正日期"
|
||||
value-format="YYYY-MM-DD HH:mm:ss"
|
||||
:readonly="localMode === 'show'"
|
||||
style="width: 200px"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="应聘人员登记表" rquired style="white-space: nowrap;">
|
||||
<sc-upload-file
|
||||
v-model="formData.record_file"
|
||||
:multiple="false"
|
||||
:limit="1"
|
||||
:accept="['.xlsx', '.xls','.pdf','.docx', '.doc', '.jpg', '.png', '.jpeg']"
|
||||
@success = "fileUPSuccess"
|
||||
:disabled="localMode ==='show'"
|
||||
>
|
||||
<el-button type="primary" icon="el-icon-upload"> </el-button>
|
||||
</sc-upload-file>
|
||||
</el-form-item>
|
||||
<el-form-item label="员工转正申请表" rquired style="white-space: nowrap;">
|
||||
<sc-upload-file
|
||||
v-model="formData.apply_file"
|
||||
:multiple="false"
|
||||
:limit="1"
|
||||
:accept="['.xlsx', '.xls','.pdf','.docx', '.doc', '.jpg', '.png', '.jpeg']"
|
||||
@success = "fileUPSuccess"
|
||||
:disabled="localMode ==='show'"
|
||||
>
|
||||
<el-button type="primary" icon="el-icon-upload"> </el-button>
|
||||
</sc-upload-file>
|
||||
</el-form-item>
|
||||
<el-form-item label="PPT 汇报考核" rquired style="white-space: nowrap;">
|
||||
<sc-upload-file
|
||||
v-model="formData.ppt_file"
|
||||
:multiple="false"
|
||||
:limit="1"
|
||||
:accept="['.xlsx', '.xls','.pdf','.docx', '.doc', '.jpg', '.png', '.jpeg']"
|
||||
@success = "fileUPSuccess"
|
||||
:disabled="localMode ==='show'"
|
||||
>
|
||||
<el-button type="primary" icon="el-icon-upload"> </el-button>
|
||||
</sc-upload-file>
|
||||
</el-form-item>
|
||||
<el-form-item label="转正申请" required>
|
||||
<el-input v-model="formData.reason" type="textarea" rows="2" style="width: 400px" placeholder="请输入请假理由"></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-footer>
|
||||
<el-button type="danger"
|
||||
v-if="localMode=='edit'"
|
||||
style="margin-right: 4px;"
|
||||
@click="handleDel"
|
||||
:loading="saveLoading"
|
||||
>删除</el-button>
|
||||
<ticketd_b
|
||||
v-if = "formData.ticket_ && localMode=='show'"
|
||||
:t_id="formData.id"
|
||||
:ticket_="formData.ticket_"
|
||||
:ticket_data="ticket_data"
|
||||
@success="$emit('success', localMode)"
|
||||
ref="ticketd_b"
|
||||
></ticketd_b>
|
||||
<el-button
|
||||
v-if="localMode!='show'"
|
||||
type="primary"
|
||||
style="margin-right: 4px;"
|
||||
@click="handleSave"
|
||||
:loading="saveLoading"
|
||||
>提交审批</el-button>
|
||||
</el-footer>
|
||||
</el-main>
|
||||
<el-aside width="20%" v-if="formData.ticket_">
|
||||
<ticketd :ticket_="formData.ticket_" @success="$emit('success')"></ticketd>
|
||||
</el-aside>
|
||||
</el-container>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ticketd_b from "@/views/wf/ticketd_b.vue";
|
||||
import ticketd from '@/views/wf/ticketd.vue';
|
||||
import { genTree } from "@/utils/verificate";
|
||||
|
||||
export default {
|
||||
name: "ProbationForm",
|
||||
components: {
|
||||
ticketd_b,
|
||||
ticketd
|
||||
},
|
||||
props: {
|
||||
mode: {
|
||||
type: String,
|
||||
default: 'show'
|
||||
},
|
||||
t_id: {
|
||||
type: String,
|
||||
default: ""
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
formData: {},
|
||||
ticket_data: {},
|
||||
localMode: this.mode,
|
||||
group:[],
|
||||
apiObjPost: this.$API.system.post.list,
|
||||
saveLoading: false,
|
||||
rules: {
|
||||
empperson: [
|
||||
{ required: true, message: "请选择员工", trigger: "change" },
|
||||
],
|
||||
reg_dept: [
|
||||
{ required: true, message: "请选择部门", trigger: "change" },
|
||||
],
|
||||
reg_post: [
|
||||
{ required: true, message: "请选择岗位", trigger: "change" },
|
||||
],
|
||||
start_date: [
|
||||
{ required: true, message: "请选择开始日期", trigger: "change" },
|
||||
],
|
||||
end_date: [
|
||||
{ required: true, message: "请选择结束日期", trigger: "change" },
|
||||
],
|
||||
},
|
||||
groupsProps: {
|
||||
multiple: false,
|
||||
emitPath: false,
|
||||
checkStrictly: true,
|
||||
},
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
formData: {
|
||||
handle(val) {
|
||||
Object.assign(this.ticket_data, val);
|
||||
},
|
||||
deep:true,
|
||||
immediate: true
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getGroup();
|
||||
if (this.t_id) {
|
||||
this.getTid();
|
||||
}else {
|
||||
this.localMode = "add";
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
async getTid() {
|
||||
try {
|
||||
let res = await this.$API.hrm.leave.item.req(this.t_id);
|
||||
this.formData = res;
|
||||
if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) {
|
||||
this.localMode = "edit";
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取请假数据失败:', error);
|
||||
}
|
||||
},
|
||||
async getGroup() {
|
||||
let res = await this.$API.system.dept.list.req({ page: 0 });
|
||||
this.group = genTree(res);
|
||||
},
|
||||
handleDel() {
|
||||
this.$confirm(`确定删除吗？`, "提示", {
|
||||
type: "warning",
|
||||
})
|
||||
.then(()=>{
|
||||
this.$API.hrm.leave.delete.req(this.formData.id).then(res=>{
|
||||
this.$message.success("删除成功");
|
||||
this.$emit('success');
|
||||
})
|
||||
})
|
||||
},
|
||||
async handleSave() {
|
||||
if (this.localMode == "add") {
|
||||
try {
|
||||
let res = await this.$API.hrm.leave.create.req(this.formData);
|
||||
this.$message.success("提交成功");
|
||||
this.$emit('success', this.localMode);
|
||||
} catch (error) {
|
||||
console.error('请假需求申请失败:', error);
|
||||
throw error;
|
||||
}
|
||||
} else if (this.localMode == "edit") {
|
||||
this.$message.error("不支持编辑");
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
@ -13,7 +13,6 @@
|
|||
<el-table-column prop="name" label="姓名"></el-table-column>
|
||||
<el-table-column prop="belong_dept_name" label="部门"></el-table-column>
|
||||
<el-table-column prop="post_name" label="岗位"></el-table-column>
|
||||
|
||||
</xtSelect>
|
||||
</el-form-item>
|
||||
<el-row :gutter="12">
|
||||
|
|
@ -230,7 +229,7 @@ export default {
|
|||
},
|
||||
watch: {
|
||||
formData: {
|
||||
handler(val){
|
||||
handle(val){
|
||||
Object.assign(this.ticket_data,{
|
||||
original_slary: val.original_slary,
|
||||
new_slary: val.new_slary,
|
||||
|
|
@ -307,7 +306,6 @@ export default {
|
|||
this.formData.start_date = obj.start_date;
|
||||
}
|
||||
},
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
@ -108,27 +108,26 @@
|
|||
<el-drawer :title="titleMap " v-model="limitedVisible" size="50%">
|
||||
<el-form
|
||||
:model="addForm"
|
||||
:rules="rules"
|
||||
ref="addForm"
|
||||
label-width="100px"
|
||||
label-position="left"
|
||||
>
|
||||
<el-form-item label="资料名称" prop="name">
|
||||
<el-form-item label="资料名称" prop="name" required>
|
||||
<el-input v-model="addForm.name" clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="档案编号" prop="number">
|
||||
<el-form-item label="档案编号" prop="number" required>
|
||||
<el-input v-model="addForm.number" clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="文件份数" prop="counts">
|
||||
<el-form-item label="文件份数" prop="counts" required>
|
||||
<el-input v-model="addForm.counts" clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="存放位置" prop="location">
|
||||
<el-form-item label="存放位置" prop="location" required>
|
||||
<el-input v-model="addForm.location" clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="存档人电话" prop="contacts">
|
||||
<el-form-item label="存档人电话" prop="contacts" required>
|
||||
<el-input v-model="addForm.contacts" clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="接收人(综合办)" prop="reciver" label-width="120px">
|
||||
<el-form-item label="接收人(综合办)" prop="reciver" label-width="120px" required>
|
||||
<el-input v-model="addForm.reciver" clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark" type="textarea">
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
<el-header>
|
||||
<div class="left-panel"></div>
|
||||
<div class="right-panel">
|
||||
<span v-if="activeName=='paiban'||activeName=='houzhui1'">毛坯检测时间：</span>
|
||||
<span v-else>排扳时间：</span>
|
||||
<el-date-picker
|
||||
v-model="query.start_date"
|
||||
type="date"
|
||||
|
|
@ -133,17 +135,20 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="长点率">
|
||||
<template #default="scope">
|
||||
<span>{{((scope.row.长点数/scope.row.总切片数)*100).toFixed(2) }}%</span>
|
||||
<span v-if="scope.row.总切片数>0">{{((scope.row.长点数/scope.row.总切片数)*100).toFixed(2) }}%</span>
|
||||
<span v-else>0%</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="加工率">
|
||||
<template #default="scope">
|
||||
<span>{{((scope.row.加工率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
|
||||
<span v-if="scope.row.总切片数>0">{{((scope.row.加工率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
|
||||
<span v-else>0%</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="合格率" prop="合格率">
|
||||
<template #default="scope">
|
||||
<span>{{((scope.row.合格率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
|
||||
<span v-if="scope.row.总切片数>0">{{((scope.row.合格率数/scope.row.总切片数)*100).toFixed(2) }}%</span>
|
||||
<span v-else>0%</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
|
|
|
|||
|
|
@ -268,6 +268,12 @@
|
|||
<el-table-column label="发白" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_缺陷_发白 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="裂" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_缺陷_裂 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="光圈" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_缺陷_光圈 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="漏光" class-name="colorheader2">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_缺陷_漏光 }}</span></template>
|
||||
</el-table-column>
|
||||
|
|
@ -327,6 +333,15 @@
|
|||
<el-table-column label="破损" class-name="colorheader3">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_破损 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="发白" class-name="colorheader3">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_发白 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="裂" class-name="colorheader3">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_裂 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="光圈" class-name="colorheader3">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_光圈 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="尺寸小" class-name="colorheader3">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_返修_缺陷_尺寸小 }}</span></template>
|
||||
</el-table-column>
|
||||
|
|
@ -352,6 +367,35 @@
|
|||
<span v-else>0</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="抽检" align="center" class-name="colorheader7">
|
||||
<el-table-column label="日期" class-name="colorheader7" width="90">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_抽检_日期 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="黑圈变形" class-name="colorheader7">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_黑圈变形 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="黑圈缺口" class-name="colorheader7">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_黑圈缺口 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="光圈" class-name="colorheader7">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_光圈 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="发白" class-name="colorheader7">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_发白 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="漏光" class-name="colorheader7">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_抽检_缺陷_漏光 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="抽检不合格" class-name="colorheader7">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_抽检_抽检不合格 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="直通总合格数" class-name="colorheader7">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_抽检_直通总合格数 }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="直通良率" class-name="colorheader7">
|
||||
<template #default="scope"><span>{{ scope.row.data.外观检验_抽检_直通良率 }}</span></template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-main>
|
||||
<el-footer>
|
||||
|
|
@ -623,44 +667,66 @@ export default {
|
|||
propert = '外观检验_缺陷_破损';
|
||||
}else if(index==53&&column.label=='发白'){
|
||||
propert = '外观检验_缺陷_发白';
|
||||
}else if(index==54&&column.label=='漏光'){
|
||||
}else if(index==54&&column.label=='裂'){
|
||||
propert = '外观检验_缺陷_裂';
|
||||
}else if(index==55&&column.label=='光圈'){
|
||||
propert = '外观检验_缺陷_光圈';
|
||||
}else if(index==56&&column.label=='漏光'){
|
||||
propert = '外观检验_缺陷_漏光';
|
||||
}else if(index == 57&&column.label=='返修数'){
|
||||
}else if(index == 59&&column.label=='返修数'){
|
||||
propert = '外观检验_返修_count_real';
|
||||
}else if(index==58&&column.label=='合格数'){
|
||||
}else if(index==60&&column.label=='合格数'){
|
||||
propert = '外观检验_返修_count_ok_full';
|
||||
}else if(index==59&&column.label=='黑圈变形'){
|
||||
}else if(index==61&&column.label=='黑圈变形'){
|
||||
propert = '外观检验_返修_缺陷_黑圈变形';
|
||||
}else if(index==60&&column.label=='气泡'){
|
||||
}else if(index==62&&column.label=='气泡'){
|
||||
propert = '外观检验_返修_缺陷_气泡';
|
||||
}else if(index==61&&column.label=='浅气泡(B)'){
|
||||
}else if(index==63&&column.label=='浅气泡(B)'){
|
||||
propert = '外观检验_返修_缺陷_浅气泡(B)';
|
||||
}else if(index==62&&column.label=='浅划麻(B)'){
|
||||
}else if(index==64&&column.label=='浅划麻(B)'){
|
||||
propert = '外观检验_返修_缺陷_浅划麻(B)';
|
||||
}else if(index==63&&column.label=='双面划麻'){
|
||||
}else if(index==65&&column.label=='双面划麻'){
|
||||
propert = '外观检验_返修_缺陷_双面划麻';
|
||||
}else if(index==64&&column.label=='浅水纹(B)'){
|
||||
}else if(index==66&&column.label=='浅水纹(B)'){
|
||||
propert = '外观检验_返修_缺陷_浅水纹(B)';
|
||||
}else if(index==65&&column.label=='重水纹'){
|
||||
}else if(index==67&&column.label=='重水纹'){
|
||||
propert = '外观检验_返修_缺陷_重水纹';
|
||||
}else if(index==66&&column.label=='大崩'){
|
||||
}else if(index==68&&column.label=='大崩'){
|
||||
propert = '外观检验_返修_缺陷_大崩';
|
||||
}else if(index==67&&column.label=='小崩边(B)'){
|
||||
}else if(index==69&&column.label=='小崩边(B)'){
|
||||
propert = '外观检验_返修_缺陷_小崩边(B)';
|
||||
}else if(index==68&&column.label=='倒角'){
|
||||
}else if(index==70&&column.label=='倒角'){
|
||||
propert = '外观检验_返修_缺陷_倒角';
|
||||
}else if(index==69&&column.label=='棕点'){
|
||||
}else if(index==71&&column.label=='棕点'){
|
||||
propert = '外观检验_返修_缺陷_棕点';
|
||||
}else if(index==70&&column.label=='漏光'){
|
||||
}else if(index==72&&column.label=='漏光'){
|
||||
propert = '外观检验_返修_缺陷_漏光';
|
||||
}else if(index==71&&column.label=='黑圈缺口'){
|
||||
}else if(index==73&&column.label=='黑圈缺口'){
|
||||
propert = '外观检验_返修_缺陷_黑圈缺口';
|
||||
}else if(index==72&&column.label=='破损'){
|
||||
}else if(index==74&&column.label=='破损'){
|
||||
propert = '外观检验_返修_缺陷_破损';
|
||||
}else if(index==73&&column.label=='尺寸小'){
|
||||
}else if(index==75&&column.label=='发白'){
|
||||
propert = '外观检验_返修_缺陷_发白';
|
||||
}else if(index==76&&column.label=='裂'){
|
||||
propert = '外观检验_返修_缺陷_裂';
|
||||
}else if(index==77&&column.label=='光圈'){
|
||||
propert = '外观检验_返修_缺陷_光圈';
|
||||
}else if(index==78&&column.label=='尺寸小'){
|
||||
propert = '外观检验_返修_缺陷_尺寸小';
|
||||
}else if(column.label=='外观总合格数'){
|
||||
propert = '外观检验_完全总合格数';
|
||||
}else if(index==83&&column.label=='黑圈变形'){
|
||||
propert = '外观检验_抽检_缺陷_黑圈变形';
|
||||
}else if(index==84&&column.label=='黑圈缺口'){
|
||||
propert = '外观检验_抽检_缺陷_黑圈缺口';
|
||||
}else if(index==85&&column.label=='光圈'){
|
||||
propert = '外观检验_抽检_缺陷_光圈';
|
||||
}else if(index==86&&column.label=='发白'){
|
||||
propert = '外观检验_抽检_缺陷_发白';
|
||||
}else if(index==87&&column.label=='漏光'){
|
||||
propert = '外观检验_抽检_缺陷_漏光';
|
||||
}else if(index==88&&column.label=='抽检不合格'){
|
||||
propert = '外观检验_抽检_缺陷_抽检不合格';
|
||||
}
|
||||
if (propert!=='') {
|
||||
const values = data.map((item) =>
|
||||
|
|
@ -689,24 +755,24 @@ export default {
|
|||
sums[index] = ((sums[index-1]/sums[28])*100).toFixed(4);
|
||||
}
|
||||
}
|
||||
if(index==74){
|
||||
if(index==79){
|
||||
let sum = 0;
|
||||
if(sums[29]){
|
||||
sum += sums[29];
|
||||
}
|
||||
if(sums[58]){
|
||||
sum += sums[58];
|
||||
if(sums[60]){
|
||||
sum += sums[60];
|
||||
}
|
||||
sums[index] = sum;
|
||||
}
|
||||
if(index==75){
|
||||
if(sums[74]&&sums[28]){
|
||||
sums[index] = ((sums[74]/sums[28])*100).toFixed(2);
|
||||
if(index==80){
|
||||
if(sums[79]&&sums[28]){
|
||||
sums[index] = ((sums[79]/sums[28])*100).toFixed(2);
|
||||
}
|
||||
}
|
||||
if(index==76){
|
||||
if(sums[75]&&sums[24]){
|
||||
sums[index] = ((sums[75]*sums[24])/100).toFixed(2);
|
||||
if(index==81){
|
||||
if(sums[80]&&sums[24]){
|
||||
sums[index] = ((sums[80]*sums[24])/100).toFixed(2);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -35,38 +35,38 @@
|
|||
<table id="mlogbwlist" class="tables">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="w_30 inlineBlock">
|
||||
<input type="checkbox" v-model="selectedAll" :value="selectedAll" style="width: 18px;" @change="selectAllChange">
|
||||
<th class="w_50" style="padding: 5px;">
|
||||
<input type="checkbox" class="checkboxInput" v-model="selectedAll" :value="selectedAll" @change="selectAllChange">
|
||||
</th>
|
||||
<th class="w_30 inlineBlock">序号</th>
|
||||
<th class="w_140 inlineBlock">物料批次</th>
|
||||
<th class="w_150 inlineBlock">物料编号</th>
|
||||
<th class="w_150 inlineBlock" v-if="route_code=='niuzhuan'">生产设备</th>
|
||||
<th class="w_180 inlineBlock" v-if="route_code=='niuzhuan'">扭转日期</th>
|
||||
<th class="w_80 inlineBlock" v-for="item in qct_testitems" :key="item.id">{{ item.testitem_name }}</th>
|
||||
<th class="w_80 inlineBlock" v-for="item in qct_defects" :key="item.id">{{ item.defect_name }}</th>
|
||||
<th class="w_80 inlineBlock">备注</th>
|
||||
<th class="w_180 inlineBlock" v-if="!isSubmit">操作</th>
|
||||
<th class="w_50">序号</th>
|
||||
<th class="w_140">物料批次</th>
|
||||
<th class="w_150">物料编号</th>
|
||||
<th class="w_150" v-if="route_code=='niuzhuan'">生产设备</th>
|
||||
<th class="w_180" v-if="route_code=='niuzhuan'">扭转日期</th>
|
||||
<th class="w_80" v-for="item in qct_testitems" :key="item.id">{{ item.testitem_name }}</th>
|
||||
<th class="w_80" v-for="item in qct_defects" :key="item.id">{{ item.defect_name }}</th>
|
||||
<th class="w_80">备注</th>
|
||||
<th class="w_180" v-if="!isSubmit">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(row, index) in mlogbwlist" :key="row.id">
|
||||
<td class="w_30 inlineBlock padding_4">
|
||||
<input type="checkbox" v-model="selectedindexes" :value="row.id" @change="selectChange">
|
||||
<td class="w_50 padding_4" style="text-align: center;">
|
||||
<input type="checkbox" class="checkboxInput" v-model="selectedindexes" :value="row.id" @change="selectChange">
|
||||
</td>
|
||||
<td class="w_30 inlineBlock padding_4">
|
||||
<td class="w_50 padding_4">
|
||||
{{ index + 1 }}
|
||||
</td>
|
||||
<td class="w_140 inlineBlock">
|
||||
<td class="w_140 ">
|
||||
<input v-if="row.isEdit" v-model="row.mlogb__batch" placeholder="物料批次">
|
||||
<span v-else>{{ row.mlogb__batch }}</span>
|
||||
</td>
|
||||
<td class="w_150 inlineBlock">
|
||||
<td class="w_150 ">
|
||||
<input v-if="row.isEdit" v-model="row.number" placeholder="物料编号">
|
||||
<span v-else>{{ row.number }}</span>
|
||||
<span v-if="row.wpr_number_out !== null && row.wpr_number_out !== undefined">——{{ row.wpr_number_out }}</span>
|
||||
</td>
|
||||
<td class="w_150 inlineBlock" v-if="route_code=='niuzhuan'">
|
||||
<td class="w_150 " v-if="route_code=='niuzhuan'">
|
||||
<select name="pets" id="pet-select" v-if="row.isEdit" style="width: 100%;" v-model="row.equip" :value="row.equip">
|
||||
<option v-for="item in optionsEq" :key="item.id" :value="item.id">
|
||||
{{ item.number }}
|
||||
|
|
@ -74,13 +74,13 @@
|
|||
</select>
|
||||
<span v-else>{{ row.equip_name }}<span v-if="row.equip_number&&row.equip_number!=null">{{ row.equip_number }}</span></span>
|
||||
</td>
|
||||
<td class="w_180 inlineBlock" v-if="route_code=='niuzhuan'">
|
||||
<td class="w_180 " v-if="route_code=='niuzhuan'">
|
||||
<input v-if="row.isEdit" type="datetime-local" id="datetime" v-model="row.work_start_time" @change = "timeChange(row)">
|
||||
<div v-else>
|
||||
<span v-if="row.work_start_time!==null">{{ row.work_start_time}}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td class="w_80 inlineBlock" v-for="item in qct_testitems" :key="item.id">
|
||||
<td class="w_80 " v-for="item in qct_testitems" :key="item.id">
|
||||
<span v-if="!row.isEdit || !item.canEdit">{{ row[item.testitem_name] }}</span>
|
||||
<input v-if="item.testitem_field_type == 'input-number' && row.isEdit && item.canEdit"
|
||||
type="number" v-model="row[item.testitem_name]" @change="defectCountSun(row)">
|
||||
|
|
@ -97,14 +97,14 @@
|
|||
<option v-for="item0 in item.testitem_choices" :key="item0" :value="item0">{{ item0 }}</option>
|
||||
</select>
|
||||
</td>
|
||||
<td class="w_80 inlineBlock padding_4 defectBlock" v-for="item in qct_defects" :key="item.id">
|
||||
<input type="checkbox" :disabled="!row.isEdit || !item.canEdit" v-model="row[item.defect_name]" @change="switchChange(row, item,index)">
|
||||
<td class="w_80 padding_4 defectBlock" v-for="item in qct_defects" :key="item.id">
|
||||
<input type="checkbox" class="checkboxInput" :disabled="!row.isEdit || !item.canEdit" v-model="row[item.defect_name]" @change="switchChange(row, item,index)">
|
||||
</td>
|
||||
<td class="w_80 inlineBlock">
|
||||
<td class="w_80 ">
|
||||
<input v-if="row.isEdit" v-model="row.note" placeholder="备注">
|
||||
<span v-else style="width: 100%;height: 100%;display: inline-block;">{{ row.note }}</span>
|
||||
</td>
|
||||
<td class="w_180 inlineBlock" v-if="!isSubmit">
|
||||
<td class="w_180 " v-if="!isSubmit">
|
||||
<button v-if="row.isEdit" type="button" class="btn btn_green" @click="formTableSave(row,index)">保存</button>
|
||||
<button v-if="row.isEdit && row.id" type="button" class="btn btn_red" @click="formTableCancel(row,index)">取消</button>
|
||||
<button v-if="row.isEdit && setForm.cd_req_addr !== null" type="button" class="btn btn_yellow" @click="getEqData(index)">重取数据</button>
|
||||
|
|
@ -1134,21 +1134,33 @@ table {
|
|||
width: max-content;
|
||||
}
|
||||
table {
|
||||
color: #606266;
|
||||
border-top: 1px solid #ebeef5;
|
||||
border-left: 1px solid #ebeef5;
|
||||
}
|
||||
tbody tr:nth-child(odd) {
|
||||
background-color: #f5f7fa;
|
||||
|
||||
}
|
||||
tr{
|
||||
min-height: 40px;
|
||||
}
|
||||
td {
|
||||
height: 25px;
|
||||
padding: 5px;
|
||||
min-height: 40px;
|
||||
line-height: 30px;
|
||||
text-align: left;
|
||||
border-right: 1px solid #ebeef5;
|
||||
border-bottom: 1px solid #ebeef5;
|
||||
}
|
||||
th{
|
||||
height: 34px;
|
||||
padding: 12px 0;
|
||||
min-height: 40px;
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
word-break: break-all;
|
||||
border-right: 1px solid #ebeef5;
|
||||
border-bottom: 1px solid #ebeef5;
|
||||
/* background-color: #5ca969; */
|
||||
}
|
||||
input{
|
||||
width: 100%;
|
||||
|
|
@ -1156,8 +1168,12 @@ input{
|
|||
border: none;
|
||||
padding: 0 2px;
|
||||
}
|
||||
.w_30{
|
||||
width: 30px;
|
||||
.checkboxInput{
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
}
|
||||
.w_50{
|
||||
width: 50px;
|
||||
}
|
||||
.w_80{
|
||||
width: 80px;
|
||||
|
|
@ -1174,21 +1190,19 @@ input{
|
|||
.w_180{
|
||||
width: 180px;
|
||||
}
|
||||
.inlineBlock{
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.padding_4{
|
||||
padding: 4px; /* 添加内边距 */
|
||||
}
|
||||
.btn{
|
||||
margin: 2px 2px;
|
||||
margin:0 5px;
|
||||
border: none;
|
||||
color: #ffffff;
|
||||
font-size: 12px;
|
||||
border-radius: 4px;
|
||||
width: 55px;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
height: 30px;
|
||||
line-height: 28px;
|
||||
}
|
||||
.btn_red{
|
||||
background: #ff0000;
|
||||
|
|
|
|||
Loading…
Reference in New Issue