From 676fba209b6bd2c0405b06078f05a72585546dc2 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 11 四月 2024 10:15:08 +0800
Subject: [PATCH] 提交一把

---
 company/src/components/enterprise/editFactoryChange.vue |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/company/src/components/enterprise/editFactoryChange.vue b/company/src/components/enterprise/editFactoryChange.vue
index 16619aa..976d5b3 100644
--- a/company/src/components/enterprise/editFactoryChange.vue
+++ b/company/src/components/enterprise/editFactoryChange.vue
@@ -16,10 +16,10 @@
                     <div style="display: flex; flex-direction: column;">
                         <el-date-picker
                             v-model="form.applyStartTime"
-                            type="datetime"
+                            type="date"
                             :picker-options="pickerOptions"
-                            value-format="yyyy-MM-dd hh:mm:ss"
-                            format="yyyy-MM-dd hh:mm:ss"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            format="yyyy-MM-dd HH:mm:ss"
                             placeholder="閫夋嫨鏃ユ湡">
                         </el-date-picker>
                         <span style="color: #F95601; font-size: 14px;">锛堟鏃ョ敓鏁堟姇淇濊浜�17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
@@ -28,7 +28,7 @@
                 <el-form-item label="鎶曚繚骞撮緞" v-if="item">
                     <span>{{item.minAge}} 鑷� {{item.maxAge}}</span>
                 </el-form-item>
-                <el-form-item label="璐圭敤" v-if="item">
+                <el-form-item label="璐圭敤" v-if="item && item.type==0">
                     <span>{{item.price}}鍏�</span>
                     <span v-if="item.timeUnit === 0">/澶�</span>
                     <span v-if="item.timeUnit === 1">/鍗婃湀</span>
@@ -77,7 +77,7 @@
                 <el-table-column
                         prop="currentFee"
                         align="center"
-                        label="褰撳墠璐圭敤(鍏�)">
+                        label="宸蹭骇鐢熻垂鐢�(鍏�)">
                 </el-table-column>
                 <el-table-column
                         prop="fee"
@@ -175,7 +175,7 @@
             return {
                 form: {
                     id: null,
-                    applyChangId: '',
+                    applyChangeId: '',
                     solutionId: '',
                     solutionsName: '',
                     applyStartTime: '',
@@ -219,7 +219,7 @@
                     this.$nextTick(() => {
                         this.$refs.form.resetFields()
                         this.form.id = target.id
-                        this.form.applyChangId = target.applyChangId
+                        this.form.applyChangeId = target.applyChangId
                         this.getDetails()
                         this.getapplyChagneDetailList()
                     })
@@ -236,7 +236,7 @@
             // 鑾峰彇鎹㈠巶浜哄憳
             getapplyChagneDetailList() {
                 applyChagneDetailList({
-                    applyChangId: this.form.applyChangId,
+                    applyChangeId: this.form.applyChangeId,
                     types: [2]
                 }).then(res => {
                     res.forEach(item => {
@@ -282,7 +282,7 @@
                         this.pickerOptions = {
                             disabledDate(time) {
                                 // - 8.64e7
-                                return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date().getTime()
+                                return time.getTime() > new Date(res.endTime).getTime() || time.getTime() <new Date(res.startTime).getTime()
                             }
                         };
                         this.changeSolution1(res.solutionId)
@@ -323,7 +323,7 @@
                         // })
                         this.isWorking = true
                         update({
-                            id: this.form.applyChangId,
+                            id: this.form.applyChangeId,
                             applyId: this.form.id,
                             changeDetailList: this.form.factory,
                             validTime: this.form.applyStartTime,

--
Gitblit v1.9.3