Jelajahi Sumber

巡检计划时间

Shannon_mu 3 tahun lalu
induk
melakukan
bb752b3488

+ 9 - 7
operationSupport/src/views/facilityInspections/popups/add.vue

@@ -37,8 +37,7 @@
                     :titles="['待选列表', '已选列表']"
                     @change="handleChange"
                     :data="devicesArr"
-                >
-                </el-transfer>
+                ></el-transfer>
             </div>
         </template>
 
@@ -176,7 +175,7 @@ export default {
 
     methods: {
         submit() {
-            new Promise((resolve) => {
+            new Promise(resolve => {
                 this.$refs.form.validate(resolve);
             }).then(() => {
                 var loading = this.$loading();
@@ -185,8 +184,11 @@ export default {
                 if (this.params.todo === 'edit') {
                     url = '/sc-community/inspection/update';
                 }
+                let initData = JSON.parse(JSON.stringify(this.formData));
+                // initData.startDate = this.formData.startDate + '00:00:00';
+                // initData.endDate = this.formData.endDate + '23:59:59';
                 this.$http
-                    .post(url, this.formData)
+                    .post(url, initData)
                     .then(({ status, msg }) => {
                         if (status == 0) {
                             this.$message.success(msg);
@@ -265,7 +267,7 @@ export default {
             this.$http.get('/sc-community/inspection/getInspectionDevices?id=' + id).then(({ data, msg }) => {
                 if (!!data && data.length > 0) {
                     let deviceIds = [];
-                    data.map((item) => {
+                    data.map(item => {
                         deviceIds.push(item.deviceId);
                     });
                     this.formData.deviceIds = deviceIds;
@@ -277,9 +279,9 @@ export default {
         this.deviceArr = this.params.deviceArr;
         this.findUser = this.params.arrData;
         if (!!this.params.data && !!this.params.data.id) {
-            new Promise((resolve) => {
+            new Promise(resolve => {
                 this.getDetails(this.params.data.id, resolve);
-            }).then((_) => {
+            }).then(_ => {
                 this.getTypes();
                 this.getSelectDevice(this.params.data.id);
             });

+ 9 - 1
operationSupport/src/views/patrolManagement/popups/scheduling.vue

@@ -39,7 +39,11 @@
                             </template>
                         </div>
                     </template>
-                    <div class="pointSet" @click="add(data)">点击设置</div>
+                    <div
+                        class="pointSet"
+                        v-if="date.getTime()>=new Date(new Date().toLocaleDateString()).getTime()"
+                        @click="add(data)"
+                    >点击设置</div>
                 </div>
             </template>
         </el-calendar>
@@ -81,6 +85,10 @@ export default {
                 title = '批量排班';
                 isSingle = false;
             }
+            if (dateDe !== undefined && onj !== undefined) {
+                new Date(dateDe).getTime() >= new Date(new Date().toLocaleDateString()).getTime();
+                return;
+            }
             new Promise(resolve => {
                 this.$store.dispatch('addPopup', {
                     url: '/patrolManagement/popups/schedulingAdd.vue',