前后:建设单位筛选

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

@@ -97,10 +97,6 @@ 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
 	}
@@ -126,6 +122,10 @@ func (this *OilContractReviewController) GetEntityList() {
 		where = where + " and ( r.CreateUserId =  '" + this.User.Id + "' "
 		where = where + " or c.SecondUnit = '" + 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

@@ -31,7 +31,7 @@
         </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-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>
@@ -149,11 +149,11 @@
             </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>
-            </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>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -446,12 +446,12 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'ProjectPlace',
-          label: '工程地点',
-          width: 100,
-          sort: true
-        },
+        // {
+        //   prop: 'ProjectPlace',
+        //   label: '工程地点',
+        //   width: 100,
+        //   sort: true
+        // },
 
         {
           prop: 'ProjectOwner',

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

@@ -31,7 +31,7 @@
         </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-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>
@@ -151,11 +151,11 @@
             </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>
-            </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>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -442,12 +442,12 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'ProjectPlace',
-          label: '工程地点',
-          width: 100,
-          sort: true
-        },
+        // {
+        //   prop: 'ProjectPlace',
+        //   label: '工程地点',
+        //   width: 100,
+        //   sort: true
+        // },
 
         {
           prop: 'ProjectOwner',

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

@@ -22,7 +22,7 @@
         </span>
         <el-form 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-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>
@@ -132,7 +132,7 @@
           </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-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>

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

@@ -31,7 +31,7 @@
         </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-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>
@@ -151,11 +151,11 @@
             </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>
-            </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>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -444,12 +444,12 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'ProjectPlace',
-          label: '工程地点',
-          width: 100,
-          sort: true
-        },
+        // {
+        //   prop: 'ProjectPlace',
+        //   label: '工程地点',
+        //   width: 100,
+        //   sort: true
+        // },
 
         {
           prop: 'ProjectOwner',