完善项目刷新功能和切换页面刷新功能

3 years ago · 7256c8aeb4
26 changed files with 217 additions and 67 deletions
--- a/anrui-base/anrui-base-ui/src/layout/components/TagsView/index.vue
+++ b/anrui-base/anrui-base-ui/src/layout/components/TagsView/index.vue
@ -137,7 +137,6 @@ export default {
    refreshSelectedTag(view) {
      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
        const { fullPath } = view
-        console.log('112233',view)
        this.$nextTick(() => {
          this.$router.replace({
            path: '/redirect' + fullPath
--- a/anrui-base/anrui-base-ui/src/router/index.js
+++ b/anrui-base/anrui-base-ui/src/router/index.js
@ -8,6 +8,15 @@ Vue.use(Router)
 /* 所有角色可以访问/没有权限要求的基页 */

 export const constantRoutes = [
+  {
+    path: '/redirect',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/redirect/:path(.*)',
+      component: () => import('@/views/redirect/index.vue')
+    }]
+  },
  {
    path: '/',
    redirect: 'index'
@ -53,7 +62,8 @@ export const constantRoutes = [
 					import('@/views/changshang/changshangguanli/changshangguanli.vue'),
 				name: 'changshangguanli',
 				meta: {
-					title: '厂商管理'
+					title: '厂商管理',
+          noCache: true,
 				}
 			},
 		]
@ -73,7 +83,8 @@ export const constantRoutes = [
 					import('@/views/pinpai/pinpaiguanli/pinpaiguanli.vue'),
 				name: 'pinpaiguanli',
 				meta: {
-					title: '品牌管理'
+					title: '品牌管理',
+          noCache: true,
 				}
 			},
 			{
@ -83,7 +94,8 @@ export const constantRoutes = [
 				name: 'pinpaiAdd',
 				hidden: true,
 				meta: {
-					title: '品牌管理'
+					title: '品牌管理',
+          noCache: true,
 				}
 			},
 			{
@ -93,7 +105,8 @@ export const constantRoutes = [
 				name: 'pinpaiInfo',
 				hidden: true,
 				meta: {
-					title: '品牌详情'
+					title: '品牌详情',
+          noCache: true,
 				}
 			},
 			{
@ -123,7 +136,8 @@ export const constantRoutes = [
 					import('@/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue'),
 				name: 'jingxiaoshangguanli',
 				meta: {
-					title: '经销商管理'
+					title: '经销商管理',
+          noCache: true,
 				}
 			},
 			{
@ -133,7 +147,8 @@ export const constantRoutes = [
 				name: 'jingxiaoshangAdd',
 				hidden: true,
 				meta: {
-					title: '经销商添加'
+					title: '经销商添加',
+          noCache: true,
 				}
 			},
 			{
@ -143,7 +158,8 @@ export const constantRoutes = [
 				name: 'jingxiaoshangEdit',
 				hidden: true,
 				meta: {
-					title: '经销商修改'
+					title: '经销商修改',
+          noCache: true,
 				}
 			},
 			{
@ -153,7 +169,8 @@ export const constantRoutes = [
 				name: 'jingxiaoshangInfo',
 				hidden: true,
 				meta: {
-					title: '经销商详情'
+					title: '经销商详情',
+          noCache: true,
 				}
 			}
 			// {
@ -185,7 +202,8 @@ export const constantRoutes = [
 					import('@/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue'),
 				name: 'guakaogongsiguanli',
 				meta: {
-					title: '经销商'
+					title: '经销商',
+          noCache: true,
 				}
 			},
 			// {
@ -245,7 +263,8 @@ export const constantRoutes = [
 					import('@/views/zifang/zifangguanli/zifangguanli.vue'),
 				name: 'zifangguanli',
 				meta: {
-					title: '资方信息管理'
+					title: '资方信息管理',
+          noCache: true,
 				}
 			},
 			{
@ -255,7 +274,8 @@ export const constantRoutes = [
 				name: 'zifangguanliAdd',
 				hidden: true,
 				meta: {
-					title: '资方信息添加'
+					title: '资方信息添加',
+          noCache: true,
 				}
 			},
 			{
@ -265,7 +285,8 @@ export const constantRoutes = [
 				name: 'zifangguanliInfo',
 				hidden: true,
 				meta: {
-					title: '资方信息详细信息'
+					title: '资方信息详细信息',
+          noCache: true,
 				}
 			},
 			{
@ -274,7 +295,8 @@ export const constantRoutes = [
 					import('@/views/zifang/zifangzhengce/zifangzhengce.vue'),
 				name: 'zifangzhengce',
 				meta: {
-					title: '资方政策管理'
+					title: '资方政策管理',
+          noCache: true,
 				}
 			},
 			{
@ -284,7 +306,8 @@ export const constantRoutes = [
 				name: 'zifangzhengceAdd',
 				hidden: true,
 				meta: {
-					title: '资方政策添加'
+					title: '资方政策添加',
+          noCache: true,
 				}
 			},
 			{
@ -294,7 +317,8 @@ export const constantRoutes = [
 				name: 'zifangzhengceInfo',
 				hidden: true,
 				meta: {
-					title: '资方政策详细信息'
+					title: '资方政策详细信息',
+          noCache: true,
 				}
 			}

@ -313,7 +337,7 @@ export const constantRoutes = [
      path: '/fileList/index',
      component: () => import('@/views/fileList/fileList.vue'),
      name: 'fileList',
-      meta: { title: '资料清单' }
+      meta: { title: '资料清单',noCache: true, }
    }]
  },

--- a/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiguanli.vue
@ -168,7 +168,7 @@ import guakaogongsiInfo from './guakaogongsiInfo.vue'
 import ButtonBar from '@/components/ButtonBar/index.vue'

 export default {
-  name: 'Guakaogongsiguanli',
+  name: 'guakaogongsiguanli',
  components: {
    Pagination,
    pageye,
--- a/anrui-base/anrui-base-ui/src/views/redirect/index.vue
+++ b/anrui-base/anrui-base-ui/src/views/redirect/index.vue
@ -0,0 +1,12 @@
+<script>
+export default {
+  created() {
+    const { params, query } = this.$route
+    const { path } = params
+    this.$router.replace({ path: '/' + path, query })
+  },
+  render: function(h) {
+    return h() // avoid warning message
+  }
+}
+</script>
--- a/anrui-base/anrui-base-ui/src/views/zifang/zifangguanli/zifangguanli.vue
+++ b/anrui-base/anrui-base-ui/src/views/zifang/zifangguanli/zifangguanli.vue
@ -95,7 +95,7 @@
  import zifangguanliAdd from './zifangguanliAdd.vue'
  import zifangguanliInfo from './zifangguanliInfo.vue'
  export default {
-    name: 'Zifangguanli',
+    name: 'zifangguanli',
    components: {
      Pagination,
      pageye,
--- a/anrui-base/anrui-base-ui/src/views/zifang/zifangzhengce/zifangzhengce.vue
+++ b/anrui-base/anrui-base-ui/src/views/zifang/zifangzhengce/zifangzhengce.vue
@ -151,7 +151,7 @@
  import { brandLike } from '@/api/jichuxinxi/brandManagement'
  import { basefinbankDnamesDown } from '@/api/jichuxinxi/basefinbank' // 资方名称
  export default {
-    name: 'Zifangzhengce',
+    name: 'zifangzhengce',
    components: {
      Pagination,
      pageye
--- a/anrui-buscenter/anrui-buscenter-ui/src/layout/components/TagsView/index.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/layout/components/TagsView/index.vue
@ -141,8 +141,8 @@
          } = view
          this.$nextTick(() => {
            this.$router.replace({
-              // path: '/redirect' + fullPath
-              path: fullPath
+              path: '/redirect' + fullPath
+              // path: fullPath
            })
          })
        })
--- a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js
@ -7,16 +7,26 @@ import codemenu from './modules/codemenu'

 Vue.use(Router)

-export const constantRoutes = [{
-  path: '/',
-  redirect: 'index'
-}, {
-  path: '/login',
-  component: () => import('@/views/login/login.vue')
-}, {
-  path: '/home',
-  component: () => import('@/views/Home/Home.vue'),
-  name: 'home'
+export const constantRoutes = [
+  {
+    path: '/redirect',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/redirect/:path(.*)',
+      component: () => import('@/views/redirect/index.vue')
+    }]
+  },
+  {
+    path: '/',
+    redirect: 'index'
+  }, {
+    path: '/login',
+    component: () => import('@/views/login/login.vue')
+  }, {
+    path: '/home',
+    component: () => import('@/views/Home/Home.vue'),
+    name: 'home'

 }, {
  path: '/index',
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/redirect/index.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/redirect/index.vue
@ -0,0 +1,12 @@
+<script>
+export default {
+  created() {
+    const { params, query } = this.$route
+    const { path } = params
+    this.$router.replace({ path: '/' + path, query })
+  },
+  render: function(h) {
+    return h() // avoid warning message
+  }
+}
+</script>
--- a/anrui-buscenter/anrui-finmanage-ui/src/layout/components/TagsView/index.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/layout/components/TagsView/index.vue
@ -138,8 +138,7 @@ export default {
        const { fullPath } = view
        this.$nextTick(() => {
          this.$router.replace({
-            path: fullPath
-            // path: '/redirect' + fullPath
+            path: '/redirect' + fullPath
          })
        })
      })
--- a/anrui-buscenter/anrui-finmanage-ui/src/router/index.js
+++ b/anrui-buscenter/anrui-finmanage-ui/src/router/index.js
@ -9,7 +9,17 @@ import Layout from '@/layout'

 import codemenu from './modules/codemenu'

-export const constantRoutes = [{
+export const constantRoutes = [
+  {
+    path: '/redirect',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/redirect/:path(.*)',
+      component: () => import('@/views/redirect/index.vue')
+    }]
+  },
+  {
    path: '/',
    redirect: 'index'
  }, {
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/redirect/index.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/redirect/index.vue
@ -0,0 +1,12 @@
+<script>
+export default {
+  created() {
+    const { params, query } = this.$route
+    const { path } = params
+    this.$router.replace({ path: '/' + path, query })
+  },
+  render: function(h) {
+    return h() // avoid warning message
+  }
+}
+</script>
--- a/anrui-management/anrui-management-ui/src/layout/components/TagsView/index.vue
+++ b/anrui-management/anrui-management-ui/src/layout/components/TagsView/index.vue
@ -130,8 +130,7 @@ export default {
        const { fullPath } = view
        this.$nextTick(() => {
          this.$router.replace({
-            path: fullPath
-            // path: '/redirect' + fullPath
+            path: '/redirect' + fullPath
          })
        })
      })
--- a/anrui-management/anrui-management-ui/src/router/index.js
+++ b/anrui-management/anrui-management-ui/src/router/index.js
@ -8,6 +8,15 @@ import Layout from '@/layout'
 /* 所有角色可以访问/没有权限要求的基页 */

 export const constantRoutes = [
+  {
+    path: '/redirect',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/redirect/:path(.*)',
+      component: () => import('@/views/redirect/index.vue')
+    }]
+  },
 	{
 		path: '/',
 		redirect: 'index'
--- a/anrui-management/anrui-management-ui/src/views/redirect/index.vue
+++ b/anrui-management/anrui-management-ui/src/views/redirect/index.vue
@ -0,0 +1,12 @@
+<script>
+export default {
+  created() {
+    const { params, query } = this.$route
+    const { path } = params
+    this.$router.replace({ path: '/' + path, query })
+  },
+  render: function(h) {
+    return h() // avoid warning message
+  }
+}
+</script>
--- a/anrui-scm/anrui-scm-ui/src/layout/components/TagsView/index.vue
+++ b/anrui-scm/anrui-scm-ui/src/layout/components/TagsView/index.vue
@ -139,8 +139,7 @@ export default {
        const { fullPath } = view
        this.$nextTick(() => {
          this.$router.replace({
-            path: fullPath
-            // path: '/redirect' + fullPath
+            path: '/redirect' + fullPath
          })
        })
      })
--- a/anrui-scm/anrui-scm-ui/src/router/index.js
+++ b/anrui-scm/anrui-scm-ui/src/router/index.js
@ -9,7 +9,17 @@ import Layout from '@/layout'

 import codemenu from './modules/codemenu'

-export const constantRoutes = [{
+export const constantRoutes = [
+  {
+    path: '/redirect',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/redirect/:path(.*)',
+      component: () => import('@/views/redirect/index.vue')
+    }]
+  },
+  {
    path: '/',
    redirect: 'index'
  }, {
--- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
+++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
@ -393,7 +393,7 @@ const codemenu = [
        path: '/kucunguanli/rukuguanli',
        component: () => import('@/views/supplychain/rukuguanli/rukuguanliAwait.vue'),
        name: 'rukuguanliawait',
-        meta: { title: '入库车辆管理' }
+        meta: { title: '入库车辆管理',noCache:true }
      }
    ]
  },
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue
@ -85,7 +85,7 @@
                <span>{{ scope.row.receiver }}</span>
              </template>
            </el-table-column>
-            <el-table-column label="备注" width="370px" align="left">
+            <el-table-column label="备注" width="370px" header-align="center" align="left">
              <template slot-scope="scope">
                <span>{{ scope.row.remarks }}</span>
              </template>
--- a/anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheTodo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/chukushenheTodo.vue
@ -9,19 +9,13 @@
            type="primary"
            size="small"
            :disabled="createBtn"
-            @click="handleAgree()"
-            >同意</el-button
-          >
+            @click="handleAgree()">同意</el-button>
          <el-button
            type="primary"
            size="small"
            :disabled="disabled"
-            @click="handleDisagree()"
-            >不同意</el-button
-          >
-          <el-button type="info" size="small" @click="handleReturn()"
-            >返回</el-button
-          >
+            @click="handleDisagree()">不同意</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
        </div>
      </div>
      <div class="listconadd">
@ -31,8 +25,7 @@
          label-position="right"
          label-width="100%"
          class="formadd"
-          :rules="rules"
-        >
+          :rules="rules">
          <div class="tit">
            出库申请
            <div class="times">
@ -56,8 +49,7 @@
            </el-col>
            <el-col :span="4">
              <el-form-item
-                ><span slot="label">是否为终端客户：</span></el-form-item
-              >
+                ><span slot="label">是否为终端客户：</span></el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item>
--- a/anrui-scm/anrui-scm-ui/src/views/redirect/index.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/redirect/index.vue
@ -0,0 +1,12 @@
+<script>
+export default {
+  created() {
+    const { params, query } = this.$route
+    const { path } = params
+    this.$router.replace({ path: '/' + path, query })
+  },
+  render: function(h) {
+    return h() // avoid warning message
+  }
+}
+</script>
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue
@ -61,9 +61,12 @@
            <el-table-column width="160px" prop="" label="目标存放地点" align="center"/>
            <el-table-column width="130px" prop="" label="经办人" align="center"/>
            <el-table-column width="160px" prop="" label="申请费用" align="center"/>
-            <el-table-column width="160px" prop="" label="现场照片" align="center">
+            <el-table-column width="180px" prop="" label="现场照片" align="center">
              <template slot-scope="{row}">
-                <el-button size="mini" type="primary" @click="handleUpload(row)">上传</el-button>
+                <div class="upload_img">
+                  <upload ref="uploadMoreImg" v-model="imgList" :limit="1" bucket="map" @eett="getList" :upload-data="{type:'0001',modelSid: row.sid}"></upload>
+                </div>
+<!--                <el-button size="mini" type="primary" @click="handleUpload(row)">上传</el-button>-->
                <el-button size="mini" type="primary" @click="handleCheckImg(row)">查看</el-button>
              </template>
            </el-table-column>
@ -84,6 +87,10 @@
        </div>
      </div>
    </div>
+    <!-- 照片弹窗 -->
+    <el-dialog title="查看" :visible.sync="dialogImgVisible">
+      <el-image v-for="item in srcList" style="width: 100px; height: 100px" :src="item" :preview-src-list="srcList"/>
+    </el-dialog>
    <cunfangdidianbiangeng-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getList"/>
    <cunfangdidianbiangeng-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
  </div>
@ -97,6 +104,7 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import cunfangdidianbiangengAdd from '@/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd'
 import cunfangdidianbiangengInfo from '@/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo'
+import upload from '../../../components/uploadFile/upload_chexing'

 export default {
  name: 'cunfangdidianbiangeng',
@ -105,7 +113,8 @@ export default {
    Pagination,
    pageye,
    cunfangdidianbiangengAdd,
-    cunfangdidianbiangengInfo
+    cunfangdidianbiangengInfo,
+    upload

  },
  data() {
@ -114,6 +123,9 @@ export default {
      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
      isSearchShow: false,
      tableLoading: false,
+      dialogImgVisible: false,
+      srcList: [],
+      imgList:[],
      multipleSelection:[],
      sids:[],
      dataList: [],
@ -300,8 +312,9 @@ export default {
    handleUpload(){

    },
-    handleCheckImg(){
-
+    handleCheckImg(row){
+      this.dialogImgVisible = true
+      // this.srcList = row.vehicleModelUrls
    },
    // 车型名称下拉框
    getModelName() {
@ -358,4 +371,8 @@ export default {
 .tab-header /deep/ .el-form-item {
  margin-bottom: 10px;
 }
+.upload_img {
+  display: inline-block;
+  padding-right: 10px;
+}
 </style>
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue
@ -9,7 +9,7 @@
    </div>
    <div class="listconadd">
      <div class="title">车辆存放地点变更申请</div>
-      <el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
+      <el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
        <div class="tit">
          <div class="times">
            <div>
@ -77,8 +77,10 @@
            <span>保险状态</span>
          </el-col>
          <el-col :span="9">
-            <el-radio v-model="temp.isTerminal" :label="0">否</el-radio>
-            <el-radio v-model="temp.isTerminal" :label="1">是</el-radio>
+            <el-form-item>
+              <el-radio v-model="temp.isTerminal" :label="0">否</el-radio>
+              <el-radio v-model="temp.isTerminal" :label="1">是</el-radio>
+            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
--- a/anrui-system-ui/src/layout/components/TagsView/index.vue
+++ b/anrui-system-ui/src/layout/components/TagsView/index.vue
@ -140,8 +140,7 @@ export default {
        const { fullPath } = view
        this.$nextTick(() => {
          this.$router.replace({
-            path: fullPath
-            // path: '/redirect' + fullPath
+            path: '/redirect' + fullPath
          })
        })
      })
--- a/anrui-system-ui/src/router/index.js
+++ b/anrui-system-ui/src/router/index.js
@ -1,14 +1,23 @@
 import Vue from 'vue'
 import Router from 'vue-router'
+/* Layout */
+import Layout from '@/layout'

 Vue.use(Router)


-/* Layout */
-import Layout from '@/layout'
 /* 所有角色可以访问/没有权限要求的基页 */

 export const constantRoutes = [
+  {
+    path: '/redirect',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/redirect/:path(.*)',
+      component: () => import('@/views/redirect/index.vue')
+    }]
+  },
  {
    path: '/',
    redirect: 'login'
--- a/anrui-system-ui/src/views/redirect/index.vue
+++ b/anrui-system-ui/src/views/redirect/index.vue
@ -0,0 +1,12 @@
+<script>
+export default {
+  created() {
+    const { params, query } = this.$route
+    const { path } = params
+    this.$router.replace({ path: '/' + path, query })
+  },
+  render: function(h) {
+    return h() // avoid warning message
+  }
+}
+</script>