From e2369c372bda536bd9e81b92cff56ceeb423cb36 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 15 四月 2024 09:15:01 +0800
Subject: [PATCH] 工单审核添加材料
---
src/views/system/result/index.vue | 4
src/views/system/result/detail/detail.vue | 6 --
src/views/system/calculate/report/index.vue | 5 +
src/views/system/work-order/index.vue | 128 +++++-------------------------------------
4 files changed, 22 insertions(+), 121 deletions(-)
diff --git a/src/views/system/calculate/report/index.vue b/src/views/system/calculate/report/index.vue
index f586a94..3dab356 100644
--- a/src/views/system/calculate/report/index.vue
+++ b/src/views/system/calculate/report/index.vue
@@ -146,6 +146,7 @@
:precision="2" :step="0.1"
:min="0" :max="1000000"
v-model="scope.row.money"
+ disabled
placeholder="璇疯緭鍏ユ墸鍑忛噾棰�">
</el-input>
</template>
@@ -187,14 +188,14 @@
score: '94',
value: '1%',
ruleName: '<95',
- money: '',
+ money: '10',
description: '姣忓皯1鍒嗘墸褰撴湀鎬绘湇鍔¤垂鐨�1%銆備緥濡傦細褰撴湀鑰冩牳寰楀垎91.5鍒嗭紝鎵ｉ櫎褰撴湀鏈嶅姟璐�3.5%鐨勯噾棰�',
}, {
time: '2024-04-03',
score: '95',
value: '0',
ruleName: '鈮�95',
- money: '',
+ money: '0',
description: '涓嶆墸娆�',
}, ],
manualScoreOpen: false,
diff --git a/src/views/system/result/detail/detail.vue b/src/views/system/result/detail/detail.vue
index 58b1544..d6f25ac 100644
--- a/src/views/system/result/detail/detail.vue
+++ b/src/views/system/result/detail/detail.vue
@@ -18,12 +18,6 @@
icon="el-icon-edit"
@click="handleRuleUpdate(scope.row)"
>淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
diff --git a/src/views/system/result/index.vue b/src/views/system/result/index.vue
index 77003fb..2ef8485 100644
--- a/src/views/system/result/index.vue
+++ b/src/views/system/result/index.vue
@@ -17,7 +17,7 @@
</div>
</el-card>
</div>
- <el-row :gutter="80">
+ <el-row :gutter="100">
<el-col :span="6">
<div class="city-warp">
<div class="city">
@@ -145,7 +145,7 @@
</el-row>
- <el-row style="margin-top: 30px" :gutter="80">
+ <el-row style="margin-top: 30px" :gutter="100">
<el-col :span="6">
<div class="city-warp">
<div class="city">
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index db3ec0d..1ccba98 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -67,17 +67,6 @@
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"
@@ -142,6 +131,12 @@
<el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
<el-input v-model="auditingForm.ywPeopleName" disabled />
</el-form-item>
+ <el-form-item label="鐜板満鎯呭喌">
+ <el-input type="textarea" v-html="auditingForm.condition" disabled />
+ </el-form-item>
+ <el-form-item label="浣愯瘉鏉愭枡">
+ <el-link v-for="item in auditingForm.proofMaterials != null ? auditingForm.proofMaterials.split(',') : auditingForm.proofMaterials" :underline="false" :key="item" @click="handleDownload(item)">{{ item.substring(item.lastIndexOf("/") + 1) }}</el-link>
+ </el-form-item>
<el-form-item label="瀹℃牳缁撴灉" prop="auditingResult">
<el-radio v-model="auditingForm.auditingResult" label="pass">閫氳繃</el-radio>
<el-radio v-model="auditingForm.auditingResult" label="return">椹冲洖</el-radio>
@@ -165,113 +160,18 @@
<el-input v-model="ywConditionForm.unitName" disabled />
</el-form-item>
<el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
- <el-input v-model="ywConditionForm.ywPeopleName" disabled />
+ <el-input v-model="ywConditionForm.ywPeopleName" />
</el-form-item>
- <el-form-item label="鐜板満鍥剧墖" prop="picture">
- <el-upload
- class="avatar-uploader"
- :action="this.$uploadUrl"
- 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 label="鐜板満鎯呭喌" prop="reportContent">
+ <editor v-model="form.condition" :min-height="192"/>
</el-form-item>
- <el-form-item label="浣愯瘉鏉愭枡" prop="certificates">
- <el-upload
- class="avatar-uploader"
- :action="this.$uploadUrl"
- 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/>
+ <el-form-item label="浣愯瘉鏉愭枡" prop="reportMaterials">
+ <file-upload v-model="form.proofMaterials"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitYwCondition">纭� 瀹�</el-button>
<el-button @click="cancelYwCondition">鍙� 娑�</el-button>
- </div>
- </el-dialog>
-
-
- <el-dialog title="杩愮淮缁撴灉璁板綍" :visible.sync="ywResultOpen" width="500px" append-to-body>
- <el-form ref="ywResultForm" :model="ywResultForm" :rules="ywResultRules" label-width="80px">
- <el-form-item label="宸ュ崟鍙�" prop="workOrderNo">
- <el-input v-model="ywResultForm.workOrderNo" disabled />
- </el-form-item>
- <el-form-item label="杩愮淮鍗曚綅" prop="unitName">
- <el-input v-model="ywResultForm.unitName" disabled />
- </el-form-item>
- <el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
- <el-input v-model="ywResultForm.ywPeopleName" disabled />
- </el-form-item>
- <el-form-item label="杩愮淮缁撴灉" prop="ywResult">
- <el-input v-model="ywResultForm.ywResult" type="textarea" maxlength="150" show-word-limit/>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitYwResult">纭� 瀹�</el-button>
- <el-button @click="cancelYwResult">鍙� 娑�</el-button>
- </div>
- </el-dialog>
-
- <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 />
- </el-form-item>
- <el-form-item label="杩愮淮鍗曚綅" prop="unitName">
- <el-input v-model="checkResultForm.unitName" disabled />
- </el-form-item>
- <el-form-item label="杩愮淮浜哄憳" prop="ywPeopleName">
- <el-input v-model="checkResultForm.ywPeopleName" disabled />
- </el-form-item>
- <el-form-item label="杩愮淮妫�娴嬬粨鏋�" prop="ywCheckResult">
- <file-upload v-model="checkResultForm.ywCheckResult"/>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitYwResult">纭� 瀹�</el-button>
- <el-button @click="cancelCheckResult">鍙� 娑�</el-button>
- </div>
- </el-dialog>
-
- <!-- 娣诲姞鎴栦慨鏀硅繍缁村伐鍗曞璇濇 -->
- <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="璇疯緭鍏ュ伐鍗曞彿" />
- </el-form-item>
- <el-form-item label="杩愮淮澶勭悊鏃堕棿" prop="ywHandleTime">
- <el-date-picker clearable
- v-model="form.ywHandleTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨杩愮淮澶勭悊鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="杩愮淮鎯呭喌" prop="ywCondition">
- <el-input v-model="form.ywCondition" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
- <el-form-item label="杩愮淮妫�娴嬬粨鏋�" prop="ywCheckResult">
- <el-input v-model="form.ywCheckResult" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -515,6 +415,10 @@
this.getList();
},
methods: {
+ /** 涓嬭浇鎸夐挳鎿嶄綔 */
+ handleDownload (data) {
+ this.$download.resource(data);
+ },
// 鎶ュ
submitReportForm() {
this.$refs["reportForm"].validate(valid => {
@@ -535,6 +439,8 @@
// 瀹℃牳鎸夐挳
handleAuditing(row) {
this.auditingForm = row;
+ this.auditingForm.condition = '璁惧寮傚父閬尅锛岀幇鍦轰慨澶嶅畬鎴�'
+ this.auditingForm.proofMaterials = '30璺敱閰嶇疆_20240411101816A008.png'
this.auditingOpen = true;
},
// 杩愮淮鎯呭喌鎸夐挳
--
Gitblit v1.8.0