askbot-dragon 1.4.55 → 1.4.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.4.55",
+  "version": "1.4.57",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/ConversationContainer.vue

@@ -13,10 +13,23 @@
       </div>
     </div> -->
 
-       <!-- <form-template
+    <!-- <form-template
          :formList="formList2"
          @submitClick="submitClick"
      ></form-template> -->
+     <form-template
+         :formList="formList"
+         @submitClick="submitClick"
+     ></form-template>
+     <!-- <form-template
+         :formList="formList3"
+         @submitClick="submitClick"
+     ></form-template>
+     <form-template
+         :formList="formList4"
+         @submitClick="submitClick"
+     ></form-template> -->
+     <text-message :text="text" @submitClick="submitClick"></text-message>
      <answer-docknowledge :isAskLightning="2" :msg="answerDocknowledge"></answer-docknowledge>
     <!--    <voice-component @closeVoice="closeVoice">
       <div slot="voiceTip">
@@ -55,7 +68,8 @@
   </div>
 </template>
 <script>
-// import TextMessage from '@/components/message/TextMessage'
+import TextMessage from '@/components/message/TextMessage'
+import FormTemplate from "@/components/formTemplate";
 
 /*import FormTemplate from "@/components/formTemplate";
 import TextMessage from "@/components/message/TextMessage";*/
@@ -102,13 +116,13 @@ export default {
     // AsserDeatils,
     AnswerRadio,
       // FormTemplate,
-    // TextMessage,
+    TextMessage,
     // FeedBack,
     // VoiceCompontent,
     // AiGuide,
     AnswerVoice,
     //  FormTemplate,
-    // FormTemplate,
+    FormTemplate,
     // FileType,
     // ChatContent,
     AnswerDocknowledge,
@@ -396,6 +410,48 @@ export default {
         formActionId: '',
         form: {
           formFieldRelation: [
+            {
+              display: true,
+              paramName: 'miaoshu',
+              formField: {
+                deleted: false,
+                createTime: '2020-12-08T08:08:03.000+0000',
+                name: '',
+                description: '',
+                updateTime: '2020-12-08T08:10:41.000+0000',
+                id: 11133332,
+                lastOperatorId: 21,
+                mainId: 'e2f80aecaf7c11eabdcd506b4b2f3ac8',
+                type: 'TIME_PICKER',
+                extInfo: {
+                  descriptionText: '我是解释说明文案'
+                }
+              },
+              required: false,
+              fieldId: 11133332,
+              value: "08:09"
+            },
+            {
+              display: true,
+              paramName: 'miaoshu',
+              formField: {
+                deleted: false,
+                createTime: '2020-12-08T08:08:03.000+0000',
+                name: '',
+                description: '',
+                updateTime: '2020-12-08T08:10:41.000+0000',
+                id: 11156562,
+                lastOperatorId: 21,
+                mainId: 'e2f80aecaf7c11eabdcd506b4b2f3ac8',
+                type: 'DATE_PICKER',
+                extInfo: {
+                  descriptionText: '我是解释说明文案'
+                }
+              },
+              required: false,
+              fieldId: 11156562,
+              value: '2020-12-09'
+            },
             {
               display: true,
               paramName: 'miaoshu',

package/src/components/formTemplate.vue

@@ -364,7 +364,7 @@
               @confirm="onConfirmCalendar($event,item)"
           />
         </div>
-        <div v-else-if="item.formField.type==='TIME_PICKER'&&(!item.formField.extInfo.mold||item.formField.extInfo.mold==='DATA_TIME' || item.formField.extInfo.mold==='DATE_TIME' || getMoldTime(item.formField) == 'DATE_TIME')" class="form-field-item-value">
+        <div v-else-if="item.formField.type==='TIME_PICKER'&&(item.formField.extInfo.mold==='DATA_TIME' || item.formField.extInfo.mold==='DATE_TIME' || getMoldTime(item.formField) == 'DATE_TIME')" class="form-field-item-value">
           <van-field
               readonly
               clickable
@@ -1102,6 +1102,18 @@ export default {
     fileListView
   },
   mounted() {
+    
+    if (this.formList.form.formFieldRelation && this.formList.form.formFieldRelation.length > 0) {
+        this.formList.form.formFieldRelation.forEach(item => {
+          if (item.formField.type === "TIME_PICKER") {
+            if (item.value.length === 5 && item.value.split(":").length === 2) {
+              console.log(1112, item.value);
+              this.extInfoFieldValue[item.fieldId] = item.value;
+              item.value = new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate() + " " + item.value + ":00";
+            }
+          }
+        })
+    }
     if (this.mainId == '8b9bd566e3e64156ab764b19defc9d48' || this.mainId == '0b73521f96e4486aaf6be42932bd7b07'){
       this.ckeditor.editorConfig.toolbar = []
     }