From 76ab72d2d4f443060448e20bb74230a8040b85f5 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 05 十一月 2024 11:00:33 +0800
Subject: [PATCH] 文件上传大小、工单审核后刷新
---
src/api/platform/online-util.js | 1 +
src/views/system/user/profile/index.vue | 3 ++-
src/views/tool/online/index.vue | 6 +++---
src/components/FileUpload/index.vue | 2 +-
src/components/WorkOrder/WorkOrderAuditing.vue | 2 +-
src/views/system/work-order/index.vue | 8 ++++----
6 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/api/platform/online-util.js b/src/api/platform/online-util.js
index 8425020..42c11af 100644
--- a/src/api/platform/online-util.js
+++ b/src/api/platform/online-util.js
@@ -5,6 +5,7 @@
return request({
url: '/system/util/online',
method: 'get',
+ timeout: 30 * 1000,
params: query
})
}
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 415ae85..95ae3a6 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -58,7 +58,7 @@
// 澶у皬闄愬埗(MB)
fileSize: {
type: Number,
- default: 5,
+ default: 20,
},
// 鏂囦欢绫诲瀷, 渚嬪['png', 'jpg', 'jpeg']
fileType: {
diff --git a/src/components/WorkOrder/WorkOrderAuditing.vue b/src/components/WorkOrder/WorkOrderAuditing.vue
index dfcddaf..242ecb4 100644
--- a/src/components/WorkOrder/WorkOrderAuditing.vue
+++ b/src/components/WorkOrder/WorkOrderAuditing.vue
@@ -89,7 +89,7 @@
auditing(this.auditingForm).then(res => {
this.$emit('close', false);
this.$modal.msgSuccess('鎿嶄綔鎴愬姛')
- this.getList()
+ this.$emit('getList', false);
})
}
})
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 529c564..6c2319c 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -25,7 +25,8 @@
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />鎵�灞為儴闂�
- <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
+<!-- <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>-->
+ <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />鎵�灞炶鑹�
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 0ab129b..5e3453e 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -55,7 +55,7 @@
plain
size="mini"
@click="handleExport"
- v-hasPermi="['work:order:audit']"
+ v-hasPermi="['work:order:export']"
>瀵煎嚭
</el-button>
</el-col>
@@ -226,7 +226,7 @@
</div>
</el-dialog>
- <WorkOrderAuditing :auditingOpen="auditingOpen" :dataForm="auditingForm" :ywConditions="ywConditions" @close="closeAuditing"/>
+ <WorkOrderAuditing :auditingOpen="auditingOpen" :dataForm="auditingForm" :ywConditions="ywConditions" @close="closeAuditing" @getList="getList"/>
<!-- <el-dialog title="宸ュ崟瀹℃牳" :visible.sync="auditingOpen" width="1000px" append-to-body>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="10">-->
@@ -272,7 +272,7 @@
<!-- </el-dialog>-->
<el-dialog title="杩愮淮鎯呭喌璁板綍" :visible.sync="ywConditionOpen" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="ywConditionRules" label-width="80px">
+ <el-form ref="ywConditionForm" :model="form" :rules="ywConditionRules" label-width="80px">
<el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
<el-input v-model="ywConditionForm.workOrderNo" disabled/>
</el-form-item>
@@ -776,7 +776,7 @@
},
// 鎻愪氦杩愮淮鎯呭喌
submitYwCondition() {
- this.$refs['form'].validate(valid => {
+ this.$refs['ywConditionForm'].validate(valid => {
if (valid) {
ywCondition(this.form).then(res => {
this.ywConditionOpen = false
diff --git a/src/views/tool/online/index.vue b/src/views/tool/online/index.vue
index e397ba4..4ef3bda 100644
--- a/src/views/tool/online/index.vue
+++ b/src/views/tool/online/index.vue
@@ -7,15 +7,15 @@
<el-input v-model="form.serialNumber"/>
</el-form-item>
<el-form-item>
- <el-button @click="check" type="primary">妫�娴�</el-button>
+ <el-button @click="check" type="primary">妫�娴�</el-button>
</el-form-item>
</el-form>
- <div v-loading="loading" v-if="result.status">
+ <div v-loading="loading">
<div class="row">
<div>妫�娴嬬粨鏋滐細</div>
<div>{{ result.status }}</div>
</div>
- <div style="margin-top: 100px">
+ <div style="margin-top: 100px" v-if="result.status">
<div v-if="result.img">
<div>鍥剧墖锛�</div>
<div>
--
Gitblit v1.8.0