添加显示

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -32,7 +32,7 @@
       <ExportChiose
         v-permission="{
           child: 'export/routeOrderList',
-          parent: '/financeManager',
+          parent: '/financeManager'
         }"
         style="margin-bottom: 20px; display: inline-block"
         name="报表导出"
@@ -185,7 +185,7 @@
             value-format="yyyy-MM-dd"
             @change="searchOrderDate"
             :picker-options="{
-              firstDayOfWeek: 1,
+              firstDayOfWeek: 1
             }"
             range-separator="至"
             start-placeholder="订单开始日期"
@@ -386,7 +386,7 @@
               <div
                 v-if="
                   scope.row.groupType == 'OUTORDER' &&
-                  $helpers.permission('routeOrder/getOrderInfo/taoqi')
+                    $helpers.permission('routeOrder/getOrderInfo/taoqi')
                 "
               >
                 <el-button type="text" @click="lookOrderInfo(scope.row)"
@@ -422,7 +422,7 @@
             label="所属分部"
             prop="routeOrganId"
             :rules="[
-              { required: true, message: '请选择分部', trigger: 'change' },
+              { required: true, message: '请选择分部', trigger: 'change' }
             ]"
             :label-width="formLabelWidth"
           >
@@ -481,8 +481,8 @@
               {
                 pattern: /^[0-9]*$/,
                 message: '请输入正确的缴费单号',
-                trigger: 'blur',
-              },
+                trigger: 'blur'
+              }
             ]"
           >
             <!-- <el-input
@@ -594,7 +594,7 @@
                 class="setWidth"
                 :prop="'goodsList.' + index + '.id'"
                 :rules="[
-                  { required: true, message: '请选择商品', trigger: 'change' },
+                  { required: true, message: '请选择商品', trigger: 'change' }
                 ]"
               >
                 <el-select
@@ -611,10 +611,12 @@
                     :label="item.name"
                     :value="item.id"
                   >
-                    <span style="float: left">{{ item.name }}</span>
-                    <span
-                      style="float: right; color: #8492a6; font-size: 13px"
-                      >{{ item.id }}</span
+                    <span style="float: left"
+                      >{{ item.name
+                      }}<span v-if="item.sn">({{ item.sn }})</span></span
+                    >
+                    <span style="float: right; color: #8492a6; font-size: 13px"
+                      >{{ item.groupPurchasePrice || 0 }}元</span
                     >
                   </el-option>
                 </el-select>
@@ -718,7 +720,7 @@ import {
   routeOrderAdd,
   getOrderInfo,
   orderDelete,
-  getCalenders,
+  getCalenders
 } from "@/api/orderManager";
 import { goodsQuery } from "@/api/businessManager";
 import { getEmployeeOrgan, getAddress, getCooperation } from "@/api/buildTeam";
@@ -755,7 +757,7 @@ export default {
         data.noneTqType = "1";
       }
       return data;
-    },
+    }
   },
   data() {
     return {
@@ -776,7 +778,7 @@ export default {
         merNos: null,
         lessBalancePaymentAmount: null,
         lessActualAmount: null,
-        orderDate: [],
+        orderDate: []
       },
       tableList: [],
       organList: [],
@@ -788,7 +790,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,
@@ -812,43 +814,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() {
@@ -894,7 +896,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) {
@@ -912,14 +914,14 @@ export default {
             form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
           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;
@@ -1089,7 +1091,7 @@ export default {
       // let params = JSON.parse(JSON.stringify(this.searchForm));
       let params = Object.assign(
         {
-          ...this.extraQuery,
+          ...this.extraQuery
         },
         this.searchForm
       );
@@ -1112,7 +1114,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;
@@ -1158,7 +1160,7 @@ export default {
         merNos: null,
         lessBalancePaymentAmount: null,
         lessActualAmount: null,
-        orderDate: [],
+        orderDate: []
       };
       this.getNow();
       this.getList();
@@ -1172,13 +1174,13 @@ export default {
     addGoodsList() {
       this.form.goodsList.push({
         id: null,
-        number: null,
+        number: null
       });
     },
     changeOrgin(val) {
       this.$set(this.form, "schoolId", 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;
           }
@@ -1186,10 +1188,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;
           }
@@ -1219,9 +1221,9 @@ export default {
       //orderNo
       this.isAdd = false;
 
-      getOrderInfo({ orderId: row.id }).then((res) => {
+      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 = {
@@ -1237,12 +1239,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 };
                 })
               );
@@ -1258,13 +1260,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;
               }
             }
             this.routeOrderStatus = true;
@@ -1276,10 +1278,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();
@@ -1296,9 +1298,9 @@ export default {
       Export(this, {
         url: "/api-web/import/downloadTemplate",
         params: {
-          templateType: "ROUTE_ORDER",
+          templateType: "ROUTE_ORDER"
         },
-        fileName: "财务管理导入模板.xls",
+        fileName: "财务管理导入模板.xls"
       });
     },
     beforeUpload(file) {
@@ -1324,9 +1326,9 @@ export default {
         this.$alert(str, "导入结果", {
           confirmButtonText: "确定",
           dangerouslyUseHTMLString: true,
-          callback: (action) => {
+          callback: action => {
             // this.getList()
-          },
+          }
         });
       } else {
         this.$message.error(response.msg);
@@ -1338,7 +1340,7 @@ export default {
     fomatStr(str) {
       let arr = str.split(";");
       let newStr = "";
-      arr.forEach((item) => {
+      arr.forEach(item => {
         newStr += `<p>${item}</p>`;
       });
       return newStr;
@@ -1348,13 +1350,13 @@ export default {
         this.form.goodsList = [
           {
             id: null,
-            number: null,
-          },
+            number: null
+          }
         ];
       }
       this.form.serviceAmount = null;
       this.form.saleAmount = null;
-    },
+    }
   },
   watch: {
     routeOrderStatus(val) {
@@ -1373,26 +1375,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() {
@@ -1413,7 +1415,7 @@ export default {
         routingOrganId: searchForm.routingOrganId,
         lessBalancePaymentAmount: searchForm.lessBalancePaymentAmount,
         lessActualAmount: searchForm.lessActualAmount,
-        ...this.extraQuery,
+        ...this.extraQuery
       };
       data.routingOrganId = this.searchForm.routingOrganId.join(",");
 
@@ -1430,7 +1432,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) {
@@ -1438,8 +1440,8 @@ export default {
         data.endTime = this.searchForm.orderDate[1];
       }
       return data;
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>

src/views/businessManager/orderManager/financeManager.vue

@@ -653,10 +653,12 @@
                     :label="item.name"
                     :value="item.id"
                   >
-                    <span style="float: left">{{ item.name }}</span>
-                    <span
-                      style="float: right; color: #8492a6; font-size: 13px"
-                      >{{ item.id }}</span
+                    <span style="float: left"
+                      >{{ item.name
+                      }}<span v-if="item.sn">({{ item.sn }})</span></span
+                    >
+                    <span style="float: right; color: #8492a6; font-size: 13px"
+                      >{{ item.groupPurchasePrice || 0 }}元</span
                     >
                   </el-option>
                 </el-select>