askbot-dragon 1.5.71-beta → 1.5.73-beta

package/src/components/formTemplate.vue

@@ -620,7 +620,7 @@
                 readonly
                 clickable
                 name="picker"
-                :value="Array.isArray(item.value)?item.value.join(','):item.value"
+                :value="showSelectText(item.formField.extInfo ? (item.formField.extInfo.option || item.formField.extInfo.options) : [],item.value)"
                 :label=item.formField.name
                 :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
                 @click="selectClick(item.fieldId,'select',item)"
@@ -641,6 +641,31 @@
                 </span>
               </template>
             </van-field>
+            <!-- <van-field
+                readonly
+                clickable
+                name="picker"
+                :value="Array.isArray(item.value)?item.value.join(','):item.value"
+                :label=item.formField.name
+                :placeholder="item.formField.extInfo&&item.formField.extInfo.placeholder?item.formField.extInfo.placeholder:'请选择'"
+                @click="selectClick(item.fieldId,'select',item)"
+                :required="item.required || isRequiredFn(item.formField)"
+                :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.stop="leftIcon(item.formField.remark)">
+                  <i class="el-icon-warning-outline"></i>
+                </span>
+                <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
+                      @click.stop="leftIcon(item.formField.extInfo.remark)">
+                  <i class="el-icon-warning-outline"></i>
+                </span>
+              </template>
+            </van-field> -->
           </template>
         </div>
         <div v-if="item.formField.type === 'REF_TEMPLATE' || item.formField.type === 'REF'" class="form-field-item-value">
@@ -1222,6 +1247,30 @@ export default {
     that.defaultClick()
   },
   methods: {
+    showSelectText(option, itemValue){
+      let text = "";
+      if(Array.isArray(itemValue)){
+        itemValue.forEach((cell, cellIndex) => {
+          option.forEach(item => {
+            if(item.value == cell) {
+              if(cellIndex !== 0){
+                text = text + ',' + item.label;
+              } else {
+                text = item.label;
+              }
+            }
+          })
+        })
+       
+      } else {
+        option.forEach(item => {
+          if(item.value == itemValue) {
+            text = item.label;
+          }
+        })
+      }
+      return text;
+    },
     listenField(){
       clearTimeout(this.listenTimer);
       this.listenTimer = null;
@@ -1980,17 +2029,14 @@ export default {
     },
     //日期的选择器
     onConfirmCalendar(date, item) {
-      this.dateValue[item.fieldId] = this.formatDate(date);
-      item.value = date;
-      this.showCalendar = false;
-      /* for (let i = 0; i < this.formShow.form.formFieldRelation.length; i++) {
-        if (this.formShow.form.formFieldRelation[i].fieldId === id) {
-          this.dateValue[id] = this.formatDate(date)
+      this.dateValue[this.dateId] = this.formatDate(date);
+       for (let i = 0; i < this.formShow.form.formFieldRelation.length; i++) {
+        if (this.formShow.form.formFieldRelation[i].fieldId === this.dateId) {
           this.formShow.form.formFieldRelation[i].value = date
-          this.showCalendar = false;
           break
         }
-      }*/
+      }
+      this.showCalendar = false;
     },
     //下拉的选择器
     onConfirmSelect(value, item) {
@@ -2211,13 +2257,14 @@ export default {
     dateClick(id) {
       if(this.disableds === false)
       {
-        for (let i = 0; i < this.formShow.form.formFieldRelation.length; i++) {
-          if (this.formShow.form.formFieldRelation[i].fieldId === id) {
-            this.dateId = id
-            this.showCalendar = true
-            break
-          }
-        }
+        // for (let i = 0; i < this.formShow.form.formFieldRelation.length; i++) {
+        //   if (this.formShow.form.formFieldRelation[i].fieldId === id) {
+            
+        //     break
+        //   }
+        // }
+        this.dateId = id
+        this.showCalendar = true
       }
 
     },