suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工艺管理问题修改

Browse Source
dev-scheduling
zhangdi 3 weeks ago
parent 5ddd42d697
commit b7ba420ad1
5 changed files with 104 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/components/basic-container/main.vue
  2. 24
      src/views/processManagement/bathRefine/components/planCheckDialog.vue
  3. 28
      src/views/processManagement/bathRefine/planClass.vue
  4. 1
      src/views/processManagement/components/addBasicProcessesDialog.vue
  5. 115
      src/views/productionManagement/productionMonitoring/index.vue

5
src/components/basic-container/main.vue
Unescape View File

@ -37,6 +37,7 @@ export default {
.basic-container {
padding: 10px 6px;
box-sizing: border-box;
height: 100%;
&--block {
height: 100%;
@ -51,7 +52,11 @@ export default {
&:first-child {
padding-top: 0;
height: 100%;
}
.basic-container__card {
height: 100%;
}
}

24
src/views/processManagement/bathRefine/components/planCheckDialog.vue
Unescape View File

@ -5,7 +5,7 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="closeDialog">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
<el-button type="primary" @click="submit" v-loading="submitLoading"> 确 定</el-button>
</span>
</template>
</el-dialog>
@ -28,6 +28,7 @@ export default {
return {
obj: {},
openShow: false,
submitLoading: false,
option: {
submitBtn: false,
emptyBtn: false,
@ -64,29 +65,34 @@ export default {
submit() {
this.$refs.form.validate((valid, done, msg) => {
if (valid) {
this.submitLoading = true;
// 室主任审核
if (this.rowItem.approvalStatus == '-1') {
directorApproval({...this.obj,id:this.rowItem.id}).then(res => {
if (this.rowItem.approvalStatus == '-1' || this.rowItem.approvalStatus == 1) {
directorApproval({ ...this.obj, id: this.rowItem.id }).then(res => {
this.$message({
type: 'success',
message: '操作成功!',
});
this.closeDialog();
this.submitLoading = false;
});
}
// 厂长审核
if (this.rowItem.approvalStatus == '2') {
factoryApproval({...this.obj,id:this.rowItem.id}).then(res=>{
this.$message({
if (this.rowItem.approvalStatus == 2) {
factoryApproval({ ...this.obj, id: this.rowItem.id }).then(res => {
this.$message({
type: 'success',
message: '操作成功!',
});
this.closeDialog()
})
}
this.closeDialog();
this.submitLoading = false;
});
}
this.submitLoading = false;
done();
} else {
console.log('error submit!!');
this.submitLoading = false;
return false;
}
});

28
src/views/processManagement/bathRefine/planClass.vue
Unescape View File

@ -17,7 +17,6 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu="scope">
<!-- <el-button
@ -27,13 +26,18 @@
</el-button> -->
<el-button
type="text"
v-if="scope.row.approvalStatus == 1"
v-if="
scope.row.approvalStatus == 1 ||
scope.row.approvalStatus == 2 ||
scope.row.approvalStatus == 5 ||
scope.row.approvalStatus == 4
"
@click="checkFn(scope.row)"
>审批</el-button
>
</template>
<template #arrangeTime="scope">
{{ scope.row.arrangeTime ? scope.row.arrangeTime.substring(0, 10) : '' }}
{{ scope.row.arrangeTime ? scope.row.arrangeTime.substring(0, 10) : '' }}
</template>
</avue-crud>
<!-- 审批 -->
@ -155,7 +159,7 @@ export default {
headerAlign: 'center',
align: 'center',
searchLabelWidth: 80,
hide:true,
hide: true,
dicUrl: `/blade-desk/BA/WorkTank/listForSelect?workstationId={{wcId}}`,
props: {
label: 'name',
@ -168,10 +172,9 @@ export default {
trigger: 'blur',
},
],
change: (value)=> {
change: value => {
this.form.batchNoName = value.item.name;
},
},
{
label: '维护内容',
@ -202,8 +205,8 @@ export default {
headerAlign: 'center',
align: 'center',
searchLabelWidth: 80,
addDisplay:false,
editDisplay:false,
addDisplay: false,
editDisplay: false,
},
{
label: '安排日期',
@ -244,7 +247,7 @@ export default {
searchLabelWidth: 80,
searchOrder: 20,
dicData: [
{
{
value: 1,
label: '待审核',
},
@ -264,7 +267,6 @@ export default {
value: 5,
label: '厂长审核未通过',
},
],
rules: [
{
@ -327,7 +329,7 @@ export default {
});
},
rowSave(row, done, loading) {
row.arrangeTime = row.arrangeTime+' 00:00:00';
row.arrangeTime = row.arrangeTime + ' 00:00:00';
add([{ ...row, bbpType: 1 }]).then(
() => {
this.onLoad(this.page);
@ -344,7 +346,7 @@ export default {
);
},
rowUpdate(row, index, done, loading) {
row.arrangeTime = row.arrangeTime+' 00:00:00';
row.arrangeTime = row.arrangeTime + ' 00:00:00';
update([row]).then(
() => {
this.onLoad(this.page);
@ -360,7 +362,7 @@ export default {
}
);
},
rowDel(row){
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',

1
src/views/processManagement/components/addBasicProcessesDialog.vue
Unescape View File

@ -195,6 +195,7 @@ export default {
tableData: [],
ruleForm: {
cycle: 0,
isCheckout:'0'
},
rules: {
code: [{ required: true, message: '请输入', trigger: 'blur' }],

115
src/views/productionManagement/productionMonitoring/index.vue
Unescape View File

@ -30,39 +30,56 @@
</template>
<template #menu="scope">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
<el-button type="text" @click="printCraftCard_new(scope.row)">工艺流程卡</el-button>
<el-button type="text" @click="priorityFn(scope.row)" v-if="scope.row.runStatus === 2"
>优先级调整</el-button
>
<el-button
type="text"
@click="handleBatches(scope.row)"
v-if="[2, 3, 4, 6].includes(scope.row.runStatus)"
>分批</el-button
>
<el-button
type="text"
@click="handleAbnormal(scope.row)"
v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4"
>异常申报</el-button
>
<el-button
type="text"
@click="handleOutsource(scope.row)"
v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5"
>转外协</el-button
>
<el-button
type="text"
@click="handleSintering(scope.row)"
v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5"
>转烧结</el-button
>
<el-button type="text" @click="handleClose(scope.row)" v-if="scope.row.runStatus < 15"
>关闭</el-button
>
<el-row>
<el-col :span="6">
<el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
</el-col>
<el-col :span="6">
<el-button type="text" @click="printCraftCard_new(scope.row)">流程卡</el-button>
</el-col>
<el-col :span="6" v-if="scope.row.runStatus === 2">
<el-button type="text" @click="priorityFn(scope.row)"
>优先级</el-button
>
</el-col>
<el-col :span="6" v-if="[2, 3, 4, 6].includes(scope.row.runStatus)">
<el-button
type="text"
@click="handleBatches(scope.row)"
>分批</el-button
>
</el-col>
<el-col :span="6" v-if="scope.row.runStatus === 3 || scope.row.runStatus === 4">
<el-button
type="text"
@click="handleAbnormal(scope.row)"
>异常申报</el-button
>
</el-col>
<el-col :span="6" v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5">
<el-button
type="text"
@click="handleOutsource(scope.row)"
>转外协</el-button
>
</el-col>
<el-col :span="6" v-if="scope.row.runStatus <= 6 && scope.row.runStatus !== 5">
<el-button
type="text"
@click="handleSintering(scope.row)"
>转烧结</el-button
>
</el-col>
<el-col :span="6" v-if="scope.row.runStatus < 15">
<el-button type="text" @click="handleClose(scope.row)"
>关闭</el-button
>
</el-col>
</el-row>
</template>
</avue-crud>
<!-- 打印标签 -->
@ -90,7 +107,7 @@
:itemData="itemData"
@closeDialog="closeDialog"
></outsource-dialog>
<!-- 分批弹窗 -->
<batches-dialog
v-if="showBatches"
@ -120,7 +137,12 @@
></productionMonitoringDialog>
<!-- 生产监控 -->
<workRate v-if="isWorkRateOpen" :showDialog="isWorkRateOpen" @closeDialog="closeDialog" :rowItem="rowItem"></workRate>
<workRate
v-if="isWorkRateOpen"
:showDialog="isWorkRateOpen"
@closeDialog="closeDialog"
:rowItem="rowItem"
></workRate>
</basic-container>
</template>
@ -131,8 +153,8 @@ import batchesDialog from '../components/batchesDialog.vue';
import closedDialog from '../components/abnormalDialog.vue';
import abnormalDialog from '../components/abnormalDialog.vue';
import productionMonitoringDialog from '../components/productionMonitoringDialog.vue';
import workRate from "@/views/workRate/index.vue";
import { getList,turnType } from '@/api/productionManagement/productionMonitoring';
import workRate from '@/views/workRate/index.vue';
import { getList, turnType } from '@/api/productionManagement/productionMonitoring';
export default {
components: {
@ -188,7 +210,7 @@ export default {
editBtnText: '修改',
viewBtnText: '详情',
labelWidth: 120,
menuWidth: 380,
menuWidth: 240,
dialogWidth: 1200,
dialogClickModal: false,
searchEnter: true,
@ -215,7 +237,7 @@ export default {
sortable: true,
overHidden: true,
fixed: 'left',
width: 180,
width: 130,
},
{
@ -410,7 +432,6 @@ export default {
overHidden: true,
width: 150,
// searchLabelWidth: 100,
},
{
label: '订单优先级',
@ -421,7 +442,7 @@ export default {
overHidden: true,
width: 150,
// searchLabelWidth: 100,
hide:true,
hide: true,
dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
props: {
label: 'dictValue',
@ -594,8 +615,8 @@ export default {
},
mounted() {},
methods: {
printCraftCard_new(row){
window.open(window.PROCESS_FLOW_CARD_HEAT_METER+'?woId='+row.woId,'_blank');
printCraftCard_new(row) {
window.open(window.PROCESS_FLOW_CARD_HEAT_METER + '?woId=' + row.woId, '_blank');
},
// 优先级调整
priorityFn(row) {
@ -648,9 +669,9 @@ export default {
id: row.woId,
yieldType: '12001',
};
turnType(query).then((res) => {
this.$message.success('转烧结成功');
this.onLoad(this.page, this.query);
turnType(query).then(res => {
this.$message.success('转烧结成功');
this.onLoad(this.page, this.query);
});
});
},
@ -707,7 +728,7 @@ export default {
this.showAbnormal = false;
this.isPriorityOpen = false;
// if (type) {
this.onLoad(this.page, this.query);
this.onLoad(this.page, this.query);
// }
},
currentChange(currentPage) {

Write Preview
Loading…
Cancel
Save