前后:建设单位筛选

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

@@ -97,6 +97,10 @@ func (this *OilContractReviewController) GetEntityList() {
 		where = where + " and c.ContractName like '%" + ContractName + "%'"
 	}
 
+	if SecondUnit != "" {
+		where = where + " and r.UnitId = " + SecondUnit
+	}
+
 	if Status != "" {
 		where = where + " and r.Status=" + Status
 	}
@@ -120,12 +124,8 @@ func (this *OilContractReviewController) GetEntityList() {
 	if !isauth {
 		// 权限过滤  自己创建的评价 ，同二级部门创建的评价 ，企管法规处能看
 		where = where + " and ( r.CreateUserId =  '" + this.User.Id + "' "
-		where = where + " or c.SecondUnit = '" + strconv.Itoa(this.User.UnitId) + "' "
+		where = where + " or r.UnitId = '" + strconv.Itoa(this.User.UnitId) + "' "
 		where = where + " )"
-	} else {
-		if SecondUnit != "" {
-			where = where + " and r.UnitId = " + SecondUnit
-		}
 	}
 
 	svc := contractReview.GetOilContractReviewService(utils.DBE)

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/index.vue

@@ -30,8 +30,8 @@
                      v-if="selectAllButtonBoolean" @click="onSelectAllButtonTrue">确定</el-button>
         </span>
         <el-form v-model="searchForm" ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="项目建设单位">
-            <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择项目建设单位" style="width: 100%" clearable>
+          <el-form-item label="发起评价单位">
+            <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择发起评价单位" style="width: 100%" clearable>
               <el-option v-for="item in secondUnitOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
                          style="width: 100%">
               </el-option>
@@ -148,7 +148,15 @@
               <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
+          <el-col :span="12">
+            <el-form-item label="发起评价单位">
+              <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择发起评价单位" style="width: 100%" clearable>
+                <el-option v-for="item in secondUnitOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                           style="width: 100%">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 <!--          <el-col :span="12">-->
 <!--            <el-form-item label="工程地点">-->
 <!--              <el-input size="mini" v-model="searchForm.ProjectPlace" style="width:100%" placeholder="请输入"></el-input>-->
@@ -427,7 +435,7 @@ export default {
         },
         {
           prop: 'SecondUnitName',
-          label: '项目建设单位',
+          label: '发起评价单位',
           width: 100,
           sort: true
         },

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/index.vue

@@ -30,8 +30,8 @@
                      v-if="selectAllButtonBoolean" @click="onSelectAllButtonTrue">确定</el-button>
         </span>
         <el-form v-model="searchForm" ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="项目建设单位">
-            <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择项目建设单位" style="width: 100%" clearable>
+          <el-form-item label="发起评价单位">
+            <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择发起评价单位" style="width: 100%" clearable>
               <el-option v-for="item in secondUnitOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
                          style="width: 100%">
               </el-option>
@@ -150,7 +150,15 @@
               <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
+          <el-col :span="12">
+            <el-form-item label="发起评价单位">
+              <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择发起评价单位" style="width: 100%" clearable>
+                <el-option v-for="item in secondUnitOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                           style="width: 100%">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 <!--          <el-col :span="12">-->
 <!--            <el-form-item label="工程地点">-->
 <!--              <el-input size="mini" v-model="searchForm.ProjectPlace" style="width:100%" placeholder="请输入"></el-input>-->

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

@@ -30,8 +30,8 @@
                      v-if="selectAllButtonBoolean" @click="onSelectAllButtonTrue">确定</el-button>
         </span>
         <el-form v-model="searchForm" ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="项目建设单位">
-            <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择项目建设单位" style="width: 100%" clearable>
+          <el-form-item label="发起评价单位">
+            <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择发起评价单位" style="width: 100%" clearable>
               <el-option v-for="item in secondUnitOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
                          style="width: 100%">
               </el-option>
@@ -150,6 +150,15 @@
               <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="发起评价单位">
+              <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择发起评价单位" style="width: 100%" clearable>
+                <el-option v-for="item in secondUnitOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                           style="width: 100%">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
 <!--          <el-col :span="12">-->
 <!--            <el-form-item label="工程地点">-->
@@ -425,7 +434,7 @@ export default {
         },
         {
           prop: 'SecondUnitName',
-          label: '项目建设单位',
+          label: '发起评价单位',
           width: 100,
           sort: true
         },