linwenxin 9 bulan lalu
induk
melakukan
78b4bc920e

+ 18 - 25
src/views/workOrder/workOrderPool/detailModule/workOrderInfo/buttons/processFeedback.vue

@@ -1,26 +1,11 @@
 <template>
   <div class="withinLine">
     <el-button type="primary" size="mini" @click="open">{{ resultCodeName }}</el-button>
-    <el-dialog
-      title=""
-      width="750px"
-      custom-class="diy-dialog"
-      append-to-body
-      :modal="true"
-      :visible.sync="formDialog"
-      :show-close="true"
-      :close-on-click-modal="false"
-      :modal-append-to-body="false"
-      :before-close="formCancel"
-    >
+    <el-dialog title="" width="750px" custom-class="diy-dialog" append-to-body :modal="true" :visible.sync="formDialog"
+      :show-close="true" :close-on-click-modal="false" :modal-append-to-body="false" :before-close="formCancel">
       <zj-form-container v-if="formDialog" ref="formRef" :form-data="formData" :styleSwitch="false">
-        <zj-form-module
-          :title="resultCodeName"
-          label-width="140px"
-          :showPackUp="false"
-          :form-data="formData"
-          :form-items="formItems"
-        >
+        <zj-form-module :title="resultCodeName" label-width="140px" :showPackUp="false" :form-data="formData"
+          :form-items="formItems">
         </zj-form-module>
       </zj-form-container>
       <div slot="footer" class="dialog-footer">
@@ -114,7 +99,7 @@ export default {
 
 
 
-        
+
 
         {
           isShow: !!~['预约', '改约'].indexOf(this.formData.type),
@@ -127,7 +112,7 @@ export default {
             style: { width: '100%' },
             type: "datetime",
             placeholder: '请选择',
-            'value-format': 'yyyy-MM-dd HH:mm',
+            'value-format': 'yyyy-MM-dd HH:mm:ss',
             'picker-options': {
               disabledDate: time => {
                 return time.getTime() < Date.now() - 86400000
@@ -135,8 +120,13 @@ export default {
             }
           },
           events: {
-            change: () => {
-              this.formData.appointmentEndTime = ""
+            change: (value) => {
+              if (value && new Date(value).getTime() < new Date().getTime()) {
+                this.formData.appointmentTime = ""
+                this.$message.warning('必须大于当前时间')
+              } else {
+                this.formData.appointmentEndTime = ""
+              }
             }
           },
           formItemAttributes: {
@@ -156,7 +146,7 @@ export default {
             style: { width: '100%' },
             type: "datetime",
             placeholder: '请选择',
-            'value-format': 'yyyy-MM-dd HH:mm',
+            'value-format': 'yyyy-MM-dd HH:mm:ss',
             'picker-options': {
               disabledDate: time => {
                 var data = this.formData?.appointmentTime?.split(" ")?.[0]
@@ -166,7 +156,10 @@ export default {
           },
           events: {
             change: (value) => {
-              if (value && new Date(value).getTime() < new Date(this.formData?.appointmentTime)) {
+              if (value && new Date(value).getTime() < new Date().getTime()) {
+                this.formData.appointmentEndTime = ""
+                this.$message.warning('必须大于当前时间')
+              } else if (value && new Date(value).getTime() < new Date(this.formData?.appointmentTime).getTime()) {
                 this.formData.appointmentTime = value
               }
             }

+ 13 - 5
src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/serviceInfo.js

@@ -135,7 +135,7 @@ export default {
             style: { width: '100%' },
             type: "datetime",
             placeholder: '请选择',
-            'value-format': 'yyyy-MM-dd HH:mm',
+            'value-format': 'yyyy-MM-dd HH:mm:ss',
             'picker-options': {
               disabledDate: time => {
                 return time.getTime() < Date.now() - 86400000
@@ -143,8 +143,13 @@ export default {
             }
           },
           events: {
-            change: () => {
-              this.orderInfo.appointmentEndTime = ""
+            change: (value) => {
+              if (value && new Date(value).getTime() < new Date().getTime()) {
+                this.orderInfo.appointmentTime = ""
+                this.$message.warning('必须大于当前时间')
+              } else {
+                this.orderInfo.appointmentEndTime = ""
+              }
             }
           },
           formItemAttributes: {
@@ -165,7 +170,7 @@ export default {
             style: { width: '100%' },
             type: "datetime",
             placeholder: '请选择',
-            'value-format': 'yyyy-MM-dd HH:mm',
+            'value-format': 'yyyy-MM-dd HH:mm:ss',
             'picker-options': {
               disabledDate: time => {
                 var data = this.orderInfo?.appointmentTime?.split(" ")?.[0]
@@ -175,7 +180,10 @@ export default {
           },
           events: {
             change: (value) => {
-              if (value && new Date(value).getTime() < new Date(this.orderInfo?.appointmentTime)) {
+              if (value && new Date(value).getTime() < new Date().getTime()) {
+                this.orderInfo.appointmentEndTime = ""
+                this.$message.warning('必须大于当前时间')
+              } else if (value && new Date(value).getTime() < new Date(this.orderInfo?.appointmentTime).getTime()) {
                 this.orderInfo.appointmentTime = value
               }
             }