From 49be3d0b1921172dcbf5aa59749243b9af8a8773 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期三, 24 五月 2023 11:59:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/common/Audit.vue | 169 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 108 insertions(+), 61 deletions(-)
diff --git a/src/views/common/Audit.vue b/src/views/common/Audit.vue
index 35787c2..1ebb2b3 100644
--- a/src/views/common/Audit.vue
+++ b/src/views/common/Audit.vue
@@ -4,23 +4,23 @@
<template slot="header">
<el-form :inline="true" :model="queryInfo" class="demo-form-inline">
<el-form-item label="鎶ユ浜猴細">
- <el-input placeholder="璇疯緭鍏ュ鍚嶆垨韬唤璇�" v-model="queryInfo.people"></el-input>
+ <el-input placeholder="璇疯緭鍏ュ鍚�" v-model="queryInfo.people"></el-input>
</el-form-item>
<el-form-item label="鎵嬫満鍙风爜锛�">
<el-input placeholder="璇疯緭鍏�" v-model="queryInfo.phoneNumber"></el-input>
</el-form-item>
- <el-form-item label="鏄惁宸茶繘缇わ細">
- <el-select v-model="queryInfo.isInGroup" placeholder="璇烽�夋嫨">
- <el-option v-for="item in optionsGroup" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鎶ユ鏉愭枡锛�">
- <el-select v-model="queryInfo.HavaMaterial" placeholder="璇烽�夋嫨">
- <el-option v-for="item in optionsMate" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
+<!-- <el-form-item label="鏄惁宸茶繘缇わ細">-->
+<!-- <el-select v-model="queryInfo.isInGroup" placeholder="璇烽�夋嫨">-->
+<!-- <el-option v-for="item in optionsGroup" :key="item.value" :label="item.label" :value="item.value">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鎶ユ鏉愭枡锛�">-->
+<!-- <el-select v-model="queryInfo.HavaMaterial" placeholder="璇烽�夋嫨">-->
+<!-- <el-option v-for="item in optionsMate" :key="item.value" :label="item.label" :value="item.value">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" @click="search">鏌ヨ</el-button>
</el-form-item>
@@ -49,20 +49,20 @@
<el-table-column width="80" prop="reporterName" label="鎶ユ浜�"></el-table-column>
<el-table-column width="120" prop="mobile" label="鎵嬫満鍙风爜"></el-table-column>
<el-table-column width="180" prop="idcard" label="璇佷欢鍙风爜"></el-table-column>
- <el-table-column width="100" prop="isCommission" label="鏄惁瀹℃牳">
- <template slot-scope="scope">
- <el-popover
- v-if="scope.row.status == 2"
- placement="bottom"
- title="椹冲洖鍘熷洜"
- width="200"
- trigger="click"
- :content="scope.row.remarks">
- <el-button type="text" slot="reference">宸查┏鍥�</el-button>
- </el-popover>
- <span v-else>鍚�</span>
- </template>
- </el-table-column>
+<!-- <el-table-column width="100" prop="isCommission" label="鏄惁瀹℃牳">-->
+<!-- <template slot-scope="scope">-->
+<!-- <el-popover-->
+<!-- v-if="scope.row.status == 2"-->
+<!-- placement="bottom"-->
+<!-- title="椹冲洖鍘熷洜"-->
+<!-- width="200"-->
+<!-- trigger="click"-->
+<!-- :content="scope.row.remarks">-->
+<!-- <el-button type="text" slot="reference">宸查┏鍥�</el-button>-->
+<!-- </el-popover>-->
+<!-- <span v-else>鍚�</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column width="100" prop="amountInvolved" label="娑夋閲戦">
<template slot-scope="scope">
<span>{{ scope.row.amountInvolved === null ? 0 : scope.row.amountInvolved }}</span>
@@ -168,7 +168,8 @@
:with-credentials="true"
:on-preview="handlePictureCardPreview"
:on-success="handIdCardMaterials"
- :on-remove="handleRemove"
+ :on-remove="handleRemovecard"
+ :file-list="auditInfo.cardimg"
>
<i slot="default" class="el-icon-plus"></i>
</el-upload>
@@ -176,7 +177,8 @@
<el-image
style="width: 100px; height: 100px"
:src="item"
- fit="fill"></el-image>
+ fit="fill"
+ :preview-src-list="idCardMaterials"></el-image>
</div>
</el-tab-pane>
<el-tab-pane label="鍚堝悓" name="b">
@@ -187,7 +189,8 @@
:with-credentials="true"
:on-preview="handlePictureCardPreview"
:on-success="handContractMaterials"
- :on-remove="handleRemove"
+ :on-remove="handleRemovecontractimg"
+ :file-list="auditInfo.contractimg"
>
<i slot="default" class="el-icon-plus"></i>
</el-upload>
@@ -195,7 +198,8 @@
<el-image
style="width: 100px; height: 100px"
:src="item"
- fit="fill"></el-image>
+ fit="fill"
+ :preview-src-list="contractMaterials"></el-image>
</div>
</el-tab-pane>
<el-tab-pane label="浜ゆ槗鍑瘉" name="c">
@@ -204,7 +208,8 @@
<el-image
style="width: 100px; height: 100px"
:src="item"
- fit="fill"></el-image>
+ fit="fill"
+ :preview-src-list="transactionMaterials"></el-image>
</div>
<el-upload
v-show="fromTitle=='娣诲姞'"
@@ -213,7 +218,8 @@
:with-credentials="true"
:on-preview="handlePictureCardPreview"
:on-success="handTransactionMaterials"
- :on-remove="handleRemove"
+ :on-remove="handleRemovetransaction"
+ :file-list="auditInfo.transactionimg"
>
<i slot="default" class="el-icon-plus"></i>
</el-upload>
@@ -226,7 +232,8 @@
:with-credentials="true"
:on-preview="handlePictureCardPreview"
:on-success="handTlseMaterials"
- :on-remove="handleRemove"
+ :on-remove="handleRemoveelse"
+ :file-list="auditInfo.elseimg"
>
<i slot="default" class="el-icon-plus"></i>
</el-upload>
@@ -234,7 +241,8 @@
<el-image
style="width: 100px; height: 100px"
:src="item"
- fit="fill"></el-image>
+ fit="fill"
+ :preview-src-list="elseMaterials"></el-image>
</div>
</el-tab-pane>
</el-tabs>
@@ -256,7 +264,7 @@
<el-button type="primary" @click="checkAdd">纭� 瀹�</el-button>
</span>
<!-- 鍥剧墖鏀惧ぇ寮圭獥 -->
- <el-dialog :visible.sync="dialogVisible">
+ <el-dialog :visible.sync="dialogVisible" append-to-body>
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
<el-dialog
@@ -328,7 +336,9 @@
<el-image
style="width: 100px; height: 100px"
:src="item"
- fit="fill"></el-image>
+ fit="fill"
+ :preview-src-list="idCardMaterials"
+ ></el-image>
</div>
</el-tab-pane>
<el-tab-pane label="鍚堝悓" name="b">
@@ -336,7 +346,8 @@
<el-image
style="width: 100px; height: 100px"
:src="item"
- fit="fill"></el-image>
+ fit="fill"
+ :preview-src-list="contractMaterials"></el-image>
</div>
</el-tab-pane>
<el-tab-pane label="浜ゆ槗鍑瘉" name="c">
@@ -344,7 +355,8 @@
<el-image
style="width: 100px; height: 100px"
:src="item"
- fit="fill"></el-image>
+ fit="fill"
+ :preview-src-list="transactionMaterials"></el-image>
</div>
</el-tab-pane>
<el-tab-pane label="鍏朵粬" name="d">
@@ -352,7 +364,8 @@
<el-image
style="width: 100px; height: 100px"
:src="item"
- fit="fill"></el-image>
+ fit="fill"
+ :preview-src-list="elseMaterials"></el-image>
</div>
</el-tab-pane>
</el-tabs>
@@ -528,8 +541,11 @@
methods: {
handTlseMaterials(res){
if (res.code === 200) {
- this.elseList.push({
- data: res.data
+ this.auditInfo.elseimg.push({
+ name: res.data,
+ url: '/minio/img/' + res.data,
+ // uid: this.addPublicityForm.img.length
+ response: {data:res.data}
})
} else {
this.$message.error(res.msg)
@@ -538,8 +554,11 @@
},
handTransactionMaterials(res){
if (res.code === 200) {
- this.transacList.push({
- data: res.data
+ this.auditInfo.transactionimg.push({
+ name: res.data,
+ url: '/minio/img/' + res.data,
+ // uid: this.addPublicityForm.img.length
+ response: {data:res.data}
})
} else {
this.$message.error(res.msg)
@@ -548,8 +567,11 @@
},
handContractMaterials(res){
if (res.code === 200) {
- this.contractList.push({
- data: res.data
+ this.auditInfo.contractimg.push({
+ name: res.data,
+ url: '/minio/img/' + res.data,
+ // uid: this.addPublicityForm.img.length
+ response: {data:res.data}
})
} else {
this.$message.error(res.msg)
@@ -557,9 +579,13 @@
console.log(res,this.auditInfo)
},
handIdCardMaterials(res){
+ console.log(res)
if (res.code === 200) {
- this.idCardList.push({
- data: res.data
+ this.auditInfo.cardimg.push({
+ name: res.data,
+ url: '/minio/img/' + res.data,
+ // uid: this.addPublicityForm.img.length
+ response: {data:res.data}
})
} else {
this.$message.error(res.msg)
@@ -573,6 +599,19 @@
// file鏄偣鍑诲垹闄ょ殑鏂囦欢锛宖ileList鏃跺垹闄ゅ悗鍓╀笅鐨勬枃浠跺垪琛�
console.log(file,fileList)
// this.auditInfo.idCardMaterials = fileList[0].response
+ },
+ handleRemovecard(file,fileList){
+ console.log(fileList)
+ this.auditInfo.cardimg = fileList
+ },
+ handleRemovecontractimg(file,fileList){
+ this.auditInfo.contractimg = fileList
+ },
+ handleRemovetransaction(file,fileList){
+ this.auditInfo.transactionimg = fileList
+ },
+ handleRemoveelse(file,fileList){
+ this.auditInfo.elseimg = fileList
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url
@@ -627,20 +666,21 @@
let form = null;
form = this.auditInfo;
console.log(form,this.idCardList)
- //澶勭悊鍥剧墖韬唤璇�
- if (this.idCardList.length>0){
- form.idCardMaterials=this.idCardList.map(item=>item.data).join(',')
- }else {form.idCardMaterials=''}
- if (this.contractList.length>0){
- form.contractMaterials=this.contractList.map(item=>item.data).join(',')
- }else {form.contractMaterials=''}
- if (this.transacList.length>0){
- form.transactionMaterials=this.transacList.map(item=>item.data).join(',')
- }else {form.transactionMaterials=''}
- if (this.elseList.length>0){
- form.elseMaterials=this.elseList.map(item=>item.data).join(',')
- }else {form.elseMaterials=''}
+
if (this.fromTitle=='娣诲姞'){
+ //澶勭悊鍥剧墖韬唤璇�
+ if (form.cardimg.length>0){
+ form.idCardMaterials=form.cardimg.map(item=>item.response.data).join(',')
+ }else {form.idCardMaterials=''}
+ if (form.contractimg.length>0){
+ form.contractMaterials=form.contractimg.map(item=>item.response.data).join(',')
+ }else {form.contractMaterials=''}
+ if (form.transactionimg.length>0){
+ form.transactionMaterials=form.transactionimg.map(item=>item.response.data).join(',')
+ }else {form.transactionMaterials=''}
+ if (form.elseimg.length>0){
+ form.elseMaterials=form.elseimg.map(item=>item.response.data).join(',')
+ }else {form.elseMaterials=''}
report(form).then(res=>{
this.checkVisible=false
console.log(res)
@@ -736,6 +776,9 @@
async getCauseOptions() {
const { data: data } = await this.$http.get('/api/cause/getCauseIdAndName');
+ data.data.map(item=>{
+ item.id=Number(item.id)
+ })
this.causeOptions = data.data;
console.log(this.causeOptions)
},
@@ -795,6 +838,10 @@
this.fromDis=false
this.picShow= ''
this.auditInfo= {
+ elseimg:[],
+ transactionimg:[],
+ cardimg:[],
+ contractimg:[],
pic: '',
reporterName: '',
mobile: '',
--
Gitblit v1.8.0