lex 1 år sedan
förälder
incheckning
bf95d2c21b

+ 4 - 3
src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -1270,15 +1270,16 @@ export default {
               payTime: orderInfo.payTime,
               serviceAmount: res.data.serviceAmount,
               saleAmount: res.data.goodsAmount,
-              schoolId: parseInt(orderInfo.musicGroupId) || "    ",
+              schoolId:
+                parseInt(orderInfo.musicGroupId) || res.data.coopName || "    ",
               applyType: "SELL",
               calenderId: res.data.calenderId ? res.data.calenderId : ""
             }),
               this.$set(
                 this.form,
                 "goodsList",
-                res.data.sellOrders.map(item => {
-                  return { id: item.goodsId, number: item.num };
+                res.data.goodsSellDtos.map(item => {
+                  return { id: item.goodsId, number: item.goodsNum };
                 })
               );
             if (orderInfo.userId && !res.data.calenderId) {

+ 5 - 4
src/views/businessManager/orderManager/financeManager.vue

@@ -1315,17 +1315,18 @@ export default {
               payTime: orderInfo.payTime,
               serviceAmount: res.data.serviceAmount,
               saleAmount: res.data.goodsAmount,
-              schoolId: parseInt(orderInfo.musicGroupId) || "",
+              schoolId:
+                parseInt(orderInfo.musicGroupId) || res.data.coopName || "",
               applyType: "SELL",
               calenderId: res.data.calenderId ? res.data.calenderId : ""
             }),
               this.$set(
                 this.form,
                 "goodsList",
-                res.data.sellOrders.map(item => {
+                res.data.goodsSellDtos.map(item => {
                   return {
-                    id: item.parentGoodsId || item.goodsId,
-                    number: item.num
+                    id: item.goodsId,
+                    number: item.goodsNum
                   };
                 })
               );

+ 1 - 8
src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -461,14 +461,7 @@ export default {
           arr.push({ id: parseInt(i), number: obj[i] });
         }
       } catch {}
-      return arr.length > 0
-        ? arr
-        : [
-            {
-              id: null,
-              number: null
-            }
-          ];
+      return arr.length > 0 ? arr : [];
     },
     auditOutOrder(status) {
       const that = this;