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

问题修改

Browse Source
dev-scheduling
zhangdi 3 weeks ago
parent dc557ea31e
commit a2deeb9ea4
7 changed files with 264 additions and 341 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. 18
      src/api/storeManagement/workwearPlan.js
  3. 2
      src/views/inboundOutboundManagement/materialIssuing.vue
  4. 3
      src/views/processManagement/components/assignDaialog.vue
  5. 79
      src/views/processManagement/taskProcessing.vue
  6. 84
      src/views/warehouseManagement/workwearPlan/components/checkDialog.vue
  7. 411
      src/views/warehouseManagement/workwearPlan/index.vue

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

@ -106,7 +106,7 @@ export const getProcessManagementAuthorized = (params) => {
// 转派 // 转派
export const taskRedeploy = data => { export const taskRedeploy = data => {
return request({ return request({
url: '/blade-desk/dsTasking/taskRedeploy', url: '/blade-desk/dsTasking/batch-taskRedeploy',
method: 'post', method: 'post',
data data
}); });

18
src/api/storeManagement/workwearPlan.js
Unescape View File

@ -97,3 +97,21 @@ export const getMaterialList = params => {
params, params,
}); });
}; };
// 发送审批
export const renderApproval = data => {
return request({
url: '/api/blade-wms/stMoldApplyFor/renderApproval ',
method: 'post',
data:data,
});
};
// 审批 /stMoldApplyFor/approval/operate
export const approvalOperate = data => {
return request({
url: '/api/blade-wms/stMoldApplyFor/approval/operate',
method: 'post',
params:data,
});
};

2
src/views/inboundOutboundManagement/materialIssuing.vue
Unescape View File

@ -35,7 +35,7 @@
</template> </template>
<template #location="scope"> <template #location="scope">
<el-button type="text" @click="editRow(scope.row, scope.row.$index)">{{ <el-button type="text" @click="editRow(scope.row, scope.row.$index)">{{
scope.row.location == '' ? '请选择库位' : scope.row.location scope.row.location == ''|| scope.row.location == null? '请选择库位' : scope.row.location
}}</el-button> }}</el-button>
</template> </template>
</avue-crud> </avue-crud>

3
src/views/processManagement/components/assignDaialog.vue
Unescape View File

@ -89,8 +89,7 @@ export default {
if (this.title == '转派') { if (this.title == '转派') {
let query = { let query = {
craftMan: this.$refs.from.form.userId, craftMan: this.$refs.from.form.userId,
id: arr[0], taskIds: arr.join(','),
// remarks:'任务分派'
}; };
taskRedeploy(query).then(res => { taskRedeploy(query).then(res => {
this.$message.success('操作成功！'); this.$message.success('操作成功！');

79
src/views/processManagement/taskProcessing.vue
Unescape View File

@ -13,15 +13,17 @@
@size-change="sizeChange" @size-change="sizeChange"
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
@selection-change="selectionChange"
> >
<template #menu-left> <template #menu-left>
<el-button @click="addFn()" type="primary">新增任务</el-button> <el-button @click="addFn()" type="primary">新增任务</el-button>
<el-button @click="setCrew()" type="primary">批量转派</el-button>
</template> </template>
<template #menu-right="{ size }"> </template> <template #menu-right="{ size }"> </template>
<template #menu="scope"> <template #menu="scope">
<!-- {{ scope.$index }} -->
<el-button type="primary" link @click="viewDetails(scope.row.partId, scope.row)" <el-button type="primary" link @click="viewDetails(scope.row.partId, scope.row)"
>详情</el-button >详情</el-button
> >
@ -34,14 +36,6 @@
v-if="scope.row.taskStatus == 2 || scope.row.sinTerType != -1" v-if="scope.row.taskStatus == 2 || scope.row.sinTerType != -1"
>编制</el-button >编制</el-button
> >
<!-- <el-button
type="primary"
link
@click="receiveFn(scope.row)"
v-if="(scope.row.taskStatus == 1)&&
(!scope.row.completed )"
>接收</el-button
> -->
<el-button <el-button
type="primary" type="primary"
link link
@ -122,6 +116,7 @@ import { getList, completeSet, taskReception } from '@/api/processManagement/tas
import partDetails from './components/processMainte/partDetails.vue'; import partDetails from './components/processMainte/partDetails.vue';
import { getPdmDocLink } from '@/api/processManagement/procepssPlanning'; import { getPdmDocLink } from '@/api/processManagement/procepssPlanning';
export default { export default {
components: { components: {
assignDaialog, assignDaialog,
@ -160,7 +155,7 @@ export default {
tree: false, tree: false,
border: true, border: true,
index: false, index: false,
selection: false, selection: true,
viewBtn: false, viewBtn: false,
editBtn: false, editBtn: false,
delBtn: false, delBtn: false,
@ -186,6 +181,7 @@ export default {
menuAlign: 'center', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchLabelWidth:'auto',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
searchMenuPosition: 'right', searchMenuPosition: 'right',
@ -293,8 +289,8 @@ export default {
align: 'center', align: 'center',
}, },
{ {
label: '备注', label: '审理意见',
prop: 'remarks', prop: 'dispose',
sortable: true, sortable: true,
search: false, search: false,
overHidden: true, overHidden: true,
@ -302,6 +298,16 @@ export default {
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
}, },
// {
// label: '备注',
// prop: 'remarks',
// sortable: true,
// search: false,
// overHidden: true,
// width: 120,
// headerAlign: 'center',
// align: 'center',
// },
{ {
label: '状态', label: '状态',
prop: 'taskStatus', prop: 'taskStatus',
@ -334,25 +340,26 @@ export default {
}, },
], ],
}, },
// {
// label: '分派人',
// prop: 'assignMan',
// sortable: true,
// search: false,
// overHidden: true,
// width: 120,
// headerAlign: 'center',
// align: 'center',
// },
{ {
label: '处理人', label: '处理人',
prop: 'craftMan', prop: 'craftMan',
sortable: true, sortable: true,
search: false, search: true,
overHidden: true, overHidden: true,
width: 120, width: 120,
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
type: 'select',
filterable: true,
clearable: true,
dicUrl:'/api/blade-system/user/list-all-by-role-alias?roleAlias=sj_craft,rb_craft',
props: {
label: 'realName',
value: 'id',
},
}, },
{ {
label: '分派时间', label: '分派时间',
@ -364,17 +371,6 @@ export default {
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
}, },
// {
// label: '接收时间',
// prop: 'receptionTime',
// sortable: true,
// search: false,
// overHidden: true,
// width: 180,
// headerAlign: 'center',
// align: 'center',
// },
], ],
}, },
data: [], data: [],
@ -382,6 +378,7 @@ export default {
isTestOpen: false, //新增任务 isTestOpen: false, //新增任务
detailsRow: {}, detailsRow: {},
updateRow: [], // updateRow: [], //
selectionList:[],
}; };
}, },
methods: { methods: {
@ -469,6 +466,20 @@ export default {
this.updateRow.push(row); this.updateRow.push(row);
this.title = '转派'; this.title = '转派';
}, },
selectionChange(list) {
this.selectionList = list;
},
// 批量转派
setCrew(){
if(this.selectionList.length<=0){
this.$message.error('请选择数据！');
return;
}
this.setCrewOpen = true;
this.updateRow=this.selectionList;
this.title = '转派';
},
// 重置 // 重置
searchReset() { searchReset() {
this.query = {}; this.query = {};

84
src/views/warehouseManagement/workwearPlan/components/checkDialog.vue
Unescape View File

@ -0,0 +1,84 @@
<template>
<el-dialog title="审核" append-to-body :modelValue="openShow" width="30%" @close="closeDialog">
<avue-form ref="form" v-model="form" :option="option"></avue-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="closeDialog">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
</span>
</template>
</el-dialog>
</template>
<script>
import {
approvalOperate,
} from '@/api/storeManagement/workwearPlan';
export default {
props: {
showDialog: {
type: Boolean,
default: false,
},
rowItem:{
type: Object,
default: {},
}
},
data() {
return {
openShow: false,
form:{},
option: {
submitBtn: false,
emptyBtn: false,
column: [
{
label: '审批结果',
prop: 'approvalResult',
span: 24,
type: 'radio',
dicData: [
{ label: '通过', value: 1 },
{ label: '不通过', value: 2 },
],
rules: [{ required: true, message: '请选择', trigger: 'blur' }],
},
// {
// label: '审批意见',
// prop: 'remark',
// type: 'textarea',
// span: 24,
// },
],
},
};
},
mounted() {
this.openShow = this.showDialog;
},
methods: {
closeDialog() {
this.openShow = false;
this.$emit('closeDialog');
},
submit() {
this.$refs.form.validate(async valid => {
if (valid) {
let params = {
id: this.rowItem.id,
approvalResult: this.form.approvalResult,
};
approvalOperate(params).then((res) => {
if (res.code == 200) {
this.$message.success('操作成功');
this.closeDialog();
}
});
}
});
},
},
};
</script>
<style lang="scss" scoped></style>

411
src/views/warehouseManagement/workwearPlan/index.vue
Unescape View File

@ -1,10 +1,5 @@
<template> <template>
<basic-container> <basic-container>
<!-- 工装计划申报 -->
<!-- <el-tabs v-model="tabPosition" class="demo-tabs" @tab-change="tabPositionChange">
<el-tab-pane label="申报计划" name="declarationPlan"></el-tab-pane>
<el-tab-pane label="申报记录" name="declarationLog"></el-tab-pane>
</el-tabs> -->
<avue-crud <avue-crud
:option="option" :option="option"
:table-loading="loading" :table-loading="loading"
@ -24,45 +19,28 @@
> >
<template #menu-left> <template #menu-left>
<el-button type="primary" @click="handleAdd">新增</el-button> <el-button type="primary" @click="handleAdd">新增</el-button>
<el-button type="primary" @click="sendCheck">发送审批</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)" v-if="scope.row.mafStatus==0||scope.row.approvalStatus==2">修改</el-button>
<el-button type="text" @click="deleteRow(scope.row)">删除</el-button> <el-button type="text" @click="checkRow(scope.row)" v-if="scope.row.mafStatus==1&&scope.row.approvalStatus==0">审批</el-button>
<el-button type="text" @click="deleteRow(scope.row)" v-if="scope.row.mafStatus==0">删除</el-button>
</template> </template>
<!-- <template #keeper="{ row }">{{ row.keeper.userName }}</template>
<template #createMan="{ row }">{{ row.createMan.userName }}</template> -->
</avue-crud> </avue-crud>
<el-dialog title="新增" append-to-body v-model="showDialog" width="80%" fullscreen> <el-dialog title="新增" append-to-body v-model="showDialog" width="80%" fullscreen>
<div style="margin-bottom: 10px"> <div style="margin-bottom: 10px">
<el-button type="primary" @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> -->
</div> </div>
<el-table :data="tableData" @select="selectChange"> <el-table :data="tableData" @select="selectChange">
<el-table-column type="selection"></el-table-column> <el-table-column type="selection"></el-table-column>
<!-- <el-table-column align="center" label="零件号" prop="partCode">
<template #default="scope">
<el-select v-model="scope.row.partCode">
<el-option v-for="item in partData" :key="item.code" :label="item.code + '-' + item.name"
:value="item.code"></el-option>
</el-select>
</template>
</el-table-column> -->
<el-table-column align="center" label="工装号" prop="moCode"> <el-table-column align="center" label="工装号" prop="moCode">
<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-select v-model="scope.row.moCode" @change="val => changeMoData(val, scope.$index)">
<el-option
v-for="item in goodsList"
:key="item.id"
:label="item.goodsCode"
:value="item.goodsCode"
></el-option>
</el-select> -->
<jhSelect <jhSelect
v-model="scope.row.moCode" v-model="scope.row.moCode"
placeholder="请搜索选择" placeholder="请搜索选择"
@ -82,19 +60,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="工装名称" prop="moName"></el-table-column> <el-table-column align="center" label="工装名称" prop="moName"></el-table-column>
<!-- <el-table-column align="center" label="零件号" prop="partCode">
<template #default="scope">
<el-select v-model="scope.row.partCode" @change="(val) => changeCode(val,scope.$index)">
<el-option
v-for="item in partData"
:key="item.id"
:label="item.partCode + '-' + item.partName"
:value="item.partCode"
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column align="center" label="零件名称" prop="partName"></el-table-column> -->
<el-table-column align="center" label="计划类型" prop="planType"> <el-table-column align="center" label="计划类型" prop="planType">
<template #default="scope"> <template #default="scope">
<el-select v-model="scope.row.planType"> <el-select v-model="scope.row.planType">
@ -182,10 +147,13 @@
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
<!-- 审批 -->
<checkDialog v-if="checkShow" :show-dialog="checkShow" :rowItem="rowItem" @closeDialog="closeDialog"></checkDialog>
</basic-container> </basic-container>
</template> </template>
<script> <script>
import checkDialog from './components/checkDialog.vue'
import { import {
getList, getList,
save, save,
@ -196,9 +164,10 @@ import {
getUserByRoleAlias, getUserByRoleAlias,
getOrderMoldPlanCaDeatils, getOrderMoldPlanCaDeatils,
removeByIds, removeByIds,
renderApproval,
} from '@/api/storeManagement/workwearPlan'; } from '@/api/storeManagement/workwearPlan';
import workColumnData from './js/workColumnData';
export default { export default {
components:{checkDialog},
data() { data() {
return { return {
// tabPosition: 'declarationPlan', // tabPosition: 'declarationPlan',
@ -231,9 +200,8 @@ export default {
option: { option: {
height: 'auto', height: 'auto',
calcHeight: 32, calcHeight: 32,
rowKey: 'twlId', rowKey: 'id',
tip: false, tip: false,
// size: 'medium',
simplePage: true, simplePage: true,
searchShow: true, searchShow: true,
searchMenuSpan: 6, searchMenuSpan: 6,
@ -241,8 +209,8 @@ export default {
searchIndex: 3, searchIndex: 3,
tree: false, tree: false,
border: true, border: true,
index: true, index: false,
selection: false, selection: true,
viewBtn: false, viewBtn: false,
delBtn: false, delBtn: false,
addBtn: false, addBtn: false,
@ -254,7 +222,7 @@ export default {
editBtnIcon: ' ', editBtnIcon: ' ',
viewBtnText: '详情', viewBtnText: '详情',
menu: true, menu: true,
menuWidth: 110, menuWidth: 120,
dialogWidth: 1200, dialogWidth: 1200,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -280,14 +248,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 120,
rules: [
{
required: true,
message: '请输入工装号',
trigger: 'blur',
},
],
}, },
{ {
label: '工装名称', label: '工装名称',
@ -295,59 +256,15 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 120,
rules: [
{
required: true,
message: '请输入工装名称',
trigger: 'blur',
},
],
}, },
// {
// label: '零件号',
// prop: 'partCode',
// search: true,
// sortable: true,
// overHidden: true,
// width: 200,
// rules: [
// {
// required: true,
// message: '请输入零件号',
// trigger: 'blur',
// },
// ],
// },
// {
// label: '零件名称',
// prop: 'partName',
// search: true,
// sortable: true,
// overHidden: true,
// width: 200,
// rules: [
// {
// required: true,
// message: '请输入零件名称',
// trigger: 'blur',
// },
// ],
// },
{ {
label: '计划类型', label: '计划类型',
prop: 'planTypeName', prop: 'planType',
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 120,
rules: [
{
required: true,
message: '请输入计划类型',
trigger: 'blur',
},
],
}, },
{ {
label: '数量', label: '数量',
@ -355,14 +272,7 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 120,
rules: [
{
required: true,
message: '请输入数量',
trigger: 'blur',
},
],
}, },
{ {
label: '需求日期', label: '需求日期',
@ -376,14 +286,7 @@ export default {
valueFormat: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD',
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 120,
rules: [
{
required: true,
message: '请输入需求日期',
trigger: 'blur',
},
],
}, },
{ {
label: '生产标识', label: '生产标识',
@ -391,14 +294,7 @@ export default {
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 120,
rules: [
{
required: true,
message: '请输入生产标识',
trigger: 'blur',
},
],
}, },
{ {
label: '紧急状态', label: '紧急状态',
@ -406,119 +302,102 @@ export default {
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, type: 'select',
rules: [ dicData: [
{ { label: '正常', value: '0' },
required: true, { label: '紧急', value: '1' },
message: '请输入紧急状态',
trigger: 'blur',
},
], ],
width: 120,
}, },
{ {
label: '保管员', label: '状态',
prop: 'keeperName', prop: 'mafStatus',
search: false, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 120,
rules: [ searchOrder: 20,
type: 'select',
dicData: [
{ {
required: true, label: '新建',
message: '请输入保管员', value: 0,
trigger: 'blur',
},
],
}, },
{ {
label: '备注', label: '已确认',
prop: 'memo', value: 1,
search: false,
sortable: true,
overHidden: true,
width: 200,
rules: [
{
required: true,
message: '请输入备注',
trigger: 'blur',
}, },
], {
label: '已申请',
value: 2,
}, },
{ {
label: '创建时间', label: '已完成',
prop: 'createTime', value: 3,
search: false, },
sortable: true,
overHidden: true,
width: 200,
rules: [
{ {
required: true, label: 'erp已删除',
message: '请输入建立时间', value: 4,
trigger: 'blur',
}, },
], ],
}, },
{ {
label: '状态', label: '审批状态',
prop: 'mafStatus', prop: 'approvalStatus',
search: true, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
width: 200, width: 120,
searchOrder: 20, searchOrder: 20,
type: 'select', type: 'select',
dicData: [ dicData: [
{ {
label: '新建', label: '审批中',
value: 0,
},
{
label: '审批通过',
value: 1, value: 1,
}, },
{ {
label: '已申请', label: '审批不通过',
value: 2, value: 2,
}, },
{
label: '已完成', ],
value: 3,
}, },
{ {
label: 'erp已删除', label: '保管员',
value: 4, prop: 'keeperName',
search: false,
sortable: true,
overHidden: true,
width: 120,
}, },
],
rules: [
{ {
required: true, label: '备注',
message: '请输入状态', prop: 'memo',
trigger: 'blur', search: false,
sortable: true,
overHidden: true,
width: 120,
}, },
], {
label: '创建时间',
prop: 'createTime',
search: false,
sortable: true,
overHidden: true,
width: 160,
}, },
// {
// label: '创建人员',
// prop: 'createMan',
// search: false,
// sortable: true,
// overHidden: true,
// width: 200,
// rules: [
// {
// required: true,
// message: '请输入建立人员',
// trigger: 'blur',
// },
// ],
// },
], ],
}, },
rowItem:{},
checkShow:false,
}; };
}, },
mounted() { mounted() {
// this.option.column = workColumnData[this.tabPosition]
this.getProdIdentList(); this.getProdIdentList();
// this.getPart()
this.getUser(); this.getUser();
this.getGoods(); this.getGoods();
}, },
@ -543,69 +422,11 @@ export default {
this.partData = res.data.data; this.partData = res.data.data;
}); });
}, },
changeCode(val, index) { checkRow(row){
let tmp = this.partData.find(item => item.partCode == val); this.checkShow = true
this.tableData[index].partName = tmp.partName; this.rowItem = row
getMoldList({
partId: this.partData.find(item => item.partCode === val)?.id,
}).then(res => {
this.tableData[index].woData = res.data.data;
});
},
tabPositionChange(val) {
this.option.column = workColumnData[this.tabPosition];
if (this.tabPosition == 'declarationPlan') {
this.option.menu = true;
this.data = [
{
id: 1,
partCode: '001',
moCodee: '002',
planType: '备件',
quantity: 10,
quaLevel: '002',
urgentTypeText: '正常',
urgentType: '0',
needDate: '2022-10-30',
createTime: '2022-10-15',
memo: '',
mafStatusTitle: '正常',
keeper: {
userName: '张三',
},
createMan: {
userName: '李四',
},
},
{
id: 2,
partCode: '001',
moCodee: '002',
planType: '备件',
quantity: 10,
quaLevel: '002',
urgentTypeText: '正常',
urgentType: '0',
needDate: '2022-10-30',
createTime: '2022-10-15',
memo: '',
mafStatusTitle: '正常',
keeper: {
userName: '张三',
},
createMan: {
userName: '李四',
},
},
];
this.page.total = this.data.length;
} else {
this.option.menu = false;
this.data = [];
this.page.total = this.data.length;
}
}, },
// 修改
editRow(row) { editRow(row) {
this.tableData = []; this.tableData = [];
getOrderMoldPlanCaDeatils({ getOrderMoldPlanCaDeatils({
@ -614,9 +435,6 @@ export default {
this.tableData.push(res.data.data); this.tableData.push(res.data.data);
this.showDialog = true; this.showDialog = true;
}); });
// this.tableData = [];
// this.tableData.push(row);
// this.showDialog = true;
}, },
deleteRow(row) { deleteRow(row) {
this.$confirm('确定将选择数据删除?', { this.$confirm('确定将选择数据删除?', {
@ -632,21 +450,44 @@ export default {
}); });
}); });
}, },
selectionChange(list) {
this.selectionList = list;
},
handleAdd() { handleAdd() {
this.showDialog = true; this.showDialog = true;
}, },
//发送审批
sendCheck() {
if (this.selectionList.length <= 0) {
this.$message.error('请选择需要发送审批的数据！');
return false;
}
const invalidItems = this.selectionList.filter(item =>( item.mafStatus !== 0)&&(item.approvalStatus != 2));
if (invalidItems.length > 0) {
this.$message.warning(`请选择新建或者审批不通过的数据！`);
return false;
}
this.$confirm(`确定将选中的 ${this.selectionList.length} 条数据发送审批?`, {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
renderApproval(this.selectionList).then(res => {
this.$message.success('操作成功');
this.onLoad(this.page, this.query);
});
})
.catch(() => {});
},
closeDialog() { closeDialog() {
this.showDialog = false; this.showDialog = false;
this.tableData = []; this.tableData = [];
this.checkShow = false
this.onLoad(this.page,this.query)
}, },
submit() { submit() {
// {
// "list": [
// {"applyNo": "M001", "moldName": "模具1", "applyNum": 5},
// {"applyNo": "M002", "moldName": "模具2", "applyNum": 3}
// ],
// "deleteIds": [1, 2, 3] // 无删除则传："deleteIds": []
// }
// 校验通过：准备提交数据（过滤无用字段） // 校验通过：准备提交数据（过滤无用字段）
const submitData = this.tableData.map(row => { const submitData = this.tableData.map(row => {
const { _select, woData, ...validData } = row; // 剔除选择状态字段 const { _select, woData, ...validData } = row; // 剔除选择状态字段
@ -666,11 +507,9 @@ export default {
}); });
}, },
changeMoData(val, tmp, row, index) { changeMoData(val, tmp, row, index) {
// let tmp = this.goodsList.find(item => item.goodsCode == val);
if (tmp != undefined) { if (tmp != undefined) {
this.tableData[index].moName = tmp.goodsName; this.tableData[index].moName = tmp.goodsName;
} }
// this.tableData[index].moName = tmp.goodsName;
}, },
insertEvent() { insertEvent() {
const record = { _select: false }; const record = { _select: false };
@ -721,7 +560,6 @@ export default {
this.query.needDate && this.query.needDate.length != 0 && this.query.needDate[1], this.query.needDate && this.query.needDate.length != 0 && this.query.needDate[1],
}; };
if (params.needDate) delete params.needDate; if (params.needDate) delete params.needDate;
// const {needDate,...searchParam} = params
getList({ getList({
current: this.page.currentPage, current: this.page.currentPage,
size: this.page.pageSize, size: this.page.pageSize,
@ -730,33 +568,6 @@ export default {
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.data = [
// {
// id: 1,
// partCode: '001', moCodee: '002', planType: '备件', quantity: 10, quaLevel: '002',
// urgentTypeText: '正常', urgentType: '0', needDate: '2022-10-30', createTime: '2022-10-15',
// memo: '', mafStatusTitle: '正常',
// keeper: {
// userName: '张三',
// },
// createMan: {
// userName: '李四'
// }
// },
// {
// id: 2,
// partCode: '001', moCodee: '002', planType: '备件', quantity: 10, quaLevel: '002',
// urgentTypeText: '正常', urgentType: '0', needDate: '2022-10-30', createTime: '2022-10-15',
// memo: '', mafStatusTitle: '正常',
// keeper: {
// userName: '张三',
// },
// createMan: {
// userName: '李四'
// }
// },
// ]
// this.page.total = this.data.length
}, },
}, },
}; };

Write Preview
Loading…
Cancel
Save