浏览代码

添加高级查询

Liuqi 6 年之前
父节点
当前提交
77c94d708d

+ 8 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/basislist.vue

@@ -143,6 +143,7 @@
                          show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-if="column.prop == 'ApplyTime'">{{ jstimehandle(scope.row.ApplyTime+'') }}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
@@ -528,6 +529,12 @@ export default {
           width: 240,
           sort: true
         },
+        {
+          prop: "ApplyTime",
+          label: '有效日期',
+          width: 220,
+          sort: true
+        },
 
         /* {
          prop: "OilCertificateNo",
@@ -1036,7 +1043,7 @@ export default {
     jstimehandle (val) {
       if (val === '') {
         return '----'
-      } else if (val === '0001-01-01T08:00:00+08:00') {
+      } else if (val === '0001-01-01T00:00:00Z') {
         return '----'
       } else if (val === '5000-01-01T23:59:59+08:00') {
         return '永久'

+ 8 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/goodslist.vue

@@ -141,6 +141,7 @@
                          show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-if="column.prop == 'ApplyTime'">{{ jstimehandle(scope.row.ApplyTime+'') }}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
@@ -530,6 +531,12 @@ export default {
           width: 240,
           sort: true
         },
+        {
+          prop: "ApplyTime",
+          label: '有效日期',
+          width: 220,
+          sort: true
+        },
 
         /* {
          prop: "OilCertificateNo",
@@ -1035,7 +1042,7 @@ export default {
     jstimehandle (val) {
       if (val === '') {
         return '----'
-      } else if (val === '0001-01-01T08:00:00+08:00') {
+      } else if (val === '0001-01-01T00:00:00Z') {
         return '----'
       } else if (val === '5000-01-01T23:59:59+08:00') {
         return '永久'

+ 8 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/index.vue

@@ -89,6 +89,7 @@
                          :prop="column.prop" sortable :width="column.width" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope" >
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-if="column.prop == 'ApplyTime'">{{ jstimehandle(scope.row.ApplyTime+'') }}</span>
              <span v-else-if="column.prop == 'AccessCardNo'" style="font-family:'黑体';font-size:13px">{{scope.row.AccessCardNo}}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
@@ -592,6 +593,12 @@
             width: 240,
             sort: true
           },
+          {
+            prop: "ApplyTime",
+            label: '有效日期',
+            width: 220,
+            sort: true
+          },
 
           /* {
            prop: "OilCertificateNo",
@@ -1070,7 +1077,7 @@
       jstimehandle (val) {
         if (val === '') {
           return '----'
-        } else if (val === '0001-01-01T08:00:00+08:00') {
+        } else if (val === '0001-01-01T00:00:00Z') {
           return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {
           return '永久'

+ 8 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/techlist.vue

@@ -143,6 +143,7 @@
                          show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.prop == 'SetupTime'">{{ jstimehandle(scope.row.SetupTime+'') }}</span>
+            <span v-if="column.prop == 'ApplyTime'">{{ jstimehandle(scope.row.ApplyTime+'') }}</span>
             <span v-else>{{ scope.row[column.prop] }}</span>
           </template>
         </el-table-column>
@@ -533,6 +534,12 @@ export default {
           width: 240,
           sort: true
         },
+        {
+          prop: "ApplyTime",
+          label: '有效日期',
+          width: 220,
+          sort: true
+        },
 
         /* {
           prop: "OilCertificateNo",
@@ -1039,7 +1046,7 @@ export default {
     jstimehandle (val) {
       if (val === '') {
         return '----'
-      } else if (val === '0001-01-01T08:00:00+08:00') {
+      } else if (val === '0001-01-01T00:00:00Z') {
         return '----'
       } else if (val === '5000-01-01T23:59:59+08:00') {
         return '永久'

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliercert/index.vue

@@ -768,7 +768,7 @@
       jstimehandle(val) {
         if (val === '') {
           return '----'
-        } else if (val === '0001-01-01T08:00:00+08:00') {
+        } else if (val === '0001-01-01T00:00:00Z') {
           return '----'
         } else if (val === '5000-01-01T23:59:59+08:00') {
           return '永久'

+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -105,9 +105,9 @@
         <!--<el-table-column label="最后一次年审" width="100px" prop="AuditDate" align="center">-->
           <!--<template slot-scope="scope">{{ jstimehandle(scope.row.AuditDate) }}</template>-->
         <!--</el-table-column>-->
-        <!-- <el-table-column label="有效期至" width="100px" prop="ApplyTime" align="center">
+        <el-table-column label="有效日期" width="220px" prop="ApplyTime" align="center">
           <template slot-scope="scope">{{ jstimehandle(scope.row.ApplyTime) }}</template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column label="状态" prop="InFlag" width="100px" align="center">
           <template slot-scope="scope">
             <el-alert