askbot-dragon 1.4.87 → 1.4.89

package/src/components/formTemplate.vue

@@ -13,7 +13,7 @@
         <div class="field-item">
           <div v-if="item.fieldId !== 'workorder_name' && item.formField.type !== 'EXPLANATION' && item.formField.type !== 'EXPLAIN' " class="field-item-name">
             <span v-if="item.fieldId!=='workorder_description'&&item.fieldId!=='workorder_clientId'">{{item.formField.name}}</span>
-            <span v-if="item.fieldId==='workorder_description'">问题描述</span>
+            <span v-if="item.fieldId==='workorder_description'">{{ isBaiLi ? '反馈描述' : '问题描述' }}</span>
             <span v-if="item.fieldId==='workorder_clientId'">报单人</span>
             <span style="color: red;padding-left: 5px;padding-right: 5px" v-if="item.fieldId !== '0feca81fce97465da537248c066e4db8' && item.fieldId !=='1d8bd21485834773a6d18eae60013000' && (item.required || isRequiredFn(item.formField))">*</span>
             <el-tooltip class="item" effect="dark" placement="right-start">
@@ -335,7 +335,7 @@
           <div v-if="item.fieldId==='workorder_description'" class="workorder_description">
             <div class="field-name" :class="item.required || isRequiredFn(item.formField)?'required-name':''">
               <span v-if="item.required || isRequiredFn(item.formField)" style="color: red">*</span>
-              <span style="padding-right: 5px">{{item.formField.name}}</span>
+              <span style="padding-right: 5px">{{ isBaiLi ? '反馈描述' : item.formField.name }}</span>
               <span v-if="item.formField.remark && item.formField.remark.enable"
                     @click.stop="leftIcon(item.formField.remark)">
                 <i class="el-icon-warning-outline"></i>
@@ -1270,11 +1270,15 @@ export default {
           else {
             item.value = ""
           }
-          this.extInfoFieldValue[item.fieldId] = []
-          this.selectValues[item.fieldId] = []
-          this.extInfoFieldValue[item.fieldId] = []
+          this.$set(this.extInfoFieldValue, item.fieldId , [])
+          this.$set(this.selectValues, item.fieldId , [])
+          // this.$set(this.extInfoFieldValue, item.fieldId , [])
+          // this.extInfoFieldValue[item.fieldId] = []
+          // this.selectValues[item.fieldId] = []
+          // this.extInfoFieldValue[item.fieldId] = []
           if (item.formField.extInfo.extInfoFieldValue){
             item.formField.extInfo.extInfoFieldValue = ''
+            this.$set(item.formField.extInfo, 'extInfoFieldValue' , '')
           }
         }
         if(this.fieldValue[item.fieldId] && !this.associatedControlsCopy.includes(item.fieldId) && (item.formField.extInfo.selectType == '单选' || item.formField.type == 'RADIO')) {
@@ -2043,23 +2047,24 @@ export default {
       if (checkDescription.checkAttachment && this.attachments.length == 0) {
         attachmentFlag = false
       }
+      let text = this.isBaiLi ? '反馈描述' : '问题描述'
       if (!textFlag) {
-        errorText = '问题描述必须要有文字'
+        errorText = text + '必须要有文字'
       }
       if (!imageFlag) {
-        errorText = '问题描述必须要有图片'
+        errorText = text + '必须要有图片'
       }
       if (!attachmentFlag) {
-        errorText = '问题描述必须要有附件'
+        errorText = text + '必须要有附件'
       }
       if (!textFlag && (!imageFlag || !attachmentFlag)) {
-        errorText = '问题描述必须要有文字和' + (!imageFlag ? '图片' : '附件')
+        errorText = text + '必须要有文字和' + (!imageFlag ? '图片' : '附件')
       }
       if (!imageFlag && !attachmentFlag) {
-        errorText = '问题描述必须要有图片和附件'
+        errorText = text + '必须要有图片和附件'
       }
       if (!imageFlag && !attachmentFlag && !textFlag) {
-        errorText = '问题描述必须要有文字、图片和附件'
+        errorText = text + '必须要有文字、图片和附件'
       }
       if (errorText) {
         this.$message.error(errorText);
@@ -2068,7 +2073,8 @@ export default {
         let d = document.createElement('div')
         d.innerHTML = this.workOrderDestail.value
         if (checkDescription.required && !d.innerText && !this.workOrderDestail.value.includes('img') && this.attachments.length == 0) {
-          this.$message.error('问题描述是必填的');
+          let errorText = this.isBaiLi ? '反馈描述是必填的' : '问题描述是必填的'
+          this.$message.error(errorText);
           return false
         }
         return true
@@ -2502,8 +2508,7 @@ export default {
           imgInfo.name = data.file.name
           imgInfo.uid = data.file.uid
         }
-        if (!this.extInfoFieldValue[this.filedId])
-        {
+        if (!this.extInfoFieldValue[this.filedId]){
           this.$set(this.extInfoFieldValue,this.filedId,[])
         }
         this.extInfoFieldValue[this.filedId].push(imgInfo)

package/src/main.js

@@ -10,7 +10,7 @@ import 'video.js/dist/video-js.css'
 import Vant from 'vant';
 import 'vant/lib/index.css';
 
-import CKEditor from '@ckeditor/ckeditor5-vue';
+import CKEditor from '@ckeditor/ckeditor5-vue2';
 Vue.use(CKEditor);
 
 /*import VConsole from 'vconsole'

package/vue.config.js

@@ -49,7 +49,7 @@ module.exports = {
             // 不去 node_modules 中找，而是去找 全局变量 ELEMENT
             // 'element-ui': 'ELEMENT',
             // 'vant': 'Vant',
-            'ckeditor': 'CKEDITOR',
+            'ckeditor': 'ClassicEditor',
         },
     },