From 9900c40097005b9d353783a985d030dabd59deb0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 24 Apr 2025 15:06:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A7=E4=BB=B6?= =?UTF-8?q?=E8=BF=94=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/storage/oldPartsFactory/index.vue | 717 ++++++++---------- .../manufacturerconfirmInfo.vue | 172 ----- .../oldPartsFactory/oldPartsFactoryAdd.vue | 497 +++++------- .../oldPartsFactory/oldPartsFactoryInfo.vue | 178 ++--- .../oldPartsFactoryDaiBan.vue | 642 ++++++++-------- .../oldPartsFactoryEdit.vue | 282 ++++--- .../oldPartsFactoryYiBan.vue | 293 ++++--- 7 files changed, 1114 insertions(+), 1667 deletions(-) delete mode 100644 yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue index b4fe07e478..8bd1399d8a 100644 --- a/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue +++ b/yxt-as-ui/src/views/storage/oldPartsFactory/index.vue @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + - - + -
-
+
- +
- - - + + + - + - - - - - - - - 返件数量确认 - - - - - - 一致 - 不一致 - - - - - - - - 备注 - - - - - {{orderInfo.remarks}} - - - - - - - 附件 - - - - - - - - - - - - - + - diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue deleted file mode 100644 index 63618b913e..0000000000 --- a/yxt-as-ui/src/views/storage/oldPartsFactory/manufacturerconfirmInfo.vue +++ /dev/null @@ -1,172 +0,0 @@ - - - - diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue index bb180d45f3..433127bfdb 100644 --- a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue +++ b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue @@ -1,28 +1,18 @@ @@ -293,29 +211,25 @@ listLoading: false, submitdisabled: false, formobj: { - "sid": "", - "remarks": "", - "createBySid": window.sessionStorage.getItem('userSid'), - "createByName": window.sessionStorage.getItem('name'), - "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage - .getItem('defaultOrgPath').lastIndexOf('/') + 1), - "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window - .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), - "createTime": getCurrentDate(), - "billNo": "", - "filePaths": [], - "useOrgSid": '', - "useOrgName": '', - "orgSidPath": window.sessionStorage.getItem('orgSidPath'), - "procDefId": "", - "nodeId": "", - "procInstId": "", - "nodeState": "", - "taskId": "", - "finishTime": "", - "asOldpartreturnList": [ - - ] + sid: '', + remarks: '', + createBySid: window.sessionStorage.getItem('userSid'), + createByName: window.sessionStorage.getItem('name'), + deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1), + deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), + createTime: getCurrentDate(), + billNo: '', + filePaths: [], + useOrgSid: '', + useOrgName: '', + orgSidPath: window.sessionStorage.getItem('orgSidPath'), + procDefId: '', + nodeId: '', + procInstId: '', + nodeState: '', + taskId: '', + finishTime: '', + asOldpartreturnList: [] }, imgList: [], dataList: [], @@ -328,23 +242,14 @@ size: 10, total: 0, params: { - "vinNo": "", - "goodsSkuCode": "", - "sourceBillNo": "", - "orgPath": "", + vinNo: '', + goodsSkuCode: '', + sourceBillNo: '', + orgPath: '' } }, rules: { - createTime: [{ - required: true, - message: '申请日期不能为空', - trigger: 'change' - }], - filePaths: [{ - required: true, - message: '附件不能为空', - trigger: 'blur' - }], + filePaths: [{ required: true, message: '附件不能为空', trigger: 'blur' }] } } }, @@ -366,8 +271,6 @@ this.dialogVisible = true }, saveOrUpdate() { - console.log('>>>>>>>>>saveOrUpdate', this.formobj) - this.$refs['form_obj'].validate((valid) => { if (valid) { this.submitdisabled = true @@ -389,7 +292,6 @@ }) }, submit() { - this.$refs['form_obj'].validate((valid) => { if (valid) { this.submitdisabled = true @@ -409,74 +311,57 @@ }) } }) - }, handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') this.imgList = [] this.formobj = { - "sid": "", - "remarks": "", - "createBySid": window.sessionStorage.getItem('userSid'), - "createByName": window.sessionStorage.getItem('name'), - "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage - .getItem('defaultOrgPath').lastIndexOf('/') + 1), - "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window - .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), - "createTime": getCurrentDate(), - "billNo": "", - "filePaths": [], - "useOrgSid": '', - "useOrgName": '', - "orgSidPath": window.sessionStorage.getItem('orgSidPath'), - "procDefId": "", - "nodeId": "", - "procInstId": "", - "nodeState": "", - "taskId": "", - "finishTime": "", - "asOldpartreturnList": [ - - ] + sid: '', + remarks: '', + createBySid: window.sessionStorage.getItem('userSid'), + createByName: window.sessionStorage.getItem('name'), + deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1), + deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), + createTime: getCurrentDate(), + billNo: '', + filePaths: [], + useOrgSid: '', + useOrgName: '', + orgSidPath: window.sessionStorage.getItem('orgSidPath'), + procDefId: '', + nodeId: '', + procInstId: '', + nodeState: '', + taskId: '', + finishTime: '', + asOldpartreturnList: [] } this.submitdisabled = false - this.isUpdata = false this.$emit('doback') }, - showAdd() { this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) - this.title = "【新增】" - this.isUpdata = false + this.title = '【新增】' }, showEdit(row) { this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) - this.title = "【修改】" - this.isUpdata = true - // var params = { - // sid: row.sid - // } - - req.init(row.sid) - .then(resp => { - if (resp.success) { - this.formobj = resp.data - - for (var i = 0; i < resp.data.filePaths.length; i++) { - this.imgList.push({ - url: resp.data.filePaths[i].url - }) - } - + this.title = '【修改】' + req.init(row.sid).then(resp => { + if (resp.success) { + this.formobj = resp.data + for (var i = 0; i < resp.data.filePaths.length; i++) { + this.imgList.push({ + url: resp.data.filePaths[i].url + }) } - }) - .catch(e => { - this.formobj = {} - }) + } + }).catch(e => { + this.formobj = {} + }) }, downLoadDetail() { const loading = this.$loading({ @@ -493,7 +378,7 @@ const fileName = '待出库旧件明细' + '.xls' const elink = document.createElement('a') elink.download = fileName - elink.style.display = 'nonde' + elink.style.display = 'none' elink.href = URL.createObjectURL(blob) document.body.appendChild(elink) elink.click() @@ -535,15 +420,11 @@ const _this = this _this.uploadResultMesssage = resp.msg _this.uploadSuccess = resp.success - if (resp.success) { - for (var i = 0; i < resp.data.length; i++) { this.formobj.asOldpartreturnList.push(resp.data[i]) } - } - }, handleConfirm() { if (!this.uploadSuccess) { @@ -560,178 +441,148 @@ console.log('backData》》》》', value) console.log('imgList', this.imgList) this.imgList = value - for (var i = 0; i < this.imgList.length; i++) { this.formobj.filePaths.push(this.imgList[i].url) } - - }, seleGoods(row) { this.itemInfo = row this.queryParams.params = { - "vinNo": row.vinNo, - "goodsSkuCode": row.goodsSkuCode, - "sourceBillNo": row.sourceBillNo, - "orgPath": window.sessionStorage.getItem('defaultOrgPath'), + vinNo: row.vinNo, + goodsSkuCode: row.goodsSkuCode, + sourceBillNo: row.sourceBillNo, + orgPath: window.sessionStorage.getItem('defaultOrgPath') } - req.getGoodsListPage(this.queryParams).then(resp => { - if (resp.success) { - const data = resp.data - this.queryParams.total = data.total - this.dataList = data.records - this.dialogVisible2 = true - } else { - // 根据resp.code进行异常情况处理 - this.dataList = [] - this.queryParams.total = 0 - } - - }) - .catch(e => {}) - - + if (resp.success) { + const data = resp.data + this.queryParams.total = data.total + this.dataList = data.records + this.dialogVisible2 = true + } else { + // 根据resp.code进行异常情况处理 + this.dataList = [] + this.queryParams.total = 0 + } + }).catch(e => { + }) }, delGoods(index) { - this.formobj.asOldpartreturnList.splice(index, 1) - }, selectionLineChangeHandle(val) { this.selectionList = val }, - addDialogList() { this.dialogVisible2 = false - if (this.selectionList.length > 0) { - const choose = this.formobj.asOldpartreturnList.filter((item) => item == this.itemInfo) - console.log('>>>>>>>>>addDialogList', choose) - var num = 0 if (choose != null && choose.length > 0) { - for (var i = 0; i < this.selectionList.length; i++) { - var item = this.selectionList[i] - num += Number(item.count) } choose[0].actualReturnCount = num - } - } - }, handleClose2() { this.dialogVisible2 = false }, seleGoods3() { this.queryParams.params = { - "vinNo": '', - "goodsSkuCode": '', - "sourceBillNo": '', - "orgPath": window.sessionStorage.getItem('defaultOrgPath'), + vinNo: '', + goodsSkuCode: '', + sourceBillNo: '', + orgPath: window.sessionStorage.getItem('defaultOrgPath') } req.getGoodsListPage(this.queryParams).then(resp => { - if (resp.success) { - const data = resp.data - this.queryParams.total = data.total - this.dataList = data.records - this.dialogVisible3 = true - } else { - // 根据resp.code进行异常情况处理 - this.dataList = [] - this.queryParams.total = 0 - } - - }) - .catch(e => {}) - - + if (resp.success) { + const data = resp.data + this.queryParams.total = data.total + this.dataList = data.records + this.dialogVisible3 = true + } else { + // 根据resp.code进行异常情况处理 + this.dataList = [] + this.queryParams.total = 0 + } + }).catch(e => { + }) }, selectionLineChangeHandle3(val) { this.selectionList3 = val }, - addDialogList3() { this.dialogVisible3 = false - for (var i = 0; i < this.selectionList3.length; i++) { - var item = this.selectionList3[i] - this.formobj.asOldpartreturnList.push({ - "sid": '', - "remarks": '', - "mainSid": '', - "vinNo": item.vinNo, - "goodsSpuSid": item.goodsSpuSid, - "goodsSpuName": item.goodsSpuName, - "goodsSkuSid": item.goodsSkuSid, - "goodsSkuTitle": item.goodsSkuTitle, - "goodsSkuCode": item.goodsSkuCode, - "goodsSkuOwnSpec": item.goodsSkuOwnSpec, - "manufacturerSid": item.manufacturerSid, - "manufacturerName": item.manufacturerName, - "warehouseSid": item.warehouseSid, - "warehouseName": item.warehouseName, - "warehouseAreaSid": item.warehouseAreaSid, - "warehouseAreaName": item.warehouseAreaName, - "warehouseRackSid": item.warehouseRackSid, - "warehouseRackName": item.warehouseRackName, - "unit": item.unit, - "sourceBillNo": item.sourceBillNo, - "claimBillNo": '', - "isCf": "是", - "needReturnCount": item.count, - "actualReturnCount": item.count + sid: '', + remarks: '', + mainSid: '', + vinNo: item.vinNo, + goodsSpuSid: item.goodsSpuSid, + goodsSpuName: item.goodsSpuName, + goodsSkuSid: item.goodsSkuSid, + goodsSkuTitle: item.goodsSkuTitle, + goodsSkuCode: item.goodsSkuCode, + goodsSkuOwnSpec: item.goodsSkuOwnSpec, + manufacturerSid: item.manufacturerSid, + manufacturerName: item.manufacturerName, + warehouseSid: item.warehouseSid, + warehouseName: item.warehouseName, + warehouseAreaSid: item.warehouseAreaSid, + warehouseAreaName: item.warehouseAreaName, + warehouseRackSid: item.warehouseRackSid, + warehouseRackName: item.warehouseRackName, + unit: item.unit, + sourceBillNo: item.sourceBillNo, + claimBillNo: '', + isCf: '是', + needReturnCount: item.count, + actualReturnCount: item.count }) } - - }, handleClose3() { this.dialogVisible3 = false - }, - + } } } diff --git a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue index db5cef2f15..f3a66f9ad8 100644 --- a/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue +++ b/yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryInfo.vue @@ -1,29 +1,14 @@ diff --git a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue index 19931755e0..774b1a5c81 100644 --- a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryDaiBan.vue @@ -31,35 +31,28 @@
备注
{{ formobj.remarks }} -
附件
- + -
-
商品列表
-
- - - - - - - - - - +
商品列表
+ + + + + + + + + + - @@ -92,8 +85,9 @@ 意见: - + + +
@@ -106,339 +100,335 @@ diff --git a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue index 4a1c1b1b74..2f92dbe6a9 100644 --- a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue +++ b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryEdit.vue @@ -29,35 +29,27 @@
备注
{{ formobj.remarks }} -
附件
- - + -
-
商品列表
-
- - - - - - - - - - +
商品列表
+ + + + + + + + + + -
@@ -65,145 +57,137 @@ diff --git a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue index 84a184044e..8752ecc0d9 100644 --- a/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/oldPartsFactoryFlow/oldPartsFactoryYiBan.vue @@ -28,35 +28,28 @@
备注
{{ formobj.remarks }} -
附件
- + -
-
商品列表
-
- - - - - - - - - - +
>商品列表
+ + + + + + + + + + - @@ -64,151 +57,143 @@ From 2bc81c834b573200957b8545d4be2e185b32474b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 24 Apr 2025 15:22:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A7=E4=BB=B6?= =?UTF-8?q?=E8=BF=94=E5=8E=82=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storage/manufacturerconfirm/index.vue | 663 ++++++------------ .../manufacturerconfirmAdd.vue | 317 ++++----- .../manufacturerconfirmInfo.vue | 175 ++--- 3 files changed, 398 insertions(+), 757 deletions(-) diff --git a/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue index 8cae1408af..352b2c5580 100644 --- a/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue +++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/index.vue @@ -1,7 +1,7 @@ diff --git a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue index da9afcb2fc..d9e5972f0a 100644 --- a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue +++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmAdd.vue @@ -1,30 +1,15 @@ diff --git a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue index 25e49a6d6d..e712eda997 100644 --- a/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue +++ b/yxt-as-ui/src/views/storage/manufacturerconfirm/manufacturerconfirmInfo.vue @@ -1,29 +1,14 @@