生产管理接口联调

dev-scheduling
zhangdi 2 months ago
parent 0347ff275e
commit b46e36c873
  1. 22
      src/api/productionManagement/WIPChange.js
  2. 24
      src/views/productionManagement/WIPChange.vue
  3. 160
      src/views/productionManagement/components/assignDaialog.vue
  4. 11
      src/views/productionManagement/components/taskHandleDialog.vue
  5. 4
      src/views/productionManagement/components/taskHandleQuality.vue

@ -12,11 +12,29 @@ export const getList = (current, size, params) => {
}); });
}; };
// 任务完成 /disTasking/taskComplete // 任务处理
export const taskComplete = (data) => { export const taskComplete = (data) => {
return request({ return request({
url: '/blade-desk/disTasking/taskComplete', url: '/blade-desk/disTasking/taskComplete',
method: 'post', method: 'post',
data data
}); });
}; };
// 转派
export const disTechnician = (data) => {
return request({
url: '/blade-desk/disTasking/disTechnician',
method: 'post',
data
});
};
// 质量任务处理
export const taskCompleteOrder = (data) => {
return request({
url: '/blade-desk/disTasking/taskCompleteOrder',
method: 'post',
data
});
};

@ -29,12 +29,18 @@
:rowItem="rowItem" :rowItem="rowItem"
></taskHandleDialog> ></taskHandleDialog>
<!-- 质量处理 --> <!-- 质量处理 -->
<taskHandleQuality v-if="isTaskHandleQuality" :showDialog="isTaskHandleQuality" @closeDialog="closeDialog" :rowItem="rowItem"></taskHandleQuality> <taskHandleQuality
v-if="isTaskHandleQuality"
:showDialog="isTaskHandleQuality"
@closeDialog="closeDialog"
:rowItem="rowItem"
></taskHandleQuality>
<!-- 转派 --> <!-- 转派 -->
<assignDaialog <assignDaialog
v-if="isAssignShow" v-if="isAssignShow"
:showDialog="isAssignShow" :showDialog="isAssignShow"
@closeDialog="closeDialog" @closeDialog="closeDialog"
:rowItem="rowItem"
></assignDaialog> ></assignDaialog>
</basic-container> </basic-container>
</template> </template>
@ -48,7 +54,7 @@ export default {
components: { components: {
taskHandleDialog, taskHandleDialog,
assignDaialog, assignDaialog,
taskHandleQuality taskHandleQuality,
}, },
data() { data() {
return { return {
@ -82,7 +88,7 @@ export default {
editBtnIcon: ' ', editBtnIcon: ' ',
labelWidth: '200px', labelWidth: '200px',
dialogWidth: 600, dialogWidth: 600,
menuWidth: 120, menuWidth: 180,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
filterBtn: true, filterBtn: true,
@ -224,20 +230,22 @@ export default {
}, },
isHandleShow: false, isHandleShow: false,
isAssignShow: false, isAssignShow: false,
isTaskHandleQuality:false, isTaskHandleQuality: false,
rowItem:{} rowItem: {},
}; };
}, },
mounted() {}, mounted() {},
methods: { methods: {
taskHandleFun(row){ taskHandleFun(row) {
this.isTaskHandleQuality = true; this.isTaskHandleQuality = true;
this.rowItem = row;
}, },
assignFn(row) { assignFn(row) {
this.isAssignShow = true; this.isAssignShow = true;
this.rowItem = row;
}, },
handleFn(row) { handleFn(row) {
this.rowItem = row this.rowItem = row;
this.isHandleShow = true; this.isHandleShow = true;
}, },
closeDialog() { closeDialog() {
@ -246,7 +254,7 @@ export default {
this.isTaskHandleQuality = false; this.isTaskHandleQuality = false;
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
}, },
currentChange(currentPage) { currentChange(currentPage) {
this.page.currentPage = currentPage; this.page.currentPage = currentPage;
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
}, },

@ -1,87 +1,95 @@
<template> <template>
<el-dialog title="转派" append-to-body :modelValue="openShow" width="30%" @close="closeDialog"> <el-dialog title="转派" append-to-body :modelValue="openShow" width="30%" @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="disAssignMan">
<el-select v-model="formData.disAssignMan" placeholder="请选择" clearable filterable>
<el-option
v-for="item in options"
:key="item.id"
:label="item.realName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="处理意见" prop="resolution">
<el-input v-model="formData.resolution" type="textarea" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-form ref="form" :model="formData" :rules="rules" label-width="80px" class="vd-form-row"> <template #footer>
<el-row> <span class="dialog-footer">
<el-col :span="24"> <el-button @click="closeDialog"> </el-button>
<el-form-item label="调度员" prop="proMan.userId"> <el-button type="primary" @click="submit" :loading="saveLoading"> </el-button>
<!-- <all-user v-model="formData.proMan.userId" /> --> </span>
<el-select v-model="formData.proMan.userId" placeholder="请选择" clearable filterable> </template>
<el-option v-for="item in options" :key="item.value" :label="item.label" </el-dialog>
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="处理意见" prop="resolution">
<el-input v-model="formData.resolution" type="textarea" />
</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> </template>
<script> <script>
import { setDispatch, getRoleUserList } from '@/api/processManagement/taskDispatch';
import { disTechnician } from '@/api/productionManagement/WIPChange.js';
export default { export default {
props: { props: {
showDialog: { showDialog: {
type: Boolean, type: Boolean,
default: false default: false,
},
}, },
data() { rowItem: {
return { type: Object,
openShow: false, default: () => ({}),
formData: { proMan: {}, resolution: null, ddtIdList: [] },
rules: {
'proMan.userId': [{ required: true }]
},
options: [
{
label: '人员一',
value: 1
},
{
label: '人员二',
value: 2
}
]
}
}, },
mounted() { },
this.openShow = this.showDialog data() {
return {
saveLoading: false,
openShow: false,
formData: { disAssignMan: null, resolution: null, ddtIdList: [] },
rules: {
disAssignMan: [{ required: true }],
},
options: [],
};
},
mounted() {
this.openShow = this.showDialog;
this.getRoleUserList();
},
methods: {
getRoleUserList() {
getRoleUserList({ current: 1, size: 9999999 }).then(res => {
this.options = res.data.data.records;
});
}, },
methods: { submit() {
submit() { this.$refs.form.validate(valid => {
// this.$refs.form.validate((valid) => { if (valid) {
// if (valid) { let query = {
// this.formData.assignType = false; ddtIdList: [this.rowItem.id],
// this.$ajax resolution: this.formData.resolution,
// .post('dsDisTasking/disTechnician', this.formData) disAssignMan: this.formData.disAssignMan,
// .then((res) => { };
// if (this.$ifAjax(res)) { disTechnician(query).then(res => {
// this.$message.success(this.$t('craft.alreadyAssign')); this.$message.success('操作成功');
// this.cancel(true); this.closeDialog();
// } });
// });
// }
// });
},
closeDialog() {
this.openShow = false
this.$emit('closeDialog');
} }
} });
} },
closeDialog() {
this.openShow = false;
this.$emit('closeDialog');
},
},
};
</script> </script>
<style lang="scss" scoped></style> <style lang="scss" scoped></style>

@ -22,15 +22,6 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </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> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
@ -91,7 +82,7 @@ export default {
disAssignMan: this.rowItem.disAssignMan, // disAssignMan: this.rowItem.disAssignMan, //
}; };
taskComplete(query).then(res => { taskComplete(query).then(res => {
this.$message.success('处理成功'); this.$message.success('操作成功');
this.closeDialog(true); this.closeDialog(true);
}); });
} }

@ -7,7 +7,7 @@
@close="closeDialog" @close="closeDialog"
> >
<el-form ref="form" v-model="formData" :rules="rules" label-width="80px" class="vd-form-row"> <el-form ref="form" v-model="formData" :rules="rules" label-width="80px" class="vd-form-row">
<el-form-item label="订单是否继续" prop="rsCode"> <el-form-item label="订单是否继续" prop="rsCode" label-width="120px">
<el-radio-group v-model="formData.rsCode"> <el-radio-group v-model="formData.rsCode">
<el-radio label="是" /> <el-radio label="是" />
<el-radio label="否" /> <el-radio label="否" />
@ -20,7 +20,7 @@
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">
<el-button @click="closeDialog"> </el-button> <el-button @click="closeDialog"> </el-button>
<el-button type="primary" @click="submit" :loading="saveLoading">修改并接收</el-button> <el-button type="primary" @click="submit" :loading="saveLoading">确定</el-button>
</span> </span>
</template> </template>
</el-dialog> </el-dialog>

Loading…
Cancel
Save