1

1

src/views/businessManager/orderManager/financeManager.vue

@@ -207,6 +207,13 @@
           :data="tableList"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         >
+          <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 align="center" prop="transNo" label="交易流水号">
             <template slot-scope="scope">
               <div>
@@ -284,8 +291,9 @@
               <div>
                 <!-- v-if="scope.row.type !== 'OUTORDER'" -->
                 <div>
-
-                  <p><copy-text> {{ scope.row.user.username }}</copy-text></p>
+                  <p>
+                    <copy-text> {{ scope.row.user.username }}</copy-text>
+                  </p>
                   <copy-text>{{ scope.row.user.phone }}</copy-text>
                 </div>
               </div>
@@ -480,7 +488,11 @@
             </el-select>
           </el-form-item>
           <div v-if="form.applyType == 'SELL'">
-            <div v-for="(goodsList, index) in form.goodsList" :key="index"  class="shopListWrap">
+            <div
+              v-for="(goodsList, index) in form.goodsList"
+              :key="index"
+              class="shopListWrap"
+            >
               <el-form-item
                 :label="'商品名称' + (index + 1)"
                 :label-width="formLabelWidth"
@@ -491,7 +503,7 @@
                 ]"
               >
                 <el-select
-                 v-if="isAdd"
+                  v-if="isAdd"
                   v-model.trim="goodsList.id"
                   filterable
                   :disabled="!isAdd"
@@ -505,13 +517,13 @@
                     :value="item.id"
                   ></el-option>
                 </el-select>
-                  <p class="showShop" v-else>
-              <Tooltip :content="goodsList.id | filterShopId" />
-            </p>
+                <p class="showShop" v-else>
+                  <Tooltip :content="goodsList.id | filterShopId" />
+                </p>
               </el-form-item>
               <el-form-item
                 class="setWidth"
-                style="margin:0 10px"
+                style="margin: 0 10px"
                 :prop="'goodsList.' + index + '.number'"
                 :rules="validAmount"
               >
@@ -531,16 +543,15 @@
                 :disabled="!isAdd"
                 v-if="form.goodsList.length > 1"
                 circle
-                 style="height:40px;"
+                style="height: 40px"
                 @click.prevent="removeGoodsList(goodsList)"
               ></el-button>
               <el-button
                 icon="el-icon-plus"
-
                 :disabled="!isAdd"
                 @click.prevent="addGoodsList"
                 circle
-                style="margin-left: 5px; height:40px;"
+                style="margin-left: 5px; height: 40px"
               ></el-button>
             </div>
           </div>
@@ -632,16 +643,16 @@ let validAmount = (rule, value, callback) => {
 };
 let that;
 export default {
-  components: { pagination,Tooltip },
+  components: { pagination, Tooltip },
   name: "incomeTwo",
   computed: {
     extraQuery() {
-      const data = {}
-      if (this.$route.path === '/orderList/financeManager') {
-        data.noneTqType = '1'
+      const data = {};
+      if (this.$route.path === "/orderList/financeManager") {
+        data.noneTqType = "1";
       }
-      return data
-    }
+      return data;
+    },
   },
   data() {
     return {
@@ -734,8 +745,8 @@ export default {
       },
     };
   },
-  created(){
-    that = this
+  created() {
+    that = this;
   },
   mounted() {
     // getEmployeeOrgan().then((res) => {
@@ -846,7 +857,7 @@ export default {
         organId: searchForm.organId,
         lessBalancePaymentAmount: searchForm.lessBalancePaymentAmount,
         lessActualAmount: searchForm.lessActualAmount,
-        ...this.extraQuery
+        ...this.extraQuery,
       };
 
       if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
@@ -891,7 +902,7 @@ export default {
               nowTime.getHours() +
               "" +
               nowTime.getMinutes();
-            let fname = "报表导出" + new Date().getTime()+'.xls'; //下载文件的名字
+            let fname = "报表导出" + new Date().getTime() + ".xls"; //下载文件的名字
             link.href = objectUrl;
             link.setAttribute("download", fname);
             document.body.appendChild(link);
@@ -905,7 +916,7 @@ export default {
       // 报表导出
       let url = "/api-web/adapay/exportBill";
       let data = {
-        ...this.extraQuery
+        ...this.extraQuery,
       };
       if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
         data.startTime = this.searchForm.orderDate[0];
@@ -938,7 +949,7 @@ export default {
             });
             let objectUrl = URL.createObjectURL(blob);
             let link = document.createElement("a");
-            let fname = "汇付订单" + new Date().getTime()+'.xls'; //下载文件的名字
+            let fname = "汇付订单" + new Date().getTime() + ".xls"; //下载文件的名字
             link.href = objectUrl;
             link.setAttribute("download", fname);
             document.body.appendChild(link);
@@ -956,9 +967,12 @@ export default {
     },
     getList() {
       // let params = JSON.parse(JSON.stringify(this.searchForm));
-      let params = Object.assign({
-        ...this.extraQuery
-      }, this.searchForm);
+      let params = Object.assign(
+        {
+          ...this.extraQuery,
+        },
+        this.searchForm
+      );
       // let params = {...this.searchForm}
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
@@ -1207,7 +1221,7 @@ export default {
       }
     },
   },
-    filters: {
+  filters: {
     filterShopId(val) {
       let str = "";
       that.shopList.forEach((shop) => {
@@ -1253,5 +1267,9 @@ export default {
   padding: 0 15px;
   margin-right: 10px;
 }
-.shopListWrap { display: flex; flex-direction: row; justify-content: flex-start;}
+.shopListWrap {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+}
 </style>