更新

src/views/businessManager/orderManager/financeManager.vue

@@ -32,7 +32,7 @@
       <ExportChiose
         v-permission="{
           child: 'export/routeOrderList',
-          parent: '/financeManager',
+          parent: '/financeManager'
         }"
         style="margin-bottom: 20px; display: inline-block"
         name="报表导出"
@@ -64,15 +64,18 @@
       />
 
       <ExportChiose
-          v-permission="{ child: 'export/MALL_ROUTE_ORDER_LIST', parent: '/financeManager' }"
-          style="margin-bottom: 20px;display: inline-block "
-          name="商城财务导出"
-          ExportEnum="MALL_ROUTE_ORDER_LIST"
-          :exportData="onOrderExport"
-          fileName="商城财务导出"
-          errorMsg="请选择月份"
-          :isDownList="true"
-        />
+        v-permission="{
+          child: 'export/MALL_ROUTE_ORDER_LIST',
+          parent: '/financeManager'
+        }"
+        style="margin-bottom: 20px;display: inline-block "
+        name="商城财务导出"
+        ExportEnum="MALL_ROUTE_ORDER_LIST"
+        :exportData="onOrderExport"
+        fileName="商城财务导出"
+        errorMsg="请选择月份"
+        :isDownList="true"
+      />
 
       <el-button
         @click="onDownload"
@@ -80,12 +83,12 @@
         type="primary"
         style="margin-bottom: 20px"
       >
-        下载模板
+        下载财务模板
       </el-button>
 
       <el-upload
         v-permission="'import/routeOrder'"
-        style="display: inline-block; margin-left: 10px"
+        style="display: inline-block;"
         action="/api-web/import/routeOrder"
         :show-file-list="false"
         :before-upload="beforeUpload"
@@ -94,7 +97,32 @@
         :on-error="handleError"
         :on-success="handleSuccess"
       >
-        <el-button type="primary" style="margin-bottom: 20px"> 导入 </el-button>
+        <el-button type="primary" style="margin-bottom: 20px">
+          账务导入
+        </el-button>
+      </el-upload>
+
+      <el-button
+        @click="onDownloadOut"
+        type="primary"
+        style="margin-bottom: 20px"
+        >下载外部订单模板</el-button
+      >
+
+      <el-upload
+        v-permission="'import/importMusicGroupPayment'"
+        style="display: inline-block;"
+        action="/api-web/import/importMusicGroupPayment"
+        :show-file-list="false"
+        :before-upload="beforeUpload"
+        accept=".xlsx,.xls"
+        :headers="headers"
+        :on-error="handleError"
+        :on-success="handleSuccess"
+      >
+        <el-button type="primary" style="margin-bottom: 20px"
+          >外部订单导入</el-button
+        >
       </el-upload>
       <!-- 搜索类型 -->
       <save-form
@@ -198,7 +226,7 @@
             value-format="yyyy-MM-dd"
             @change="searchOrderDate"
             :picker-options="{
-              firstDayOfWeek: 1,
+              firstDayOfWeek: 1
             }"
             range-separator="至"
             start-placeholder="订单开始日期"
@@ -399,7 +427,7 @@
               <div
                 v-if="
                   scope.row.groupType == 'OUTORDER' &&
-                  $helpers.permission('routeOrder/getOrderInfo')
+                    $helpers.permission('routeOrder/getOrderInfo')
                 "
               >
                 <el-button type="text" @click="lookOrderInfo(scope.row)"
@@ -435,7 +463,7 @@
             label="所属分部"
             prop="routeOrganId"
             :rules="[
-              { required: true, message: '请选择分部', trigger: 'change' },
+              { required: true, message: '请选择分部', trigger: 'change' }
             ]"
             :label-width="formLabelWidth"
           >
@@ -494,8 +522,8 @@
               {
                 pattern: /^[0-9]*$/,
                 message: '请输入正确的缴费单号',
-                trigger: 'blur',
-              },
+                trigger: 'blur'
+              }
             ]"
           >
             <!-- <el-input
@@ -607,7 +635,7 @@
                 class="setWidth"
                 :prop="'goodsList.' + index + '.id'"
                 :rules="[
-                  { required: true, message: '请选择商品', trigger: 'change' },
+                  { required: true, message: '请选择商品', trigger: 'change' }
                 ]"
               >
                 <el-select
@@ -731,7 +759,7 @@ import {
   routeOrderAdd,
   getOrderInfo,
   orderDelete,
-  getCalenders,
+  getCalenders
 } from "@/api/orderManager";
 import { goodsQuery } from "@/api/businessManager";
 import { getEmployeeOrgan, getAddress, getCooperation } from "@/api/buildTeam";
@@ -768,7 +796,7 @@ export default {
         data.noneTqType = "1";
       }
       return data;
-    },
+    }
   },
   data() {
     return {
@@ -789,7 +817,7 @@ export default {
         merNos: null,
         lessBalancePaymentAmount: null,
         lessActualAmount: null,
-        orderDate: [],
+        orderDate: []
       },
       tableList: [],
       organList: [],
@@ -801,7 +829,7 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50], // 选择限制显示条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       totalUserBalance: 0,
       totalActualAmount: 0,
@@ -825,43 +853,43 @@ export default {
         goodsList: [
           {
             id: null,
-            number: null,
-          },
+            number: null
+          }
         ],
         applyType: null,
         userId: "",
-        calenderId: "",
+        calenderId: ""
       },
       validAmount: [
         { required: true, validator: validAmount, trigger: "blur" },
-        { type: "number", message: "商品数量必须为数字" },
+        { type: "number", message: "商品数量必须为数字" }
       ],
       rules: {
         organId: [
-          { required: true, message: "请选择所属分部", trigger: "change" },
+          { required: true, message: "请选择所属分部", trigger: "change" }
         ],
         // schoolId: [
         //   { required: true, message: "请选择学校", trigger: "change" }
         // ],
         actualAmount: [
-          { required: true, message: "请输入金额", trigger: "blur" },
+          { required: true, message: "请输入金额", trigger: "blur" }
         ],
         transNo: [
-          { required: true, message: "请输入交易流水号", trigger: "blur" },
+          { required: true, message: "请输入交易流水号", trigger: "blur" }
         ],
         merNo: [{ required: true, message: "请输入收款账户", trigger: "blur" }],
         payTime: [
-          { required: true, message: "选择交易日期", trigger: "change" },
+          { required: true, message: "选择交易日期", trigger: "change" }
         ],
         applyType: [
-          { required: true, message: "请选择收入类型", trigger: "change" },
-        ],
+          { required: true, message: "请选择收入类型", trigger: "change" }
+        ]
       },
       headers: {
         Authorization: getToken(),
-        tenantId: getTenantId(),
+        tenantId: getTenantId()
       },
-      getCalenderList: [],
+      getCalenderList: []
     };
   },
   created() {
@@ -907,7 +935,7 @@ export default {
     },
     onOrderSubmit(formName) {
       // 添加订单
-      this.$refs[formName].validate((valid) => {
+      this.$refs[formName].validate(valid => {
         if (valid) {
           let form = JSON.parse(JSON.stringify(this.form));
           if (!form.saleAmount && !form.serviceAmount) {
@@ -923,16 +951,16 @@ export default {
           }
           form.goodsJson =
             form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
-                 if (this.insertOrderType == 1) {
+          if (this.insertOrderType == 1) {
             form.calenderId = null;
-            form.type='PERSONAL'
+            form.type = "PERSONAL";
           } else if (this.insertOrderType == 2) {
             form.userId = null;
-                form.type='SCHOOL'
-          }else{
-                form.type='OTHER'
+            form.type = "SCHOOL";
+          } else {
+            form.type = "OTHER";
           }
-          routeOrderAdd(form).then((res) => {
+          routeOrderAdd(form).then(res => {
             if (res.code == 200) {
               this.$message.success("添加成功");
               this.routeOrderStatus = false;
@@ -1104,7 +1132,7 @@ export default {
       // let params = JSON.parse(JSON.stringify(this.searchForm));
       let params = Object.assign(
         {
-          ...this.extraQuery,
+          ...this.extraQuery
         },
         this.searchForm
       );
@@ -1127,7 +1155,7 @@ export default {
         params.orderEndDate = null;
       }
       params.orderDate = null;
-      routeOrderFinance(cleanDeep(params)).then((res) => {
+      routeOrderFinance(cleanDeep(params)).then(res => {
         let result = res.data;
         if (res.code == 200) {
           this.tableList = result.rows;
@@ -1173,7 +1201,7 @@ export default {
         merNos: null,
         lessBalancePaymentAmount: null,
         lessActualAmount: null,
-        orderDate: [],
+        orderDate: []
       };
       this.getNow();
       this.getList();
@@ -1187,14 +1215,14 @@ export default {
     addGoodsList() {
       this.form.goodsList.push({
         id: null,
-        number: null,
+        number: null
       });
     },
     changeOrgin(val) {
       this.$set(this.form, "schoolId", null);
       this.form.calenderId = null;
       if (val) {
-        getCooperation({ rows: 9999, organId: val }).then((res) => {
+        getCooperation({ rows: 9999, organId: val }).then(res => {
           if (res.code === 200) {
             this.cooperationList = res.data.rows;
           }
@@ -1202,10 +1230,10 @@ export default {
         this.form.goodsList = [
           {
             id: null,
-            number: null,
-          },
+            number: null
+          }
         ];
-        goodsQuery({ rows: 99999, noOrganSearch: 1 }).then((res) => {
+        goodsQuery({ rows: 99999, noOrganSearch: 1 }).then(res => {
           if (res.code === 200) {
             this.shopList = res.data.rows;
           }
@@ -1234,9 +1262,9 @@ export default {
     async lookOrderInfo(row) {
       //orderNo
       this.isAdd = false;
-      await getOrderInfo({ orderId: row.id }).then((res) => {
+      await getOrderInfo({ orderId: row.id }).then(res => {
         if (res.code === 200) {
-          this.$nextTick((some) => {
+          this.$nextTick(some => {
             let orderInfo = res.data.studentPaymentOrder;
             this.changeOrgin(parseInt(orderInfo.organId));
             (this.form = {
@@ -1252,12 +1280,12 @@ export default {
               saleAmount: res.data.goodsAmount,
               schoolId: parseInt(orderInfo.musicGroupId) || "    ",
               applyType: "SELL",
-              calenderId: res.data.calenderId ? res.data.calenderId : "",
+              calenderId: res.data.calenderId ? res.data.calenderId : ""
             }),
               this.$set(
                 this.form,
                 "goodsList",
-                res.data.sellOrders.map((item) => {
+                res.data.sellOrders.map(item => {
                   return { id: item.goodsId, number: item.num };
                 })
               );
@@ -1274,13 +1302,13 @@ export default {
             // SCHOOL("SCHOOL", "学校订单"),
             // PERSONAL("PERSONAL", "个人订单"),
             // OTHER("OTHER", "其他")
-            if(row.type !== 'OUTORDER'){
-              if(row.type === 'OTHER') {
-                this.insertOrderType = 3
-              } else if(row.type === 'SCHOOL') {
-                this.insertOrderType = 2
-              } else if(row.type === 'PERSONAL') {
-                this.insertOrderType = 1
+            if (row.type !== "OUTORDER") {
+              if (row.type === "OTHER") {
+                this.insertOrderType = 3;
+              } else if (row.type === "SCHOOL") {
+                this.insertOrderType = 2;
+              } else if (row.type === "PERSONAL") {
+                this.insertOrderType = 1;
               }
             }
 
@@ -1301,10 +1329,10 @@ export default {
       this.$confirm("确定删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(() => {
-          orderDelete({ orderId: row.id }).then((res) => {
+          orderDelete({ orderId: row.id }).then(res => {
             if (res.code === 200) {
               this.$message.success("删除成功");
               this.getList();
@@ -1315,15 +1343,19 @@ export default {
         .catch();
       // orderDelete
     },
+    onDownloadOut() {
+      window.location.href =
+        "https://daya-docs.ks3-cn-beijing.ksyuncs.com/%E7%BC%B4%E8%B4%B9%E9%A1%B9%E7%9B%AE%E5%A4%96%E9%83%A8%E8%AE%A2%E5%8D%95%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx";
+    },
     onDownload() {
       // 下载模板
       // // 报表导出
       Export(this, {
         url: "/api-web/import/downloadTemplate",
         params: {
-          templateType: "ROUTE_ORDER",
+          templateType: "ROUTE_ORDER"
         },
-        fileName: "财务管理导入模板.xls",
+        fileName: "财务管理导入模板.xls"
       });
     },
     beforeUpload(file) {
@@ -1349,9 +1381,9 @@ export default {
         this.$alert(str, "导入结果", {
           confirmButtonText: "确定",
           dangerouslyUseHTMLString: true,
-          callback: (action) => {
+          callback: action => {
             // this.getList()
-          },
+          }
         });
       } else {
         this.$message.error(response.msg);
@@ -1363,7 +1395,7 @@ export default {
     fomatStr(str) {
       let arr = str.split(";");
       let newStr = "";
-      arr.forEach((item) => {
+      arr.forEach(item => {
         newStr += `<p>${item}</p>`;
       });
       return newStr;
@@ -1373,13 +1405,13 @@ export default {
         this.form.goodsList = [
           {
             id: null,
-            number: null,
-          },
+            number: null
+          }
         ];
       }
       this.form.serviceAmount = null;
       this.form.saleAmount = null;
-    },
+    }
   },
   watch: {
     routeOrderStatus(val) {
@@ -1398,26 +1430,26 @@ export default {
           goodsList: [
             {
               id: null,
-              number: null,
-            },
+              number: null
+            }
           ],
           applyType: null,
           userId: "",
-          calenderId: null,
+          calenderId: null
         };
       }
-    },
+    }
   },
   filters: {
     filterShopId(val) {
       let str = "";
-      that.shopList.forEach((shop) => {
+      that.shopList.forEach(shop => {
         if (shop.id == val) {
           str = shop.name;
         }
       });
       return str;
-    },
+    }
   },
   computed: {
     onOrderExport() {
@@ -1438,7 +1470,7 @@ export default {
         routingOrganId: searchForm.routingOrganId,
         lessBalancePaymentAmount: searchForm.lessBalancePaymentAmount,
         lessActualAmount: searchForm.lessActualAmount,
-        ...this.extraQuery,
+        ...this.extraQuery
       };
       data.routingOrganId = this.searchForm.routingOrganId.join(",");
 
@@ -1455,7 +1487,7 @@ export default {
       // 报表导出
       let url = "/api-web/adapay/exportBill";
       let data = {
-        ...this.extraQuery,
+        ...this.extraQuery
       };
       data.routingOrganId = this.searchForm.routingOrganId.join(",");
       if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
@@ -1463,8 +1495,8 @@ export default {
         data.endTime = this.searchForm.orderDate[1];
       }
       return data;
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>