askbot-dragon 0.8.20 → 0.8.23

package/package.json

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

package/src/components/formTemplate.vue

@@ -15,7 +15,13 @@
             <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_clientId'">报单人</span>
-            <span style="color: red;padding-left: 5px" v-if="item.required || isRequiredFn(item.formField)">*</span>
+            <span style="color: red;padding-left: 5px;padding-right: 5px" v-if="item.required || isRequiredFn(item.formField)">*</span>
+            <el-tooltip class="item" effect="dark" placement="right-start">
+              <div slot="content">{{item.formField.remark && item.formField.remark.text}}</div>
+              <span v-if="item.formField.remark&&item.formField.remark.enable">
+                <i class="el-icon-warning-outline"></i>
+              </span>
+            </el-tooltip>
           </div>
           <!-- item.value -->
           <el-input v-model="item.value"
@@ -265,7 +271,15 @@
                      @blur="typeCheck(item.formField,item)"
                      :type="item.formField.extInfo.inputType==='NUMBER'||
                           item.formField.extInfo.inputType==='RATE'? 'number':'text'"
-          />
+          >
+            <template slot="label">
+              <span style="padding-right: 5px">{{item.formField.name}}</span>
+              <span v-if="item.formField.remark&&item.formField.remark.enable"
+                    @click="leftIcon(item.formField.remark)">
+                <i class="el-icon-warning-outline"></i>
+              </span>
+            </template>
+          </van-field>
         </div>
         <div v-else-if="item.formField.type==='EXPLANATION'||item.formField.type==='EXPLAIN'" class="explan-ation">
           <div  class="explanation">
@@ -289,11 +303,23 @@
                      :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请输入'"
                      :maxlength="item.formField.extInfo&&item.formField.extInfo.maxNum?item.formField.extInfo.maxNum*1:1000"
                      v-if="item.fieldId!=='workorder_description'"
-          />
+          >
+            <template slot="label">
+              <span style="padding-right: 5px">{{item.formField.name}}</span>
+              <span v-if="item.formField.remark&&item.formField.remark.enable"
+                    @click="leftIcon(item.formField.remark)">
+                <i class="el-icon-warning-outline"></i>
+              </span>
+            </template>
+          </van-field>
           <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>
-              {{item.formField.name}}
+              <span style="padding-right: 5px">{{item.formField.name}}</span>
+              <span v-if="item.formField.remark&&item.formField.remark.enable"
+                    @click="leftIcon(item.formField.remark)">
+                <i class="el-icon-warning-outline"></i>
+              </span>
             </div>
             <ckeditor
                 :editor="ckeditor.editor"
@@ -315,7 +341,15 @@
               @click="dateClick(item.fieldId)"
               :disabled="disableds"
               right-icon="van-icon van-icon-arrow van-cell__right-icon"
-          />
+          >
+            <template slot="label">
+              <span style="padding-right: 5px">{{item.formField.name}}</span>
+              <span v-if="item.formField.remark&&item.formField.remark.enable"
+                    @click="leftIcon(item.formField.remark)">
+                <i class="el-icon-warning-outline"></i>
+              </span>
+            </template>
+          </van-field>
           <van-calendar
               v-model="showCalendar"
               @confirm="onConfirmCalendar($event,item)"
@@ -334,7 +368,15 @@
               :disabled="disableds"
               right-icon="van-icon van-icon-arrow van-cell__right-icon"
 
-          />
+          >
+            <template slot="label">
+              <span style="padding-right: 5px">{{item.formField.name}}</span>
+              <span v-if="item.formField.remark&&item.formField.remark.enable"
+                    @click="leftIcon(item.formField.remark)">
+                <i class="el-icon-warning-outline"></i>
+              </span>
+            </template>
+          </van-field>
           <van-popup v-model="dateTimePicker" position="bottom">
             <van-datetime-picker
                 v-model="currentDate"
@@ -360,7 +402,15 @@
                 :disabled="disableds"
                 right-icon="van-icon van-icon-arrow van-cell__right-icon"
 
-            />
+            >
+              <template slot="label">
+                <span style="padding-right: 5px">{{item.formField.name}}</span>
+                <span v-if="item.formField.remark&&item.formField.remark.enable"
+                      @click="leftIcon(item.formField.remark)">
+                <i class="el-icon-warning-outline"></i>
+              </span>
+              </template>
+            </van-field>
             <van-popup v-model="timePicker" position="bottom">
               <van-datetime-picker
                   v-model="currentTime"
@@ -386,11 +436,26 @@
               :disabled="disableds"
               right-icon="van-icon van-icon-arrow van-cell__right-icon"
 
-          />
+          >
+            <template slot="label">
+              <span style="padding-right: 5px">{{item.formField.name}}</span>
+              <span v-if="item.formField.remark&&item.formField.remark.enable"
+                    @click="leftIcon(item.formField.remark)">
+                <i class="el-icon-warning-outline"></i>
+              </span>
+            </template>
+          </van-field>
           <van-calendar v-model="datePicker" :show-confirm="false" @confirm="onConfirm($event,item.fieldId,item,'DATE')"  @cancel="datePicker = false"/>
         </div>
         <div v-else-if="item.formField.type==='RADIO'" class="form-field-item-other">
           <van-field name="radio" :label="item.formField.name" :required="item.required || isRequiredFn(item.formField)" :disabled="disableds"  v-if="item.formField.extInfo.option">
+            <template slot="label">
+              <span style="padding-right: 5px">{{item.formField.name}}</span>
+              <span v-if="item.formField.remark&&item.formField.remark.enable"
+                    @click="leftIcon(item.formField.remark)">
+                <i class="el-icon-warning-outline"></i>
+              </span>
+            </template>
             <template #input style="display: flex;align-items: center">
               <van-radio-group v-model=item.value direction="horizontal" :disabled="disableds">
                 <van-radio v-for="(items,index) in item.formField.extInfo.option"  :name=items.value :key="index">{{items.label}}</van-radio>
@@ -398,6 +463,13 @@
             </template>
           </van-field>
           <van-field name="radio" :label="item.formField.name" :required="item.required || isRequiredFn(item.formField)" :disabled="disableds"  v-if="item.formField.extInfo.options">
+            <template slot="label">
+              <span style="padding-right: 5px">{{item.formField.name}}</span>
+              <span v-if="item.formField.remark&&item.formField.remark.enable"
+                    @click="leftIcon(item.formField.remark)">
+                <i class="el-icon-warning-outline"></i>
+              </span>
+            </template>
             <template #input style="display: flex;align-items: center" >
               <van-radio-group v-model=item.value direction="horizontal" :disabled="disableds">
                 <van-radio v-for="(items,index) in item.formField.extInfo.options"  :name=items.value :key="index">{{items.label}}</van-radio>
@@ -407,6 +479,13 @@
         </div>
         <div v-else-if="item.formField.type==='CHECKBOX'" class="form-field-item-other">
           <van-field name="checkbox" :label=item.formField.name :required="item.required || isRequiredFn(item.formField)" :disabled="disableds" v-if="item.formField.extInfo.option">
+            <template slot="label">
+              <span style="padding-right: 5px">{{item.formField.name}}</span>
+              <span v-if="item.formField.remark&&item.formField.remark.enable"
+                    @click="leftIcon(item.formField.remark)">
+                <i class="el-icon-warning-outline"></i>
+              </span>
+            </template>
             <template #input style="display: flex;align-items: center" >
               <van-checkbox-group v-model=item.value ref="checkboxGroup" direction="horizontal" :disabled="disableds">
                 <van-checkbox
@@ -420,6 +499,13 @@
             </template>
           </van-field>
           <van-field name="checkbox" :label=item.formField.name :required="item.required || isRequiredFn(item.formField)" :disabled="disableds" v-if="item.formField.extInfo.options">
+            <template slot="label">
+              <span style="padding-right: 5px">{{item.formField.name}}</span>
+              <span v-if="item.formField.remark&&item.formField.remark.enable"
+                    @click="leftIcon(item.formField.remark)">
+                <i class="el-icon-warning-outline"></i>
+              </span>
+            </template>
             <template #input style="display: flex;align-items: center" >
               <van-checkbox-group v-model=item.value ref="checkboxGroup" direction="horizontal" :disabled="disableds">
                 <van-checkbox
@@ -447,7 +533,15 @@
                 :disabled="disableds"
                 @click-right-icon.stop="SelectClear(item.fieldId)"
                 :right-icon="selectValues[item.fieldId]? 'close' : 'van-icon van-icon-arrow van-cell__right-icon'"
-            />
+            >
+              <template slot="label">
+                <span style="padding-right: 5px">{{item.formField.name}}</span>
+                <span v-if="item.formField.remark&&item.formField.remark.enable"
+                      @click="leftIcon(item.formField.remark)">
+                  <i class="el-icon-warning-outline"></i>
+                </span>
+              </template>
+            </van-field>
             <van-popup v-model="showPicker" position="bottom">
               <van-picker
                   show-toolbar
@@ -472,7 +566,15 @@
                 :disabled="disableds"
                 @click-right-icon.stop="SelectClear(item.fieldId)"
                 :right-icon="item.value && item.value.length? 'close' : 'van-icon van-icon-arrow van-cell__right-icon'"
-            />
+            >
+              <template slot="label">
+                <span style="padding-right: 5px">{{item.formField.name}}</span>
+                <span v-if="item.formField.remark&&item.formField.remark.enable"
+                      @click="leftIcon(item.formField.remark)">
+                  <i class="el-icon-warning-outline"></i>
+                </span>
+              </template>
+            </van-field>
             <van-popup v-model="selectPicker" position="bottom" :style="{ height: '300px' }">
               <select-popup
                   :options="selectOptions(item.formField)"
@@ -534,8 +636,15 @@
               :required="item.required || isRequiredFn(item.formField)"
               :disabled="disableds"
               right-icon="van-icon van-icon-arrow van-cell__right-icon"
-          />
-
+          >
+            <template slot="label">
+              <span style="padding-right: 5px">{{item.formField.name}}</span>
+              <span v-if="item.formField.remark&&item.formField.remark.enable"
+                    @click="leftIcon(item.formField.remark)">
+                  <i class="el-icon-warning-outline"></i>
+                </span>
+            </template>
+          </van-field>
           <van-popup v-model="showArea" position="bottom" :style="{ height: '400px' }">
             <tree ref="drawerTree"
                   :dataOptions="item.formField"
@@ -546,7 +655,14 @@
         </div>
         <div v-else-if="item.formField.type === 'FILE' || item.formField.type === 'IMAGE' || item.formField.type === 'ATTACHMENT' || item.formField.type === 'VIDEO'" class="form-field-item-value">
           <div @click="checkUpload(item.fieldId,item.formField.extInfo)" class="form-field-item-file">
-            <div class="fileName"><span style="color: red" v-if="item.required || isRequiredFn(item.formField)">*</span>{{item.formField.name}}</div>
+            <div class="fileName">
+              <span style="color: red" v-if="item.required || isRequiredFn(item.formField)">*</span>
+              <span style="padding-right: 5px">{{item.formField.name}}</span>
+              <span v-if="item.formField.remark&&item.formField.remark.enable"
+                    @click="leftIcon(item.formField.remark)">
+                  <i class="el-icon-warning-outline"></i>
+              </span>
+            </div>
             <van-uploader
                 v-model="extInfoFieldValue[item.fieldId]"
                 :before-read="(file=>{return beforeRead(file,item.formField.type)})"
@@ -933,7 +1049,7 @@ export default {
       if (!Array.isArray(file)){
         if (type === 'IMAGE' || type === 'FILE'){
           const isLte2M = file.size / 1024 / 1024 <= 8;
-          const isSupportedFormat =file.type.indexOf('image')!==-1
+          const isSupportedFormat = file.type.indexOf('image')!==-1
           if (!isSupportedFormat){
             this.$message.error("只能上传图片格式");
             return false
@@ -974,8 +1090,8 @@ export default {
         if (file.length<=this.limitNum-length){
           for (let i=0;i<file.length;i++){
             if (type === 'IMAGE' || type === 'FILE'){
-              const isLte2M = file.size / 1024 / 1024 <= 8;
-              const isSupportedFormat =file.type.indexOf('image')!==-1
+              const isLte2M = file[i].size / 1024 / 1024 <= 8;
+              const isSupportedFormat =file[i].type.indexOf('image')!==-1
               if (!isSupportedFormat){
                 this.$message.error("只能上传图片格式");
                 return false
@@ -987,8 +1103,8 @@ export default {
               return true
             }
             else if (type === 'VIDEO'){
-              const isLte2M = file.size / 1024 / 1024 <= 100;
-              const isSupportedFormat =file.type.indexOf('video')!==-1
+              const isLte2M = file[i].size / 1024 / 1024 <= 100;
+              const isSupportedFormat =file[i].type.indexOf('video')!==-1
               if (!isSupportedFormat){
                 this.$message.error("只能上传视频格式");
                 return false
@@ -1000,7 +1116,7 @@ export default {
               return true
             }
             else if (type === 'ATTACHMENT'){
-              const isLte2M = file.size / 1024 / 1024 <= 100;
+              const isLte2M = file[i].size / 1024 / 1024 <= 100;
               if (!isLte2M) {
                 this.$message.error("上传附件大小不能超过100MB!");
                 return false
@@ -1181,7 +1297,15 @@ export default {
               }
             }
           }
-
+          let options = [];
+          if (extInfo){
+            options = extInfo.option?extInfo.option:extInfo.options;
+            options.forEach(opt=>{
+              if (!opt.value){
+                opt.value = opt.label
+              }
+            })
+          }
         }
         if (type ==='FILE' || type == 'ATTACHMENT' || type == 'IMAGE' || type == 'VIDEO'){
           if (this.formList.form.formFieldRelation[i].value){
@@ -1508,7 +1632,6 @@ export default {
             }
             bool[this.formShow.form.formFieldRelation[i].fieldId] = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.includes('\n') && !strVal
           }
-          console.debug('formFieldRelation',this.formShow.form.formFieldRelation[i].value,bool[this.formShow.form.formFieldRelation[i]],Array.isArray(this.formShow.form.formFieldRelation[i].value) && !this.formShow.form.formFieldRelation[i].value.length)
             if(!this.formShow.form.formFieldRelation[i].value || bool[this.formShow.form.formFieldRelation[i].fieldId] || (Array.isArray(this.formShow.form.formFieldRelation[i].value) && !this.formShow.form.formFieldRelation[i].value.length)) {
               this.$message.error('请完善'+ this.formShow.form.formFieldRelation[i].formField.name)
               return
@@ -1518,9 +1641,15 @@ export default {
       let extInfo = {
         extInfoFieldValue:this.extInfoFieldValue
       }
-        this.$set(this.formShow,'extInfo',extInfo)
-      console.debug('form',this.formShow)
-        this.$emit('submitClick',this.formShow)
+      this.$set(this.formShow,'extInfo',extInfo)
+      let newForm = JSON.parse(JSON.stringify(this.formShow));
+      for (let i=0;i<newForm.form.formFieldRelation.length;i++){
+        if (newForm.form.formFieldRelation[i].fieldId === 'workorder_description'){
+          newForm.form.formFieldRelation[i].value =  newForm.form.formFieldRelation[i].value.replace(/<img/g, "<img onclick='previewImage(this)' ")
+        }
+      }
+      console.debug('formShow',this.formShow.form,newForm.form)
+        this.$emit('submitClick',newForm)
         this.disableds = true
         this.submitValue = '已提交'
     },
@@ -2004,6 +2133,13 @@ export default {
       this.dataQuery[item.fieldId].pageInfo.pageNo += 1
       this.refTemplateVisibleChange(true,item)
     },
+    //点击左侧备注图标提示
+    leftIcon(remark){
+      this.$toast({
+        message:remark.text,
+        duration:2000,
+      })
+    },
     //校验输入框
     typeCheck(field,item){
       if (!item.value){