ex问题

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

@@ -798,9 +798,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 	secondAudit := this.GetString("SecondAudit")
 	thirdAudit := this.GetString("ThirdAudit")
 	//majorDept := this.GetString("majorDept")
-	if AuditRemark != "" {
-		dataother.AuditorRemark = AuditRemark
-	}
+
 
 	//取出审批列表
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
@@ -811,6 +809,9 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 	certSrv.GetEntity(&supplierEntity, wheresup)
 	var jsonblob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonblob, &dataother)
+	if AuditRemark != "" {
+		dataother.AuditorRemark = AuditRemark
+	}
 	var errinfo ErrorDataInfo
 	defer func() { //finally处理失败的异常
 		if err := recover(); err != nil {

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

@@ -3,7 +3,6 @@ package oilsupplier
 import (
 	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
-	"dashoo.cn/backend/api/business/oilsupplier/qualchange"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
 	"dashoo.cn/backend/api/business/register"
@@ -134,7 +133,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.SupplierName = item.SupplierName
 				todo.UserName = this.User.Realname
 				todo.Status = item.Status
-				todo.BusinessKey = item.CertId + "-"+ strconv.Itoa(item.AuditIndex)
+				todo.BusinessKey = item.BusinessKey
 				todolists = append(todolists, todo)
 			}
 		}
@@ -229,7 +228,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.UserName = this.User.Realname
 				todo.SupplierTypeCode = item.AppendType
 				todo.Status = item.Status
-				todo.BusinessKey = strconv.Itoa(item.Id) + "-"+ strconv.Itoa(item.AuditIndex)
+				todo.BusinessKey = item.BusinessKey
 				todolists = append(todolists, todo)
 			}
 		}
@@ -273,7 +272,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.WorkflowId = item.WorkflowId
 				todo.Status = item.Status
 				todo.CertId = strconv.Itoa(item.CerId)
-				todo.BusinessKey = strconv.Itoa(item.CerId) + "-"+ strconv.Itoa(item.AuditIndex)
+				todo.BusinessKey = item.BusinessKey
 				todolists = append(todolists, todo)
 			}
 		}
@@ -310,51 +309,51 @@ func (this *TodoListController) GetMyTaskEntityList() {
 				todo.UserName = this.User.Realname
 				todo.SupplierTypeCode = item.SupplierTypeName
 				todo.Status = item.Status
-				todo.BusinessKey = strconv.Itoa(item.Id) + "-"+ strconv.Itoa(item.AuditIndex)
-				todolists = append(todolists, todo)
-			}
-		}
-	}
-	if stype == "5" || stype == "" {
-		// 资质变更
-		arr := actisvc.GetMyTasksWithTime(workflow.OIL_QUAL_CHANGE, this.User.Id)
-		for _,s := range arr {
-			myTasksRetWithTimes = append(myTasksRetWithTimes, s)
-		}
-		var listqual []qualchange.OilQualChangeMain
-		qualList := actisvc.GetMyTasks(workflow.OIL_QUAL_CHANGE, this.User.Id)
-		qualIdarr := strings.Split(qualList, ",")
-		for i, item := range qualIdarr {
-			idx := strings.Index(item, "-")
-			if idx >= 0 {
-				qualIdarr[i] = strings.Split(item, "-")[0]
-			}
-		}
-		qualList = strings.Join(qualIdarr, ",")
-		wherequal := "1=1 "
-
-		if supplierName != "" {
-			wherequal = wherequal + " and SupplierName like '%" + supplierName + "%'"
-		}
-		if qualList != "" {
-			wherequal += " and Id in (" + qualList + ")"
-			wherequal += " and Status > 0 "
-			svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listqual, wherequal)
-			var todo todolist.TodoList
-			for _, item := range listqual {
-				todo.Id = item.Id
-				todo.CertId = strconv.Itoa(item.SupplierCertId)
-				todo.SupplierId = strconv.Itoa(item.SupplierId)
-				todo.Type = todolist.QUALCHANGE
-				todo.SupplierName = item.SupplierName
-				todo.UserName = this.User.Realname
-				todo.SupplierTypeCode = "0"
-				todo.Status = item.Status
-				todo.BusinessKey = strconv.Itoa(item.Id) + "-"+ strconv.Itoa(item.AuditIndex)
+				todo.BusinessKey = item.BusinessKey//strconv.Itoa(item.Id) + "-"+ strconv.Itoa(item.AuditIndex)
 				todolists = append(todolists, todo)
 			}
 		}
 	}
+	//if stype == "5" || stype == "" {
+	//	// 资质变更
+	//	arr := actisvc.GetMyTasksWithTime(workflow.OIL_QUAL_CHANGE, this.User.Id)
+	//	for _,s := range arr {
+	//		myTasksRetWithTimes = append(myTasksRetWithTimes, s)
+	//	}
+	//	var listqual []qualchange.OilQualChangeMain
+	//	qualList := actisvc.GetMyTasks(workflow.OIL_QUAL_CHANGE, this.User.Id)
+	//	qualIdarr := strings.Split(qualList, ",")
+	//	for i, item := range qualIdarr {
+	//		idx := strings.Index(item, "-")
+	//		if idx >= 0 {
+	//			qualIdarr[i] = strings.Split(item, "-")[0]
+	//		}
+	//	}
+	//	qualList = strings.Join(qualIdarr, ",")
+	//	wherequal := "1=1 "
+	//
+	//	if supplierName != "" {
+	//		wherequal = wherequal + " and SupplierName like '%" + supplierName + "%'"
+	//	}
+	//	if qualList != "" {
+	//		wherequal += " and Id in (" + qualList + ")"
+	//		wherequal += " and Status > 0 "
+	//		svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listqual, wherequal)
+	//		var todo todolist.TodoList
+	//		for _, item := range listqual {
+	//			todo.Id = item.Id
+	//			todo.CertId = strconv.Itoa(item.SupplierCertId)
+	//			todo.SupplierId = strconv.Itoa(item.SupplierId)
+	//			todo.Type = todolist.QUALCHANGE
+	//			todo.SupplierName = item.SupplierName
+	//			todo.UserName = this.User.Realname
+	//			todo.SupplierTypeCode = "0"
+	//			todo.Status = item.Status
+	//			todo.BusinessKey = strconv.Itoa(item.Id) + "-"+ strconv.Itoa(item.AuditIndex)
+	//			todolists = append(todolists, todo)
+	//		}
+	//	}
+	//}
 	if stype == "6" || stype == "" {
 		where := " CheckStatus=0 "
 		if supplierName != "" {
@@ -519,7 +518,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 				todo.SupplierName = item.SupplierName
 				todo.UserName = this.User.Realname
 				todo.Status = item.Status
-				todo.BusinessKey = item.CertId + "-"+ strconv.Itoa(item.AuditIndex)
+				todo.BusinessKey = item.BusinessKey
 				todolists = append(todolists, todo)
 			}
 		}
@@ -612,7 +611,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 				todo.UserName = this.User.Realname
 				todo.SupplierTypeCode = item.AppendType
 				todo.Status = item.Status
-				todo.BusinessKey = strconv.Itoa(item.Id) + "-"+ strconv.Itoa(item.AuditIndex)
+				todo.BusinessKey = item.BusinessKey
 				todolists = append(todolists, todo)
 			}
 		}
@@ -654,7 +653,7 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 				todo.WorkflowId = item.WorkflowId
 				todo.Status = item.Status
 				todo.CertId = strconv.Itoa(item.CerId)
-				todo.BusinessKey = strconv.Itoa(item.CerId) + "-"+ strconv.Itoa(item.AuditIndex)
+				todo.BusinessKey = item.BusinessKey
 				todolists = append(todolists, todo)
 			}
 		}
@@ -689,50 +688,50 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 				todo.UserName = this.User.Realname
 				todo.SupplierTypeCode = item.SupplierTypeName
 				todo.Status = item.Status
-				todo.BusinessKey = strconv.Itoa(item.Id) + "-"+ strconv.Itoa(item.AuditIndex)
-				todolists = append(todolists, todo)
-			}
-		}
-	}
-	if stype == "5" || stype == "" {
-		// 资质变更
-		var listqual []qualchange.OilQualChangeMain
-		arr := actisvc.GetMyTasksWithTime(workflow.OIL_QUAL_CHANGE, this.User.Id)
-		for _,s := range arr {
-			myTasksRetWithTimes = append(myTasksRetWithTimes, s)
-		}
-		qualList := actisvc.GetHistoryMyTasks(workflow.OIL_QUAL_CHANGE, this.User.Id)
-		qualIdarr := strings.Split(qualList, ",")
-		for i, item := range qualIdarr {
-			idx := strings.Index(item, "-")
-			if idx >= 0 {
-				qualIdarr[i] = strings.Split(item, "-")[0]
-			}
-		}
-		qualList = strings.Join(qualIdarr, ",")
-		wherequal := "1=1 "
-
-		if supplierName != "" {
-			wherequal = wherequal + " and SupplierName like '%" + supplierName + "%'"
-		}
-		if qualList != "" {
-			wherequal += " and Id in (" + qualList + ")"
-			wherequal += " and Status != -2 "
-			svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listqual, wherequal)
-			for _, item := range listqual {
-				todo.Id = item.Id
-				todo.CertId = strconv.Itoa(item.SupplierCertId)
-				todo.SupplierId = strconv.Itoa(item.SupplierId)
-				todo.Type = todolist.QUALCHANGE
-				todo.SupplierName = item.SupplierName
-				todo.UserName = this.User.Realname
-				todo.SupplierTypeCode = "0"
-				todo.Status = item.Status
-				todo.BusinessKey = strconv.Itoa(item.Id) + "-"+ strconv.Itoa(item.AuditIndex)
+				todo.BusinessKey = item.BusinessKey
 				todolists = append(todolists, todo)
 			}
 		}
 	}
+	//if stype == "5" || stype == "" {
+	//	// 资质变更
+	//	var listqual []qualchange.OilQualChangeMain
+	//	arr := actisvc.GetMyTasksWithTime(workflow.OIL_QUAL_CHANGE, this.User.Id)
+	//	for _,s := range arr {
+	//		myTasksRetWithTimes = append(myTasksRetWithTimes, s)
+	//	}
+	//	qualList := actisvc.GetHistoryMyTasks(workflow.OIL_QUAL_CHANGE, this.User.Id)
+	//	qualIdarr := strings.Split(qualList, ",")
+	//	for i, item := range qualIdarr {
+	//		idx := strings.Index(item, "-")
+	//		if idx >= 0 {
+	//			qualIdarr[i] = strings.Split(item, "-")[0]
+	//		}
+	//	}
+	//	qualList = strings.Join(qualIdarr, ",")
+	//	wherequal := "1=1 "
+	//
+	//	if supplierName != "" {
+	//		wherequal = wherequal + " and SupplierName like '%" + supplierName + "%'"
+	//	}
+	//	if qualList != "" {
+	//		wherequal += " and Id in (" + qualList + ")"
+	//		wherequal += " and Status != -2 "
+	//		svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &listqual, wherequal)
+	//		for _, item := range listqual {
+	//			todo.Id = item.Id
+	//			todo.CertId = strconv.Itoa(item.SupplierCertId)
+	//			todo.SupplierId = strconv.Itoa(item.SupplierId)
+	//			todo.Type = todolist.QUALCHANGE
+	//			todo.SupplierName = item.SupplierName
+	//			todo.UserName = this.User.Realname
+	//			todo.SupplierTypeCode = "0"
+	//			todo.Status = item.Status
+	//			todo.BusinessKey = strconv.Itoa(item.Id) + "-"+ strconv.Itoa(item.AuditIndex)
+	//			todolists = append(todolists, todo)
+	//		}
+	//	}
+	//}
 	if stype == "6" || stype == "" {
 		where := " CheckStatus in (1,2) "
 		if supplierName != "" {

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

@@ -72,7 +72,7 @@
 
             <!--<el-table-column label="提交" prop="CreateTime">-->
               <!--<template slot-scope="scope">-->
-                <!--{{ jstimehandle(timestampToTime(scope.row.CreateTime)) }}-->
+                <!--{{scope.row.CreateTime}}=={{timestampToTime(scope.row.CreateTime)}}==={{ jstimehandle(timestampToTime(scope.row.CreateTime)) }}-->
               <!--</template>-->
             <!--</el-table-column>-->
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -269,7 +269,7 @@
 
               <el-col :span="8">
                 <el-form-item label="固定电话" prop="Telphone">
-                  <el-input v-model="formData.Telphone" maxlength="20" :readonly="true" placeholder="请输入"
+                  <el-input v-model="formData.Telphone" maxlength="20" :readonly="true" placeholder="区号-0000000"
                     :class="getchange('Telphone') ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -277,7 +277,7 @@
 
               <el-col :span="8">
                 <el-form-item label="传真" prop="Fax">
-                  <el-input v-model="formData.Fax" maxlength="20" :readonly="true" placeholder="请输入"
+                  <el-input v-model="formData.Fax" maxlength="20" :readonly="true" placeholder="区号-0000000"
                     :class="getchange('Fax') ? 'modified-form-input' : ''" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
@@ -382,7 +382,7 @@
               </el-col>
               <el-col :span="16">
                 <el-form-item label="营业范围" prop="BusinessScope">
-                  <el-input v-model="formData.BusinessScope" :readonly="true" maxlength="200" placeholder="请输入"
+                  <el-input v-model="formData.BusinessScope" :readonly="true" maxlength="200" placeholder="营业执照上的信息"
                     type="textarea" :class="getchange('BusinessScope')  ? 'modified-form-input' : ''" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -280,14 +280,14 @@
 
               <el-col :span="8">
                 <el-form-item label="传真" prop="Fax">
-                  <el-input v-model="formData.Fax" maxlength="20" placeholder="请输入"
+                  <el-input v-model="formData.Fax" maxlength="20" placeholder="区号-0000000"
                     :class="changedForm['Fax'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :span="8">
                 <el-form-item label="财务电话" prop="CompanyTel">
-                  <el-input v-model="formData.CompanyTel" placeholder="请输入" maxlength="20"
+                  <el-input v-model="formData.CompanyTel" placeholder="区号-0000000" maxlength="20"
                     :class="changedForm['CompanyTel'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -379,7 +379,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="营业范围" prop="BusinessScope">
-                  <el-input v-model="formData.BusinessScope" maxlength="200" placeholder="请输入" type="textarea"
+                  <el-input v-model="formData.BusinessScope" maxlength="200" placeholder="营业执照上的信息" type="textarea"
                     :class="changedForm['BusinessScope'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operationbasic.vue

@@ -223,14 +223,14 @@
 
         <el-col :span="8">
           <el-form-item label="传真" prop="Fax">
-            <el-input v-model="formData.Fax" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
+            <el-input v-model="formData.Fax" maxlength="20" :readonly="!canUpdateSupplier" placeholder="区号-0000000"
               style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
           <el-form-item label="财务电话" prop="CompanyTel">
-            <el-input v-model="formData.CompanyTel" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="20"
+            <el-input v-model="formData.CompanyTel" :readonly="!canUpdateSupplier" placeholder="区号-0000000" maxlength="20"
               style="width: 100%">
             </el-input>
           </el-form-item>
@@ -301,7 +301,7 @@
         </el-col>
         <el-col :span="16">
           <el-form-item label="营业范围" prop="BusinessScope">
-            <el-input v-model="formData.BusinessScope" maxlength="200" placeholder="请输入" type="textarea"
+            <el-input v-model="formData.BusinessScope" maxlength="200" placeholder="营业执照上的信息" type="textarea"
               style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
@@ -316,7 +316,7 @@
     </el-form>
       </el-card>
     </el-card>
-    
+
     <el-dialog title="提交申请" :visible.sync="commitshow" width="360px">
       <el-form label-width="90px" :model="entityForm" ref="EntityFormref">
         <el-row>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operationgoods.vue

@@ -249,7 +249,7 @@
 
             <el-col :span="8">
               <el-form-item label="固定电话" prop="Telphone">
-                <el-input v-model="formData.Telphone" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
+                <el-input v-model="formData.Telphone" maxlength="20" :readonly="!canUpdateSupplier" placeholder="区号-0000000"
                   style="width: 100%">
                 </el-input>
               </el-form-item>
@@ -257,7 +257,7 @@
 
             <el-col :span="8">
               <el-form-item label="传真" prop="Fax">
-                <el-input v-model="formData.Fax" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
+                <el-input v-model="formData.Fax" maxlength="20" :readonly="!canUpdateSupplier" placeholder="区号-0000000"
                   style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
@@ -356,7 +356,7 @@
             </el-col>
             <el-col :span="16">
               <el-form-item label="营业范围" prop="BusinessScope">
-                <el-input v-model="formData.BusinessScope" maxlength="200" placeholder="请输入" type="textarea"
+                <el-input v-model="formData.BusinessScope" maxlength="200" placeholder="营业执照上的信息" type="textarea"
                   style="width: 100%"></el-input>
               </el-form-item>
             </el-col>