前端: 合同评价按年度查询、计算

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

@@ -411,6 +411,7 @@ export default {
   created () {
     // console.log('接受操作', this.$route.query.item)
     this.serviceId = this.$route.params.opera
+    this.year = !this.$route.query.year === true ? '' : this.$route.query.year
     this.initPageId(this.serviceId)
 
     // if (this.$route.query.item) {
@@ -556,7 +557,8 @@ export default {
     initPageId (id) {
       if (id > 0) {
         var data = {
-          ContractClass: '02'
+          ContractClass: '02',
+          Year: this.year
         }
         api.computeEntity(id, data, this.$axios).then(res => {
           console.log('详情', res)

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

@@ -19,14 +19,20 @@
           <el-form-item label="企业名称">
             <el-input size="mini" clearable v-model="searchForm.SupplierName" placeholder="请输入企业名称"></el-input>
           </el-form-item>
-          <el-form-item label="评价结果">
-            <el-select size="mini" v-model="searchForm.Evaluate" placeholder="请选择" style="width: 100%" clearable>
+          <el-form-item label="评价结果" style="width: 170px">
+            <el-select size="mini" v-model="searchForm.Evaluate" placeholder="请选择" style="width: 100px" clearable>
               <el-option label="全部" value="" key="01"></el-option>
               <el-option label="优秀" value="1" key="02"></el-option>
               <el-option label="合格" value="2" key="03"></el-option>
               <el-option label="不合格" value="3" key="04"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="年度">
+            <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="年度">
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
@@ -257,6 +263,7 @@
 
     data () {
       return {
+        yearList: [],
         tableLoading: false,
 
         tableWidth: '290px',
@@ -290,13 +297,14 @@
           Score6: '',
           Score7: '',
           Score8: '',
-          Remark: ''
-
+          Remark: '',
+          Year: ''
         },
         jurisdictionBoolean: false
       }
     },
     created () {
+      this.getYearList()
       // 查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm)
       // 查询列表
@@ -305,6 +313,11 @@
       this.permissionIsauth()
     },
     methods: {
+      getYearList () {
+        let now = new Date()
+        let nowYear = now.getFullYear()
+        this.yearList = [nowYear, nowYear - 1, nowYear - 2, nowYear - 3]
+      },
       // 判断权限
       permissionIsauth () {
         var data = {
@@ -482,6 +495,7 @@
         this.$router.push({
           path: '/oilcontract/contract-basis-year/' + item.SupplierId + '/operation',
           query: {
+            year: this.searchForm.Year
             // item: item
             // SupplierId:item.SupplierId,
           }

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

@@ -33,6 +33,12 @@
               <el-option label="已完成" value="8" key="04"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="年度">
+            <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="年度">
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
@@ -291,6 +297,7 @@ export default {
   },
   data () {
     return {
+      yearList: [],
       delAuditProf: false, // 企管法规处的权限
       tableLoading: false, // table表格
       userSelectBoolean: false,
@@ -350,7 +357,8 @@ export default {
         ModifiedOn: '',
         ModifiedUserId: '',
         ModifiedBy: '',
-        Status: ''
+        Status: '',
+        Year: ''
       },
       tableColumns: [
 
@@ -455,6 +463,7 @@ export default {
     }
   },
   created () {
+    this.getYearList()
     // 查询条件初始值备份
     Object.assign(this.searchFormReset, this.searchForm)
     // 查询列表
@@ -471,6 +480,11 @@ export default {
     // }
   },
   methods: {
+    getYearList () {
+      let now = new Date()
+      let nowYear = now.getFullYear()
+      this.yearList = [nowYear, nowYear - 1, nowYear - 2, nowYear - 3]
+    },
     timeStyle (item) {
       if (item === '0001-01-01T00:00:00Z' || item === '') {
         return '--'

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

@@ -370,6 +370,7 @@ export default {
   watch: {},
   created () {
     this.serviceId = this.$route.params.opera
+    this.year = !this.$route.query.year === true ? '' : this.$route.query.year
     this.initPageId(this.serviceId)
     // console.log('接受操作', this.$route.query.item)
     // if (this.$route.query.item) {
@@ -484,9 +485,9 @@ export default {
     initPageId (id) {
       if (id > 0) {
         var data = {
-          ContractClass: '01'
+          ContractClass: '01',
+          Year: this.year
         }
-        console.log('传进来了?', id)
         api.computeEntity(id, data, this.$axios).then(res => {
           console.log('详情', res)
           this.initPage(id, res.data)

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

@@ -15,14 +15,20 @@
           <el-form-item label="企业名称">
             <el-input size="mini" clearable v-model="searchForm.SupplierName" placeholder="请输入企业名称"></el-input>
           </el-form-item>
-          <el-form-item label="评价结果">
-            <el-select size="mini" v-model="searchForm.Evaluate" placeholder="请选择" style="width: 100%" clearable>
+          <el-form-item label="评价结果" style="width: 170px">
+            <el-select size="mini" v-model="searchForm.Evaluate" placeholder="请选择" style="width: 100px" clearable>
               <el-option label="全部" value="" key="01"></el-option>
               <el-option label="优秀" value="1" key="02"></el-option>
               <el-option label="合格" value="2" key="03"></el-option>
               <el-option label="不合格" value="3" key="04"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="年度">
+            <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="年度">
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
@@ -182,6 +188,7 @@
 
     data() {
       return {
+        yearList: [],
         tableLoading: false,
         dialogVisible: false,
         excelLoading: false,
@@ -212,8 +219,8 @@
           Score3: "",
           Score4: "",
           Score5: "",
-
-          Remark: '',
+          Year: '',
+          Remark: ''
         },
         tableColumns: [
 
@@ -269,6 +276,7 @@
       }
     },
     created() {
+      this.getYearList()
       //查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm);
       //查询列表
@@ -277,6 +285,11 @@
       this.permissionIsauth()
     },
     methods: {
+      getYearList () {
+        let now = new Date()
+        let nowYear = now.getFullYear()
+        this.yearList = [nowYear, nowYear - 1, nowYear - 2, nowYear - 3]
+      },
       // 判断权限
       permissionIsauth(){
         var data = {
@@ -412,6 +425,7 @@
           path: '/oilcontract/contract-goods-year/' + item.SupplierId + '/operation',
           query: {
             // item:item
+            year: this.searchForm.Year
           }
         })
       },

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

@@ -33,6 +33,12 @@
               <el-option label="已完成" value="8" key="04"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="年度">
+            <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="年度">
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
@@ -289,6 +295,7 @@ export default {
   },
   data () {
     return {
+      yearList: [],
       delAuditProf: false, // 企管法规处的权限
       tableLoading: false,
       userSelectBoolean: false,
@@ -348,7 +355,8 @@ export default {
         ModifiedOn: '',
         ModifiedUserId: '',
         ModifiedBy: '',
-        Status: ''
+        Status: '',
+        Year: ''
       },
       tableColumns: [
 
@@ -454,6 +462,7 @@ export default {
     }
   },
   created () {
+    this.getYearList()
     // 查询条件初始值备份
     Object.assign(this.searchFormReset, this.searchForm)
     // 查询列表
@@ -463,6 +472,11 @@ export default {
     this.statusFun()
   },
   methods: {
+    getYearList () {
+      let now = new Date()
+      let nowYear = now.getFullYear()
+      this.yearList = [nowYear, nowYear - 1, nowYear - 2, nowYear - 3]
+    },
     timeStyle (item) {
       if (item === '0001-01-01T00:00:00Z' || item === '') {
         return '--'

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

@@ -358,6 +358,7 @@ export default {
   created () {
     // console.log('接受操作', this.$route.query.item)
     this.serviceId = this.$route.params.opera
+    this.year = !this.$route.query.year === true ? '' : this.$route.query.year
     this.initPageId(this.serviceId)
     // if (this.$route.query.item) {
     //   if (this.$route.query.item.SupplierId > 0) {
@@ -472,7 +473,8 @@ export default {
     initPageId (id) {
       if (id > 0) {
         var data = {
-          ContractClass: '03'
+          ContractClass: '03',
+          Year: this.year
         }
         api.computeEntity(id, data, this.$axios).then(res => {
           console.log('详情', res)

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

@@ -18,14 +18,20 @@
           <el-form-item label="企业名称">
             <el-input size="mini" clearable v-model="searchForm.SupplierName" placeholder="请输入企业名称"></el-input>
           </el-form-item>
-          <el-form-item label="评价结果">
-            <el-select size="mini" v-model="searchForm.Evaluate" placeholder="请选择" style="width: 100%" clearable>
+          <el-form-item label="评价结果" style="width: 170px">
+            <el-select size="mini" v-model="searchForm.Evaluate" placeholder="请选择" style="width: 100px" clearable>
               <el-option label="全部" value="" key="01"></el-option>
               <el-option label="优秀" value="1" key="02"></el-option>
               <el-option label="合格" value="2" key="03"></el-option>
               <el-option label="不合格" value="3" key="04"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="年度">
+            <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="年度">
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
@@ -175,6 +181,7 @@
 
     data() {
       return {
+        yearList: [],
         tableLoading: false,
         jurisdictionBoolean:false,
         dialogVisible: false,
@@ -205,11 +212,13 @@
           Score3: "",
           Score4: "",
           Remark: '',
+          Year: ''
         },
 
       }
     },
     created() {
+      this.getYearList()
       //查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm);
       //查询列表
@@ -218,6 +227,11 @@
       this.permissionIsauth()
     },
     methods: {
+      getYearList () {
+        let now = new Date()
+        let nowYear = now.getFullYear()
+        this.yearList = [nowYear, nowYear - 1, nowYear - 2, nowYear - 3]
+      },
       // 判断权限
       permissionIsauth(){
         var data = {
@@ -409,19 +423,19 @@
         minute = minute < 10 ? ('0' + minute) : minute;
         return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
       },
-      //跳转评价
-      onNavigateScore(item){
-        console.log('跳转',item)
+      // 跳转评价
+      onNavigateScore (item) {
+        console.log('跳转', item)
         this.$router.push({
-          path:'/oilcontract/contract-service-year/' + item.SupplierId + '/operation',
-          query:{
+          path: '/oilcontract/contract-service-year/' + item.SupplierId + '/operation',
+          query: {
+            year: this.searchForm.Year
             // item:item
           }
         })
-      },
+      }
     }
   }
-
 </script>
 
 <style lang="scss">

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

@@ -33,6 +33,12 @@
               <el-option label="已完成" value="8" key="04"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="年度">
+            <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="年度">
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
                             start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
@@ -288,6 +294,7 @@ export default {
   },
   data () {
     return {
+      yearList: [],
       delAuditProf: false, // 企管法规处的权限
       tableLoading: false,
       userSelectBoolean: false,
@@ -347,8 +354,8 @@ export default {
         ModifiedOn: '',
         ModifiedUserId: '',
         ModifiedBy: '',
-        Status: ''
-
+        Status: '',
+        Year: ''
       },
       tableColumns: [
 
@@ -454,6 +461,7 @@ export default {
     }
   },
   created () {
+    this.getYearList()
     // 查询条件初始值备份
     Object.assign(this.searchFormReset, this.searchForm)
     // 查询列表
@@ -463,6 +471,11 @@ export default {
     this.statusFun()
   },
   methods: {
+    getYearList () {
+      let now = new Date()
+      let nowYear = now.getFullYear()
+      this.yearList = [nowYear, nowYear - 1, nowYear - 2, nowYear - 3]
+    },
     timeStyle (item) {
       if (item === '0001-01-01T00:00:00Z' || item === '') {
         return '--'