From 29f6836fca5aa76c034edf562208b5578fef7070 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期二, 26 三月 2024 15:06:14 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/system/work-order/index.vue | 183 ++++++++++++++++++++-------------------------
1 files changed, 80 insertions(+), 103 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index a40125e..a0f0a1f 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -29,108 +29,55 @@
</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="margin: 10px;width: 20%;">
+ <el-card :body-style="{ padding: '0px' }">
+ <img 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: 14px;">
+ <span>{{ item.unitName }}</span>
+ <span class="time">{{ item.ywPeopleName }}</span>
+ <div class="bottom clearfix">
+ <span style="font-size: 13px;">澶勭悊鏃堕棿</span>
+ <time class="time">{{ item.ywHandleTime }}</time>
+ </div>
+ <div class="bottom clearfix">
+ <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>
+ </div>
+ </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" width="170">
- <template slot-scope="scope">
- <el-tag>宸叉姤澶�(浜嬪墠)</el-tag>
- </template>
- </el-table-column>
- <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"
- @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>
- <el-button
- size="mini"
- type="text"
- @click="handleReport(scope.row)"
- >浜嬪悗鎶ュ</el-button>
- </template>
- </el-table-column>
- </el-table>
<pagination
v-show="total>0"
@@ -265,7 +212,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 />
@@ -277,7 +224,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">
@@ -287,7 +234,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="璇疯緭鍏ュ伐鍗曞彿" />
@@ -790,3 +737,33 @@
}
};
</script>
+
+<style scoped>
+
+.time {
+ font-size: 13px;
+ color: #999;
+ margin-left: 10px;
+}
+
+.bottom {
+ margin-top: 13px;
+ line-height: 12px;
+}
+
+
+.image {
+ width: 100%;
+ display: block;
+}
+
+.clearfix:before,
+.clearfix:after {
+ display: table;
+ content: "";
+}
+
+.clearfix:after {
+ clear: both
+}
+</style>
--
Gitblit v1.8.0