Merge remote-tracking branch 'origin/master'

master
1178634255 2 years ago
commit b18ef86793

@ -19,9 +19,10 @@
ref="inputQuery" ref="inputQuery"
label-width="150px" label-width="150px"
> >
<el-card class="el-card"> <el-card class="el-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>本企业信息:</span> <span>审核信息:</span>
<div> <div>
<div style="float: right;margin-top: -20px "> <div style="float: right;margin-top: -20px ">
<el-button <el-button
@ -44,27 +45,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <el-row-->
<!-- :gutter="20"-->
<!-- class="el-row"-->
<!-- type="flex"-->
<!-- >-->
<!-- <el-col :span="15" class="el-col">-->
<!-- <el-form-item-->
<!-- label="本企业信息审核状态:"-->
<!-- prop="reason"-->
<!-- >-->
<!-- <span>-->
<!-- <el-tag :type="inputQuery.ucstatus | statusFilterType">-->
<!-- {{ checkSupFlag[inputQuery.ucstatus] }}-->
<!-- </el-tag>-->
<!-- </span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row <el-row
:gutter="20" :gutter="20"
class="el-row" class="el-row"
@ -86,26 +66,54 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row
:gutter="20"
class="el-row"
type="flex"
>
<el-col :span="15" class="el-col">
<el-form-item
label="审核说明:"
prop="reason"
>
<el-input
size="small"
disabled
v-model="inputQuery.reason"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-card>
<el-card class="el-card">
<div slot="header" class="clearfix">
<span>本企业信息:</span>
</div>
<!-- <el-row--> <!-- <el-row-->
<!-- :gutter="20"--> <!-- :gutter="20"-->
<!-- class="el-row"--> <!-- class="el-row"-->
<!-- type="flex"--> <!-- type="flex"-->
<!-- >--> <!-- >-->
<!-- <el-col :span="15" class="el-col">--> <!-- <el-col :span="15" class="el-col">-->
<!-- <el-form-item--> <!-- <el-form-item-->
<!-- label="审核说明:"--> <!-- label="本企业信息审核状态:"-->
<!-- prop="reason"--> <!-- prop="reason"-->
<!-- >--> <!-- >-->
<!-- <el-input--> <!-- <span>-->
<!-- size="small"--> <!-- <el-tag :type="inputQuery.ucstatus | statusFilterType">-->
<!-- disabled--> <!-- {{ checkSupFlag[inputQuery.ucstatus] }}-->
<!-- v-model="inputQuery.reason"--> <!-- </el-tag>-->
<!-- ></el-input>--> <!-- </span>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<el-row <el-row
:gutter="20" :gutter="20"
class="el-row" class="el-row"
@ -322,7 +330,7 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span> <span>
系统负责人信息 系统负责人信息:
</span> </span>
</div> </div>
@ -440,7 +448,7 @@
<el-card> <el-card>
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span> <span>
资质证书信息 资质证书信息:
</span> </span>
<div style="float: right; text-align: right; margin-bottom: 8px"> <div style="float: right; text-align: right; margin-bottom: 8px">
@ -472,30 +480,30 @@
<el-table-column label="证书编号" prop="code" ></el-table-column> <el-table-column label="证书编号" prop="code" ></el-table-column>
<el-table-column label="生效日期" prop="validDate"></el-table-column> <el-table-column label="生效日期" prop="validDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column> <el-table-column label="失效日期" prop="expireDate"></el-table-column>
<el-table-column label="确认状态" prop="checkStatus" width="120"> <el-table-column label="确认状态" prop="checkStatus" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.checkStatus | statusFilterType"> <el-tag :type="scope.row.checkStatus | statusFilterType">
{{ checkFlag[scope.row.checkStatus] }} {{ checkFlag[scope.row.checkStatus] }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column--> <el-table-column
<!-- label="确认说明"--> label="确认说明"
<!-- prop="checkComment"--> prop="checkComment"
<!-- show-overflow-tooltip--> show-overflow-tooltip
<!-- ></el-table-column>--> ></el-table-column>
<el-table-column label="状态说明" prop="status" width="120"> <!-- <el-table-column label="状态说明" prop="status" width="120">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-tag :type="scope.row.status | statusFilterType"> <!-- <el-tag :type="scope.row.status | statusFilterType">-->
{{ statusFlag[scope.row.status] }} <!-- {{ statusFlag[scope.row.status] }}-->
</el-tag> <!-- </el-tag>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="备注" prop="remark"></el-table-column> <el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" width="180"> <el-table-column label="操作" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -1019,4 +1027,8 @@ export default {
margin: auto; margin: auto;
} }
.el-form-item{
margin-top: 5px;
margin-bottom: 4px;
}
</style> </style>

@ -1,97 +1,97 @@
<template> <template>
<div> <div>
<el-card> <!-- <el-card>-->
<div> <!-- <div>-->
<p class="form-title">配送企业资质设置</p> <!-- <p class="form-title">配送企业资质设置</p>-->
</div> <!-- </div>-->
<div style=" float: right; text-align: right; margin-bottom: 8px;"> <!-- <div style=" float: right; text-align: right; margin-bottom: 8px;">-->
<el-button type="primary" size="mini" icon="search" @click="addCert" style="text-align:right">添加设置</el-button> <!-- <el-button type="primary" size="mini" icon="search" @click="addCert" style="text-align:right">添加设置</el-button>-->
</div> <!-- </div>-->
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row> <!-- <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>-->
<el-table-column type="index" label="序号" width="50"></el-table-column> <!-- <el-table-column type="index" label="序号" width="50"></el-table-column>-->
<el-table-column label="证书名称" prop="name"></el-table-column> <!-- <el-table-column label="证书名称" prop="name"></el-table-column>-->
<el-table-column label="是否必传" prop="require" s> <!-- <el-table-column label="是否必传" prop="require" s>-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ enableMap[scope.row.need] }}</span> <!-- <span>{{ enableMap[scope.row.need] }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="说明" prop="remark"></el-table-column> <!-- <el-table-column label="说明" prop="remark"></el-table-column>-->
<el-table-column label="操作" width="200"> <!-- <el-table-column label="操作" width="200">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
size="small" <!-- size="small"-->
@click="handleEdit(scope.row)" <!-- @click="handleEdit(scope.row)"-->
>编辑 <!-- >编辑-->
</el-button> <!-- </el-button>-->
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
size="small" <!-- size="small"-->
@click="handleDel( scope.row)" <!-- @click="handleDel( scope.row)"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> <!-- </el-table>-->
<pagination <!-- <pagination-->
v-show="total>0" <!-- v-show="total>0"-->
:total="total" <!-- :total="total"-->
:page.sync="query.page" <!-- :page.sync="query.page"-->
:limit.sync="query.limit" <!-- :limit.sync="query.limit"-->
@pagination="handleCurrentChange" <!-- @pagination="handleCurrentChange"-->
></pagination> <!-- ></pagination>-->
<el-dialog <!-- <el-dialog-->
:title="formMap[formName]" <!-- :title="formMap[formName]"-->
:visible.sync="addDialogVisible" <!-- :visible.sync="addDialogVisible"-->
width="60%" <!-- width="60%"-->
:close-on-click-modal="false" <!-- :close-on-click-modal="false"-->
:close-on-press-escape="false" <!-- :close-on-press-escape="false"-->
v-if="addDialogVisible" <!-- v-if="addDialogVisible"-->
> <!-- >-->
<el-form :model="currentSup" :rules="formRules" label-width="100px" ref="dataForm"> <!-- <el-form :model="currentSup" :rules="formRules" label-width="100px" ref="dataForm">-->
<el-row> <!-- <el-row>-->
<el-col :span="11"> <!-- <el-col :span="11">-->
<el-form-item label="证书名称:" prop="name"> <!-- <el-form-item label="证书名称:" prop="name">-->
<el-input v-model="currentSup.name" style="width: 90%" auto-complete="off"></el-input> <!-- <el-input v-model="currentSup.name" style="width: 90%" auto-complete="off"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="11"> <!-- <el-col :span="11">-->
<el-form-item label="是否必传:" prop="need"> <!-- <el-form-item label="是否必传:" prop="need">-->
<el-select style="width: 90%" v-model="currentSup.need"> <!-- <el-select style="width: 90%" v-model="currentSup.need">-->
<el-option label="是" :value=true></el-option> <!-- <el-option label="是" :value=true></el-option>-->
<el-option label="否" :value=false></el-option> <!-- <el-option label="否" :value=false></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
<el-row> <!-- <el-row>-->
<el-col :span="22"> <!-- <el-col :span="22">-->
<el-form-item label="说明:" prop="remark"> <!-- <el-form-item label="说明:" prop="remark">-->
<el-input v-model="currentSup.remark" style="width: 95.5%" auto-complete="off" type="textarea" <!-- <el-input v-model="currentSup.remark" style="width: 95.5%" auto-complete="off" type="textarea"-->
autosize></el-input> <!-- autosize></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
</el-form> <!-- </el-form>-->
<div style="text-align: center"> <!-- <div style="text-align: center">-->
<el-button type="primary" size="small" icon="search" @click="onAddSubmit" <!-- <el-button type="primary" size="small" icon="search" @click="onAddSubmit"-->
>提交 <!-- >提交-->
</el-button <!-- </el-button-->
> <!-- >-->
<el-button type="primary" size="small" icon="search" @click="cancelDialog" <!-- <el-button type="primary" size="small" icon="search" @click="cancelDialog"-->
>取消 <!-- >取消-->
</el-button <!-- </el-button-->
> <!-- >-->
</div> <!-- </div>-->
</el-dialog> <!-- </el-dialog>-->
</el-card> <!-- </el-card>-->
<el-card> <el-card>
<div> <div>

@ -58,7 +58,6 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="expireDate"> <el-form-item prop="expireDate">
<el-date-picker <el-date-picker
v-model="formData.expireDate" v-model="formData.expireDate"
type="date" type="date"
@ -67,9 +66,19 @@
style="width: 100%" style="width: 100%"
placeholder="请选择失效期"> placeholder="请选择失效期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="1">
<el-radio-group v-model="formData.expireDate">
<el-radio-button
v-model="formData.expireDate"
label="2999-01-01"
type="date"
value-format="yyyy-MM-dd"
:disabled="this.formData.expireDate != null || formData.auditStatus == 1"
>永久有效</el-radio-button>
</el-radio-group>
</el-col>
</el-row> </el-row>
@ -85,7 +94,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -250,7 +258,6 @@ export default {
}, },
submitUpload(){ submitUpload(){
debugger
if(this.editTye == 1){ if(this.editTye == 1){
this.onConfirmSubmit(); this.onConfirmSubmit();
}else{ }else{
@ -274,7 +281,6 @@ export default {
updateCert(){ updateCert(){
updateCert(this.formData).then((res)=>{ updateCert(this.formData).then((res)=>{
if(res.code == 20000){ if(res.code == 20000){
debugger
this.$message.success("修改成功!") this.$message.success("修改成功!")
this.closeDialog(); this.closeDialog();
}else{ }else{

Loading…
Cancel
Save