diff --git a/src/components/LocalImageUpload/index.vue b/src/components/LocalImageUpload/index.vue
index 49fbffed..b7f80c9b 100644
--- a/src/components/LocalImageUpload/index.vue
+++ b/src/components/LocalImageUpload/index.vue
@@ -17,7 +17,7 @@
>
- 最多可上传{{this.limit}}张现场照片,允许上传的文件大小限制{{this.fileSize}}（MB）
+ 最多可上传{{this.maxFiles}}张现场照片,允许上传的文件大小限制{{this.fileSize}}（MB）
![]()
diff --git a/src/views/components/deviceRepairDialog/index.js b/src/views/components/deviceRepairDialog/index.js
index b8bb4d87..1b67606c 100644
--- a/src/views/components/deviceRepairDialog/index.js
+++ b/src/views/components/deviceRepairDialog/index.js
@@ -5,7 +5,14 @@ import {deviceRepairInfo} from "@/api/dev/deviceRepairApi";
export default {
name: "deviceRepairDialog",
- props: {repairId: {require: true}},
+ props: {
+ repairId:
+ { require: true },
+ disabledUp:
+ {required: false,
+ default: false,
+ type: Boolean},
+ },
data() {
return {
maxFiles: 3, // 允许同时上传的最大文件数
diff --git a/src/views/components/deviceRepairDialog/index.vue b/src/views/components/deviceRepairDialog/index.vue
index 7b682333..f99b305a 100644
--- a/src/views/components/deviceRepairDialog/index.vue
+++ b/src/views/components/deviceRepairDialog/index.vue
@@ -8,7 +8,7 @@
刷新
-
+
{{ info.id }}
{{
info.finishFlag ? '已完成' : '未完成'
@@ -43,7 +43,7 @@
:fileSizeLimit="this.fileSizeLimit"
:type="deptDeviceCheck"
:uploadedFileNames="info.livePath"
- :isShowTip="false"
+ :disabledUp="info.finishFlag || this.disabledUp"
@changeComponent1Data="component1DataChange"
>
@@ -51,8 +51,31 @@
{{ info.diagnosisInfo }}
+
+
+
-
+
+
+
+
+
diff --git a/src/views/dev/deviceInfo.vue b/src/views/dev/deviceInfo.vue
index 7d5561d5..504bbe7c 100644
--- a/src/views/dev/deviceInfo.vue
+++ b/src/views/dev/deviceInfo.vue
@@ -218,7 +218,7 @@
{{ item.ggxh }}
-
+
@@ -229,6 +229,19 @@
+
+
+
+
+
diff --git a/src/views/dev/deviceRepair.vue b/src/views/dev/deviceRepair.vue
index b7865bbb..6afb28cb 100644
--- a/src/views/dev/deviceRepair.vue
+++ b/src/views/dev/deviceRepair.vue
@@ -142,13 +142,24 @@
:uploadedFileNames="currentRow.livePath"
:isShowTip="false"
:disabledUp="true"
- @changeComponent1Data="component1DataChange"
>
{{ currentRow.diagnosisInfo }}
+
+
+
+
+
diff --git a/src/views/dev/deviceRepairApply.vue b/src/views/dev/deviceRepairApply.vue
index 39040589..5a7a735b 100644
--- a/src/views/dev/deviceRepairApply.vue
+++ b/src/views/dev/deviceRepairApply.vue
@@ -89,6 +89,7 @@
+
@@ -201,7 +202,7 @@
{{ item.productName }}
{{ item.ggxh }}
-
+
@@ -212,6 +213,19 @@
+
+
+
+
+
@@ -240,7 +254,8 @@
title="维修单信息"
width="80%"
>
-
+
+
diff --git a/src/views/dev/deviceRepairApplyHall.vue b/src/views/dev/deviceRepairApplyHall.vue
index 49deaaab..8b9f2a55 100644
--- a/src/views/dev/deviceRepairApplyHall.vue
+++ b/src/views/dev/deviceRepairApplyHall.vue
@@ -101,6 +101,7 @@
+
@@ -187,6 +188,17 @@
{{ detailData.description }}
+
+
+
@@ -238,6 +250,21 @@
maxlength="300" v-model.trim="diagnosisData.diagnosisInfo"/>
+
+
+
+
+
+
+
@@ -250,7 +277,7 @@
title="维修单信息"
width="80%"
>
-
+
diff --git a/src/views/dev/deviceRepairApplyMy.vue b/src/views/dev/deviceRepairApplyMy.vue
index 34bff5fb..10dc8419 100644
--- a/src/views/dev/deviceRepairApplyMy.vue
+++ b/src/views/dev/deviceRepairApplyMy.vue
@@ -92,6 +92,7 @@
+
diff --git a/src/views/dev/js/deviceInfo.js b/src/views/dev/js/deviceInfo.js
index 369e584d..c0d832b1 100644
--- a/src/views/dev/js/deviceInfo.js
+++ b/src/views/dev/js/deviceInfo.js
@@ -38,6 +38,10 @@ export default {
props: {isChoose: {required: false, default: false, type: Boolean}, chooseFunc: {required: false, type: Function}},
data() {
return {
+ maxFiles: 3, // 允许同时上传的最大文件数
+ fileSizeLimit: 5, // 允许上传的文件大小限制（MB）
+ uploadedFileNames: '', // 存储已上传文件名，逗号隔开
+
locDeptCode: null,
clickRow: null,
showSearch: true,
@@ -66,6 +70,13 @@ export default {
this.getDetailList()
},
methods: {
+ /**
+ * 父组件处理子组件发送的数据更改
+ * @param params
+ */
+ component1DataChange(params) {
+ this.uploadedFileNames = params;
+ },
downloadBase64Image,
tableRowClassName({row}) {
if (row.checked) return "warning-row";
@@ -76,6 +87,7 @@ export default {
this.$message.error("请选择一个设备！")
return
}
+ this.item.livePath = this.uploadedFileNames
this.chooseFunc(this.item)
},
handleChange(val) {
@@ -83,6 +95,7 @@ export default {
this.currentRow = val;
this.item = val;
this.multipleSelection = val
+ this.uploadedFileNames = val.livePath
},
genQR(row) {
genDeviceQR(row.deviceCode).then(res => {
diff --git a/src/views/dev/js/deviceRepairApply.js b/src/views/dev/js/deviceRepairApply.js
index 3a26c8fa..521232fe 100644
--- a/src/views/dev/js/deviceRepairApply.js
+++ b/src/views/dev/js/deviceRepairApply.js
@@ -37,6 +37,10 @@ export default {
},
data() {
return {
+ maxFiles: 3, // 允许同时上传的最大文件数
+ fileSizeLimit: 5, // 允许上传的文件大小限制（MB）
+ uploadedFileNames: '', // 存储已上传文件名，逗号隔开
+
showSearch: true,
loading: false,
total: .0,
diff --git a/src/views/dev/js/deviceRepairApplyHall.js b/src/views/dev/js/deviceRepairApplyHall.js
index 51a56fbf..45083a0b 100644
--- a/src/views/dev/js/deviceRepairApplyHall.js
+++ b/src/views/dev/js/deviceRepairApplyHall.js
@@ -33,6 +33,7 @@ let diagnosisData = {
repairUserName: '',
repairUserPhone: '',
diagnosisInfo: '',
+ diagnosisLivePath: '',
}
export default {
@@ -47,6 +48,10 @@ export default {
},
data() {
return {
+ maxFiles: 3, // 允许同时上传的最大文件数
+ fileSizeLimit: 5, // 允许上传的文件大小限制（MB）
+ uploadedFileNames: '', // 存储已上传文件名，逗号隔开
+
tabActive: 1,
showSearch: true,
loading: false,
@@ -114,6 +119,13 @@ export default {
this.getList()
},
methods: {
+ /**
+ * 父组件处理子组件发送的数据更改
+ * @param params
+ */
+ component1DataChange(params) {
+ this.uploadedFileNames = params;
+ },
repairInfo(row) {
this.repairId = row.repairId
},
@@ -122,6 +134,7 @@ export default {
if (!b) {
return
}
+ this.diagnosisData.diagnosisLivePath = this.uploadedFileNames
deviceRepairApplyDetailDiagnosis(this.diagnosisData).then(res => {
if (res.code != 20000) {
this.$message.error(res.message)
@@ -168,6 +181,7 @@ export default {
openDiagnosisDialog(row) {
this.detailFlag = true
this.detailData = _.cloneDeep(row)
+ this.uploadedFileNames = row.diagnosisLivePath
this.diagnosisData = _.cloneDeep({...diagnosisData, applyId: row.applyId, deviceCode: row.deviceCode})
},
confirm(row) {
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 2062f42d..7e379c14 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -180,6 +180,7 @@
:pId="pId"
:purType="1"
:codeArray="codeArray"
+ :attributeType="pageType==2?1:2"
>