From c842728cb2b4c74d5213360da344ebda01da328f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 17 七月 2024 11:29:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/index.vue | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index acce881..64d5232 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -200,8 +200,8 @@
<el-dialog title="杩愮淮鎵归噺瀹℃牳" :visible.sync="batchAuditingVisible" width="500px" append-to-body>
<el-form ref="batchAuditingWorkOrder" :model="batchAuditingWorkOrder" label-width="80px" :rules="batchAuditingRules">
<el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
- <el-select v-model="batchAuditingWorkOrder.errorType" placeholder="鏁呴殰绫诲瀷">
- <el-option v-for="item, index in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+ <el-select v-model="batchAuditingWorkOrder.errorTypes" multiple placeholder="鏁呴殰绫诲瀷">
+ <el-option v-for="(item, index) in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="瀹℃牳璇存槑" prop="auditingRemark">
@@ -209,8 +209,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="batchAuditing('AUDITING_SUCCESS')">瀹� 鏍�</el-button>
- <el-button type="danger" @click="batchAuditing('AUDITING_FAIL')">椹� 鍥�</el-button>
+ <el-button type="primary" @click="batchAuditing('AUDITING_SUCCESS')" size="small">閫� 杩�</el-button>
+ <el-button type="danger" @click="batchAuditing('AUDITING_FAIL')" size="small">椹� 鍥�</el-button>
</div>
</el-dialog>
@@ -246,10 +246,9 @@
<div class="y-item-1">
<div class="flow-item-x">
鐜板満鎯呭喌锛�
- <div v-html="item.ywCondition"></div>
-<!-- <el-tooltip class="item" effect="dark" :content="item.ywCondition" placement="top">-->
-<!-- <el-tag size="small" class="line-limit-length">{{ item.ywCondition }}</el-tag>-->
-<!-- </el-tooltip>-->
+ <!-- <el-tooltip class="item" effect="dark" :content="item.ywCondition" placement="top"> -->
+ <span v-html="item.ywCondition"></span>
+ <!-- </el-tooltip> -->
</div>
<!-- <div class="flow-item-x">
<el-tag size="small" v-for="file in item.ywProofMaterials != null ? item.ywProofMaterials.split(',') : item.ywProofMaterials" :key="file" @click="handleDownload(file)">{{ file.substring(file.lastIndexOf("/") + 1) }}</el-tag>
@@ -260,7 +259,7 @@
{{ parseTime(item.createTime) }}
</div>
<div >
- 绗嚑娆★細{{ index + 1 }}
+ 绗瑊{ index + 1 }}娆�
</div>
</div>
</div>
@@ -274,7 +273,7 @@
瀹℃牳缁撴灉锛�<el-tag :type="item.result == '瀹℃牳閫氳繃' ? 'success' : 'danger'" size="small">{{ item.result }}</el-tag>
</div>
<div class="flow-item-x">
- 瀹℃牳璇存槑锛�<el-tag size="small" v-if="item.remark">{{ item.remark }}</el-tag>
+ 瀹℃牳璇存槑锛�<span v-html="item.remark"></span>
</div>
</div>
<div class="y-item-2">
@@ -282,7 +281,7 @@
{{ parseTime(item.createTime) }}
</div>
<div >
- 绗嚑娆★細{{ index + 1 }}
+ 绗瑊{ index + 1 }}娆�
</div>
</div>
</div>
@@ -326,7 +325,11 @@
errorTypeOptions: [],
ywConditions: [],
batchAuditingVisible: false,
- batchAuditingWorkOrder: {},
+ batchAuditingWorkOrder: {
+ errorTypes: [],
+ auditingRemark: '',
+ auditingResult: ''
+ },
ywHandleList: [],
ywAuditingList: [],
reportFormRules: {
@@ -426,8 +429,8 @@
},
// 鎵归噺瀹℃牳鏍￠獙
batchAuditingRules: {
- errorType: [
- { required: true, message: "璇烽�夋嫨鏁呴殰绫诲瀷", trigger: "blur" }
+ errorTypes: [
+ { required: true, message: "璇烽�夋嫨鏁呴殰绫诲瀷", trigger: "change" }
],
}
};
--
Gitblit v1.8.0