diff --git a/src/views/claimAndreturn/picking/auditing/component/EditPicking.vue b/src/views/claimAndreturn/picking/auditing/component/EditPicking.vue
index 11b8232..35eee80 100644
--- a/src/views/claimAndreturn/picking/auditing/component/EditPicking.vue
+++ b/src/views/claimAndreturn/picking/auditing/component/EditPicking.vue
@@ -1101,12 +1101,6 @@ export default {
// this.leaseApplyDetails = []
// }
},
- // 获取规格型号
- async getMaTypeDataByIdFun(val) {
- const res = await getMaTypeDataById({ id: val })
- this.typeListDev = res.data
- console.log('🚀 ~ getMaTypeDataByIdFun ~ res:', res)
- },
// 选择规格型号
changeType(e) {
// console.log('🚀 ~ changeType ~ e:', e)
diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue
index 9f4802c..e50d4fb 100644
--- a/src/views/claimAndreturn/picking/outbound/index.vue
+++ b/src/views/claimAndreturn/picking/outbound/index.vue
@@ -439,9 +439,9 @@
领料单位：{{ leaseOutData.unitName }}
- 出库时间：
+ 出库时间：{{ formattedOutTime(item.date) }}
-
{{formattedOutTime(item.date)
- }}
+ }} -->
@@ -708,10 +708,11 @@ export default {
const year = date.getFullYear();
const month = String(date.getMonth() + 1).padStart(2, '0');
const day = String(date.getDate()).padStart(2, '0');
- const hours = String(date.getHours()).padStart(2, '0');
- const minutes = String(date.getMinutes()).padStart(2, '0');
- const seconds = String(date.getSeconds()).padStart(2, '0');
- return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ // const hours = String(date.getHours()).padStart(2, '0');
+ // const minutes = String(date.getMinutes()).padStart(2, '0');
+ // const seconds = String(date.getSeconds()).padStart(2, '0');
+ // return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ return `${year}-${month}-${day}`
},
generateUUID() {
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
diff --git a/src/views/cost/csotSettlement/component/finishAndDetails.vue b/src/views/cost/csotSettlement/component/finishAndDetails.vue
index 7e546df..1814a51 100644
--- a/src/views/cost/csotSettlement/component/finishAndDetails.vue
+++ b/src/views/cost/csotSettlement/component/finishAndDetails.vue
@@ -45,7 +45,7 @@
v-if="settleTableData_03.length > 0"
@handelSaveSuccess="handelSaveSuccess"
/>
-
+ />
-
+
{{
constBear === 1 ? '费用承担方：01' : '费用承担方：03'
@@ -42,7 +42,7 @@
v-hasPermi="['cost:settlement:update']"
v-if="
isSettle == 0 &&
- (isCostBear || (isRepair && currRowInfo.isSlt == 0)) &&
+ (isCostBear) &&
tableData.length > 0
"
@click="handleEdit"
@@ -78,11 +78,11 @@
width="55"
align="center"
/>
-
+ /> -->
-
+
保存
模板下载
@@ -700,52 +700,52 @@ export default {
partAllCosts: (partNum * partPrice).toFixed(2),
}
- // 获取该项的层级路径
- const path = this.getParentsById(this.equipmentTypeList, item.typeId);
+ // // 获取该项的层级路径
+ // const path = this.getParentsById(this.equipmentTypeList, item.typeId);
- // 检查是否已存在相同typeId的项
+ // // 检查是否已存在相同typeId的项
let exists = false;
- let typeIdExistsInDeviceType = false;
+ // let typeIdExistsInDeviceType = false;
- // 检查设备列表中是否存在相同typeId
- for (let i = 0; i < this.equipmentList.length; i++) {
- if (this.equipmentList[i].typeId == item.typeId) {
- // 替换已存在的项
- this.equipmentList[i] = newItem;
- exists = true;
- break;
- }
- }
+ // // 检查设备列表中是否存在相同typeId
+ // for (let i = 0; i < this.equipmentList.length; i++) {
+ // if (this.equipmentList[i].typeId == item.typeId) {
+ // // 替换已存在的项
+ // this.equipmentList[i] = newItem;
+ // exists = true;
+ // break;
+ // }
+ // }
- // 检查deviceType中是否已包含该typeId
- if (path && path.length > 0) {
- const targetTypeId = path[path.length - 1]; // 最底层typeId
- for (let i = 0; i < this.deviceType.length; i++) {
- if (this.deviceType[i][this.deviceType[i].length - 1] === targetTypeId) {
- typeIdExistsInDeviceType = true;
- break;
- }
- }
- }
+ // // 检查deviceType中是否已包含该typeId
+ // if (path && path.length > 0) {
+ // const targetTypeId = path[path.length - 1]; // 最底层typeId
+ // for (let i = 0; i < this.deviceType.length; i++) {
+ // if (this.deviceType[i][this.deviceType[i].length - 1] === targetTypeId) {
+ // typeIdExistsInDeviceType = true;
+ // break;
+ // }
+ // }
+ // }
// 如果不存在，则添加新项
- if (!exists) {
+ // if (!exists) {
this.equipmentList.push(newItem);
// 获取新增项的层级路径并添加到deviceType
- if (path && !typeIdExistsInDeviceType) {
- this.deviceType.push(path);
- }
- } else if (path && !typeIdExistsInDeviceType) {
- // 如果是替换已有项，但deviceType中没有对应的typeId，则添加
- this.deviceType.push(path);
- }
+ // if (path && !typeIdExistsInDeviceType) {
+ // this.deviceType.push(path);
+ // }
+ // } else if (path && !typeIdExistsInDeviceType) {
+ // // 如果是替换已有项，但deviceType中没有对应的typeId，则添加
+ // this.deviceType.push(path);
+ // }
// 强制更新propsKey以触发级联选择器重新渲染
- this.propsKey++;
+ // this.propsKey++;
})
} else {
- this.$message.error('文件上传失败');
+ this.$message.error(response.msg);
}
},
// 计算配件总价