askbot-dragon 0.7.93 → 0.7.94

package/src/components/formTemplate.vue

@@ -21,7 +21,7 @@
           <el-input v-model="item.value"
                     :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-else-if="item.formField.type==='INPUT'&&item.fieldId!=='workorder_name'"
+                    v-if="item.formField.type==='INPUT'&&item.fieldId!=='workorder_name'"
           ></el-input>
           <template v-else-if="item.formField.type==='EXPLANATION'">
             <div class="explanation">
@@ -40,7 +40,7 @@
               </p>
             </div>
           </template>
-          <el-input type="textarea" :rows="2" v-model="fieldValus[item.fieldId]"
+          <el-input type="textarea" :rows="2" v-model="item.value"
                     :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.formField.type==='TEXTAREA'&& item.fieldId!=='workorder_description'"
@@ -229,18 +229,21 @@
                     filterable
                     :multiple="item.formField.extInfo && item.formField.extInfo.selectType == '多选'"
                     @visible-change="(visible) =>{ return refTemplateVisibleChange(visible,item)  }"
+                    collapse-tags
+                    @change="changeRefData($event,item)"
             >
               <template v-for="(items,index) in refTemplateList[item.fieldId]">
                 <el-option
                         v-if="refTemplateList[item.fieldId]"
                         :key="index"
-                        :label="items.label"
-                        :value="items.value">
+                        :label="items.name"
+                        :value="items.id">
                 </el-option>
               </template>
               <div
                 @click="lodeMore(item)"
-                style="widht:100%;height:30px;display:flex;align-items: center;justify-content: center;color:#606266">
+                v-if="dataQuery[item.fieldId] && dataQuery[item.fieldId].hasNextPage"
+                style="width:100%;height:30px;display:flex;align-items: center;justify-content: center;color:#606266">
                   加载更多
               </div>
             </el-select>
@@ -500,11 +503,11 @@
             />
             <van-popup v-model="refShowPicker" position="bottom" :style="{ height: '300px' }">
               <select-popup
-                  :options="refTemplateList[item.fieldId]"
-                  :defaultValue="defaultValue"
+                  :options="refTemplateList[selectDetail.fieldId]"
+                  :defaultValue="refDefaultValue[selectDetail.fieldId]"
                   @onConfim="confirmRefSelect"
                   @onclose= "refShowPicker = false"
-                  :multiple="detailField.formField.extInfo && detailField.formField.extInfo.selectType ==='多选'?true:false"
+                  :multiple="selectDetail.formField && selectDetail.formField.extInfo && selectDetail.formField.extInfo.selectType ==='多选'?true:false"
                   ref="selectPopup"
                   :props="{
                     value:'id',
@@ -730,7 +733,8 @@ export default {
       options:[],
       defaultValue:[],
       timeDetailData:{},
-      selectDetail:{}
+      selectDetail:{},
+      refDefaultValue:{}
     }
   },
   props: {
@@ -1148,8 +1152,11 @@ export default {
           }
 
         }
-        if (type ==='FILE'){
-          if (this.formList.form.formFieldRelation[i].value!==undefined){
+        if (type ==='FILE' || type == 'ATTACHMENT' || type == 'IMAGE' || type == 'VIDEO'){
+          if (this.formList.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue){
+            this.fileListList[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue
+          }
+          else if (this.formList.form.formFieldRelation[i].value){
             if (this.formList.form.formFieldRelation[i].value===null||this.formList.form.formFieldRelation[i].value===''){
               this.formList.form.formFieldRelation[i].value=[]
             }
@@ -1177,16 +1184,25 @@ export default {
               }
             }
           }
-
-
-
+        }
+        if (type === 'REF' || type === 'REF_TEMPLATE'){
+          if (this.formList.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue){
+            let name = this.formList.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue.map(item=>{
+              return item.name
+            })
+            this.selectValues[this.formList.form.formFieldRelation[i].fieldId] = name
+          }
         }
       }
       for (let i = 0; i < this.formList.form.formFieldRelation.length; i++) {
         let type = this.formList.form.formFieldRelation[i].formField.type
         let extInfo = this.formList.form.formFieldRelation[i].formField.extInfo
         if (type === 'CASCADER') {
-          let fieldValue = this.formList.form.formFieldRelation[i].formField.extInfo.fieldValue?this.formList.form.formFieldRelation[i].formField.extInfo.fieldValue:[]
+          let fieldValue = this.formList.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue?
+              this.formList.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue:
+              (this.formList.form.formFieldRelation[i].formField.extInfo.fieldValue?
+                  this.formList.form.formFieldRelation[i].formField.extInfo.fieldValue:[])
+
           this.checkDatas[this.formList.form.formFieldRelation[i].fieldId] = fieldValue
           if (this.formList.form.formFieldRelation[i].value){
             this.formList.form.formFieldRelation[i].value = this.formList.form.formFieldRelation[i].formField.defaultValue?
@@ -1305,6 +1321,7 @@ export default {
         this.isPhone=this.propIsPhone;
         this.isCompany=this.propIsCompany;
       }
+
     },
     //时间的选择器
     onConfirm(value, id,item,type) {
@@ -1426,7 +1443,7 @@ export default {
             }
           })
         }
-        if (this.fileListList[this.formShow.form.formFieldRelation[i].fieldId]!== undefined) {
+        if (this.fileListList[this.formShow.form.formFieldRelation[i].fieldId]) {
           let value=[]
           this.fileListList[this.formShow.form.formFieldRelation[i].fieldId].forEach(item=>{
             let file = {}
@@ -1434,7 +1451,10 @@ export default {
             file.url = item.url
             value.push(file)
           })
-          this.formShow.form.formFieldRelation[i].value=value
+          this.formShow.form.formFieldRelation[i].value = value.map(item=>{
+            return item.name
+          })
+          this.formShow.form.formFieldRelation[i].formField.extInfo.extInfoFieldValue = value
         }
         if(this.formShow.form.formFieldRelation[i].display &&
             (this.formShow.form.formFieldRelation[i].required || this.isRequiredFn(this.formShow.form.formFieldRelation[i].formField)) &&
@@ -1488,11 +1508,12 @@ export default {
     },
     //下拉的点击事件
     selectClick(id,type,item) {
-      console.debug('111')
+      console.debug('111',item)
       if (this.disableds){
         return
       }
-      this.selectDetail = item
+      this.selectDetail = item;
+      this.defaultValue = ''
       if(type == 'client') {
         let selectOption
         this.selectValue=[]
@@ -1511,7 +1532,9 @@ export default {
         this.selectId = id
         this.showPicker = true
       } else if (type == 'ref'){
-        this.refShowPicker = true
+        this.refShowPicker = true;
+        this.refTemplateVisibleChange(true,item);
+        this.refDefaultValue[item.fieldId] = item.value?[item.value]:[]
       } else if (type == 'select'){
         this.selectPicker = true;
       }
@@ -1867,6 +1890,7 @@ export default {
       this.videoUploadPercent = file.percentage.toFixed(0);
     },
     refTemplateVisibleChange(visible,field) {
+      console.debug('field1111',field)
       let fields = field.formField.type === 'REF' ? field.formField.extInfo.ref.field : field.formField.extInfo.ref.vars
       if (visible) {
         if (
@@ -1887,6 +1911,37 @@ export default {
         }
       }
     },
+    changeRefData(value, item) {
+      console.log(value);
+      console.debug('value', value, item, this.refTemplateList[item.fieldId])
+      let arr = []
+      if (this.refTemplateList[item.fieldId]) {
+        this.refTemplateList[item.fieldId].forEach(data => {
+          if(typeof value == 'string' || typeof value == 'number') {
+            if(value == data.id) {
+              let obj = {
+                name: data.name,
+                id: data.id
+              }
+              arr.push(data)
+            }
+          } else {
+            if (value.indexOf(data.id) !== -1) {
+              let obj = {
+                name: data.name,
+                id: data.id
+              }
+              arr.push(data)
+            }
+          }
+        })
+      }
+      if (!item.formField.extInfo.extInfoFieldValue){
+        this.$set(item.formField.extInfo,'extInfoFieldValue',[])
+      }
+      item.formField.extInfo.extInfoFieldValue = arr
+      console.log(arr,item);
+    },
     getTemplateList(templateId, fieldId, field) {
       let url = '/order-api/data-template/data/page'
       this.dataQuery[field.fieldId].templateId = templateId
@@ -1936,7 +1991,9 @@ export default {
               ...this.refTemplateList[field.fieldId],
               ...templateList
             ])
+            console.log('refTemplateList',this.refTemplateList[field.fieldId])
           })
+
         }
       })
     },
@@ -1987,7 +2044,8 @@ export default {
     saveData(checkList,checkDatas){
       this.$set(this.detailField,'value',checkList);
       this.checkDatas[this.detailField.fieldId] = checkDatas;
-      this.$set(this.detailField.formField.extInfo,'fieldValue',this.checkDatas)
+      this.$set(this.detailField.formField.extInfo,'extInfoFieldValue',checkDatas);
+      console.debug('checkDatas',this.detailField.formField.extInfo,checkList)
       this.$forceUpdate();
       this.showArea = false;
       this.drawer = false;
@@ -2006,11 +2064,22 @@ export default {
         this.refShowPicker = false;
         return
       }
+      if (!this.detailField.formField.extInfo.extInfoFieldValue){
+        this.$set(this.detailField.formField.extInfo,'extInfoFieldValue',[])
+      }
       this.detailField.value = list;
-      let val = option?option.map(item=>{
-        return item.name
-      }):[]
-      this.selectValue[this.detailField.fieldId] = val;
+      let val = ''
+      if (Array.isArray(option)){
+        val = option.map(item=>{
+          return item.name
+        })
+        this.detailField.formField.extInfo.extInfoFieldValue = option
+      }
+      else {
+        val = option.name
+        this.detailField.formField.extInfo.extInfoFieldValue = [option]
+      }
+      this.selectValues[this.detailField.fieldId] = val;
       this.refShowPicker = false;
     },
     // 一个重复的方法 兼容 状态优先级 的关联控件，

package/src/components/popup.vue

@@ -95,10 +95,45 @@ export default {
   watch: {
     defaultValue: {
       handler(value) {
-        if (!value) {
-          // 定位当前位置
-        /*  this.options.forEach(item => {})*/
+        console.log(value,'=====');
+        this.checkOptions = []
+        if(Array.isArray(this.defaultValue)) {
+          if (this.multiple){
+            let val = []
+            this.defaultValue.forEach(item=>{
+              item.forEach(items=>{
+                val.push(items)
+              })
+            })
+            this.checkIdList = [...val]
+          }
+          else {
+            this.checkIdList = [...this.defaultValue]
+          }
+
+          this.checkIdList.forEach(item =>{
+            if (Array.isArray(item)){
+              item.forEach(items=>{
+
+                this.options.forEach(res =>{
+                  console.debug('items',items,res[this.props.value])
+                  if(items == res[this.props.value]) {
+                    this.checkOptions.push(res)
+                  }
+                })
+              })
+            }
+            else {
+              this.options.forEach(res =>{
+                if(item == res[this.props.value]) {
+                  this.checkOptions.push(res)
+                }
+              })
+            }
+
+          })
         }
+        console.debug('checkOptions',this.checkOptions)
       },
       deep: true,
       immediate: true
@@ -126,15 +161,21 @@ export default {
         this.checkOptions = []
         this.checkIdList = []
       }
-    }
+    },
   },
-  
+  mounted() {
+    console.debug('options',this.options)
+
+  }
 }
 </script>
 
 <style lang="less" scoped>
 .popup-content {
   /*padding-top: 8px;*/
+  height: 240px;
+  overflow-y: scroll;
+  overflow-x: hidden;
   .filter-item {
     width: 100%;
     display: flex;

package/src/components/tree.vue

@@ -51,19 +51,23 @@ export default {
     },
     ergodicData(list){
       list.forEach(item=>{
-        if (item.checked){
-          let data = this.$refs.dataTree.getNode(item)
-          let checkList = []
-          let arr = this.serchParent(data,checkList)
-          this.checkList.push(arr)
-          this.checkDatas.push(item)
+        if (this.dataOptions.extInfo.selectType === '多选'){
+          if (item.checked){
+            let data = this.$refs.dataTree.getNode(item)
+            let checkList = []
+            let arr = this.serchParent(data,checkList)
+            this.checkList.push(arr)
+            this.checkDatas.push(item)
+          }
         }
-        if (item.value === this.checked){
-          let data = this.$refs.dataTree.getNode(item)
-          let checkList = []
-          let arr = this.serchParent(data,checkList)
-          this.checkList = arr
-          this.checkDatas = [item]
+       else {
+          if (item.value === this.checked){
+            let data = this.$refs.dataTree.getNode(item)
+            let checkList = []
+            let arr = this.serchParent(data,checkList)
+            this.checkList = arr
+            this.checkDatas = [item]
+          }
         }
         if (item.children){
           this.ergodicData(item.children)