lrl - 2021-10-13

src/views/energyOperationSupport/components/startStopDocuments/SSDApproval.vue

@@ -315,7 +315,6 @@
                         <el-col :span="8">
                             <el-form-item label="编制时间" prop="creattime">
                                 <el-date-picker
-                                    value-format="yyyy-MM-dd HH:mm:ss"
                                     type="datetime"
                                     v-model="dialog.editorBox.form.data.creattime"
                                     placeholder=""

src/views/energyPlan/components/supplyAndDemand/planProjectRoundGx.vue

@@ -284,13 +284,14 @@
                                  v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
                                   :rules="tableFormRules.describe"
                                 >
-                                <zj-timegran-date
+                                <el-date-picker
+                                    value-format="yyyy-MM-dd"
+                                    type="date"
                                     v-model="rightTableObj[scope.row.seq].may"
-                                    @keydown.native="keyDown" :id="scope.$index + scope.column.id"
+                                    placeholder=""
                                     style="width: 100%;"
-                                    :timegranId="'DAY'"
-                                    :custom="1"
-                                ></zj-timegran-date>
+                                    @keydown.native="keyDown"
+                                ></el-date-picker>
                                 </el-form-item>
                                 <span v-else>{{scope.row.may}}</span>
                                 </template>

src/views/energyPlan/components/supplyAndDemand/planProjectRoundLG.vue

@@ -270,12 +270,14 @@
                                  v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
                                   :rules="tableFormRules.describe"
                                 >
-                                <zj-timegran-date
-                                     v-model="rightTableObj[scope.row.seq].may"
+                                <el-date-picker
+                                    value-format="yyyy-MM-dd"
+                                    type="date"
+                                    v-model="rightTableObj[scope.row.seq].may"
+                                    placeholder=""
                                     style="width: 100%;"
-                                    :timegranId="'DAY'"
-                                    :custom="1"
-                                ></zj-timegran-date>
+                                    @keydown.native="keyDown"
+                                ></el-date-picker>
                                 </el-form-item>
                                 <span v-else>{{scope.row.may}}</span>
                                 </template>

src/views/energyPlan/components/supplyAndDemand/planProjectRoundXG.vue

@@ -278,17 +278,24 @@
                                 >
                                 <template slot-scope="scope">
                                 <el-form-item
-                                 :prop="scope.row.seq + '.describe'"
+                                 :prop="scope.row.seq + '.may'"
                                  v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
-                                  :rules="tableFormRules.describe"
+                                 :rules="tableFormRules.may"
                                 >
-                                <zj-timegran-date
+                                <el-date-picker
+                                    value-format="yyyy-MM-dd"
+                                    type="date"
                                     v-model="rightTableObj[scope.row.seq].may"
-                                    @keydown.native="keyDown" :id="scope.$index + scope.column.id"
+                                    placeholder=""
+                                    style="width: 100%;"
+                                    @keydown.native="keyDown"
+                                ></el-date-picker>
+                                <!-- <zj-timegran-date
+                                    v
+                                    :id="scope.$index + scope.column.id"
                                     style="width: 100%;"
                                     :timegranId="'DAY'"
-                                    :custom="1"
-                                ></zj-timegran-date>
+                                ></zj-timegran-date> -->
                                 </el-form-item>
                                 <span v-else>{{scope.row.may}}</span>
                                 </template>
@@ -305,7 +312,7 @@
                                 <el-form-item
                                  :prop="scope.row.seq + '.describe'"
                                  v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
-                                  :rules="tableFormRules.describe"
+                                 :rules="tableFormRules.describe"
                                 >
                                     <el-input
                                     style="width: 100%;"