diff --git a/src/views/claimAndreturn/return/receive/component/addReturn1.vue b/src/views/claimAndreturn/return/receive/component/addReturn1.vue
index 314f2d4..46718a5 100644
--- a/src/views/claimAndreturn/return/receive/component/addReturn1.vue
+++ b/src/views/claimAndreturn/return/receive/component/addReturn1.vue
@@ -226,14 +226,17 @@
-
+
+
+
diff --git a/src/views/repairTest/brokenExamine/index.vue b/src/views/repairTest/brokenExamine/index.vue
index 6a2fad1..59d90a0 100644
--- a/src/views/repairTest/brokenExamine/index.vue
+++ b/src/views/repairTest/brokenExamine/index.vue
@@ -176,7 +176,7 @@
size="mini"
type="text"
icon="el-icon-circle-check"
-
+ v-if="scope.row.taskStatus == 0"
@click="handleUpdate(scope.row, 'update')"
>审核
@@ -866,7 +866,7 @@ export default {
//图片查看
picturePreview(file) {
- this.dialogImageUrl = file.fileUrl;
+ this.dialogImageUrl = this.uploadUrl + file.fileUrl;
console.log("xxxxxxxxxx",this.dialogImageUrl)
const parts = file.fileName.split(".");
const extension = parts.pop();
diff --git a/src/views/repairTest/repair/index.vue b/src/views/repairTest/repair/index.vue
index 7ee6069..f222a07 100644
--- a/src/views/repairTest/repair/index.vue
+++ b/src/views/repairTest/repair/index.vue
@@ -814,6 +814,7 @@ export default {
},
data() {
return {
+ uploadUrl: process.env.VUE_APP_BASE_API + '/system', // 上传的图片服务器地址
deptList: [],
dicSelectList: [],
deptTypeList: [],
@@ -1336,7 +1337,7 @@ export default {
//图片查看
picturePreview(file) {
- this.dialogImageUrl = file.fileUrl;
+ this.dialogImageUrl = this.uploadUrl + file.fileUrl;
const parts = file.fileName.split(".");
const extension = parts.pop();
if (extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF') {
diff --git a/src/views/repairTest/testExamine/index.vue b/src/views/repairTest/testExamine/index.vue
index a9c929d..1a6ca3e 100644
--- a/src/views/repairTest/testExamine/index.vue
+++ b/src/views/repairTest/testExamine/index.vue
@@ -39,7 +39,8 @@
>
-
+
+
@@ -122,7 +123,12 @@
- 未通过
+ 维修驳回
+
+
+
+
+ 报废驳回
@@ -837,7 +843,7 @@ export default {
//图片查看
picturePreview(file) {
- this.dialogImageUrl = file.fileUrl;
+ this.dialogImageUrl = this.uploadUrl + file.fileUrl;
const parts = file.fileName.split(".");
const extension = parts.pop();
if (extension === 'doc' || extension === 'DOC' || extension === 'docx' || extension === 'DOCX' || extension === 'pdf' || extension === 'PDF') {
diff --git a/src/views/warehouseManage/machinery/warning/index.vue b/src/views/warehouseManage/machinery/warning/index.vue
index 43fbbf0..9417817 100644
--- a/src/views/warehouseManage/machinery/warning/index.vue
+++ b/src/views/warehouseManage/machinery/warning/index.vue
@@ -110,7 +110,7 @@
@click="resetQuery"
>重置
- 导出
+ > -->