From b9346c0dad8727fce46482c5ed29009717a902d0 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 25 九月 2024 14:20:39 +0800
Subject: [PATCH] 标线调整
---
src/views/system/work-order/index.vue | 109 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 63 insertions(+), 46 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 23a5fff..d27bd64 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -24,6 +24,16 @@
<el-option label="瀹℃牳鏈�氳繃" value="AUDITING_FAIL"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鏃堕棿鑼冨洿" prop="timeRange">
+ <el-date-picker
+ v-model="queryParams.timeRange"
+ type="daterange"
+ range-separator="鑷�"
+ value-format="yyyy-MM-dd"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
@@ -88,7 +98,7 @@
<el-col :span="24" class="time">鏁呴殰鏃堕棿锛歿{ item.createTime }}</el-col>
</el-row>
<el-row class="work-order-item">
- <el-col class="time" :span="24"><div>鏁呴殰鐐逛綅锛�</div><div>{{ item.source }}</div></el-col>
+ <el-col class="time" :span="24"><div>鍥芥爣鐮侊細{{ item.serialNumber }}</div><div>{{ item.source }}</div></el-col>
</el-row>
<el-row style="position: absolute;bottom: 10px">
<el-button
@@ -193,49 +203,50 @@
</div>
</el-dialog>
- <el-dialog title="宸ュ崟瀹℃牳" :visible.sync="auditingOpen" width="1000px" append-to-body>
- <el-row :gutter="20">
- <el-col :span="10">
- <el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="80px">
- <el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
- <el-input v-model="auditingForm.workOrderNo" disabled/>
- </el-form-item>
- <el-form-item label="杩愮淮鍗曚綅" prop="unitName">
- <el-input v-model="auditingForm.unitName" disabled/>
- </el-form-item>
- <el-form-item label="瀹℃牳缁撴灉" prop="auditingResult">
- <el-radio v-model="auditingForm.auditingResult" label="AUDITING_SUCCESS">閫氳繃</el-radio>
- <el-radio v-model="auditingForm.auditingResult" label="AUDITING_FAIL">椹冲洖</el-radio>
- </el-form-item>
- <el-form-item label="瀹℃牳澶囨敞" prop="auditingRemark">
- <el-input v-model="auditingForm.auditingRemark" type="textarea" maxlength="30" show-word-limit/>
- </el-form-item>
- </el-form>
- </el-col>
- <el-col :span="14" style="max-height: 500px; overflow-y: auto">
- <el-timeline v-if="ywConditions && ywConditions.length > 0">
- <el-timeline-item v-for="(condition, index) in ywConditions" :key="index"
- :timestamp="condition.commitUserName + '___' + condition.createTime" placement="top"
- >
- <el-card>
- <div v-html="condition.ywCondition"></div>
- <el-link type="primary"
- v-for="item in condition.ywProofMaterials != null ? condition.ywProofMaterials.split(',') : condition.ywProofMaterials"
- :underline="false" :key="item.id" @click="handleDownload(item)"
- >{{ item.substring(item.lastIndexOf('/') + 1) }}
- </el-link>
- </el-card>
- </el-timeline-item>
- </el-timeline>
- <el-empty v-else description="娌℃湁澶勭悊璁板綍"></el-empty>
- </el-col>
- </el-row>
+ <WorkOrderAuditing :auditingOpen="auditingOpen" :dataForm="auditingForm" :ywConditions="ywConditions" @close="closeAuditing"/>
+<!-- <el-dialog title="宸ュ崟瀹℃牳" :visible.sync="auditingOpen" width="1000px" append-to-body>-->
+<!-- <el-row :gutter="20">-->
+<!-- <el-col :span="10">-->
+<!-- <el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="80px">-->
+<!-- <el-form-item label="宸ュ崟鍙�" prop="workOrderNo">-->
+<!-- <el-input v-model="auditingForm.workOrderNo" disabled/>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="杩愮淮鍗曚綅" prop="unitName">-->
+<!-- <el-input v-model="auditingForm.unitName" disabled/>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="瀹℃牳缁撴灉" prop="auditingResult">-->
+<!-- <el-radio v-model="auditingForm.auditingResult" label="AUDITING_SUCCESS">閫氳繃</el-radio>-->
+<!-- <el-radio v-model="auditingForm.auditingResult" label="AUDITING_FAIL">椹冲洖</el-radio>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="瀹℃牳澶囨敞" prop="auditingRemark">-->
+<!-- <el-input v-model="auditingForm.auditingRemark" type="textarea" maxlength="30" show-word-limit/>-->
+<!-- </el-form-item>-->
+<!-- </el-form>-->
+<!-- </el-col>-->
+<!-- <el-col :span="14" style="max-height: 500px; overflow-y: auto">-->
+<!-- <el-timeline v-if="ywConditions && ywConditions.length > 0">-->
+<!-- <el-timeline-item v-for="(condition, index) in ywConditions" :key="index"-->
+<!-- :timestamp="condition.commitUserName + '___' + condition.createTime" placement="top"-->
+<!-- >-->
+<!-- <el-card>-->
+<!-- <div v-html="condition.ywCondition"></div>-->
+<!-- <el-link type="primary"-->
+<!-- v-for="item in condition.ywProofMaterials != null ? condition.ywProofMaterials.split(',') : condition.ywProofMaterials"-->
+<!-- :underline="false" :key="item.id" @click="handleDownload(item)"-->
+<!-- >{{ item.substring(item.lastIndexOf('/') + 1) }}-->
+<!-- </el-link>-->
+<!-- </el-card>-->
+<!-- </el-timeline-item>-->
+<!-- </el-timeline>-->
+<!-- <el-empty v-else description="娌℃湁澶勭悊璁板綍"></el-empty>-->
+<!-- </el-col>-->
+<!-- </el-row>-->
- <div slot="footer" class="dialog-footer">
- <el-button @click="cancelAuditing">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitAuditing">瀹� 鏍�</el-button>
- </div>
- </el-dialog>
+<!-- <div slot="footer" class="dialog-footer">-->
+<!-- <el-button @click="cancelAuditing">鍙� 娑�</el-button>-->
+<!-- <el-button type="primary" @click="submitAuditing">瀹� 鏍�</el-button>-->
+<!-- </div>-->
+<!-- </el-dialog>-->
<el-dialog title="杩愮淮鎯呭喌璁板綍" :visible.sync="ywConditionOpen" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="ywConditionRules" label-width="80px">
@@ -452,11 +463,12 @@
process
} from '@/api/platform/work-order'
import { addReport } from '@/api/platform/report'
+import WorkOrderAuditing from "@/components/WorkOrder/WorkOrderAuditing";
export default {
name: 'Work-order',
dicts: ['error_type', 'report_error_type'],
- components: {},
+ components: {WorkOrderAuditing},
data() {
return {
drawer: false,
@@ -587,6 +599,9 @@
this.getList()
},
methods: {
+ closeAuditing() {
+ this.auditingOpen = false
+ },
getTitle1() {
return '浜х敓宸ュ崟' + (this.beforeReportMsg ? '(' + this.beforeReportMsg + ')' : '')
},
@@ -764,8 +779,10 @@
this.empty = false;
this.loading = true
this.queryParams.params = {}
- this.queryParams['start'] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[0] : null
- this.queryParams['end'] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[1] : null
+ if (this.queryParams.timeRange && this.queryParams.timeRange.length > 0) {
+ this.queryParams.start = this.queryParams.timeRange[0]
+ this.queryParams.end = this.queryParams.timeRange[1]
+ }
listWorkOrder(this.queryParams).then(response => {
response.data.forEach(item => {
--
Gitblit v1.8.0