Explorar el Código

调整下载链接

look hace 3 años
padre
commit
b77639fcfe

+ 2 - 3
src/components/orderDetail/orderDetail.vue

@@ -3,9 +3,8 @@
     <el-card class="box">
         <span class="box-header-title">
           基本信息(<el-link type="primary">{{ form.orderCode }}</el-link>)
-          <el-link target="_blank" :href="form.originFileLink">{{ form.fileDescription }}</el-link>
-          <el-button size="mini" @click="handleOrderPDFFiles(form.id)">下载pdf</el-button>
-          <el-link target="_blank" :href="form.webProofFileLink">下载样稿文件</el-link>
+          <el-link v-show="form.printFileUrlLink != null" target="_blank" :href="form.printFileUrlLink">下载原图文件</el-link>
+          <el-link v-show="form.attachFileUrlLink != null" target="_blank" :href="form.attachFileUrlLink">下载附件文件</el-link>
         </span>
         <i class="box-header-icon el-icon-caret-top" @click="unfold($event,'basicInfo',2)"></i>
 

+ 3 - 5
src/router/index.js

@@ -327,10 +327,10 @@ export const routerMap = {
   // 发货管理
   toStockOrderList: {component: () => import('@/views/delivery/ToStockOrderList.vue'), hidden: false}, // 包数录入
   stockItemList: {component: () => import('@/views/delivery/StockItemList.vue'), hidden: false}, // 成品入库
-
   toTransferItemList: {component: () => import('@/views/delivery/ToTransferItemList.vue'), hidden: false}, // 手动发货
   deliverFeedback: {component: () => import('@/views/delivery/DeliverFeedback.vue'), hidden: false}, // 发货反馈
   sendBillList: {component: () => import('@/views/delivery/SendBillList.vue'), hidden: false}, // 发货单查询
+
   // 应收管理
   orderCollection: {component: () => import('@/views/orderCharge/orderCollection'), hidden: false}, // 订单收款
   collectionRecords: {component: () => import('@/views/orderCharge/collectionRecords'), hidden: false}, // 收款记录
@@ -377,8 +377,6 @@ export const routerMap = {
   DispatchOrder: {component: () => import('@/views/specialEdition/dispatchOrder'), hidden: false}, // 订单分配
   FileHandle: {component: () => import('@/views/specialEdition/fileHandle'), hidden: false}, // 订单文件处理
   ProcessStatistics: {component: () => import('@/views/specialEdition/processStatistics'), hidden: false}, // 专版处理汇总
-  reportinfo: {component: () => import('@/views/specialEdition/reportinfo'), hidden: false}, // 日报表列表
-  reportinfoPersonal: {component: () => import('@/views/specialEdition/reportinfoPersonal'), hidden: false}, // 个人日报表列表
 
   // 开票管理
   invoiceOrderList: {component: () => import('@/views/invoice/invoiceOrderList'), hidden: false}, // 开票申请
@@ -389,7 +387,6 @@ export const routerMap = {
   machineBurdenInfos: {component: () => import('@/views/doc/inquire/MachineBurdenInfos.vue'), hidden: false}, // 机台负荷
   sendWarning: {component: () => import('@/views/invoice/sendWarning.vue'), hidden: false}, // 发货预警
   chartSummary: {component: () => import('@/views/dashboard/indexVital.vue'), hidden: false}, // 产值图表汇总
-  orderStatistical: {component: () => import('@/views/order/orderStatistical_SendKind.vue'), hidden: false}, // 订单按照发货方式统计
 
   // 专版拼版任务
   ExclusiveSpliceDispatch: {component: () => import('@/views/exclusiveSplice/dispatchOrder.vue'), hidden: false}, // 获取待分配的拼版任务
@@ -402,7 +399,8 @@ const createRouter = () => new Router({
   routes: constantRoutes
 })
 
-const router = createRouter();
+const router = createRouter()
+
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
 export function resetRouter() {
   const newRouter = createRouter()

+ 2 - 5
src/views/order/orderList/orderList.vue

@@ -378,13 +378,10 @@ const defaultItems = [
     name: '制单时间', id: 14, field: 'createTime', width: '160'
   },
   {
-    name: '原图文件', id: 16, field: 'fileDescription', width: '100px'
+    name: '原图文件', id: 16, field: 'printFileName', width: '100px'
   },
   {
-    name: '附件', id: 17, field: 'attachFile', width: '190px'
-  },
-  {
-    name: '制单人', id: 18, field: 'createMan', width: '75'
+    name: '附件', id: 17, field: 'attachFileName', width: '190px'
   }
 ]
 

+ 2 - 2
src/views/user/index.vue

@@ -65,7 +65,7 @@
 <script>
 import { validUsername } from '@/utils/validate'
 import Bg2 from '@/assets/background.svg'
-// import LogoImg from '@/assets/logo.png'
+import LogoImg from '@/assets/logo.png'
 
 export default {
   name: 'Login',
@@ -86,7 +86,7 @@ export default {
     }
     return {
       bg2: Bg2,
-      // logoImg: LogoImg,
+      logoImg: LogoImg,
       loginForm: {
         loginName: '',
         password: ''