代码提交

dev-scheduling
zhangdi 4 months ago
parent ba07a8a507
commit 31012d24b3
  1. 39
      src/api/productionSchedulingPlan/basic.js
  2. 4
      src/views/processManagement/basicProcesses.vue
  3. 4
      src/views/processManagement/bathRefine/accumulateClass.vue
  4. 4
      src/views/processManagement/bathRefine/addQuantity.vue
  5. 10
      src/views/processManagement/bathRefine/bathRefineTask.vue
  6. 6
      src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue
  7. 3
      src/views/processManagement/bathRefine/components/addPeriodicalClassDialog.vue
  8. 4
      src/views/processManagement/bathRefine/components/addQuantityDialog.vue
  9. 4
      src/views/processManagement/bathRefine/components/periodicalBatch.vue
  10. 2
      src/views/processManagement/bathRefine/components/periodicalClassDevice.vue
  11. 6
      src/views/processManagement/bathRefine/js/periodColumnData.js
  12. 6
      src/views/processManagement/bathRefine/planClass.vue
  13. 4
      src/views/processManagement/bathRefine/workCenterDevice.vue
  14. 2
      src/views/processManagement/components/addBasicProcessesDialog.vue
  15. 12
      src/views/processManagement/components/addTemplateDialog.vue
  16. 6
      src/views/processManagement/components/addTestDialog.vue
  17. 2
      src/views/processManagement/components/assignDaialog.vue
  18. 6
      src/views/processManagement/components/inPlantMaintenance.vue
  19. 4
      src/views/processManagement/components/processMainte/dsCraft.vue
  20. 8
      src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
  21. 4
      src/views/processManagement/components/processMainte/dsProcess.vue
  22. 62
      src/views/processManagement/components/processMainte/partDetails.vue
  23. 18
      src/views/processManagement/components/processMainte/processPlanning.vue
  24. 68
      src/views/processManagement/components/processMainte/reworkProcessPlanning.vue
  25. 2
      src/views/processManagement/inPlantProcess.vue
  26. 4
      src/views/processManagement/procepssPlanning.vue
  27. 2
      src/views/processManagement/sinTer/components/moldChild.vue
  28. 2
      src/views/processManagement/sinTer/components/sinterMoldNew.vue
  29. 2
      src/views/processManagement/taskDispatch.vue
  30. 5
      src/views/processManagement/taskProcessing.vue
  31. 243
      src/views/productionSchedulingPlan/basic/oemProcess.vue

@ -284,4 +284,43 @@ export const exportBlob = (url, params) => {
method: 'post',
responseType: 'blob',
});
};
// 外协工序 增删改查
export const getListOutsourceProcess = (current, size, params) => {
return request({
url: '/blade-scheduling/outsourceProcess/page',
method: 'get',
params: {
...params,
current,
size,
},
});
};
export const removeOutsourceProcess = ids => {
return request({
url: '/blade-scheduling/outsourceProcess/remove',
method: 'post',
params: {
ids,
},
});
};
export const addOutsourceProcess = row => {
return request({
url: '/blade-scheduling/outsourceProcess/save',
method: 'post',
data: row,
});
};
export const updateOutsourceProcess = row => {
return request({
url: '/blade-scheduling/outsourceProcess/update',
method: 'post',
data: row,
});
};

@ -165,7 +165,6 @@ export default {
gridBtn: false,
searchMenuPosition: 'right',
align: 'center',
column: [
{
label: '编码',
@ -215,6 +214,7 @@ export default {
align: 'center',
searchLabelWidth: 120,
type: 'select',
filterable:true,
clearable: true,
dicData: [
{
@ -245,6 +245,7 @@ export default {
align: 'center',
searchLabelWidth: 60,
type: 'select',
filterable:true,
clearable: true,
dicData: [
{
@ -275,6 +276,7 @@ export default {
align: 'center',
searchLabelWidth: 45,
type: 'select',
filterable:true,
clearable: true,
dicData: [
{

@ -229,6 +229,8 @@ export default {
label: '作业中心',
prop: 'wcId',
type: 'select',
filterable:true,
clearable: true,
search: true,
sortable: true,
overHidden: true,
@ -269,6 +271,8 @@ export default {
label: '规则类型',
prop: 'ruleType',
type: 'select',
filterable:true,
clearable: true,
search: true,
sortable: true,
overHidden: true,

@ -108,6 +108,8 @@ export default {
label: '作业中心',
prop: 'wcId',
type: 'select',
filterable:true,
clearable: true,
search: true,
sortable: true,
overHidden: true,
@ -127,6 +129,8 @@ export default {
sortable: true,
overHidden: true,
type: 'select',
filterable:true,
clearable: true,
headerAlign: 'center',
align: 'center',
searchLabelWidth: 80,

@ -146,6 +146,8 @@ export default {
label: '作业中心',
prop: 'wcId',
type: 'select',
filterable:true,
clearable: true,
width: 200,
search: true,
sortable: true,
@ -170,6 +172,8 @@ export default {
label: '作业槽/设备检查项',
prop: 'batchNo',
type: 'select',
filterable:true,
clearable: true,
search: true,
width: 200,
sortable: true,
@ -246,6 +250,8 @@ export default {
prop: 'finishManStr',
width: 120,
type: 'select',
filterable:true,
clearable: true,
search: false,
sortable: true,
overHidden: true,
@ -287,6 +293,8 @@ export default {
align: 'center',
searchMenuPosition: 'right',
type: 'select',
filterable:true,
clearable: true,
dicData: [
{
label: '合格',
@ -309,6 +317,8 @@ export default {
label: '状态',
prop: 'taskStatus',
type: 'select',
filterable:true,
clearable: true,
width: 120,
search: true,
sortable: true,

@ -28,7 +28,7 @@
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].wcId`" :rules="formRules.wcId">
<el-select v-model="scope.row.wcId">
<el-select v-model="scope.row.wcId" clearable filterable>
<el-option
v-for="item in wcData"
:key="item.id"
@ -45,7 +45,7 @@
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].batchNo`" :rules="formRules.batchNo">
<el-select v-model="scope.row.batchNo">
<el-select v-model="scope.row.batchNo" clearable filterable>
<el-option
v-for="item in batchNoOptions"
:key="item.value"
@ -62,7 +62,7 @@
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].ruleType`" :rules="formRules.ruleType">
<el-select v-model="scope.row.ruleType">
<el-select v-model="scope.row.ruleType" clearable filterable>
<el-option
v-for="item in ruleTypeData"
:key="item.value"

@ -23,7 +23,7 @@
<template #default="scope">
<!-- prop 格式数组名[索引].字段名 -->
<el-form-item :prop="`tableData[${scope.$index}].wcId`" :rules="formRules.wcId">
<el-select v-model="scope.row.wcId" placeholder="请选择" style="width: 100%">
<el-select v-model="scope.row.wcId" placeholder="请选择" style="width: 100%" clearable filterable>
<el-option
v-for="item in wcData"
:key="item.id"
@ -59,6 +59,7 @@
v-model="scope.row.batchNo"
placeholder="请选择"
style="width: 100%"
clearable filterable
>
<el-option label="#21" value="1"></el-option>
<el-option label="11" value="11"></el-option>

@ -23,7 +23,7 @@
<template #default="scope">
<!-- prop 格式数组名[索引].字段名 -->
<el-form-item :prop="`tableData[${scope.$index}].wcId`" :rules="formRules.wcId">
<el-select v-model="scope.row.wcId" placeholder="请选择" style="width: 100%">
<el-select v-model="scope.row.wcId" placeholder="请选择" style="width: 100%" clearable filterable>
<el-option
v-for="item in wcData"
:key="item.id"
@ -42,7 +42,7 @@
</template>
<template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].batchNo`" :rules="formRules.batchNo">
<el-select v-model="scope.row.batchNo" placeholder="请选择" style="width: 100%">
<el-select v-model="scope.row.batchNo" placeholder="请选择" style="width: 100%" clearable filterable>
<el-option label="#21" value="1"></el-option>
<el-option label="11" value="11"></el-option>
<el-option label="#22" value="3"></el-option>

@ -136,6 +136,8 @@ export default {
label: '作业槽',
prop: 'batchNo',
type: 'select',
filterable:true,
clearable: true,
search: true,
sortable: true,
overHidden: true,
@ -177,6 +179,8 @@ export default {
label: '审批状态',
prop: 'approvalStatus',
type: 'select',
filterable:true,
clearable: true,
search: false,
hide: true,
sortable: true,

@ -190,6 +190,8 @@ export default {
label: '审批状态',
prop: 'approvalStatus',
type: 'select',
filterable:true,
clearable: true,
search: true,
hide: true,
sortable: true,

@ -27,6 +27,8 @@ export default {
label: '作业槽',
prop: 'batchNo',
type: 'select',
filterable:true,
clearable: true,
search: true,
sortable: true,
overHidden: true,
@ -68,6 +70,8 @@ export default {
label: '审批状态',
prop: 'approvalStatus',
type: 'select',
filterable:true,
clearable: true,
search: false,
hide: true,
sortable: true,
@ -199,6 +203,8 @@ export default {
label: '审批状态',
prop: 'approvalStatus',
type: 'select',
filterable:true,
clearable: true,
search: true,
hide: true,
sortable: true,

@ -102,6 +102,8 @@ export default {
label: '作业中心',
prop: 'wcId',
type: 'select',
filterable:true,
clearable: true,
search: true,
sortable: true,
overHidden: true,
@ -125,6 +127,8 @@ export default {
label: '作业槽',
prop: 'batchNo',
type: 'select',
filterable:true,
clearable: true,
search: true,
sortable: true,
overHidden: true,
@ -188,6 +192,8 @@ export default {
label: '审批状态',
prop: 'approvalStatus',
type: 'select',
filterable:true,
clearable: true,
addDisplay: false,
editDisplay: false,
search: true,

@ -88,6 +88,8 @@ export default {
label: '作业中心',
prop: 'wcId',
type: 'select',
filterable:true,
clearable: true,
search: true,
sortable: true,
overHidden: true,
@ -112,6 +114,8 @@ export default {
label: '工艺员',
prop: 'craftManName',
type: 'select',
filterable:true,
clearable: true,
// multiple: true,
search: false,
sortable: true,

@ -44,7 +44,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="检验工序:" prop="isCheckout">
<el-select v-model="ruleForm.isCheckout" placeholder="请选择">
<el-select v-model="ruleForm.isCheckout" placeholder="请选择" clearable filterable>
<el-option
label="是"
value="1">

@ -14,14 +14,14 @@
</el-col>
<el-col :span="8">
<el-form-item label="模板类型:" prop="templateType">
<el-select v-model="ruleForm.templateType" placeholder="请选择">
<el-select v-model="ruleForm.templateType" placeholder="请选择" clearable filterable>
<el-option v-for="(item,index) in processTemplateList" :label="item.dictValue" :value="item.dictKey"> </el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="作业中心:" prop="workCenterId">
<el-select v-model="ruleForm.workCenterId" placeholder="请选择">
<el-select v-model="ruleForm.workCenterId" placeholder="请选择" clearable filterable>
<el-option label="作业中心1" value="1"> </el-option>
<el-option label="作业中心2" value="2"> </el-option>
<el-option label="作业中心3" value="3"> </el-option>
@ -39,7 +39,7 @@
</el-col> -->
<el-col :span="8">
<el-form-item label="镀种分类:" prop="platingType">
<el-select v-model="ruleForm.platingType" placeholder="请选择">
<el-select v-model="ruleForm.platingType" placeholder="请选择" clearable filterable>
<el-option v-for="(item,index) in platingTypeList" :label="item.plateType" :value="item.id"> </el-option>
</el-select>
@ -81,7 +81,7 @@
<span><i style="color:red">*</i>工序代码</span>
</template>
<template #default="scope">
<el-select v-model="scope.row.processCode" placeholder="请选择" @change="processChange(scope.row,scope.$index)">
<el-select v-model="scope.row.processCode" placeholder="请选择" @change="processChange(scope.row,scope.$index)" clearable filterable>
<el-option v-for="(item,index) in processList" :label="item.code"
:value="item.id"> </el-option>
@ -99,7 +99,7 @@
<span><i style="color:red">*</i>工艺能力</span>
</template>
<template #default="scope">
<el-select v-model="scope.row.craftCode" placeholder="请选择">
<el-select v-model="scope.row.craftCode" placeholder="请选择" clearable filterable>
<el-option label="工艺能力1" value="1"> </el-option>
<el-option label="工艺能力2" value="2"> </el-option>
<el-option label="工艺能力3" value="3"> </el-option>
@ -127,7 +127,7 @@
<span><i style="color:red">*</i>主工序</span>
</template>
<template #default="scope">
<el-select v-model="scope.row.isMain" placeholder="请选择">
<el-select v-model="scope.row.isMain" placeholder="请选择" clearable filterable>
<el-option label="是" value="1"> </el-option>
<el-option label="否" value="2"> </el-option>
</el-select>

@ -10,7 +10,7 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="零件号:" prop="partId">
<el-select v-model="ruleForm.partId" placeholder="请输入" @change="partChange">
<el-select v-model="ruleForm.partId" placeholder="请输入" @change="partChange" clearable filterable>
<el-option v-for="(item,index) in getPartOptions" :key="index" :label="item.partName" :value="item.id" />
</el-select>
</el-form-item>
@ -20,14 +20,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="工艺版本号:" prop="version">
<el-select v-model="ruleForm.version" placeholder="请输入">
<el-select v-model="ruleForm.version" placeholder="请输入" clearable filterable>
<el-option v-for="(item,index) in versionOptions" :key="index" :label="item.partVersions" :value="item.partVersions" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工艺员:" prop="craftMan">
<el-select v-model="ruleForm.craftMan" placeholder="请输入">
<el-select v-model="ruleForm.craftMan" placeholder="请输入" clearable filterable>
<el-option v-for="(item,index) in craftManOptions" :key="index" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>

@ -53,6 +53,8 @@ export default {
prop: 'userId',
span: 23,
type: 'select',
filterable:true,
clearable: true,
dicUrl: '/blade-system/user/page?current=1&&size=99999',
props: {
label: 'name',

@ -109,6 +109,8 @@ export default {
headerAlign: 'center',
align: 'left',
type: 'select',
filterable:true,
clearable: true,
dicUrl: '/blade-desk/bsWorkCenter/getList',
props: {
label: 'wcName',
@ -132,6 +134,8 @@ export default {
headerAlign: 'center',
align: 'left',
type: 'select',
filterable:true,
clearable: true,
dicData: [
{
label: '产线1',
@ -224,6 +228,8 @@ export default {
headerAlign: 'center',
align: 'center',
type: 'select',
filterable:true,
clearable: true,
dicUrl: '/blade-system/user/page?current=1&&size=99999',
props: {
label: 'name',

@ -13,7 +13,7 @@
<el-col :span="8">
<!-- 级别 -->
<el-form-item :label="'工艺级别'" prop="rank">
<el-select v-model="dsCraftMold.rank" :placeholder="'请选择'">
<el-select v-model="dsCraftMold.rank" :placeholder="'请选择'" clearable filterable>
<el-option
v-for="item in rankList"
:key="item.value"
@ -33,7 +33,7 @@
style="width: 120px"
@change="procedureQuaChange"
/>
<el-select v-model="dsCraftMold.qualityGrade" :placeholder="'请选择'">
<el-select v-model="dsCraftMold.qualityGrade" :placeholder="'请选择'" clearable filterable>
<el-option
v-for="item in rankList"
:key="item.value"

@ -89,7 +89,7 @@
v-if="partType == '热表' || (partType == '烧结' && formData.isGlassCake)"
>
<el-form-item label="物料编码:" prop="wuliaobianma">
<el-select v-model="value" placeholder="请选择" style="width: 250px">
<el-select v-model="value" placeholder="请选择" style="width: 250px" clearable filterable>
<el-option label="物料一" value="1" />
<el-option label="物料二" value="2" />
<el-option label="物料三" value="3" />
@ -98,7 +98,7 @@
</el-col>
<el-col :span="8" v-if="partType == '热表'">
<el-form-item label="镀种1:" prop="plate">
<el-select v-model="formData.plate" placeholder="请选择" style="width: 250px">
<el-select v-model="formData.plate" placeholder="请选择" style="width: 250px" clearable filterable>
<el-option label="镀种一" value="1" />
<el-option label="镀种二" value="2" />
<el-option label="镀种三" value="3" />
@ -117,7 +117,7 @@
</el-col>
<el-col :span="8" v-if="partType == '热表'">
<el-form-item label="镀种2:" prop="plateTwo">
<el-select v-model="formData.plateTwo" placeholder="请选择" style="width: 250px">
<el-select v-model="formData.plateTwo" placeholder="请选择" style="width: 250px" clearable filterable>
<el-option label="镀种一" value="1" />
<el-option label="镀种二" value="2" />
<el-option label="镀种三" value="3" />
@ -480,6 +480,8 @@ export default {
sortable: true,
overHidden: true,
type: 'select',
filterable:true,
clearable: true,
cell: true,
dicData: [
{

@ -6,7 +6,7 @@
<el-col :span="8">
<!-- 级别 -->
<el-form-item :label="'工艺级别'" prop="rank">
<el-select v-model="dsCraftMold.rank" :placeholder="'请选择'">
<el-select v-model="dsCraftMold.rank" :placeholder="'请选择'" clearable filterable>
<el-option v-for="item in rankList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
@ -16,7 +16,7 @@
<el-form-item :label="'生产标识'" prop="qualityGrade">
<procedure-qua v-model="dsCraftMold.qualityGrade" :option="procedureQuaOption" multiple style="width:120px"
@change="procedureQuaChange" />
<el-select v-model="dsCraftMold.qualityGrade" :placeholder="'请选择'">
<el-select v-model="dsCraftMold.qualityGrade" :placeholder="'请选择'" clearable filterable>
<el-option v-for="item in rankList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>

@ -88,7 +88,7 @@
v-if="partType == '热表' || (partType == '烧结' && formData.isGlassCake)"
>
<el-form-item label="物料编码:" prop="wuliaobianma">
<el-select v-model="value" placeholder="请选择" style="width: 250px" disabled>
<el-select v-model="value" placeholder="请选择" style="width: 250px" disabled clearable filterable>
<el-option label="物料一" value="1" />
<el-option label="物料二" value="2" />
<el-option label="物料三" value="3" />
@ -102,6 +102,7 @@
placeholder="请选择"
style="width: 250px"
disabled
clearable filterable
>
<el-option label="镀种一" value="1" />
<el-option label="镀种二" value="2" />
@ -126,6 +127,7 @@
placeholder="请选择"
style="width: 250px"
disabled
clearable filterable
>
<el-option label="镀种一" value="1" />
<el-option label="镀种二" value="2" />
@ -263,10 +265,11 @@
<el-form :model="form" label-width="auto">
<el-form-item label="工艺级别:">
<el-select
v-model="processLevel"
v-model="rank"
placeholder="请选择"
style="width: 220px"
@change="leavelChange"
clearable filterable
>
<el-option label="一级工艺" value="1" />
<el-option label="二级工艺" value="2" />
@ -288,14 +291,30 @@
<el-form :model="form" label-width="auto">
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="重要度:" prop="zhongyaodu"> </el-form-item>
<el-form-item label="重要度:" prop="zhongyaodu">
{{
this.craftData.craftList.length > 0
? this.craftData.craftList[0].craftInfo.prority
: ''
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="生产标识:" prop="qualityGrade"> </el-form-item>
<el-form-item label="生产标识:" prop="qualityGrade">
{{
this.craftData.craftList.length > 0
? this.craftData.craftList[0].craftInfo.qualityGradeName
: ''
}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注:" prop="beizhu">
{{ form.beizhu }}
{{
this.craftData.craftList.length > 0
? this.craftData.craftList[0].craftInfo.remarks
: ''
}}
</el-form-item>
</el-col>
</el-row>
@ -395,6 +414,10 @@ export default {
type: String,
default: '',
},
partId: {
type: String,
default: '',
},
},
data() {
return {
@ -407,6 +430,7 @@ export default {
form: {},
processLevel: '1',
rankList: [],
rank: '2',
priorityList: [],
form1: {
tableData1: [], //
@ -498,6 +522,8 @@ export default {
sortable: true,
overHidden: true,
type: 'select',
filterable:true,
clearable: true,
cell: true,
dicData: [
{
@ -529,7 +555,7 @@ export default {
sortable: true,
overHidden: true,
},
{
{
label: '修改时间',
prop: 'updateTime',
search: false,
@ -554,17 +580,6 @@ export default {
methods: {
//
handleNodeClick(nodes, node, self) {
// if (nodes.disabled) {
// //
// return false;
// }
// this.treeLeave = node.level;
// if (this.treeLeave == 3) {
// this.activeName = '2';
// }
// if (this.treeLeave == 2) {
// this.activeName = '1';
// }
if (nodes.disabled) {
return false;
}
@ -621,26 +636,27 @@ export default {
},
leavelChange(value) {
console.log('工艺级别', value);
this.getCcraftInfo();
},
//
getCcraftInfo() {
// -
if (this.detailsType == 'processPlanning') {
let query = {
partId: 4,
partId: this.partId,
partVersion: '1.3',
rank: '2',
rank: this.rank,
};
getProcessManagementAuthorized(query).then(res => {
this.data = this.transformCraftTree(res.data.data);
});
} else if (this.detailsType === 'taskProcessing') {
let query = {
partId: 4,
partVersion: '1.3',
rank: '2',
partId: this.partId,
rank: this.rank,
taskId: this.rowData.id,
};
getProcessAuthorized({ partId: this.partId, taskId: this.rowData.id }).then(res => {
getProcessAuthorized(query).then(res => {
this.craftData = res.data.data;
this.data = this.transformCraftTree(res.data.data);
});

@ -10,6 +10,7 @@
placeholder="请选择"
style="width: 220px"
@change="leavelChange"
clearable filterable
>
<el-option label="一级工艺" value="1" />
<el-option label="二级工艺" value="2" />
@ -32,7 +33,7 @@
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="重要度:" prop="zhongyaodu">
<el-select v-model="form.zhongyaodu" :placeholder="'请选择'">
<el-select v-model="form.zhongyaodu" :placeholder="'请选择'" clearable filterable>
<el-option
v-for="item in priorityList"
:key="item.value"
@ -44,7 +45,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="生产标识:" prop="qualityGrade">
<el-select v-model="form.qualityGrade" :placeholder="'请选择'">
<el-select v-model="form.qualityGrade" :placeholder="'请选择'" clearable filterable>
<el-option
v-for="item in rankList"
:key="item.value"
@ -78,6 +79,7 @@
v-model="modelLevel"
placeholder="选择工艺模板"
style="width: 220px; margin-right: 12px"
clearable filterable
>
<el-option
v-for="(item, index) in modelOption"
@ -117,7 +119,7 @@
:prop="`tableData1[${scope.$index}].ppsId`"
:rules="formRules1.ppsId"
>
<el-select v-model="scope.row.ppsId" placeholder="请选择">
<el-select v-model="scope.row.ppsId" placeholder="请选择" clearable filterable>
<el-option
v-for="(item, index) in processSetOption"
:key="index"
@ -137,7 +139,7 @@
:prop="`tableData1[${scope.$index}].craftName`"
:rules="formRules1.craftName"
>
<el-select v-model="scope.row.craftName" placeholder="请选择">
<el-select v-model="scope.row.craftName" placeholder="请选择" clearable filterable>
<el-option
v-for="(item, index) in craftAbilityOption"
:key="index"
@ -191,7 +193,7 @@
<el-table-column prop="isMain" label="是否主工序">
<template #default="scope">
<el-form-item :prop="`tableData1[${scope.$index}].isMain`" :rules="formRules1.isMain">
<el-select v-model="scope.row.isMain" placeholder="请选择">
<el-select v-model="scope.row.isMain" placeholder="请选择" clearable filterable>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="2"></el-option>
</el-select>
@ -228,7 +230,7 @@
:prop="`tableData2[${scope.$index}].projectName`"
:rules="formRules2.projectName"
>
<el-select v-model="scope.row.projectName" placeholder="请选择">
<el-select v-model="scope.row.projectName" placeholder="请选择" clearable filterable>
<el-option label="是" value="1"></el-option>
</el-select>
</el-form-item>
@ -307,7 +309,7 @@
:prop="`tableData3[${scope.$index}].testType`"
:rules="formRules3.testType"
>
<el-select v-model="scope.row.testType" placeholder="请选择">
<el-select v-model="scope.row.testType" placeholder="请选择" clearable filterable>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="2"></el-option>
</el-select>
@ -320,7 +322,7 @@
</template>
<template #default="scope">
<el-form-item :prop="`tableData3[${scope.$index}].tool`" :rules="formRules3.tool">
<el-select v-model="scope.row.tool" placeholder="请选择">
<el-select v-model="scope.row.tool" placeholder="请选择" clearable filterable>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="2"></el-option>
</el-select>

@ -26,11 +26,23 @@
</div>
</div>
<div class="table-btn-right" v-if="activeName == '1'">
<div class="table-btn-right-box">
<!-- <el-input v-model="reworkNoNum" type="number" placeholder="请输入" style="width: 220px; margin-right: 12px"></el-input>
<el-button type="primary" @change="reworkNoNumSave()">保存</el-button> -->
<el-input placeholder="请输入内容" v-model="reworkNoNum">
<template #append>
<el-button :icon="Search" >保存</el-button>
</template>
<el-button class="el-icon-search" @click="reworkNoNumSave()">保存</el-button>
</el-input>
</div>
<div class="table-btn-right-box">
<el-select
v-model="modelLevel"
placeholder="选择工艺模板"
style="width: 220px; margin-right: 12px"
clearable
filterable
>
<el-option
v-for="(item, index) in modelOption"
@ -46,6 +58,8 @@
v-model="processLevel"
placeholder="选择零件"
style="width: 220px; margin-right: 12px"
clearable
filterable
>
<el-option label="模板一" value="1" />
<el-option label="模板二" value="2" />
@ -110,7 +124,12 @@
:prop="`tableData1[${scope.$index}].processInfo.ppsId`"
:rules="formRules1.ppsId"
>
<el-select v-model="scope.row.processInfo.ppsId" placeholder="请选择">
<el-select
v-model="scope.row.processInfo.ppsId"
placeholder="请选择"
clearable
filterable
>
<el-option
v-for="(item, index) in processSetOption"
:key="index"
@ -130,7 +149,12 @@
:prop="`tableData1[${scope.$index}].processInfo.caId`"
:rules="formRules1.caId"
>
<el-select v-model="scope.row.processInfo.caId" placeholder="请选择">
<el-select
v-model="scope.row.processInfo.caId"
placeholder="请选择"
clearable
filterable
>
<el-option
v-for="(item, index) in craftAbilityOption"
:key="index"
@ -143,7 +167,12 @@
</el-table-column>
<el-table-column prop="makeTeam" label="加工班组">
<template #default="scope">
<el-select v-model="scope.row.processInfo.makeTeam" placeholder="请选择">
<el-select
v-model="scope.row.processInfo.makeTeam"
placeholder="请选择"
clearable
filterable
>
<el-option label="班组1" :value="1"></el-option>
<el-option label="班组2" :value="2"></el-option>
<el-option label="班组2" :value="3"></el-option>
@ -172,7 +201,12 @@
:prop="`tableData1[${scope.$index}].processInfo.cruxProcess`"
:rules="formRules1.cruxProcess"
>
<el-select v-model="scope.row.processInfo.cruxProcess" placeholder="请选择">
<el-select
v-model="scope.row.processInfo.cruxProcess"
placeholder="请选择"
clearable
filterable
>
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
@ -225,7 +259,12 @@
:prop="`tableData2[${scope.$index}].projectName`"
:rules="formRules2.projectName"
>
<el-select v-model="scope.row.projectName" placeholder="请选择">
<el-select
v-model="scope.row.projectName"
placeholder="请选择"
clearable
filterable
>
<el-option label="是" value="1"></el-option>
</el-select>
</el-form-item>
@ -286,7 +325,7 @@
:prop="`tableData3[${scope.$index}].testType`"
:rules="formRules3.testType"
>
<el-select v-model="scope.row.testType" placeholder="请选择">
<el-select v-model="scope.row.testType" placeholder="请选择" clearable filterable>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="2"></el-option>
</el-select>
@ -299,7 +338,7 @@
</template>
<template #default="scope">
<el-form-item :prop="`tableData3[${scope.$index}].tool`" :rules="formRules3.tool">
<el-select v-model="scope.row.tool" placeholder="请选择">
<el-select v-model="scope.row.tool" placeholder="请选择" clearable filterable>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="2"></el-option>
</el-select>
@ -524,6 +563,7 @@ export default {
processSetOption: [],
craftAbilityOption: [],
treeNodes: {},
reworkNoNum: null, //
};
},
mounted() {
@ -533,6 +573,9 @@ export default {
this.getCraftAbilityList();
},
methods: {
reworkNoNumSave() {
console.log(99999, this.reworkNoNum);
},
//
getProcessSetList() {
getProcessSetList().then(res => {
@ -670,39 +713,38 @@ export default {
}
},
submit() {
if (this.activeName == '1') {
// Form
this.$refs.tableForm1.validate((isValid, invalidFields) => {
if (isValid) {
this.submitData()
this.submitData();
}
});
}
if (this.activeName == '2') {
this.$refs.tableForm2.validate((isValid, invalidFields) => {
if (isValid) {
this.submitData()
this.submitData();
}
});
}
if (this.activeName == '3') {
this.$refs.tableForm3.validate((isValid, invalidFields) => {
if (isValid) {
this.submitData()
this.submitData();
}
});
}
if (this.activeName == '4') {
this.$refs.tableForm4.validate((isValid, invalidFields) => {
if (isValid) {
this.submitData()
this.submitData();
}
});
}
},
submitData() {
let newArr = [];
let newArr = [];
if (this.treeLeave == 2) {
this.treeNodes.processList.forEach(item => {
newArr.push({

@ -90,6 +90,8 @@ export default {
headerAlign: 'center',
align: 'left',
type: 'select',
filterable:true,
clearable: true,
hide: true,
dicUrl: '/blade-desk/bsWorkCenter/getList',
props: {

@ -222,6 +222,8 @@ export default {
headerAlign: 'center',
align: 'center',
type: 'select',
filterable:true,
clearable: true,
multiple: true,
dicData: [
{
@ -262,6 +264,8 @@ export default {
search: false,
overHidden: true,
type: 'select',
filterable:true,
clearable: true,
headerAlign: 'center',
align: 'center',
dicData: [

@ -106,6 +106,8 @@ export default {
span: 24,
search: true,
type: 'select',
filterable:true,
clearable: true,
dicData: [
{
label: '烧结 部件一',

@ -106,6 +106,8 @@ export default {
span: 24,
search: true,
type: 'select',
filterable:true,
clearable: true,
dicData: [
{
label: '烧结 部件一',

@ -138,6 +138,8 @@ export default {
search: true,
overHidden: true,
type: 'select',
filterable:true,
clearable: true,
headerAlign: 'center',
align: 'center',
dicUrl: '/blade-system/dict/dictionary?code=processTaskType',

@ -115,6 +115,7 @@
:dialogType="'view'"
:rowData="detailsRow"
:detailsType="'taskProcessing'"
:partId="partId"
></partDetails>
</basic-container>
</template>
@ -223,6 +224,8 @@ export default {
search: true,
overHidden: true,
type: 'select',
filterable:true,
clearable: true,
headerAlign: 'center',
align: 'center',
dicUrl: '/blade-system/dict/dictionary?code=processTaskType',
@ -290,6 +293,8 @@ export default {
overHidden: true,
width: 120,
type: 'select',
filterable:true,
clearable: true,
headerAlign: 'center',
align: 'center',
searchLabelWidth: 45,

@ -0,0 +1,243 @@
<template>
<basic-container>
<avue-crud
:option="option"
:table-loading="loading"
:data="data"
v-model="form"
v-model:page="page"
ref="crud"
@row-del="rowDel"
@row-update="rowUpdate"
@row-save="rowSave"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left> </template>
<template #menu-right> </template>
<template #menu="{ row }"> </template>
<template #heatTreat="scope"> </template>
</avue-crud>
</basic-container>
</template>
<script>
import {
getListOutsourceProcess,
removeOutsourceProcess,
addOutsourceProcess,
updateOutsourceProcess,
} from '@/api/productionSchedulingPlan/basic';
export default {
components: {},
data() {
return {
form: {},
selectionList: [],
query: {},
loading: false,
page: {
pageSize: 10,
currentPage: 1,
total: 0,
},
option: {
columnSort: true,
tip: false,
height: 'auto',
calcHeight: 32,
simplePage: false,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
searchIndex: 3,
tree: false,
border: true,
index: true,
selection: false,
addBtn: true,
editBtn: true,
viewBtn: false,
delBtn: true,
editBtnText: '修改',
labelWidth: 120,
menuWidth: 120,
dialogWidth: 900,
dialogClickModal: false,
searchEnter: true,
excelBtn: false,
filterBtn: true,
searchShowBtn: false,
excelBtn: true,
showOverflowTooltip: true,
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
gridBtn: false,
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
menuAlign: 'left',
gridBtn: false,
searchMenuPosition: 'right',
align: 'center',
column: [
{
label: '工序',
prop: 'processId',
search: true,
sortable: true,
span: 12,
type: 'select',
filterable: true,
dicUrl: '/blade-scheduling/processSet/findList',
props: {
label: 'name',
value: 'id',
},
change: (val, row) => {
this.onChangeData(val.item, 'processId');
},
},
{
label: '工序',
prop: 'processName',
search: false,
sortable: true,
span: 12,
hide: true,
display: false,
},
{
label: '天数',
prop: 'days',
search: false,
sortable: true,
span: 12,
type: 'number',
},
{
label: '备注',
prop: 'remarks',
search: false,
sortable: true,
span: 12,
},
],
},
data: [],
};
},
methods: {
onChangeData(val, type) {
if (val && type == 'workCenterId') {
this.form.workCenterName = val.wcName;
}
if (val && type == 'processId') {
this.form.processName = val.name;
}
if (val && type == 'craftId') {
this.form.craftName = val.caName;
}
},
rowSave(row, done, loading) {
addOutsourceProcess(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
done();
},
error => {
window.console.log(error);
loading();
}
);
},
rowUpdate(row, index, done, loading) {
updateOutsourceProcess(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
done();
},
error => {
window.console.log(error);
loading();
}
);
},
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return removeOutsourceProcess(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
});
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
this.loading = true;
getListOutsourceProcess(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();
}
);
},
},
mounted() {},
};
</script>
Loading…
Cancel
Save