From 4fa27a6fb37b7d5685cbeb1ae4ec9c1b85936fbf Mon Sep 17 00:00:00 2001 From: ruanqi Date: Fri, 31 May 2024 18:02:46 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/material/poReceive.js | 11 + src/views/modules/material/poReceiving.vue | 725 +++++++++++++++---- src/views/modules/sys/user-add-or-update.vue | 20 +- 3 files changed, 585 insertions(+), 171 deletions(-) create mode 100644 src/api/material/poReceive.js diff --git a/src/api/material/poReceive.js b/src/api/material/poReceive.js new file mode 100644 index 0000000..08e416e --- /dev/null +++ b/src/api/material/poReceive.js @@ -0,0 +1,11 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +export const searchTransHeader = data => createAPI(`/poReceive/searchTransHeader`,'post',data) + +export const searchTransDetail = data => createAPI(`/poReceive/searchTransDetail`,'post',data) + +export const searchTransDetailSub = data => createAPI(`/poReceive/searchTransDetailSub`,'post',data) + + +export const getWareHouseList = data => createAPI(`/poReceive/getWareHouseList`,'post',data) +export const saveTransHeaderData= data => createAPI(`/poReceive/saveTransHeaderData`,'post',data) diff --git a/src/views/modules/material/poReceiving.vue b/src/views/modules/material/poReceiving.vue index f1bebdc..fe692e9 100644 --- a/src/views/modules/material/poReceiving.vue +++ b/src/views/modules/material/poReceiving.vue @@ -2,6 +2,32 @@
+ + + + + + + + + + + + + + + + 查询 新增 {{ '导出' }} + @@ -45,11 +73,12 @@ header-align="center" align="center" width="150" - fixed="right" + fixed="left" label="操作"> @@ -62,16 +91,116 @@ :total="totalPage" layout="total, sizes, prev, pager, next, jumper"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 保存后直接扫描 + + + + + + + + + + + + + 供应商编码 + + + + + + + + 保存 + 关闭 + +
+ + + + From aa5ce8040d7010e0ff103b3de8c2abfe242edc75 Mon Sep 17 00:00:00 2001 From: zelian_wu Date: Tue, 4 Jun 2024 18:19:59 +0800 Subject: [PATCH 04/12] =?UTF-8?q?2024/06/04=20=E8=AE=A2=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/production/shopOrder.js | 1 + src/views/modules/production/order.vue | 108 +++++++++++++++++++++++-- 2 files changed, 103 insertions(+), 6 deletions(-) diff --git a/src/api/production/shopOrder.js b/src/api/production/shopOrder.js index c84b884..4522b00 100644 --- a/src/api/production/shopOrder.js +++ b/src/api/production/shopOrder.js @@ -1,6 +1,7 @@ import {createAPI} from "../../utils/httpRequest"; export const getDataList = (data) => createAPI(`/shop/order/list`,'post',data) +export const getIFSDataList = (data) => createAPI(`/shop/order/ifs/list`,'post',data) export const getDataPageList = (data) => createAPI(`/shop/order/page/${data.no}/${data.size}`,'post',data) export const saveData = (data) => createAPI(`/shop/order/add`,'post',data) diff --git a/src/views/modules/production/order.vue b/src/views/modules/production/order.vue index ffcb73d..0da8fd1 100644 --- a/src/views/modules/production/order.vue +++ b/src/views/modules/production/order.vue @@ -3,12 +3,13 @@ import { deleteData, editData, getDataList, - getDataPageList, + getDataPageList, getIFSDataList, getPartDataList, saveData -} from "../../../api/production/shopOrder"; +} from '../../../api/production/shopOrder' import dayjs from "dayjs"; +const os = require('os'); export default { name: 'order', props:{ @@ -136,7 +137,7 @@ export default { tableName: "ShopOrder", columnProp: "status", headerAlign: "center", - align: "left", + align: "center", columnLabel: "状态", columnHidden: false, columnImage: false, @@ -188,6 +189,12 @@ export default { partDesc: '', }, partDataList:[], + + importOpen:false, + importDataList:[], + importForm:{ + orderNo: '', + }, } }, methods:{ @@ -324,9 +331,69 @@ export default { this.form.partNo = row.partNo this.form.partDesc = row.partDesc this.partOpen = false + }, + ifsOrderRowClick(row){ + this.form.orderNo = row.orderNo + this.form.partNo = row.partNo + this.form.partDesc = row.partDesc + this.form.lotSize = row.lotSize + this.form.planStartDate = row.planStartDate + this.importOpen = false + }, + handleValidatePart(){ + let params = { + partNo: this.form.partNo, + site: this.$store.state.user.site, + } + getPartDataList(params).then(({data})=>{ + if (data && data.code === 0){ + if (data.rows.length === 1){ + this.partRowClick(data.rows[0]) + } + }else { + this.$message.warning(data.msg) + } + }).catch((error)=>{ + this.$message.error(error) + }) + }, + handleImportIFS(){ + this.importOpen = true; + let params = { + ...this.importForm, + site: this.$store.state.user.site, + } + getIFSDataList(params).then(({data})=>{ + if (data && data.code === 0){ + this.importDataList = data.rows + }else { + this.$message.warning(data.msg) + } + }).catch((error)=>{ + this.$message.error(error) + }) + }, + }, + watch:{ + 'form.partNo'(newVal,oldVal){ + if (newVal){ + this.partForm.partNo = newVal.toUpperCase() + this.partForm.partNo = this.form.partNo + } + }, + 'form.orderNo'(newVal,oldVal){ + if (newVal){ + this.form.orderNo = newVal.toUpperCase() + } + }, + 'importForm.orderNo'(newVal,oldVal){ + if (newVal) { + this.importForm.orderNo = newVal.toUpperCase() + } } }, created() { + console.log(os.homedir()) this.getList(); } } @@ -431,7 +498,7 @@ export default { - 从IFS导入 + 从IFS导入 @@ -439,7 +506,7 @@ export default { 产品编码 - + @@ -476,12 +543,41 @@ export default { - + + + + + + + + + + 查询 + + + + + + + + + + 查询 + + + + + + + + + + From 3ece884906b5222933970051376b005b3641f3c6 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Tue, 4 Jun 2024 18:28:32 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/base/normalSearch.js | 1 + src/api/material/poReceive.js | 4 + .../com_poReceiving_add_or_update.vue | 581 ++++++++++++++++++ src/views/modules/material/poReceiving.vue | 62 +- 4 files changed, 628 insertions(+), 20 deletions(-) create mode 100644 src/api/base/normalSearch.js create mode 100644 src/views/modules/material/com_poReceiving_add_or_update.vue diff --git a/src/api/base/normalSearch.js b/src/api/base/normalSearch.js new file mode 100644 index 0000000..07db551 --- /dev/null +++ b/src/api/base/normalSearch.js @@ -0,0 +1 @@ +import { createAPI } from "@/utils/httpRequest.js"; diff --git a/src/api/material/poReceive.js b/src/api/material/poReceive.js index 08e416e..9b5c1aa 100644 --- a/src/api/material/poReceive.js +++ b/src/api/material/poReceive.js @@ -9,3 +9,7 @@ export const searchTransDetailSub = data => createAPI(`/poReceive/searchTransDet export const getWareHouseList = data => createAPI(`/poReceive/getWareHouseList`,'post',data) export const saveTransHeaderData= data => createAPI(`/poReceive/saveTransHeaderData`,'post',data) + +export const searchTransDetailAndSubCach= data => createAPI(`/poReceive/searchTransDetailAndSubCach`,'post',data) +export const createNewCachRoll= data => createAPI(`/poReceive/createNewCachRoll`,'post',data) +export const finalSaveTransHeaderDetail= data => createAPI(`/poReceive/finalSaveTransHeaderDetail`,'post',data) diff --git a/src/views/modules/material/com_poReceiving_add_or_update.vue b/src/views/modules/material/com_poReceiving_add_or_update.vue new file mode 100644 index 0000000..240b04b --- /dev/null +++ b/src/views/modules/material/com_poReceiving_add_or_update.vue @@ -0,0 +1,581 @@ + + + + + diff --git a/src/views/modules/material/poReceiving.vue b/src/views/modules/material/poReceiving.vue index fe692e9..50d1252 100644 --- a/src/views/modules/material/poReceiving.vue +++ b/src/views/modules/material/poReceiving.vue @@ -51,6 +51,8 @@ @row-click="changeData" :height="height" border + highlight-current-row + ref="mainTable" v-loading="dataListLoading" style="width: 100%; "> 编辑 删除 - 扫描 + 扫描 @@ -91,6 +93,8 @@ :total="totalPage" layout="total, sizes, prev, pager, next, jumper"> + + - + @@ -189,6 +193,9 @@ 关闭 + + + @@ -200,11 +207,14 @@ ,searchTransDetailSub ,getWareHouseList ,saveTransHeaderData + } from "@/api/material/poReceive.js" + import addOrUpdate from './com_poReceiving_add_or_update' import Chooselist from '@/views/modules/common/Chooselist' export default { components: { Chooselist + ,addOrUpdate }, data() { return { @@ -214,6 +224,7 @@ dataList: [], dataList2: [], dataList3: [], + addOrUpdateVisible:false, searchData: { page: 1, limit: 100, @@ -230,7 +241,7 @@ addFlag:0, site:this.$store.state.user.site, transDate:new Date(), - wareHouseId:'', + warehouseID:'', receiver:'', orderRef1:'', supplierId:'', @@ -299,10 +310,10 @@ },{ userId: this.$store.state.user.name, functionId: 200001, - serialNumber: '200001Table1WareHouseId', + serialNumber: '200001Table1WareHouseID', tableId: "200001Table1", tableName: "采购入库主表", - columnProp: "wareHouseId", + columnProp: "warehouseID", headerAlign: "center", align: "left", columnLabel: "仓库编码", @@ -333,10 +344,10 @@ },{ userId: this.$store.state.user.name, functionId: 200001, - serialNumber: '200001Table1Receiver', + serialNumber: '200001Table1ReceiverName', tableId: "200001Table1", tableName: "采购入库主表", - columnProp: "receiver", + columnProp: "receiverName", headerAlign: "center", align: "left", columnLabel: "经手人", @@ -455,10 +466,10 @@ },{ userId: this.$store.state.user.name, functionId: 200001, - serialNumber: '200001Table2LocationId', + serialNumber: '200001Table2LocationID', tableId: "200001Table2", tableName: "采购入库明细", - columnProp: "locationId", + columnProp: "locationID", headerAlign: "center", align: "left", columnLabel: "库位", @@ -729,17 +740,17 @@ this.dataList2 = data.rows } else { - this.dataList = []; + this.dataList2 = []; } }); }else { searchTransDetailSub(this.currentRow).then(({data}) => { //区分请求成功和失败的状况 if (data && data.code == 0) { - this.dataList2 = data.rows + this.dataList3 = data.rows } else { - this.dataList = []; + this.dataList3 = []; } }); } @@ -772,16 +783,16 @@ addFlag:0, site:this.$store.state.user.site, transDate:new Date(), - wareHouseId:this.wareHouseList.length>0?this.wareHouseList[0].wareHouseId:'', + warehouseID:this.wareHouseList.length>0?this.wareHouseList[0].wareHouseId:'', receiver:this.$store.state.user.name, orderRef1:'', supplierId:'', supplierName:'', enterBy:this.$store.state.user.name, }; - if(this.wareHouseList.length>0){ - this.modelData.wareHouseId=this.wareHouseList[0].wareHouseId - } + // if(this.wareHouseList.length>0){ + // this.modelData.wareHouseId=this.wareHouseList[0].wareHouseId + // } this.modelFlag=true; }, updateModel(row){ @@ -819,25 +830,25 @@ }) }, saveHeaderData(){ - if(this.dataForm.wareHouseId===''){ + if(this.modelData.warehouseID===''){ this.$alert('请选择仓库！', '错误', { confirmButtonText: '确定' }) return false } - if(this.dataForm.receiver===''){ + if(this.modelData.receiver===''){ this.$alert('请选择经手人！', '错误', { confirmButtonText: '确定' }) return false } - if(this.dataForm.transDate===''){ + if(this.modelData.transDate===''){ this.$alert('请选择入库日期！', '错误', { confirmButtonText: '确定' }) return false } - saveTransHeaderData(this.dataForm).then(({data}) => { + saveTransHeaderData(this.modelData).then(({data}) => { if (data && data.code === 0) { this.$message.success( '操作成功') this.modelFlag = false @@ -845,6 +856,7 @@ if(this.jumpFlag){ this.$nextTick(function () { setTimeout(() => { + console.log(data.transNo) // let inData = { // site: this.$store.state.user.site, // codeNo: data.row.codeNo, @@ -869,6 +881,16 @@ } }) }, + scanRoll(row){ + let data={ + site:row.site, + transNo:row.transNo, + } + this.addOrUpdateVisible = true + this.$nextTick(() => { + this.$refs.addOrUpdate.init(data) + }) + }, //导出excel //导出excel async createExportData() { From 7f56d8a0703e18ca1818934b671d48e81ee4a765 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 5 Jun 2024 15:45:04 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/base/normalSearch.js | 4 + src/api/material/poReceive.js | 2 + .../com_poReceiving_add_or_update.vue | 255 ++++++++++++++++-- src/views/modules/material/poReceiving.vue | 103 ++++--- 4 files changed, 302 insertions(+), 62 deletions(-) diff --git a/src/api/base/normalSearch.js b/src/api/base/normalSearch.js index 07db551..e23bcd6 100644 --- a/src/api/base/normalSearch.js +++ b/src/api/base/normalSearch.js @@ -1 +1,5 @@ import { createAPI } from "@/utils/httpRequest.js"; + +export const getLocationListForSearch = data => createAPI(`/normalSearch/getLocationListForSearch`,'post',data) +export const getPartListForSearch = data => createAPI(`/normalSearch/getPartListForSearch`,'post',data) + diff --git a/src/api/material/poReceive.js b/src/api/material/poReceive.js index 9b5c1aa..0f4c280 100644 --- a/src/api/material/poReceive.js +++ b/src/api/material/poReceive.js @@ -13,3 +13,5 @@ export const saveTransHeaderData= data => createAPI(`/poReceive/saveTransHeaderD export const searchTransDetailAndSubCach= data => createAPI(`/poReceive/searchTransDetailAndSubCach`,'post',data) export const createNewCachRoll= data => createAPI(`/poReceive/createNewCachRoll`,'post',data) export const finalSaveTransHeaderDetail= data => createAPI(`/poReceive/finalSaveTransHeaderDetail`,'post',data) +export const deleteSubCach= data => createAPI(`/poReceive/deleteSubCach`,'post',data) +export const deleteTransHeaderData= data => createAPI(`/poReceive/deleteTransHeaderData`,'post',data) diff --git a/src/views/modules/material/com_poReceiving_add_or_update.vue b/src/views/modules/material/com_poReceiving_add_or_update.vue index 240b04b..d4e920b 100644 --- a/src/views/modules/material/com_poReceiving_add_or_update.vue +++ b/src/views/modules/material/com_poReceiving_add_or_update.vue @@ -60,8 +60,9 @@ - - + + 物料编码 + @@ -71,12 +72,14 @@ - + + + - {{'扫描条码入库'}} + {{'扫描条码入库'}} @@ -133,7 +136,7 @@ {{'最终保存'}} - {{'关闭'}} + @@ -144,6 +147,16 @@ border v-loading="false" style="width: 100%; "> + + + + + + + + + + + + + + + + 物料编码 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{'创建分卷'}} + + + + + {{'关闭'}} + + + + + + 最终保存 + 取消 + + diff --git a/src/views/modules/material/poReceiving.vue b/src/views/modules/material/poReceiving.vue index 50d1252..f51055f 100644 --- a/src/views/modules/material/poReceiving.vue +++ b/src/views/modules/material/poReceiving.vue @@ -153,7 +153,7 @@ - + @@ -207,8 +207,11 @@ ,searchTransDetailSub ,getWareHouseList ,saveTransHeaderData - + ,deleteTransHeaderData } from "@/api/material/poReceive.js" + import { + getLocationListForSearch + } from "@/api/base/normalSearch.js" import addOrUpdate from './com_poReceiving_add_or_update' import Chooselist from '@/views/modules/common/Chooselist' export default { @@ -238,7 +241,7 @@ wareHouseList:[], jumpFlag:true, modelData:{ - addFlag:0, + transNo:'', site:this.$store.state.user.site, transDate:new Date(), warehouseID:'', @@ -619,6 +622,23 @@ status: true, fixed: '', columnWidth: 100 + },{ + userId: this.$store.state.user.name, + functionId: 200001, + serialNumber: '200001Table3ExpiredDate', + tableId: "200001Table3", + tableName: "采购入库卷明细", + columnProp: "expiredDate", + headerAlign: "center", + align: "center", + columnLabel: "失效日期", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 },{ userId: this.$store.state.user.name, functionId: 200001, @@ -778,47 +798,43 @@ }, addModal(){ this.getWareHouseList(); - - this.modelData={ - addFlag:0, - site:this.$store.state.user.site, - transDate:new Date(), - warehouseID:this.wareHouseList.length>0?this.wareHouseList[0].wareHouseId:'', - receiver:this.$store.state.user.name, - orderRef1:'', - supplierId:'', - supplierName:'', - enterBy:this.$store.state.user.name, - }; - // if(this.wareHouseList.length>0){ - // this.modelData.wareHouseId=this.wareHouseList[0].wareHouseId - // } - this.modelFlag=true; + setTimeout(() => { + this.modelData={ + transNo:"0", + site:this.$store.state.user.site, + transDate:new Date(), + warehouseID:this.wareHouseList.length>0?this.wareHouseList[0].wareHouseId:'', + receiver:this.$store.state.user.name, + orderRef1:'', + supplierId:'', + supplierName:'', + enterBy:this.$store.state.user.name, + }; + this.modelFlag=true; + },200) }, updateModel(row){ + this.getWareHouseList(); this.modelData={ - id:row.id, - site: row.site, - projectId: row.projectId, - testPartNo:row.testPartNo, - partType:row.partType, - partTypeDesc:row.partTypeDesc, - partName:row.partName, - partDesc:row.partDesc, - partSpec:row.partSpec, - remark:row.remark, - materialNumber:row.materialNumber, - username:this.$store.state.user.name, + transNo:row.transNo, + site:row.site, + transDate:row.transDate, + warehouseID:row.warehouseID, + receiver:row.receiver, + orderRef1:row.orderRef1, + supplierId:row.partnerID, + supplierName:row.partnerName, + enterBy:row.userName, } this.modelFlag=true; }, - deleteData(){ + deleteData(row){ this.$confirm('确定要删除这条数据?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - deleteProjectPartWithId(this.modelData).then(({data}) => { + deleteTransHeaderData(row).then(({data}) => { if (data && data.code === 0) { this.$message.success( '操作成功') this.searchTable(); @@ -850,21 +866,21 @@ } saveTransHeaderData(this.modelData).then(({data}) => { if (data && data.code === 0) { + var transNo=data.transNo this.$message.success( '操作成功') this.modelFlag = false this.searchTable() if(this.jumpFlag){ this.$nextTick(function () { setTimeout(() => { - console.log(data.transNo) - // let inData = { - // site: this.$store.state.user.site, - // codeNo: data.row.codeNo, - // buNo: data.row.buNo, - // username: this.$store.state.user.name - // }; - // localStorage.setItem('tsfData', JSON.stringify(inData)) - // window.open('#/BMPage'); + let data={ + site:this.$store.state.user.site, + transNo:transNo, + } + this.addOrUpdateVisible = true + this.$nextTick(() => { + this.$refs.addOrUpdate.init(data) + }) },500) }) } @@ -878,6 +894,7 @@ getWareHouseList({site:this.$store.state.user.site}).then(({data}) => { if (data && data.code === 0) { this.wareHouseList=data.rows + } }) }, @@ -896,7 +913,7 @@ async createExportData() { this.searchData.limit = -1 this.searchData.page = 1 - await projectInfoSearch(this.searchData).then(({data}) => { + await searchTransHeader(this.searchData).then(({data}) => { this.exportList= data.page.list; }) From eb2715655e778a89e1ce94211baf5d457dc19733 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 5 Jun 2024 18:01:26 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/material/issureSo.js | 17 + .../material/com_issureSo_add_or_update.vue | 543 ++++++++++ .../com_poReceiving_add_or_update.vue | 21 +- src/views/modules/material/issureSo.vue | 948 ++++++++++++++++++ 4 files changed, 1519 insertions(+), 10 deletions(-) create mode 100644 src/api/material/issureSo.js create mode 100644 src/views/modules/material/com_issureSo_add_or_update.vue create mode 100644 src/views/modules/material/issureSo.vue diff --git a/src/api/material/issureSo.js b/src/api/material/issureSo.js new file mode 100644 index 0000000..2cd7803 --- /dev/null +++ b/src/api/material/issureSo.js @@ -0,0 +1,17 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +export const searchTransHeader = data => createAPI(`/issureSo/searchTransHeader`,'post',data) + +export const searchTransDetail = data => createAPI(`/issureSo/searchTransDetail`,'post',data) + +export const searchTransDetailSub = data => createAPI(`/issureSo/searchTransDetailSub`,'post',data) + + +export const getWareHouseList = data => createAPI(`/issureSo/getWareHouseList`,'post',data) +export const saveTransHeaderData= data => createAPI(`/issureSo/saveTransHeaderData`,'post',data) + +export const searchTransDetailAndSubCach= data => createAPI(`/issureSo/searchTransDetailAndSubCach`,'post',data) +export const createNewCachRoll= data => createAPI(`/issureSo/createNewCachRoll`,'post',data) +export const finalSaveTransHeaderDetail= data => createAPI(`/issureSo/finalSaveTransHeaderDetail`,'post',data) +export const deleteSubCach= data => createAPI(`/issureSo/deleteSubCach`,'post',data) +export const deleteTransHeaderData= data => createAPI(`/issureSo/deleteTransHeaderData`,'post',data) diff --git a/src/views/modules/material/com_issureSo_add_or_update.vue b/src/views/modules/material/com_issureSo_add_or_update.vue new file mode 100644 index 0000000..afd6505 --- /dev/null +++ b/src/views/modules/material/com_issureSo_add_or_update.vue @@ -0,0 +1,543 @@ + + + + + diff --git a/src/views/modules/material/com_poReceiving_add_or_update.vue b/src/views/modules/material/com_poReceiving_add_or_update.vue index d4e920b..3337231 100644 --- a/src/views/modules/material/com_poReceiving_add_or_update.vue +++ b/src/views/modules/material/com_poReceiving_add_or_update.vue @@ -49,7 +49,7 @@ - + @@ -311,7 +311,7 @@ partnerID:'', partnerName:'', transDate:'', - receiveName:'', + receiverName:'', orderRef1:'', partNo:'', partDesc:'', @@ -559,17 +559,17 @@ searchTransDetailAndSubCach(row).then(({data})=>{ //区分请求成功和失败的状况 if (data && data.code == 0) { - let row= data.row + let dataRow= data.row this.dataList = data.rows this.dataForm={ - site:row.site, + site:dataRow.site, warehouseID:data.row.warehouseID, - transNo:row.transNo, - partnerID:row.partnerID, - partnerName:row.partnerName, - transDate:row.transDate, - receiveName:row.receiverName, - orderRef1:row.orderRef1, + transNo:dataRow.transNo, + partnerID:dataRow.partnerID, + partnerName:dataRow.partnerName, + transDate:dataRow.transDate, + receiverName:dataRow.receiverName, + orderRef1:dataRow.orderRef1, partNo:'', partDesc:'', locationId:'', @@ -738,6 +738,7 @@ scanModel(){ this.scanSerial=''; this.scanModalFlag=true; + this.$nextTick(() => { this.$refs.scan.focus();}) }, scanSaveCach(){ debugger; diff --git a/src/views/modules/material/issureSo.vue b/src/views/modules/material/issureSo.vue new file mode 100644 index 0000000..9548a47 --- /dev/null +++ b/src/views/modules/material/issureSo.vue @@ -0,0 +1,948 @@ + + + + + From 761583d8d356bba6bd549889fe3ee32a55d46bef Mon Sep 17 00:00:00 2001 From: ruanqi Date: Thu, 6 Jun 2024 14:58:17 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/material/issureSo.js | 1 + .../material/com_issureSo_add_or_update.vue | 35 ++++++++++++++++--- src/views/modules/material/issureSo.vue | 1 - src/views/modules/material/poReceiving.vue | 1 - 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/api/material/issureSo.js b/src/api/material/issureSo.js index 2cd7803..21625a8 100644 --- a/src/api/material/issureSo.js +++ b/src/api/material/issureSo.js @@ -15,3 +15,4 @@ export const createNewCachRoll= data => createAPI(`/issureSo/createNewCachRoll`, export const finalSaveTransHeaderDetail= data => createAPI(`/issureSo/finalSaveTransHeaderDetail`,'post',data) export const deleteSubCach= data => createAPI(`/issureSo/deleteSubCach`,'post',data) export const deleteTransHeaderData= data => createAPI(`/issureSo/deleteTransHeaderData`,'post',data) +export const saveIssureCach= data => createAPI(`/issureSo/saveIssureCach`,'post',data) diff --git a/src/views/modules/material/com_issureSo_add_or_update.vue b/src/views/modules/material/com_issureSo_add_or_update.vue index afd6505..1910bb7 100644 --- a/src/views/modules/material/com_issureSo_add_or_update.vue +++ b/src/views/modules/material/com_issureSo_add_or_update.vue @@ -62,7 +62,7 @@ - + @@ -121,9 +121,9 @@ searchTransDetailAndSubCach ,createNewCachRoll ,finalSaveTransHeaderDetail - ,deleteSubCach - - } from "@/api/material/poReceive.js" + ,deleteSubCach, + saveIssureCach, + } from "@/api/material/IssureSo.js" import Chooselist from '@/views/modules/common/Chooselist' import {searchTransDetail} from "../../../api/material/poReceive"; export default { @@ -525,11 +525,36 @@ this.dataList = data.rows }) } else { - + this.$message.error( data.msg) } }) }) }, + scanSaveCach(){ + let arr=this.dataForm.scanSerialNo.split(','); + if(arr.length<2){ + this.$message.error( '二维码格式有误！') + } + let inData={ + site:this.dataForm.site, + transNo:this.dataForm.transNo, + orderNo:this.dataForm.orderRef1, + rollNo:arr[1], + } + saveIssureCach(inData).then(({data}) => { + //区分请求成功和失败的状况 + if (data && data.code == 0) { + this.$message.success( '操作成功') + searchTransDetailAndSubCach(this.dataForm).then(({data})=>{ + this.dataList = data.rows + }) + this.dataForm.scanSerialNo='' + } else { + this.$message.error( data.msg) + this.dataForm.scanSerialNo='' + } + }) + }, diff --git a/src/views/modules/material/issureSo.vue b/src/views/modules/material/issureSo.vue index 9548a47..221c5ce 100644 --- a/src/views/modules/material/issureSo.vue +++ b/src/views/modules/material/issureSo.vue @@ -160,7 +160,6 @@ Date: Thu, 6 Jun 2024 15:14:12 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/material/com_issureSo_add_or_update.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/material/com_issureSo_add_or_update.vue b/src/views/modules/material/com_issureSo_add_or_update.vue index 1910bb7..c6ff4f6 100644 --- a/src/views/modules/material/com_issureSo_add_or_update.vue +++ b/src/views/modules/material/com_issureSo_add_or_update.vue @@ -123,7 +123,7 @@ ,finalSaveTransHeaderDetail ,deleteSubCach, saveIssureCach, - } from "@/api/material/IssureSo.js" + } from "@/api/material/issureSo.js" import Chooselist from '@/views/modules/common/Chooselist' import {searchTransDetail} from "../../../api/material/poReceive"; export default { From 45434056be66a5a3c8cb5bbfcd653459ae552ff7 Mon Sep 17 00:00:00 2001 From: zelian_wu Date: Thu, 6 Jun 2024 17:58:03 +0800 Subject: [PATCH 10/12] 2024/06/06 --- src/api/shipment/detail.js | 3 + src/api/shipment/index.js | 5 + .../modules/finshProduct/outWarehouse.vue | 410 ++++++++++++++++++ .../outWarehouse/outWarehouseDetail.vue | 54 +++ .../finshProduct/outWarehouse/shipmentBox.vue | 41 ++ src/views/modules/production/order.vue | 15 +- 6 files changed, 524 insertions(+), 4 deletions(-) create mode 100644 src/api/shipment/detail.js create mode 100644 src/api/shipment/index.js create mode 100644 src/views/modules/finshProduct/outWarehouse.vue create mode 100644 src/views/modules/finshProduct/outWarehouse/outWarehouseDetail.vue create mode 100644 src/views/modules/finshProduct/outWarehouse/shipmentBox.vue diff --git a/src/api/shipment/detail.js b/src/api/shipment/detail.js new file mode 100644 index 0000000..04735cb --- /dev/null +++ b/src/api/shipment/detail.js @@ -0,0 +1,3 @@ +import {createAPI} from '../../utils/httpRequest' + +export const getShipmentDetailList = (data) => createAPI(`/shipment/detail/list`,'post',data) diff --git a/src/api/shipment/index.js b/src/api/shipment/index.js new file mode 100644 index 0000000..e31417f --- /dev/null +++ b/src/api/shipment/index.js @@ -0,0 +1,5 @@ +import {createAPI} from '../../utils/httpRequest' + +export const getShipmentList = (data) => createAPI( '/shipment/list','post', data) + +export const getShipmentPage = (data) => createAPI( `/shipment/list/${data.no}/${data.size}`,'post',data) diff --git a/src/views/modules/finshProduct/outWarehouse.vue b/src/views/modules/finshProduct/outWarehouse.vue new file mode 100644 index 0000000..f6bfa93 --- /dev/null +++ b/src/views/modules/finshProduct/outWarehouse.vue @@ -0,0 +1,410 @@ + + + + + diff --git a/src/views/modules/finshProduct/outWarehouse/outWarehouseDetail.vue b/src/views/modules/finshProduct/outWarehouse/outWarehouseDetail.vue new file mode 100644 index 0000000..ebebc30 --- /dev/null +++ b/src/views/modules/finshProduct/outWarehouse/outWarehouseDetail.vue @@ -0,0 +1,54 @@ + + + + + diff --git a/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue b/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue new file mode 100644 index 0000000..87f0528 --- /dev/null +++ b/src/views/modules/finshProduct/outWarehouse/shipmentBox.vue @@ -0,0 +1,41 @@ + + + + + diff --git a/src/views/modules/production/order.vue b/src/views/modules/production/order.vue index 0da8fd1..0dc8ce0 100644 --- a/src/views/modules/production/order.vue +++ b/src/views/modules/production/order.vue @@ -8,8 +8,6 @@ import { saveData } from '../../../api/production/shopOrder' import dayjs from "dayjs"; - -const os = require('os'); export default { name: 'order', props:{ @@ -386,6 +384,16 @@ export default { this.form.orderNo = newVal.toUpperCase() } }, + 'queryForm.partNo'(newVal,oldVal){ + if (newVal){ + this.queryForm.partNo = newVal.toUpperCase() + } + }, + 'queryForm.orderNo'(newVal,oldVal){ + if (newVal){ + this.queryForm.orderNo = newVal.toUpperCase() + } + }, 'importForm.orderNo'(newVal,oldVal){ if (newVal) { this.importForm.orderNo = newVal.toUpperCase() @@ -393,7 +401,6 @@ export default { } }, created() { - console.log(os.homedir()) this.getList(); } } @@ -482,7 +489,7 @@ export default { @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="no" - :page-sizes="[20, 50, 100, 1000]" + :page-sizes="[50, 100, 1000]" :page-size="size" :total="total" layout="total, sizes, prev, pager, next, jumper"> From 120de6a9a5a0e4ef7ffd271741a7000cce87ad77 Mon Sep 17 00:00:00 2001 From: ruanqi Date: Thu, 6 Jun 2024 18:19:23 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E5=8F=91=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/rq.scss | 3 ++ .../material/com_issureSo_add_or_update.vue | 49 ++++++++++++------- src/views/modules/material/issureSo.vue | 34 ++++++------- 3 files changed, 50 insertions(+), 36 deletions(-) diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss index 5ebd2df..245e5f7 100644 --- a/src/assets/scss/rq.scss +++ b/src/assets/scss/rq.scss @@ -77,3 +77,6 @@ font-weight: bold; color: rgb(23, 179, 163); } +.el-table .error-row { + background: #eee77c; +} diff --git a/src/views/modules/material/com_issureSo_add_or_update.vue b/src/views/modules/material/com_issureSo_add_or_update.vue index c6ff4f6..eb0619d 100644 --- a/src/views/modules/material/com_issureSo_add_or_update.vue +++ b/src/views/modules/material/com_issureSo_add_or_update.vue @@ -77,6 +77,7 @@ :data="dataList" height="300" border + :row-class-name="tableRowClassName" v-loading="false" style="width: 100%; "> { //区分请求成功和失败的状况 if (data && data.code == 0) { - this.$message.success( '操作成功') + this.$message.success( '操作成功'+data.str) searchTransDetailAndSubCach(this.dataForm).then(({data})=>{ this.dataList = data.rows }) @@ -555,7 +556,17 @@ } }) }, - + tableRowClassName ({row, rowIndex}) { + var currentDate = new Date(); + var futureDate = new Date(); + futureDate.setDate(currentDate.getDate() + 90); + var date = new Date(row.expiredDate) + if (date.getTime() < futureDate.getTime()) { + console.log('快过期了') + return 'error-row' + } + return '' + }, }, diff --git a/src/views/modules/material/issureSo.vue b/src/views/modules/material/issureSo.vue index 221c5ce..b48cf47 100644 --- a/src/views/modules/material/issureSo.vue +++ b/src/views/modules/material/issureSo.vue @@ -482,23 +482,23 @@ status: true, fixed: '', columnWidth: 80 - },{ - userId: this.$store.state.user.name, - functionId: 200002, - serialNumber: '200002Table2WdrNo', - tableId: "200002Table2", - tableName: "生产发料明细", - columnProp: "wdrNo", - headerAlign: "center", - align: "left", - columnLabel: "W/D/R", - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 100 + // },{ + // userId: this.$store.state.user.name, + // functionId: 200002, + // serialNumber: '200002Table2WdrNo', + // tableId: "200002Table2", + // tableName: "生产发料明细", + // columnProp: "wdrNo", + // headerAlign: "center", + // align: "left", + // columnLabel: "W/D/R", + // columnHidden: false, + // columnImage: false, + // columnSortable: false, + // sortLv: 0, + // status: true, + // fixed: '', + // columnWidth: 100 },{ userId: this.$store.state.user.name, functionId: 200002, From bbcccadc5ea8e851e36af8ec3d1637ab1322c38d Mon Sep 17 00:00:00 2001 From: ruanqi Date: Fri, 7 Jun 2024 18:04:29 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E5=8F=91=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/material/productionStock.js | 18 + .../com_productionStock_add_or_update.vue | 600 +++++++++++ .../modules/material/productionStock.vue | 947 ++++++++++++++++++ 3 files changed, 1565 insertions(+) create mode 100644 src/api/material/productionStock.js create mode 100644 src/views/modules/material/com_productionStock_add_or_update.vue create mode 100644 src/views/modules/material/productionStock.vue diff --git a/src/api/material/productionStock.js b/src/api/material/productionStock.js new file mode 100644 index 0000000..c6e96ce --- /dev/null +++ b/src/api/material/productionStock.js @@ -0,0 +1,18 @@ +import { createAPI } from "@/utils/httpRequest.js"; + +export const searchTransHeader = data => createAPI(`/productionStock/searchTransHeader`,'post',data) + +export const searchTransDetail = data => createAPI(`/productionStock/searchTransDetail`,'post',data) + +export const searchTransDetailSub = data => createAPI(`/productionStock/searchTransDetailSub`,'post',data) + + +export const getWareHouseList = data => createAPI(`/productionStock/getWareHouseList`,'post',data) +export const saveTransHeaderData= data => createAPI(`/productionStock/saveTransHeaderData`,'post',data) + +export const searchTransDetailAndSubCach= data => createAPI(`/productionStock/searchTransDetailAndSubCach`,'post',data) +export const createNewCachRoll= data => createAPI(`/productionStock/createNewCachRoll`,'post',data) +export const finalSaveTransHeaderDetail= data => createAPI(`/productionStock/finalSaveTransHeaderDetail`,'post',data) +export const deleteSubCach= data => createAPI(`/productionStock/deleteSubCach`,'post',data) +export const deleteTransHeaderData= data => createAPI(`/productionStock/deleteTransHeaderData`,'post',data) +export const saveStockCach= data => createAPI(`/productionStock/saveStockCach`,'post',data) diff --git a/src/views/modules/material/com_productionStock_add_or_update.vue b/src/views/modules/material/com_productionStock_add_or_update.vue new file mode 100644 index 0000000..f943b91 --- /dev/null +++ b/src/views/modules/material/com_productionStock_add_or_update.vue @@ -0,0 +1,600 @@ + + + + + diff --git a/src/views/modules/material/productionStock.vue b/src/views/modules/material/productionStock.vue new file mode 100644 index 0000000..577ae3f --- /dev/null +++ b/src/views/modules/material/productionStock.vue @@ -0,0 +1,947 @@ + + + + +