Skip to content

D
dsk-operate-sys-cscec
Commit ccc1c34c authored by danfuman's avatar danfuman
Browse files
Options

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys... 

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

# Conflicts:
#	dsk-operate-ui/vue.config.js
parent c0d97a8c
Show whitespace changes
Inline Side-by-side
Showing with 174 additions and 75 deletions
dsk-operate-ui/src/views/supplier/disableManagement/affiliationRisk.vue
View file @ ccc1c34c
......@@ -11,19 +11,16 @@
<el-row>
<el-col :span="8">
<el-form-item label="劳务队长名称" label-width="90px" class="i">
<el-input v-model="formdata.supplierName" placeholder="请输入供应商名称" clearable></el-input>
<el-input v-model="formdata.supplierName" placeholder="请输入劳务队长名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否为局名义被诉案件">
<el-select v-model="formdata.isGroupCase" placeholder="请选择" clearable>
<el-option label="是" value="是"></el-option>
<el-option label="否" value="否"></el-option>
</el-select>
<el-form-item label="挂靠单位" label-width="90px" class="i">
<el-input v-model="formdata.supplierName" placeholder="请输入挂靠单位名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="限用/禁用时间" label-width="115px" class="j">
<el-form-item label="发生日期" label-width="115px" class="j">
<el-date-picker
v-model="formdata.times" clearable
type="daterange"
......@@ -45,15 +42,17 @@
<div class="table-supplier">
<div class="total-title">
<div class="totals">共{{total}}条</div>
<div class="add" @click="dialogVisible=true">添加数据</div>
</div>
<div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
<img class="item-jf-img" src="@/assets/images/kong.png" alt="">
<div class="item-jf-titel">暂无相关数据</div>
<div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
</div>
<skeleton v-if="isSkeleton"></skeleton>
<!--<skeleton v-if="isSkeleton"></skeleton>-->
<div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
<!--<div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">-->
<div class="table-item-jf table-item">
<el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
:header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
......@@ -64,54 +63,41 @@
<span>{{(formdata.pageNum - 1) *formdata.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="单据编号" :fixed="tableColumnFixed" width="150" :resizable="false">
<el-table-column label="劳务队长名称" :fixed="tableColumnFixed" width="150" :resizable="false">
<template slot-scope="scope">
{{scope.row.frecordno||"--"}}
{{scope.row.name||"--"}}
</template>
</el-table-column>
<el-table-column label="分供方名称" :fixed="tableColumnFixed" width="380" :resizable="false">
<el-table-column label="身份证号" :fixed="tableColumnFixed" min-width="150" :resizable="false">
<template slot-scope="scope">
<div class="renling">
<div style="display:flex;align-items:center">
<router-link v-if="scope.row.supplierCid" :to="`/enterprise/${encodeStr(scope.row.supplierCid)}`" tag="a"
class="wordprimary" v-html="scope.row.fsuppliername"></router-link>
<span v-else v-html="scope.row.fsuppliername"></span>
</div>
</div>
{{scope.row.IDCard||"--"}}
</template>
</el-table-column>
<el-table-column label="社会统一信用代码" min-width="180">
<el-table-column label="联系电话" min-width="150">
<template slot-scope="scope">
{{scope.row.funifiedsocialcreditcode||"--"}}
{{scope.row.telephone||"--"}}
</template>
</el-table-column>
<el-table-column label="限用情形" min-width="280" :resizable="false">
<el-table-column label="挂靠单位" min-width="280" :resizable="false">
<template slot-scope="scope">
<div class="wrap2">{{scope.row.flimitsituation||"--"}}</div>
<div class="wrap2">{{scope.row.unit||"--"}}</div>
</template>
</el-table-column>
<el-table-column label="禁用情景" min-width="280" :resizable="false">
<el-table-column label="不良事由" min-width="120" :resizable="false">
<template slot-scope="scope">
{{scope.row.fdisablesituation||"--"}}
{{scope.row.blsy||"--"}}
</template>
</el-table-column>
<el-table-column label="限用推送单位" min-width="120" :resizable="false">
<el-table-column label="不良行为情形" min-width="280" :resizable="false">
<template slot-scope="scope">
{{scope.row.fjobunitname||"--"}}
{{scope.row.blxw||"--"}}
</template>
</el-table-column>
<el-table-column label="限用/禁用" min-width="120" :resizable="false">
<el-table-column label="发生日期" min-width="150" :resizable="false">
<template slot-scope="scope">
{{scope.row.fstate||"--"}}
</template>
</el-table-column>
<el-table-column label="限用/禁用开始日期" min-width="180" :resizable="false">
<template slot-scope="scope">
{{scope.row.fts||"--"}}
{{scope.row.date||"--"}}
</template>
</el-table-column>
</el-table>
......@@ -122,6 +108,32 @@
</el-pagination>
</div>
</div>
<el-dialog :visible.sync="dialogVisible" width="480px" append-to-body class="dialogVisible" title="添加劳务供应商挂靠信息">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="addForm" label-width="127px">
<el-form-item label="劳务队长名称" prop="name">
<el-input v-model="ruleForm.name" placeholder="请输入劳务队长名称"></el-input>
</el-form-item>
<el-form-item label="身份证号码" prop="IDCard">
<el-input v-model="ruleForm.IDCard" placeholder="请输入劳务队长身份证号码"></el-input>
</el-form-item>
<el-form-item label="联系电话" prop="telephone">
<el-input v-model="ruleForm.telephone" placeholder="请输入联系电话"></el-input>
</el-form-item>
<el-form-item label="挂靠单位" prop="unit">
<el-input v-model="ruleForm.unit" placeholder="请输入挂靠单位"></el-input>
</el-form-item>
<el-form-item label="不良事由">
<el-input v-model="ruleForm.blsy" placeholder="请输入不良事由类型"></el-input>
</el-form-item>
<el-form-item label="不良行为具体情形">
<el-input type="textarea" v-model="ruleForm.blxw" placeholder="请输入不良行为具体情形"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible=false">取消</el-button>
<el-button type="primary" @click="handleAdd">添加</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -147,42 +159,80 @@
pageSize:50,
pageNum:1,
},
tableData:[],
tableData:[
{
name:'侯成刚',
IDCard:'11022419630408005X',
telephone:'13801265539',
unit:'北京金鑫永盛建筑劳务有限',
blsy:'工人闹事',
blxw:'1.未及时发放建筑劳务人员的工资，造成拖欠劳务人员工资，引发农民工集体上',
date:'2024年02月20日'
},
{
name:'谢兆可',
IDCard:'44072619640710433X',
telephone:'18878735559',
unit:'西全茂建筑劳务有限公司',
blsy:'合同违约',
blxw:'访或聚众闹事的(因业主或总包单位拖欠工程款除外)',
date:'2024年01月20日'
},
{
name:'舒小松',
IDCard:'510221197310083636',
telephone:'13801265539',
unit:'重庆群林建筑劳务有限公司',
blsy:'劳动合同纠纷',
blxw:'1.未及时发放建筑劳务人员的工资，造成拖欠劳务人员工资，引发农民工集体上',
date:'2024年02月20日'
},
],
isSkeleton:true,
total:0,
// table列是否悬浮
tableColumnFixed: true,
fbsvisib:false,
fbsisSkeleton:false,
dialogVisible:false,
ruleForm:{
},
rules: {
name: { required: true, message: '劳务队长名称为空', trigger: 'blur' }, // 限制必填
IDCard:{ required: true, message: '身份证号码不能为空', trigger: 'blur' }, // 限制必填
telephone:{ required: true, message: '联系电话不能为空', trigger: 'blur' }, // 限制必填
unit:{ required: true, message: '挂靠单位不能为空', trigger: 'blur' }, // 限制必填
},
}
},
created() {
this.searchList()
// this.searchList()
},
methods:{
searchList(){
this.isSkeleton = true
let formdata = JSON.parse(JSON.stringify(this.formdata))
if(formdata.times != [] &&formdata.times.length>1){
formdata.limitedStartTime = formdata.times[0]
formdata.limitedEndTime = formdata.times[1]
}else{
formdata.limitedStartTime = ''
formdata.limitedEndTime = ''
}
delete formdata.times
getSupplierLimitedList(formdata).then(res=>{
this.isSkeleton = false
if(res.code == 200) {
this.total = res.total
this.tableData = res.rows
this.formdata.pageNum = res.currentPage
}else{
this.total = 0
this.tableData = []
this.formdata.pageNum = 1
}
})
// this.isSkeleton = true
// let formdata = JSON.parse(JSON.stringify(this.formdata))
// if(formdata.times != [] &&formdata.times.length>1){
// formdata.limitedStartTime = formdata.times[0]
// formdata.limitedEndTime = formdata.times[1]
// }else{
// formdata.limitedStartTime = ''
// formdata.limitedEndTime = ''
// }
// delete formdata.times
// getSupplierLimitedList(formdata).then(res=>{
// this.isSkeleton = false
// if(res.code == 200) {
// this.total = res.total
// this.tableData = res.rows
// this.formdata.pageNum = res.currentPage
// }else{
// this.total = 0
// this.tableData = []
// this.formdata.pageNum = 1
// }
// })
},
clears(){
this.formdata={
......@@ -194,7 +244,7 @@
pageSize:50,
pageNum:1,
}
this.searchList()
// this.searchList()
},
handleCurrentChange(val){
this.formdata.pageNum = val
......@@ -211,24 +261,33 @@
setRowClass({ row, rowIndex }) {
return "enterprise-name-row";
},
//点击分包商等级
getFBS(row){
this.fbsvisib = true
this.fbsisSkeleton = true
},
//点击准入
goAccess(row){
this.$tab.openPage(row.customerName+'-准入情况', '/supplier/supplierlist/access')
},
//点击考评
goAssessment(row){
this.$tab.openPage(row.customerName+'-供应商考评', '/supplier/supplierlist/assessment')
},
handleAdd(){
this.dialogVisible=false
}
}
}
</script>
<style scoped lang="scss">
.table-supplier{
.total-title{
height: 32px;
line-height: 32px;
.add{
float: right;
width: 80px;
height: 32px;
background: #0081FF;
border-radius: 4px 4px 4px 4px;
color: #FFFFFF;
line-height: 32px;
font-size: 14px;
text-align: center;
cursor: pointer;
}
}
}
::v-deep .content-supplier {
.el-form-item__content {
width: calc(100% - 170px);
......@@ -244,4 +303,44 @@
}
}
}
.dialogVisible{
::v-deep .el-dialog {
position:absolute;
top:50%;
left:50%;
transform:translate(-50%,-50%);
margin-top:0 !important;
.el-dialog__body{
flex:1;
overflow: auto;
padding:24px 20px 0 20px;
border-top: 1px solid #EEEEEE;
border-bottom: 1px solid #EEEEEE;
.el-input{
width: 320px !important;
}
.el-textarea{
width: 320px !important;
}
.el-textarea__inner {
font-family: Arial, Helvetica, sans-serif !important;
}
input::-webkit-input-placeholder { /* Chrome/Opera/Safari */
color: #C0C4CC;
}
input::-moz-placeholder { /* Firefox 19+ */
color: #C0C4CC;
}
input:-ms-input-placeholder { /* IE 10+ */
color: #C0C4CC;
}
input:-moz-placeholder { /* Firefox 18- */
color: #C0C4CC;
}
}
.el-dialog__footer{
padding: 16px 20px;
}
}
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment