页面问题-

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

@@ -149,7 +149,7 @@ func (this *OilSupplierCertAppendController) GetEntityById() {
 // @router /getsupplier/:id [get]
 func (this *OilSupplierCertAppendController) GetSupplier() {
 	Id := this.Ctx.Input.Param(":id")
-	where := " WHERE b.Id is NOT NULL AND a.SupplierTypeCode = " + Id + " and a.InFlag='1'"
+	where := " WHERE b.Id is NOT NULL AND a.SupplierTypeCode = '" + Id + "' and a.InFlag='1'"
 	if this.User.IsCompanyUser == 1 {
 		where = where + " and b.CreateUserId = '" + this.User.Id + "'"
 	}

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

@@ -53,8 +53,10 @@ func (this *TodoListController) GetMyTaskEntityList() {
 	if supplierName != "" {
 		where = where + " and a.SupplierName like '%" + supplierName + "%'"
 	}
-
 	actisvc := workflow.GetActivitiService(utils.DBE)
+
+	//myTasksRetWithTimes := actisvc.GetMyTasksWithTime(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
+	//fmt.Println(myTasksRetWithTimes)
 	svc := supplier.GetOilSupplierService(utils.DBE)
 	if stype == "1" || stype == "" {
 		//找出待办任务===准入

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

@@ -477,7 +477,7 @@ func (this *OilCorporateInfoController) GetDictList() {
 func (this *OilCorporateInfoController) OrgLoginList() {
 	svc := organize.GetOrganizeService(utils.DBE)
 	var org []organize.Base_Organize
-	where := "Category='unit' and ParentId in (100000128,100000176)"
+	where := "Category='unit' and ParentId in (100000128,100000176) and Id not in (100000159,100000151,100000166)"
 	svc.GetEntities(&org, where)
 	var datainfo DataInfo
 	datainfo.Items = org

src/dashoo.cn/frontend_web/src/components/oilsupplier/performancelist.vue

@@ -9,7 +9,7 @@
             :disabled="!canadd">删除</el-button>
         </template>
       </el-table-column>
-      <el-table-column prop="ProjectName" label="设备名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="ProjectName" label="项目名称" show-overflow-tooltip></el-table-column>
       <el-table-column prop="BearContent" label="主要内容" show-overflow-tooltip></el-table-column>
       <el-table-column prop="OwnerUnit" label="合作单位" show-overflow-tooltip></el-table-column>
       <el-table-column prop="StartTime" label="起始时间" show-overflow-tooltip>
@@ -39,7 +39,7 @@
       <el-form ref="refPerformance" :model="PerformanceForm" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="设备名称">
+            <el-form-item label="项目名称">
               <el-input v-model="PerformanceForm.ProjectName"></el-input>
             </el-form-item>
           </el-col>

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

@@ -128,13 +128,13 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="账号/Email" label-width="150px" style="width: 100%" prop="UserName">
-              <el-input v-model="formData.UserName" readonly></el-input>
+            <el-form-item label="邮箱" label-width="150px" style="width: 100%" prop="UserName">
+              <el-input v-model="formData.EMail" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="用户名"  label-width="150px" style="width: 100%" prop="UserRealName">
-              <el-input v-model="formData.UserRealName" readonly></el-input>
+              <el-input v-model="formData.UserName" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -143,7 +143,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
+
         <!-- <el-row style="margin-top: 10px; margin-bottom: 20px;"> -->
           <!-- <el-button  type="primary" size="mini" @click="ComAudit">审核</el-button> -->
           <!-- <el-button size="mini" @click="cancelOption">审核未通过</el-button> -->
@@ -271,7 +271,7 @@
       this.initData()
     },
     methods: {
-      
+
       bigImg(url){
         this.bigUrl=url
         this.legalPersonImgVisible=true