Merge remote-tracking branch 'origin/dev' into dev

src/views/accessrecords/ProcessMaterialWarehousingRecord.vue

@@ -113,7 +113,7 @@ aq<template>
         <span slot="warehousingBatch" slot-scope="text, record">
             <j-ellipsis :value="text" :length="10"/>
         </span>
-        <span slot="sysOrgCode_dictText" slot-scope="text, record">
+        <span slot="departId_dictText" slot-scope="text, record">
             <j-ellipsis :value="text" :length="10"/>
         </span>
         <template slot="htmlSlot" slot-scope="text">
@@ -225,7 +225,7 @@ aq<template>
           {
             title:'流程发起部门',
             align:"center",
-            scopedSlots: { customRender: 'sysOrgCode_dictText' },
+            scopedSlots: { customRender: 'departId_dictText' },
             dataIndex: 'departId_dictText',
           },
           {
@@ -305,6 +305,12 @@ aq<template>
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
       }
     },
+    watch: {
+      $route(to,from) {
+        // this.queryParam.processUdgetPlanId;
+        this.searchQuery()
+      }
+    },
     methods: {
       searchQuery() {
         this.loadData(1);
@@ -381,7 +387,7 @@ aq<template>
         let ue= sessionStorage.getItem('USER_INFORMATION');
         let res=JSON.parse(ue);
         if(res.realname !== "管理员"){
-          this.queryParam.sysOrgCode = res.departIds;
+          this.queryParam.departId = res.departIds;
         }
         // console.log("_______________.",res);
         // console.log(res.departIds);

src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue

@@ -57,7 +57,7 @@
         :customRow="clickThenSelect"
         @change="handleTableChange">
 
-        <span slot="sysOrgCode_dictText" slot-scope="text, record">
+        <span slot="departId_dictText" slot-scope="text, record">
             <j-ellipsis :value="text" :length="10"/>
         </span>
         <span slot="describes" slot-scope="text, record">
@@ -267,7 +267,7 @@
           {
             title:'流程发起部门',
             align:"center",
-            scopedSlots: { customRender: 'sysOrgCode_dictText' },
+            scopedSlots: { customRender: 'departId_dictText' },
             dataIndex: 'departId_dictText',
           },
           {
@@ -350,6 +350,13 @@
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
       }
     },
+    watch: {
+      $route(to,from) {
+        // this.queryParam.processUdgetPlanId;
+        this.searchQuery()
+      }
+    },
+
     methods: {
       searchQuery() {
         this.loadData(1);
@@ -421,7 +428,7 @@
         let ue= sessionStorage.getItem('USER_INFORMATION');
         let res=JSON.parse(ue);
         if(res.realname !== "管理员"){
-          this.queryParam.sysOrgCode = res.departIds;
+          this.queryParam.departId = res.departIds;
         }
         // this.queryParam.sysOrgCode = res.departIds;
         var params = this.getQueryParams();//查询条件

src/views/accessrecords/ProcessMaterialsPlanRecord.vue

@@ -330,6 +330,12 @@
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
       }
     },
+    watch: {
+      $route(to,from) {
+        // this.queryParam.processUdgetPlanId;
+        this.searchQuery()
+      }
+    },
     methods: {
       searchQuery() {
         this.loadData(1);
@@ -403,7 +409,7 @@
         let ue= sessionStorage.getItem('USER_INFORMATION');
         let res=JSON.parse(ue);
         if(res.realname !== "管理员"){
-          this.queryParam.sysOrgCode = res.departIds;
+          this.queryParam.departId = res.departIds;
         }
         // this.queryParam.sysOrgCode = res.departIds;
         var params = this.getQueryParams();//查询条件

src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue

@@ -48,7 +48,7 @@
             </a-form-item>
           </a-col>
           <a-col :xl="8" :lg="7" :md="8" :sm="24">
-            <a-button type="primary" icon="download" @click="handleExportXls('物资入库流程')">导出</a-button>
+<!--            <a-button type="primary" icon="download" @click="handleExportXls('物资入库流程')">导出</a-button>-->
             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
             <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
           </a-col>

src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue

@@ -25,7 +25,7 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="16">
-            <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
+<!--            <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>-->
             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
             <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
           </a-col>

src/views/accessrecords/modules/ProcessMaterialsPlanDetail.vue

@@ -20,7 +20,7 @@
             </a-form-item>
           </a-col>
           <a-col :xl="8" :lg="7" :md="8" :sm="24">
-            <a-button type="primary" icon="download" @click="handleExportXls('物资采购记录')">导出</a-button>
+<!--            <a-button type="primary" icon="download" @click="handleExportXls('物资采购记录')">导出</a-button>-->
             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
             <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
           </a-col>

src/views/accessrecords/plan/ProcessMaterialWarehousingPlan.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false" >
 
-    <a-tabs style="text-align: center" @change="callback">
+    <a-tabs style="text-align: center" :active-key="this.tabKey" @change="callback">
       <a-tab-pane tab="物资明细" key="1" forceRender >
         <process-material-warehousing-detail :materWared="this.$route.query.item" />
       </a-tab-pane>
@@ -31,6 +31,7 @@ export default {
   },
   data() {
     return {
+      tabKey:'1',
       isNew:'',
       ifShow:false,
       pictureId:'',
@@ -89,8 +90,15 @@ export default {
     console.log(this.proMaterListId);
     // this.getPicture();
   },
+  watch:{
+    $route(to,from) {
+      this.tabKey = '1'
+      console.log("我监听到了页面的切换")
+    }
+  },
   methods: {
     callback(key){
+      this.tabKey = key
       if (key==2){
         getAction(this.url.getProcessPicture, { id:this.$route.query.item }).then((res) => {
           if (res.success) {

src/views/accessrecords/plan/ProcessMaterialsDeliveryPlan.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false" >
 
-    <a-tabs style="text-align: center" @change="callback">
+    <a-tabs style="text-align: center" :active-key="this.tabKey" @change="callback">
       <a-tab-pane tab="物资明细" key="1" forceRender>
         <ProcessMaterialsDeliveryDetail :delivery-detail-id="this.$route.query.item" />
       </a-tab-pane>
@@ -33,6 +33,7 @@ export default {
   },
   data() {
     return {
+      tabKey:'1',
       isNew:'',
       ifShow:false,
       pictureId:'',
@@ -90,8 +91,15 @@ export default {
   created(){
     console.log(this.proMaterListId);
   },
+  watch:{
+    $route(to,from) {
+      this.tabKey = '1'
+      console.log("我监听到了页面的切换")
+    }
+  },
   methods: {
     callback(key){
+      this.tabKey = key
       if (key==2){
         getAction(this.url.getProcessPicture, { id:this.$route.query.item }).then((res) => {
           if (res.success) {

src/views/accessrecords/plan/ProcessMaterialsPlan.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card :bordered="false" >
 
-    <a-tabs style="text-align: center" :default-active-key="this.tabKey" @change="callback">
+    <a-tabs style="text-align: center" :active-key="this.tabKey" @change="callback">
       <a-tab-pane tab="采购明细" key="1" forceRender >
         <process-materials-plan-detail :materPlanId="this.$route.query.item" />
       </a-tab-pane>
@@ -100,11 +100,15 @@
         if(newData !== oldData){
           console.log("=================","值发生了变化","===================")
         }
+      },
+      $route(to,from) {
+        this.tabKey = '1'
+        console.log("我监听到了页面的切换")
       }
-
     },
     methods: {
       callback(key) {
+        this.tabKey = key
         console.log("=================",key,"===================")
         if (key == 2) {
           getAction(this.url.getProcessPicture, { id: this.$route.query.item }).then((res) => {