前后:待办bug;合同评价列表筛选

src/dashoo.cn/backend/api/business/oilcontract/contractReview/contractReviewService.go

@@ -23,7 +23,7 @@ func (s *OilContractReviewService) GetContractReviewList(pageIndex, itemsPerPage
 	var resultsSlice []map[string][]byte
 	sqlconunt := "SELECT count(*) " +
 		"FROM OilContractReview r " +
-		"LEFT JOIN OilContract c ON r.ContractId=c.id " +
+		"LEFT JOIN OilContract c ON r.ContractId=c.Id " +
 		"WHERE "+ where
 
 	sql := "SELECT r.*,c.SupplierName,c.ProjectName,c.ContractNo,c.SupplierId " +
@@ -45,7 +45,7 @@ func (s *OilContractReviewService) GetContractReviewList(pageIndex, itemsPerPage
 		",c.SettleStatus" +
 		",c.Remark " +
 		"FROM OilContractReview r " +
-		"LEFT JOIN OilContract c ON r.ContractId=c.id " +
+		"LEFT JOIN OilContract c ON r.ContractId=c.Id " +
 		"WHERE "+ where +
 		" Order By " + order + asc + " Limit " + strconv.Itoa(int(itemsPerPage)) +" OFFSET " + strconv.Itoa((int(pageIndex)-1)*int(itemsPerPage))
 

src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

@@ -37,7 +37,7 @@ func (this *OilContractReviewController) GetEntityList() {
 	//获取分页信息
 	page := this.GetPageInfoForm()
 	where := " 1=1 "
-	orderby := "Id"
+	orderby := "r.Id"
 	asc := " desc "
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
@@ -50,6 +50,7 @@ func (this *OilContractReviewController) GetEntityList() {
 	Id := this.GetString("Id")
 	ContractClass := this.GetString("ContractClass")
 	ContractName := this.GetString("ContractName")
+	ContractNo := this.GetString("ContractNo")
 	ContractId := this.GetString("ContractId")
 	WorkflowId := this.GetString("WorkflowId")
 	BusinessKey := this.GetString("BusinessKey")
@@ -97,6 +98,10 @@ func (this *OilContractReviewController) GetEntityList() {
 		where = where + " and c.ContractName like '%" + ContractName + "%'"
 	}
 
+	if ContractNo != "" {
+		where = where + " and c.ContractNo like '%" + ContractNo + "%'"
+	}
+
 	if SecondUnit != "" {
 		where = where + " and r.UnitId = " + SecondUnit
 	}

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

@@ -88,12 +88,9 @@
               <span v-if="scope.row.SupplierTypeCode=='8'">待开发票</span>
               <span v-if="scope.row.SupplierTypeCode=='9-6'">外部市场</span>
               <span v-if="scope.row.SupplierTypeCode=='9-7'">收入业务</span>
-              <span v-if="scope.row.SupplierTypeCode=='01' && (scope.row.Type=='10'||scope.row.Type=='11')">供应商</span>
-              <span v-if="scope.row.SupplierTypeCode=='02' && (scope.row.Type=='10'||scope.row.Type=='11')">承包商</span>
-              <span v-if="scope.row.SupplierTypeCode=='03' && (scope.row.Type=='10'||scope.row.Type=='11')">服务商</span>
-              <span v-if="scope.row.SupplierTypeCode=='01' && (scope.row.Type=='10'||scope.row.Type=='12')">供应商</span>
-              <span v-if="scope.row.SupplierTypeCode=='02' && (scope.row.Type=='10'||scope.row.Type=='12')">承包商</span>
-              <span v-if="scope.row.SupplierTypeCode=='03' && (scope.row.Type=='10'||scope.row.Type=='12')">服务商</span>
+              <span v-if="scope.row.SupplierTypeCode=='01' && (scope.row.Type=='10'||scope.row.Type=='11'||scope.row.Type=='12')">供应商</span>
+              <span v-if="scope.row.SupplierTypeCode=='02' && (scope.row.Type=='10'||scope.row.Type=='11'||scope.row.Type=='12')">承包商</span>
+              <span v-if="scope.row.SupplierTypeCode=='03' && (scope.row.Type=='10'||scope.row.Type=='11'||scope.row.Type=='12')">服务商</span>
             </template>
 
 
@@ -167,12 +164,9 @@
               <span v-if="scope.row.SupplierTypeCode=='8'">待开发票</span>
               <span v-if="scope.row.SupplierTypeCode=='9-6'">外部市场</span>
               <span v-if="scope.row.SupplierTypeCode=='9-7'">收入业务</span>
-              <span v-if="scope.row.SupplierTypeCode=='01' && (scope.row.Type=='10'||scope.row.Type=='11')">供应商</span>
-              <span v-if="scope.row.SupplierTypeCode=='02' && (scope.row.Type=='10'||scope.row.Type=='11')">承包商</span>
-              <span v-if="scope.row.SupplierTypeCode=='03' && (scope.row.Type=='10'||scope.row.Type=='11')">服务商</span>
-              <span v-if="scope.row.SupplierTypeCode=='01' && (scope.row.Type=='10'||scope.row.Type=='12')">供应商</span>
-              <span v-if="scope.row.SupplierTypeCode=='02' && (scope.row.Type=='10'||scope.row.Type=='12')">承包商</span>
-              <span v-if="scope.row.SupplierTypeCode=='03' && (scope.row.Type=='10'||scope.row.Type=='12')">服务商</span>
+              <span v-if="scope.row.SupplierTypeCode=='01' && (scope.row.Type=='10'||scope.row.Type=='11'||scope.row.Type=='12')">供应商</span>
+              <span v-if="scope.row.SupplierTypeCode=='02' && (scope.row.Type=='10'||scope.row.Type=='11'||scope.row.Type=='12')">承包商</span>
+              <span v-if="scope.row.SupplierTypeCode=='03' && (scope.row.Type=='10'||scope.row.Type=='11'||scope.row.Type=='12')">服务商</span>
 
             </template>
           </el-table-column>