调整前端年审页面

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

@@ -89,7 +89,7 @@ func (this *OilContractReviewController) GetEntityList() {
 	}
 
 	// 权限过滤  自己创建的评价 ，同二级部门创建的评价 ，企管法规处能看
-	where = where + " ( r.CreateUserId =  '" + this.User.Id + "' "
+	where = where + " and ( r.CreateUserId =  '" + this.User.Id + "' "
 	where = where + " or r.UnitId = '" +  strconv.Itoa(this.User.UnitId) + "' "
 
 	// 还少个企管法规处

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

@@ -56,6 +56,9 @@ func (this *OilContractSumScoreController) GetEntityList() {
 	NormalSumScore4 := this.GetString("NormalSumScore4")
 	SumScore4 := this.GetString("SumScore4")
 	Content4 := this.GetString("Content4")
+	NormalSumScore5 := this.GetString("NormalSumScore5")
+	SumScore5 := this.GetString("SumScore5")
+	Content5 := this.GetString("Content5")
 	ConclusionReason := this.GetString("ConclusionReason")
 	Conclusion := this.GetString("Conclusion")
 	CreateOn := this.GetString("CreateOn")
@@ -125,7 +128,17 @@ func (this *OilContractSumScoreController) GetEntityList() {
 	if SumScore4 != "" {
 		where = where + " and SumScore4 like '%" + SumScore4 + "%'"
 	}
+	if Content5 != "" {
+		where = where + " and Content5 like '%" + Content5 + "%'"
+	}
+
+	if NormalSumScore5 != "" {
+		where = where + " and NormalSumScore5 like '%" + NormalSumScore5 + "%'"
+	}
 
+	if SumScore5 != "" {
+		where = where + " and SumScore5 like '%" + SumScore5 + "%'"
+	}
 	if ConclusionReason != "" {
 		where = where + " and ConclusionReason like '%" + ConclusionReason + "%'"
 	}
@@ -135,9 +148,9 @@ func (this *OilContractSumScoreController) GetEntityList() {
 		where = where + " and Conclusion like '%" + Conclusion + "%'"
 	}
 
-	if CreateOn != "" {
-		where = where + " and CreateOn like '%" + CreateOn + "%'"
-	}
+	//if CreateOn != "" {
+	//	where = where + " and CreateOn like '%" + CreateOn + "%'"
+	//}
 
 
 	if CreateUserId != "" {
@@ -176,7 +189,7 @@ func (this *OilContractSumScoreController) GetEntityList() {
 
 	svc := contractSumScore.GetOilContractSumScoreService(utils.DBE)
 	var list []contractSumScore.OilContractSumScore
-	total := svc.GetPagingEntitiesWithOrderBytbl(this.User.AccCode, page.CurrentPage, page.Size, orderby, asc, &list, where)
+	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total

src/dashoo.cn/frontend_web/src/api/oilcontract/contractSumScore.js

@@ -13,4 +13,11 @@ export default {
           data: formData
         })
       },
+    getList(CreateOn, params, myAxios) {
+      return myAxios({
+        url: '/contract-score/list?CreateOn='+ CreateOn,
+        method: 'GET',
+        params: params
+      });
+    },
 }

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year-check/_opera/operation.vue

@@ -221,6 +221,7 @@
       },
 
       addEntity() {
+        this.formData.Conclusion   = parseInt( this.formData.Conclusion ) 
         api.addEntity(this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year-check/index.vue

@@ -12,9 +12,9 @@
           <i class="icon icon-table2"></i> 合同表
         </span>
         <span style="float: right;">
-          <router-link :to="'/oilcontract/contract-basis-year-single/add/operation'">
+          <!-- <router-link :to="'/oilcontract/contract-basis-year-single/add/operation'">
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
-          </router-link>
+          </router-link> -->
           <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">导入</el-button>
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
@@ -300,7 +300,7 @@
 </template>
 <script>
   import { mapGetters } from 'vuex';
-  import api from '@/api/oilcontract/contract';
+  import api from '@/api/oilcontract/contractSumScore';
 
   export default {
     computed: {
@@ -366,192 +366,63 @@
 
         },
         tableColumns: [
-
-          {
-            prop: "Id",
-            label: '',
-            width: 100,
-            sort: true
-          },
-
           {
             prop: "SupplierId",
-            label: '供应商ID',
+            label: '服务商ID',
             width: 100,
             sort: true
           },
 
           {
             prop: "SupplierName",
-            label: '企业名称',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ProjectName",
-            label: '项目名称',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ContractNo",
-            label: '合同编号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ProjectPlace",
-            label: '工程地点',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ProjectOwner",
-            label: '项目负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Telephone",
-            label: '联系人电话',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ProjectType",
-            label: '项目类别',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ContractMode",
-            label: '合同模式',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Amount",
-            label: '合同总金额(万元)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ContractPeriod",
-            label: '合同总工期(天)',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "OpenDate",
-            label: '开工日期',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "PlanFinishDate",
-            label: '计划竣工时间',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "ConstructionUnit",
-            label: '建设单位',
+            label: '服务商名称',
             width: 100,
             sort: true
           },
 
           {
-            prop: "ConstructionOwner",
-            label: '建设负责人',
+            prop: "SumScore",
+            label: '评价得分',
             width: 100,
             sort: true
           },
 
           {
-            prop: "ConstructionTelphone",
-            label: '手机号',
+            prop: "SumScore1",
+            label: '项目管理(40分)',
             width: 100,
             sort: true
           },
 
           {
-            prop: "BuildUnit",
-            label: '施工单位',
+            prop: "SumScore2",
+            label: 'HSE管理(30分)',
             width: 100,
             sort: true
           },
 
           {
-            prop: "BuildOwner",
-            label: '施工负责人',
+            prop: "SumScore3",
+            label: '合同履行(15分)',
             width: 100,
             sort: true
           },
 
           {
-            prop: "BuildTelphone",
-            label: '手机号',
+            prop: "SumScore4",
+            label: '企业诚信(15分)',
             width: 100,
             sort: true
           },
-
           {
-            prop: "SuperviseUnit",
-            label: '监理单位',
+            prop: "Conclusion",
+            label: '评价结果',
             width: 100,
             sort: true
           },
-
-          {
-            prop: "SuperviseOwner",
-            label: '监理负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SuperviseTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityUnit",
-            label: '质量监督单位',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityOwner",
-            label: '质量监督负责人',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "QualityTelphone",
-            label: '手机号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "Remark",
-            label: '备注',
+           {
+            prop: "Status",
+            label: '状态',
             width: 100,
             sort: true
           }]