yinq
/
XMXS-OS-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 工单字段修改

Browse Source
main
yinq 5 months ago
parent 086e7b3674
commit 915152fb5b
3 changed files with 97 additions and 96 deletions
Show Stats Download Patch File Download Diff File

1
src/views/mes/prod/prodOrderInfo/releasePlan.vue
Unescape Escape View File

@ -228,7 +228,6 @@ export default {
obj.planBeginTime = this.form.beginDate
obj.planEndTime = this.form.endDate
this.mesProductPlanList.push(obj)
console.log(this.mesProductPlanList)
})
})
},

78
src/views/mes/prod/prodPlanInfo/index.vue
Unescape Escape View File

@ -94,17 +94,17 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes/prod:prodPlanInfo:add']"
>新增
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['mes/prod:prodPlanInfo:add']"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="success"
@ -150,9 +150,9 @@
<el-table-column label="订单编号" align="center" prop="orderCode" v-if="columns[2].visible"/>
<el-table-column label="物料编号" align="center" prop="materialCode" v-if="columns[3].visible"/>
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[4].visible"/>
<el-table-column label="计划工位" align="center" prop="stationCode" v-if="columns[5].visible"/>
<el-table-column label="计划工位" align="center" prop="stationName" v-if="columns[5].visible"/>
<el-table-column label="设备编号" align="center" prop="deviceCode" v-if="columns[6].visible"/>
<el-table-column label="计划班组" align="center" prop="teamCode" v-if="columns[7].visible"/>
<el-table-column label="计划班组" align="center" prop="teamName" v-if="columns[7].visible"/>
<el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[8].visible"/>
<el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[9].visible"/>
<el-table-column label="实际开始时间" align="center" prop="beginTime" width="180" v-if="columns[10].visible">
@ -182,26 +182,26 @@
<span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes/prod:prodPlanInfo:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes/prod:prodPlanInfo:remove']"
>删除
</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['mes/prod:prodPlanInfo:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['mes/prod:prodPlanInfo:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
@ -370,23 +370,23 @@ export default {
]
},
columns: [
{ key: 0, label: `主键标识`, visible: true },
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `工单编号`, visible: true },
{ key: 2, label: `订单编号`, visible: true },
{ key: 3, label: `物料编号`, visible: true },
{ key: 4, label: `物料名称`, visible: true },
{ key: 5, label: `计划工位`, visible: true },
{ key: 6, label: `设备编号`, visible: true },
{ key: 6, label: `设备编号`, visible: false },
{ key: 7, label: `计划班组`, visible: true },
{ key: 8, label: `计划数量`, visible: true },
{ key: 9, label: `完成数量`, visible: true },
{ key: 10, label: `实际开始时间`, visible: true },
{ key: 11, label: `实际完成时间`, visible: true },
{ key: 12, label: `完成标识`, visible: true },
{ key: 13, label: `创建人`, visible: true },
{ key: 14, label: `创建时间`, visible: true },
{ key: 15, label: `更新人`, visible: true },
{ key: 16, label: `更新时间`, visible: true }
{ key: 13, label: `创建人`, visible: false },
{ key: 14, label: `创建时间`, visible: false },
{ key: 15, label: `更新人`, visible: false },
{ key: 16, label: `更新时间`, visible: false }
]
}
},

114
src/views/mes/record/recordStaffAttendance/index.vue
Unescape Escape View File

@ -29,10 +29,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="班组编号" prop="teamCode">
<el-form-item label="所属班组" prop="teamCode">
<el-input
v-model="queryParams.teamCode"
placeholder="请输入班组编号"
placeholder="请输入所属班组"
clearable
@keyup.enter.native="handleQuery"
/>
@ -55,29 +55,29 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes/record:recordStaffAttendance:add']"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes/record:recordStaffAttendance:edit']"
>修改
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['mes/record:recordStaffAttendance:add']"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['mes/record:recordStaffAttendance:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="danger"
@ -108,17 +108,23 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="员工ID" align="center" prop="staffId" v-if="columns[1].visible"/>
<el-table-column label="员工姓名" align="center" prop="staffName" v-if="columns[12].visible"/>
<el-table-column label="打卡类型" align="center" prop="attendanceType" v-if="columns[2].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.attendance_type" :value="scope.row.attendanceType"/>
</template>
</el-table-column>
<el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[3].visible"/>
<el-table-column label="班组" align="center" prop="teamName" v-if="columns[3].visible"/>
<el-table-column label="班次" align="center" prop="classes" v-if="columns[4].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.classes" :value="scope.row.classes"/>
</template>
</el-table-column>
<el-table-column label="打卡时间" align="center" prop="createTime" width="180" v-if="columns[8].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible"/>
<el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[6].visible">
<template slot-scope="scope">
@ -126,11 +132,6 @@
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[7].visible"/>
<el-table-column label="打卡时间" align="center" prop="createTime" width="180" v-if="columns[8].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[9].visible"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[10].visible">
<template slot-scope="scope">
@ -138,26 +139,26 @@
</template>
</el-table-column>
<el-table-column label="机台编号" align="center" prop="machineCode" v-if="columns[11].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes/record:recordStaffAttendance:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes/record:recordStaffAttendance:remove']"
>删除
</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['mes/record:recordStaffAttendance:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['mes/record:recordStaffAttendance:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
@ -184,8 +185,8 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="班组编号" prop="teamCode">
<el-input v-model="form.teamCode" placeholder="请输入班组编号"/>
<el-form-item label="所属班组" prop="teamCode">
<el-input v-model="form.teamCode" placeholder="请输入所属班组"/>
</el-form-item>
<el-form-item label="班次" prop="classes">
<el-radio-group v-model="form.classes">
@ -276,15 +277,16 @@ export default {
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `员工ID`, visible: true },
{ key: 2, label: `打卡类型`, visible: true },
{ key: 3, label: `班组编号`, visible: true },
{ key: 4, label: `班次`, visible: true },
{ key: 3, label: `所属班组`, visible: true },
{ key: 4, label: `班次`, visible: false },
{ key: 5, label: `备注`, visible: true },
{ key: 6, label: `是否标识`, visible: false },
{ key: 7, label: `创建人`, visible: false },
{ key: 8, label: `打卡时间`, visible: true },
{ key: 9, label: `更新人`, visible: false },
{ key: 10, label: `更新时间`, visible: false },
{ key: 11, label: `机台编号`, visible: true }
{ key: 11, label: `机台编号`, visible: false },
{ key: 12, label: `员工姓名`, visible: true },
]
}
},

Write Preview
Loading…
Cancel
Save