askbot-dragon 0.8.17 → 0.8.20

package/src/components/formTemplate.vue

@@ -127,7 +127,7 @@
                 v-if="item.fieldId==='workorder_clientId' || item.fieldId === 'workorder_statusId' || item.fieldId === 'workorder_priority'"
             >
               <el-option
-                  v-for="(items,index) in item.formField.extInfo.option?item.formField.extInfo.option:item.formField.extInfo.options"
+                  v-for="(items,index) in selectOptions(item.formField)"
                   :key="index"
                   :label="items.label"
                   :value="items.value">
@@ -142,7 +142,7 @@
                 :multiple="item.formField.extInfo && item.formField.extInfo.selectType == '多选'"
             >
               <el-option
-                  v-for="(items,index) in item.formField.extInfo.option?item.formField.extInfo.option:item.formField.extInfo.options"
+                  v-for="(items,index) in selectOptions(item.formField)"
                   :key="index"
                   :label="items.label"
                   :value="items.value">
@@ -475,7 +475,7 @@
             />
             <van-popup v-model="selectPicker" position="bottom" :style="{ height: '300px' }">
               <select-popup
-                  :options="item.formField.extInfo.option?item.formField.extInfo.option:item.formField.extInfo.options"
+                  :options="selectOptions(item.formField)"
                   :defaultValue="defaultValue"
                   @onConfim="confirmSelect"
                   @onclose= "selectPicker = false"
@@ -874,6 +874,19 @@ export default {
     that.defaultClick()
   },
   methods: {
+    selectOptions(field){
+      let options = []
+      if (!field.extInfo){
+        return []
+      }
+      if (field.extInfo.option){
+        options = field.extInfo.option
+      }
+      else if (field.extInfo.options){
+        options = field.extInfo.options
+      }
+      return options
+    },
     getMoldTime(){
       let otherTime = {}
       this.formList.form && this.formList.form.formFieldRelation.forEach(item=>{
@@ -1484,18 +1497,19 @@ export default {
             (this.formShow.form.formFieldRelation[i].required || this.isRequiredFn(this.formShow.form.formFieldRelation[i].formField)) &&
             this.formShow.form.formFieldRelation[i].fieldId!=='workorder_name'&&
             this.formShow.form.formFieldRelation[i].formField.type !== 'EXPLANATION') {
-          console.debug('formFieldRelation',this.formShow.form.formFieldRelation[i].value)
           let value = "";
-          let bool = false
+          let bool = {}
+          bool[this.formShow.form.formFieldRelation[i].fieldId] = false
           if (this.formShow.form.formFieldRelation[i].formField.type === 'INPUT' || this.formShow.form.formFieldRelation[i].formField.type === 'TEXTAREA'){
-            value = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.indexOf('\n')!==-1?this.formShow.form.formFieldRelation[i].value:'';
+            value = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.includes('\n')?this.formShow.form.formFieldRelation[i].value:'';
             let strVal = '';
             if(value){
               strVal = value.replace(/\n/g,'');
             }
-            bool = this.formShow.form.formFieldRelation[i].value && this.formShow.form.formFieldRelation[i].value.indexOf('\n')!==-1 && !strVal
+            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].value || bool || (this.formShow.form.formFieldRelation[i].value && !this.formShow.form.formFieldRelation[i].value.length)) {
+          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
             }
@@ -1555,7 +1569,8 @@ export default {
           if(this.formShow.form.formFieldRelation[i].formField.type==='SELECT' || this.formShow.form.formFieldRelation[i].formField.type==='OPTION')
           {
             if (this.formShow.form.formFieldRelation[i].fieldId === id) {
-              selectOption = this.formShow.form.formFieldRelation[i].formField.extInfo.option?this.formShow.form.formFieldRelation[i].formField.extInfo.option:this.formShow.form.formFieldRelation[i].formField.extInfo.options?this.formShow.form.formFieldRelation[i].formField.extInfo.options:[]
+              console.debug('11')
+              selectOption = this.selectOptions(this.formShow.form.formFieldRelation[i].formField)
               for (let j = 0; j < selectOption.length; j++) {
                 this.selectValue[j] = selectOption[j].label
               }