关联流程页面显示,调拨物资类型可选择

src/components/jeecg/modal/ProcessDelivery.vue

@@ -560,5 +560,21 @@
 </script>
 
 <style scoped>
+@import '~@assets/less/common.less';
 
+/deep/.ant-modal {
+  /*overflow-y: hidden;*/
+  width: 80% !important;
+  height: 93%;
+  top:45px
+}
+/deep/.ant-modal-content{
+  height: 100%;
+  /*overflow-y: hidden;*/
+  overflow-y: scroll;
+}
+/deep/.ant-modal-body{
+  /*height: 100%;*/
+  /*overflow-y: scroll;*/
+}
 </style>

src/components/jeecg/modal/ProcessPlan.vue

@@ -556,4 +556,20 @@ export default {
 
 <style scoped>
 @import '~@assets/less/common.less';
+
+/deep/.ant-modal {
+  /*overflow-y: hidden;*/
+  width: 80% !important;
+  height: 93%;
+  top:45px
+}
+/deep/.ant-modal-content{
+  height: 100%;
+  /*overflow-y: hidden;*/
+  overflow-y: scroll;
+}
+/deep/.ant-modal-body{
+  /*height: 100%;*/
+  /*overflow-y: scroll;*/
+}
 </style>

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -44,7 +44,7 @@
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" @change="materialType"
                                  v-decorator="['materialType']" :trigger-change="true"
-                                 dictCode="material_type" placeholder="请选择物资类型" :disabled="issh" disabled/>
+                                 dictCode="material_type" placeholder="请选择物资类型" :disabled="issh" />
             </a-form-item>
           </a-col>
           <a-col :span="8">
@@ -329,7 +329,7 @@
           queryById: '/hy/processMaterialsAllot/queryById',
           descriptionRake: '/wastematerials/processWasteMaterials/wasteMaterialsName', //查询物料组
           descriptionRakeUrl: '/hy/processMaterialWarehousingList/queryByIdWarehousingList', //查询物料组
-          merchandiseNewsList: '/wastematerials/processWasteMaterials/merchandiseNewsName',
+          merchandiseNewsList: '/wastematerials/processWasteMaterials/merchandiseNewsNameBymaterialType',
           unitWasteNameUrl: '/unitwaste/processUnitWasteWarehouseCode/unitWasteName',
           puwwlistByuntil: '/unitwaste/processUnitWasteWarehouseCode/list',
           getFirstNode: '/actProcessIns/getFirstNode',
@@ -435,6 +435,9 @@
       }
     },
     methods: {
+      // click(record, index){
+      //   console.log("欧克")
+      // },
       async onSelect(record) {
         // console.log(record)
         // console.log("keykey",record.column.key)
@@ -591,11 +594,15 @@
 
       },
       fetchMerchandiseNews(value) { //查询物料清单信息
+        console.log("this.form=============================")
+        console.log(this.form)
         //查询大品类数据
         return new Promise((resolve, reject) => {
+
           //你的逻辑代码
           let par = {
-            departId: this.libraryInvisible
+            departId: this.libraryInvisible,
+            materialType: this.materialTypeRecord
           }
           this.bigIdMerchandiseNewsList = []
           let qc = []
@@ -696,6 +703,8 @@
       },
 
       materialType(val) {
+        console.log("val===================")
+        console.log(val)
         this.materialTypeRecord = val;
         if (!!val  &&  !!this.libraryInvisible ) {
           this.heid = false
@@ -1031,7 +1040,7 @@
         param.company = company
         param.departId = res.departIds
         param.createTime = getCurrentTime()
-        param.materialType=1;
+        // param.materialType=1;
         this.data = param
         let fieldval = pick(this.data, 'createBy', 'company', 'departId', 'createTime',"materialType")
         this.$nextTick(() => {