2
3
Prechádzať zdrojové kódy

el-card样式修改

Kevin 6 rokov pred
rodič
commit
c10e735f37

+ 65 - 51
src/dashoo.cn/backend/api/business/tmpzcgf/tmpCertSubSession.go

@@ -3,9 +3,10 @@ package tmpzcgf
 import (
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	. "dashoo.cn/backend/api/mydb"
-	"github.com/go-xorm/xorm"
-
 
+	"strconv"
+	"fmt"
+	"github.com/go-xorm/xorm"
 )
 
 type TmpCertSession struct {
@@ -13,17 +14,16 @@ type TmpCertSession struct {
 }
 
 type TmpCertEntity struct {
-
-	SupplierCertId			int					"xorm:"
-	SupplierTypeCode		string
-	AccessRange				string
+	SupplierCertId   int      	    `xorm:"INT"`
+	SupplierTypeCode string		    `xorm:" VARCHAR"`
+	AccessRange      string 		`xorm:"VARCHAR"`
 }
 
-type SubClassId struct{
-	id int
+type SubClassId struct {
+	Id int
 }
 
-type AllId struct{
+type AllId struct {
 	Id int
 }
 
@@ -34,69 +34,83 @@ func GetTmpCertService(session *xorm.Session) *TmpCertSession {
 }
 
 //获取tmp_zcgf所有Id
-func (s *TmpCertSession) GetAllId() []AllId{
+func (s *TmpCertSession) GetAllId() []AllId {
 	var ids []AllId
-	sql := `SELECT
-				id
-			FROM
-				tmp_zcgf`
+	sql := "SELECT id  FROM	tmp_zcgf"
 	s.Session.SQL(sql).Find(&ids)
+	fmt.Println(sql)
 	return ids
 }
 
 //从tmp_zcgf获取一条数据
-func (s *TmpCertSession) SelectOne(id int) TmpCertEntity {
-	var one TmpCertEntity
-	sql := `SELECT
-				a.准入范围 AccessRange,
-				c.id SupplierCertId,
-				c.SupplierTypeCode SupplierTypeCode
-			FROM
-				tmp_zcgf a
-				LEFT JOIN oilsupplier b ON a.企业名称 = b.SupplierName
-				JOIN oilsuppliercert c ON b.id = c.SupplierId
-				AND a.准入类别 = c.SupplierTypeName
-			WHERE
-				a.id =` + string(id)
-	 s.Session.SQL(sql).Find(&one)
-	return one
+func (s *TmpCertSession) SelectOne(id int) TmpCertEntity{
+	var one []TmpCertEntity
+	var result TmpCertEntity
+	//var result TmpCertEntity
+	//var resultsSlice []map[string][]byte
+	strId := strconv.Itoa(id)
+	//sql := "SELECT	a.准入范围 as AccessRange,	c.id as SupplierCertId,c.SupplierTypeCode as SupplierTypeCode	FROM tmp_zcgf a	LEFT JOIN oilsupplier b ON a.企业名称 = b.SupplierName "+
+	//			"JOIN oilsuppliercert c ON b.id = c.SupplierId AND a.准入类别 = c.SupplierTypeName WHERE	a.id =" +strId
+	///
+	//sql := "select AccessRange, SupplierTypeCode, SupplierCertId FROM (SELECT	a.准入范围 AccessRange,	c.id SupplierCertId,c.SupplierTypeCode SupplierTypeCode	FROM tmp_zcgf a	LEFT JOIN oilsupplier b ON a.企业名称 = b.SupplierName JOIN oilsuppliercert c ON b.id = c.SupplierId AND a.准入类别 = c.SupplierTypeName WHERE	a.id =" + strId + ") TmpCertEntity"
+	//LogError(err)
+	//sql := "SELECT id, 国家 country , 级别 class FROM tmp_zcgf where id=8803"
+	//sql := "select AccessRange, SupplierTypeCode, SupplierCertId FROM (SELECT	a.准入范围 AccessRange,	c.id SupplierCertId,c.SupplierTypeCode SupplierTypeCode	FROM tmp_zcgf a	 JOIN oilsupplier b ON a.企业名称 = b.SupplierName JOIN oilsuppliercert c ON b.id = c.SupplierId AND a.准入类别 = c.SupplierTypeName WHERE	a.id =8830) TmpCertEntity"
+	sql := "SELECT	tmp_zcgf.`准入范围` AS AccessRange,	OilSupplierCert.SupplierTypeCode,	OilSupplierCert.id SupplierCertId FROM	OilSupplier	INNER JOIN OilSupplierCert ON OilSupplier.Id = OilSupplierCert.SupplierId	INNER JOIN tmp_zcgf ON tmp_zcgf.`企业名称` = OilSupplier.supplierName AND tmp_zcgf.`准入类别` = OilSupplierCert.SupplierTypeName WHERE	tmp_zcgf.ID = "+strId
+	fmt.Println(sql)
+	//s.Session.SQL(sql).Get(&one)
+	s.Session.SQL(sql).Find(&one)
+	if len(one)>0 {
+		 result = one[0]
+	}
+	//fmt.Println("123",result)
+
+	//	results := resultsSlice[0]
+	//	one.AccessRange = string(results["AccessRange"])
+	//	one.SupplierCertId = results["SupplierCertId"]
+	//	one.SupplierTypeCode = string(results["SupplierTypeCode"])
+	//s.Session.Table("TmpCertEntity").SQL(sql).Find(&one)
+	return result
 }
 
-
 //获取subClassId
 func (s *TmpCertSession) GetSubClassId(code string, supplierTypeCode string) int{
 	//var subClassName
-	var id SubClassId
+	var subClassId SubClassId
 	var tableName string
-	switch supplierTypeCode{
+	switch supplierTypeCode {
 	case "01":
 		tableName = "OilGoodsAptitudeClass"
-		//subClassName = []goodsaptitudeclass.OilGoodsAptitudeClass
 	case "02":
 		tableName = "OilBasisBuild"
-		//subClassName = []basisbuild.OilBasisBuild
 	case "03":
 		tableName = "OilTechnologyServiceClass"
-		//subClassName = []technologyserviceclass.OilTechnologyServiceClass
 	}
-	var sql = `SELECT id FROM`+tableName+`WHERE	1 = 1 AND code =`+ code
-
-	s.Session.SQL(sql).Find(&id)
-	return id.id
-
+	var sql = `SELECT id FROM ` + tableName + ` WHERE  code = '` + code+ `'`
+	fmt.Println(sql)
+	 //a, err := s.Session.SQL(sql).Find(&subClassId)
+	  s.Session.SQL(sql).Get(&subClassId)
+
+	// fmt.Println(result)
+	// if err!=nil{
+	// 	fmt.Println(err)
+	// }
+	 sub := subClassId.Id
+	 return  sub
+	//a := s.Session.SQL(sql).Find(&subClassId)
+	//fmt.Println("a:",&a)
+	//fmt.Println("subclassid:",subClassId)
 }
 
 func (s *TmpCertSession) InsertSupplierCertSub(sub suppliercertsub.OilSupplierCertSub) error {
-	var supplierId = string(sub.SupplierId)
-	var	supplierCertId = string(sub.SupplierCertId)
-	var	supplierTypeCode = sub.SupplierTypeCode
-	var	subClassId = string(sub.SubClassId)
-	var	code = sub.Code
-	var	name = sub.Name
-	sql := `INSERT INTO OilSupplierCertSub ( SupplierId, SupplierCertId, SupplierTypeCode, SubClassId, CODE, NAME )
-	VALUES ( ’`	+ supplierId+`‘,‘`+supplierCertId+`','`+supplierTypeCode+`','`+subClassId+`','`+code+`','`+name+`')`
-
-	_,err := s.Session.Query(sql)
+	//var supplierId = string(sub.SupplierId)
+	var supplierCertId = string(sub.SupplierCertId)
+	var supplierTypeCode = sub.SupplierTypeCode
+	var subClassId = string(sub.SubClassId)
+	var code = sub.Code
+	var name = sub.Name
+	sql := `INSERT INTO OilSupplierCertSub_tmp ( SupplierCertId, SupplierTypeCode, SubClassId, CODE, NAME ) VALUES ('` + supplierCertId + `','` + supplierTypeCode + `','` + subClassId + `','` + code + `','` + name + `')`
+
+	_, err := s.Session.Query(sql)
 	return err
 }
-

+ 17 - 8
src/dashoo.cn/backend/api/controllers/tmpzcgf/tmpcertsub.go

@@ -35,28 +35,34 @@ type TmpCertController struct {
 func (this *TmpCertController) InsertCertSub(){
 	fmt.Printf("Insertsubcert start!")
 	var total []tmpzcgf.AllId
-	var one tmpzcgf.TmpCertEntity
 	t := time.Now()
 	session := utils.DBE.NewSession()
 	defer session.Close()
 	err := session.Begin()
 	svc := tmpzcgf.GetTmpCertService(session)
 	total = svc.GetAllId()
+	num1 := 1
 	for index := range total{
+		fmt.Println("num1:",num1)
 		id := total[index].Id
-		//fmt.Printf('%T',id)
-		one = svc.SelectOne(id)
+		one := svc.SelectOne(id)
 
 		accessRange := one.AccessRange
+		if one.AccessRange == "" {
+			continue
+		}
+		num2 := 1
 		accessRanges := strings.Split(accessRange,";")
-		for index := range accessRanges{
-			item := strings.Split(accessRanges[index]," ")
+		for i := 0; i<len(accessRanges)-1; i++{
+			fmt.Println("num2:",num2)
+			item := strings.Split(accessRanges[i]," ")
 			code := item[0]
+			fmt.Println(code)
 			code = code[2:]
 			name := item[1]
 
 			var newOne suppliercertsub.OilSupplierCertSub
-			newOne.SupplierCertId = one.SupplierCertId
+			//newOne.SupplierCertId = one.SupplierCertId
 			newOne.SupplierTypeCode = one.SupplierTypeCode
 			newOne.Code = code
 			newOne.Name = name
@@ -64,10 +70,13 @@ func (this *TmpCertController) InsertCertSub(){
 			newOne.SubClassId = subClassId
 
 			 svc.InsertSupplierCertSub(newOne)
-
+			num2++
 		}
 		fmt.Println("Insertsubcert end!")
-
+		num1++
+		if num1>=10{
+			break
+		}
 	}
 
 	//if err != nil {

+ 8 - 8
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -17,7 +17,7 @@
       </div>
     </no-ssr>-->
 
-    <el-card class="box-card">
+    <el-card class="box-card mycard">
       <div slot="header">
         <span>
           <i class="icon icon-table2"></i> 信息
@@ -65,7 +65,7 @@
 
       <el-tabs tab-position="top" v-model="activeName" style="margin-top: -10px">
         <el-tab-pane label="企业信息">
-          <el-card class="box-card">
+          <el-card class="box-card mycard">
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
               <span style="float: right;">
@@ -80,7 +80,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="企业情况" :disabled="!certId">
-          <el-card class="box-card">
+          <el-card class="box-card mycard">
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
               <span style="float: right;">
@@ -168,7 +168,7 @@
             </el-form>
           </el-card>
 
-          <el-card class="box-card" style="margin-top: 10px;">
+          <el-card class="box-card mycard" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>企业主要设备</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog"
@@ -178,7 +178,7 @@
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></equipment-list>
           </el-card>
 
-          <el-card class="box-card" style="margin-top: 10px;">
+          <el-card class="box-card mycard" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>近三年主要业绩</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog"
@@ -188,7 +188,7 @@
               :SupplierTypeCode="classId" :canadd="add_flat" style="margin-top: 20px"></performance-list>
           </el-card>
 
-          <el-card class="box-card" style="margin-top: 10px;">
+          <el-card class="box-card mycard" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>专利及专有技术</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog"
@@ -198,7 +198,7 @@
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></patent-list>
           </el-card>
 
-          <el-card class="box-card" style="margin-top: 10px;">
+          <el-card class="box-card mycard" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>近三年省部级及以上获奖项目</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog"
@@ -219,7 +219,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="审批流程" v-if="formDataCert.Status != 0">
-          <el-card class="box-card">
+          <el-card class="box-card mycard">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
               <!-- <span style="float: right;">

+ 8 - 8
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -17,7 +17,7 @@
       </div>
     </no-ssr>-->
 
-    <el-card class="box-card">
+    <el-card class="box-card mycard">
       <div slot="header">
         <span>
           <i class="icon icon-table2"></i> 信息
@@ -61,7 +61,7 @@
 
       <el-tabs tab-position="top" v-model="activeName" style="margin-top: -10px">
         <el-tab-pane label="企业信息">
-          <el-card class="box-card">
+          <el-card class="box-card mycard">
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
               <span style="float: right;">
@@ -76,7 +76,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="企业情况" :disabled="!certId">
-          <el-card class="box-card">
+          <el-card class="box-card mycard">
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
               <span style="float: right;">
@@ -160,7 +160,7 @@
             </el-form>
           </el-card>
 
-          <el-card class="box-card" style="margin-top: 10px;">
+          <el-card class="box-card mycard" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>企业主要设备</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog"
@@ -170,7 +170,7 @@
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></equipment-list>
           </el-card>
 
-          <el-card class="box-card" style="margin-top: 10px;">
+          <el-card class="box-card mycard" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>近三年主要业绩</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog"
@@ -180,7 +180,7 @@
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></performance-list>
           </el-card>
 
-          <el-card class="box-card" style="margin-top: 10px;">
+          <el-card class="box-card mycard" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>专利及专有技术</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog"
@@ -190,7 +190,7 @@
               :SupplierTypeCode="classId" :canadd="add_flat" height="360px" style="margin-top: 20px"></patent-list>
           </el-card>
 
-          <el-card class="box-card" style="margin-top: 10px;">
+          <el-card class="box-card mycard" style="margin-top: 10px;">
             <div slot="header" class="clearfix">
               <span>近三年省部级及以上获奖项目</span>
               <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog"
@@ -211,7 +211,7 @@
         </el-tab-pane>
 
         <el-tab-pane label="审批流程" v-if="formDataCert.Status != 0">
-          <el-card class="box-card">
+          <el-card class="box-card mycard">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
               <!-- <span style="float: right;">