Merge remote-tracking branch 'origin/develop' into develop

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

@@ -111,98 +111,121 @@ func (this *BadRecordController) GetCompany() {
 // @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, &rmodel)
 
-	//判断名称是否已拥有
+	var err error
+	modelTyeList := rmodel.Type
+	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
+	}
+
+	if rmodel.Status == "3" { //取消， 企业类别中有一类取消就全部类别都取消
+		model.Wzstatus = rmodel.Status
+		model.Wzrecord = rmodel.Record
+		model.Jjstatus = rmodel.Status
+		model.Jjrecord = rmodel.Record
+		model.Jfstatus = rmodel.Status
+		model.Jfrecord = rmodel.Record
+		//更新准入表状态
+		modelTyeList = "01,02,03"
+	}
 	var companyCode = rmodel.Companycode
 
+	//更新准入表状态
+	if strings.Index(modelTyeList, "01") >= 0 {
+		var supplierCert suppliercert.OilSupplierCert
+		tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+companyCode+"' and SupplierTypeCode='01'")
+		if tempCount>0{
+			supplierCert.InFlag=rmodel.Status
+			cols := []string{ "InFlag"}
+			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)
+		}else{
+			model.Wzstatus=""
+		}
+	}
+	if strings.Index(modelTyeList, "02") >= 0 {
+		var supplierCert suppliercert.OilSupplierCert
+		tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+companyCode+"' and SupplierTypeCode='02'")
+		if tempCount>0 {
+			supplierCert.InFlag = rmodel.Status
+			cols := []string{"InFlag"}
+			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)
+		}else{
+			model.Jjstatus=""
+		}
+	}
+	if strings.Index(modelTyeList, "03") >= 0 {
+		var supplierCert suppliercert.OilSupplierCert
+		tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+companyCode+"' and SupplierTypeCode='03'")
+		if tempCount>0 {
+			supplierCert.InFlag = rmodel.Status
+			cols := []string{"InFlag"}
+			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)
+		}else{
+			model.Jfstatus=""
+		}
+	}
+	//判断名称是否已拥有
 	where := "1=1 and CompanyCode='" + companyCode + "'"
 	total := svc.GetName(BaseBadRecord, where)
 	if total != 0 {
-
 		model.Modifiedon = time.Now()
 		model.Modifiedby = this.User.Realname
 		model.Modifieduserid,_ = strconv.Atoi(this.User.Id)
-
 		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 rmodel.Type == "01"{
-			var supplierCert suppliercert.OilSupplierCert
-			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='"+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 rmodel.Type == "02"{
-			var supplierCert suppliercert.OilSupplierCert
-			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='"+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 rmodel.Type == "03"{
-			var supplierCert suppliercert.OilSupplierCert
-			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='"+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 rmodel.Status == "3" { //取消， 企业类别中有一类取消就全部类别都取消
+			cols = []string{"WZStatus","WZRecord","JJStatus","JJRecord","JFStatus","JFRecord","ModifiedOn","ModifiedUserId","ModifiedBy"}
 		}
-
+		err:= svc.UpdateEntityBywheretbl(BaseBadRecord,&model,cols,"CompanyCode='"+companyCode+"'")
 
 		if err == nil {
 			errinfo.Message = "更新成功"
@@ -222,81 +245,6 @@ func (this *BadRecordController) AddBadRecord() {
 		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 rmodel.Type == "01"{
-			var supplierCert suppliercert.OilSupplierCert
-			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+companyCode+"' and SupplierTypeCode='01'")
-			if tempCount>0{
-				supplierCert.InFlag=rmodel.Status
-				cols := []string{ "InFlag"}
-				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)
-			}else{
-				model.Wzstatus=""
-			}
-		}
-		if rmodel.Type == "02"{
-			var supplierCert suppliercert.OilSupplierCert
-			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+companyCode+"' and SupplierTypeCode='02'")
-			if tempCount>0 {
-				supplierCert.InFlag = rmodel.Status
-				cols := []string{"InFlag"}
-				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)
-			}else{
-				model.Jjstatus=""
-			}
-		}
-		if rmodel.Type == "03"{
-			var supplierCert suppliercert.OilSupplierCert
-			tempCount,_:=svc.GetCount(&supplierCert,"SupplierId='"+companyCode+"' and SupplierTypeCode='03'")
-			if tempCount>0 {
-				supplierCert.InFlag = rmodel.Status
-				cols := []string{"InFlag"}
-				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)
-			}else{
-				model.Jfstatus=""
-			}
-		}
 		_, err = svc.InsertEntityBytbl(BaseBadRecord, &model)
 		if err == nil {
 			errinfo.Message = "保存成功"
@@ -309,67 +257,7 @@ func (this *BadRecordController) AddBadRecord() {
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		}
-
-
 	}
-
-
-	//	if isFlag=="0"{
-	//		model.Bak1 = "0"
-
-	//
-	//
-	//		if err == nil {
-	//			//新增
-	//			errinfo.Message = "添加成功！"
-	//			errinfo.Code = 0
-	//			this.Data["json"] = &errinfo
-	//			this.ServeJSON()
-	//		} else {
-	//			errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
-	//			errinfo.Code = -1
-	//			this.Data["json"] = &errinfo
-	//			this.ServeJSON()
-	//		}
-	//	}else {
-	//		model.Bak1 = "1"
-	//		_, err := svc.InsertEntityBytbl(BaseBadRecord, &model)
-	//		//更新准入范围的表状态
-	//		if goodsString!=""{
-	//			var supplierCertSub suppliercertsub.OilSupplierCertSub
-	//			supplierCertSub.CertSubStatus=model.Bak3
-	//			cols := []string{ "CertSubStatus"}
-	//			svc.UpdateEntityBywheretbl(OilSupplierCertSubName,&supplierCertSub, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='01' and Id in ("+goodsString+")")
-	//		}
-	//
-	//		if basisString!=""{
-	//			var supplierCertSub suppliercertsub.OilSupplierCertSub
-	//			supplierCertSub.CertSubStatus=model.Bak3
-	//			cols := []string{ "CertSubStatus"}
-	//			svc.UpdateEntityBywheretbl(OilSupplierCertSubName,&supplierCertSub, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='02' and Id in ("+basisString+")")
-	//		}
-	//
-	//		if tcString!=""{
-	//			var supplierCertSub suppliercertsub.OilSupplierCertSub
-	//			supplierCertSub.CertSubStatus=model.Bak3
-	//			cols := []string{ "CertSubStatus"}
-	//			svc.UpdateEntityBywheretbl(OilSupplierCertSubName,&supplierCertSub, cols,"SupplierId='"+model.Companycode+"' and SupplierTypeCode='03' and Id in ("+tcString+")")
-	//		}
-	//		if err == nil {
-	//			//新增
-	//			errinfo.Message = "添加成功！"
-	//			errinfo.Code = 0
-	//			this.Data["json"] = &errinfo
-	//			this.ServeJSON()
-	//		} else {
-	//			errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
-	//			errinfo.Code = -1
-	//			this.Data["json"] = &errinfo
-	//			this.ServeJSON()
-	//		}
-	//	}
-	//}
-
 }
 
 // @Title 删除单条信息

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

@@ -59,7 +59,7 @@
       </div>
 
       <!--内框表格显示-->
-      <el-table size="mini"
+      <el-table highlight-current-row size="mini"
                 :data="entityList"
                 border
                 height="calc(100vh - 243px)"
@@ -991,14 +991,14 @@ export default {
         value: '1',
         label: '准入',
         style: 'color:#67C23A'
+      },  {
+        value: '3',
+        label: '取消',
+        style: 'color:#F56C6C'
       }, {
         value: '2',
         label: '暂停',
         style: 'color:#E6A23C'
-      }, {
-        value: '3',
-        label: '取消',
-        style: 'color:#F56C6C'
       }],
       companyChooseName: '',
       certChooseName: '',

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

@@ -44,7 +44,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="entityList" id="rebateSetTable" size="mini" border height="calc(100vh - 243px)"
+      <el-table highlight-current-row :data="entityList" id="rebateSetTable" size="mini" border height="calc(100vh - 243px)"
         style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="200" align="center" fixed="right">
           <template slot-scope="scope">

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

@@ -43,7 +43,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="entityList" id="rebateSetTable" size="mini" border height="calc(100vh - 243px)"
+      <el-table highlight-current-row :data="entityList" id="rebateSetTable" size="mini" border height="calc(100vh - 243px)"
         style="width: 100%" @sort-change="orderby" v-loading="importloading" >
         <el-table-column label="操作" min-width="200" align="center" fixed="right">
           <template slot-scope="scope">

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

@@ -52,7 +52,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table id="rebateSetTable"
+      <el-table highlight-current-row id="rebateSetTable"
                 :data="entityList"
                 size="mini"
                 border

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

@@ -38,7 +38,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <el-table :data="entityList" id="rebateSetTable" size="mini" border height="calc(100vh - 243px)"
+      <el-table highlight-current-row :data="entityList" id="rebateSetTable" size="mini" border height="calc(100vh - 243px)"
         style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="200" align="center" fixed="right">
           <template slot-scope="scope">