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 2dec99b96e
commit de515561df
6 changed files with 102 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/api/processManagement/taskProcessing.js
  2. 51
      src/views/logisticsManagement/siteBasic.vue
  3. 68
      src/views/processManagement/components/addTemplateDialog.vue
  4. 2
      src/views/processManagement/components/addTestDialog.vue
  5. 1
      src/views/processManagement/components/processMainte/processPlanning.vue
  6. 25
      src/views/processManagement/components/processMainte/reworkProcessPlanning.vue

2
src/api/processManagement/taskProcessing.js
Unescape View File

@ -26,7 +26,7 @@ export const completeSet = params => {
// 查询零件信息 // 查询零件信息
export const getPartList = (current, size, params) => { export const getPartList = (current, size, params) => {
return request({ return request({
url: '/blade-desk/dsPart/getPartList', url: '/blade-desk/dsPart/listNew',
method: 'get', method: 'get',
params: { params: {
...params, ...params,

51
src/views/logisticsManagement/siteBasic.vue
Unescape View File

@ -32,8 +32,12 @@
</template> </template>
<template #stationStatus="scope"> <template #stationStatus="scope">
<el-tag v-if="scope.row.stationStatus == '0'" type="success" @click="handleEdit(row)">闲置</el-tag> <el-tag v-if="scope.row.stationStatus == '0'" type="success" @click="handleEdit(row)"
<el-tag v-if="scope.row.stationStatus == '1'" type="danger" @click="handleEdit(row)">占用</el-tag> >闲置</el-tag
>
<el-tag v-if="scope.row.stationStatus == '1'" type="danger" @click="handleEdit(row)"
>占用</el-tag
>
</template> </template>
<template #stationPosition="scope"> {{ scope.row.stationPosition }}楼 </template> <template #stationPosition="scope"> {{ scope.row.stationPosition }}楼 </template>
</avue-crud> </avue-crud>
@ -41,7 +45,7 @@
</template> </template>
<script> <script>
import { getStationList,stationUpdate } from '@/api/logisticsManagement/siteBasic'; import { getStationList, stationUpdate } from '@/api/logisticsManagement/siteBasic';
export default { export default {
components: {}, components: {},
data() { data() {
@ -99,13 +103,29 @@ export default {
align: 'center', align: 'center',
column: [ column: [
{ {
label: '站点区域', label: '作业中心',
prop: 'stationRegion', prop: 'wcName',
search: false, search: false,
sortable: true, sortable: true,
span: 12, span: 12,
display: false, display: false,
}, },
{
label: '作业中心',
prop: 'wcId',
search: true,
sortable: true,
span: 12,
filterable: true,
hide: true,
searchOrder: 17,
type: 'select',
dicUrl: '/api/blade-desk/BA/WorkCenter/listForSelect',
props: {
label: 'wcName',
value: 'id',
},
},
{ {
label: '作业中心', label: '作业中心',
prop: 'wcName', prop: 'wcName',
@ -130,6 +150,15 @@ export default {
value: 'id', value: 'id',
}, },
}, },
{
label: '站点区域',
prop: 'stationRegion',
search: false,
sortable: true,
span: 12,
display: false,
},
{ {
label: '站点名称', label: '站点名称',
prop: 'stationName', prop: 'stationName',
@ -199,17 +228,21 @@ export default {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { })
.then(() => {
row.stationStatus = Number(newStatus); row.stationStatus = Number(newStatus);
// 调用更新接口 // 调用更新接口
stationUpdate(row).then(() => { stationUpdate(row)
.then(() => {
this.$message.success('状态修改成功'); this.$message.success('状态修改成功');
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
}).catch(err => { })
.catch(err => {
this.$message.error('状态修改失败'); this.$message.error('状态修改失败');
console.error(err); console.error(err);
}); });
}).catch(() => { })
.catch(() => {
// 用户取消 // 用户取消
}); });
}, },

68
src/views/processManagement/components/addTemplateDialog.vue
Unescape View File

@ -135,9 +135,9 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ppsId" label="工序名称" align="left"> <el-table-column prop="ppsId" label="工序" align="left">
<template #header> <template #header>
<span><i style="color: red">*</i>工序名称</span> <span><i style="color: red">*</i>工序</span>
</template> </template>
<template #default="scope"> <template #default="scope">
<el-form-item <el-form-item
@ -154,7 +154,7 @@
> >
<el-option <el-option
v-for="(item, index) in processList" v-for="(item, index) in processList"
:label="item.name" :label="`${item.code}-${item.name}`"
:value="item.id" :value="item.id"
> >
</el-option> </el-option>
@ -179,16 +179,17 @@
filterable filterable
@change="craftChange(scope.row, scope.$index)" @change="craftChange(scope.row, scope.$index)"
> >
<el-option v-for="item in caIdList" :label="item.name" :value="item.id"> <el-option
v-for="item in caIdList"
:label="`${item.code}-${item.name}`"
:value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="proDes" label="工序描述" align="left"> <el-table-column prop="proDes" label="工序描述" align="left">
<template #header>
<span><i style="color: red">*</i>工序描述</span>
</template>
<template #default="scope"> <template #default="scope">
<el-form-item <el-form-item
:prop="`tableData[${scope.$index}].proDes`" :prop="`tableData[${scope.$index}].proDes`"
@ -199,25 +200,6 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="workHours" label="工时(分钟)" align="left">
<template #header>
<span><i style="color: red">*</i>工时(分钟)</span>
</template>
<template #default="scope">
<el-form-item
:prop="`tableData[${scope.$index}].workHours`"
:rules="rules.tableData.workHours"
label-width="0"
>
<el-input-number
v-model="scope.row.workHours"
controls-position="right"
:min="1"
:max="10"
></el-input-number>
</el-form-item>
</template>
</el-table-column> -->
<el-table-column prop="partName" label="主工序" align="left"> <el-table-column prop="partName" label="主工序" align="left">
<template #header> <template #header>
@ -244,9 +226,9 @@
@selection-change="handleProjectSelectionChange" @selection-change="handleProjectSelectionChange"
> >
<el-table-column type="selection" width="55"> </el-table-column> <el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="trialNo" label="工序号"> <el-table-column prop="trialNo" label="项目编码">
<template #header> <template #header>
<span><i style="color: red">*</i>工序号</span> <span><i style="color: red">*</i>项目编码</span>
</template> </template>
<template #default="scope"> <template #default="scope">
<el-form-item <el-form-item
@ -315,9 +297,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="proHours" label="定额工时(分钟)"> <el-table-column prop="proHours" label="定额工时(分钟)">
<template #header>
<span><i style="color: red">*</i>定额工时(分钟)</span>
</template>
<template #default="scope"> <template #default="scope">
<el-form-item <el-form-item
:prop="`tableData2[${scope.$index}].proHours`" :prop="`tableData2[${scope.$index}].proHours`"
@ -494,7 +473,6 @@ export default {
ppsId: [{ required: true, message: '请选择工序代码', trigger: 'blur' }], ppsId: [{ required: true, message: '请选择工序代码', trigger: 'blur' }],
caId: [{ required: true, message: '请选择工艺能力', trigger: 'blur' }], caId: [{ required: true, message: '请选择工艺能力', trigger: 'blur' }],
workHours: [{ required: true, message: '请输入工时(分钟)', trigger: 'blur' }], workHours: [{ required: true, message: '请输入工时(分钟)', trigger: 'blur' }],
proDes: [{ required: true, message: '请输入工序描述', trigger: 'blur' }],
isMain: [{ required: true, message: '请选择主工序', trigger: 'blur' }], isMain: [{ required: true, message: '请选择主工序', trigger: 'blur' }],
}, },
@ -793,7 +771,7 @@ export default {
message: '操作成功!', message: '操作成功!',
}); });
this.$emit('closeDialog'); this.$emit('closeDialog');
this.getDetail() this.getDetail();
}) })
.catch(err => { .catch(err => {
this.formLoading = false; this.formLoading = false;
@ -808,7 +786,7 @@ export default {
message: '操作成功!', message: '操作成功!',
}); });
this.$emit('closeDialog'); this.$emit('closeDialog');
this.getDetail() this.getDetail();
}) })
.catch(err => { .catch(err => {
this.formLoading = false; this.formLoading = false;
@ -895,4 +873,26 @@ export default {
} }
} }
} }
:deep(.el-tree-node.is-current > .el-tree-node__content) {
background-color: rgba(40, 76, 135, 0.9) !important;
.el-tree-node__label {
color: #fff;
}
}
:deep(.el-tree) {
height: auto;
padding: 0px 0;
.el-tree-node__content {
height: 26px;
&:hover {
// background-color: #f5f7fa;
}
}
.el-tree-node__label {
font-size: 14px;
}
}
</style> </style>

2
src/views/processManagement/components/addTestDialog.vue
Unescape View File

@ -20,7 +20,7 @@
<el-option <el-option
v-for="(item, index) in getPartOptions" v-for="(item, index) in getPartOptions"
:key="index" :key="index"
:label="item.partName" :label="item.partCode"
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>

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

@ -163,6 +163,7 @@
filterable filterable
@change="processChange(scope.row, scope.$index)" @change="processChange(scope.row, scope.$index)"
> >
<el-option <el-option
v-for="(item, index) in processSetOption" v-for="(item, index) in processSetOption"
:key="index" :key="index"

25
src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
Unescape View File

@ -141,7 +141,7 @@
<el-option <el-option
v-for="(item, index) in processSetOption" v-for="(item, index) in processSetOption"
:key="index" :key="index"
:label="item.name" :label="`${item.code}-${item.name}`"
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
@ -167,7 +167,7 @@
<el-option <el-option
v-for="(item, index) in craftAbilityOption" v-for="(item, index) in craftAbilityOption"
:key="index" :key="index"
:label="item.caName" :label="`${item.caCode}-${item.caName}`"
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
@ -175,9 +175,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="makeMemo" label="工序描述"> <el-table-column prop="makeMemo" label="工序描述">
<template #header>
<span><i style="color: red">*</i>工序描述</span>
</template>
<template #default="scope"> <template #default="scope">
<el-form-item <el-form-item
:prop="`tableData1[${scope.$index}].processInfo.makeMemo`" :prop="`tableData1[${scope.$index}].processInfo.makeMemo`"
@ -302,7 +299,7 @@
> >
<el-option <el-option
v-for="(item, index) in projectOptions" v-for="(item, index) in projectOptions"
:label="item.name" :label="`${item.code}-${item.name}`"
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
@ -327,7 +324,7 @@
> >
<el-option <el-option
v-for="(item, index) in standardList" v-for="(item, index) in standardList"
:label="item.name" :label="`${item.code}-${item.name}`"
:value="item.id" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
@ -639,7 +636,6 @@ export default {
proDes: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }], proDes: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
proHours: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }], proHours: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }],
cruxProcess: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }], cruxProcess: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
makeMemo: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
}, },
formRules2: { formRules2: {
trialNo: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }], trialNo: [{ required: true, message: '请输入', trigger: ['change', 'submit'] }],
@ -761,7 +757,10 @@ export default {
processChange(row, index) { processChange(row, index) {
let selectName = this.processSetOption.find(item => item.id == row.processInfo.ppsId); let selectName = this.processSetOption.find(item => item.id == row.processInfo.ppsId);
this.form1.tableData1[index].processInfo.ppsName = selectName.name; this.form1.tableData1[index].processInfo.ppsName = selectName.name;
if (this.form1.tableData1[index].processName&&this.form1.tableData1[index].processName.indexOf('涂色标') > -1) { if (
this.form1.tableData1[index].processName &&
this.form1.tableData1[index].processName.indexOf('涂色标') > -1
) {
// tsbNum 涂色标个数 tsdNum 涂色带个数 涂箭头个数 // tsbNum 涂色标个数 tsdNum 涂色带个数 涂箭头个数
let sum_ = 0; let sum_ = 0;
if (this.partInfoData.tsbNum) { if (this.partInfoData.tsbNum) {
@ -914,7 +913,9 @@ export default {
label: `${craftInfo?.reworkOrder || '返工单'}`, label: `${craftInfo?.reworkOrder || '返工单'}`,
rawData: craftInfo, rawData: craftInfo,
children: processList.map(process => { children: processList.map(process => {
process.processInfo.cruxProcess = process.processInfo.cruxProcess ? process.processInfo.cruxProcess : process.processInfo.isMain; process.processInfo.cruxProcess = process.processInfo.cruxProcess
? process.processInfo.cruxProcess
: process.processInfo.isMain;
const ppsName = const ppsName =
process.processInfo.ppsName || process.processInfo.ppsName ||
process.processInfo.name || process.processInfo.name ||
@ -931,7 +932,7 @@ export default {
return { return {
...process, ...process,
label: ppsNo+'-'+ppsName, label: ppsNo + '-' + ppsName,
rawData: { rawData: {
partCode: partInfo.partCode, partCode: partInfo.partCode,
partId: partInfo.id, partId: partInfo.id,
@ -1203,7 +1204,7 @@ export default {
processMeasuringToolDeleteIds: this.form3.deleteIds, //量具删除id processMeasuringToolDeleteIds: this.form3.deleteIds, //量具删除id
processMoldToolDeleteIds: this.form4.deleteIds, //工装删除合集 processMoldToolDeleteIds: this.form4.deleteIds, //工装删除合集
}; };
console.log(999999,query_) console.log(999999, query_);
reworkAuthorizedAccomplish(query_).then(res => { reworkAuthorizedAccomplish(query_).then(res => {
this.$message.success('保存成功'); this.$message.success('保存成功');
this.craftLoading = false; this.craftLoading = false;

Write Preview
Loading…
Cancel
Save