From a206ac34469aa9e32d7bd36db783f15c2e9b90d6 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期三, 13 三月 2024 10:57:25 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/system/work-order/index.vue | 100 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 91 insertions(+), 9 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index c476d51..2ead84c 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -16,7 +16,7 @@
@clear="handleQuery"
v-model="daterangeYwHandleTime"
style="width: 240px"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -59,7 +59,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['x:work-order:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -78,12 +77,15 @@
<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="ywResult" />
<el-table-column label="杩愮淮鎯呭喌" align="center" prop="ywCondition" width="150"/>
<el-table-column label="杩愮淮妫�娴嬬粨鏋�" align="center" prop="ywCheckResult" width="230"/>
+
<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">
@@ -99,25 +101,21 @@
size="mini"
type="text"
@click="handleAuditing(scope.row)"
- v-hasPermi="['x:work-order:remove']"
>瀹℃牳</el-button>
<el-button
size="mini"
type="text"
@click="handleYwCondition(scope.row)"
- v-hasPermi="['x:work-order:remove']"
>杩愮淮鎯呭喌</el-button>
<el-button
size="mini"
type="text"
@click="handleYwResult(scope.row)"
- v-hasPermi="['x:work-order:remove']"
>杩愮淮缁撴灉</el-button>
<el-button
size="mini"
type="text"
@click="handleCheckResult(scope.row)"
- v-hasPermi="['x:work-order:remove']"
>妫�娴嬬粨鏋�</el-button>
</template>
</el-table-column>
@@ -166,6 +164,34 @@
</el-form-item>
<el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
<el-input v-model="ywConditionForm.ywPeopleName" disabled />
+ </el-form-item>
+ <el-form-item label="鐜板満鍥剧墖" prop="picture">
+ <el-upload
+ class="avatar-uploader"
+ action="/dev-api/common/upload"
+ name="file"
+ :headers="{'Authorization': 'Bearer ' + getToken()}"
+ :on-success="pictureUploadSuccess"
+ :on-remove="pictureRemove"
+ :file-list="pictureList"
+ list-type="picture">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb</div>
+ </el-upload>
+ </el-form-item>
+ <el-form-item label="浣愯瘉鏉愭枡" prop="certificates">
+ <el-upload
+ class="avatar-uploader"
+ action="/dev-api/common/upload"
+ name="file"
+ :headers="{'Authorization': 'Bearer ' + getToken()}"
+ :on-success="certificateUploadSuccess"
+ :on-remove="certificateRemove"
+ :file-list="certificateList"
+ list-type="picture">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb</div>
+ </el-upload>
</el-form-item>
<el-form-item label="杩愮淮鎯呭喌" prop="ywCondition">
<el-input v-model="ywConditionForm.ywCondition" type="textarea" maxlength="150" show-word-limit/>
@@ -250,12 +276,14 @@
</template>
<script>
-import { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder } from "@/api/platform/work-order";
+import { listWorkOrder, getWorkOrder, delWorkOrder, addWorkOrder, updateWorkOrder,auditing, ywCondition } from "@/api/platform/work-order";
export default {
name: "Work-order",
data() {
return {
+ certificateList:[],
+ pictureList: [],
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -357,16 +385,56 @@
},
// 鎻愪氦瀹℃牳
submitAuditing() {
- // todo
+ this.$refs["auditingForm"].validate(valid => {
+ if (valid) {
+ auditing(this.auditingForm).then(res => {
+ this.auditingOpen = false;
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ })
+ }
+ })
},
// 鍙栨秷瀹℃牳
cancelAuditing() {
this.auditingForm = {};
this.auditingOpen = false;
},
+ pictureRemove(file, fileList) {
+ this.form.picture = null,
+
+ this.pictureList = this.pictureList.filter(item => item.name !== file.name)
+ },
+ certificateRemove(file, fileList) {
+ this.form.certificate = null,
+
+ this.certificateList = this.certificateList.filter(item => item.name !== file.name)
+ },
+ pictureUploadSuccess(response, file, fileList) {
+ this.form.picture = response.fileName,
+ this.pictureList.push({
+ name: response.originalFilename,
+ url: response.url,
+ fileName: response.fileName
+ })
+ },
+ certificateUploadSuccess(response, file, fileList) {
+ this.form.certificate = response.fileName,
+ this.certificateList.push({
+ name: response.originalFilename,
+ url: response.url,
+ fileName: response.fileName
+ })
+ },
// 鎻愪氦杩愮淮鎯呭喌
submitYwCondition() {
- // todo
+ this.$refs["ywConditionForm"].validate(valid => {
+ if (valid) {
+ ywCondition(this.ywConditionForm).then(res => {
+ this.ywConditionOpen = false;
+ this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ })
+ }
+ })
},
cancelYwCondition() {
this.ywConditionForm = {};
@@ -455,6 +523,20 @@
this.form = response.data;
this.open = true;
this.title = "淇敼杩愮淮宸ュ崟";
+ this.pictureList = JSON.parse(response.data.picture).map(item => {
+ return {
+ name: item,
+ url: process.env.VUE_APP_FILE_API + '/' + item,
+ fileName: item
+ }
+ })
+ this.certificateList = JSON.parse(row.certificate).map(item => {
+ return {
+ name: item,
+ url: process.env.VUE_APP_FILE_API + '/' + item,
+ fileName: item
+ }
+ })
});
},
/** 鎻愪氦鎸夐挳 */
--
Gitblit v1.8.0