zc

src/layout/index.vue

@@ -28,6 +28,7 @@ import ResizeMixin from './mixin/ResizeHandler'
 import { mapState } from 'vuex'
 import variables from '@/assets/styles/variables.scss'
 import BreadcrumbDiy from '@/components/BreadcrumbDiy'
+import store from '@/store'
 
 export default {
   name: 'Layout',
@@ -68,6 +69,10 @@ export default {
     }
   },
   mounted(){
+    console.log('刷新啦');
+    if(localStorage.getItem('setSmartAlarmType')){
+      store.dispatch('settings/setSmartAlarmType', localStorage.getItem('setSmartAlarmType'))
+    }
   },
   methods: {
     demo(type){

src/store/modules/settings.js

@@ -7,7 +7,7 @@ const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
   title: '',
   pageName:"",
-  smartAlarmType:0,//1开启 0关闭
+  smartAlarmType:0,//柜锁开关 1开启 0关闭
   theme: storageSetting.theme || variables.theme,
   sideTheme: storageSetting.sideTheme || sideTheme,
   showSettings: showSettings,

src/views/comprehensive/system/publicConfig/index.vue

@@ -281,6 +281,7 @@
         getLogoInfo().then(response => {
           this.$set(this,'form',response.data)
           store.dispatch('settings/setSmartAlarmType', response.data.smartLock)
+          localStorage.setItem('setSmartAlarmType',response.data.smartLock)
           localStorage.setItem('circularLogo',response.data.circularLogo)
           localStorage.setItem('rectangleLogo',response.data.rectangleLogo)
           localStorage.setItem('videoCover',response.data.videoCover)

src/views/login.vue

@@ -128,6 +128,7 @@ export default {
       getLogoInfo().then(response => {
         console.log('公共配置',response.data)
         store.dispatch('settings/setSmartAlarmType', response.data.smartLock)
+        localStorage.setItem('setSmartAlarmType',response.data.smartLock)
         this.rectangleLogo = response.data.rectangleLogo;
         localStorage.setItem('circularLogo',response.data.circularLogo)
         localStorage.setItem('rectangleLogo',response.data.rectangleLogo)

src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/approvalPage.vue

@@ -157,11 +157,12 @@
                     <p>{{minItem.name}}</p>
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_1.png" v-if="item.actApplytaskNodeList[0].applyUserid == minItem.id&&minIndex!=item.actApplytaskNodeList[0].applyUserList.length-1">
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_2.png" v-if="item.actApplytaskNodeList[0].applyUserid != minItem.id&&minIndex!=item.actApplytaskNodeList[0].applyUserList.length-1">
-                    <img class="position-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_cgsq_ytg.png" v-if="item.actApplytaskNodeList[0].applyUserid == minItem.id">
+                    <img class="position-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_cgsq_ytg.png" v-if="item.actApplytaskNodeList[0].applyUserid == minItem.id&&item.actApplytaskNodeList[0].nodeStatus == 1">
+                    <img class="position-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_cgsq_yjj.png" v-if="item.actApplytaskNodeList[0].applyUserid == minItem.id&&item.actApplytaskNodeList[0].nodeStatus == 2">
                   </div>
                 </div>
               </div>
-              <p class="right-right-time-p">{{dataInfo.approvalStatus==2||dataInfo.approvalStatus==3?dataInfo.actApplytask.overTime:item.applyTaskTime}}</p>
+              <p class="right-right-time-p">{{item.applyTaskTime}}</p>
             </div>
           </div>
           <div class="approval-for-box" v-if="dataInfo.approvalStatus==3">

src/views/medicUniversity-3_1/chemicalManagement/chemicalProcurement/purchaseRequisition/editPage.vue

@@ -306,7 +306,7 @@
         });
       },
       getCabinet(val){
-        getCabinetBySubId({id:val}).then(response => {
+        getCabinetBySubId({subId:val}).then(response => {
           this.$set(this,'cabinetLit',response.data);
         });
       },

src/views/studentViews/chemicalManagement/studentPurchaseRequisition/addPage.vue

@@ -252,7 +252,7 @@
           };
           this.$parent.goPage(3,obj);
         }else if(type == 3){
-          this.$parent.backPage();
+          this.$parent.backPage(1);
         }
       },
       // 机柜选中

src/views/studentViews/chemicalManagement/studentPurchaseRequisition/approvalPage.vue

@@ -121,11 +121,12 @@
                     <p>{{minItem.name}}</p>
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_1.png" v-if="item.actApplytaskNodeList[0].applyUserid == minItem.id&&minIndex!=item.actApplytaskNodeList[0].applyUserList.length-1">
                     <img class="right-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_bz_2.png" v-if="item.actApplytaskNodeList[0].applyUserid != minItem.id&&minIndex!=item.actApplytaskNodeList[0].applyUserList.length-1">
-                    <img class="position-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_cgsq_ytg.png" v-if="item.actApplytaskNodeList[0].applyUserid == minItem.id">
+                    <img class="position-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_cgsq_ytg.png" v-if="item.actApplytaskNodeList[0].applyUserid == minItem.id&&item.actApplytaskNodeList[0].nodeStatus == 1">
+                    <img class="position-min-img" src="@/assets/ZDimages/medicUniversity-3_1/icon_cgsq_yjj.png" v-if="item.actApplytaskNodeList[0].applyUserid == minItem.id&&item.actApplytaskNodeList[0].nodeStatus == 2">
                   </div>
                 </div>
               </div>
-              <p class="right-right-time-p">{{dataInfo.approvalStatus==2||dataInfo.approvalStatus==3?dataInfo.actApplytask.overTime:item.applyTaskTime}}</p>
+              <p class="right-right-time-p">{{item.applyTaskTime}}</p>
             </div>
           </div>
           <div class="approval-for-box" v-if="dataInfo.approvalStatus==3">

src/views/studentViews/chemicalManagement/studentPurchaseRequisition/editPage.vue

@@ -307,7 +307,7 @@
         });
       },
       getCabinet(val){
-        getCabinetBySubId({id:val}).then(response => {
+        getCabinetBySubId({subId:val}).then(response => {
           this.$set(this,'cabinetLit',response.data);
         });
       },

src/views/studentViews/chemicalManagement/studentPurchaseRequisition/listPage.vue

@@ -47,7 +47,7 @@
         <el-form-item style="float: right;">
           <el-col :span="1.5">
             <p class="reset-button-one"
-               @click="backPage"
+               @click="backPage(0)"
             >返回</p>
           </el-col>
         </el-form-item>
@@ -186,8 +186,12 @@
         this.handleQuery();
       },
       //返回
-      backPage(){
-        this.$parent.pageToggle(0);
+      backPage(type){
+        if(type == 0){
+          this.$parent.pageToggle(0);
+        }else if(type == 1){
+          this.$parent.pageToggle(1);
+        }
       },
       // 多选框选中数据
       handleSelectionChange(selection) {