企业不良记录

src/dashoo.cn/backend/api/business/oilsupplier/badrecord/badrecord.go

@@ -31,3 +31,22 @@ type BadRecord struct {
 	Modifieduserid int       `xorm:"comment('修改者编号') INT(11)"`
 	Modifiedby     string    `xorm:"comment('修改者') VARCHAR(50)"`
 }
+
+type BadAddEntity struct {
+	Companyname    string    `xorm:"VARCHAR(70)"`
+	Companycode    string    `xorm:"comment('ID') VARCHAR(10)"`
+	Type           string    `xorm:"comment('类别') VARCHAR(10)"`
+	Status         string    `xorm:"comment('状态') VARCHAR(10)"`
+	Record         string    `xorm:"comment('不良记录') VARCHAR(500)"`
+}
+
+type BadRecordHistory struct {
+	Id               int       `xorm:"not null pk autoincr INT(11)"`
+	SupplierId       int       `xorm:"INT(11)"`
+	SupplierTypeCode string    `xorm:"VARCHAR(10)"`
+	CertSubStatus    string    `xorm:"VARCHAR(50)"`
+	BackReason       string    `xorm:"VARCHAR(500)"`
+	Createon         time.Time `xorm:"comment('创建时间') DATETIME"`
+	Createuserid     int       `xorm:"comment('创建者编号') INT(11)"`
+	Createby         string    `xorm:"comment('创建者') VARCHAR(50)"`
+}

src/dashoo.cn/backend/api/controllers/oilsupplier/badrecord.go

@@ -110,14 +110,16 @@ func (this *BadRecordController) GetCompany() {
 // @Success	200	{object}
 // @router /add [post]
 func (this *BadRecordController) AddBadRecord() {
+	var rmodel BadRecord.BadAddEntity
+
 	var model BadRecord.BadRecord
 	var jsonBlob = this.Ctx.Input.RequestBody
 	var errinfo ErrorDataInfo
 	svc := BadRecord.GetBadRecordService(utils.DBE)
-	json.Unmarshal(jsonBlob, &model)
+	json.Unmarshal(jsonBlob, &rmodel)
 
 	//判断名称是否已拥有
-	var companyCode = model.Companycode
+	var companyCode = rmodel.Companycode
 
 	where := "1=1 and CompanyCode='" + companyCode + "'"
 	total := svc.GetName(BaseBadRecord, where)
@@ -126,38 +128,82 @@ func (this *BadRecordController) AddBadRecord() {
 		model.Modifiedon = time.Now()
 		model.Modifiedby = this.User.Realname
 		model.Modifieduserid,_ = strconv.Atoi(this.User.Id)
-		cols := []string{"WZStatus","WZRecord","JJStatus","JJRecord","JFStatus","JFRecord","CertRecord","ModifiedOn","ModifiedUserId","ModifiedBy"}
+
+		var cols  []string
+		if rmodel.Type == "01" {
+			model.Wzstatus = rmodel.Status
+			model.Wzrecord = rmodel.Record
+			cols = []string{"WZStatus","WZRecord","ModifiedOn","ModifiedUserId","ModifiedBy"}
+		}
+		if rmodel.Type == "02" {
+			model.Jjstatus = rmodel.Status
+			model.Jjrecord = rmodel.Record
+			cols = []string{"JJStatus","JJRecord","ModifiedOn","ModifiedUserId","ModifiedBy"}
+		}
+		if rmodel.Type == "03" {
+			model.Jfstatus = rmodel.Status
+			model.Jfrecord = rmodel.Record
+			cols = []string{"JFStatus","JFRecord","ModifiedOn","ModifiedUserId","ModifiedBy"}
+		}
 		err:= svc.UpdateEntityBywheretbl(BaseBadRecord,&model,cols,"CompanyCode='"+companyCode+"'")
 
 		//更新准入表状态
-		if model.Wzstatus!=""{
+		if rmodel.Type == "01"{
 			var supplierCert suppliercert.OilSupplierCert
-			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01'")
+			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+companyCode+"' and SupplierTypeCode='01'")
 			if tempCount>0{
 				supplierCert.InFlag=model.Wzstatus
 				cols := []string{ "InFlag"}
-				err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01'")
+				err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+companyCode+"' and SupplierTypeCode='01'")
+				var badhis BadRecord.BadRecordHistory
+				badhis.SupplierId, _ = strconv.Atoi(companyCode)
+				badhis.Createuserid, _ = strconv.Atoi(this.User.Id)
+				badhis.Createon = time.Now()
+				badhis.Createby = this.User.Realname
+				badhis.SupplierTypeCode = "01"
+				badhis.CertSubStatus = model.Wzstatus
+				badhis.BackReason = model.Wzrecord
+				svc.InsertEntity(&badhis)
 			}
 		}
-		if model.Jjstatus!=""{
+		if rmodel.Type == "02"{
 			var supplierCert suppliercert.OilSupplierCert
-			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='02'")
+			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+companyCode+"' and SupplierTypeCode='02'")
 			if tempCount>0 {
 				supplierCert.InFlag = model.Jjstatus
 				cols := []string{"InFlag"}
-				err = svc.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "SupplierId='"+model.Companycode+"' and SupplierTypeCode='02'")
+				err = svc.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "SupplierId='"+companyCode+"' and SupplierTypeCode='02'")
+				var badhis BadRecord.BadRecordHistory
+				badhis.SupplierId, _ = strconv.Atoi(companyCode)
+				badhis.Createuserid, _ = strconv.Atoi(this.User.Id)
+				badhis.Createon = time.Now()
+				badhis.Createby = this.User.Realname
+				badhis.SupplierTypeCode = "02"
+				badhis.CertSubStatus = model.Jjstatus
+				badhis.BackReason = model.Jjrecord
+				svc.InsertEntity(&badhis)
 			}
 		}
-		if model.Jfstatus!=""{
+		if rmodel.Type == "03"{
 			var supplierCert suppliercert.OilSupplierCert
-			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='03'")
+			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+companyCode+"' and SupplierTypeCode='03'")
 			if tempCount>0 {
 				supplierCert.InFlag = model.Jfstatus
 				cols := []string{"InFlag"}
-				err = svc.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "SupplierId='"+model.Companycode+"' and SupplierTypeCode='03'")
+				err = svc.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "SupplierId='"+companyCode+"' and SupplierTypeCode='03'")
+				var badhis BadRecord.BadRecordHistory
+				badhis.SupplierId, _ = strconv.Atoi(companyCode)
+				badhis.Createuserid, _ = strconv.Atoi(this.User.Id)
+				badhis.Createon = time.Now()
+				badhis.Createby = this.User.Realname
+				badhis.SupplierTypeCode = "03"
+				badhis.CertSubStatus = model.Jfstatus
+				badhis.BackReason = model.Jfrecord
+				svc.InsertEntity(&badhis)
 			}
 		}
 
+
 		if err == nil {
 			errinfo.Message = "更新成功"
 			errinfo.Code = 1
@@ -173,37 +219,53 @@ func (this *BadRecordController) AddBadRecord() {
 		model.Createon = time.Now()
 		model.Createby = this.User.Realname
 		model.Createuserid, _ = utils.StrTo(this.User.Id).Int()
+		model.Companyname = rmodel.Companyname
+		model.Companycode = rmodel.Companycode
+
+		if rmodel.Type == "01" {
+			model.Wzstatus = rmodel.Status
+			model.Wzrecord = rmodel.Record
+		}
+		if rmodel.Type == "02" {
+			model.Jjstatus = rmodel.Status
+			model.Jjrecord = rmodel.Record
+		}
+		if rmodel.Type == "03" {
+			model.Jfstatus = rmodel.Status
+			model.Jfrecord = rmodel.Record
+		}
+
 		var err error
 		//更新准入表状态
-		if model.Wzstatus!=""{
+		if rmodel.Type == "01"{
 			var supplierCert suppliercert.OilSupplierCert
-			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01'")
+			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+companyCode+"' and SupplierTypeCode='01'")
 			if tempCount>0{
-				supplierCert.InFlag=model.Wzstatus
+				supplierCert.InFlag=rmodel.Status
 				cols := []string{ "InFlag"}
-				err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01'")
+				err=svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+companyCode+"' and SupplierTypeCode='01'")
 			}else{
 				model.Wzstatus=""
 			}
 		}
-		if model.Jjstatus!=""{
+		if rmodel.Type == "02"{
 			var supplierCert suppliercert.OilSupplierCert
-			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='02'")
+			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+companyCode+"' and SupplierTypeCode='02'")
 			if tempCount>0 {
-				supplierCert.InFlag = model.Jjstatus
+				supplierCert.InFlag = rmodel.Status
 				cols := []string{"InFlag"}
-				err = svc.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "SupplierId='"+model.Companycode+"' and SupplierTypeCode='02'")
+				err = svc.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "SupplierId='"+companyCode+"' and SupplierTypeCode='02'")
 			}else{
 				model.Jjstatus=""
 			}
 		}
-		if model.Jfstatus!=""{
+		if rmodel.Type == "03"{
 			var supplierCert suppliercert.OilSupplierCert
-			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='03'")
+			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+companyCode+"' and SupplierTypeCode='03'")
 			if tempCount>0 {
-				supplierCert.InFlag = model.Jfstatus
+				supplierCert.InFlag = rmodel.Status
 				cols := []string{"InFlag"}
-				err = svc.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "SupplierId='"+model.Companycode+"' and SupplierTypeCode='03'")
+				err = svc.UpdateEntityBywheretbl(OilSupplierCertName, &supplierCert, cols, "SupplierId='"+companyCode+"' and SupplierTypeCode='03'")
 			}else{
 				model.Jfstatus=""
 			}
@@ -631,4 +693,42 @@ func (this *BadRecordController) BackCompanyBadRecord() {
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 
+}
+
+// @Title 获取企业不良历史
+// @Description get badrecord
+// @Success 200 {object}
+// @router /getbadlist [post]
+func (this *BadRecordController) GetBadList() {
+
+	companyId := this.GetString("companyId")
+	companytype := this.GetString("companyType")
+
+	//获取分页信息
+	page := this.GetPageInfoForm() //包括当前页、每页书数量
+
+	var where string = " 1=1"
+
+	if companyId != "" {
+		where = where + " and SupplierId=" + companyId
+	}
+	if companytype != "" {
+		where = where + " and SupplierTypeCode='" + companytype + "'"
+	}
+
+	orderby := "Id"
+	asc := false
+
+	svc := BadRecord.GetBadRecordService(utils.DBE) //获得数据库引擎
+	var list []BadRecord.BadRecordHistory
+	total := svc.GetPagingEntitiesWithOrder(page.CurrentPage, page.Size, orderby, asc, &list, where)
+
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = page.CurrentPage
+	datainfo.ItemsPerPage = page.Size
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+
 }

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertsub.go

@@ -35,7 +35,7 @@ func (this *OilSupplierCertSubController) GetEntityList() {
 	//获取分页信息
 	page := this.GetPageInfoForm()
 	where := " 1=1 "
-	orderby := "Id"
+	orderby := "CertSubStatus, Code"
 	asc := false
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")

src/dashoo.cn/frontend_web/src/api/oilsupplier/oilclassorgset.js

@@ -139,5 +139,12 @@ export default {
       url: '/badrecord/backcompanybadrecord?id=' + id,
       method: 'get'
     })
+  },
+  getBadList (params, myAxios) {
+    return myAxios({
+      url: '/badrecord/getbadlist',
+      method: 'post',
+      params: params
+    })
   }
 }

src/dashoo.cn/frontend_web/src/pages/oilsupplier/badrecord/index.vue

@@ -220,7 +220,7 @@
 
     <!-- 添加框（默认隐藏） -->
     <el-dialog :title="addShowTitle"
-               :visible.sync="addshow" :before-close="handleClose"
+               :visible.sync="addshow"
                 width="85%">
       <!-- <el-form :model="entityForm"
                :rules="rules"
@@ -325,120 +325,297 @@
       </span> -->
       <el-tabs type="border-card">
         <el-tab-pane label="企业">
-          <el-form :model="entityForm"
-                   ref="EntityFormref"
+          <el-form :model="badForm"
+                   ref="badFormref"
                    label-width="80px"
                    :rules="rules">
-            <el-form-item label="企业名称"
-                          prop="CompanyName">
-              <el-input placeholder="请选择企业名称"
-                        v-model="entityForm.CompanyName"
-                        readonly
-                        style="width:100%">
-                <el-button type="primary"
-                           style="width:30%"
-                           :disabled="isChooseDisable"
-                           @click="companyDialog = true"
-                           slot="append">选择</el-button>
-              </el-input>
-            </el-form-item>
             <el-card class="box-card1"
-                     shadow="never"
-                     v-if="wzFlag">
+                     shadow="never">
               <div slot="header">
-                <span>物资类</span>
+                <span>变更不良行为</span>
               </div>
-              <div>
-
-                <el-form-item label="状态">
-                  <el-select v-model="entityForm.WZStatus"
-                             placeholder="请选择"
-                             style="width:20%"
-                             size="mini">
-                    <el-option v-for="item in options"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="企业名称"
+                                prop="CompanyName">
+                    <el-input placeholder="请选择企业名称"
+                              v-model="badForm.CompanyName"
+                              readonly
+                              style="width:100%">
+                      <el-button type="primary"
+                                 style="width:30%"
+                                 :disabled="isChooseDisable"
+                                 @click="companyDialog = true"
+                                 slot="append">选择</el-button>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                  <el-form-item label="类别" prop="Type">
+                    <el-select
+                               placeholder="请选择"
+                               style="width:100%"
+                               size="mini" v-model="badForm.Type">
+                      <el-option v-for="item in typeOptions"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value"
+                                 size="mini">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                  <el-form-item label="状态" prop="Status">
+                    <el-select v-model="badForm.Status"
+                               placeholder="请选择"
+                               style="width:100%"
                                size="mini">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="不良行为">
-                  <el-input type="textarea"
-                            size="mini"
-                            style="width:100%"
-                            v-model="entityForm.WZRecord"></el-input>
-                </el-form-item>
+                      <el-option v-for="item in options"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value"
+                                 size="mini">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="不良行为" prop="Record">
+                    <el-input type="textarea"
+                              size="mini"
+                              style="width:100%"
+                              v-model="badForm.Record"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <div style="margin-bottom: 6px;float:right">
+                <el-button type="primary"
+                           size="small"
+                           @click="addAnnualAudit()">确 定</el-button>
               </div>
             </el-card>
             <el-card class="box-card1"
-                     shadow="never"
-                     v-if="jjFlag">
+                  shadow="never">
               <div slot="header">
-                <span>基建类</span>
+                <span>历史记录</span>
               </div>
-              <div>
+              <el-tabs type="border-card"
+                       style="margin-top:-7px"
+                       @tab-click="handleClick"
+                       v-model="activeName1">
+                <el-tab-pane label="物资类"
+                             name="first">
+                  <el-table size="mini"
+                            :data="wzList"
+                            border
+                            height="300px">
+                    <el-table-column width="150" property="CreateOn" label="操作时间">
+                      <template slot-scope="scope">
+                        {{ jstimehandle(scope.row.Createon+'') }}
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="CertSubStatus"
+                                     label="状态"
+                                     width="100px"
+                                     align="center"
+                                     show-overflow-tooltip>
+                      <template slot-scope="scope">
+                        <span style="color: #67C23A" v-if="scope.row.CertSubStatus=='1'">准入</span>
+                        <span style="color: #E6A23C" v-else-if="scope.row.CertSubStatus=='2'">暂停</span>
+                        <span style="color: #F56C6C" v-else-if="scope.row.CertSubStatus=='3'">取消</span>
+                        <span v-else>——</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="BackReason"
+                                     label="原因"
+                                     align="center"
+                                     show-overflow-tooltip></el-table-column>
+                  </el-table>
+                  <el-pagination @size-change="handleWZSizeChange"
+                                 @current-change="handleWZCurrentChange"
+                                 :current-page="wzCurrentPage"
+                                 :page-sizes="[10, 15, 20, 25]"
+                                 :page-size="wzSize"
+                                 layout="total, sizes, prev, pager, next, jumper"
+                                 :total="wzCurrentItemCount"></el-pagination>
+                </el-tab-pane>
+                <el-tab-pane label="基建类"
+                             name="second">
+                  <el-table size="mini"
+                            :data="jjList"
+                            border
+                            height="300px">
+                    <el-table-column width="150" property="CreateOn" label="操作时间">
+                      <template slot-scope="scope">
+                        {{ jstimehandle(scope.row.Createon+'') }}
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="CertSubStatus"
+                                     label="状态"
+                                     width="100px"
+                                     align="center"
+                                     show-overflow-tooltip>
+                      <template slot-scope="scope">
+                        <span style="color: #67C23A" v-if="scope.row.CertSubStatus=='1'">准入</span>
+                        <span style="color: #E6A23C" v-else-if="scope.row.CertSubStatus=='2'">暂停</span>
+                        <span style="color: #F56C6C" v-else-if="scope.row.CertSubStatus=='3'">取消</span>
+                        <span v-else>——</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="BackReason"
+                                     label="原因"
+                                     align="center"
+                                     show-overflow-tooltip></el-table-column>
+                  </el-table>
+                  <el-pagination @size-change="handleJJSizeChange"
+                                 @current-change="handleJJCurrentChange"
+                                 :current-page="jjCurrentPage"
+                                 :page-sizes="[10, 15, 20, 25]"
+                                 :page-size="jjSize"
+                                 layout="total, sizes, prev, pager, next, jumper"
+                                 :total="jjCurrentItemCount"></el-pagination>
+                </el-tab-pane>
+                <el-tab-pane label="技术服务类"
+                             name="third">
+                  <el-table size="mini"
+                            :data="jfList"
+                            border
+                            height="300px">
+                    <el-table-column width="150" property="CreateOn" label="操作时间">
+                      <template slot-scope="scope">
+                        {{ jstimehandle(scope.row.Createon+'') }}
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="CertSubStatus"
+                                     label="状态"
+                                     width="100px"
+                                     align="center"
+                                     show-overflow-tooltip>
+                      <template slot-scope="scope">
+                        <span style="color: #67C23A" v-if="scope.row.CertSubStatus=='1'">准入</span>
+                        <span style="color: #E6A23C" v-else-if="scope.row.CertSubStatus=='2'">暂停</span>
+                        <span style="color: #F56C6C" v-else-if="scope.row.CertSubStatus=='3'">取消</span>
+                        <span v-else>——</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="BackReason"
+                                     label="原因"
+                                     align="center"
+                                     show-overflow-tooltip></el-table-column>
+                  </el-table>
+                  <el-pagination @size-change="handleJFSizeChange"
+                                 @current-change="handleJFCurrentChange"
+                                 :current-page="jfCurrentPage"
+                                 :page-sizes="[10, 15, 20, 25]"
+                                 :page-size="jfSize"
+                                 layout="total, sizes, prev, pager, next, jumper"
+                                 :total="jfCurrentItemCount"></el-pagination>
+                </el-tab-pane>
+              </el-tabs>
 
-                <el-form-item label="状态">
-                  <el-select v-model="entityForm.JJStatus"
-                             placeholder="请选择"
-                             style="width:20%"
-                             size="mini">
-                    <el-option v-for="item in options"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"
-                               size="mini">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="不良行为">
-                  <el-input type="textarea"
-                            size="mini"
-                            style="width:100%"
-                            v-model="entityForm.JJRecord"></el-input>
-                </el-form-item>
 
-              </div>
             </el-card>
-            <el-card class="box-card1"
-                     shadow="never"
-                     v-if="jfFlag">
-              <div slot="header">
-                <span>技术服务类</span>
-              </div>
-              <div>
+            <!--<el-card class="box-card1"-->
+                     <!--shadow="never"-->
+                     <!--v-if="wzFlag">-->
+              <!--<div slot="header">-->
+                <!--<span>物资类</span>-->
+                <!--<el-button type="primary" size="mini" style="float: right; margin-top: -5px" @click="openHistory()">历史记录</el-button>-->
+              <!--</div>-->
+              <!--<div>-->
 
-                <el-form-item label="状态">
-                  <el-select v-model="entityForm.JFStatus"
-                             placeholder="请选择"
-                             style="width:20%"
-                             size="mini">
-                    <el-option v-for="item in options"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"
-                               size="mini">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="不良行为">
-                  <el-input type="textarea"
-                            size="mini"
-                            style="width:100%"
-                            v-model="entityForm.JFRecord"></el-input>
-                </el-form-item>
+                <!--<el-form-item label="状态">-->
+                  <!--<el-select v-model="entityForm.WZStatus"-->
+                             <!--placeholder="请选择"-->
+                             <!--style="width:20%"-->
+                             <!--size="mini">-->
+                    <!--<el-option v-for="item in options"-->
+                               <!--:key="item.value"-->
+                               <!--:label="item.label"-->
+                               <!--:value="item.value"-->
+                               <!--size="mini">-->
+                    <!--</el-option>-->
+                  <!--</el-select>-->
+                <!--</el-form-item>-->
+                <!--<el-form-item label="不良行为">-->
+                  <!--<el-input type="textarea"-->
+                            <!--size="mini"-->
+                            <!--style="width:100%"-->
+                            <!--v-model="entityForm.WZRecord"></el-input>-->
+                <!--</el-form-item>-->
+              <!--</div>-->
+            <!--</el-card>-->
+            <!--<el-card class="box-card1"-->
+                     <!--shadow="never"-->
+                     <!--v-if="jjFlag">-->
+              <!--<div slot="header">-->
+                <!--<span>基建类</span>-->
+                <!--<el-button type="primary" size="mini" style="float: right; margin-top: -5px" @click="openHistory()">历史记录</el-button>-->
+              <!--</div>-->
+              <!--<div>-->
 
-              </div>
-            </el-card>
+                <!--<el-form-item label="状态">-->
+                  <!--<el-select v-model="entityForm.JJStatus"-->
+                             <!--placeholder="请选择"-->
+                             <!--style="width:20%"-->
+                             <!--size="mini">-->
+                    <!--<el-option v-for="item in options"-->
+                               <!--:key="item.value"-->
+                               <!--:label="item.label"-->
+                               <!--:value="item.value"-->
+                               <!--size="mini">-->
+                    <!--</el-option>-->
+                  <!--</el-select>-->
+                <!--</el-form-item>-->
+                <!--<el-form-item label="不良行为">-->
+                  <!--<el-input type="textarea"-->
+                            <!--size="mini"-->
+                            <!--style="width:100%"-->
+                            <!--v-model="entityForm.JJRecord"></el-input>-->
+                <!--</el-form-item>-->
+
+              <!--</div>-->
+            <!--</el-card>-->
+            <!--<el-card class="box-card1"-->
+                     <!--shadow="never"-->
+                     <!--v-if="jfFlag">-->
+              <!--<div slot="header">-->
+                <!--<span>技术服务类</span>-->
+                <!--<el-button type="primary" size="mini" style="float: right; margin-top: -5px" @click="openHistory()">历史记录</el-button>-->
+              <!--</div>-->
+              <!--<div>-->
+
+                <!--<el-form-item label="状态">-->
+                  <!--<el-select v-model="entityForm.JFStatus"-->
+                             <!--placeholder="请选择"-->
+                             <!--style="width:20%"-->
+                             <!--size="mini">-->
+                    <!--<el-option v-for="item in options"-->
+                               <!--:key="item.value"-->
+                               <!--:label="item.label"-->
+                               <!--:value="item.value"-->
+                               <!--size="mini">-->
+                    <!--</el-option>-->
+                  <!--</el-select>-->
+                <!--</el-form-item>-->
+                <!--<el-form-item label="不良行为">-->
+                  <!--<el-input type="textarea"-->
+                            <!--size="mini"-->
+                            <!--style="width:100%"-->
+                            <!--v-model="entityForm.JFRecord"></el-input>-->
+                <!--</el-form-item>-->
+
+              <!--</div>-->
+            <!--</el-card>-->
           </el-form>
-          <div style="margin-top:5px;float:right">
-            <el-button size="small"
-                       @click="addshow = false">取 消</el-button>
-            <el-button type="primary"
-                       size="small"
-                       @click="addAnnualAudit()">确 定</el-button>
-          </div>
+          <!--<div style="margin-top:5px;float:right">-->
+            <!--<el-button size="small"-->
+                       <!--@click="addshow = false">取 消</el-button>-->
+            <!--<el-button type="primary"-->
+                       <!--size="small"-->
+                       <!--@click="addAnnualAudit()">确 定</el-button>-->
+          <!--</div>-->
         </el-tab-pane>
         <el-tab-pane label="准入范围">
           <!--<el-form label-width="80px"-->
@@ -630,13 +807,13 @@
             </el-tab-pane>
           </el-tabs>
 
-          <div style="margin-top:5px;float:right">
-            <el-button size="small"
-                       @click="addshow = false">取 消</el-button>
-            <el-button type="primary"
-                       size="small"
-                       @click="addAnnualAudit()">保 存</el-button>
-          </div>
+          <!--<div style="margin-top:5px;float:right">-->
+            <!--<el-button size="small"-->
+                       <!--@click="addshow = false">取 消</el-button>-->
+            <!--<el-button type="primary"-->
+                       <!--size="small"-->
+                       <!--@click="addAnnualAudit()">保 存</el-button>-->
+          <!--</div>-->
         </el-tab-pane>
       </el-tabs>
       <el-dialog
@@ -770,6 +947,7 @@ export default {
       tcTemp: '',
       yChooseCert: '',
       activeName: 'first',
+      activeName1: 'first',
       goodsSelection: [],
       basisSelection: [],
       tcSelection: [],
@@ -777,6 +955,7 @@ export default {
       basisList: [],
       tcList: [],
       certNames: '',
+      typeOptions: [],
       options: [{
         value: '1',
         label: '准入',
@@ -807,6 +986,20 @@ export default {
       size1: 10,
       goodsSize: 10,
       basisSize: 10,
+
+      wzList: [],
+      jjList: [],
+      jfList: [],
+      wzSize: 10,
+      jjSize: 10,
+      jfSize: 10,
+      wzCurrentPage: 1,
+      jjCurrentPage: 1,
+      jfCurrentPage: 1,
+      wzCurrentItemCount: 0,
+      jjCurrentItemCount: 0,
+      jfCurrentItemCount: 0,
+
       tcSize: 10,
       currentPage: 1,
       currentPage1: 1,
@@ -820,6 +1013,13 @@ export default {
       currentTCItemCount: 0,
       Bak2: [],
       Bak22: [],
+      badForm: {
+        CompanyCode: '',
+        CompanyName: '',
+        Type: '',
+        Status: '',
+        Record: ''
+      },
       entityForm: {
         CompanyCode: '',
         CompanyName: '',
@@ -846,11 +1046,16 @@ export default {
       },
       rules: {
         CompanyName: [
-          {
-            required: true,
-            message: '请输入企业名称',
-            trigger: 'change'
-          }
+          {required: true, message: '请输入企业名称', trigger: 'change'}
+        ],
+        Type: [
+          {required: true, message: '请选择类别', trigger: 'change'}
+        ],
+        Status: [
+          {required: true, message: '请选择状态', trigger: 'change'}
+        ],
+        Record: [
+          {required: true, message: '请输入变更原因', trigger: 'change'}
         ]
         // Bak3: [
         //   {
@@ -884,6 +1089,57 @@ export default {
   },
 
   methods: {
+    getWZBadList () {
+      let params = {
+        _size: this.wzSize,
+        _currentPage: this.wzCurrentPage,
+        companyId: this.companyId,
+        companyType: '01'
+      }
+      setapi
+        .getBadList(params, this.$axios)
+        .then(res => {
+          this.wzList = res.data.items
+          this.wzCurrentItemCount = res.data.currentItemCount
+        })
+        .catch(err => {
+          console.error(err)
+        })
+    },
+    getJJBadList () {
+      let params = {
+        _size: this.jjSize,
+        _currentPage: this.jjCurrentPage,
+        companyId: this.companyId,
+        companyType: '02'
+      }
+      setapi
+        .getBadList(params, this.$axios)
+        .then(res => {
+          this.jjList = res.data.items
+          this.jjCurrentItemCount = res.data.currentItemCount
+        })
+        .catch(err => {
+          console.error(err)
+        })
+    },
+    getJFBadList () {
+      let params = {
+        _size: this.jfSize,
+        _currentPage: this.jfCurrentPage,
+        companyId: this.companyId,
+        companyType: '03'
+      }
+      setapi
+        .getBadList(params, this.$axios)
+        .then(res => {
+          this.jfList = res.data.items
+          this.jfCurrentItemCount = res.data.currentItemCount
+        })
+        .catch(err => {
+          console.error(err)
+        })
+    },
     handleClose () {
       this.$confirm('是否保存？')
         .then(_ => {
@@ -1049,6 +1305,8 @@ export default {
       // this.yChooseCert = ''
       this.entityForm.CompanyCode = val.Id
       this.entityForm.CompanyName = val.SupplierName
+      this.badForm.CompanyCode = val.Id
+      this.badForm.CompanyName = val.SupplierName
       this.serachCertType(val.Id)
       // 搜索该公司是否有准入
       this.serachCertByCompany(val.Id)
@@ -1083,15 +1341,28 @@ export default {
       setapi
         .serachCertType(val, this.$axios)
         .then(res => {
+          this.typeOptions = []
           this.wzFlag = res.data.items[0]
+          if (this.wzFlag) {
+            this.typeOptions.push({value: '01', label: '物资类'})
+          }
           this.jjFlag = res.data.items[1]
+          if (this.jjFlag) {
+            this.typeOptions.push({value: '02', label: '基建类'})
+          }
           this.jfFlag = res.data.items[2]
+          if (this.jfFlag) {
+            this.typeOptions.push({value: '03', label: '技术服务类'})
+          }
           // 搜索该公司badrecord表返显
           this.backCompanyBadRecord(val)
         })
     },
     serachCertByCompany (companyId) {
       this.companyId = companyId
+      this.getWZBadList()
+      this.getJJBadList()
+      this.getJFBadList()
       this.serachGoodsCertByCompany()
       this.serachBasisCertByCompany()
       this.serachTCCertByCompany()
@@ -1256,6 +1527,8 @@ export default {
       this.isChooseDisable = true
       this.entityForm.CompanyCode = row.Companycode
       this.entityForm.CompanyName = row.Companyname
+      this.badForm.CompanyCode = row.Companycode
+      this.badForm.CompanyName = row.Companyname
       this.serachCertType(row.Companycode)
       this.serachCertByCompany(row.Companycode)
 
@@ -1344,63 +1617,23 @@ export default {
       this.jjFlag = false
       this.jfFlag = false
       this.addShowTitle = '添加不良行为'
-      if (this.$refs['EntityFormref'] !== undefined) {
-        this.$refs['EntityFormref'].resetFields()
+      if (this.$refs['badFormref'] !== undefined) {
+        this.$refs['badFormref'].resetFields()
       }
     },
     // 增加方法
     addAnnualAudit () {
-      // 处理时间段
-      // if (this.Bak2 && this.Bak2.length !== 0) {
-      //   var startDate = this.formatDateTime(this.Bak2[0])
-      //   var endDate = this.formatDateTime(this.Bak2[1])
-      //   this.entityForm.Bak2 = startDate + ' 至 ' + endDate
-      // }
-      // 判断是什么暂停
-      // if (this.certNames !== '') {
-      //   this.isFlag = '1'
-      // } else {
-      //   this.isFlag = '0'
-      // }
-      // 处理选中的数组
-      // var goodsString = ''
-      // if (this.goodsSelection.length !== 0) {
-      //   for (var i = 0; i < this.goodsSelection.length; i++) {
-      //     goodsString = goodsString + this.goodsSelection[i].Id + ','
-      //   }
-      //   goodsString = goodsString.substring(0, goodsString.length - 1)
-      // }
-
-      // var basisString = ''
-      // if (this.basisSelection.length !== 0) {
-      //   for (var j = 0; j < this.basisSelection.length; j++) {
-      //     basisString = basisString + this.basisSelection[j].Id + ','
-      //   }
-      //   basisString = basisString.substring(0, basisString.length - 1)
-      // }
-
-      // var tcString = ''
-      // if (this.tcSelection.length !== 0) {
-      //   for (var k = 0; k < this.tcSelection.length; k++) {
-      //     tcString = tcString + this.tcSelection[k].Id + ','
-      //   }
-      //   tcString = tcString.substring(0, tcString.length - 1)
-      // }
-      // let params = {
-      //   _isFlag: this.isFlag,
-      //   _goodsString: goodsString,
-      //   _basisString: basisString,
-      //   _tcString: tcString
-      // }
-      this.$refs['EntityFormref'].validate(valid => {
+      this.$refs['badFormref'].validate(valid => {
         if (valid) {
           setapi
-            .addBadRecord(this.entityForm, this.$axios)
+            .addBadRecord(this.badForm, this.$axios)
             .then(res => {
               if (res.data.code !== -1) {
                 // 刷新列表
                 this.initDatas()
-                this.addshow = false
+                this.getWZBadList()
+                this.getJJBadList()
+                this.getJFBadList()
                 this.$message({
                   type: 'success',
                   message: res.data.message
@@ -1551,6 +1784,35 @@ export default {
       this.currentTCPage = 1
       this.serachTCCertByCompany()
     },
+
+    handleWZSizeChange (value) {
+      this.wzSize = value
+      this.wzCurrentPage = 1
+      this.getWZBadList()
+    },
+    handleWZCurrentChange (value) {
+      this.wzCurrentPage = value
+      this.getWZBadList()
+    },
+    handleJJSizeChange (value) {
+      this.jjSize = value
+      this.jjCurrentPage = 1
+      this.getJJBadList()
+    },
+    handleJJCurrentChange (value) {
+      this.jjCurrentPage = value
+      this.getJJBadList()
+    },
+    handleJFSizeChange (value) {
+      this.jfSize = value
+      this.jfCurrentPage = 1
+      this.getJFBadList()
+    },
+    handleJFCurrentChange (value) {
+      this.jfCurrentPage = value
+      this.getJFBadList()
+    },
+
     searchCommand (command) {
       if (command === 'clear') {
         this.clearSearch()

src/dashoo.cn/frontend_web/src/pages/select/badrecordselect/index.vue

@@ -83,11 +83,11 @@
                          width="100px">
           <template slot-scope="scope">
             <span v-if="scope.row.Wzstatus=='1'"
-                  style="color:#67C23A">准入</span>
+                  style="color:#67C23A; cursor:pointer;"  @click="openedit(scope.row, 'first')">准入</span>
             <span v-else-if="scope.row.Wzstatus=='2'"
-                  style="color:#E6A23C">暂停</span>
+                  style="color:#E6A23C; cursor:pointer;" @click="openedit(scope.row, 'first')">暂停</span>
             <span v-else-if="scope.row.Wzstatus=='3'"
-                  style="color:#F56C6C">取消</span>
+                  style="color:#F56C6C; cursor:pointer;" @click="openedit(scope.row, 'first')">取消</span>
             <span v-else>——</span>
           </template>
         </el-table-column>
@@ -101,11 +101,11 @@
                          width="100px">
           <template slot-scope="scope">
             <span v-if="scope.row.Jjstatus=='1'"
-                  style="color:#67C23A">准入</span>
+                  style="color:#67C23A; cursor:pointer;" @click="openedit(scope.row, 'second')">准入</span>
             <span v-else-if="scope.row.Jjstatus=='2'"
-                  style="color:#E6A23C">暂停</span>
+                  style="color:#E6A23C; cursor:pointer;" @click="openedit(scope.row, 'second')">暂停</span>
             <span v-else-if="scope.row.Jjstatus=='3'"
-                  style="color:#F56C6C">取消</span>
+                  style="color:#F56C6C; cursor:pointer;" @click="openedit(scope.row, 'second')">取消</span>
             <span v-else>——</span>
           </template>
         </el-table-column>
@@ -119,11 +119,11 @@
                          width="150px">
           <template slot-scope="scope">
             <span v-if="scope.row.Jfstatus=='1'"
-                  style="color:#67C23A">准入</span>
+                  style="color:#67C23A; cursor:pointer;" @click="openedit(scope.row, 'third')">准入</span>
             <span v-else-if="scope.row.Jfstatus=='2'"
-                  style="color:#E6A23C">暂停</span>
+                  style="color:#E6A23C; cursor:pointer;" @click="openedit(scope.row, 'third')">暂停</span>
             <span v-else-if="scope.row.Jfstatus=='3'"
-                  style="color:#F56C6C">取消</span>
+                  style="color:#F56C6C; cursor:pointer;" @click="openedit(scope.row, 'third')">取消</span>
             <span v-else>——</span>
           </template>
         </el-table-column>
@@ -137,7 +137,7 @@
                          prop="Bak1"
                          :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span style="color: #F56C6C" v-if="scope.row.Bak1 != '0'">暂停{{scope.row.Bak1}}条</span>
+            <span style="color: #F56C6C; cursor:pointer;" v-if="scope.row.Bak1 != '0'" @click="opencert(scope.row, 'second')">暂停{{scope.row.Bak1}}条</span>
             <span v-else></span>
           </template>
         </el-table-column>
@@ -226,121 +226,242 @@
     <el-dialog :title="addShowTitle"
                :visible.sync="addshow"
                width="85%">
-      <el-tabs type="border-card">
-        <el-tab-pane label="企业">
-          <el-form :model="entityForm"
-                   ref="EntityFormref"
-                   label-width="80px"
-                   :rules="rules">
-            <el-form-item label="企业名称"
-                          prop="CompanyName">
-              <el-input placeholder="请选择企业名称"
-                        v-model="entityForm.CompanyName"
-                        readonly
-                        style="width:100%">
-                <el-button type="primary"
-                           style="width:30%"
-                           :disabled="isChooseDisable"
-                           @click="companyDialog = true"
-                           slot="append">选择</el-button>
-              </el-input>
-            </el-form-item>
-            <el-card class="box-card1"
-                     shadow="never"
-                     v-if="wzFlag">
-              <div slot="header">
-                <span>物资类</span>
-              </div>
-              <div>
+      <el-tabs type="border-card" v-model="activeName2">
+        <el-tab-pane label="企业" name="first">
+          <el-card class="box-card1"
+                   shadow="never">
+            <div slot="header">
+              <span>历史记录</span>
+            </div>
+            <el-tabs type="border-card"
+                     style="margin-top:-7px"
+                     @tab-click="handleClick"
+                     v-model="activeName1">
+              <el-tab-pane label="物资类"
+                           name="first">
+                <el-table size="mini"
+                          :data="wzList"
+                          border
+                          height="300px">
+                  <el-table-column width="150" property="CreateOn" label="操作时间">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.Createon+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="CertSubStatus"
+                                   label="状态"
+                                   width="100px"
+                                   align="center"
+                                   show-overflow-tooltip>
+                    <template slot-scope="scope">
+                      <span style="color: #67C23A" v-if="scope.row.CertSubStatus=='1'">准入</span>
+                      <span style="color: #E6A23C" v-else-if="scope.row.CertSubStatus=='2'">暂停</span>
+                      <span style="color: #F56C6C" v-else-if="scope.row.CertSubStatus=='3'">取消</span>
+                      <span v-else>——</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="BackReason"
+                                   label="原因"
+                                   align="center"
+                                   show-overflow-tooltip></el-table-column>
+                </el-table>
+                <el-pagination @size-change="handleWZSizeChange"
+                               @current-change="handleWZCurrentChange"
+                               :current-page="wzCurrentPage"
+                               :page-sizes="[10, 15, 20, 25]"
+                               :page-size="wzSize"
+                               layout="total, sizes, prev, pager, next, jumper"
+                               :total="wzCurrentItemCount"></el-pagination>
+              </el-tab-pane>
+              <el-tab-pane label="基建类"
+                           name="second">
+                <el-table size="mini"
+                          :data="jjList"
+                          border
+                          height="300px">
+                  <el-table-column width="150" property="CreateOn" label="操作时间">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.Createon+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="CertSubStatus"
+                                   label="状态"
+                                   width="100px"
+                                   align="center"
+                                   show-overflow-tooltip>
+                    <template slot-scope="scope">
+                      <span style="color: #67C23A" v-if="scope.row.CertSubStatus=='1'">准入</span>
+                      <span style="color: #E6A23C" v-else-if="scope.row.CertSubStatus=='2'">暂停</span>
+                      <span style="color: #F56C6C" v-else-if="scope.row.CertSubStatus=='3'">取消</span>
+                      <span v-else>——</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="BackReason"
+                                   label="原因"
+                                   align="center"
+                                   show-overflow-tooltip></el-table-column>
+                </el-table>
+                <el-pagination @size-change="handleJJSizeChange"
+                               @current-change="handleJJCurrentChange"
+                               :current-page="jjCurrentPage"
+                               :page-sizes="[10, 15, 20, 25]"
+                               :page-size="jjSize"
+                               layout="total, sizes, prev, pager, next, jumper"
+                               :total="jjCurrentItemCount"></el-pagination>
+              </el-tab-pane>
+              <el-tab-pane label="技术服务类"
+                           name="third">
+                <el-table size="mini"
+                          :data="jfList"
+                          border
+                          height="300px">
+                  <el-table-column width="150" property="CreateOn" label="操作时间">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.Createon+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="CertSubStatus"
+                                   label="状态"
+                                   width="100px"
+                                   align="center"
+                                   show-overflow-tooltip>
+                    <template slot-scope="scope">
+                      <span style="color: #67C23A" v-if="scope.row.CertSubStatus=='1'">准入</span>
+                      <span style="color: #E6A23C" v-else-if="scope.row.CertSubStatus=='2'">暂停</span>
+                      <span style="color: #F56C6C" v-else-if="scope.row.CertSubStatus=='3'">取消</span>
+                      <span v-else>——</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="BackReason"
+                                   label="原因"
+                                   align="center"
+                                   show-overflow-tooltip></el-table-column>
+                </el-table>
+                <el-pagination @size-change="handleJFSizeChange"
+                               @current-change="handleJFCurrentChange"
+                               :current-page="jfCurrentPage"
+                               :page-sizes="[10, 15, 20, 25]"
+                               :page-size="jfSize"
+                               layout="total, sizes, prev, pager, next, jumper"
+                               :total="jfCurrentItemCount"></el-pagination>
+              </el-tab-pane>
+            </el-tabs>
 
-                <el-form-item label="状态">
-                  <el-select v-model="entityForm.WZStatus"
-                             placeholder="请选择"
-                             style="width:20%"
-                             disabled
-                             size="mini">
-                    <el-option v-for="item in options"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"
-                               size="mini">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="不良行为">
-                  <el-input type="textarea"
-                            size="mini"
-                            style="width:100%"
-                            readonly
-                            v-model="entityForm.WZRecord"></el-input>
-                </el-form-item>
-              </div>
-            </el-card>
-            <el-card class="box-card1"
-                     shadow="never"
-                     v-if="jjFlag">
-              <div slot="header">
-                <span>基建类</span>
-              </div>
-              <div>
 
-                <el-form-item label="状态">
-                  <el-select v-model="entityForm.JJStatus"
-                             placeholder="请选择"
-                             style="width:20%"
-                             disabled
-                             size="mini">
-                    <el-option v-for="item in options"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"
-                               size="mini">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="不良行为">
-                  <el-input type="textarea"
-                            size="mini"
-                            style="width:100%"
-                            readonly
-                            v-model="entityForm.JJRecord"></el-input>
-                </el-form-item>
+          </el-card>
+          <!--<el-form :model="entityForm"-->
+                   <!--ref="EntityFormref"-->
+                   <!--label-width="80px"-->
+                   <!--:rules="rules">-->
+            <!--<el-form-item label="企业名称"-->
+                          <!--prop="CompanyName">-->
+              <!--<el-input placeholder="请选择企业名称"-->
+                        <!--v-model="entityForm.CompanyName"-->
+                        <!--readonly-->
+                        <!--style="width:100%">-->
+                <!--<el-button type="primary"-->
+                           <!--style="width:30%"-->
+                           <!--:disabled="isChooseDisable"-->
+                           <!--@click="companyDialog = true"-->
+                           <!--slot="append">选择</el-button>-->
+              <!--</el-input>-->
+            <!--</el-form-item>-->
+            <!--<el-card class="box-card1"-->
+                     <!--shadow="never"-->
+                     <!--v-if="wzFlag">-->
+              <!--<div slot="header">-->
+                <!--<span>物资类</span>-->
+              <!--</div>-->
+              <!--<div>-->
 
-              </div>
-            </el-card>
-            <el-card class="box-card1"
-                     shadow="never"
-                     v-if="jfFlag">
-              <div slot="header">
-                <span>技术服务类</span>
-              </div>
-              <div>
+                <!--<el-form-item label="状态">-->
+                  <!--<el-select v-model="entityForm.WZStatus"-->
+                             <!--placeholder="请选择"-->
+                             <!--style="width:20%"-->
+                             <!--disabled-->
+                             <!--size="mini">-->
+                    <!--<el-option v-for="item in options"-->
+                               <!--:key="item.value"-->
+                               <!--:label="item.label"-->
+                               <!--:value="item.value"-->
+                               <!--size="mini">-->
+                    <!--</el-option>-->
+                  <!--</el-select>-->
+                <!--</el-form-item>-->
+                <!--<el-form-item label="不良行为">-->
+                  <!--<el-input type="textarea"-->
+                            <!--size="mini"-->
+                            <!--style="width:100%"-->
+                            <!--readonly-->
+                            <!--v-model="entityForm.WZRecord"></el-input>-->
+                <!--</el-form-item>-->
+              <!--</div>-->
+            <!--</el-card>-->
+            <!--<el-card class="box-card1"-->
+                     <!--shadow="never"-->
+                     <!--v-if="jjFlag">-->
+              <!--<div slot="header">-->
+                <!--<span>基建类</span>-->
+              <!--</div>-->
+              <!--<div>-->
 
-                <el-form-item label="状态">
-                  <el-select v-model="entityForm.JFStatus"
-                             placeholder="请选择"
-                             style="width:20%"
-                             disabled
-                             size="mini">
-                    <el-option v-for="item in options"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value"
-                               size="mini">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="不良行为">
-                  <el-input type="textarea"
-                            size="mini"
-                            style="width:100%"
-                            readonly
-                            v-model="entityForm.JFRecord"></el-input>
-                </el-form-item>
+                <!--<el-form-item label="状态">-->
+                  <!--<el-select v-model="entityForm.JJStatus"-->
+                             <!--placeholder="请选择"-->
+                             <!--style="width:20%"-->
+                             <!--disabled-->
+                             <!--size="mini">-->
+                    <!--<el-option v-for="item in options"-->
+                               <!--:key="item.value"-->
+                               <!--:label="item.label"-->
+                               <!--:value="item.value"-->
+                               <!--size="mini">-->
+                    <!--</el-option>-->
+                  <!--</el-select>-->
+                <!--</el-form-item>-->
+                <!--<el-form-item label="不良行为">-->
+                  <!--<el-input type="textarea"-->
+                            <!--size="mini"-->
+                            <!--style="width:100%"-->
+                            <!--readonly-->
+                            <!--v-model="entityForm.JJRecord"></el-input>-->
+                <!--</el-form-item>-->
 
-              </div>
-            </el-card>
-          </el-form>
+              <!--</div>-->
+            <!--</el-card>-->
+            <!--<el-card class="box-card1"-->
+                     <!--shadow="never"-->
+                     <!--v-if="jfFlag">-->
+              <!--<div slot="header">-->
+                <!--<span>技术服务类</span>-->
+              <!--</div>-->
+              <!--<div>-->
+
+                <!--<el-form-item label="状态">-->
+                  <!--<el-select v-model="entityForm.JFStatus"-->
+                             <!--placeholder="请选择"-->
+                             <!--style="width:20%"-->
+                             <!--disabled-->
+                             <!--size="mini">-->
+                    <!--<el-option v-for="item in options"-->
+                               <!--:key="item.value"-->
+                               <!--:label="item.label"-->
+                               <!--:value="item.value"-->
+                               <!--size="mini">-->
+                    <!--</el-option>-->
+                  <!--</el-select>-->
+                <!--</el-form-item>-->
+                <!--<el-form-item label="不良行为">-->
+                  <!--<el-input type="textarea"-->
+                            <!--size="mini"-->
+                            <!--style="width:100%"-->
+                            <!--readonly-->
+                            <!--v-model="entityForm.JFRecord"></el-input>-->
+                <!--</el-form-item>-->
+
+              <!--</div>-->
+            <!--</el-card>-->
+          <!--</el-form>-->
           <!-- <div style="margin-top:5px;float:right">
             <el-button size="small"
                        @click="addshow = false">取 消</el-button>
@@ -349,7 +470,7 @@
                        @click="addAnnualAudit()">确 定</el-button>
           </div> -->
         </el-tab-pane>
-        <el-tab-pane label="准入范围">
+        <el-tab-pane label="准入范围" name="second">
           <div style="width:100%;height:50px;margin-top:-15px">
             <el-button type="primary"
                        style="float:right;margin-top:6.5px"
@@ -517,14 +638,14 @@
                              :total="currentTCItemCount"></el-pagination>
             </el-tab-pane>
           </el-tabs>
-          <el-form label-width="80px"
-                   label-position="top"
-                   class="certForm">
-            <el-form-item label="不良记录">
-              <el-input type="textarea"
-                        v-model="entityForm.CertRecord"></el-input>
-            </el-form-item>
-          </el-form>
+          <!--<el-form label-width="80px"-->
+                   <!--label-position="top"-->
+                   <!--class="certForm">-->
+            <!--<el-form-item label="不良记录">-->
+              <!--<el-input type="textarea"-->
+                        <!--v-model="entityForm.CertRecord"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-form>-->
           <!-- <div style="margin-top:5px;float:right">
             <el-button size="small"
                        @click="addshow = false">取 消</el-button>
@@ -869,6 +990,8 @@ export default {
       tcTemp: '',
       yChooseCert: '',
       activeName: 'first',
+      activeName1: 'first',
+      activeName2: 'first',
       CreateOn: [],
       goodsSelection: [],
       basisSelection: [],
@@ -918,6 +1041,20 @@ export default {
       currentGoodsItemCount: 0,
       currentBasisItemCount: 0,
       currentTCItemCount: 0,
+
+      wzList: [],
+      jjList: [],
+      jfList: [],
+      wzSize: 10,
+      jjSize: 10,
+      jfSize: 10,
+      wzCurrentPage: 1,
+      jjCurrentPage: 1,
+      jfCurrentPage: 1,
+      wzCurrentItemCount: 0,
+      jjCurrentItemCount: 0,
+      jfCurrentItemCount: 0,
+
       Bak2: [],
       Bak22: [],
       entityForm: {
@@ -978,6 +1115,58 @@ export default {
   },
 
   methods: {
+    getWZBadList () {
+      let params = {
+        _size: this.wzSize,
+        _currentPage: this.wzCurrentPage,
+        companyId: this.companyId,
+        companyType: '01'
+      }
+      setapi
+        .getBadList(params, this.$axios)
+        .then(res => {
+          this.wzList = res.data.items
+          this.wzCurrentItemCount = res.data.currentItemCount
+        })
+        .catch(err => {
+          console.error(err)
+        })
+    },
+    getJJBadList () {
+      let params = {
+        _size: this.jjSize,
+        _currentPage: this.jjCurrentPage,
+        companyId: this.companyId,
+        companyType: '02'
+      }
+      setapi
+        .getBadList(params, this.$axios)
+        .then(res => {
+          this.jjList = res.data.items
+          this.jjCurrentItemCount = res.data.currentItemCount
+        })
+        .catch(err => {
+          console.error(err)
+        })
+    },
+    getJFBadList () {
+      let params = {
+        _size: this.jfSize,
+        _currentPage: this.jfCurrentPage,
+        companyId: this.companyId,
+        companyType: '03'
+      }
+      setapi
+        .getBadList(params, this.$axios)
+        .then(res => {
+          this.jfList = res.data.items
+          this.jfCurrentItemCount = res.data.currentItemCount
+        })
+        .catch(err => {
+          console.error(err)
+        })
+    },
+
     returnBadRecord (val1, val2, val3, val4, val5, val6, val7, val8) {
       if (val2 === '1') {
         val2 = '准入'
@@ -1161,6 +1350,9 @@ export default {
     },
     serachCertByCompany (companyId) {
       this.companyId = companyId
+      this.getWZBadList()
+      this.getJJBadList()
+      this.getJFBadList()
       this.serachGoodsCertByCompany()
       this.serachBasisCertByCompany()
       this.serachTCCertByCompany()
@@ -1320,6 +1512,27 @@ export default {
         }
       })
     },
+    opencert (row, val) {
+      this.addShowTitle = '查看不良行为'
+      this.isChooseDisable = true
+      this.entityForm.CompanyCode = row.Companycode
+      this.entityForm.CompanyName = row.Companyname
+      this.serachCertType(row.Companycode)
+      this.serachCertByCompany(row.Companycode)
+      this.activeName2 = val
+      this.addshow = true
+    },
+    openedit (row, val) {
+      this.addShowTitle = '查看不良行为'
+      this.isChooseDisable = true
+      this.entityForm.CompanyCode = row.Companycode
+      this.entityForm.CompanyName = row.Companyname
+      this.serachCertType(row.Companycode)
+      this.serachCertByCompany(row.Companycode)
+      this.activeName2 = 'first'
+      this.activeName1 = val
+      this.addshow = true
+    },
     edit (row) {
       this.addShowTitle = '查看不良行为'
       this.isChooseDisable = true
@@ -1631,6 +1844,35 @@ export default {
       this.currentTCPage = 1
       this.serachTCCertByCompany()
     },
+
+    handleWZSizeChange (value) {
+      this.wzSize = value
+      this.wzCurrentPage = 1
+      this.getWZBadList()
+    },
+    handleWZCurrentChange (value) {
+      this.wzCurrentPage = value
+      this.getWZBadList()
+    },
+    handleJJSizeChange (value) {
+      this.jjSize = value
+      this.jjCurrentPage = 1
+      this.getJJBadList()
+    },
+    handleJJCurrentChange (value) {
+      this.jjCurrentPage = value
+      this.getJJBadList()
+    },
+    handleJFSizeChange (value) {
+      this.jfSize = value
+      this.jfCurrentPage = 1
+      this.getJFBadList()
+    },
+    handleJFCurrentChange (value) {
+      this.jfCurrentPage = value
+      this.getJFBadList()
+    },
+
     searchCommand (command) {
       if (command === 'clear') {
         this.clearSearch()