在制品变更处理接口联调

dev-scheduling
zhangdi 2 months ago
parent 8971f0d0ad
commit e03e1710a4
  1. 18
      src/api/productionManagement/WIPChange.js
  2. 326
      src/views/productionManagement/WIPChange.vue
  3. 152
      src/views/productionManagement/components/taskHandleDialog.vue

@ -0,0 +1,18 @@
import request from '@/axios';
//列表接口
export const getList = (params) => {
return request({
url: '/blade-desk/disTasking/disTaskHandle',
method: 'get',
params
});
};
// 任务完成 /disTasking/taskComplete
export const taskComplete = (data) => {
return request({
url: '/blade-desk/disTasking/taskComplete',
method: 'post',
data
});
};

@ -20,14 +20,14 @@
<el-button type="text" @click="handleFn(row)">处理</el-button>
</template>
</avue-crud>
<!-- 处理 -->
<taskHandleDialog
v-if="isHandleShow"
:showDialog="isHandleShow"
@closeDialog="closeDialog"
:flag="false"
:rowItem="rowItem"
></taskHandleDialog>
<!-- 转派 -->
<assignDaialog
v-if="isAssignShow"
:showDialog="isAssignShow"
@ -36,10 +36,10 @@
</basic-container>
</template>
<script>
import { status } from "nprogress";
import taskHandleDialog from "./components/taskHandleDialog.vue";
import assignDaialog from "./components/assignDaialog.vue";
import { status } from 'nprogress';
import taskHandleDialog from './components/taskHandleDialog.vue';
import assignDaialog from './components/assignDaialog.vue';
import { getList, taskComplete } from '@/api/productionManagement/WIPChange.js';
export default {
components: {
taskHandleDialog,
@ -52,7 +52,7 @@ export default {
form: {},
option: {
tip: false,
height: "auto",
height: 'auto',
calcHeight: 32,
columnSort: true,
// simplePage: true,
@ -68,13 +68,13 @@ export default {
delBtn: false,
addBtn: false,
editBtn: false,
editBtnText: "修改",
viewBtnText: "详情",
addBtnIcon: " ",
viewBtnIcon: " ",
delBtnIcon: " ",
editBtnIcon: " ",
labelWidth: "200px",
editBtnText: '修改',
viewBtnText: '详情',
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
labelWidth: '200px',
dialogWidth: 600,
menuWidth: 120,
dialogClickModal: false,
@ -83,142 +83,133 @@ export default {
searchShowBtn: false,
excelBtn: true,
showOverflowTooltip: true,
align: "center",
searchLabelPosition: "left",
searchLabelPosition: "left",
align: 'center',
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
menuAlign: "left",
menuAlign: 'left',
gridBtn: false,
searchMenuPosition: "right",
searchMenuPosition: 'right',
column: [
{
label: "物料号",
prop: "partCode",
bind: "dsTasking.partCode",
label: '物料号',
prop: 'partCode',
search: true,
sortable: true,
filter: true,
width: 120,
},
{
label: "物料名称",
prop: "partName",
bind: "dsTasking.partName",
label: '物料名称',
prop: 'partName',
search: true,
sortable: true,
filter: true,
width: 120,
},
{
label: "镀种",
prop: "plate",
bind: "dsTasking.plate",
label: '镀种',
prop: 'plate',
search: true,
sortable: true,
filter: true,
width: 120,
},
{
label: "批次号",
prop: "batchNo",
label: '批次号',
prop: 'batchNo',
search: false,
sortable: true,
filter: true,
width: 120,
},
{
label: "流程卡号",
prop: "cardNo",
label: '流程卡号',
prop: 'cardNo',
search: false,
sortable: true,
filter: true,
width: 120,
},
{
label: "版本",
prop: "versionNo",
bind: "dsTasking.versionNo",
label: '版本',
prop: 'version',
search: true,
sortable: true,
filter: true,
width: 120,
},
{
label: "PDM发布时间",
prop: "createTime",
bind: "dsTasking.createTime",
label: 'PDM发布时间',
prop: 'pdmCreateTime',
search: false,
sortable: true,
filter: true,
width: 140,
},
{
label: "工艺路线详情",
prop: "wayDetails",
bind: "dsTasking.wayDetails",
label: '工艺路线详情',
prop: 'wayDetails',
search: false,
sortable: true,
filter: true,
width: 140,
},
{
label: "在制品意见",
prop: "wipTake",
bind: "dsTasking.wipTake",
label: '在制品意见',
prop: 'wipTake',
search: false,
sortable: true,
filter: true,
width: 120,
},
{
label: "更改单号",
prop: "ecnNo",
bind: "dsTasking.ecnNo",
label: '更改单号',
prop: 'changeNo',
search: true,
sortable: true,
filter: true,
width: 120,
},
{
label: "调度员",
prop: "searchCode",
label: '调度员',
prop: 'searchCode',
search: true,
sortable: true,
filter: true,
width: 120,
},
{
label: "完成时间",
prop: "dispatchTime",
label: '完成时间',
prop: 'craftTime',
search: false,
sortable: true,
filter: true,
width: 120,
},
{
label: "任务时间",
prop: "createTime",
label: '任务时间',
prop: 'taskTime',
search: false,
sortable: true,
filter: true,
width: 120,
},
{
label: "状态",
prop: "status",
label: '状态',
prop: 'status',
search: true,
sortable: true,
filter: true,
width: 120,
type: "select",
type: 'select',
dicData: [
{
label: "待处理",
label: '待处理',
value: 1,
},
{
label: "已处理",
label: '已处理',
value: 2,
},
],
@ -227,6 +218,7 @@ export default {
},
isHandleShow: false,
isAssignShow: false,
rowItem:{}
};
},
mounted() {},
@ -235,219 +227,21 @@ export default {
this.isAssignShow = true;
},
handleFn(row) {
this.rowItem = row
this.isHandleShow = true;
},
closeDialog() {
this.isHandleShow = false;
this.isAssignShow = false;
},
receiveData(row) {
this.$confirm("确定接收此工单?", "提示", {
confirmButtonText: "确认",
cancelButtonText: "取消",
type: "warning",
}).then(() => {});
},
finishData(row) {
this.$confirm("确定完成此工单?", "提示", {
confirmButtonText: "确认",
cancelButtonText: "取消",
type: "warning",
}).then(() => {});
},
onLoad() {
this.data = [
{
batchNo: "Y6942304004",
cardNo: "1016803763",
createTime: null,
ddtId: 1485,
disAssignMan: null,
disAssignManName: null,
disAssignTime: "2023-10-17 09:38:11",
disOutFlag: true,
disTaskStatus: 1,
disTaskStatusTitle: "已分派",
dispatchMan: {
accountId: 388,
card: null,
createTime: "2023-02-08",
curStatus: 1,
deleted: false,
deptName: null,
dimissionTime: null,
factoryId: 41,
head: 0,
jobName: "表面处理工",
keyValue: 449,
ldapName: "08355",
mail: null,
mobile: null,
pfDepartment: {
appLink: null,
createTime: "2023-02-08",
deleted: false,
deptCode: "23",
deptId: 65,
deptName: "外协业务交付管理室",
deptType: 1,
deptTypeTitle: "厂",
keyValue: 65,
memo: null,
orders: "23",
parentDeptId: 41,
parentPath: null,
ucDeptId: null,
updateTime: "2023-02-08 16:41:39",
},
pinyinIndex: "08355,08355",
ucUserId: null,
updateTime: "2023-02-08 17:25:13",
userCode: "08355",
userId: 449,
userName: "08355",
userSex: 1,
userSources: "08355",
userString: "449:A:08355",
userType: "A",
},
dispatchManName: null,
dispatchTime: null,
dsTasking: {
askForMold: false,
assignMan: null,
assignTime: null,
craftMan: null,
craftManName: null,
craftTime: null,
craftWay: null,
createTime: null,
dtId: 32545,
ecnLink: null,
ecnNo: null,
extension: false,
finalPlate: null,
inProduction: false,
keyValue: 32545,
material: null,
memo: null,
outFlag: true,
outType: "4",
outTypeTitle: "审理单超时",
partCode: "21E8-170-816-E9",
partId: null,
partName: null,
plate: "XXXX",
syncTime: "2023-10-17 09:38:11",
taskStatus: 1,
taskStatusTitle: "已分派",
transferMess: null,
versionNo: null,
wayDetails: null,
wipTake: null,
},
extension: true,
handleResult: null,
memo:
"流程卡号为: 1016803763 ,批次号为 Y6942304004 的 0025 检验工序的单子已超过三小时未处理!!!",
rsCode: null,
},
{
batchNo: "Y0262304119",
cardNo: "1016835815",
createTime: null,
ddtId: 1484,
disAssignMan: null,
disAssignManName: null,
disAssignTime: "2023-10-17 09:38:11",
disOutFlag: true,
disTaskStatus: 1,
disTaskStatusTitle: "已分派",
dispatchMan: {
accountId: 369,
card: null,
createTime: "2023-02-08",
curStatus: 1,
deleted: false,
deptName: null,
dimissionTime: null,
factoryId: 41,
head: 0,
jobName: "表面处理工",
keyValue: 355,
ldapName: "07188",
mail: null,
mobile: null,
pfDepartment: {
appLink: null,
createTime: "2023-02-08",
deleted: false,
deptCode: "36",
deptId: 79,
deptName: "热处理班",
deptType: 1,
deptTypeTitle: "厂",
keyValue: 79,
memo: null,
orders: "36",
parentDeptId: 41,
parentPath: null,
ucDeptId: null,
updateTime: "2023-02-08 16:44:17",
},
pinyinIndex: "07188,07188",
ucUserId: null,
updateTime: "2023-02-08 17:25:08",
userCode: "07188",
userId: 355,
userName: "07188",
userSex: 1,
userSources: "07188",
userString: "355:A:07188",
userType: "A",
},
dispatchManName: null,
dispatchTime: null,
dsTasking: {
askForMold: false,
assignMan: null,
assignTime: null,
craftMan: null,
craftManName: null,
craftTime: null,
craftWay: null,
createTime: null,
dtId: 32544,
ecnLink: null,
ecnNo: null,
extension: false,
finalPlate: null,
inProduction: false,
keyValue: 32544,
material: null,
memo: null,
outFlag: true,
outType: "4",
outTypeTitle: "审理单超时",
partCode: "21E8-001-1825-E9-D",
partId: null,
partName: null,
plate: "XXXX",
syncTime: "2023-10-17 09:38:11",
taskStatus: 1,
taskStatusTitle: "已分派",
transferMess: null,
versionNo: null,
wayDetails: null,
wipTake: null,
},
extension: true,
handleResult: null,
memo:
"流程卡号为: 1016835815 ,批次号为 Y0262304119 的 0035 检验工序的单子已超过三小时未处理!!!",
rsCode: null,
},
];
onLoad(page, params = {}) {
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.data = res.data.data.records;
this.loading = false;
this.page.total = res.data.data.total;
this.selectionClear();
});
},
},
};

@ -1,71 +1,101 @@
<template>
<el-dialog title="处理" append-to-body :modelValue="openShow" width="35%" @close="closeDialog">
<el-dialog title="处理" append-to-body :modelValue="openShow" width="35%" @close="closeDialog">
<el-form
ref="form"
:model="formData"
:rules="rules"
label-width="80px"
class="vd-form-row"
>
<el-row>
<el-col :span="24">
<el-form-item label="审理单号" prop="rsCode">
<el-input v-model="formData.rsCode" type="text" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="处理意见" prop="handleResult">
<el-input v-model="formData.handleResult" type="textarea" :rows="3" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- <el-form v-else ref="form" :model="formData" label-width="80px" class="vd-form-row">
<el-row>
<el-col :span="24">
<el-form-item label="处理意见" prop="handleResult">
<el-input v-model="formData.handleResult" type="textarea" :rows="3" />
</el-form-item>
</el-col>
</el-row>
</el-form> -->
<el-form v-if="flag" ref="form" :model="formData" :rules="rules" label-width="80px" class="vd-form-row">
<el-row>
<el-col :span="24">
<el-form-item label="审理单号" prop="rsCode">
<el-input v-model="formData.rsCode" type="text" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="处理意见" prop="handleResult">
<el-input v-model="formData.handleResult" type="textarea" :rows="3" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-form v-else ref="form" :model="formData" label-width="80px" class="vd-form-row">
<el-row>
<el-col :span="24">
<el-form-item label="处理意见" prop="handleResult">
<el-input v-model="formData.handleResult" type="textarea" :rows="3" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="closeDialog"> </el-button>
<el-button type="primary" @click="submit"> </el-button>
</span>
</template>
</el-dialog>
<template #footer>
<span class="dialog-footer">
<el-button @click="closeDialog"> </el-button>
<el-button type="primary" @click="submit"> </el-button>
</span>
</template>
</el-dialog>
</template>
<script>
import { taskComplete } from '@/api/productionManagement/WIPChange.js';
export default {
props: {
flag: {
type: Boolean,
default: false
},
showDialog: {
type: Boolean,
default: false
},
props: {
showDialog: {
type: Boolean,
default: false,
},
data() {
return {
openShow: false,
formData: {},
rules: {
rsCode: [{ required: true }],
handleResult: [{ required: true }]
}
}
rowItem: {
type: Object,
default: () => ({}),
},
mounted() {
this.openShow = this.showDialog
},
data() {
return {
openShow: false,
formData: {},
rules: {
rsCode: [{ required: true }],
handleResult: [{ required: true }],
},
};
},
mounted() {
this.openShow = this.showDialog;
},
methods: {
closeDialog() {
this.openShow = false;
this.$emit('closeDialog');
},
methods: {
closeDialog() {
this.openShow = false
this.$emit('closeDialog');
submit() {
this.$refs.form.validate(valid => {
if (valid) {
let query = {
ddtIdList:[this.rowItem.ddtId], //ID
rsCode: this.formData.rsCode, //
handleResult: this.formData.handleResult, //
loginUser: '', //
isDefault: '',
partCode: this.rowItem.partCode, //
partName: this.rowItem.partName, //
plate: this.rowItem.plate, //
version: this.rowItem.version, //
changeNo: this.rowItem.changeNo, //
disAssignMan: this.rowItem.disAssignMan, //
};
taskComplete(query).then(res => {
this.$message.success('处理成功');
this.closeDialog();
});
}
}
}
});
},
},
};
</script>
<style lang="scss" scoped></style>
<style lang="scss" scoped></style>

Loading…
Cancel
Save