Browse Source

修改流程报表增加日期选择器的显示

xlj_bule 3 years ago
parent
commit
abb1246550

+ 11 - 1
packages/process/src/ProcessReportDynamic.vue

@@ -61,7 +61,6 @@
               type-bold="true"
               @change="valueChanged(item)"
             />
-
             <DateTime
               v-if="item.displayType =='DateTimeBoxEditor'"
               :id="'editor_' + item.id"
@@ -71,6 +70,15 @@
               @update:model-value="changeValue(item, $event)"
             />
 
+            <!-- 日期选择器  -->
+            <Date
+              v-if="item.displayType =='DateBoxEditor'"
+              :id="'DateBoxEditor_' + item.id"
+              v-model="item.fieldValue.displayValue[0]"
+              class="m-input-group"
+              @update:model-value="changeValue(item, $event)"
+            />
+
             <EnumSelectWidget
               v-if="item.displayType =='ListBoxEnumEditor'"
               :field="item"
@@ -148,6 +156,7 @@ import Common from '../../common/Common.js';
 
 import Navbar from '../../navbar/src/Navbar.vue';
 import DateTime from '../../datetime/src/DateTime.vue';
+import Date from '../../date/src/Date.vue';
 import Loading from '../../loading/src/Loading.vue';
 import ProcessReportResultPreview from './ProcessReportResultPreview.vue';
 import SearchWidget from '../../info/src/SearchWidget.vue';
@@ -159,6 +168,7 @@ export default {
 
   components: {
     DateTime,
+    Date,
     MultiSearchWidget : defineAsyncComponent(() =>
       import('../../info/src/MultiSearchWidget.vue'),
     ),

+ 9 - 1
packages/process/src/ProcessReportStatic.vue

@@ -58,7 +58,7 @@
               placeholder="请输入数字"
               @change="valueChanged(item)"
             />
-
+            {{ item.displayType }}
             <Switches
               v-if="item.displayType =='CheckBoxEditor'"
               v-model="item.fieldValue.displayValue[0]"
@@ -103,6 +103,13 @@
               @value-changed="tabValueChanged($event, item)"
             />
 
+            <!-- 日期选择器  -->
+            <Date
+              v-if="item.displayType =='DateBoxEditor'"
+              v-model="item.fieldValue.displayValue[0]"
+              @selected="changeValue(item, $event)"
+            />
+
             <VueMonthlyPicker
               v-if="item.displayType =='YearMonthEditor'"
               :value="item.fieldValue.displayValue[0]"
@@ -153,6 +160,7 @@ import { defineAsyncComponent } from 'vue';
 
 import moment from 'moment';
 import Common from '../../common/Common.js';
+import Date from '../../date/src/Date.vue';
 import DateTime from '../../datetime/src/DateTime.vue';
 import YearPicker from '../../year-picker/src/YearPicker.vue';
 import Loading from '../../loading/src/Loading.vue';