diff --git a/src/api/logisticsManagement/siteBasic.js b/src/api/logisticsManagement/siteBasic.js index be43d59..3d6f674 100644 --- a/src/api/logisticsManagement/siteBasic.js +++ b/src/api/logisticsManagement/siteBasic.js @@ -26,3 +26,13 @@ export const getLocationLis = (current, size, params) => { }, }); }; + + +// 更新站点状态 /station/update +export const stationUpdate = (data) => { + return request({ + url: '/blade-desk/station/update', + method: 'post', + data: data, + }); +}; \ No newline at end of file diff --git a/src/views/logisticsManagement/siteBasic.vue b/src/views/logisticsManagement/siteBasic.vue index 946e3a8..b0fcb83 100644 --- a/src/views/logisticsManagement/siteBasic.vue +++ b/src/views/logisticsManagement/siteBasic.vue @@ -8,6 +8,7 @@ v-model:page="page" ref="crud" @row-del="rowDel" + @row-update="rowUpdate" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange" @@ -15,21 +16,32 @@ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" + :before-open="beforeOpenFn" > - + - + + 闲置 + 占用 + + - + + diff --git a/src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingEntryDialog.vue b/src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingEntryDialog.vue index 0616119..551f168 100644 --- a/src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingEntryDialog.vue +++ b/src/views/productionManagement/beforeAndAfterPlating/components/beforePlatingEntryDialog.vue @@ -32,8 +32,8 @@ :height="tableHeight" > - - + + - - + --> @@ -165,21 +163,6 @@ export default { trigger: 'submit', }, ], - - userId: [ - { - required: true, - message: '请选择', - trigger: 'blur', - }, - ], - createTime: [ - { - required: true, - message: '请输入', - trigger: 'blur', - }, - ], }, }; }, @@ -268,15 +251,23 @@ export default { // 调用接口提交(实际项目替换)hrTypeBool: 0-转工 1-入库 try { - savePlateAroundPlateFrontEnter(this.form.beforePlatingEntryData) + let query = []; + this.form.beforePlatingEntryData.forEach(item => { + query.push({ + wpId: item.wpId, + tsId: item.teamId, + ocId: item.ocId ? item.ocId : null, + }); + }); + savePlateAroundPlateFrontEnter(query) .then(res => { this.sunmitLoading = false; this.$message.success('提交成功'); this.closeDialog(); - this.$emit('submitSuccess', submitData); + // this.$emit('submitSuccess', submitData); }) .catch(err => { - this.sunmitLoading = false; + this.sunmitLoading = false; }); } catch (err) { this.sunmitLoading = false;