页面显示

src/views/accessrecords/LndustrialExplosiveCome.vue

@@ -260,7 +260,7 @@ export default {
         {
           title:'出库时间',
           align:"center",
-          dataIndex: 'deliveryTime',
+          dataIndex: 'createTime',
           customRender:function (text) {
             return !text?"":(text.length>10?text.substr(0,10):text)
           }

src/views/activiti/form/ProcessMaterialsDelivery.vue

@@ -89,10 +89,12 @@
       let user= JSON.parse(userInfo)
       //项目部从总库出库
       if (user.orgType==2){
+        this.delivery = 1
         this.noDisabled=false
       }
       //生成小队从项目部出库
       if (user.orgType==3){
+        this.delivery = 2
         this.onlineDisabled=false
       }
     },
@@ -121,11 +123,11 @@
       showType(val){
         if (val==2){
           this.delivery=2;
-          this.onlineDisabled=false
+          // this.onlineDisabled=false
         }
         if (val==1){
           this.delivery=1;
-          this.noDisabled=false
+          // this.noDisabled=false
         }
       }
     }

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -528,7 +528,8 @@
           getFirstNode: '/actProcessIns/getFirstNode',
           processUdgetPlanMaterial: {
             list: '/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainId'
-          }
+          },
+          processUdgetPlanMaterialLists: '/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainIdList'
         },
         btndisabled: false,
         isShowInput: '',
@@ -1261,7 +1262,7 @@
         // 加载子表数据
         if (this.data.id) {
           let params = { id: this.data.id }
-          this.requestSubTableData(this.url.processUdgetPlanMaterial.list, params, this.processUdgetPlanMaterialTable)
+          this.requestSubTableData(this.url.processUdgetPlanMaterialLists, params, this.processUdgetPlanMaterialTable)
           console.log('子表数据', this.processUdgetPlanMaterialTable)
 
         }