- 接收抱杆类型：{{ dialogData.typeName }}，型号：{{
- dialogData.typeCode
- }}，付数：{{ returnNum }}。接收明细如下
+ 接收抱杆类型：{{ dialogData.typeName }}，型号：{{ dialogData.typeCode }}，付数：{{ returnNum }}。接收明细如下
-
+
保存
@@ -443,40 +327,15 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-->
-
+
保存
-
-
-
-
+
+
+
+
+
+
+ 点击上传
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -636,6 +508,8 @@ import { equipmentTypeTree } from '@/api/store/tools'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { getInfo } from '@/api/login'
+import { getToken } from '@/utils/auth'
+
export default {
// name: "returnInDetail",
components: { Treeselect },
@@ -655,6 +529,10 @@ export default {
},
data() {
return {
+ uploadUrl: process.env.VUE_APP_BASE_API + '/system/sys/file/upload', // 上传的图片服务器地址
+ headers: {
+ Authorization: 'Bearer ' + getToken(),
+ },
createBy: '', //用户名
// 遮罩层
loading: false,
@@ -756,15 +634,10 @@ export default {
item.children.forEach((item2, index2) => {
if (item2.children && item2.children.length > 0) {
item2.children.forEach((item3) => {
- if (
- item3.children &&
- item3.children.length > 0
- ) {
+ if (item3.children && item3.children.length > 0) {
item3.children.forEach((item4) => {
- item4.machineTypeName =
- item3.typeName
- item4.specificationType =
- item4.typeName
+ item4.machineTypeName = item3.typeName
+ item4.specificationType = item4.typeName
this.$set(item4, 'purchasePrice', 0)
this.$set(item4, 'purchaseNum', 1)
})
@@ -824,38 +697,39 @@ export default {
this.$confirm('该操作后进行退料的数据之后无法再次修改和删除，是否确认？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
- type: 'warning'
- }).then(async () => {
- let param1 = {
- parentId: this.queryParams.id,
- }
- const res1 = await getRecord(param1)
- if (res1.code == 200) {
- let param = {
- createBy: this.createBy,
+ type: 'warning',
+ })
+ .then(async () => {
+ let param1 = {
parentId: this.queryParams.id,
- taskId: this.queryParams.taskId,
}
- endBack(param).then((response) => {
- if (response.code == 200) {
- this.$modal.msgSuccess('操作成功')
- // this.back()
- this.$emit('goBackPage')
+ const res1 = await getRecord(param1)
+ if (res1.code == 200) {
+ let param = {
+ createBy: this.createBy,
+ parentId: this.queryParams.id,
+ taskId: this.queryParams.taskId,
}
- })
- }
- }).catch(() => {
- // this.$message({
- // type: 'info',
- // message: '已取消操作'
- // });
- });
+ endBack(param).then((response) => {
+ if (response.code == 200) {
+ this.$modal.msgSuccess('操作成功')
+ // this.back()
+ this.$emit('goBackPage')
+ }
+ })
+ }
+ })
+ .catch(() => {
+ // this.$message({
+ // type: 'info',
+ // message: '已取消操作'
+ // });
+ })
// let param1 = {
// parentId: this.queryParams.id,
// }
-
// const res1 = await getRecord(param1)
// if (res1.code == 200) {
// let param = {
@@ -889,6 +763,14 @@ export default {
item.qualifiedNum = item.hgNum
item.serviceNum = item.wxNum
item.scrapNum = item.bfNum
+ // item.serviceRemark = item.wxRemark
+ // item.scrapRemark = item.bfRemark
+ // item.scrapReason = item.bfReason
+ // item.fileList = item.fileList
+ item.fileList?.forEach((item2) => {
+ item2.url = item2.fileUrl
+ item2.name = item2.fileName
+ })
// if (item.backStatus == '1') {
// item.qualifiedNum = item.backNum
// item.serviceNum = 0
@@ -918,9 +800,7 @@ export default {
this.handleCodeQuery()
} else if (row.manageType == '2') {
this.handleNumReturn(row)
- const modelIdsJoined = row.maTypeDetails
- .map((item) => item.modelId)
- .join(',')
+ const modelIdsJoined = row.maTypeDetails.map((item) => item.modelId).join(',')
let param = {
parentId: row.id,
typeId: modelIdsJoined,
@@ -932,9 +812,7 @@ export default {
this.openNum = true
this.dialogIsView = true
this.dialogData.maTypeDetails.map((itemA) => {
- const matchingItemB = res.data.rows.find(
- (itemB) => itemA.modelId === itemB.modelId,
- )
+ const matchingItemB = res.data.rows.find((itemB) => itemA.modelId === itemB.modelId)
if (matchingItemB) {
// switch (matchingItemB.backStatus) {
// case '1':
@@ -982,6 +860,10 @@ export default {
this.$set(item, 'qualifiedNum', undefined)
this.$set(item, 'serviceNum', undefined)
this.$set(item, 'scrapNum', undefined)
+ this.$set(item, 'serviceRemark', undefined)
+ this.$set(item, 'scrapRemark', undefined)
+ this.$set(item, 'fileList', [])
+ this.$set(item, 'scrapReason', undefined)
})
this.dialogData.maTypeDetails = row.maTypeDetails
}
@@ -1029,6 +911,12 @@ export default {
getBackMachine(this.codeQuery).then((response) => {
this.codeList = response.data.rows
this.codeTotal = response.data.total
+ this.codeList.forEach((item) => {
+ this.$set(item, 'fileList', [])
+ this.$set(item, 'serviceRemark', '')
+ this.$set(item, 'scrapRemark', '')
+ this.$set(item, 'scrapReason', '')
+ })
})
},
//获取退料编码查看列表
@@ -1047,6 +935,10 @@ export default {
if (item.backStatus == '3') {
item.maStatus = '报废'
}
+ item.fileList?.forEach((item) => {
+ item.url = item.filePath
+ item.name = item.fileName
+ })
})
this.codeTotal = response.data.total
})
@@ -1064,10 +956,7 @@ export default {
}
let arr = []
for (const item of data) {
- let sumUnmber =
- (item.qualifiedNum || 0) +
- (item.serviceNum || 0) +
- (item.scrapNum || 0)
+ let sumUnmber = (item.qualifiedNum || 0) + (item.serviceNum || 0) + (item.scrapNum || 0)
if (sumUnmber > item.partNum && sumUnmber > item.num) {
this.$modal.msgError('退料总量已大于待退料数量！')
return
@@ -1080,6 +969,9 @@ export default {
createBy: this.createBy,
backStatus: 1,
backNum: item.qualifiedNum,
+ serviceRemark: item.serviceRemark,
+ scrapRemark: item.scrapRemark,
+ fileList: item.fileList,
}
arr.push(obj)
}
@@ -1091,6 +983,9 @@ export default {
createBy: this.createBy,
backStatus: 2,
backNum: item.serviceNum,
+ serviceRemark: item.serviceRemark,
+ scrapRemark: item.scrapRemark,
+ fileList: item.fileList,
}
arr.push(obj)
}
@@ -1102,6 +997,9 @@ export default {
createBy: this.createBy,
backStatus: 3,
backNum: item.scrapNum,
+ serviceRemark: item.serviceRemark,
+ scrapRemark: item.scrapRemark,
+ fileList: item.fileList,
}
arr.push(obj)
}
@@ -1133,6 +1031,10 @@ export default {
manageType: 0,
createBy: this.createBy,
maId: row.maId,
+ scrapReason: row.scrapReason,
+ scrapRemark: row.scrapRemark,
+ serviceRemark: row.serviceRemark,
+ fileList: row.fileList,
},
]
let param = {
@@ -1171,6 +1073,10 @@ export default {
manageType: 0,
createBy: this.createBy,
maId: item.maId,
+ scrapReason: item.scrapReason,
+ scrapRemark: item.scrapRemark,
+ serviceRemark: item.serviceRemark,
+ fileList: item.fileList,
}
})
let param = {
@@ -1182,14 +1088,59 @@ export default {
if (response.code == 200) {
this.$modal.msgSuccess('操作成功')
// this.openCode = false;
- this.returnNum =
- Number(this.returnNum) - this.codeSelectList.length
+ this.returnNum = Number(this.returnNum) - this.codeSelectList.length
this.handleCodeQuery()
this.handleQuery()
}
})
}
},
+ handleRemove(file, fileList, row) {
+ console.log(file, fileList)
+ console.log('🚀 ~ handleRemove ~ row:', row)
+ row.fileList = fileList.map((item) => {
+ let fileName = ''
+ let fileUrl = ''
+ if (item.response) {
+ fileName = item.response.data.fileName
+ fileUrl = item.response.data.fileUrl
+ } else {
+ fileName = item.fileName
+ fileUrl = item.fileUrl
+ }
+ return {
+ fileName: fileName,
+ fileUrl: fileUrl,
+ }
+ })
+ console.log('🚀 ~ handleRemove ~ row.fileList:', row.fileList)
+ },
+ handlePreview(file) {
+ console.log('🚀 ~ handlePreview ~ file:', file)
+ // if (file.response) {
+ // window.open(file.response.data.fileUrl)
+ // } else {
+ // window.open(file.fileUrl)
+ // }
+ },
+ handleExceed(files, fileList) {
+ this.$message.warning(
+ `当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`,
+ )
+ },
+ beforeRemove(file, fileList) {
+ return this.$confirm(`确定移除 ${file.name} ？`)
+ },
+ handleSuccess(file, fileList, row) {
+ console.log(file, fileList, row)
+ row.fileList = fileList.map((item) => {
+ return {
+ fileName: item.response?.data.fileName,
+ fileUrl: item.response?.data.fileUrl,
+ }
+ })
+ console.log('🚀 ~ row.fileList=fileList.map ~ row.fileList:', row.fileList)
+ },
},
}
diff --git a/src/views/repairTest/repair/dialogOneForm.vue b/src/views/repairTest/repair/dialogOneForm.vue
index 9e3e2d3..c424ec3 100644
--- a/src/views/repairTest/repair/dialogOneForm.vue
+++ b/src/views/repairTest/repair/dialogOneForm.vue
@@ -60,7 +60,7 @@
/>
-
+