|
|
@@ -52,6 +52,97 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="检查开始时间" required prop="checkStartTime">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="addForm.checkStartTime"
|
|
|
+ type="datetime"
|
|
|
+ format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ placeholder="选择日期"
|
|
|
+ style="width: 100%"
|
|
|
+ :picker-options="{
|
|
|
+ disabledDate: (time) => time.getTime() > Date.now()
|
|
|
+ }"
|
|
|
+ @change="computedDuration"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="检查结束时间" required prop="checkFinishTime">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="addForm.checkFinishTime"
|
|
|
+ type="datetime"
|
|
|
+ format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ placeholder="选择日期"
|
|
|
+ style="width: 100%"
|
|
|
+ :picker-options="{
|
|
|
+ disabledDate: (time) => time.getTime() > Date.now()
|
|
|
+ }"
|
|
|
+ @change="computedDuration"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="执行人">
|
|
|
+ <el-select
|
|
|
+ v-model="addForm.teamId"
|
|
|
+ placeholder="请选择班组"
|
|
|
+ filterable
|
|
|
+ style="width: 120px"
|
|
|
+ @change="checkTeamList(addForm.teamId)"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in teamList"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
+ :key="item.id"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ <el-select
|
|
|
+ v-model="addForm.executeUsersIds"
|
|
|
+ placeholder="请选择执行人"
|
|
|
+ filterable
|
|
|
+ multiple
|
|
|
+ @change="changeId"
|
|
|
+ >
|
|
|
+ <div class="checkboxWrapper">
|
|
|
+ <el-checkbox v-model="checked" @change="checkChange">
|
|
|
+ 全选
|
|
|
+ </el-checkbox>
|
|
|
+ </div>
|
|
|
+ <el-option
|
|
|
+ v-for="item in teamUserList"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
+ :key="item.id"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="工时">
|
|
|
+ <el-input
|
|
|
+ placeholder="请输入"
|
|
|
+ v-model="addForm.duration"
|
|
|
+ type="number"
|
|
|
+ min="0"
|
|
|
+ step="0.1"
|
|
|
+ @change="durationChagne"
|
|
|
+ >
|
|
|
+ <template slot="append">
|
|
|
+ <div style="width: 40px; box-sizing: border-box">小时</div>
|
|
|
+ </template>
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
</el-form>
|
|
|
|
|
|
<!-- 底部按钮 -->
|
|
|
@@ -79,6 +170,8 @@
|
|
|
import DictSelection from '@/components/Dict/DictSelection.vue';
|
|
|
import SelectUser from '@/components/select/SelectUser/index.vue';
|
|
|
import { saveRuleRecord } from '@/api/producetaskrulerecord/index.js';
|
|
|
+ import { getTeam } from '@/api/produce/job.js';
|
|
|
+ import { getById } from '@/api/producetaskrecordrulesrecord/index';
|
|
|
|
|
|
export default {
|
|
|
components: { SelectUser },
|
|
|
@@ -122,7 +215,13 @@
|
|
|
specification: '',
|
|
|
workOrderCode: '',
|
|
|
workOrderId: 0,
|
|
|
- itemTaskName: ''
|
|
|
+ itemTaskName: '',
|
|
|
+ teamId: null,
|
|
|
+ checkStartTime: '',
|
|
|
+ checkFinishTime: '',
|
|
|
+ duration: null,
|
|
|
+ executeUsers: [],
|
|
|
+ executeUsersIds: []
|
|
|
};
|
|
|
|
|
|
return {
|
|
|
@@ -153,6 +252,51 @@
|
|
|
message: '请选择检查有效期单位',
|
|
|
trigger: 'change'
|
|
|
}
|
|
|
+ ],
|
|
|
+ checkStartTime: [
|
|
|
+ { required: true, message: '请选择检查开始时间', trigger: 'blur' },
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: '请选择检查开始时间',
|
|
|
+ trigger: 'change'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ validator: (rule, value, callback) => {
|
|
|
+ if (!value) return callback();
|
|
|
+ const start = new Date(value).getTime();
|
|
|
+ const now = Date.now();
|
|
|
+ if (start > now) {
|
|
|
+ callback(new Error('开始时间不能超过当前时间'));
|
|
|
+ } else {
|
|
|
+ callback();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ trigger: 'blur'
|
|
|
+ }
|
|
|
+ ],
|
|
|
+ checkFinishTime: [
|
|
|
+ { required: true, message: '请选择检查完成时间', trigger: 'blur' },
|
|
|
+ {
|
|
|
+ required: true,
|
|
|
+ message: '请选择检查完成时间',
|
|
|
+ trigger: 'change'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ validator: (rule, value, callback) => {
|
|
|
+ if (!value) return callback();
|
|
|
+ const start = new Date(this.addForm.checkStartTime).getTime();
|
|
|
+ const finish = new Date(value).getTime();
|
|
|
+ const now = Date.now();
|
|
|
+ if (finish <= start) {
|
|
|
+ callback(new Error('结束时间必须大于开始时间'));
|
|
|
+ } else if (finish > now) {
|
|
|
+ callback(new Error('结束时间不能超过当前时间'));
|
|
|
+ } else {
|
|
|
+ callback();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ trigger: 'blur'
|
|
|
+ }
|
|
|
]
|
|
|
},
|
|
|
productionInfo: null,
|
|
|
@@ -167,10 +311,23 @@
|
|
|
loading: false,
|
|
|
title: '任务确认',
|
|
|
// 编辑 或者是 详情 edit detila
|
|
|
- type: 'edit'
|
|
|
+ type: 'edit',
|
|
|
+ checked: false,
|
|
|
+ teamUserList: [],
|
|
|
+ teamList: [],
|
|
|
+ teamAllList: [],
|
|
|
+ checked: false
|
|
|
};
|
|
|
},
|
|
|
computed: {},
|
|
|
+ mounted() {
|
|
|
+ if (localStorage.getItem('singleUserInfo') == '1') {
|
|
|
+ const data = JSON.parse(localStorage.getItem('chooseUserInfo'));
|
|
|
+ this.getTeamList(data.teamId);
|
|
|
+ } else {
|
|
|
+ this.getTeamList(this.$store.state.user.info.teamId);
|
|
|
+ }
|
|
|
+ },
|
|
|
methods: {
|
|
|
openView(productionInfo, workOrderInfo) {
|
|
|
this.type = 'detail';
|
|
|
@@ -186,25 +343,31 @@
|
|
|
this.productionInfo = productionInfo;
|
|
|
this.workOrderInfo = workOrderInfo;
|
|
|
|
|
|
- this.addForm.batchNo = workOrderInfo.batchNo;
|
|
|
- this.addForm.executeMethod = productionInfo.executeMethod;
|
|
|
- this.addForm.formingNum = workOrderInfo.formingNum;
|
|
|
- this.addForm.itemType = productionInfo.itemType;
|
|
|
- this.addForm.produceRoutingId = workOrderInfo.produceRoutingId;
|
|
|
- this.addForm.produceRoutingName = workOrderInfo.produceRoutingName;
|
|
|
- this.addForm.produceTaskConfigId = productionInfo.produceTaskConfigId;
|
|
|
- this.addForm.produceTaskId = productionInfo.produceTaskId;
|
|
|
- this.addForm.produceTaskName = productionInfo.produceTaskName;
|
|
|
- this.addForm.productCode = workOrderInfo.productCode;
|
|
|
- this.addForm.productModel = workOrderInfo.model;
|
|
|
- this.addForm.productName = workOrderInfo.productName;
|
|
|
- this.addForm.reportWorkType = productionInfo.reportWorkType;
|
|
|
- this.addForm.specification = workOrderInfo.specification;
|
|
|
- this.addForm.workOrderCode = workOrderInfo.code;
|
|
|
- this.addForm.workOrderId = workOrderInfo.id;
|
|
|
- this.addForm.itemTaskName = productionInfo.itemTaskName;
|
|
|
- this.addForm.ruleId = productionInfo.ruleId;
|
|
|
- this.addForm.brandNo = productionInfo.brandNo;
|
|
|
+ // 存在缓存记录
|
|
|
+ if (this.productionInfo.recordId != null) {
|
|
|
+ // 查询详情
|
|
|
+ this.getCacheInfo();
|
|
|
+ } else {
|
|
|
+ this.addForm.batchNo = workOrderInfo.batchNo;
|
|
|
+ this.addForm.executeMethod = productionInfo.executeMethod;
|
|
|
+ this.addForm.formingNum = workOrderInfo.formingNum;
|
|
|
+ this.addForm.itemType = productionInfo.itemType;
|
|
|
+ this.addForm.produceRoutingId = workOrderInfo.produceRoutingId;
|
|
|
+ this.addForm.produceRoutingName = workOrderInfo.produceRoutingName;
|
|
|
+ this.addForm.produceTaskConfigId = productionInfo.produceTaskConfigId;
|
|
|
+ this.addForm.produceTaskId = productionInfo.produceTaskId;
|
|
|
+ this.addForm.produceTaskName = productionInfo.produceTaskName;
|
|
|
+ this.addForm.productCode = workOrderInfo.productCode;
|
|
|
+ this.addForm.productModel = workOrderInfo.model;
|
|
|
+ this.addForm.productName = workOrderInfo.productName;
|
|
|
+ this.addForm.reportWorkType = productionInfo.reportWorkType;
|
|
|
+ this.addForm.specification = workOrderInfo.specification;
|
|
|
+ this.addForm.workOrderCode = workOrderInfo.code;
|
|
|
+ this.addForm.workOrderId = workOrderInfo.id;
|
|
|
+ this.addForm.itemTaskName = productionInfo.itemTaskName;
|
|
|
+ this.addForm.ruleId = productionInfo.ruleId;
|
|
|
+ this.addForm.brandNo = productionInfo.brandNo;
|
|
|
+ }
|
|
|
|
|
|
console.log('this.productionInfo', this.productionInfo);
|
|
|
console.log('this.addForm', this.addForm);
|
|
|
@@ -231,7 +394,13 @@
|
|
|
// 提交
|
|
|
this.butLoading = true;
|
|
|
try {
|
|
|
- await saveRuleRecord(this.addForm);
|
|
|
+ const body = JSON.parse(JSON.stringify(this.addForm));
|
|
|
+
|
|
|
+ // 工时小时转毫秒
|
|
|
+ body.duration = Number(body.duration);
|
|
|
+ body.duration = body.duration * 60 * 60 * 1000;
|
|
|
+
|
|
|
+ await saveRuleRecord(body);
|
|
|
this.$message.success('报工成功！');
|
|
|
|
|
|
this.butLoading = false;
|
|
|
@@ -244,6 +413,152 @@
|
|
|
this.butLoading = false;
|
|
|
}
|
|
|
});
|
|
|
+ },
|
|
|
+ durationChagne() {
|
|
|
+ // 保留小数后一位
|
|
|
+ if (
|
|
|
+ this.addForm.duration &&
|
|
|
+ this.addForm.duration.toString().includes('.')
|
|
|
+ ) {
|
|
|
+ this.addForm.duration = Number(this.addForm.duration).toFixed(1);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ async getTeamList(id) {
|
|
|
+ if (!id) return;
|
|
|
+ const ids = id.split(',');
|
|
|
+ this.teamList = [];
|
|
|
+ this.teamUserList = [];
|
|
|
+ const list = ids.map((item) => getTeam(item));
|
|
|
+
|
|
|
+ const dataList = await Promise.all(list);
|
|
|
+
|
|
|
+ dataList.forEach((item) => {
|
|
|
+ this.teamList.push({
|
|
|
+ name: item.name,
|
|
|
+ id: item.id
|
|
|
+ });
|
|
|
+
|
|
|
+ this.teamAllList.push(item.userVOList);
|
|
|
+ });
|
|
|
+ },
|
|
|
+ checkTeamList(id) {
|
|
|
+ const index = this.teamList.findIndex((item) => item.id == id);
|
|
|
+ this.teamUserList = this.teamAllList[index];
|
|
|
+ console.log('this.teamUserList', this.teamUserList);
|
|
|
+ },
|
|
|
+ changeId() {
|
|
|
+ if (this.addForm.executeUsersIds.length == this.teamUserList.length) {
|
|
|
+ this.checked = true;
|
|
|
+ } else {
|
|
|
+ this.checked = false;
|
|
|
+ }
|
|
|
+
|
|
|
+ const deleteUserIds = this.addForm.executeUsers
|
|
|
+ .map((i) => i.userId)
|
|
|
+ .filter((id) => !this.addForm.executeUsersIds.includes(id));
|
|
|
+
|
|
|
+ const addUserIds = this.addForm.executeUsersIds.filter(
|
|
|
+ (id) => !this.addForm.executeUsers.map((i) => i.userId).includes(id)
|
|
|
+ );
|
|
|
+
|
|
|
+ // 删除 用户
|
|
|
+ if (deleteUserIds.length > 0) {
|
|
|
+ this.addForm.executeUsers = this.addForm.executeUsers.filter(
|
|
|
+ (item) => !deleteUserIds.includes(item.userId)
|
|
|
+ );
|
|
|
+ }
|
|
|
+
|
|
|
+ // 添加 用户
|
|
|
+ addUserIds.forEach((id) => {
|
|
|
+ const user = this.teamUserList.find((item) => item.id === id);
|
|
|
+ if (user) {
|
|
|
+ this.addForm.executeUsers.push({
|
|
|
+ teamId: this.addForm.teamId,
|
|
|
+ teamName: this.teamList.find(
|
|
|
+ (team) => team.id == this.addForm.teamId
|
|
|
+ )?.name,
|
|
|
+ userId: user.id,
|
|
|
+ userName: user.name
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ console.log('this.addForm.executeUsers', this.addForm.executeUsers);
|
|
|
+
|
|
|
+ this.computedDuration();
|
|
|
+
|
|
|
+ // 同步详情执行人
|
|
|
+ this.addForm.details.forEach((detail) => {
|
|
|
+ detail.checkUsersIds = this.addForm.executeUsersIds;
|
|
|
+ detail.checkUsers = this.addForm.executeUsers;
|
|
|
+ });
|
|
|
+ },
|
|
|
+ // 计算工时
|
|
|
+ computedDuration() {
|
|
|
+ if (
|
|
|
+ this.addForm.checkStartTime &&
|
|
|
+ this.addForm.checkFinishTime &&
|
|
|
+ this.addForm.executeUsersIds.length > 0
|
|
|
+ ) {
|
|
|
+ const start = new Date(this.addForm.checkStartTime);
|
|
|
+ const finish = new Date(this.addForm.checkFinishTime);
|
|
|
+ const diff = finish - start; // 毫秒差值
|
|
|
+ const hours = diff / (1000 * 60 * 60); // 转换为小时
|
|
|
+ const totalDuration = hours * this.addForm.executeUsersIds.length;
|
|
|
+ this.addForm.duration = totalDuration.toFixed(1);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ checkChange() {
|
|
|
+ this.addForm.executeUsersIds = [];
|
|
|
+ if (this.checked) {
|
|
|
+ this.addForm.executeUsersIds = this.teamUserList.map(
|
|
|
+ (item) => item.id
|
|
|
+ );
|
|
|
+ } else {
|
|
|
+ this.addForm.executeUsersIds = [];
|
|
|
+ }
|
|
|
+ },
|
|
|
+ // 获取详情
|
|
|
+ async getCacheInfo() {
|
|
|
+ this.loading = true;
|
|
|
+ try {
|
|
|
+ const data = await getById(this.productionInfo.recordId);
|
|
|
+ console.log('dat 缓存', data);
|
|
|
+
|
|
|
+ this.$util.assignObject(this.addForm, data);
|
|
|
+
|
|
|
+ // 工时毫秒转小时
|
|
|
+ this.addForm.duration = (
|
|
|
+ this.addForm.duration /
|
|
|
+ (1000 * 60 * 60)
|
|
|
+ ).toFixed(2);
|
|
|
+
|
|
|
+ this.addForm.recordRulesClassify += '';
|
|
|
+
|
|
|
+ this.addForm.executeUsersIds = this.addForm.executeUsers.map(
|
|
|
+ (i) => i.userId
|
|
|
+ );
|
|
|
+
|
|
|
+ this.addForm.teamId =
|
|
|
+ this.addForm.executeUsers.length > 0
|
|
|
+ ? this.addForm.executeUsers[0].teamId
|
|
|
+ : '';
|
|
|
+
|
|
|
+ // 加载班组人员列表
|
|
|
+ if (this.addForm.teamId) {
|
|
|
+ const index = this.teamList.findIndex(
|
|
|
+ (item) => item.id == this.addForm.teamId
|
|
|
+ );
|
|
|
+ this.teamUserList = this.teamAllList[index];
|
|
|
+ console.log('this.teamUserList', this.teamUserList);
|
|
|
+ }
|
|
|
+
|
|
|
+ console.log('this.addForm', this.addForm);
|
|
|
+
|
|
|
+ this.loading = false;
|
|
|
+ } catch (error) {
|
|
|
+ this.loading = false;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
@@ -264,4 +579,24 @@
|
|
|
.el-form-item .el-form-item {
|
|
|
margin-bottom: -5px;
|
|
|
}
|
|
|
+
|
|
|
+ .checkboxWrapper {
|
|
|
+ padding: 8px 20px;
|
|
|
+ border-bottom: 1px solid #ccc;
|
|
|
+ }
|
|
|
+
|
|
|
+ ::v-deep .el-select__tags {
|
|
|
+ flex-wrap: nowrap;
|
|
|
+ overflow: auto;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* 输入框最大宽度*/
|
|
|
+ ::v-deep .el-select__tags-text {
|
|
|
+ max-width: 90px;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* 底部滚动条的高度*/
|
|
|
+ ::v-deep .el-select__tags::-webkit-scrollbar {
|
|
|
+ height: 2px !important;
|
|
|
+ }
|
|
|
</style>
|
lucw