前后:建设单位筛选

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

@@ -57,6 +57,7 @@ func (this *OilContractReviewController) GetEntityList() {
 	BackRemark := this.GetString("BackRemark")
 	CreateOn := this.GetString("CreateOn")
 	SupplierName := this.GetString("SupplierName")
+	SecondUnit := this.GetString("SecondUnit")
 	Status := this.GetString("Status")
 	Year := this.GetString("Year")
 
@@ -96,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
 	}

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

@@ -30,6 +30,13 @@
                      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-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-form-item label="企业名称">
             <el-input size="mini" clearable v-model="searchForm.SupplierName" placeholder="请输入企业名称"></el-input>
           </el-form-item>
@@ -296,6 +303,7 @@ export default {
   },
   data () {
     return {
+      secondUnitOptions: [],
       selectedAuditBtn: '',
       auditOptions: [
         {
@@ -357,6 +365,7 @@ export default {
       searchFormReset: {},
       searchForm: {
         Id: '',
+        SecondUnit: '',
         SupplierId: '',
         SupplierName: '',
         ProjectName: '',
@@ -512,6 +521,7 @@ export default {
     // this.getDictOptions()
     this.getAuditPermForProf()
     this.statusFun()
+    this.GetSecondUnitOptions()
     // console.log(8888888,localStorage.getItem('userRoleids'))
     // if(localStorage.getItem('userRoleids')!=''&&localStorage.getItem('userRoleids')!=undefined){
     //   this.userRoleids = localStorage.getItem('userRoleids').indexOf('10000221')
@@ -521,6 +531,14 @@ export default {
     // }
   },
   methods: {
+    GetSecondUnitOptions () {
+      let _this = this
+      this.$axios.get('/register/orgList').then(res => {
+        _this.secondUnitOptions = res.data.items
+      }).catch(err => {
+        console.log(err)
+      })
+    },
     changeTableLoading () {
       this.tableLoading = true
     },

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

@@ -30,6 +30,13 @@
                      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-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-form-item label="企业名称">
             <el-input size="mini" clearable v-model="searchForm.SupplierName" placeholder="请输入企业名称"></el-input>
           </el-form-item>
@@ -351,8 +358,10 @@ export default {
       CreateOn: [],
       // 查询项
       searchFormReset: {},
+      secondUnitOptions: [],
       searchForm: {
         Id: '',
+        SecondUnit: '',
         SupplierId: '',
         SupplierName: '',
         ContractName: '',
@@ -509,8 +518,18 @@ export default {
     this.getAuditPermForProf()
     // this.getDictOptions()
     this.statusFun()
+    this.GetSecondUnitOptions()
   },
   methods: {
+    // 二级单位列表
+    GetSecondUnitOptions () {
+      let _this = this
+      this.$axios.get('/register/orgList').then(res => {
+        _this.secondUnitOptions = res.data.items
+      }).catch(err => {
+        console.log(err)
+      })
+    },
     changeTableLoading () {
       this.tableLoading = true
     },

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

@@ -21,6 +21,13 @@
           <!-- <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">
+          <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-form-item label="企业名称">
             <el-input size="mini" clearable v-model="searchForm.SupplierName" style="width: 120px;" placeholder="企业名称"></el-input>
           </el-form-item>
@@ -383,6 +390,7 @@
             <template slot-scope="scope">
               <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.SupplierId'" :rules="rules.name">
                 <el-select style="width: 100%" size="mini" v-model="scope.row.SupplierId" filterable :ref="'supplierIdSelect'+scope.$index" placeholder="请选择" :disabled="nameDisabled(scope.row.ContractClass)" @change="allUpdate(scope.row.SupplierId,scope.row.ImportSupplierName,'SupplierId',scope.row.Id, scope.row.SupplierId)">
+                  <el-option label="请选择" :value="0" :key="0"></el-option>
                   <el-option v-for="(item,index) of (SupplierNameDataFun(scope.row.ImportSupplierName,scope.$index, scope.row.ContractClass))" :key="index" :label="item.SupplierName" :value="item.Id"></el-option>
                 </el-select>
               </el-form-item>
@@ -419,6 +427,7 @@
             <template slot-scope="scope">
               <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.SecondUnit'" :rules="rules.SecondUnit">
                 <el-select filterable size="mini" v-model="scope.row.SecondUnit" placeholder="请选择" style="width: 100%" @change="allUpdate(scope.row.SecondUnit,scope.row.ImportSecondUnit,'SecondUnit', scope.row.Id, scope.row.SupplierId)">
+                  <el-option label="请选择" :value="0" :key="0"></el-option>
                   <el-option v-for="item in secondUnitOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
                              style="width: 100%">
                   </el-option>
@@ -1073,27 +1082,12 @@
           console.log('企业名称数据', res)
           if (value === '01') {
             this.SupplierNameData1 = res.data.items
-            let params = {
-              Id: 0,
-              SupplierName: '请选择'
-            }
-            this.SupplierNameData1.push(params)
           }
           if (value === '02') {
             this.SupplierNameData2 = res.data.items
-            let params = {
-              Id: 0,
-              SupplierName: '请选择'
-            }
-            this.SupplierNameData2.push(params)
           }
           if (value === '03') {
             this.SupplierNameData3 = res.data.items
-            let params = {
-              Id: 0,
-              SupplierName: '请选择'
-            }
-            this.SupplierNameData3.push(params)
           }
         }).catch(err => {
           console.error(err)
@@ -1277,11 +1271,6 @@
         let _this = this
         this.$axios.get('/register/orgList').then(res => {
           _this.secondUnitOptions = res.data.items
-          let params = {
-            Id: 0,
-            Fullname: '请选择'
-          }
-          _this.secondUnitOptions.push(params)
         }).catch(err => {
           console.log(err)
         })

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

@@ -30,6 +30,13 @@
                      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-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-form-item label="企业名称">
             <el-input size="mini" clearable v-model="searchForm.SupplierName" placeholder="请输入企业名称"></el-input>
           </el-form-item>
@@ -295,6 +302,7 @@ export default {
   data () {
     return {
       selectedAuditBtn: '',
+      secondUnitOptions: [],
       auditOptions: [
         {
           value: 0,
@@ -355,6 +363,7 @@ export default {
       searchFormReset: {},
       searchForm: {
         Id: '',
+        SecondUnit: '',
         SupplierId: '',
         SupplierName: '',
         ContractName: '',
@@ -511,8 +520,17 @@ export default {
     this.getAuditPermForProf()
     // this.getDictOptions()
     this.statusFun()
+    this.GetSecondUnitOptions()
   },
   methods: {
+    GetSecondUnitOptions () {
+      let _this = this
+      this.$axios.get('/register/orgList').then(res => {
+        _this.secondUnitOptions = res.data.items
+      }).catch(err => {
+        console.log(err)
+      })
+    },
     changeTableLoading (val) {
       if (val === true) {
         this.tableLoading = true