修改关联表单回显bug

src/components/jeecg/HDelivery.vue

@@ -114,9 +114,9 @@
             this.showText = ''
           } else {
             this.showText = val
-            if (Array.isArray(JSON.parse(val))){
+           /* if (Array.isArray(JSON.parse(val))){
               this.showText=JSON.parse(val)[0]
-            }
+            }*/
             this.showTextVal();
           }
         }
@@ -160,7 +160,7 @@
           this.$refs.ProcessDelivery.show(this.showText);
         }else {
           if (this.disabled === false) {
-            this.$refs.ProcessDelivery.show();
+            this.$refs.ProcessDelivery.show(null);
           }
         }
       },

src/components/jeecg/HPlan.vue

@@ -115,13 +115,14 @@
       value: {
         immediate: true,
         handler: function(val) {
+          console.log(val,'4444444444444444444')
           if (!val) {
             this.showText = ''
           } else {
             this.showText = val
-            if (Array.isArray(JSON.parse(val))){
+            /*if (Array.isArray(JSON.parse(val))){
               this.showText=JSON.parse(val)[0]
-            }
+            }*/
             this.showTextVal()
           }
         }
@@ -160,11 +161,10 @@
       },
       openModal() {
         if (this.showText){
-
           this.$refs.ProcessPlan.show(this.showText);
         }else {
           if (this.disabled === false) {
-            this.$refs.ProcessPlan.show();
+            this.$refs.ProcessPlan.show(null);
           }
         }
 

src/components/jeecg/modal/ProcessDelivery.vue

@@ -300,7 +300,7 @@
           this.loading = false
         })
         this.selectedRowKeys = this.changeData
-        this.selectedMainId = this.changeData[0]
+        this.selectedMainId = this.changeData
       },
       clickThenSelect(record) {
         return {
@@ -390,15 +390,14 @@
         //this.onClearSelected()
       },
       show(val) {
+        this.visible = true
         if (val) {
           this.getFileData = true
+          let data = []
+          data.push(val.ids[0])
+          this.changeData = data
+          this.loadPlan(1)
         }
-        let data = []
-        data.push(val)
-        console.log('这是什么数据', val)
-        this.changeData = data
-        this.visible = true
-        this.loadPlan(1)
       },
       handleToggleSearch() {
         this.toggleSearchStatus = !this.toggleSearchStatus

src/components/jeecg/modal/ProcessPlan.vue

@@ -425,15 +425,14 @@
         //this.onClearSelected()
       },
       show(val) {
+        this.visible = true
         if (val) {
           this.getFileData = true
+          let data = []
+          data.push(val.ids[0])
+          this.changeData = data
+          this.loadPlan(1)
         }
-        let data = []
-        data.push(val)
-        console.log('这是什么数据', val)
-        this.changeData = data
-        this.visible = true
-        this.loadPlan(1)
       },
       handleToggleSearch() {
         this.toggleSearchStatus = !this.toggleSearchStatus

src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@@ -34,7 +34,7 @@
             <a-form-item label="关联预算流程" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <!-- <a-input v-decorator="['processUdgetPlanId']" placeholder="请输入关联预算流程" ></a-input>-->
               <h-plan v-decorator="['processUdgetPlanId']" :trigger-change="true"
-                      code="demo" field="name" :multi="true" orgFields="name" @mounted="getPlanList" @callType="getcallType"
+                      code="demo" field="name"  orgFields="name" @mounted="getPlanList" @callType="getcallType"
                       destFields="name"  />
               <!--              <j-popup-->
               <!--                v-decorator="['one']"-->
@@ -467,6 +467,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
             formData.procDeTitle = this.processData.name
             formData.title = this.processData.description
             formData.targetLibrary = this.libraryAssociationIdInvisible
+            formData.processUdgetPlanId=this.processUdgetPlanIds
             if (!formData.tableName) formData.tableName = this.processData.businessTable
             var url = this.url.addWarehousingApply
             let method = 'post'
@@ -607,7 +608,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
           ids.push(val[i].id);
         }
       }
-      this.processUdgetPlanIds=JSON.stringify(ids);
+      this.processUdgetPlanIds=ids.join(",");
       let params = {}
       params.ids = JSON.stringify(ids)
       this.requestSubTableData(this.url.list, params, this.processMaterialWarehousingListTable)

src/views/activiti/form/ProcessSmaterialsScrapForm.vue

@@ -410,7 +410,8 @@
             ids.push(val[i].id);
           }
         }
-        this.processOutflowIds=JSON.stringify(ids);
+        this.processOutflowIds=ids.join(",");
+        console.log(this.processOutflowIds,"传值-------------------------")
         let params = {}
         params.ids = JSON.stringify(ids)
         this.requestSubTableData(this.url.list, params, this.processSmaterialsScrapListTable)
@@ -514,6 +515,7 @@
               formData.procDefId = this.processData.id
               formData.procDeTitle = this.processData.name
               formData.title = this.processData.description
+              formData.processOutflowId=this.processOutflowIds;
               if (!formData.tableName) formData.tableName = this.processData.businessTable
               console.log('格式化后的数据', formData)
               var url = this.url.add

src/views/processmaterials/ProcessMaterialsDeliveryListList.vue

@@ -102,7 +102,14 @@
           if(!this.mainId){
             this.clearList()
           }else{
-            this.queryParam['id'] = val
+            let newarr=[]
+            val.map(item=>{
+              if(item){
+                newarr.push(item)
+              }
+            })
+            let valuse  =  JSON.stringify(newarr)
+            this.queryParam['ids'] = valuse
             this.loadData(1);
           }
         }
@@ -185,7 +192,7 @@
           }*/
         ],
         url: {
-          list: "/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId",
+          list: "/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainIds",
           delete: "/hy/processMaterialsDelivery/deleteProcessMaterialsDeliveryList",
           deleteBatch: "/hy/processMaterialsDelivery/deleteBatchProcessMaterialsDeliveryList",
           exportXlsUrl: "/hy/processMaterialsDelivery/exportProcessMaterialsDeliveryList",

src/views/processmaterials/ProcessUdgetPlanMaterialList.vue

@@ -106,8 +106,8 @@
                 newarr.push(item)
               }
             })
-            let a  =  JSON.stringify(newarr)
-            this.queryParam['ids'] = a
+            let valuse  =  JSON.stringify(newarr)
+            this.queryParam['ids'] = valuse
             this.loadData(1);
           }
         }