前:列列表时间显示

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

@@ -207,6 +207,7 @@ import permissionApi from '@/api/oilcontract/permission'
 import submitPopup from '@/components/oilcontract/submitPopup.vue'
 import FileSaver from 'file-saver'
 import XLSX from 'xlsx'
+import util from "../../../utils/util";
 
 export default {
   computed: {
@@ -258,6 +259,9 @@ export default {
               return '--'
               break;
           }
+        } else if (index === 'OpenDate' || index === 'EndDate' || index === 'PlanFinishDate' || index === 'SubmitDate') {
+          let timeString = this.timeStyle(item)
+          return timeString
         } else {
           return item;
         }
@@ -449,6 +453,12 @@ export default {
 
   },
   methods: {
+    timeStyle (item) {
+      if (item === '0001-01-01T00:00:00Z' || item === '') {
+        return '--'
+      }
+      return util.formatDate('year', item)
+    },
     //一键处理
     onSelectAll(e) {
       console.log(e)

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

@@ -40,7 +40,7 @@
         </el-table-column>
 
         <el-table-column sortable show-overflow-tooltip prop="SupplierName" header-align="center" width="130" label="供应商名称"></el-table-column>
-        <el-table-column sortable show-overflow-tooltip prop="Score" header-align="center" label="评价得分(100分)" width="120"></el-table-column>
+        <el-table-column sortable show-overflow-tooltip prop="Score" header-align="center" label="评价得分(100分)" width="140"></el-table-column>
         <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center">
           <el-table-column sortable show-overflow-tooltip prop="Score1" header-align="center" label="产品质量(30分)" width="140"></el-table-column>
           <el-table-column sortable show-overflow-tooltip prop="Score2" header-align="center" label="合同履约(20分)" width="140"></el-table-column>

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

@@ -206,14 +206,13 @@ import FileSaver from 'file-saver'
 import XLSX from 'xlsx'
 import evaluationList from "../contract-basis/_opera/evaluationlist";
 import baseList from "../contract-basis/_opera/baselist";
+import util from "../../../utils/util";
 
 export default {
   computed: {
     ...mapGetters({
       authUser: 'authUser'
-    })
-  },
-  computed: {
+    }),
     columnFun: function () {
       return function (item, index) {
         if (index == 'Status') {
@@ -259,8 +258,11 @@ export default {
               return '--'
               break;
           }
+        } else if (index === 'OpenDate' || index === 'EndDate' || index === 'PlanFinishDate' || index === 'SubmitDate') {
+          let timeString = this.timeStyle(item)
+          return timeString
         } else {
-          return item;
+          return item
         }
 
       }
@@ -444,7 +446,13 @@ export default {
     this.statusFun()
   },
   methods: {
-    //一键处理
+    timeStyle (item) {
+      if (item === '0001-01-01T00:00:00Z' || item === '') {
+        return '--'
+      }
+      return util.formatDate('year', item)
+    },
+    // 一键处理
     onSelectAll(e) {
       console.log(e)
       var list = []
@@ -453,7 +461,7 @@ export default {
       })
       this.eveIdList = list
     },
-    //筛选
+    // 筛选
     selectableFun(row, index) {
       if (row.Status == 4) {
         return true;

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

@@ -349,19 +349,18 @@
   </div>
 </template>
 <script>
-  import { mapGetters } from 'vuex';
-  import api from '@/api/oilcontract/contract';
-  import permissionApi from '@/api/oilcontract/permission';
+  import { mapGetters } from 'vuex'
+  import api from '@/api/oilcontract/contract'
+  import permissionApi from '@/api/oilcontract/permission'
   import axios from 'axios'
   import uploadajax from '@/assets/js/uploadajax.js'
   import oilsupplierApi from '@/api/oilsupplier/annualaudit'
+  import util from '../../../utils/util'
   export default {
-    computed: {
+    computed:{
       ...mapGetters({
         authUser: 'authUser'
-      })
-    },
-    computed:{
+      }),
       tableFun:function(){
         return function(name,item){
           if(name == 'ContractClass'){
@@ -394,7 +393,10 @@
               default:
               return '--'
             }
-          }else{
+          } else if (name === 'OpenDate' || name === 'EndDate' || name === 'PlanFinishDate' || name === 'SubmitDate') {
+            let timeString = this.timeStyle(item)
+            return timeString
+          } else {
             return item
           }
         }
@@ -414,8 +416,7 @@
             return list
           }
         }
-      },
-
+      }
     },
     name: 'oilcontract',
     data() {
@@ -772,6 +773,12 @@
 
     },
     methods: {
+      timeStyle (item) {
+        if (item === '0001-01-01T00:00:00Z' || item === '') {
+          return '--'
+        }
+        return util.formatDate('year', item)
+      },
       onSelectContractClass(e){
         var that = this;
         setTimeout(function() {

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

@@ -205,14 +205,13 @@ import permissionApi from '@/api/oilcontract/permission'
 import submitPopup from '@/components/oilcontract/submitPopup.vue'
 import FileSaver from 'file-saver'
 import XLSX from 'xlsx'
+import util from "../../../utils/util";
 
 export default {
   computed: {
     ...mapGetters({
       authUser: 'authUser'
-    })
-  },
-  computed: {
+    }),
     columnFun: function () {
       return function (item, index) {
         if (index == 'Status') {
@@ -258,10 +257,12 @@ export default {
               return '--'
               break;
           }
+        } else if (index === 'OpenDate' || index === 'EndDate' || index === 'PlanFinishDate' || index === 'SubmitDate') {
+          let timeString = this.timeStyle(item)
+          return timeString
         } else {
-          return item;
+          return item
         }
-
       }
     }
   },
@@ -442,6 +443,12 @@ export default {
     this.statusFun()
   },
   methods: {
+    timeStyle (item) {
+      if (item === '0001-01-01T00:00:00Z' || item === '') {
+        return '--'
+      }
+      return util.formatDate('year', item)
+    },
     //一键处理
     onSelectAll(e) {
       console.log(e)

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

@@ -152,16 +152,16 @@
           }
         }
       },
-      dateFun:function(){
-        return function(item){
+      dateFun: function () {
+        return function (item) {
           // var myDate = new Date(item);
           console.log(item, '33333')
-          if (item == '0001-01-01T00:00:00Z') {
+          if (item === '0001-01-01T00:00:00Z') {
             return '--'
           }
-          return util.formatDate('year',item)
+          return util.formatDate('year', item)
         }
-      },
+      }
     },
     name: 'oilcontract',
     data() {