入库流程,报废流程关联

src/components/jeecg/modal/ProcessDelivery.vue

@@ -199,7 +199,7 @@
           // }
         ],
         url: {
-          list: '/hy/processMaterialsDelivery/list',
+          list: '/hy/processMaterialsDelivery/listByDel',
           delete: '/hy/processMaterialsDelivery/delete',
           deleteBatch: '/hy/processMaterialsDelivery/deleteBatch',
           exportXlsUrl: '/hy/processMaterialsDelivery/exportXls',
@@ -270,10 +270,13 @@
         }
         //加载数据 若传入参数1则加载第一页的内容
         if (arg === 1) {
-          this.pagination.current = 1
+          this.pagination.current = arg
         }
         this.onClearSelected()
         var params = this.queryParams()//查询条件
+        if(this.changeData){
+          params.id=this.changeData[0]
+        }
         this.loading = true
         getAction(this.url.list, params).then((res) => {
           if (res.success) {

src/components/jeecg/modal/ProcessPlan.vue

@@ -297,11 +297,14 @@
           return
         }
         //加载数据 若传入参数1则加载第一页的内容
-  //      if (arg === 1) {
+       if (arg === 1) {
           this.pagination.current = arg
-     //   }
+       }
          this.onClearSelected()
         var params = this.getQueryParams()//查询条件
+        if(this.changeData){
+          params.id=this.changeData[0]
+        }
         this.loading = true
         getAction(this.url.list, params).then((res) => {
           if (res.success) {

src/utils/request.js

@@ -17,7 +17,7 @@ let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot";
 const service = axios.create({
   //baseURL: '/jeecg-boot',
   baseURL: apiBaseUrl, // api base_url
-  timeout: 9000 // 请求超时时间
+  timeout: 20000 // 请求超时时间
 })
 
 const err = (error) => {

src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@@ -35,7 +35,7 @@
               <!-- <a-input v-decorator="['processUdgetPlanId']" placeholder="请输入关联预算流程" ></a-input>-->
               <h-plan v-decorator="['processUdgetPlanId',validatorRules.processUdgetPlanId]" :trigger-change="true"
                       code="demo" field="name" orgFields="name" @mounted="getPlanList" @callType="getcallType"
-                      destFields="name" :multi="true" />
+                      destFields="name"  />
               <!--              <j-popup-->
               <!--                v-decorator="['one']"-->
               <!--                :trigger-change="true"-->
@@ -409,7 +409,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
             this.btndisabled = true
             httpAction(url, formData, method).then((res) => {
               if (res.success) {
-                this.$message.success('保存成功！')
+                //this.$message.success('保存成功！')
                 //todo 将表单的数据传给父组件
                 this.$emit('afterSubmit', formData)
               } else {