Merge branch 'five-second-add' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into six

src/components/tableList.vue

@@ -1303,9 +1303,9 @@
                 : scope.row[item.prop] === 0
                 ? "待支付"
                 : scope.row[item.prop] === 1
-                ? `已支付（${scope.row["goodsReceived"]}）`
+                ? `已支付（￥${scope.row["goodsReceived"]}）`
                 : scope.row[item.prop] === 2
-                ? `已退款（${scope.row["goodsReceived"]}）`
+                ? `已退款（￥${scope.row["goodsReceived"]}）`
                 : ""
             }}
           </div>

src/views/Marketing/order/offlineOrder/batchRecord/secondStep/setGoodsList.vue

@@ -236,6 +236,7 @@ export default {
       if (type == 3 || type == 4) {
         data.businessIds = this.oldObj.businessId;
       }
+      data.goodsStatus = 1
       this.$api.inquireGoods(data).then((res) => {
         res.rows.forEach((item) => {
           item.subjectId = subjectId;

src/views/Marketing/order/offlineOrder/index.vue

@@ -109,7 +109,7 @@ export default {
           hidden: true,
         },
         {
-          label: "学员",
+          label: "学员数量",
           prop: "userNum",
           hidden: true,
         },