状态位置

src/dashoo.cn/backend/api/business/msg/msgService.go

@@ -6,6 +6,7 @@ import (
 	"dashoo.cn/utils"
 	. "dashoo.cn/utils/db"
 	"encoding/json"
+	"fmt"
 	"github.com/go-xorm/xorm"
 	"io/ioutil"
 	"log"
@@ -26,7 +27,7 @@ func GetMsgService(xormEngine *xorm.Engine) *MsgService {
 
 //处理短信数据
 //tomobile 目的手机号 msg 信息 typecode 发送节点（1-1注册审核通过1-2注册审核不通过。。）username 发送用户 userrealname 发送用户真实姓名 userid 发送用户id
-func (s *MsgService) HandleMsg(toMobile,msg,typeCode,userName,userRealName,userId string) (err error)  {
+func (s *MsgService) HandleMsg(toMobile,msg,typeCode,userName,userRealName,userId, loginName string) (err error)  {
 
 	//调用短信接口发送短信
 	rtxSvc := oilrtx.GetRtxService(utils.DBE)
@@ -38,7 +39,7 @@ func (s *MsgService) HandleMsg(toMobile,msg,typeCode,userName,userRealName,userI
 			log.Println("handleMsgError= ", err)
 		}
 	}()
-	resp:=rtxSvc.HandleSendMsg("", toMobile, msg)
+	resp:=rtxSvc.HandleSendMsg(loginName, toMobile, msg)
 
 	var rtxRespToken oilrtx.RtxRespToken
 	if resp !=nil{
@@ -47,6 +48,7 @@ func (s *MsgService) HandleMsg(toMobile,msg,typeCode,userName,userRealName,userI
 	}else{
 		rtxRespToken.Code=-1
 	}
+	fmt.Println(rtxRespToken, "rtxRespToken=====")
 	//如果发送返回代码存入短信信息记录表
 	var resultMsg oilrtx.Base_Msg
 	resultMsg.Type=typeCode

src/dashoo.cn/backend/api/business/oilrtx/RtxService.go

@@ -1,6 +1,7 @@
 package oilrtx
 
 import (
+	"dashoo.cn/utils"
 	"encoding/json"
 	"fmt"
 	"golang.org/x/text/encoding/simplifiedchinese"
@@ -11,8 +12,6 @@ import (
 	"strings"
 	"time"
 
-	"dashoo.cn/utils"
-
 	"dashoo.cn/backend/api/business/organize"
 	"dashoo.cn/business2/userRole"
 	. "dashoo.cn/utils/db"
@@ -156,20 +155,23 @@ func (s *RtxService) RecursionOrganize(rtxOrganizes []RtxOrganize) bool {
 
 func (s *RtxService) HandleSendMsg(username string, tomobile string, message string) *http.Response {
 	client := &http.Client{}
-	var msg Msg
+	var msg MsgTest
 
 	msg.UserName = username
 	msg.ToMobile = tomobile
-	msg.Msg = message
-
-	json, err := json.Marshal(msg)
-	params, err := simplifiedchinese.GBK.NewEncoder().String(string(json))
-    fmt.Sprintf(params, "短信=====")
-	params1 := "{\"UserName\":\"" + msg.UserName + "\",\"ToMobile\":\"" + msg.ToMobile + "\",\"MSG\":\"" + msg.Msg  +"\"}"
-	fmt.Println(params1)
-	req, err := http.NewRequest("post", "http://api.uidp.dgyt.petrochina/SMS/API/sendSMS", strings.NewReader(params))
-	req.Header.Add("Content-Type", "application/json")
-	req.Header.Add("X-Token", "/LT6VRmkY8mpGHJzWMKxzMQhjbkXwAHsk0zJkRfAPtjC0Wsecn1539xiULbJU32D59Kh0jTuUD0=")
+	msg.Msg, _ = simplifiedchinese.GBK.NewEncoder().String(message)
+	msg.BizName = "scglxt"
+	msg.BizPwd = "scglxt"
+	msg.EXPCode = "19"
+	//json, err := json.Marshal(msg)
+	//params := string(json)
+	msgStr, _ := simplifiedchinese.GBK.NewEncoder().String(message)
+	url := "http://10.76.19.19/SMS/Interface/Send.aspx?UserName=" + username + "&EXPCode=19&BizName=rjgc&BizPwd=scglxt&ToMobile=" + tomobile + "&Msg=" + msgStr
+	//req, err := http.NewRequest("post", "http://api.uidp.dgyt.petrochina/SMS/API/sendSMS", strings.NewReader(params))
+	fmt.Println(url)
+	req, err := http.NewRequest("get", url, nil)
+	//req.Header.Add("Content-Type", "application/json")
+	//req.Header.Add("X-Token", "/LT6VRmkY8mpGHJzWMKxzMQhjbkXwAHsk0zJkRfAPtjC0Wsecn1539xiULbJU32D59Kh0jTuUD0=")
 
 	resp, err := client.Do(req)
 	if err != nil {
@@ -209,12 +211,12 @@ func (s *RtxService) HandlePtrLogin(username string, password string, BaseUser s
 	if rtxRespToken.Code == 2000 {
 		sql := " UserName='" + username + "'"
 		var baseUser1 userRole.Base_User
-		s.GetEntity(&baseUser1,sql)
+		s.GetEntity(&baseUser1, sql)
 
-		if baseUser1.Username!="" {
+		if baseUser1.Username != "" {
 			flag = 1
-			res:=utils.RBAC.GetRolesForUserInDomain("uid_"+strconv.Itoa(baseUser1.Id),utils.DOMAIN)
-			if len(res)<=0{
+			res := utils.RBAC.GetRolesForUserInDomain("uid_"+strconv.Itoa(baseUser1.Id), utils.DOMAIN)
+			if len(res) <= 0 {
 				flag = 3
 			}
 		} else {
@@ -233,13 +235,12 @@ func (s *RtxService) HandlePtrLogin(username string, password string, BaseUser s
 				log.Println(err)
 			}
 			//查询角色表里有没有权限登录此系统
-			res:=utils.RBAC.GetRolesForUserInDomain("uid_"+strconv.Itoa(baseuser.Id),utils.DOMAIN)
-			if len(res)<=0{
+			res := utils.RBAC.GetRolesForUserInDomain("uid_"+strconv.Itoa(baseuser.Id), utils.DOMAIN)
+			if len(res) <= 0 {
 				flag = 3
 			}
 		}
 
-
 	} else {
 		log.Println("Code:" + string(rtxRespToken.Code) + ",Message:" + rtxRespToken.Message + ",Token:" + rtxRespToken.Token)
 	}

src/dashoo.cn/backend/api/business/oilrtx/rtx.go

@@ -18,6 +18,15 @@ type Msg struct {
 	Msg      string `json:"MSG"`
 }
 
+type MsgTest struct {
+	UserName string `json:"UserName"`
+	ToMobile string `json:"ToMobile"`
+	Msg      string `json:"MSG"`
+	BizName  string `json:"BizName"`
+	BizPwd   string `json:"BizPwd"`
+	EXPCode  string `json:"EXPCode"`
+}
+
 type RtxLogin struct {
 	Username   string `json:"username"`
 	Password   string `json:"password"`

src/dashoo.cn/backend/api/controllers/base.go

@@ -252,6 +252,7 @@ var (
 	OilInfoChangeName                        string = "OilInfoChange"               //信息变更表
 	OilQualChangeMainName                    string = "OilQualChangeMain"           //资质变更表
 	OilQualChangeDetailName                  string = "OilQualChangeDetail"         //资质变更表
+	OilQualChangeDetailAnnualName            string = "OilQualChangeDetailAnnual"   //年审资质变更表
 	BaseTableHeader                          string = "Base_TableHeader"            //资质配置字典信息表
 	BaseBadRecord                            string = "BadRecord"                   //不良记录表
 	OilSupplierCert2FileName                 string = "OilSupplierCert2File"        // 准入与资质对应关系表

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

@@ -1027,7 +1027,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 				}
 				msg:= "您的"+ bFlag + "年审审核通过，请及时确认交费信息！"
 				msgService := msg2.GetMsgService(utils.DBE)
-				msgService.HandleMsg(toMobile,msg,"4-1",list.CreateBy,supplierEntity.ContactName,strconv.Itoa(list.CreateUserId))
+				msgService.HandleMsg(toMobile,msg,"4-1",list.CreateBy,supplierEntity.ContactName,strconv.Itoa(list.CreateUserId), this.User.Username)
 			} else {
 				auditmodel.Status = suppliercert.ALL_PASE_STATUS
 			}
@@ -1090,7 +1090,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 			}
 			msg:= "您的"+ bFlag + "年审审核未通过，请及时查看！"
 			msgService := msg2.GetMsgService(utils.DBE)
-			msgService.HandleMsg(toMobile,msg,"4-1",list.CreateBy,supplierEntity.ContactName,strconv.Itoa(list.CreateUserId))
+			msgService.HandleMsg(toMobile,msg,"4-1",list.CreateBy,supplierEntity.ContactName,strconv.Itoa(list.CreateUserId), this.User.Username)
 			if err == nil {
 				errinfo.Message = "提交成功！"
 				errinfo.Code = 0

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

@@ -1199,7 +1199,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 						toMobile := supplierEntity.Mobile
 						msg := "您的" + supplierCertEntity.SupplierTypeName + "准入审核通过，请及时确认交费信息！"
 						msgService := msg2.GetMsgService(utils.DBE)
-						msgService.HandleMsg(toMobile, msg, "3-1", supplierCertEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(supplierCertEntity.CreateUserId))
+						msgService.HandleMsg(toMobile, msg, "3-1", supplierCertEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(supplierCertEntity.CreateUserId), this.User.Username)
 					}
 
 					//paysvc.AddPaymentinfo(supplierCertEntity.SupplierId, supplierCertEntity.Id, Amount, "1")
@@ -1389,7 +1389,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 			toMobile := supplierEntity.Mobile
 			msg := "您的" + supplierCertEntity.SupplierTypeName + "准入审核未通过，请及时查看！"
 			msgService := msg2.GetMsgService(utils.DBE)
-			msgService.HandleMsg(toMobile, msg, "4-1", supplierCertEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(supplierCertEntity.CreateUserId))
+			msgService.HandleMsg(toMobile, msg, "4-1", supplierCertEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(supplierCertEntity.CreateUserId), this.User.Username)
 			errinfo.Message = "提交成功！"
 			errinfo.Code = 0
 			this.Data["json"] = &errinfo
@@ -1645,19 +1645,19 @@ func (this *OilSupplierCertController) SendingSMS() {
 			toMobile := item.Mobile
 			msg := "您的" + item.SupplierTypeName + "准入还有3个月到期"
 			msgService := msg2.GetMsgService(utils.DBE)
-			msgService.HandleMsg(toMobile, msg, "1-1", item.CreateBy, item.ContactName, strconv.Itoa(item.CreateUserId))
+			msgService.HandleMsg(toMobile, msg, "1-1", item.CreateBy, item.ContactName, strconv.Itoa(item.CreateUserId), this.User.Username)
 		}
 		if currenttime.AddDate(0, 2, 0).Format("2006-01-02") == (item.ApplyTime.Format("2006-01-02")) {
 			toMobile := item.Mobile
 			msg := "您的" + item.SupplierTypeName + "准入还有2个月到期"
 			msgService := msg2.GetMsgService(utils.DBE)
-			msgService.HandleMsg(toMobile, msg, "1-1", item.CreateBy, item.ContactName, strconv.Itoa(item.CreateUserId))
+			msgService.HandleMsg(toMobile, msg, "1-1", item.CreateBy, item.ContactName, strconv.Itoa(item.CreateUserId), this.User.Username)
 		}
 		if currenttime.AddDate(0, 1, 0).Format("2006-01-02") == (item.ApplyTime.Format("2006-01-02")) {
 			toMobile := item.Mobile
 			msg := "您的" + item.SupplierTypeName + "准入还有1个月到期"
 			msgService := msg2.GetMsgService(utils.DBE)
-			msgService.HandleMsg(toMobile, msg, "1-1", item.CreateBy, item.ContactName, strconv.Itoa(item.CreateUserId))
+			msgService.HandleMsg(toMobile, msg, "1-1", item.CreateBy, item.ContactName, strconv.Itoa(item.CreateUserId), this.User.Username)
 		}
 	}
 	elapsed := time.Since(t)
@@ -1681,7 +1681,7 @@ func (this *OilSupplierCertController) SendingSMSSupplierFile() {
 			toMobile := item.Mobile
 			msg := "您的" + item.ExpireAllFile + "还有1个月到期"
 			msgService := msg2.GetMsgService(utils.DBE)
-			msgService.HandleMsg(toMobile, msg, "1-1", item.CreateBy, item.ContactName, strconv.Itoa(item.CreateUserId))
+			msgService.HandleMsg(toMobile, msg, "1-1", item.CreateBy, item.ContactName, strconv.Itoa(item.CreateUserId), this.User.Username)
 		}
 	}
 	elapsed := time.Since(t)

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

@@ -886,7 +886,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 						}
 						msg:= "您的"+ bFlag + "增项审核通过，请及时确认交费信息！"
 						msgService := msg2.GetMsgService(utils.DBE)
-						msgService.HandleMsg(toMobile,msg,"4-1",supplierCertAppendEntity.CreateBy,supplierEntity.ContactName,strconv.Itoa(supplierCertAppendEntity.CreateUserId))
+						msgService.HandleMsg(toMobile,msg,"4-1",supplierCertAppendEntity.CreateBy,supplierEntity.ContactName,strconv.Itoa(supplierCertAppendEntity.CreateUserId), this.User.Username)
 					}
 
 					//var model suppliercertsub.OilSupplierCertSub
@@ -976,7 +976,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 			}
 			msg:= "您的"+ bFlag + "增项审核未通过，请及时查看！"
 			msgService := msg2.GetMsgService(utils.DBE)
-			msgService.HandleMsg(toMobile,msg,"5-1",supplierCertAppendEntity.CreateBy,supplierEntity.ContactName,strconv.Itoa(supplierCertAppendEntity.CreateUserId))
+			msgService.HandleMsg(toMobile,msg,"5-1",supplierCertAppendEntity.CreateBy,supplierEntity.ContactName,strconv.Itoa(supplierCertAppendEntity.CreateUserId), this.User.Username)
 
 			if err == nil {
 				errinfo.Message = "提交成功！"

src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -409,7 +409,7 @@ func (this *OilCorporateInfoController) ComAudit() {
 						toMobile := model.UserTelephone
 						msg := "恭喜您！市场管理信息系统账号注册成功，系统登录用户名为: " + model.UserName //
 						msgService := msg2.GetMsgService(utils.DBE)
-						err := msgService.HandleMsg(toMobile, msg, "1-1", model.UserName, model.UserRealName, strconv.Itoa(model.UserId))
+						err := msgService.HandleMsg(toMobile, msg, "1-1", model.UserName, model.UserRealName, strconv.Itoa(model.UserId), this.User.Username)
 						if err == nil {
 							errinfo.Message = "审核通过！"
 							errinfo.Code = 0
@@ -463,7 +463,7 @@ func (this *OilCorporateInfoController) ComAudit() {
 
 			//调用短信接口发送短信
 			msgService := msg2.GetMsgService(utils.DBE)
-			res := msgService.HandleMsg(toMobile, msg, "1-2", model.UserName, model.UserRealName, strconv.Itoa(model.UserId))
+			res := msgService.HandleMsg(toMobile, msg, "1-2", model.UserName, model.UserRealName, strconv.Itoa(model.UserId), this.User.Username)
 
 			if err == nil && res == nil {
 				errinfo.Message = "审核未通过！"
@@ -714,7 +714,7 @@ func (this *OilCorporateInfoController) GetCode() {
 				msg := "验证码为: " + randomNumber + ",5分钟内有效"
 				//调用短信接口发送短信
 				msgService := msg2.GetMsgService(utils.DBE)
-				error := msgService.HandleMsg(mobile, msg, "2-1", userName, sPerson.Realname, strconv.Itoa(sPerson.Id))
+				error := msgService.HandleMsg(mobile, msg, "2-1", userName, sPerson.Realname, strconv.Itoa(sPerson.Id), this.User.Username)
 				if error == nil {
 					errinfo.Message = "请等待接收验证码,5分钟内有效"
 					errinfo.Code = 0

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -479,18 +479,18 @@ export default class Login extends Vue {
       } catch (e) {
         if (e.response.status === 777) {
           this.$message({
-          showClose: true,
-          message: '您无权限登录本系统',
-          type: 'warning',
-          duration: 5000
-        })
+            showClose: true,
+            message: '您无权限登录本系统',
+            type: 'warning',
+            duration: 5000
+          })
         } else {
           this.$message({
-          showClose: true,
-          message: '账号或密码错误',
-          type: 'warning',
-          duration: 5000
-        })
+            showClose: true,
+            message: '账号或密码错误',
+            type: 'warning',
+            duration: 5000
+          })
         }
         this.identifyCode = ''
         this.makeCode(this.identifyCodes, 4)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/annualfistaudit.vue

@@ -41,21 +41,6 @@
             </router-link>
           </template>
         </el-table-column>
-
-        <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="AccessCardNo" label="准入编码" sortable min-width="110" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
-          show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column>
-        <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column> -->
         <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
           <template slot-scope="scope">
             <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
@@ -70,6 +55,21 @@
             <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
           </template>
         </el-table-column>
+        <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="AccessCardNo" label="准入编码" sortable min-width="110" align="center" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
+          show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column>
+        <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column> -->
+
         <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.ApplyTime+'') }}

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -64,20 +64,6 @@
           </el-table-column>
 
           <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column> -->
-          <el-table-column prop="AccessCardNo" label="准入编码" sortable min-width="110" align="center"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center"
-            show-overflow-tooltip>
-          </el-table-column>
-          <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
           <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
             <template slot-scope="scope">
@@ -95,6 +81,21 @@
               <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
             </template>
           </el-table-column>
+          <el-table-column prop="AccessCardNo" label="准入编码" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column> -->
+
           <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center"
             show-overflow-tooltip>
             <template slot-scope="scope">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -64,20 +64,6 @@
           </el-table-column>
 
           <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column> -->
-          <el-table-column prop="AccessCardNo" label="准入编码" sortable min-width="110" align="center"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center"
-            show-overflow-tooltip>
-          </el-table-column>
-          <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
           <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
             <template slot-scope="scope">
@@ -95,6 +81,21 @@
               <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
             </template>
           </el-table-column>
+          <el-table-column prop="AccessCardNo" label="准入编码" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column> -->
+
           <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center"
             show-overflow-tooltip>
             <template slot-scope="scope">

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

@@ -62,6 +62,22 @@
           <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center"
             show-overflow-tooltip>
           </el-table-column> -->
+          <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
+            <template slot-scope="scope">
+              <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
+              <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
+              <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
+              <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
+              <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
+              <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+              <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
+              <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
+              <span v-if="scope.row.Status=='6'" style="color:#F56C6C">待交费</span>
+              <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
+              <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待分办</span>
+              <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="AccessCardNo" label="准入编码" sortable min-width="110" align="center"
             show-overflow-tooltip>
           <template slot-scope="scope" >
@@ -79,22 +95,7 @@
           </el-table-column>
           <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
-          <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
-            <template slot-scope="scope">
-              <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
-              <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
-              <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
-              <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
-              <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
-              <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
-              <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
-              <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">专业处室审批未通过</span>
-              <span v-if="scope.row.Status=='6'" style="color:#F56C6C">待交费</span>
-              <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
-              <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待分办</span>
-              <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
-            </template>
-          </el-table-column>
+
           <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center"
             show-overflow-tooltip>
             <template slot-scope="scope">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -64,20 +64,6 @@
           </el-table-column>
 
           <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column> -->
-          <el-table-column prop="AccessCardNo" label="准入编码" sortable min-width="110" align="center"
-            show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center"
-            show-overflow-tooltip>
-          </el-table-column>
-          <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column> -->
           <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
             <template slot-scope="scope">
@@ -95,6 +81,20 @@
               <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
             </template>
           </el-table-column>
+          <el-table-column prop="AccessCardNo" label="准入编码" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center"
+            show-overflow-tooltip>
+          </el-table-column>
+          <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column> -->
           <el-table-column prop="ApplyTime" sortable min-width="130" label="年审到期日期" align="center"
             show-overflow-tooltip>
             <template slot-scope="scope">

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

@@ -44,10 +44,6 @@
             </router-link>
           </template>
         </el-table-column>
-
-        <el-table-column v-for="column in tableColumns" :key="column.Id" :prop="column.prop" sortable min-width="100"
-          :label="column.label" align="center" show-overflow-tooltip>
-        </el-table-column>
         <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
           <template slot-scope="scope">
             <span v-if="scope.row.Status=='1'" style="color:#E6A23C">已申请</span>
@@ -57,6 +53,9 @@
             <span v-if="scope.row.Status=='3'" style="color:#67C23A">审核通过</span>
           </template>
         </el-table-column>
+        <el-table-column v-for="column in tableColumns" :key="column.Id" :prop="column.prop" sortable min-width="100"
+          :label="column.label" align="center" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column prop="ConmmitTime" sortable min-width="100" label="申请日期" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.ConmmitTime+'') }}

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

@@ -52,10 +52,6 @@
               </router-link>
             </template>
           </el-table-column>
-
-          <el-table-column v-for="column in tableColumns" :key="column.Id" :prop="column.prop" sortable min-width="100"
-            :label="column.label" align="center" show-overflow-tooltip>
-          </el-table-column>
           <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
             <template slot-scope="scope">
               <span v-if="scope.row.Status=='0'" style="color:#E6A23C">待提交</span>
@@ -70,6 +66,10 @@
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
             </template>
           </el-table-column>
+          <el-table-column v-for="column in tableColumns" :key="column.Id" :prop="column.prop" sortable min-width="100"
+            :label="column.label" align="center" show-overflow-tooltip>
+          </el-table-column>
+
           <el-table-column prop="ConmmitTime" sortable min-width="100" label="申请日期" align="center"
             show-overflow-tooltip>
             <template slot-scope="scope">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -54,27 +54,6 @@
               <!-- <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button> -->
             </template>
           </el-table-column>
-
-          <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
-            show-overflow-tooltip></el-table-column>
-          <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
-          <el-table-column prop="AppendType" label="增项类别" sortable width="150" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ checkAppendType(scope.row.AppendType) }}
-            </template>
-          </el-table-column>
-          <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column> -->
-          <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.ApplyDate) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.AuditDate) }}
-            </template>
-          </el-table-column>
           <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>
@@ -95,6 +74,26 @@
               <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
             </template>
           </el-table-column>
+          <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
+            show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
+          <el-table-column prop="AppendType" label="增项类别" sortable width="150" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkAppendType(scope.row.AppendType) }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column> -->
+          <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.ApplyDate) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.AuditDate) }}
+            </template>
+          </el-table-column>
           <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>
           </el-table-column>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -54,27 +54,6 @@
               <!-- <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button> -->
             </template>
           </el-table-column>
-
-          <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
-            show-overflow-tooltip></el-table-column>
-          <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
-          <el-table-column prop="AppendType" label="增项类别" sortable width="150" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ checkAppendType(scope.row.AppendType) }}
-            </template>
-          </el-table-column>
-          <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
-          </el-table-column> -->
-          <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.ApplyDate) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.AuditDate) }}
-            </template>
-          </el-table-column>
           <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>
@@ -96,6 +75,26 @@
 
             </template>
           </el-table-column>
+          <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
+            show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
+          <el-table-column prop="AppendType" label="增项类别" sortable width="150" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkAppendType(scope.row.AppendType) }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
+          </el-table-column> -->
+          <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.ApplyDate) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.AuditDate) }}
+            </template>
+          </el-table-column>
           <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>
           </el-table-column>
 

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

@@ -59,27 +59,6 @@
               <!-- <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button> -->
             </template>
           </el-table-column>
-
-          <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
-                           show-overflow-tooltip></el-table-column>
-          <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
-          <el-table-column prop="AppendType" label="增项类别" sortable width="150" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ checkAppendType(scope.row.AppendType) }}
-            </template>
-          </el-table-column>
-          <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
-          </el-table-column> -->
-          <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.ApplyDate) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ jstimehandle(scope.row.AuditDate) }}
-            </template>
-          </el-table-column>
           <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>
@@ -100,6 +79,27 @@
               <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
             </template>
           </el-table-column>
+          <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
+                           show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
+          <el-table-column prop="AppendType" label="增项类别" sortable width="150" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ checkAppendType(scope.row.AppendType) }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
+          </el-table-column> -->
+          <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.ApplyDate) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ jstimehandle(scope.row.AuditDate) }}
+            </template>
+          </el-table-column>
+
           <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>
           </el-table-column>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -54,7 +54,27 @@
               <!-- <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)">删除</el-button> -->
             </template>
           </el-table-column>
+          <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>
+              <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
+              <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
+              <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
+              <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
+              <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+              <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
+              <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
+              <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
+              <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
+              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
+              <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
+              <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
+              <span v-if="scope.row.Status=='11'" style="color:#67C23A">完成</span>
+              <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待分办</span>
+              <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
 
+            </template>
+          </el-table-column>
           <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
             show-overflow-tooltip></el-table-column>
           <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
@@ -75,27 +95,7 @@
               {{ jstimehandle(scope.row.AuditDate) }}
             </template>
           </el-table-column>
-          <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>
-              <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
-              <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
-              <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
-              <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
-              <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
-              <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
-              <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
-              <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
-              <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
-              <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待交费</span>
-              <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
-              <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
-              <span v-if="scope.row.Status=='11'" style="color:#67C23A">完成</span>
-              <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待分办</span>
-              <span v-if="scope.row.Status=='-10'" style="color:#E6A23C">分办未通过</span>
 
-            </template>
-          </el-table-column>
           <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>
           </el-table-column>
 

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

@@ -88,26 +88,6 @@
           </template>
         </el-table-column>
         <!--内框表格剩余栏显示-->
-        <el-table-column label="准入编码" width="100px" prop="AccessCardNo" sortable align="center">
-           <template slot-scope="scope" >
-             <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
-        <el-table-column label="准入类别" prop="SupplierTypeCode" align="center">
-          <template slot-scope="scope">
-              {{transferStr(scope.row.SupplierTypeCode)}}
-          </template>
-        </el-table-column>
-        <el-table-column label="法人代表"  width="100px" prop="LegalPerson" align="center"></el-table-column>
-        <el-table-column label="注册资金（万元）"  width="170px" prop="RegCapital" sortable align="center"></el-table-column>
-        <el-table-column label="移动电话"  width="120px" prop="Mobile" align="center"></el-table-column>
-        <!--<el-table-column label="最后一次年审" width="100px" prop="AuditDate" align="center">-->
-          <!--<template slot-scope="scope">{{ jstimehandle(scope.row.AuditDate) }}</template>-->
-        <!--</el-table-column>-->
-        <el-table-column label="有效日期" width="220px" prop="ApplyTime" align="center">
-          <template slot-scope="scope">{{ jstimehandle(scope.row.ApplyTime) }}</template>
-        </el-table-column>
         <el-table-column label="状态" prop="InFlag" width="100px" align="center">
           <template slot-scope="scope">
             <el-alert
@@ -133,6 +113,26 @@
             ></el-alert>
           </template>
         </el-table-column>
+        <el-table-column label="准入编码" width="100px" prop="AccessCardNo" sortable align="center">
+           <template slot-scope="scope" >
+             <span style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+        <el-table-column label="准入类别" prop="SupplierTypeCode" align="center">
+          <template slot-scope="scope">
+              {{transferStr(scope.row.SupplierTypeCode)}}
+          </template>
+        </el-table-column>
+        <el-table-column label="法人代表"  width="100px" prop="LegalPerson" align="center"></el-table-column>
+        <el-table-column label="注册资金（万元）"  width="170px" prop="RegCapital" sortable align="center"></el-table-column>
+        <el-table-column label="移动电话"  width="120px" prop="Mobile" align="center"></el-table-column>
+        <!--<el-table-column label="最后一次年审" width="100px" prop="AuditDate" align="center">-->
+          <!--<template slot-scope="scope">{{ jstimehandle(scope.row.AuditDate) }}</template>-->
+        <!--</el-table-column>-->
+        <el-table-column label="有效日期" width="220px" prop="ApplyTime" align="center">
+          <template slot-scope="scope">{{ jstimehandle(scope.row.ApplyTime) }}</template>
+        </el-table-column>
         <el-table-column label="企业曾用名" width="280px" prop="OldSupplierName" align="center"></el-table-column>
         <el-table-column label="推荐单位" width="280px" prop="CheckUnitName" align="center"></el-table-column>
         <el-table-column label="专业处室审核" width="280px" prop="FullName" align="center"></el-table-column>