bug修改

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -762,7 +762,13 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
       fileurlcut (val, index) {
         let fileurlall = val.split('$')[index]
         let fileurl = fileurlall.split('|')
-        return fileurl[0]
+        let retUrl = fileurl[0]
+        // 内网服务器专用
+        if (process.client && retUrl.indexOf('/upfile') === 0) {
+          const myDomain = window.location.host
+          retUrl = myDomain + '/' + retUrl
+        }
+        return retUrl
       },
 
       // 列表排序功能

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -774,7 +774,13 @@
       fileurlcut (val, index) {
         let fileurlall = val.split('$')[index]
         let fileurl = fileurlall.split('|')
-        return fileurl[0]
+        let retUrl = fileurl[0]
+        // 内网服务器专用
+        if (process.client && retUrl.indexOf('/upfile') === 0) {
+          const myDomain = window.location.host
+          retUrl = myDomain + '/' + retUrl
+        }
+        return retUrl
       },
 
       // 列表排序功能

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -782,7 +782,13 @@
       fileurlcut (val, index) {
         let fileurlall = val.split('$')[index]
         let fileurl = fileurlall.split('|')
-        return fileurl[0]
+        let retUrl = fileurl[0]
+        // 内网服务器专用
+        if (process.client && retUrl.indexOf('/upfile') === 0) {
+          const myDomain = window.location.host
+          retUrl = myDomain + '/' + retUrl
+        }
+        return retUrl
       },
 
       // 列表排序功能

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/_opera/basisedit.vue

@@ -182,7 +182,8 @@
                 </el-button>
               </span> -->
             </div>
-            <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+            <wf-multi-history ref="WfHistory"
+                              :entryinfo="entrydetail"></wf-multi-history>
           </el-card>
         </el-tab-pane>
 
@@ -191,7 +192,8 @@
             <div slot="header" class="clearfix">
               <span>审批历史</span>
             </div>
-            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+            <wf-multi-history ref="WfHistory"
+                              :entryinfo="entrydetail"></wf-multi-history>
           </el-card>
         </el-tab-pane>
 
@@ -249,6 +251,7 @@
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfhistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
+  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
@@ -264,6 +267,7 @@
   export default {
 
     components: {
+      WfMultiHistory,
       SupplierFileTable,
       WfHistory,
       WfBackHistory,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/_opera/goodsedit.vue

@@ -173,7 +173,8 @@
             <div slot="header" class="clearfix">
               <span>审批流程</span>
             </div>
-            <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+            <wf-multi-history ref="WfHistory"
+                              :entryinfo="entrydetail"></wf-multi-history>
           </el-card>
         </el-tab-pane>
 
@@ -182,7 +183,8 @@
             <div slot="header" class="clearfix">
               <span>审批历史</span>
             </div>
-            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+            <wf-multi-history ref="WfHistory"
+                              :entryinfo="entrydetail"></wf-multi-history>
           </el-card>
         </el-tab-pane>
 
@@ -205,6 +207,7 @@
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfhistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
+  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
@@ -222,6 +225,7 @@
     components: {
       chooseAuditorVisible: false,
       SupplierFileTable,
+      WfMultiHistory,
       WfHistory,
       WfBackHistory,
       SupplierCertEdit,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/suppliernopass/_opera/techedit.vue

@@ -187,7 +187,8 @@
                 </el-button>
               </span> -->
             </div>
-            <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+            <wf-multi-history ref="WfHistory"
+                              :entryinfo="entrydetail"></wf-multi-history>
           </el-card>
         </el-tab-pane>
         <el-tab-pane name="6" label="审批历史">
@@ -195,7 +196,8 @@
             <div slot="header" class="clearfix">
               <span>审批历史</span>
             </div>
-            <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+            <wf-multi-history ref="WfHistory"
+                              :entryinfo="entrydetail"></wf-multi-history>
           </el-card>
         </el-tab-pane>
         <el-tab-pane name="7" label="供方交费" v-if="formDataCert.Status == 5">
@@ -253,6 +255,7 @@
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 
@@ -269,6 +272,7 @@
   export default {
 
     components: {
+      WfMultiHistory,
       SupplierFileTable,
       WfHistory,
       WfBackHistory,

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

@@ -44,10 +44,9 @@
       <el-table :data="entityList" id="rebateSetTable" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="150" align="center" fixed="right">
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/suppliernopass/' + scope.row.Id + '/goodsedit?certid=' + scope.row.CertId">
+            <router-link :to="'/oilsupplier/suppliernopass/' + scope.row.Id + '/'+changeFlag(scope.row.SupplierTypeName)+'?certid=' + scope.row.CertId">
               <el-button type="primary" plain title="编辑" size="mini">打开</el-button>
             </router-link>
-
             <el-popover placement="top" title="提示">
               <el-alert
                 title=""
@@ -77,7 +76,7 @@
       </el-pagination>
     </el-card>
 
-    
+
         <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
           <el-form ref="advancedsearchForm" label-width="130px">
         <el-row>
@@ -1101,6 +1100,15 @@
   },
 
     methods: {
+      changeFlag (val) {
+        if (val === '物资类') {
+          return 'goodsedit'
+        } else if (val === '基建类') {
+          return 'basisedit'
+        } else {
+          return 'techedit'
+        }
+      },
       initDatas () {
         // 分页及列表条件
         let params = {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/basisedit.vue

@@ -261,7 +261,7 @@
   import api from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
-  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/goodsedit.vue

@@ -262,7 +262,7 @@
   import api from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
-  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstorage/_opera/techedit.vue

@@ -269,7 +269,7 @@
   import api from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
-  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/basisedit.vue

@@ -307,7 +307,7 @@
   import api from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
-  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/goodsedit.vue

@@ -284,7 +284,7 @@
   import api from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
-  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/_opera/techedit.vue

@@ -315,7 +315,7 @@
   import api from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
-  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 

src/dashoo.cn/frontend_web/src/pages/select/components/subfilelist.vue

@@ -188,12 +188,12 @@
       },
       handleCurrentChange (value) {
         this.currentPage = value
-        this.getbusList()
+        this.initData()
       },
       handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
-        this.getbusList()
+        this.initData()
       }
     }
   }