前:附件上传路径;目录审批

src/dashoo.cn/frontend_web/nuxt.config.prod.js

@@ -178,7 +178,7 @@ module.exports = {
     /* --------Nuxt Start发版用 START-------------- */
 
     appclient:  'gfgl',                            //供方信息管理平台
-    upfilehost: 'http://10.76.248.23/uploadfile',                     //附件上传
+    upfilehost: '/uploadfile',                     //附件上传
     baseURL:    '/api/',                           //本地工作流图片
     LOCAL_IP:   '10.76.248.23'                     //定义服务器内网IP,word转PDF时用到
     // API_URL:    'http://10.76.248.23:10091/api/'   //服务器渲染时调用

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalog/index.vue

@@ -41,6 +41,7 @@
             <router-link :to="'/oilsupplier/oilcatalogsub/add/incomeedit'">
               <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="formData.CatalogType == '7'">申请</el-button>
             </router-link>
+            &nbsp;
             <el-button type="primary" size="mini" @click="addOilcatalog" v-if="showBtn">添加</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="exportExcel">导出</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="importExcel" v-if="showBtn">导入</el-button>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogsub/_opera/incomeedit.vue

@@ -16,7 +16,7 @@
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="approvalEntity" v-if="auditBtn && formData.Status == 2">复审</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="approvalEntity" v-if="auditBtn && formData.Status == 5">审批</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="auhistory">审批流程</el-button>
-            <router-link :to="'/oilsupplier/oilcatalogsub'">
+            <router-link :to="'/oilsupplier/oilcatalog?catalogType=7'">
             <el-button type="warning" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="isEdit && formData.Status <= 0">返回</el-button>
           </router-link>
           </span>