From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/views/business/company.vue | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/company/src/views/business/company.vue b/company/src/views/business/company.vue
index 51341f7..9e85ac0 100644
--- a/company/src/views/business/company.vue
+++ b/company/src/views/business/company.vue
@@ -5,9 +5,6 @@
<el-form-item label="浼佷笟鍚嶇О" prop="name">
<el-input v-model="searchForm.name" placeholder="璇疯緭鍏ヤ紒涓氬悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鎵�灞炲晢鎴�" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ墍灞炲晢鎴�" @keypress.enter.native="search"></el-input>
- </el-form-item>
<el-form-item label="鎵�灞炵悊璧斿憳" prop="username">
<el-input v-model="searchForm.username" placeholder="璇疯緭鍏ユ墍灞炵悊璧斿憳" @keypress.enter.native="search"></el-input>
</el-form-item>
@@ -42,6 +39,14 @@
</el-switch>
</template>
</el-table-column>
+ <el-table-column label="鐢靛瓙绛捐璇佺姸鎬�" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.signStatus === 0">寰呰璇�</span>
+ <span v-if="row.signStatus === 1">璁よ瘉涓�</span>
+ <span v-if="row.signStatus === 2">璁よ瘉澶辫触</span>
+ <span v-if="row.signStatus === 3">璁よ瘉閫氳繃</span>
+ </template>
+ </el-table-column>
<el-table-column
v-if="containPermissions(['business:company:update', 'business:company:delete'])"
label="鎿嶄綔"
@@ -51,7 +56,9 @@
<template slot-scope="{row}">
<el-button type="text" @click="$refs.OperaCompanyDescWindow.open('浼佷笟璇︽儏', row)" v-permissions="['business:company:update']">鏌ョ湅璇︽儏</el-button>
<el-button type="text" @click="edit(row)" v-permissions="['business:company:update']">淇敼</el-button>
+<!--
<el-button type="text" @click="$refs.operaCompanyWindow.open('缂栬緫浼佷笟淇℃伅琛�', row)" v-permissions="['business:company:update']">鐢靛瓙绛捐璇�</el-button>
+-->
</template>
</el-table-column>
</el-table>
@@ -85,7 +92,8 @@
// 鎼滅储
searchForm: {
name: '',
- username: ''
+ username: '',
+ type:0
}
}
},
@@ -122,10 +130,17 @@
}
form.file.imgurl = res.businessImg.fileurl
form.file.imgurlfull = res.businessImg.fileurlFull
+ if( res.idcardImgList ==null){
+ res.idcardImgList = new Array();
+ }
+ if( res.idcardImgList && res.idcardImgList.length>0){
form.file1.imgurl = res.idcardImgList[0].fileurl
form.file1.imgurlfull = res.idcardImgList[0].fileurlFull
- form.file2.imgurl = res.idcardImgList[1].fileurl
+ }
+ if( res.idcardImgList && res.idcardImgList.length>1){
+ form.file2.imgurl = res.idcardImgList[1].fileurl
form.file2.imgurlfull = res.idcardImgList[1].fileurlFull
+ }
form.file3.imgurl = res.signImg.fileurl
form.file3.imgurlfull = res.signImg.fileurlFull
this.$refs.operaCompanyWindow.open('缂栬緫浼佷笟', form)
--
Gitblit v1.9.3