askbot-dragon 1.0.5 → 1.0.7

package/package.json

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

package/src/components/formTemplate.vue

@@ -2046,7 +2046,7 @@ export default {
             }
             bool[this.formShow.form.formFieldRelation[i].fieldId] = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.includes('\n') && !strVal
           }
-          if (this.formShow.form.formFieldRelation[i].relationDisplay && this.formShow.form.formFieldRelation[i].display) {
+          if (this.formShow.form.formFieldRelation[i].relationDisplay && this.formShow.form.formFieldRelation[i].display && this.formShow.form.formFieldRelation[i].fieldId !== 'workorder_description') {
             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
@@ -2056,6 +2056,8 @@ export default {
       }
       let extInfo = {
         extInfoFieldValue:this.extInfoFieldValue,
+        attachments:this.attachments,
+        attachmentList:this.attachmentList
       }
       this.$set(this.formShow,'extInfo',extInfo)
       let newForm = JSON.parse(JSON.stringify(this.formShow));
@@ -2063,11 +2065,9 @@ export default {
         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.log(newForm.form.formFieldRelation[i]);
-          this.$set(newForm.form.formFieldRelation[i].formField.extInfo,'attachments',this.attachments)
-          this.$set(newForm.form.formFieldRelation[i].formField.extInfo,'attachmentList',this.attachmentList)
         }
       }
-      console.debug('formShow',this.formShow.form,newForm.form)
+      console.debug('formShow',this.formShow,this.formShow.form,newForm.form)
         this.$emit('submitClick',newForm)
         this.disableds = true
         this.submitValue = '已提交'