Bläddra i källkod

更改样式,时间

sunyanqiang 2 år sedan
förälder
incheckning
6586115fe9

+ 2 - 2
src/views/grassrootsregistration/bdglarmament/index.vue

@@ -509,7 +509,7 @@ export default {
       this.current_month.forEach((element) => {
         // 十号之前是1675987200
         var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1675987200 && this.dayTime == 1) {
+        if (date1 > 1678406400 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -522,7 +522,7 @@ export default {
               this.form.recordDate = null;
             });
         }
-        if (date1 < 1672501850 && this.dayTime == 1) {
+        if (date1 < 1675180250 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

+ 2 - 2
src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -2101,7 +2101,7 @@ export default {
       this.current_month.forEach((element) => {
         // 十号之前是1675987200
         var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1675987200 && this.dayTime == 1) {
+        if (date1 > 1678406400 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -2114,7 +2114,7 @@ export default {
               this.form.startTime = null;
             });
         }
-        if (date1 < 1672501850 && this.dayTime == 1) {
+        if (date1 < 1675180250 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

+ 2 - 2
src/views/grassrootsregistration/bdgldrill/index.vue

@@ -980,7 +980,7 @@ export default {
       this.current_month.forEach((element) => {
         // 十号之前是1675987200
         var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1675987200 && this.dayTime == 1) {
+        if (date1 > 1678406400 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -993,7 +993,7 @@ export default {
               this.form.drillTime = null;
             });
         }
-        if (date1 < 1672501850 && this.dayTime == 1) {
+        if (date1 < 1675180250 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

+ 2 - 2
src/views/grassrootsregistration/bdglequip/index.vue

@@ -570,7 +570,7 @@ export default {
       this.current_month.forEach((element) => {
         // 十号之前是1675987200
         var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1675987200 && this.dayTime == 1) {
+        if (date1 > 1678406400 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -583,7 +583,7 @@ export default {
               this.form.intime = null;
             });
         }
-        if (date1 < 1672501850 && this.dayTime == 1) {
+        if (date1 < 1675180250 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

+ 3 - 3
src/views/grassrootsregistration/bdgleven/index.vue

@@ -514,9 +514,9 @@ export default {
       var date1 = Math.round(new Date(val) / 1000);
       // 当月时间
       this.current_month.forEach((element) => {
-        // 十号之前是1675987200
+        // 十号之前是1678406400
         var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1675987200&&this.dayTime==1) {
+        if (date1 > 1678406400&&this.dayTime==1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -529,7 +529,7 @@ export default {
               this.form.convokeTime = null;
             });
         }
-        if (date1<1672501850&&this.dayTime==1) {
+        if (date1<1675180250&&this.dayTime==1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

+ 2 - 2
src/views/grassrootsregistration/bdglfood/index.vue

@@ -1440,7 +1440,7 @@ export default {
       this.current_month.forEach((element) => {
         // 十号之前是1675987200
         var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1675987200 && this.dayTime == 1) {
+        if (date1 > 1678406400 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -1453,7 +1453,7 @@ export default {
               this.form.recordDate = null;
             });
         }
-        if (date1 < 1672501850 && this.dayTime == 1) {
+        if (date1 < 1675180250 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

+ 2 - 2
src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -652,7 +652,7 @@ export default {
       this.current_month.forEach((element) => {
         // 十号之前是1675987200
         var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1675987200 && this.dayTime == 1) {
+        if (date1 > 1678406400 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -665,7 +665,7 @@ export default {
               this.form.convokeTime = null;
             });
         }
-        if (date1 < 1672501850 && this.dayTime == 1) {
+        if (date1 < 1675180250 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

+ 2 - 2
src/views/grassrootsregistration/bdglparty/index.vue

@@ -606,7 +606,7 @@ export default {
       this.current_month.forEach((element) => {
         // 十号之前是1675987200
         var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1675987200 && this.dayTime == 1) {
+        if (date1 > 1678406400 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -619,7 +619,7 @@ export default {
               this.form.convokeTime = null;
             });
         }
-        if (date1 < 1672501850 && this.dayTime == 1) {
+        if (date1 < 1675180250 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

+ 2 - 2
src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -472,7 +472,7 @@ export default {
       this.current_month.forEach((element) => {
         // 十号之前是1675987200
         var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1675987200 && this.dayTime == 1) {
+        if (date1 > 1678406400 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -485,7 +485,7 @@ export default {
               this.form.equipTime = null;
             });
         }
-        if (date1 < 1672501850 && this.dayTime == 1) {
+        if (date1 < 1675180250 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

+ 2 - 2
src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -531,7 +531,7 @@ export default {
       this.current_month.forEach((element) => {
         // 十号之前是1675987200
         var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1675987200 && this.dayTime == 1) {
+        if (date1 > 1678406400 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -544,7 +544,7 @@ export default {
               this.form.startTime = null;
             });
         }
-        if (date1 < 1672501850 && this.dayTime == 1) {
+        if (date1 < 1675180250 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

+ 2 - 2
src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -603,7 +603,7 @@ export default {
       this.current_month.forEach((element) => {
         // 十号之前是1675987200
         var date2 = Math.round(new Date(element) / 1000);
-        if (date1 > 1675987200 && this.dayTime == 1) {
+        if (date1 > 1678406400 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
@@ -616,7 +616,7 @@ export default {
               this.form.convokeTime = null;
             });
         }
-        if (date1 < 1672501850 && this.dayTime == 1) {
+        if (date1 < 1675180250 && this.dayTime == 1) {
           this.$confirm("请在规定时间内填写", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

+ 14 - 4
src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -143,7 +143,7 @@
         label="开始时间"
         align="center"
         prop="authStime"
-        width="200"
+        width="100"
       >
         <template slot-scope="scope">
           <span>{{
@@ -158,7 +158,7 @@
         label="结束时间"
         align="center"
         prop="authEtime"
-        width="200"
+        width="100"
       >
         <template slot-scope="scope">
           <span>{{
@@ -180,8 +180,18 @@
         label="所在单位审批时间"
         align="center"
         prop="battaliontime"
-        width="150"
-      />
+        width="130"
+      >
+      <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.battaliontime, "{y}-{m}-{d}")
+          }}<br/>
+          {{
+            parseTime(scope.row.battaliontime, "{h}:{m}:{s}")
+          }}
+        </span>
+        </template>
+      </el-table-column>
       <el-table-column label="所在单位审批状态" align="center" width="130">
         <template slot-scope="scope">
           <el-col v-if="scope.row.unitPeopleState == 1" style="color: #ffba00"