From c18977b826b2a8bb5bb0c18e15030719da1ad19d Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 13 Nov 2025 14:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/claimAndRefund/receive.js | 4 +-
src/views/base/unit/index.vue | 2 -
.../auditing/component/EditPicking.vue | 22 +-
.../auditing/component/auditingPage1.vue | 7 +-
.../picking/auditing/component/home1.vue | 11 +-
.../claimAndreturn/picking/outbound/index.vue | 5 +
.../return/receive/component/home.vue | 2 +-
.../component/finishAndDetails.vue | 4 +-
.../cost/csotSettlement/repairCostList.vue | 740 ++++++++++++++++++
9 files changed, 772 insertions(+), 25 deletions(-)
create mode 100644 src/views/cost/csotSettlement/repairCostList.vue
diff --git a/src/api/claimAndRefund/receive.js b/src/api/claimAndRefund/receive.js
index 2c9f1ab..d9a57e1 100644
--- a/src/api/claimAndRefund/receive.js
+++ b/src/api/claimAndRefund/receive.js
@@ -395,7 +395,7 @@ export function getMaTypeDataById(data) {
url: '/material/select/getMaTypeDataById',
method: 'post',
headers: {
- repeatSubmit: false,
+ repeatSubmit: true,
},
data,
})
@@ -407,7 +407,7 @@ export function getMaTypeDataByIdTwo(data) {
url: '/material/select/getMaTypeDataByIdTwo',
method: 'post',
headers: {
- repeatSubmit: false,
+ repeatSubmit: true,
},
data,
})
diff --git a/src/views/base/unit/index.vue b/src/views/base/unit/index.vue
index 60f3276..f5762c6 100644
--- a/src/views/base/unit/index.vue
+++ b/src/views/base/unit/index.vue
@@ -68,9 +68,7 @@
v-loading="loading"
:data="typeList"
border
- @selection-change="handleSelectionChange"
>
-
{
+ getMaTypeDataById({ id: item.maTypeId }).then((res) => {
console.log('🚀 ~ this.leaseApplyDetails.forEach ~ res:', res)
this.$set(item, 'isReplaceOpt', res.data)
})
@@ -828,7 +828,8 @@ export default {
template.maTypeId = item.maTypeId
template.replaceTypeId = item.replaceTypeId
template.maModel = item.maModel
- template.levelTwoId = item.levelTwoId
+ template.leasePrice = item.leasePrice
+ template.isChange = item.isChange
return template
},
@@ -997,7 +998,7 @@ export default {
// this.queryParams.leaseApplyDetails = wholeTypeList
}
-
+ console.log("xxxxxxxxxxxx",params)
res = await editLeaseApply(params)
} else {
// console.log(this.queryParams)
@@ -1275,12 +1276,17 @@ export default {
},
// 以大代小
handleReplaceType(e, row) {
- console.log('🚀 ~ handleReplaceType ~ e:', e)
- console.log('🚀 ~ handleReplaceType ~ row:', row)
+ const objSmall = row.isReplaceOpt.find((item) => item.id == row.typeId)
const obj = row.isReplaceOpt.find((item) => item.id == e)
- console.log('🚀 ~ handleReplaceType ~ obj:', obj)
- row.leasePrice = obj.leasePrice
- row.maModel = obj.name
+ if(row.typeId != e){
+ row.leasePrice = objSmall.leasePrice
+ row.maModel = objSmall.name
+ row.isChange = 1
+ }else{
+ row.leasePrice = objSmall.leasePrice
+ row.maModel = objSmall.name
+ row.isChange = 0
+ }
}
},
}
diff --git a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
index 365af4b..78e701af 100644
--- a/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
+++ b/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
@@ -122,12 +122,7 @@
-->
-
+
diff --git a/src/views/claimAndreturn/picking/auditing/component/home1.vue b/src/views/claimAndreturn/picking/auditing/component/home1.vue
index 6335ed4..d5291d3 100644
--- a/src/views/claimAndreturn/picking/auditing/component/home1.vue
+++ b/src/views/claimAndreturn/picking/auditing/component/home1.vue
@@ -189,7 +189,7 @@
/>
-
+
领料单
@@ -252,9 +252,9 @@
{{
- scope.row.remark && scope.row.maModel
+ scope.row.remark && scope.row.replaceTypeName
? scope.row.remark + ', 以大代小'
- : scope.row.maModel
+ : scope.row.replaceTypeName
? '以大代小'
: scope.row.remark
}}
@@ -266,14 +266,15 @@
+
{{
- scope.row.remark && scope.row.maModel
+ scope.row.remark && scope.row.replaceTypeName
? scope.row.remark + ', 以大代小'
- : scope.row.maModel
+ : scope.row.replaceTypeName
? '以大代小'
: scope.row.remark
}}
diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue
index 0d4bc28..9f4802c 100644
--- a/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/src/views/claimAndreturn/picking/outbound/index.vue
@@ -530,6 +530,7 @@ import { equipmentTypeTree } from '@/api/store/tools'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import vueEasyPrint from 'vue-easy-print'
+import { replace } from 'lodash'
export default {
name: 'Outbound',
components: { Treeselect, vueEasyPrint },
@@ -896,6 +897,8 @@ export default {
this.$set(obj, 'outNum', row.outNum) //待出库数量
this.$set(obj, 'inputNum', row.outNum) //出库数量
this.$set(obj, 'num', row.num) //库存
+ this.$set(obj, 'replaceTypeId', row.replaceTypeId) //以大代小id
+ this.$set(obj, 'leasePrice', row.leasePrice) //租赁价
this.$set(obj, 'maModel', row.maModel) // 以大代小 规格
this.$set(obj, 'maName', row.maName) // 以大代小 类型
this.outNumList = [obj]
@@ -959,6 +962,8 @@ export default {
outNum: 1,
taskId: this.outObj.taskId,
leaseType: this.leaseType,
+ leasePrice: this.outObj.leasePrice,
+ replaceTypeId: this.outObj.replaceTypeId,
maModel: this.outObj.maModel,
maName: this.outObj.maName,
createTime: this.codeOutForm.createTime,
diff --git a/src/views/claimAndreturn/return/receive/component/home.vue b/src/views/claimAndreturn/return/receive/component/home.vue
index f8a5bcf..9f62dd9 100644
--- a/src/views/claimAndreturn/return/receive/component/home.vue
+++ b/src/views/claimAndreturn/return/receive/component/home.vue
@@ -138,7 +138,7 @@
-
+
diff --git a/src/views/cost/csotSettlement/component/finishAndDetails.vue b/src/views/cost/csotSettlement/component/finishAndDetails.vue
index 9c29c7c..7e546df 100644
--- a/src/views/cost/csotSettlement/component/finishAndDetails.vue
+++ b/src/views/cost/csotSettlement/component/finishAndDetails.vue
@@ -390,7 +390,9 @@ export default {
/** 全部导出 */
handleExportAll() {
for (let i = 1; i < 7; i++) {
- this.handleExport(i)
+ if(i != 3){
+ this.handleExport(i)
+ }
}
},
/** 单个导出 */
diff --git a/src/views/cost/csotSettlement/repairCostList.vue b/src/views/cost/csotSettlement/repairCostList.vue
new file mode 100644
index 0000000..58c3f4b
--- /dev/null
+++ b/src/views/cost/csotSettlement/repairCostList.vue
@@ -0,0 +1,740 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 模板下载
+ 模板上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+ 将文件拖到此处,或点击上传
+ 只能上传.xlsx文件
+
+
+
+
+
+
+
+