基础数据问题修改

dev-scheduling
zhangdi 2 months ago
parent 9e04baddea
commit 76adf574de
  1. 2
      src/api/productionSchedulingPlan/scheduling.js
  2. 2
      src/views/basicData/bigBatch/addBatch.vue
  3. 2
      src/views/basicData/calculationFormula/tankDosing.vue
  4. 2
      src/views/basicData/calculationFormula/theoreticalValue.vue
  5. 7
      src/views/basicData/localPlateParts/index.vue
  6. 4
      src/views/basicData/materialQuota/components/KAu.vue
  7. 4
      src/views/basicData/materialQuota/components/silverAnode.vue
  8. 2
      src/views/basicData/ruleMaintenance.vue
  9. 4
      src/views/basicData/shiftManagement.vue
  10. 47
      src/views/basicData/teamManagement.vue
  11. 50
      src/views/basicData/workCenter.vue
  12. 18
      src/views/flowManagement/milestoneDialog.vue
  13. 2
      src/views/oem/oemCustomer/index.vue
  14. 2
      src/views/oem/oemCustomer/setCraftAbility.vue
  15. 35
      src/views/oem/outsourcingAssignmentControl/index.vue
  16. 6
      src/views/processManagement/platingAssort.vue
  17. 10
      src/views/processManagement/platingTypeInfo.vue
  18. 412
      src/views/processManagement/processCapability.vue
  19. 1
      src/views/productionSchedulingPlan/basic/qualityGrade.vue
  20. 4
      src/views/qualityManagement/tankSolutionSystem/workTankManagement.vue

@ -54,7 +54,7 @@ export const selectEquip = row => {
// 排产恢复 recoveryUpdate // 排产恢复 recoveryUpdate
export const recoveryUpdate = row => { export const recoveryUpdate = row => {
return request({ return request({
url: '/blade-scheduling//yieldOrder/update', url: '/blade-scheduling/yieldOrder/update',
method: 'post', method: 'post',
data: row, data: row,
// data: row, // data: row,

@ -261,7 +261,7 @@ export default {
font-size: 14px; font-size: 14px;
line-height: 1.5; line-height: 1.5;
} }
:deep(.el-table .el-table__cell) { :deep(.el-table .el-table__body .el-table__cell) {
height: 50px !important; height: 50px !important;
padding: 0 !important; padding: 0 !important;
line-height: 50px !important; line-height: 50px !important;

@ -24,7 +24,7 @@
</template> </template>
<template #menu-right> </template> <template #menu-right> </template>
<template #menu="scope"> <template #menu="scope">
<el-button type="text" @click="editFn(scope.row)">编辑 </el-button> <el-button type="text" @click="editFn(scope.row)">修改 </el-button>
<el-button type="text" @click="handleDelete(scope.row)">删除 </el-button> <el-button type="text" @click="handleDelete(scope.row)">删除 </el-button>
</template> </template>
<template #produceTsTarget="scope"> </template> <template #produceTsTarget="scope"> </template>

@ -14,7 +14,7 @@
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-button type="text" @click="editFn(scope.row)">编辑 <el-button type="text" @click="editFn(scope.row)">修改
</el-button> </el-button>
<el-button type="text" @click="handleDelete(scope.row)">删除 <el-button type="text" @click="handleDelete(scope.row)">删除
</el-button> </el-button>

@ -19,7 +19,7 @@
@on-load="onLoad" @on-load="onLoad"
> >
<template #menu-left> <template #menu-left>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" <el-button type="danger" @click="handleDelete"
>删除 >删除
</el-button> </el-button>
</template> </template>
@ -70,9 +70,9 @@ export default {
delBtnIcon: " ", delBtnIcon: " ",
editBtnIcon: " ", editBtnIcon: " ",
viewBtnText: "详情", viewBtnText: "详情",
labelWidth: 120, labelWidth: 80,
menuWidth: 120, menuWidth: 120,
dialogWidth: 640, dialogWidth: 540,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
excelBtn: false, excelBtn: false,
@ -83,7 +83,6 @@ export default {
columnSort: true, columnSort: true,
showOverflowTooltip: true, showOverflowTooltip: true,
searchLabelPosition: "left", searchLabelPosition: "left",
searchLabelPosition: "left",
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: "center", menuAlign: "center",

@ -21,12 +21,12 @@
> >
<template #menu-left> <template #menu-left>
<!-- <el-button type="primary" icon="el-icon-plus" @click="addEdit">新增 </el-button> --> <!-- <el-button type="primary" icon="el-icon-plus" @click="addEdit">新增 </el-button> -->
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" <el-button type="danger" @click="handleDelete"
>删除 >删除
</el-button> </el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="primary" icon="el-icon-upload" @click="handleImport">导入 </el-button> <el-button type="primary" @click="handleImport">导入 </el-button>
</template> </template>
<template #menu="scope"> <template #menu="scope">
<!-- <el-button type="text" @click="editFn(scope.row)">编辑 </el-button> --> <!-- <el-button type="text" @click="editFn(scope.row)">编辑 </el-button> -->

@ -21,10 +21,10 @@
> >
<template #menu-left> <template #menu-left>
<!-- <el-button type="primary" icon="el-icon-plus" @click="addEdit">新增 </el-button> --> <!-- <el-button type="primary" icon="el-icon-plus" @click="addEdit">新增 </el-button> -->
<el-button type="danger" icon="el-icon-delete" @click="handleDelete">删除 </el-button> <el-button type="danger" @click="handleDelete">删除 </el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="primary" icon="el-icon-upload" @click="handleImport">导入 </el-button> <el-button type="primary" @click="handleImport">导入 </el-button>
</template> </template>
<template #menu="scope"> <template #menu="scope">
<!-- <el-button type="text" @click="editFn(scope.row)">编辑 </el-button> --> <!-- <el-button type="text" @click="editFn(scope.row)">编辑 </el-button> -->

@ -29,7 +29,7 @@
<el-button type="primary" @click="handleImport">导入</el-button> <el-button type="primary" @click="handleImport">导入</el-button>
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-button type="text" @click="editRow(scope.row)">编辑</el-button> <el-button type="text" @click="editRow(scope.row)">修改</el-button>
<el-button type="text" @click="rowDel(scope.row)">删除</el-button> <el-button type="text" @click="rowDel(scope.row)">删除</el-button>
</template> </template>
</avue-crud> </avue-crud>

@ -58,7 +58,7 @@ export default {
viewBtnText: "详情", viewBtnText: "详情",
labelWidth: 120, labelWidth: 120,
menuWidth: 120, menuWidth: 120,
dialogWidth: 600, dialogWidth: 300,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
filterBtn: true, filterBtn: true,
@ -66,12 +66,12 @@ export default {
excelBtn: true, excelBtn: true,
showOverflowTooltip: true, showOverflowTooltip: true,
searchLabelPosition: "left", searchLabelPosition: "left",
searchLabelPosition: "left",
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: "center", menuAlign: "center",
gridBtn: false, gridBtn: false,
searchMenuPosition: "right", searchMenuPosition: "right",
searchLabelWidth:'auto',
addBtnIcon: " ", addBtnIcon: " ",
viewBtnIcon: " ", viewBtnIcon: " ",
delBtnIcon: " ", delBtnIcon: " ",

@ -136,7 +136,7 @@
</el-dialog> </el-dialog>
<el-dialog title="时间" append-to-body v-model="timeDialog" width="60%"> <el-dialog title="时间" append-to-body v-model="timeDialog" width="60%">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="insertEvent()">插入一行</el-button> <el-button type="primary" @click="insertEvent()">插入一行</el-button>
<el-button plain type="danger" @click="remove">删除选择行</el-button> <el-button plain type="danger" @click="remove">删除选择行</el-button>
<!-- <el-button type="primary" @click="handleSave">保存</el-button> --> <!-- <el-button type="primary" @click="handleSave">保存</el-button> -->
</div> </div>
@ -259,15 +259,15 @@ export default {
searchIndex: 3, searchIndex: 3,
tree: false, tree: false,
border: true, border: true,
index: true, index: false,
selection: true, selection: true,
viewBtn: false, viewBtn: false,
delBtn: false, delBtn: false,
editBtnText: '修改', editBtnText: '修改',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 80,
menuWidth: 440, menuWidth: 380,
dialogWidth: 600, dialogWidth: 800,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
filterBtn: true, filterBtn: true,
@ -285,6 +285,7 @@ export default {
delBtnIcon: ' ', delBtnIcon: ' ',
editBtnIcon: ' ', editBtnIcon: ' ',
align: 'center', align: 'center',
searchLabelWidth: 'auto',
column: [ column: [
{ {
label: '编码', label: '编码',
@ -292,8 +293,8 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
filter: true, filter: true,
span: 24, span: 12,
width: 150, width: 100,
rules: [ rules: [
{ {
required: true, required: true,
@ -307,7 +308,7 @@ export default {
prop: 'tsName', prop: 'tsName',
sortable: true, sortable: true,
filter: true, filter: true,
span: 24, span: 12,
width: 150, width: 150,
search: true, search: true,
rules: [ rules: [
@ -325,7 +326,7 @@ export default {
type: 'select', type: 'select',
sortable: true, sortable: true,
filter: true, filter: true,
span: 24, span: 12,
width: 150, width: 150,
rules: [ rules: [
{ {
@ -348,7 +349,7 @@ export default {
sortable: true, sortable: true,
filter: true, filter: true,
type: 'select', type: 'select',
span: 24, span: 12,
width: 150, width: 150,
rules: [ rules: [
{ {
@ -372,7 +373,7 @@ export default {
filter: true, filter: true,
remote: true, remote: true,
type: 'select', type: 'select',
span: 24, span: 12,
width: 150, width: 150,
rules: [ rules: [
{ {
@ -396,7 +397,7 @@ export default {
filter: true, filter: true,
editDisplay: false, editDisplay: false,
addDisplay: false, addDisplay: false,
span: 24, span: 12,
width: 150, width: 150,
rules: [ rules: [
{ {
@ -413,7 +414,7 @@ export default {
type: 'select', type: 'select',
sortable: true, sortable: true,
filter: true, filter: true,
span: 24, span: 12,
width: 150, width: 150,
props: { props: {
label: 'name', label: 'name',
@ -428,7 +429,7 @@ export default {
type: 'select', type: 'select',
sortable: true, sortable: true,
filter: true, filter: true,
span: 24, span: 12,
width: 150, width: 150,
dicData: [ dicData: [
{ value: '1', label: '针孔' }, { value: '1', label: '针孔' },
@ -446,7 +447,7 @@ export default {
editDisplay: false, editDisplay: false,
filter: true, filter: true,
addDisplay: false, addDisplay: false,
span: 24, span: 12,
width: 150, width: 150,
rules: [ rules: [
{ {
@ -464,7 +465,7 @@ export default {
editDisplay: false, editDisplay: false,
filter: true, filter: true,
addDisplay: false, addDisplay: false,
span: 24, span: 12,
width: 150, width: 150,
rules: [ rules: [
{ {
@ -482,7 +483,7 @@ export default {
editDisplay: false, editDisplay: false,
filter: true, filter: true,
addDisplay: false, addDisplay: false,
span: 24, span: 12,
width: 150, width: 150,
rules: [ rules: [
{ {
@ -499,7 +500,7 @@ export default {
type: 'select', type: 'select',
sortable: true, sortable: true,
filter: true, filter: true,
span: 24, span: 12,
width: 150, width: 150,
dicData: [ dicData: [
{ {
@ -519,6 +520,16 @@ export default {
}, },
], ],
}, },
{
label: '修改时间',
prop: 'updateTime',
span: 12,
overflow: true,
search: false,
width: 150,
addDisplay: false,
editDisplay: false,
},
], ],
}, },
selectionList: [], selectionList: [],

@ -46,7 +46,7 @@
</el-dialog> </el-dialog>
<el-dialog title="设置工艺能力" append-to-body v-model="capacityDialog" width="60%"> <el-dialog title="设置工艺能力" append-to-body v-model="capacityDialog" width="60%">
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="insertEvent()">插入一行</el-button> <el-button type="primary" @click="insertEvent()">插入一行</el-button>
<el-button type="danger" @click="delTable">删除选中行</el-button> <el-button type="danger" @click="delTable">删除选中行</el-button>
<!-- <el-button type="primary" @click="handleSave">保存</el-button> --> <!-- <el-button type="primary" @click="handleSave">保存</el-button> -->
</div> </div>
@ -54,10 +54,13 @@
<el-table <el-table
:data="capacityList" :data="capacityList"
@selection-change="selectionChangeProject" @selection-change="selectionChangeProject"
@select="selectChange" @select="selectChange"
> >
<el-table-column type="selection" width="55px"></el-table-column> <el-table-column type="selection" width="55px"></el-table-column>
<el-table-column align="center" label="*工艺能力" prop="id"> <el-table-column align="center" label="工艺能力" prop="id">
<template #header>
<span><i style="color: red">*</i>工艺能力</span>
</template>
<template #default="scope"> <template #default="scope">
<el-select v-model="scope.row.id" filterable @change="handleAbilityChange"> <el-select v-model="scope.row.id" filterable @change="handleAbilityChange">
<el-option <el-option
@ -171,11 +174,11 @@ export default {
editBtnIcon: ' ', editBtnIcon: ' ',
delBtnIcon: ' ', delBtnIcon: ' ',
addBtn: true, addBtn: true,
labelWidth: 120, labelWidth: 100,
searchLabelWidth: 100, searchLabelWidth: 'auto',
menu: true, menu: true,
menuWidth: 240, menuWidth: 220,
dialogWidth: 800, dialogWidth: 700,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
excelBtn: true, excelBtn: true,
@ -183,7 +186,6 @@ export default {
searchShowBtn: false, searchShowBtn: false,
showOverflowTooltip: true, showOverflowTooltip: true,
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'center', menuAlign: 'center',
@ -197,7 +199,7 @@ export default {
{ {
label: '编码', label: '编码',
prop: 'wcCode', prop: 'wcCode',
span: 24, span: 12,
overflow: true, overflow: true,
search: true, search: true,
sortable: true, sortable: true,
@ -212,7 +214,7 @@ export default {
{ {
label: '名称', label: '名称',
prop: 'wcName', prop: 'wcName',
span: 24, span: 12,
overflow: true, overflow: true,
search: true, search: true,
sortable: true, sortable: true,
@ -227,7 +229,7 @@ export default {
{ {
label: '工序', label: '工序',
prop: 'processes', prop: 'processes',
span: 24, span: 12,
hide: true, hide: true,
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
@ -245,7 +247,7 @@ export default {
{ {
label: '工艺能力', label: '工艺能力',
prop: 'craftAbility', prop: 'craftAbility',
span: 24, span: 12,
overflow: true, overflow: true,
search: false, search: false,
addDisplay: false, addDisplay: false,
@ -262,7 +264,7 @@ export default {
{ {
label: '业务标识', label: '业务标识',
prop: 'sign', prop: 'sign',
span: 24, span: 12,
overflow: true, overflow: true,
search: true, search: true,
sortable: true, sortable: true,
@ -278,7 +280,7 @@ export default {
label: '主管工艺员', label: '主管工艺员',
prop: 'leaderUserName', prop: 'leaderUserName',
// type: "select", // type: "select",
span: 24, span: 12,
overflow: true, overflow: true,
// search: true, // search: true,
addDisplay: false, addDisplay: false,
@ -305,7 +307,7 @@ export default {
label: '主管工艺员', label: '主管工艺员',
prop: 'leaderUser', prop: 'leaderUser',
type: 'select', type: 'select',
span: 24, span: 12,
overflow: true, overflow: true,
search: true, search: true,
hide: true, hide: true,
@ -332,7 +334,7 @@ export default {
{ {
label: '班组', label: '班组',
prop: 'team', prop: 'team',
span: 24, span: 12,
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
overflow: true, overflow: true,
@ -350,7 +352,7 @@ export default {
label: '交付中心', label: '交付中心',
prop: 'jcId', prop: 'jcId',
type: 'select', type: 'select',
span: 24, span: 12,
overflow: true, overflow: true,
search: false, search: false,
dicUrl: '/api/blade-system/dict/dictionary?code=workCenterJfCenter', // dicUrl: '/api/blade-system/dict/dictionary?code=workCenterJfCenter', //
@ -394,7 +396,7 @@ export default {
{ label: '是', value: 1 }, { label: '是', value: 1 },
], ],
// dicData: [{ label: "", value: 1 }], // dicData: [{ label: "", value: 1 }],
span: 24, span: 12,
hide: true, hide: true,
overflow: true, overflow: true,
search: false, search: false,
@ -416,7 +418,7 @@ export default {
{ label: '是', value: 1 }, { label: '是', value: 1 },
], ],
// dicData: [{ label: "", value: 1 }], // dicData: [{ label: "", value: 1 }],
span: 24, span: 12,
hide: true, hide: true,
overflow: true, overflow: true,
search: false, search: false,
@ -438,7 +440,7 @@ export default {
{ label: '是', value: 1 }, { label: '是', value: 1 },
], ],
// dicData: [{ label: "", value: 1 }], // dicData: [{ label: "", value: 1 }],
span: 24, span: 12,
hide: true, hide: true,
overflow: true, overflow: true,
search: false, search: false,
@ -450,6 +452,14 @@ export default {
// }, // },
// ], // ],
}, },
{
label: '修改时间',
prop: 'updateTime',
overflow: true,
search: false,
addDisplay: false,
editDisplay: false,
},
], ],
}, },
checkId: '', checkId: '',

@ -235,6 +235,7 @@ import { getRoleUserList } from '@/api/processManagement/taskDispatch';
import { projectExecute, projectCheck, projectApprove,getProcessDetail } from '@/api/flowManagement/index'; import { projectExecute, projectCheck, projectApprove,getProcessDetail } from '@/api/flowManagement/index';
import { getDictionary } from '@/api/system/dict'; import { getDictionary } from '@/api/system/dict';
import jhSelect from '@/components/jh-select/index.vue'; import jhSelect from '@/components/jh-select/index.vue';
import { id } from 'element-plus/es/locales.mjs';
export default { export default {
components: { jhSelect }, components: { jhSelect },
props: { props: {
@ -336,13 +337,18 @@ export default {
let query_ = { let query_ = {
...this.detailForm, ...this.detailForm,
fmProjectApplication: { fmProjectApplication: {
...this.executeForm, // ...this.executeForm,
id: this.executeForm.id,
}, },
attachList: this.existingFiles, attachList: this.existingFiles,
}; };
query_.checkResult = 1; query_.checkResult = 1;
query_.fmProjectApplication.delayTime = // query_.fmProjectApplication.delayTime =
query_.fmProjectApplication.delayTime + ' 00:00:00'; // query_.fmProjectApplication.delayTime + ' 00:00:00';
query_.delayTime=query_.delayTime==''?null:query_.delayTime+ ' 00:00:00';
query_.okTime = query_.okTime==''?null:query_.okTime;
projectExecute(query_) projectExecute(query_)
.then(res => { .then(res => {
this.$message.success('操作成功!'); this.$message.success('操作成功!');
@ -357,7 +363,8 @@ export default {
let query_ = { let query_ = {
...this.detailForm, ...this.detailForm,
fmProjectApplication: { fmProjectApplication: {
...this.executeForm, // ...this.executeForm,
id: this.executeForm.id,
}, },
// attachList: this.existingFiles, // attachList: this.existingFiles,
}; };
@ -381,7 +388,8 @@ export default {
let query_ = { let query_ = {
...this.detailForm, ...this.detailForm,
fmProjectApplication: { fmProjectApplication: {
...this.executeForm, // ...this.executeForm,
id: this.executeForm.id,
}, },
}; };
if (this.detailForm.score < 75) { if (this.detailForm.score < 75) {

@ -127,7 +127,7 @@ export default {
searchIndex: 3, searchIndex: 3,
searchIcon: true, searchIcon: true,
searchLabelPosition: "left", searchLabelPosition: "left",
searchLabelPosition: "left", searchLabelWidth:'auto',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: "center", menuAlign: "center",

@ -15,7 +15,7 @@
</template> </template>
</avue-crud> --> </avue-crud> -->
<div> <div>
<el-button type="primary" icon="el-icon-plus" @click="insertEvent()" <el-button type="primary" @click="insertEvent()"
>插入一行</el-button >插入一行</el-button
> >
<el-button plain type="danger" @click="remove">删除选择行</el-button> <el-button plain type="danger" @click="remove">删除选择行</el-button>

@ -18,7 +18,7 @@
> >
<template #menu-left> <template #menu-left>
<el-button type="danger" @click="handleDelete">删除 </el-button> <el-button type="danger" @click="handleDelete">删除 </el-button>
<el-button type="primary" plain @click="handleSave">保存 </el-button> <el-button type="primary" @click="handleSave">保存 </el-button>
</template> </template>
<template #oemId="scope"> <template #oemId="scope">
<el-select v-model="scope.row.oemId" @change="handleSupplierChange(scope.row)"> <el-select v-model="scope.row.oemId" @change="handleSupplierChange(scope.row)">
@ -31,9 +31,27 @@
</el-select> </el-select>
</template> </template>
<template #dsPart="scope"> <template #dsPart="scope">
<el-select v-model="scope.row.dsPart" remote :remote-method="(query) => queryPart(query,scope.index)" filterable :loading="partLoading"> <!-- <el-select v-model="scope.row.dsPart" remote :remote-method="(query) => queryPart(query,scope.index)" filterable :loading="partLoading">
<el-option v-for="item in partData" :key="item.id" :label="item.partCode" :value="item.id"></el-option> <el-option v-for="item in partData" :key="item.id" :label="item.partCode" :value="item.id"></el-option>
</el-select> </el-select> -->
<jhSelect
:value="scope.row.dsPart"
@input="val => (scope.row.dsPart = val)"
placeholder="请搜索选择"
api-url="/blade-desk/dsPart/listNew"
echo-api="/blade-desk/dsPart/listNew"
echoParamsKey="id"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="partCode"
value-key="id"
search-key="partCode"
:debounce-time="500"
:title="'修改'"
/>
</template> </template>
<template #assignScale="scope"> <template #assignScale="scope">
<el-input-number style="width:98%;" v-model="scope.row.assignScale" controls-position="right"></el-input-number> <el-input-number style="width:98%;" v-model="scope.row.assignScale" controls-position="right"></el-input-number>
@ -59,8 +77,9 @@
<script> <script>
import basicImport from '@/components/basic-import/main.vue' import basicImport from '@/components/basic-import/main.vue'
import {getList,getSupplier,getProcessAbility,getPartList,submitBat,remove} from "@/api/basicData/outsourcingAssignmentControl" import {getList,getSupplier,getProcessAbility,getPartList,submitBat,remove} from "@/api/basicData/outsourcingAssignmentControl"
import jhSelect from '@/components/jh-select/index.vue';
export default { export default {
components: { basicImport }, components: { basicImport,jhSelect },
data() { data() {
return { return {
isShowImport: false, isShowImport: false,
@ -76,7 +95,7 @@ export default {
partData:[], partData:[],
data: [], data: [],
option: { option: {
index: true, index: false,
addRowBtn: true, addRowBtn: true,
addBtnText:"插入一行", addBtnText:"插入一行",
addRowBtnText: "插入一行", addRowBtnText: "插入一行",
@ -114,7 +133,6 @@ export default {
showOverflowTooltip: true, showOverflowTooltip: true,
menu: false, menu: false,
searchLabelPosition: "left", searchLabelPosition: "left",
searchLabelPosition: "left",
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: "left", menuAlign: "left",
@ -446,6 +464,11 @@ export default {
// 3. data // 3. data
this.data = records; this.data = records;
this.data.forEach(item=>{
item.oemId = item.oemId+''
item.platingId = item.platingId+''
item.dsPart = item.dsPart+''
})
this.page.total = res.data.data.total; this.page.total = res.data.data.total;
} catch (error) { } catch (error) {
console.error(error); console.error(error);

@ -108,7 +108,7 @@ export default {
searchMenuSpan: 18, searchMenuSpan: 18,
dialogWidth: "30%", dialogWidth: "30%",
border: true, border: true,
selection: true, selection: false,
viewBtn: true, viewBtn: true,
menuWidth: 185, menuWidth: 185,
dialogClickModal: false, dialogClickModal: false,
@ -118,7 +118,7 @@ export default {
viewBtnIcon: " ", viewBtnIcon: " ",
delBtnIcon: " ", delBtnIcon: " ",
editBtnIcon: " ", editBtnIcon: " ",
editBtnText: "编辑", editBtnText: "修改",
refreshBtn: true, refreshBtn: true,
searchShowBtn: false, searchShowBtn: false,
gridBtn: false, gridBtn: false,
@ -132,7 +132,7 @@ export default {
gridBtn: false, gridBtn: false,
searchMenuPosition: "right", searchMenuPosition: "right",
align: "center", align: "center",
index: true,
column: [ column: [
{ {
label: "编码", label: "编码",

@ -140,12 +140,12 @@ export default {
simplePage: false, simplePage: false,
searchShow: true, searchShow: true,
searchMenuSpan: 6, searchMenuSpan: 6,
dialogWidth: '60%', dialogWidth: '50%',
border: true, border: true,
selection: true, selection: true,
viewBtn: true, viewBtn: true,
menuWidth: 120, menuWidth: 120,
labelWidth: 150, labelWidth: 100,
dialogClickModal: false, dialogClickModal: false,
excelBtn: true, excelBtn: true,
viewBtn: false, viewBtn: false,
@ -153,14 +153,14 @@ export default {
viewBtnIcon: ' ', viewBtnIcon: ' ',
delBtnIcon: ' ', delBtnIcon: ' ',
editBtnIcon: ' ', editBtnIcon: ' ',
editBtnText: '编辑', editBtnText: '修改',
refreshBtn: false, refreshBtn: false,
searchShowBtn: false, searchShowBtn: false,
gridBtn: false, gridBtn: false,
searchIndex: 3, searchIndex: 3,
searchIcon: true, searchIcon: true,
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchLabelPosition: 'left', searchLabelWidth: 'auto',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'left',
@ -367,6 +367,8 @@ export default {
sortable: true, sortable: true,
search: false, search: false,
width: 200, width: 200,
labelWidth: 150,
span:24,
dicData: [ dicData: [
{ label: '否', value: 0 }, { label: '否', value: 0 },
{ label: '是', value: 1 }, // true false { label: '是', value: 1 }, // true false

@ -42,8 +42,12 @@
</span> </span>
</template> </template>
<template #localArea-form="{type}"> <template #localArea-form="{ type }">
<el-input v-if="type == 'add' || 'edit'" v-model="form.localArea" @input="validateSmallBat"></el-input> <el-input
v-if="type == 'add' || 'edit'"
v-model="form.localArea"
@input="validateSmallBat"
></el-input>
</template> </template>
<template #name="{ row }"> <template #name="{ row }">
@ -58,36 +62,47 @@
</avue-crud> </avue-crud>
<!-- 导入 --> <!-- 导入 -->
<basic-import v-if="isShowImport" title="导入" :isShow="isShowImport" <basic-import
v-if="isShowImport"
title="导入"
:isShow="isShowImport"
templateUrl="/blade-desk/BA/craftAbility/downloadExcelTemplate" templateUrl="/blade-desk/BA/craftAbility/downloadExcelTemplate"
templateName="工艺能力模板.xls" templateName="工艺能力模板.xls"
importUrl="/blade-desk/BA/craftAbility/importExcel" importUrl="/blade-desk/BA/craftAbility/importExcel"
@closeDialog="closeDialog"></basic-import> @closeDialog="closeDialog"
></basic-import>
</basic-container> </basic-container>
</template> </template>
<script> <script>
import { mapGetters } from "vuex"; import { mapGetters } from 'vuex';
import {getList,getPlateSmall,addProcessAbility,updateProcessAbility,deleteProcessAbility,saveProcessAbility} from "@/api/basicData/processCapability" import {
import { getDictionary } from "@/api/system/dict"; getList,
import basicImport from "@/components/basic-import/main.vue"; getPlateSmall,
import {getDecimal} from "@/utils/formatter"; addProcessAbility,
updateProcessAbility,
deleteProcessAbility,
saveProcessAbility,
} from '@/api/basicData/processCapability';
import { getDictionary } from '@/api/system/dict';
import basicImport from '@/components/basic-import/main.vue';
import { getDecimal } from '@/utils/formatter';
export default { export default {
components: { components: {
basicImport basicImport,
}, },
data() { data() {
return { return {
isShowImport:false, isShowImport: false,
slectForm: { slectForm: {
wtName: "", wtName: '',
}, },
slectDic: [], slectDic: [],
form: {}, form: {},
query: {}, query: {},
loading: true, loading: true,
selectionList: [], selectionList: [],
parentId: "", parentId: '',
page: { page: {
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
@ -99,22 +114,22 @@ export default {
menuBtn: false, menuBtn: false,
column: [ column: [
{ {
label: "", label: '',
prop: "wtName", prop: 'wtName',
type: "select", type: 'select',
filterable: true, filterable: true,
props: { props: {
label: "dictValue", label: 'dictValue',
value: "dictKey", value: 'dictKey',
}, },
dicUrl: "/blade-system/dict/dictionary?code=ProcessCapabilityType", dicUrl: '/blade-system/dict/dictionary?code=ProcessCapabilityType',
}, },
], ],
}, },
option: { option: {
columnSort: true, columnSort: true,
tip: false, tip: false,
height: "auto", height: 'auto',
calcHeight: 32, calcHeight: 32,
simplePage: false, simplePage: false,
searchShow: true, searchShow: true,
@ -123,56 +138,56 @@ export default {
border: true, border: true,
selection: true, selection: true,
viewBtn: true, viewBtn: true,
addBtnIcon: " ", addBtnIcon: ' ',
viewBtnIcon: " ", viewBtnIcon: ' ',
delBtnIcon: " ", delBtnIcon: ' ',
editBtnIcon: " ", editBtnIcon: ' ',
menuWidth: 120, menuWidth: 100,
dialogClickModal: false, dialogClickModal: false,
excelBtn: true, excelBtn: true,
viewBtn: false, viewBtn: false,
editBtnText: "修改", editBtnText: '修改',
refreshBtn: false, refreshBtn: false,
searchShowBtn: false, searchShowBtn: false,
gridBtn: false, gridBtn: false,
searchIndex: 3, searchIndex: 3,
searchIcon: true, searchIcon: true,
searchLabelPosition: "left", searchLabelPosition: 'left',
searchLabelPosition: "left",
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: "center", menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchMenuPosition: "right", searchMenuPosition: 'right',
align: "center", align: 'center',
labelWidth:140, labelWidth: 100,
searchLabelWidth: 'auto',
column: [ column: [
{ {
label: "编码", label: '编码',
prop: "caCode", prop: 'caCode',
search: true, search: true,
sortable: true, sortable: true,
span:24, span: 12,
width: 80,
rules: [ rules: [
{ {
required: true, required: true,
message: "请输入编码", message: '请输入编码',
trigger: "blur", trigger: 'blur',
}, },
], ],
}, },
{ {
label: "名称", label: '名称',
prop: "caName", prop: 'caName',
span:24, span: 12,
sortable: true, sortable: true,
search: true, search: true,
rules: [ rules: [
{ {
required: true, required: true,
message: "请输入名称", message: '请输入名称',
trigger: "blur", trigger: 'blur',
}, },
], ],
}, },
@ -197,13 +212,13 @@ export default {
// ], // ],
// }, // },
{ {
label: "能力类型", label: '能力类型',
span:24, span: 12,
prop: "wxLimit", prop: 'wxLimit',
// bind: "bsWorkType.wtName", // bind: "bsWorkType.wtName",
sortable: true, sortable: true,
search: true, search: true,
type: "select", type: 'select',
filterable: true, filterable: true,
formatter: (row, value, label, column) => { formatter: (row, value, label, column) => {
// -1 // -1
@ -215,90 +230,92 @@ export default {
return dictItem ? dictItem.dictValue : value; return dictItem ? dictItem.dictValue : value;
}, },
props: { props: {
label: "dictValue", label: 'dictValue',
value: "dictKey", value: 'dictKey',
}, },
dicUrl: "/blade-system/dict/dictionary?code=ProcessCapabilityType", dicUrl: '/blade-system/dict/dictionary?code=ProcessCapabilityType',
rules: [ rules: [
{ {
required: false, required: false,
message: "请选择能力类型", message: '请选择能力类型',
trigger: "click", trigger: 'click',
}, },
], ],
}, },
{ {
label:"外协限制", label: '外协限制',
prop:"wtId", prop: 'wtId',
type:"select", type: 'select',
span:24, span: 12,
dicUrl: "/blade-system/dict/dictionary?code=WxLimit", dicUrl: '/blade-system/dict/dictionary?code=WxLimit',
props: { props: {
label: "dictValue", label: 'dictValue',
value: "dictKey", value: 'dictKey',
}, },
}, },
{ {
label:"厂内比例(%)", label: '厂内比例(%)',
prop:"inRate", prop: 'inRate',
type: 'number', type: 'number',
span:24, span: 12,
controls: false, controls: false,
max:100, max: 100,
rules: [ rules: [
{ {
required: true, required: true,
message: "请输入厂内比例", message: '请输入厂内比例',
trigger: "change", trigger: 'change',
}, },
], ],
change: (val) => { change: val => {
console.log('val==========',val) console.log('val==========', val);
this.form.outRate = 100 - val.value this.form.outRate = 100 - val.value;
} },
}, },
{ {
label:"外协比例(%)", label: '外协比例(%)',
prop:"outRate", prop: 'outRate',
type: 'number', type: 'number',
disabled:true, disabled: true,
span:24, span: 12,
controls: false, controls: false,
rules: [ rules: [
{ {
required: true, required: true,
message: "请输入外协比例", message: '请输入外协比例',
trigger: "change", trigger: 'change',
}, },
], ],
}, },
{ {
label:"局部镀订单面积(dm²)", label: '局部镀订单面积(dm²)',
prop:"localArea", prop: 'localArea',
type: 'number', type: 'number',
span:24, span: 24,
controls: false, controls: false,
labelWidth: 140,
}, },
{ {
label: "修改时间", label: '修改时间',
prop: "updateTime", prop: 'updateTime',
sortable: true, sortable: true,
search: true, search: true,
searchRange: true, searchRange: true,
display: false, display: false,
hide:true, hide: true,
type: "date", type: 'date',
valueFormat: "YYYY-MM-DD", valueFormat: 'YYYY-MM-DD',
format:"YYYY-MM-DD" format: 'YYYY-MM-DD',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间',
}, },
{ {
label: "修改时间", label: '修改时间',
prop: "updateTime", prop: 'updateTime',
sortable: true, sortable: true,
search: false, search: false,
display: false, display: false,
type: "date", type: 'date',
}, },
], ],
}, },
@ -306,7 +323,7 @@ export default {
}; };
}, },
computed: { computed: {
...mapGetters(["userInfo", "permission"]), ...mapGetters(['userInfo', 'permission']),
permissionList() { permissionList() {
return { return {
addBtn: this.validData(this.permission.menu_add, false), addBtn: this.validData(this.permission.menu_add, false),
@ -317,28 +334,26 @@ export default {
}, },
ids() { ids() {
let ids = []; let ids = [];
this.selectionList.forEach((ele) => { this.selectionList.forEach(ele => {
ids.push(ele.id); ids.push(ele.id);
}); });
return ids.join(","); return ids.join(',');
}, },
}, },
methods: { methods: {
validateSmallBat(value){ validateSmallBat(value) {
this.form.localArea = getDecimal(value,5) this.form.localArea = getDecimal(value, 5);
}, },
getType(){ getType() {
getTypeData().then(res =>{ getTypeData().then(res => {});
})
}, },
closeDialog(val){ closeDialog(val) {
this.isShowImport = false this.isShowImport = false;
if(val){ if (val) {
// //
setTimeout(() => { setTimeout(() => {
this.onLoad() this.onLoad();
}, 500) }, 500);
} }
}, },
// //
@ -349,37 +364,37 @@ export default {
}, },
// //
handleImport() { handleImport() {
this.isShowImport = true this.isShowImport = true;
}, },
getDictionary() { getDictionary() {
getDictionary({ code: "ProcessCapabilityType" }).then((res) => { getDictionary({ code: 'ProcessCapabilityType' }).then(res => {
this.slectDic = res.data.data; this.slectDic = res.data.data;
}); });
}, },
// //
batchSet() { batchSet() {
if (this.selectionList.length === 0) { if (this.selectionList.length === 0) {
return this.$message.error("请先选择数据再进行操作!"); return this.$message.error('请先选择数据再进行操作!');
} }
if (this.slectForm.wtName == "") { if (this.slectForm.wtName == '') {
return this.$message.error("请先选择能力类型!"); return this.$message.error('请先选择能力类型!');
} }
if (this.slectForm.wtName) { if (this.slectForm.wtName) {
this.$confirm("请确认此操作!", "提示", { this.$confirm('请确认此操作!', '提示', {
confirmButtonText: "确认", confirmButtonText: '确认',
cancelButtonText: "取消", cancelButtonText: '取消',
type: "warning", type: 'warning',
}).then(() =>{ }).then(() => {
saveProcessAbility({ saveProcessAbility({
ids:this.selectionList.map(item => item.id), ids: this.selectionList.map(item => item.id),
wxLimit:this.slectForm.wtName, wxLimit: this.slectForm.wtName,
}).then((res) => { }).then(res => {
if(res.data.code === 200){ if (res.data.code === 200) {
this.$message.success('设置成功'); this.$message.success('设置成功');
this.onLoad() this.onLoad();
} }
}); });
}) });
} }
}, },
initData() { initData() {
@ -390,7 +405,7 @@ export default {
}, },
handleAdd(row) { handleAdd(row) {
this.parentId = row.id; this.parentId = row.id;
const column = this.findObject(this.option.column, "parentId"); const column = this.findObject(this.option.column, 'parentId');
column.value = row.id; column.value = row.id;
column.addDisabled = true; column.addDisabled = true;
this.$refs.crud.rowAdd(); this.$refs.crud.rowAdd();
@ -405,18 +420,24 @@ export default {
if (submitData.bpsId === '' || submitData.bpsId === null || submitData.bpsId === undefined) { if (submitData.bpsId === '' || submitData.bpsId === null || submitData.bpsId === undefined) {
submitData.bpsId = ''; submitData.bpsId = '';
} }
if (submitData.wxLimit === '' || submitData.wxLimit === null || submitData.wxLimit === undefined) { if (
submitData.wxLimit === '' ||
submitData.wxLimit === null ||
submitData.wxLimit === undefined
) {
submitData.wxLimit = ''; submitData.wxLimit = '';
} }
addProcessAbility(submitData).then(res =>{ addProcessAbility(submitData)
if(res.data.code == 200){ .then(res => {
this.$message.success("新增成功") if (res.data.code == 200) {
this.onLoad() this.$message.success('新增成功');
done() this.onLoad();
} done();
}).catch(() => { }
loading(); })
}) .catch(() => {
loading();
});
}, },
// //
rowUpdate(row, index, done, loading) { rowUpdate(row, index, done, loading) {
@ -428,58 +449,67 @@ export default {
if (submitData.bpsId === '' || submitData.bpsId === null || submitData.bpsId === undefined) { if (submitData.bpsId === '' || submitData.bpsId === null || submitData.bpsId === undefined) {
submitData.bpsId = ''; submitData.bpsId = '';
} }
if (submitData.wxLimit === '' || submitData.wxLimit === null || submitData.wxLimit === undefined) { if (
submitData.wxLimit === '' ||
submitData.wxLimit === null ||
submitData.wxLimit === undefined
) {
submitData.wxLimit = ''; submitData.wxLimit = '';
} }
if(submitData.localArea === '' || submitData.localArea === null || submitData.localArea === undefined){ if (
submitData.localArea = '' submitData.localArea === '' ||
submitData.localArea === null ||
submitData.localArea === undefined
) {
submitData.localArea = '';
} }
updateProcessAbility(submitData).then(res =>{ updateProcessAbility(submitData)
if(res.data.code == 200){ .then(res => {
this.$message.success("修改成功") if (res.data.code == 200) {
this.onLoad() this.$message.success('修改成功');
done() this.onLoad();
} done();
}).catch(() => { }
loading(); })
}) .catch(() => {
loading();
});
}, },
rowDel(row, index, done) { rowDel(row, index, done) {
this.$confirm("确定将选择数据删除?", { this.$confirm('确定将选择数据删除?', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
type: "warning", type: 'warning',
}).then(() => { }).then(() => {
deleteProcessAbility({ deleteProcessAbility({
ids:row.id ids: row.id,
}).then(res =>{ }).then(res => {
if(res.data.code == 200){ if (res.data.code == 200) {
this.$message.success("删除成功") this.$message.success('删除成功');
this.onLoad() this.onLoad();
} }
}) });
}) });
}, },
handleDelete(){ handleDelete() {
if(this.selectionList.length == 0){ if (this.selectionList.length == 0) {
this.$message.error('请至少选择一条数据!') this.$message.error('请至少选择一条数据!');
return return;
} }
this.$confirm("确定将选择数据删除?", { this.$confirm('确定将选择数据删除?', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
type: "warning", type: 'warning',
}).then(() => { }).then(() => {
deleteProcessAbility({ deleteProcessAbility({
ids:this.selectionList.map(item => item.id).join(',') ids: this.selectionList.map(item => item.id).join(','),
}).then(res =>{ }).then(res => {
if(res.data.code == 200){ if (res.data.code == 200) {
this.$message.success("删除成功") this.$message.success('删除成功');
this.onLoad() this.onLoad();
} }
}) });
}) });
}, },
// //
searchReset() { searchReset() {
@ -490,7 +520,7 @@ export default {
// //
searchChange(params, done) { searchChange(params, done) {
this.query = params; this.query = params;
this.parentId = ""; this.parentId = '';
this.page.currentPage = 1; this.page.currentPage = 1;
this.onLoad(this.page, params); this.onLoad(this.page, params);
done(); done();
@ -508,17 +538,17 @@ export default {
// beforeOpen // beforeOpen
beforeOpen(done, type) { beforeOpen(done, type) {
if (['edit', 'view'].includes(type)) { if (['edit', 'view'].includes(type)) {
// -1 // -1
this.form.bpsId = (this.form.bpsId && this.form.bpsId !== -1) ? this.form.bpsId + '' : '' this.form.bpsId = this.form.bpsId && this.form.bpsId !== -1 ? this.form.bpsId + '' : '';
this.form.wtId = (this.form.wtId && this.form.wtId !== -1) ? this.form.wtId + '' : '' this.form.wtId = this.form.wtId && this.form.wtId !== -1 ? this.form.wtId + '' : '';
} }
done(); done();
}, },
// beforeClose // beforeClose
beforeClose(done) { beforeClose(done) {
this.parentId = ""; this.parentId = '';
const column = this.findObject(this.option.column, "parentId"); const column = this.findObject(this.option.column, 'parentId');
column.value = ""; column.value = '';
column.addDisabled = false; column.addDisabled = false;
done(); done();
}, },
@ -538,24 +568,26 @@ export default {
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
let param = { let param = {
descs:'CA_CODE', descs: 'CA_CODE',
...this.query, ...this.query,
startTime:this.query.updateTime && this.query.updateTime.length != 0 && this.query.updateTime[0], startTime:
endTime:this.query.updateTime && this.query.updateTime.length != 0 && this.query.updateTime[1], this.query.updateTime && this.query.updateTime.length != 0 && this.query.updateTime[0],
} endTime:
const {updateTime,...searchParam} = param this.query.updateTime && this.query.updateTime.length != 0 && this.query.updateTime[1],
};
const { updateTime, ...searchParam } = param;
getList({ getList({
current:this.page.currentPage, current: this.page.currentPage,
size:this.page.pageSize, size: this.page.pageSize,
...searchParam ...searchParam,
}).then(res =>{ }).then(res => {
res.data.data.records.map(item => { res.data.data.records.map(item => {
item.localArea = item.localArea == -1 ? '' : item.localArea item.localArea = item.localArea == -1 ? '' : item.localArea;
}) });
this.data = res.data.data.records this.data = res.data.data.records;
this.page.total = res.data.data.total this.page.total = res.data.data.total;
this.loading = false this.loading = false;
}) });
}, },
}, },

@ -88,6 +88,7 @@ export default {
editBtnIcon: ' ', editBtnIcon: ' ',
gridBtn: false, gridBtn: false,
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchLabelWidth: 'auto',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'left',

@ -20,7 +20,7 @@
@on-load="onLoad" @on-load="onLoad"
> >
<template #menu-left> <template #menu-left>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete"> </el-button> <el-button type="danger" @click="handleDelete"> </el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="primary" @click="handleImport">导入 </el-button> <el-button type="primary" @click="handleImport">导入 </el-button>
@ -108,7 +108,7 @@ export default {
showOverflowTooltip: true, showOverflowTooltip: true,
align: 'center', align: 'center',
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchLabelPosition: 'left', searchLabelWidth:'auto',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'center', menuAlign: 'center',

Loading…
Cancel
Save