Merge branch 'ol_12_30' into wxl_01_15

debug.log

@@ -0,0 +1,2 @@
+[0118/174310.352:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[0119/094348.688:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

src/views/businessManager/orderManager/financeManager.vue

@@ -207,13 +207,13 @@
           :data="tableList"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         >
-          <!-- <el-table-column align="center" prop="transNo" label="所属分部">
+          <el-table-column align="center" prop="transNo" label="所属分部">
             <template slot-scope="scope">
               <div>
                 <copy-text>{{ scope.row.routeOrganName }}</copy-text>
               </div>
             </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column align="center" prop="transNo" label="交易流水号">
             <template slot-scope="scope">
               <div>

src/views/businessManager/orderManager/income.vue

@@ -186,7 +186,7 @@
           :data="tableList"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         >
-               <!-- <el-table-column
+               <el-table-column
             align="center"
             prop="transNo"
             label="所属分部"
@@ -196,7 +196,7 @@
                 <copy-text>{{ scope.row.organName }}</copy-text>
               </div>
             </template>
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column
             align="center"
             width="180px"