From 7f356bf22e4fe731e2b79ca3877e7c702eaf0704 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 03 四月 2024 14:25:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/index.vue | 243 ++++++++++++++++++++++++++++--------------------
1 files changed, 143 insertions(+), 100 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 0ebfc45..ad79c56 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -10,6 +10,12 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <el-form-item label="鏁呴殰绫诲瀷" prop="workOrderNo">
+ <el-select v-model="queryParams.errorType" placeholder="鏁呴殰绫诲瀷" clearable @clear="handleQuery">
+ <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐"></el-option>
+ <el-option label="璁惧閬楀け" value="璁惧閬楀け"></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="杩愮淮澶勭悊鏃堕棿">
<el-date-picker
clearable
@@ -29,105 +35,64 @@
</el-form-item>
</el-form>
- <el-row :gutter="10" class="mb8">
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="primary"-->
-<!-- plain-->
-<!-- icon="el-icon-plus"-->
-<!-- size="mini"-->
-<!-- @click="handleAdd"-->
-<!-- v-hasPermi="['x:work-order:add']"-->
-<!-- >鏂板</el-button>-->
-<!-- </el-col>-->
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="success"-->
-<!-- plain-->
-<!-- icon="el-icon-edit"-->
-<!-- size="mini"-->
-<!-- :disabled="single"-->
-<!-- @click="handleUpdate"-->
-<!-- v-hasPermi="['x:work-order:edit']"-->
-<!-- >淇敼</el-button>-->
-<!-- </el-col>-->
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- >鍒犻櫎</el-button>
+ <el-row>
+ <el-col :span="8" v-for="item in workOrderList" :key="item" style="width: 390px;margin-left: 40px;margin-top:20px;">
+ <el-card :body-style="{ padding: '0px' }">
+ <el-image :preview-src-list="['https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357']" fit="cover" src="https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357" class="image"/>
+ <div style="padding-right: 10px;padding-top: 10px;float: right;">
+ <el-row>
+ <el-col :span="24" class="time">鏁呴殰绫诲瀷锛�<el-tag size="small" type="danger">甯傛斂鏂藉伐</el-tag></el-col>
+ </el-row>
+ <el-row class="work-order-item">
+ <el-col class="time" :span="24">杩愮淮浜哄憳锛歿{ item.ywPeopleName }}</el-col>
+ </el-row>
+ <el-row class="work-order-item">
+ <el-col class="time" :span="24">杩愮淮鍗曚綅锛歿{ item.unitName }}</el-col>
+ </el-row>
+ <el-row class="work-order-item">
+ <el-col :span="24" class="time">宸ュ崟缂栧彿锛歿{ item.workOrderNo }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24" class="time">澶勭悊鏃堕棿锛歿{ item.ywHandleTime }}</el-col>
+ </el-row>
+ <el-row>
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleAuditing(item)"
+ v-hasPermi="['work:order:audit']"
+ >瀹℃牳</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleYwCondition(item)"
+ >杩愮淮鎯呭喌</el-button>
+ <!-- <el-button-->
+ <!-- size="mini"-->
+ <!-- type="text"-->
+ <!-- @click="handleYwResult(scope.row)"-->
+ <!-- >杩愮淮缁撴灉</el-button>-->
+<!-- <el-button-->
+<!-- size="mini"-->
+<!-- type="text"-->
+<!-- @click="handleCheckResult(item)"-->
+<!-- v-hasPermi="['work:order:result']"-->
+<!-- >妫�娴嬬粨鏋�</el-button>-->
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleFlow(item)"
+ >杩囩▼鍥�</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleReport(item)"
+ >浜嬪悗鎶ュ</el-button>
+ </el-row>
+ </div>
+ </el-card>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['x:work-order:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
-
- <el-table v-loading="loading" :data="workOrderList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="宸ュ崟鍙�" align="center" prop="workOrderNo" width="170"/>
- <el-table-column label="宸ュ崟鏉ユ簮" align="center" prop="source" width="170"/>
- <el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType" width="170"/>
- <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName" width="150"/>
- <el-table-column label="杩愮淮浜哄憳" align="center" prop="ywPeopleName" />
- <el-table-column label="杩愮淮澶勭悊鏃堕棿" align="center" prop="ywHandleTime" width="180"/>
- <el-table-column label="澶勭悊缁撴潫鏃堕棿" align="center" prop="ywHandleTime" width="180"/>
- <el-table-column label="杩愮淮缁撴灉" align="center" prop="ywResult" />
- <el-table-column label="杩愮淮鎯呭喌" align="center" prop="ywCondition" width="150"/>
- <el-table-column label="杩愮淮妫�娴嬬粨鏋�" align="center" prop="ywCheckResult" width="200"/>
- <el-table-column label="瀹℃牳閫氳繃鏃堕棿" align="center" prop="ywHandleTime" width="200"/>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180"/>
-
- <el-table-column label="鎿嶄綔" fixed="right" width="150" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- icon="el-icon-edit"-->
-<!-- @click="handleUpdate(scope.row)"-->
-<!-- v-hasPermi="['x:work-order:edit']"-->
-<!-- >淇敼</el-button>-->
- <el-button
- size="mini"
- type="text"
- @click="handleAuditing(scope.row)"
- v-hasPermi="['work:order:audit']"
- >瀹℃牳</el-button>
- <el-button
- size="mini"
- type="text"
- @click="handleYwCondition(scope.row)"
- >杩愮淮鎯呭喌</el-button>
-<!-- <el-button-->
-<!-- size="mini"-->
-<!-- type="text"-->
-<!-- @click="handleYwResult(scope.row)"-->
-<!-- >杩愮淮缁撴灉</el-button>-->
- <el-button
- size="mini"
- type="text"
- @click="handleCheckResult(scope.row)"
- v-hasPermi="['work:order:result']"
- >妫�娴嬬粨鏋�</el-button>
- <el-button
- size="mini"
- type="text"
- @click="handleFlow(scope.row)"
- >杩囩▼鍥�</el-button>
- </template>
- </el-table-column>
- </el-table>
<pagination
v-show="total>0"
@@ -136,6 +101,35 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
+
+ <!-- 浜嬪悗鎶ュ -->
+ <el-dialog title="浜嬪悗鎶ュ" :visible.sync="reportOpen" width="600px" append-to-body>
+ <el-form ref="reportForm" :model="reportForm" :rules="reportFormRules" label-width="80px">
+ <el-form-item label="鐐逛綅" prop="pointId">
+ <el-input v-model="reportForm.pointId" disabled />
+ </el-form-item>
+ <el-form-item label="鎶ュ绫诲瀷">
+ <el-input v-model="reportForm.reportType" disabled />
+ </el-form-item>
+ <el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
+ <el-select v-model="reportForm.errorType">
+ <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐"/>
+ <el-option label="璁惧鏁呴殰" value="璁惧鏁呴殰"/>
+ <el-option label="璁惧閬楀け" value="璁惧閬楀け"/>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎶ュ鍐呭" prop="reportContent">
+ <editor v-model="reportForm.reportContent" :min-height="192"/>
+ </el-form-item>
+ <el-form-item label="涓婃姤鏉愭枡" prop="reportMaterials">
+ <file-upload v-model="reportForm.reportMaterials"/>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitReportForm">鎻� 浜�</el-button>
+ <el-button @click="reportOpen = false">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
<el-dialog title="宸ュ崟瀹℃牳" :visible.sync="auditingOpen" width="500px" append-to-body>
<el-form ref="auditingForm" :model="auditingForm" :rules="auditingRules" label-width="80px">
@@ -233,7 +227,7 @@
</div>
</el-dialog>
- <el-dialog title="杩愮淮妫�娴嬬粨鏋�" :visible.sync="checkResultOpen" width="500px" append-to-body>
+ <el-dialog title="杩愮淮妫�娴嬬粨鏋�" :visible.sync="checkResultOpen" width="550px" append-to-body>
<el-form ref="ywResultForm" :model="checkResultForm" :rules="checkResultRules" label-width="120px">
<el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
<el-input v-model="checkResultForm.workOrderNo" disabled />
@@ -245,7 +239,7 @@
<el-input v-model="checkResultForm.ywPeopleName" disabled />
</el-form-item>
<el-form-item label="杩愮淮妫�娴嬬粨鏋�" prop="ywCheckResult">
- <el-input v-model="checkResultForm.ywCheckResult" type="textarea" maxlength="150" show-word-limit/>
+ <file-upload v-model="checkResultForm.ywCheckResult"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -255,7 +249,7 @@
</el-dialog>
<!-- 娣诲姞鎴栦慨鏀硅繍缁村伐鍗曞璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
<el-input v-model="form.workOrderNo" placeholder="璇疯緭鍏ュ伐鍗曞彿" />
@@ -421,6 +415,22 @@
},
data() {
return {
+ reportFormRules: {
+ reportContent: [
+ { required: true, message: "鎶ュ鍐呭涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ reportMaterials: [
+ { required: true, message: "涓婃姤鏉愭枡涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ },
+ reportOpen: false,
+ reportForm: {
+ reportType: "浜嬪悗鎶ュ",
+ pointId: "鐞间簬闀�3琛�1鍙锋憚鍍忓ご",
+ errorType: "",
+ reportContent: "",
+ reportMaterials: ""
+ },
// 杩囩▼鍥�
flowOpen: false,
flowForm: {},
@@ -505,6 +515,23 @@
this.getList();
},
methods: {
+ // 鎶ュ
+ submitReportForm() {
+ this.$refs["reportForm"].validate(valid => {
+ if (valid) {
+ addReport(this.form).then(response => {
+ this.$modal.msgSuccess("鎴愬姛鎻愪氦鎶ュ");
+ this.open = false;
+ this.getList();
+ });
+ }
+ });
+ },
+ // 浜嬪悗鎶ュ鎸夐挳
+ handleReport(row) {
+ this.reportForm.pointId = row.source;
+ this.reportOpen = true;
+ },
// 瀹℃牳鎸夐挳
handleAuditing(row) {
this.auditingForm = row;
@@ -725,3 +752,19 @@
}
};
</script>
+
+<style scoped>
+.work-order-item {
+ margin-bottom: 5px;
+}
+.time {
+ font-size: 13px;
+ color: #999;
+}
+
+.image {
+ width: 165px;
+ height: 150px;
+ padding: 10px;
+}
+</style>
--
Gitblit v1.8.0