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

src/views/Marketing/order/offlineOrder/orderChargeInfo/bodyBox.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="bodyBox">
     <el-row style="height: 100%">
-      <el-col :span="4" class="height_sty" style="background: #eee">
+      <el-col :span="5" class="height_sty" style="background: #eee">
         <div
           v-for="(item, index) in list"
           :key="index"
@@ -31,7 +31,7 @@
           </ul>
         </div>
       </el-col>
-      <el-col :span="20" class="height_sty clsy" style="padding-left: 14px">
+      <el-col :span="19" class="height_sty clsy" style="padding-left: 14px">
         <div class="topStyle">
           <el-tabs v-model="activeName" style="height: 55px; flex-shrink: 0">
             <el-tab-pane label="商品信息" name="first"></el-tab-pane>

src/views/Marketing/order/offlineOrder/orderChargeInfo/goodsDocument/costPrice.vue

@@ -69,7 +69,18 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="付款方式" prop="payType">
-              <el-input v-model="listData.payType"></el-input>
+              <el-select
+                v-model="listData.payType"
+                placeholder="请选择付款方式"
+              >
+                <el-option
+                  v-for="(item, index) in payType"
+                  :key="index"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -196,6 +207,24 @@ export default {
       rules: {},
       orderList: [],
       costList: {},
+      payType: [
+        {
+          label: "微信",
+          value: "weChatPay",
+        },
+        {
+          label: "支付宝",
+          value: "aliPay",
+        },
+        {
+          label: "银行卡",
+          value: "bankCard",
+        },
+        {
+          label: "现金",
+          value: "cash",
+        },
+      ],
     };
   },
   mounted() {

src/views/Marketing/order/offlineOrder/orderChargeInfo/goodsDocument/goodsInfos.vue

@@ -192,6 +192,14 @@
         </el-col>
       </el-row>
       <div class="fgx"></div>
+      <el-form-item label="订单状态" prop="orderGoodsStatus">
+        <el-radio-group v-model="listData.orderGoodsStatus" disabled>
+          <el-radio :label="-1">关闭</el-radio>
+          <el-radio :label="0">待支付</el-radio>
+          <el-radio :label="1">已支付</el-radio>
+          <el-radio :label="2">已退款</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="订单备注" prop="remark">
         <el-input
           type="textarea"
@@ -294,16 +302,16 @@ export default {
           prop: "goodsType",
           scope: "select",
         },
-        {
-          label: "商品编码",
-          prop: "code",
-        },
         {
           label: "支付状态",
           prop: "payStatus",
           dataType: "listData",
           scope: "payType",
         },
+        {
+          label: "商品编码",
+          prop: "code",
+        },
         {
           label: "商品名称",
           prop: "goodsName",
@@ -316,24 +324,24 @@ export default {
           scope: "yecj",
         },
         {
-          label: "学时",
-          prop: "classHours",
+          label: "商品标准价格明细",
+          prop: "payer",
+          scope: "table",
         },
         {
           label: "商品有效期",
           prop: "validity",
           scope: "startEndTime",
         },
-        {
-          label: "商品标准价格明细",
-          prop: "payer",
-          scope: "table",
-        },
         {
           label: "学习服务期",
           prop: "studentTime",
           scope: "startEndTime",
         },
+        {
+          label: "学时",
+          prop: "classHours",
+        },
       ],
       lists2: [
         {
@@ -421,7 +429,7 @@ export default {
   border-bottom: 1px dotted #9a9a9a;
   margin-bottom: 12px;
 }
-/deep/ .el-input__inner{
+/deep/ .el-input__inner {
   width: 350px;
 }
 </style>

src/views/Marketing/order/offlineOrder/orderChargeInfo/topBox.vue

@@ -77,8 +77,8 @@ export default {
         },
         {
           label: "商品业务层级：",
-          prop1: "businessName",
-          prop2: "businessName",
+          prop1: "educationName",
+          prop2: "projectName",
           prop3: "businessName",
           scope: "busin",
         },
@@ -89,7 +89,7 @@ export default {
         {
           label: "订单时间：",
           prop: "createTime",
-          socpe: "time",
+          scope: "time",
         },
         {
           label: "商品标准价格总金额：",

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

@@ -286,12 +286,12 @@ export default {
               click: true,
             },
             {
-              label: "已退款",
+              label: "无",
               value: 2,
               click: true,
             },
             {
-              label: "拒绝退款",
+              label: "无",
               value: 3,
               click: true,
             },