bugfix

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 太仓市网络资产核查管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.120:9115'
+VUE_APP_BASE_API = 'http://192.168.0.112:9115'
 # VUE_APP_BASE_API = 'http://39.101.188.84:9115'
 
 # 路由懒加载

src/views/auditPages/unitAutonomicFill/assetsAuth.vue

@@ -1,9 +1,9 @@
 <template>
-  <assetsTypeOne :pageType="$route.query.pageType" :audit="true" :isModdle="true" :id="$route.query.id" v-if="$route.query.type == 0" />
-  <assetsTypeTwo :pageType="$route.query.pageType" :audit="true" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 1" />
-  <assetsTypeThree :pageType="$route.query.pageType" :audit="true" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 2" />
-  <assetsTypeFour :pageType="$route.query.pageType" :audit="true" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 3" />
-  <assetsTypeFive :pageType="$route.query.pageType" :audit="true" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 4" />
+  <assetsTypeOne :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" v-if="$route.query.type == 0" />
+  <assetsTypeTwo :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 1" />
+  <assetsTypeThree :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 2" />
+  <assetsTypeFour :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 3" />
+  <assetsTypeFive :pageType="$route.query.pageType" :audit="$route.query.pageType == 'change' ? true : false" :isModdle="true" :id="$route.query.id" v-else-if="$route.query.type == 4" />
 </template>
 <script>
 // web资产

src/views/auditPages/unitAutonomicFill/index.vue

@@ -158,7 +158,7 @@ export default {
     }
   },
   mounted() {
-    this.getInfo(1);
+    // this.getInfo(1);
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
   },
@@ -256,6 +256,7 @@ export default {
         name: 'unitAssetsAuth', query: {
           type: this.btnShow == 'web' ? 0 : this.btnShow == 'xcx' ? 1 : this.btnShow == 'gzh' ? 2 : this.btnShow == 'emil' ? 3 : this.btnShow == 'app' ? 4 : 5,
           pageType: "look",
+          btnShow: this.btnShow,
           id: this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null
         }
       })
@@ -266,6 +267,7 @@ export default {
         name: 'unitAssetsAuth', query: {
           type: this.btnShow == 'web' ? 0 : this.btnShow == 'xcx' ? 1 : this.btnShow == 'gzh' ? 2 : this.btnShow == 'emil' ? 3 : this.btnShow == 'app' ? 4 : 5,
           pageType: "change",
+          btnShow: this.btnShow,
           id: this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null
         }
       })
@@ -317,6 +319,26 @@ export default {
       this.tabHeader = elementHeight - headerHeight - paginationtHeight - 140;
     }
   },
+  beforeRouteEnter(to, from, next){
+    next(vm => {
+      if(from.path == "/unitAssetsAuth") {
+        vm.btnShow = from.query.btnShow
+        if(vm.btnShow == 'web') {
+          vm.getInfo(1);
+        } else if(vm.btnShow == 'xcx') {
+          vm.getInfo(2);
+        } else if(vm.btnShow == 'gzh') {
+          vm.getInfo(3);
+        } else if(vm.btnShow == 'emil') {
+          vm.getInfo(4);
+        } else if(vm.btnShow == 'app') {
+          vm.getInfo(5);
+        }
+      } else {
+        vm.getInfo(1);
+      }
+    })
+  },
 }
 </script>
 
@@ -344,7 +366,8 @@ export default {
   margin: 0 10px;
   display: inline-block;
   padding: 5px 20px;
-  background-color: rgba(30, 128, 235, 0.1);
+  // background-color: rgba(30, 128, 235, 0.1);
+  background-color: rgba(213, 225, 236, 0.1);
   border-radius: 8px;
   border: 1px solid #1e80eb;
   font-size: 14px;

src/views/components/myAssetsType/index_v2.vue

@@ -21,7 +21,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="平台类型" prop="ptlx" required>
-                <el-select v-model="ruleForm.ptlx" @change="ptlxChange" placeholder="请选择平台类型" >
+                <el-select v-model="ruleForm.ptlx" disabled placeholder="请选择平台类型" >
                   <el-option 
                     v-for="dict in dict.type.sys_ptlx_type" 
                     :key="dict.value" 
@@ -443,7 +443,7 @@
 import { assetOfficialAccount, assetOfficialAccountInfo, unitAllList, gzhLookInfo, gzhAudit, gzhUnitEdit } from "@/api/auditPagesApi/index";
 import myDialog from "@/views/components/myDialog/index.vue"
 export default {
-  dicts:['app_xzqh','app_sshy','app_zdhy','gzh_state','gzh_lx','gzh_rzzt','gzh_rzlx','gzh_cdlx'],
+  dicts:['app_xzqh','app_sshy','app_zdhy','gzh_state','gzh_lx','gzh_rzzt','gzh_rzlx','gzh_cdlx','sys_ptlx_type'],
   components:{
     myDialog
   },

src/views/login.vue

@@ -180,7 +180,7 @@ export default {
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style rel="stylesheet/scss" lang="scss" scoped>
 .login {
   display: flex;
   justify-content: center;

src/views/unitPages/assetRecord/index.vue

@@ -60,7 +60,7 @@
               <span v-if="scope.row.auditState == 1" style="color: #F58A0C;">
                 待审核
               </span>
-              <span v-if="scope.row.auditState == 2" style="color: #1485EF;">
+              <span v-if="scope.row.auditState == 2" style="color: #16B771;">
                 审批通过
               </span>
               <span v-if="scope.row.auditState == 3" style="color: #F50C0C;">
@@ -76,7 +76,7 @@
                   <span class="look-info" style="color: #1485EF;">查看</span>
                 </div>
                 <!--  -->
-                <div v-if="scope.row.auditState == 2 || scope.row.auditState == 3" style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
+                <div v-if="scope.row.auditState == 3" style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
                   @click="delInfo(scope.row)">
                   <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
                   <span class="del-info" style="color: #1485EF;">编辑</span>
@@ -153,7 +153,7 @@ export default {
     }
   },
   mounted() {
-    this.getInfo(1);
+    // this.getInfo(1);
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
   },
@@ -256,6 +256,7 @@ export default {
         name: 'assetsAuthRecord', query: {
           type: this.btnShow == 'web' ? 0 : this.btnShow == 'xcx' ? 1 : this.btnShow == 'gzh' ? 2 : this.btnShow == 'emil' ? 3 : this.btnShow == 'app' ? 4 : 5,
           pageType: "look",
+          btnShow: this.btnShow,
           id: this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null
         }
       })
@@ -267,6 +268,7 @@ export default {
         name: 'assetsAuthRecord', query: {
           type: this.btnShow == 'web' ? 0 : this.btnShow == 'xcx' ? 1 : this.btnShow == 'gzh' ? 2 : this.btnShow == 'emil' ? 3 : this.btnShow == 'app' ? 4 : 5,
           pageType: "change",
+          btnShow: this.btnShow,
           id:  this.btnShow == 'web' ? row.currentId : this.btnShow == 'xcx' ? row.miniId : this.btnShow == 'gzh' ? row.accountId : this.btnShow == 'emil' ? row.emailId : this.btnShow == 'app' ? row.appId : null
         }
       })
@@ -318,6 +320,26 @@ export default {
       this.tabHeader = elementHeight - headerHeight - paginationtHeight - 140;
     }
   },
+  beforeRouteEnter(to, from, next){
+    next(vm => {
+      if(from.path == "/assetsAuthRecord") {
+        vm.btnShow = from.query.btnShow
+        if(vm.btnShow == 'web') {
+          vm.getInfo(1);
+        } else if(vm.btnShow == 'xcx') {
+          vm.getInfo(2);
+        } else if(vm.btnShow == 'gzh') {
+          vm.getInfo(3);
+        } else if(vm.btnShow == 'emil') {
+          vm.getInfo(4);
+        } else if(vm.btnShow == 'app') {
+          vm.getInfo(5);
+        }
+      } else {
+        vm.getInfo(1);
+      }
+    })
+  },
 }
 </script>
 
@@ -345,7 +367,8 @@ export default {
   margin: 0 10px;
   display: inline-block;
   padding: 5px 20px;
-  background-color: rgba(30, 128, 235, 0.1);
+  // background-color: rgba(30, 128, 235, 0.1);
+  background-color: rgba(213, 225, 236, 0.1);
   border-radius: 8px;
   border: 1px solid #1e80eb;
   font-size: 14px;

src/views/unitPages/myAssets/index.vue

@@ -99,7 +99,7 @@
                   <img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
                   <span class="look-info" style="color: #1485EF;">查看</span>
                 </div>
-                <div v-if="!scope.row.auditState || scope.row.auditState == 2" style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="goInfo(scope.row,2)">
+                <div v-if="!scope.row.auditState || scope.row.auditState == 2 || scope.row.xtzt == '5'" style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="goInfo(scope.row,2)">
                   <img src="@/assets/images/edit.png" alt="" style="width: 15px;margin-right: 5px;">
                   <span class="look-info" style="color: #1485EF;margin-right: 15px;">编辑</span>
                 </div>

src/views/unitPages/unitInfo/index.vue

@@ -571,10 +571,10 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="$route.query.pageType !== 'look'">
-            <el-button type="danger" @click="cancel" :disabled="false">取消</el-button>
-            <el-button type="warning" @click="editUnit" :disabled="isDisabled">编辑</el-button>
-            <el-button type="primary" @click="newUnit" :disabled="false">确定</el-button>
+          <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;">
+            <el-button type="danger" @click="cancel" :disabled="false" v-if="isDisabled">取消</el-button>
+            <el-button type="warning" @click="editUnit" v-if="!isDisabled" :disabled="isDisabled">编辑</el-button>
+            <el-button type="primary" @click="newUnit" :disabled="false" v-if="isDisabled">确定</el-button>
           </el-row>
         </el-form>
       </div>