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

工艺问题修改

Browse Source
dev-scheduling
zhangdi 1 month ago
parent 90f8e0a553
commit 3723510e23
11 changed files with 167 additions and 97 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. 21
      src/views/processManagement/basicProcesses.vue
  2. 7
      src/views/processManagement/bathRefine/accumulateClass.vue
  3. 33
      src/views/processManagement/bathRefine/addQuantity.vue
  4. 1
      src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue
  5. 22
      src/views/processManagement/bathRefine/components/addQuantityDialog.vue
  6. 23
      src/views/processManagement/bathRefine/planClass.vue
  7. 1
      src/views/processManagement/components/addBasicProcessesDialog.vue
  8. 11
      src/views/processManagement/components/addinPlantMaintenanceDialog.vue
  9. 8
      src/views/processManagement/components/inPlantMaintenance.vue
  10. 130
      src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
  11. 7
      src/views/processManagement/components/processMainte/processPlanning.vue

21
src/views/processManagement/basicProcesses.vue
Unescape View File

@ -60,6 +60,9 @@
<i :class="row.source" />
</div>
</template>
<template #cycle="{ row }">
{{ row.cycle == -1 ? '0' : row.cycle }}
</template>
</avue-crud>
<setCrew
@ -169,7 +172,6 @@ export default {
headerAlign: 'center',
align: 'center',
searchLabelWidth: 45,
},
{
label: '名称',
@ -182,7 +184,6 @@ export default {
headerAlign: 'center',
align: 'left',
searchLabelWidth: 45,
},
{
label: '是否检验工序',
@ -196,7 +197,7 @@ export default {
searchLabelWidth: 120,
width: 140,
type: 'select',
filterable:true,
filterable: true,
clearable: true,
dicData: [
{
@ -208,7 +209,6 @@ export default {
value: '0',
},
],
},
{
label: '不分派',
@ -221,7 +221,7 @@ export default {
align: 'center',
searchLabelWidth: 60,
type: 'select',
filterable:true,
filterable: true,
clearable: true,
dicData: [
{
@ -233,7 +233,6 @@ export default {
value: '2',
},
],
},
{
label: '特殊',
@ -246,7 +245,7 @@ export default {
align: 'center',
searchLabelWidth: 45,
type: 'select',
filterable:true,
filterable: true,
clearable: true,
dicData: [
{
@ -258,7 +257,6 @@ export default {
value: '2',
},
],
},
{
label: '主工序',
@ -268,7 +266,6 @@ export default {
span: 8,
headerAlign: 'center',
align: 'center',
},
{
label: '班组',
@ -279,7 +276,6 @@ export default {
display: false,
headerAlign: 'center',
align: 'left',
},
{
label: '标准周期',
@ -290,7 +286,6 @@ export default {
span: 24,
headerAlign: 'center',
align: 'center',
},
{
label: '电流(A)',
@ -358,13 +353,13 @@ export default {
this.isAddOpen = false;
this.isShowImport = false;
// if (isRefresh) {
this.onLoad(this.page, this.query);
this.onLoad(this.page, this.query);
// }
},
detailsFn(row) {
this.openTitle = '详情';
this.isAddOpen = true;
row.isCheckout = row.isCheckout+''
row.isCheckout = row.isCheckout + '';
this.rowId = row.id;
},
// 设置班组人员

7
src/views/processManagement/bathRefine/accumulateClass.vue
Unescape View File

@ -25,7 +25,10 @@
<el-button type="primary" @click="handleMaintain">批量重置</el-button>
</template>
<template #menu="scope">
<!-- <el-button type="text" @click="editRow(scope.row)">修改</el-button> -->
<el-button type="text" @click="editRow(scope.row)">修改</el-button>
</template>
<template #addQuantity="{row}">
{{ row.addQuantity==-1?0:row.addQuantity }}
</template>
</avue-crud>
@ -93,7 +96,7 @@ export default {
viewBtn: false,
delBtn: true,
addBtn: false,
editBtn: true,
editBtn: false,
editBtnText: '修改',
addBtnIcon: ' ',
viewBtnIcon: ' ',

33
src/views/processManagement/bathRefine/addQuantity.vue
Unescape View File

@ -23,7 +23,9 @@
<el-button type="primary" @click="handleAdd">新增</el-button>
</template>
<template #menu="scope"> </template>
<template #menu="scope">
<el-button type="text" @click="editRow(scope.row)">修改</el-button>
</template>
</avue-crud>
<!-- 新增 -->
@ -32,6 +34,7 @@
:showDialog="showDialog"
@closeDialog="closeDialog"
:moldAddMore="moldAddMore"
:maintainData="maintainData"
></addQuantityDialog>
</basic-container>
</template>
@ -46,6 +49,7 @@ export default {
data() {
return {
moldAddMore:false,
maintainData:[],
query: {},
loading: false,
title: '新增',
@ -75,7 +79,7 @@ export default {
viewBtn: false,
delBtn: true,
addBtn: false,
editBtn: true,
editBtn: false,
editBtnText: '修改',
addBtnIcon: ' ',
viewBtnIcon: ' ',
@ -159,21 +163,28 @@ export default {
headerAlign: 'center',
align: 'center',
},
{
label: '维护时间',
prop: 'maintainTime',
search: true,
sortable: true,
headerAlign: 'center',
align: 'center',
type: 'date',
},
// {
// label: '维护时间',
// prop: 'addTime',
// search: true,
// sortable: true,
// headerAlign: 'center',
// align: 'center',
// type: 'date',
// },
],
},
};
},
mounted() {},
methods: {
// 编辑
editRow(row) {
this.title = '修改';
this.maintainData = [row];
this.showDialog = true;
this.moldAddMore = false;
},
handleAdd() {
this.title = '新增';
this.tableData = [];

1
src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue
Unescape View File

@ -325,6 +325,7 @@ export default {
}
} else {
this.maintainData.forEach((item, index) => {
item.batchNo = item.batchNo+''
this.getTankList(item.wcId, index);
this.getEquipmentList(item.wcId, index);
});

22
src/views/processManagement/bathRefine/components/addQuantityDialog.vue
Unescape View File

@ -121,6 +121,8 @@ export default {
showDialog: { type: Boolean, default: false },
moldAddMore: { type: Boolean, default: false },
tabPosition: { type: String, default: '' },
title: { type: String, default: '' },
maintainData: { type: Array, default: [] },
},
data() {
return {
@ -183,9 +185,23 @@ export default {
mounted() {
this.openShow = this.showDialog;
this.getWorkCenterList();
// 初始添加一行（可选）
if (this.moldAddMore && this.form.tableData.length === 0) {
this.addTable();
// // 初始添加一行（可选）
// if (this.moldAddMore && this.form.tableData.length === 0) {
// this.addTable();
// }
if (this.title == '新增') {
// 初始添加一行（可选）
if (this.moldAddMore && this.form.tableData.length === 0) {
this.addTable();
}
} else {
this.maintainData.forEach((item, index) => {
item.batchNo = item.batchNo + '';
this.getTankList(item.wcId, index);
// this.getTankList(item.wcId, index);
// this.getEquipmentList(item.wcId, index);
});
this.form.tableData = this.maintainData;
}
},
methods: {

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

@ -10,6 +10,7 @@
ref="crud"
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@current-change="currentChange"
@ -94,11 +95,11 @@ export default {
delBtnIcon: ' ',
editBtnIcon: ' ',
viewBtnText: '详情',
labelWidth: 120,
labelWidth: 80,
searchLabelWidth: 120,
menu: true,
menuWidth: 140,
dialogWidth: 1200,
dialogWidth: 800,
dialogClickModal: false,
searchEnter: true,
excelBtn: false,
@ -343,6 +344,7 @@ export default {
);
},
rowUpdate(row, index, done, loading) {
row.arrangeTime = row.arrangeTime+' 00:00:00';
update([row]).then(
() => {
this.onLoad(this.page);
@ -358,6 +360,23 @@ export default {
}
);
},
rowDel(row){
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
},
searchReset() {
this.query = { bbpType: 1 };
this.onLoad(this.page);

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

@ -212,6 +212,7 @@ export default {
if (this.title == "详情") {
getDetail(this.id).then((res) => {
this.ruleForm = res.data.data;
this.ruleForm.isCheckout = this.ruleForm.isCheckout == -1 ? '' : this.ruleForm.isCheckout+''
});
}
},

11
src/views/processManagement/components/addinPlantMaintenanceDialog.vue
Unescape View File

@ -119,7 +119,6 @@
<el-input-number
v-model="scope.row.remDays"
controls-position="right"
@change="handleChange"
:min="1"
></el-input-number>
</el-form-item>
@ -149,9 +148,9 @@
</el-table-column>
<el-table-column align="center" label="备注">
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].remark`">
<el-form-item :prop="`tableData[${scope.$index}].remarks`">
<el-input
v-model="scope.row.remark"
v-model="scope.row.remarks"
placeholder="请输入"
style="width: 100%"
></el-input>
@ -237,7 +236,11 @@ export default {
console.log('this.itemData', this.itemData);
this.form.tableData =
this.itemData.length > 0 ? JSON.parse(JSON.stringify(this.itemData)) : [];
if(this.form.tableData.length > 0){
this.form.tableData.forEach(item => {
item.lastDueTime = item.lastDueTime+' 00:00:00'
})
}
this.workCenterChange()
}
},

8
src/views/processManagement/components/inPlantMaintenance.vue
Unescape View File

@ -37,7 +37,7 @@
templateUrl="/blade-desk/dsSpecialPro/import-template"
templateName="工艺特殊过程项导入模板.xls"
importUrl="/blade-desk/dsSpecialPro/import-excel-SpecialPro"
@closeDialog="closeDialog"
@closeDialog="closeAddDialog"
></basic-import>
<!-- 新增 -->
@ -315,6 +315,7 @@ export default {
},
closeAddDialog(){
this.showAddDialog = false
this.isShowImport = false
this.onLoad(this.page,this.query)
},
equipmentChange(val,type){
@ -405,10 +406,7 @@ export default {
// 数据回调进行刷新
done();
this.onLoad(this.page,this.query);
this.$message({
type: 'success',
message: '操作成功!',
});
});
},
// 重置

130
src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
Unescape View File

@ -33,12 +33,12 @@
<el-form-item label="相似零件:" prop="productType">
</el-form-item>
</el-col> -->
</el-col> :disabled="disabled"-->
<el-col :span="8" v-if="partType == '烧结'">
<el-form-item label="是否为玻璃饼:" prop="isClassCake">
<el-switch
v-model="formData.isClassCake"
:disabled="disabled"
disabled
active-color="#13ce66"
inactive-color="#ff4949"
active-value="1"
@ -46,36 +46,37 @@
/>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="是否印字:" prop="isPrint">
<el-radio-group v-if="partType != '烧结'&&!formData.isGlassCake" v-model="formData.isPrint">
<el-radio value="1">否</el-radio>
<el-col :span="8" v-if="partType == '烧结'">
<el-form-item label="是否印字:" prop="isPrint" >
<el-radio-group v-if="formData.isGlassCake" v-model="formData.isPrint">
<el-radio value="2">单</el-radio>
<el-radio value="3">双</el-radio>
<el-radio value="1">否</el-radio>
</el-radio-group>
<el-radio-group v-model="formData.isPrint" v-if="formData.isGlassCake">
<el-radio-group v-model="formData.isPrint" v-else>
<el-radio value="2">是</el-radio>
<el-radio value="1">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8" v-if="partType == '烧结' && formData.isGlassCake">
<el-col :span="8" v-if="partType == '热表' && formData.isGlassCake">
<el-form-item label="材料:" prop="material">
<el-input v-model="formData.material" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8" v-if="partType == '烧结' && formData.isGlassCake">
<el-col :span="8" v-if="formData.isGlassCake">
<el-form-item label="粉重:" prop="powderWeight">
<el-input v-model="formData.powderWeight" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8" v-if="partType == '烧结' && formData.isGlassCake">
<el-col :span="8" v-if="formData.isGlassCake">
<el-form-item label="成型厚度:" prop="formingThickness">
<el-input v-model="formData.formingThickness" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8" v-if="partType == '烧结' && formData.isGlassCake">
<el-form-item label="面积(dm²):" prop="area">
<!-- prop="area" 热表必填 非热表不必填 -->
<el-form-item label="面积(dm²):" >
<el-input v-model="formData.area" placeholder="请输入" />
</el-form-item>
</el-col>
@ -91,7 +92,7 @@
</el-col>
<el-col
:span="8"
v-if="partType == '热表' || (partType == '烧结' && formData.isGlassCake)"
v-if="partType == '热表'"
>
<el-form-item label="物料编码:" prop="plateGoodsCode">
<el-select
@ -108,7 +109,8 @@
</el-col>
<el-col :span="8" v-if="partType == '热表'">
<el-form-item label="镀种1:" prop="plate">
<el-select
<el-input v-model="formData.plate" placeholder="请输入" />
<!-- <el-select
v-model="formData.plate"
placeholder="请选择"
style="width: 250px"
@ -120,7 +122,7 @@
:label="item.plating"
:value="item.id"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="8" v-if="partType == '热表'">
@ -135,7 +137,8 @@
</el-col>
<el-col :span="8" v-if="partType == '热表'">
<el-form-item label="镀种2:" prop="plateTwo">
<el-select
<el-input v-model="formData.plateTwo" placeholder="请输入" />
<!-- <el-select
v-model="formData.plateTwo"
placeholder="请选择"
style="width: 250px"
@ -147,7 +150,7 @@
:label="item.plating"
:value="item.id"
></el-option>
</el-select>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="8" v-if="partType == '热表'">
@ -160,11 +163,21 @@
<el-input v-model="formData.areaTwo" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8" v-if="partType == '热表'">
<el-col :span="8" v-if="partType == '烧结' && !formData.isGlassCake">
<el-form-item label="镀层厚度:" prop="plateThickness">
<el-input v-model="formData.plateThickness" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8" v-if="partType == '热表'">
<el-form-item label="镀层厚度1:" prop="plateThickness">
<el-input v-model="formData.plateThickness" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8" v-if="partType == '热表'">
<el-form-item label="镀层厚度2:" prop="plateThickness">
<el-input v-model="formData.plateThickness" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品应用领域:" prop="productApplicationArea">
@ -200,40 +213,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="有效期:" prop="periodOfValidity">
<el-radio-group v-model="formData.periodOfValidity" @change="periodOfValidityFn">
<el-radio value="1">长期有效</el-radio>
<el-radio value="2">自定义</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="有效周期(天):" prop="expirationPeriod">
<el-input-number
:max="100000"
:min="0"
v-model="formData.expirationPeriod"
controls-position="right"
placeholder="请输入"
style="width: 250px"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="到期提醒(天):" prop="advanceRemind">
<el-input-number
:max="100000"
:min="0"
v-model="formData.advanceRemind"
controls-position="right"
placeholder="请输入"
style="width: 250px"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="涂色标个数:" prop="tsbNum">
@ -283,6 +263,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="16">
<el-form-item label="关键信息:" prop="keyInfo">
@ -297,6 +278,40 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="有效期:" prop="periodOfValidity">
<el-radio-group v-model="formData.periodOfValidity" @change="periodOfValidityFn">
<el-radio value="1">长期有效</el-radio>
<el-radio value="2">自定义</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8" v-if="formData.periodOfValidity=='2'">
<el-form-item label="有效周期(天):" prop="expirationPeriod">
<el-input-number
:max="100000"
:min="0"
v-model="formData.expirationPeriod"
controls-position="right"
placeholder="请输入"
style="width: 250px"
/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="formData.periodOfValidity=='2'">
<el-form-item label="到期提醒(天):" prop="advanceRemind">
<el-input-number
:max="100000"
:min="0"
v-model="formData.advanceRemind"
controls-position="right"
placeholder="请输入"
style="width: 250px"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col
:span="24"
@ -339,9 +354,9 @@
>喷码</el-checkbox
>
</div>
<div style="width: 100%" v-if="formData.goldMark && partType == '热表'">
<!-- <div style="width: 100%" v-if="formData.goldMark==1 && partType == '热表'">
<el-text class="mx-1" type="danger">本零件需要编制一级和二级工艺！</el-text>
</div>
</div> -->
</el-form-item>
</el-col>
</el-row>
@ -666,11 +681,11 @@ export default {
this.partType = res.data.data.dsPartEntity.isSintering == '1' ? '烧结' : '热表';
if (res.data.data.dsPartEntity.isGlassCake === '0') {
// if (res.data.data.dsPartEntity.isGlassCake === '0') {
this.formData.isGlassCake = false;
} else {
this.formData.isGlassCake = true;
}
// } else {
// this.formData.isGlassCake = true;
// }
// 如果当前零件号在局部镀金列表里面 镀金标识禁用 this.getLocallyPlatedPartList();
let selPart = this.locallyPlatedData.filter(item => {
return item.partCode == this.formData.partCode;
@ -680,6 +695,7 @@ export default {
this.formData.goldMark = true;
}
}
this.formData.isClassCake = true
});
},

7
src/views/processManagement/components/processMainte/processPlanning.vue
Unescape View File

@ -90,11 +90,18 @@
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="8">
<!-- 不必填 如果为空 默认值是 临时工艺 -->
<el-form-item label="流转编号:" prop="remarks">
<el-input v-model="treeNodes.rawData.remarks" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注:" prop="remarks">
<el-input v-model="treeNodes.rawData.remarks" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">

Write Preview
Loading…
Cancel
Save