From 697538d2220f3ca911e9d1b32a8effd359c7e3bc Mon Sep 17 00:00:00 2001 From: bb_pan Date: Wed, 19 Mar 2025 14:46:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/businessHandling/index.vue | 16 ++++++++++++++++ .../business/businessHandlingRecord/index.vue | 2 +- src/views/material/archives/index.vue | 4 ++-- src/views/material/report/backReport.vue | 4 ++-- src/views/material/report/leaseOutReport.vue | 4 ++-- src/views/material/report/repairReport.vue | 4 ++-- src/views/material/report/scrapReport.vue | 4 ++-- .../material/report/testedInBoundReport.vue | 4 ++-- vue.config.js | 4 ++-- 9 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/views/business/businessHandling/index.vue b/src/views/business/businessHandling/index.vue index 3b25e1b2..b0405bc3 100644 --- a/src/views/business/businessHandling/index.vue +++ b/src/views/business/businessHandling/index.vue @@ -478,6 +478,9 @@ export default { message: '请上传委托书', trigger: 'change' } + ], + deviceType: [ + { required: true, message: '请选择类型规格', trigger: 'blur' } ] }, maTypeList: [], // 类型名称 @@ -542,6 +545,19 @@ export default { return this.maForm.bmFileInfos && this.maForm.bmFileInfos.length == 5 } }, + watch: { + equipmentList(newVal) { + if (newVal && newVal.length > 0) { + // 设备列表有值，设置deviceType为非必填 + this.rules.deviceType = [] + } else { + // 设备列表为空，设置deviceType为必填 + this.rules.deviceType = [{ required: true, message: '请选择类型规格', trigger: 'blur' }] + } + // 重置表单验证状态，避免旧的错误提示残留 + this.$refs.maForm.clearValidate('deviceType') + } + }, created() { // getCode() if (this.$route.query.type == 'edit') { diff --git a/src/views/business/businessHandlingRecord/index.vue b/src/views/business/businessHandlingRecord/index.vue index 87b24813..377d7600 100644 --- a/src/views/business/businessHandlingRecord/index.vue +++ b/src/views/business/businessHandlingRecord/index.vue @@ -256,7 +256,7 @@ 打 印 - 查看PDF + 取 消 diff --git a/src/views/material/archives/index.vue b/src/views/material/archives/index.vue index c9d0268d..4cf3cc6f 100644 --- a/src/views/material/archives/index.vue +++ b/src/views/material/archives/index.vue @@ -187,12 +187,12 @@ :action="upload.url" style="width: 100%;" :file-list="fileList" :on-success="handleSuccess" :on-error="handleError" :on-remove="handleFileRemove" :before-upload="beforeUpload" - accept=".rar,.zip" + accept="image/*,.pdf,.doc,.docx" >
将文件拖到此处，或点击上传
- 按住Ctrl可同时多选，支持上传rar/zip格式文件，单个文件不能超过5M + 按住Ctrl可同时多选，支持上传图、PDF、Word格式文件，单个文件不能超过5M
diff --git a/src/views/material/report/backReport.vue b/src/views/material/report/backReport.vue index 355ea212..e2a0d19c 100644 --- a/src/views/material/report/backReport.vue +++ b/src/views/material/report/backReport.vue @@ -4,8 +4,8 @@ diff --git a/src/views/material/report/leaseOutReport.vue b/src/views/material/report/leaseOutReport.vue index 6ebb1ec5..2cdcd16a 100644 --- a/src/views/material/report/leaseOutReport.vue +++ b/src/views/material/report/leaseOutReport.vue @@ -4,8 +4,8 @@ diff --git a/src/views/material/report/repairReport.vue b/src/views/material/report/repairReport.vue index 68ea6e1e..9a43c9e6 100644 --- a/src/views/material/report/repairReport.vue +++ b/src/views/material/report/repairReport.vue @@ -4,8 +4,8 @@ diff --git a/src/views/material/report/scrapReport.vue b/src/views/material/report/scrapReport.vue index f1f5b877..869c861e 100644 --- a/src/views/material/report/scrapReport.vue +++ b/src/views/material/report/scrapReport.vue @@ -4,8 +4,8 @@ diff --git a/src/views/material/report/testedInBoundReport.vue b/src/views/material/report/testedInBoundReport.vue index b2b24cbd..9fd270cc 100644 --- a/src/views/material/report/testedInBoundReport.vue +++ b/src/views/material/report/testedInBoundReport.vue @@ -4,8 +4,8 @@ diff --git a/vue.config.js b/vue.config.js index 7136c77f..cee0b504 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,13 +36,13 @@ module.exports = { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // target: `http://36.33.26.201:19988/prod-api`, - // target: `http://192.168.0.15:18080`,//马 + target: `http://192.168.0.96:18080`,//马 // target: `http://192.168.0.244:18580`,//测试 // target: `http://192.168.2.223:18080`,//山 // target: `http://192.168.2.23:18080`,//洪 // target: `http://192.168.0.234:18080`, //阮 // target: `http://192.168.137.1:18080`,// - target: `http://192.168.0.15:18080`, // 韩傲宇 + // target: `http://192.168.0.15:18080`, // 韩傲宇 // target: `http://192.168.0.60:18080`, // 赵福海 changeOrigin: true, pathRewrite: {