Procházet zdrojové kódy

Merge branch 'dev' into x_d_5.1

谢杰标 před 2 roky
rodič
revize
ef963292c4
48 změnil soubory, kde provedl 434 přidání a 231 odebrání
  1. binární
      src/assets/images/404@2x.png
  2. binární
      src/assets/images/left_slices/left.png
  3. binární
      src/assets/images/left_slices/left@2x.png
  4. binární
      src/assets/images/loginPage/bag@2x.png
  5. binární
      src/assets/images/loginPage/bg2@2x.png
  6. binární
      src/assets/images/loginPage/bg@2x.png
  7. binární
      src/assets/images/loginPage/card@2x.png
  8. binární
      src/assets/images/loginPage/kc@2x.png
  9. binární
      src/assets/images/loginPage/ks@2x.png
  10. binární
      src/assets/images/loginPage/pass.png
  11. binární
      src/assets/images/loginPage/passno.png
  12. binární
      src/assets/images/loginPage/qz@2x.png
  13. binární
      src/assets/images/loginPage/welcome@2x.png
  14. binární
      src/assets/images/修改补款@2x.png
  15. binární
      src/assets/images/到账金额.png
  16. binární
      src/assets/images/合同金额@2x.png
  17. binární
      src/assets/images/完单分成.png
  18. binární
      src/assets/images/实际款@2x.png
  19. binární
      src/assets/images/已收款@2x.png
  20. binární
      src/assets/images/已认款.png
  21. binární
      src/assets/images/已退款@2x.png
  22. binární
      src/assets/images/已领取.png
  23. binární
      src/assets/images/应付分成.png
  24. binární
      src/assets/images/待认款.png
  25. binární
      src/assets/images/成本金额@2x.png
  26. binární
      src/assets/images/排名.png
  27. binární
      src/assets/images/未收款@2x.png
  28. binární
      src/assets/images/登录页3_slices/left@2x.png
  29. binární
      src/assets/images/登录页3_slices/smile@2x.png
  30. binární
      src/assets/images/盈亏@2x.png
  31. binární
      src/assets/images/税前佣金.png
  32. binární
      src/assets/images/结算佣金.png
  33. binární
      src/assets/images/结算金额.png
  34. binární
      src/assets/images/订单人数@2x.png
  35. binární
      src/assets/images/订单数@2x.png
  36. binární
      src/assets/images/转化率.png
  37. binární
      src/assets/images/转化量同比.png
  38. binární
      src/assets/images/转化量环比.png
  39. binární
      src/assets/images/转化金额同比.png
  40. binární
      src/assets/images/转化金额环比.png
  41. binární
      src/assets/images/退款扣除.png
  42. 6 11
      src/components/Comon/pictureList.vue
  43. 191 72
      src/views/financed/components/refund/dislogSet.vue
  44. 1 1
      src/views/financed/components/studentDetails.vue
  45. 213 97
      src/views/financed/components/trainee/dislogSetTrainee.vue
  46. 7 18
      src/views/financed/orderManageList/independent/index.vue
  47. 7 13
      src/views/financed/orderManageList/index.vue
  48. 9 19
      src/views/financed/orderManageList/operate/index.vue

binární
src/assets/images/404@2x.png


binární
src/assets/images/left_slices/left.png


binární
src/assets/images/left_slices/left@2x.png


binární
src/assets/images/loginPage/bag@2x.png


binární
src/assets/images/loginPage/bg2@2x.png


binární
src/assets/images/loginPage/bg@2x.png


binární
src/assets/images/loginPage/card@2x.png


binární
src/assets/images/loginPage/kc@2x.png


binární
src/assets/images/loginPage/ks@2x.png


binární
src/assets/images/loginPage/pass.png


binární
src/assets/images/loginPage/passno.png


binární
src/assets/images/loginPage/qz@2x.png


binární
src/assets/images/loginPage/welcome@2x.png


binární
src/assets/images/修改补款@2x.png


binární
src/assets/images/到账金额.png


binární
src/assets/images/合同金额@2x.png


binární
src/assets/images/完单分成.png


binární
src/assets/images/实际款@2x.png


binární
src/assets/images/已收款@2x.png


binární
src/assets/images/已认款.png


binární
src/assets/images/已退款@2x.png


binární
src/assets/images/已领取.png


binární
src/assets/images/应付分成.png


binární
src/assets/images/待认款.png


binární
src/assets/images/成本金额@2x.png


binární
src/assets/images/排名.png


binární
src/assets/images/未收款@2x.png


binární
src/assets/images/登录页3_slices/left@2x.png


binární
src/assets/images/登录页3_slices/smile@2x.png


binární
src/assets/images/盈亏@2x.png


binární
src/assets/images/税前佣金.png


binární
src/assets/images/结算佣金.png


binární
src/assets/images/结算金额.png


binární
src/assets/images/订单人数@2x.png


binární
src/assets/images/订单数@2x.png


binární
src/assets/images/转化率.png


binární
src/assets/images/转化量同比.png


binární
src/assets/images/转化量环比.png


binární
src/assets/images/转化金额同比.png


binární
src/assets/images/转化金额环比.png


binární
src/assets/images/退款扣除.png


+ 6 - 11
src/components/Comon/pictureList.vue

@@ -50,25 +50,20 @@ export default {
   & > .list {
     user-select: none;
     cursor: pointer;
-    transition: all 0.3s;
-    box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.2);
     background-color: rgb(243,249,255);
     padding: 4px;
-    &:hover {
-      transform: scale(1.04);
-    }
-    width: 166px;
-    height: 44px;
-    border-radius: 6px;
+    width: 170px;
+    height: 60px;
+    border-radius: 3px;
     display: flex;
     align-items: center;
     flex-shrink: 0;
     margin-right: 10px;
     margin-bottom: 15px;
     & > img {
-      margin-left: 2px;
-      width: 32px;
-      height: 32px;
+      margin-left: 10px;
+      width: 36px;
+      height: 36px;
     }
     & > .right {
       padding-top: 4px;

+ 191 - 72
src/views/financed/components/refund/dislogSet.vue

@@ -2,12 +2,11 @@
   <div>
     <BaseDialog
       :disabledBtn="disabledBtn"
-      width="600px"
+      width="900px"
       :isShow.sync="isShow"
       title="退款审核"
       @close="close"
-      @submit="submitForm"
-      :confirmName="form.checkType === 3 ? '确定支付' : '确定'"
+      :confirmStatus="false"
     >
       <div v-if="formPay.toBankAcount">
         <em>收款信息:</em>
@@ -50,33 +49,92 @@
           <span class="color_1890ff">{{ form.applyName }}</span>
           <span>,发起退款申请</span>
         </p>
+
         <div class="bgc_pink">
           <p>
-            本次退款金额:<span class="color_red">¥{{ form.refundFee }}</span>
+            <strong>订单号:</strong><span>{{ form.orderSn }}</span>
+            <el-button
+              type="text"
+              style="margin-left: 10px"
+              @click="openOrderDetail"
+              >订单详情</el-button
+            >
           </p>
-          <p>退款理由:{{ form.refundReason }}</p>
+          <!-- :span-method="objectSpanMethod" 表格合并代码👇 -->
+          <el-table
+            size="small"
+            border
+            :data="form.refundUserList"
+            stripe
+            style="width: 100%"
+            height="340"
+          >
+            <el-table-column
+              align="center"
+              type="index"
+              label="序号"
+              width="70"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              v-for="(item, index) in tableList"
+              :key="index"
+              :prop="item.prop"
+              :label="item.label"
+              :width="item.width"
+            >
+              <template slot-scope="scope">
+                <template v-if="item.scope === 'isOptions'">
+                  <template v-for="(i, k) in item.options">
+                    <span v-if="scope.row[item.prop] == i.value">{{
+                      i.label
+                    }}</span>
+                  </template>
+                </template>
+                <div v-else :style="item.style">
+                  <span v-if="item.ch && scope.row[item.prop]">{{
+                    item.ch
+                  }}</span>
+                  {{ scope.row[item.prop] }}
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+          <ul>
+            <li>
+              本次申请退款:<span
+                >¥{{ parseFloat(form.refundFee).toFixed(2) }}</span
+              >
+            </li>
+            <li>
+              未收货款:<span
+                >¥{{ parseFloat(form.orderUncollected).toFixed(2) }}</span
+              >
+            </li>
+            <li>
+              已收款待退:<span
+                >¥{{ parseFloat(form.orderReceived).toFixed(2) }}</span
+              >
+            </li>
+            <li>
+              已申请的佣金:<span
+                >¥{{ parseFloat(form.brokerage).toFixed(2) }}</span
+              ><strong v-if="form.brokerage > 0"
+                >(佣金已结算,建议联系业务员与客户沟通,确认是否申请佣金,再做审核已)</strong
+              >
+            </li>
+            <li>
+              本次可退金额:<span style="font-weight: bold"
+                >¥{{
+                  parseFloat(form.refundFee - form.orderUncollected).toFixed(2)
+                }}</span
+              >
+            </li>
+          </ul>
         </div>
-        <el-form
-          :model="formData"
-          :rules="rules"
-          ref="formData"
-          label-width="100px"
-        >
-          <el-form-item prop="checkResult" label="审核结果:">
-            <el-radio-group v-model="formData.checkResult">
-              <el-radio label="1">同意</el-radio>
-              <el-radio label="-1">拒绝</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item prop="checkReason" label="审核意见:">
-            <el-input
-              type="textarea"
-              placeholder="请输入审核意见"
-              v-model="formData.checkReason"
-            ></el-input> </el-form-item
-        ></el-form>
-        <template slot="slotBtn">
-          <el-button @click="auditProgress = true">审核进度</el-button>
+        <template slot="slotBtnRight">
+          <el-button @click="auditFail">审核不通过</el-button>
+          <el-button type="primary" @click="submitForm">审核通过</el-button>
         </template>
         <audit-progress
           :auditProgress.sync="auditProgress"
@@ -112,18 +170,23 @@
         <el-tag type="danger" v-if="form.payType === 2">网银支付</el-tag>
       </template>
     </BaseDialog>
+
+    <dislogOrderDetails
+      :dialogVisible.sync="orderDialogVisible"
+      :orderSn="orderSn"
+      :ShowStatus="1"
+    ></dislogOrderDetails>
   </div>
 </template>
 
 <script>
-import { baseURL } from "@/utils/request.js";
-import { getToken } from "@/utils/auth";
-import axios from "axios";
+import dislogOrderDetails from "../dislogOrderDetails.vue";
 import auditProgress from "./auditProgress.vue";
 export default {
   name: "DislogSet",
   components: {
     auditProgress,
+    dislogOrderDetails,
   },
   props: {
     dialogVisible: {
@@ -134,30 +197,15 @@ export default {
       type: String,
       default: "",
     },
-    checkRoleName: {
-      type: String,
-      default: "",
-    },
   },
   data() {
     return {
       disabledBtn: false,
       auditProgress: false,
-      formData: {
-        checkResult: "",
-        checkReason: "",
-      },
+      orderDialogVisible: false,
       form: {
         checkLogVos: [],
       },
-      rules: {
-        checkResult: [
-          { required: true, message: "请选择审核结果", trigger: "change" },
-        ],
-        checkReason: [
-          { required: false, message: "请输入审核意见", trigger: "blur" },
-        ],
-      },
       formPay: {
         toBankAcount: "",
         toBankName: "",
@@ -174,12 +222,65 @@ export default {
           { required: true, message: "请输入银行名称", trigger: "blur" },
         ],
       },
+      tableData: [],
+      tableList: [
+        {
+          label: "业务类型",
+          prop: "businessName",
+          width: "180",
+        },
+        {
+          label: "退款课程",
+          prop: "goodsName",
+          width: "180",
+        },
+        {
+          label: "原价",
+          prop: "refundFee",
+          width: "100",
+          ch: "¥",
+        },
+        {
+          label: "单价",
+          prop: "refundFee",
+          width: "160",
+          ch: "¥",
+          style: { color: "red" },
+        },
+        {
+          label: "税前佣金",
+          prop: "refundFee",
+          ch: "¥",
+        },
+        {
+          label: "实际单价",
+          prop: "refundFee",
+          ch: "¥",
+        },
+        {
+          label: "学员姓名",
+          prop: "userName",
+        },
+        {
+          label: "身份证号码",
+          prop: "userCard",
+          width: "160",
+        },
+        {
+          label: "退款原因",
+          prop: "refundReason",
+        },
+      ],
     };
   },
 
   mounted() {},
 
   methods: {
+    //订单详情
+    openOrderDetail() {
+      this.orderDialogVisible = true;
+    },
     init() {
       this.resetForm();
       this.$api.systemtoporderrefunddetail(this.orderSn).then((res) => {
@@ -192,24 +293,40 @@ export default {
       });
     },
     close() {
-      this.$refs[
-        this.form.checkType === 2 ? "formData" : "rulesPay"
-      ].resetFields();
+      this.$refs["rulesPay"].resetFields();
     },
     resetForm() {
       this.form = {
         checkLogVos: [],
       };
-      this.formData = {
-        checkResult: "",
-        checkReason: "",
-      };
       this.formPay = {
         toBankAcount: "",
         toBankName: "",
         toBankTypeName: "",
       };
     },
+
+    auditFail() {
+      this.$prompt("确定审核不通过吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        inputPlaceholder: "输入不通过原因",
+      })
+        .then(({ value }) => {
+          this.$api
+            .systemtoporderrefundcheck({
+              orderSn: this.orderSn,
+              checkResult: "-1",
+              checkReason: value || "",
+            })
+            .then((res) => {
+              this.$message.success("操作成功");
+              this.isShow = false;
+              this.$emit("search");
+            });
+        })
+        .catch(() => {});
+    },
     submitForm() {
       if (this.form.checkType === 3) {
         this.$api
@@ -224,25 +341,20 @@ export default {
             this.$emit("search");
           });
       } else {
-        this.$refs["formData"].validate((valid) => {
-          if (valid) {
-            this.disabledBtn = true;
-            this.$api
-              .systemtoporderrefundcheck({
-                orderSn: this.orderSn,
-                ...this.formData,
-              })
-              .then((res) => {
-                this.isShow = false;
-                this.$emit("search");
-              })
-              .finally(() => {
-                this.disabledBtn = false;
-              });
-          } else {
-            return false;
-          }
-        });
+        this.disabledBtn = true;
+        this.$api
+          .systemtoporderrefundcheck({
+            orderSn: this.orderSn,
+            checkResult: "1",
+          })
+          .then((res) => {
+            this.$message.success("操作成功");
+            this.isShow = false;
+            this.$emit("search");
+          })
+          .finally(() => {
+            this.disabledBtn = false;
+          });
       }
     },
   },
@@ -265,7 +377,8 @@ export default {
 <style lang="scss" scoped>
 .bgc_pink {
   padding: 10px;
-  background-color: rgb(252, 234, 236);
+  box-shadow: 0px 0px 4px 2px rgba(0, 0, 0, 0.2);
+  border-radius: 8px;
   color: #000;
 }
 .color_red {
@@ -281,4 +394,10 @@ em {
   color: #000;
   font-style: unset;
 }
+li {
+  margin-bottom: 6px;
+  span {
+    color: red;
+  }
+}
 </style>

+ 1 - 1
src/views/financed/components/studentDetails.vue

@@ -438,7 +438,7 @@ export default {
     padding: 0;
   }
 }
-/deep/ .el-input__inner {
+/deep/ .el-input--small .el-input__inner {
   width: 120px;
 }
 </style>

+ 213 - 97
src/views/financed/components/trainee/dislogSetTrainee.vue

@@ -4,31 +4,52 @@
       :disabledBtn="disabledBtn"
       width="900px"
       :isShow.sync="isShow"
-      title="'学员审核"
+      title="学员审核"
       @close="close"
-      @submit="submitForm"
+      :confirmStatus="false"
     >
       <p style="margin-top: 0">
-        申请时间:{{ $methodsTools.onlyForma(form.applyTime) }}
+        <strong style="color: #000">申请时间:</strong
+        >{{ $methodsTools.onlyForma(form.buyTime) }}
       </p>
       <p>
-        <span class="color_1890ff">{{ form.applyName }}</span>
+        <span class="color_1890ff">{{ form.tenantName }}</span>
         <span>,发起学员修改申请</span>
       </p>
       <div class="bgc_pink">
         <p>
-          <strong>订单号:</strong><span>123456124356124356142365</span>
-          <el-button type="text" style="margin-left: 10px">订单详情</el-button>
+          <strong>订单号:</strong><span>{{ form.orderSn }}</span>
+          <el-button
+            type="text"
+            style="margin-left: 10px"
+            @click="openOrderDetail"
+            >订单详情</el-button
+          >
         </p>
+        <!-- :span-method="objectSpanMethod" 表格合并代码👇 -->
         <el-table
-        size="small"
-          :span-method="objectSpanMethod"
+          ref="tableList"
+          row-key="orderGoodsId"
+          size="small"
           border
           :data="tableData"
           stripe
           style="width: 100%"
           height="340"
+          v-loading="loading"
+          @select-all="selectAll"
+          @select="select"
         >
+          <el-table-column
+            reserve-selection
+            align="center"
+            type="selection"
+            width="55"
+            header-align="center"
+            fixed="left"
+            :selectable="selectableFunc"
+          >
+          </el-table-column>
           <el-table-column
             align="center"
             type="index"
@@ -43,7 +64,21 @@
             :label="item.label"
             :width="item.width"
           >
-            <template slot-scope="scope">{{ scope.row[item.prop] }}</template>
+            <template slot-scope="scope">
+              <template v-if="item.scope === 'isOptions'">
+                <template v-for="(i, k) in item.options">
+                  <span v-if="scope.row[item.prop] == i.value">{{
+                    i.label
+                  }}</span>
+                </template>
+              </template>
+              <div v-else :style="item.style">
+                <span v-if="item.ch && scope.row[item.prop]">{{
+                  item.ch
+                }}</span>
+                {{ scope.row[item.prop] }}
+              </div>
+            </template>
           </el-table-column>
         </el-table>
         <pagination
@@ -53,43 +88,28 @@
           @search="search"
         />
       </div>
-      <el-form
-        :model="formData"
-        :rules="rules"
-        ref="formData"
-        label-width="100px"
-      >
-        <el-form-item prop="checkResult" label="审核结果:">
-          <el-radio-group v-model="formData.checkResult">
-            <el-radio label="1">同意</el-radio>
-            <el-radio label="-1">拒绝</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item prop="checkReason" label="审核意见:">
-          <el-input
-            type="textarea"
-            placeholder="请输入审核意见"
-            v-model="formData.checkReason"
-          ></el-input> </el-form-item
-      ></el-form>
-      <template slot="slotBtn">
-        <el-button @click="auditProgress = true">审核进度</el-button>
+      <template slot="slotBtnRight">
+        <el-button @click="auditFail">审核不通过</el-button>
+        <el-button type="primary" @click="submitForm">审核通过</el-button>
       </template>
-      <audit-progress
-        :auditProgress.sync="auditProgress"
-        :checkLogVos="form.checkLogVos"
-      ></audit-progress>
     </BaseDialog>
+
+    <dislogOrderDetails
+      :dialogVisible.sync="orderDialogVisible"
+      :orderSn="orderSn"
+      :ShowStatus="1"
+      @search="search"
+    ></dislogOrderDetails>
   </div>
 </template>
 
 <script>
+import dislogOrderDetails from "../dislogOrderDetails.vue";
 import pagination from "@/components/pagination";
-import auditProgress from "./auditProgress.vue";
 export default {
   components: {
-    auditProgress,
     pagination,
+    dislogOrderDetails,
   },
   props: {
     dialogVisible: {
@@ -103,71 +123,92 @@ export default {
   },
   data() {
     return {
+      loading: false,
       form: {},
       disabledBtn: false,
-      auditProgress: false,
-      formData: {
-        checkResult: "",
-        checkReason: "",
-      },
-      rules: {
-        checkResult: [
-          { required: true, message: "请选择审核结果", trigger: "change" },
-        ],
-        checkReason: [
-          { required: false, message: "请输入审核意见", trigger: "blur" },
-        ],
-      },
-      tableData: [
+      tableData: [],
+      tableList: [
+        {
+          label: "姓名",
+          prop: "userName",
+        },
         {
-          id: 1,
-          name: "tang",
-          idCard: "445224199901040000",
+          label: "身份证号",
+          prop: "userCard",
+          width: "140",
         },
         {
-          id: 2,
-          name: "li",
-          idCard: "445224199000000000",
+          label: "手机号",
+          prop: "userPhone",
+          width: "100",
         },
         {
-          id: 3,
-          name: "chen",
-          idCard: "445224199901040000",
+          label: "课程",
+          prop: "goodsName",
+          width: "160",
         },
         {
-          id: 4,
-          name: "huang",
-          idCard: "445224199000000000",
+          label: "年份",
+          prop: "year",
         },
         {
-          id: 5,
-          name: "chen",
-          idCard: "445224199901040000",
+          label: "专业",
+          prop: "majorName",
         },
         {
-          id: 6,
-          name: "huang",
-          idCard: "445224199000000000",
+          label: "业务",
+          prop: "businessName",
+          width: "180",
         },
         {
-          id: 7,
-          name: "chen",
-          idCard: "445224199901040000",
+          label: "原价(元)",
+          prop: "goodsPrice",
+          ch: "¥",
         },
         {
-          id: 8,
-          name: "huang",
-          idCard: "445224199000000000",
+          label: "单价(元)",
+          prop: "goodsRealPrice",
+          ch: "¥",
         },
-      ],
-      tableList: [
         {
-          label: "姓名",
-          prop: "name",
+          label: "学习状态",
+          prop: "studyStatus",
         },
         {
-          label: "身份证号",
-          prop: "idCard",
+          label: "审核状态",
+          prop: "checkStatus",
+          scope: "isOptions",
+          options: [
+            {
+              label: "待审核",
+              value: 0,
+            },
+            {
+              label: "已通过",
+              value: 1,
+            },
+            {
+              label: "未通过",
+              value: 2,
+            },
+            {
+              label: "已撤销",
+              value: 3,
+            },
+            {
+              label: "已取消",
+              value: -1,
+            },
+          ],
+        },
+        {
+          label: "发起原因",
+          prop: "refundReason",
+        },
+        {
+          label: "审核意见",
+          prop: "checkReason",
+          style: { color: "red" },
         },
       ],
       refFormData: {
@@ -175,37 +216,104 @@ export default {
         pageNum: 1,
       },
       total: 0,
+      orderDialogVisible: false,
+      allCheckData: [],
+      selectableFunc: (row, rowIndex) => {
+        if (row.checkStatus === 0) {
+          return true;
+        } else {
+          return false;
+        }
+      },
     };
   },
 
   mounted() {},
 
   methods: {
-    init() {},
-    search() {},
+    //订单详情
+    openOrderDetail() {
+      this.orderDialogVisible = true;
+    },
+    init() {
+      this.$api.systemtoporderid(this.orderSn).then((res) => {
+        this.form = res.data;
+        this.search();
+      });
+    },
+    search() {
+      let ary = Object.assign(
+        {
+          orderSn: this.orderSn,
+          orderFrom: this.form.orderFrom,
+        },
+        this.refFormData
+      );
+      this.loading = true;
+      this.$api
+        .systemtopordergoodslist(ary)
+        .then((res) => {
+          this.tableData = res.rows;
+          this.total = res.total;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
     close() {
-      this.$refs.formData.resetFields();
+      this.allCheckData = [];
+      this.$refs.tableList.clearSelection();
     },
-    submitForm() {
-      this.$refs["formData"].validate((valid) => {
-        if (valid) {
-          this.disabledBtn = true;
+    auditFail() {
+      if (this.allCheckData.length === 0) {
+        this.$message.error("请勾选数据");
+        return;
+      }
+      this.$prompt("确定审核不通过吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        inputPlaceholder: "输入不通过原因",
+      })
+        .then(({ value }) => {
           this.$api
-            .systemtoporderrefundcheck({
+            .systemtopordercheckstudent({
+              checkReason: value || "",
+              checkStatus: 2,
               orderSn: this.orderSn,
-              ...this.formData,
+              orderGoodsIds: this.allCheckData.map(
+                (i) => i.orderGoodsId
+              ),
             })
             .then((res) => {
+              this.$message.success("操作成功");
               this.isShow = false;
               this.$emit("search");
-            })
-            .finally(() => {
-              this.disabledBtn = false;
             });
-        } else {
-          return false;
-        }
-      });
+        })
+        .catch(() => {});
+    },
+    submitForm() {
+      if (this.allCheckData.length === 0) {
+        this.$message.error("请勾选数据");
+        return;
+      }
+      this.disabledBtn = true;
+      this.$api
+        .systemtopordercheckstudent({
+          checkStatus: 1,
+          orderSn: this.orderSn,
+          orderGoodsIds: this.allCheckData.map(
+            (i) => i.orderGoodsId
+          ),
+        })
+        .then((res) => {
+          this.$message.success("操作成功");
+          this.isShow = false;
+          this.$emit("search");
+        })
+        .finally(() => {
+          this.disabledBtn = false;
+        });
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
@@ -222,6 +330,13 @@ export default {
         }
       }
     },
+
+    selectAll(value) {
+      this.allCheckData = value;
+    },
+    select(selection) {
+      this.allCheckData = selection;
+    },
   },
   computed: {
     isShow: {
@@ -242,7 +357,8 @@ export default {
 <style lang="scss" scoped>
 .bgc_pink {
   padding: 10px;
-  background-color: rgb(252, 234, 236);
+  box-shadow: 0px 0px 4px 2px rgba(0, 0, 0, 0.2);
+  border-radius: 8px;
   color: #000;
 }
 .color_red {

+ 7 - 18
src/views/financed/orderManageList/independent/index.vue

@@ -48,6 +48,7 @@
     >
       <template slot="customize">
         <el-checkbox
+          v-if="false"
           style="margin-right: 10px"
           v-model="formData.check"
           :true-label="1"
@@ -179,7 +180,6 @@
       @search="search"
       :type="2"
       :orderSn="orderSn"
-      :checkRoleName="orderInfo.refundName"
     ></dislog-set>
     <dislog-set-trainee
       :dialogVisible.sync="dialogVisibleTrainee"
@@ -408,12 +408,6 @@ export default {
             { label: "支付失败", value: 6 },
           ],
         },
-        {
-          prop: "abc",
-          placeholder: "学员状态",
-          scope: "select",
-          options: [{ label: "未设置", value: 1 }],
-        },
         {
           prop: "creditStatus",
           placeholder: "账款状态",
@@ -894,25 +888,20 @@ export default {
   & > .list {
     user-select: none;
     cursor: pointer;
-    transition: all 0.3s;
-    box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.2);
     background-color: rgb(243,249,255);
     padding: 4px;
-    &:hover {
-      transform: scale(1.04);
-    }
-    width: 136px;
-    height: 44px;
-    border-radius: 6px;
+    width: 170px;
+    height: 60px;
+    border-radius: 3px;
     display: flex;
     align-items: center;
     flex-shrink: 0;
     margin-right: 10px;
     margin-bottom: 10px;
     & > img {
-      margin-left: 2px;
-      width: 32px;
-      height: 32px;
+      margin-left: 10px;
+      width: 36px;
+      height: 36px;
     }
     & > .right {
       flex: 1;

+ 7 - 13
src/views/financed/orderManageList/index.vue

@@ -233,7 +233,6 @@
       @search="search"
       :type="2"
       :orderSn="orderSn"
-      :checkRoleName="orderInfo.refundName"
     ></dislog-set>
     <remarks
       :dialogVisible.sync="remarksVisible"
@@ -915,25 +914,20 @@ export default {
   & > .list {
     user-select: none;
     cursor: pointer;
-    transition: all 0.3s;
-    box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.2);
-    background-color: rgb(243,249,255);
+    background-color: rgb(243, 249, 255);
     padding: 4px;
-    &:hover {
-      transform: scale(1.04);
-    }
-    width: 136px;
-    height: 44px;
-    border-radius: 6px;
+    width: 170px;
+    height: 60px;
+    border-radius: 3px;
     display: flex;
     align-items: center;
     flex-shrink: 0;
     margin-right: 10px;
     margin-bottom: 10px;
     & > img {
-      margin-left: 2px;
-      width: 32px;
-      height: 32px;
+      margin-left: 10px;
+      width: 36px;
+      height: 36px;
     }
     & > .right {
       flex: 1;

+ 9 - 19
src/views/financed/orderManageList/operate/index.vue

@@ -48,6 +48,7 @@
     >
       <template slot="customize">
         <el-checkbox
+          v-if="false"
           style="margin-right: 10px"
           v-model="formData.check"
           :true-label="1"
@@ -191,7 +192,8 @@
           >订单审核</el-button
         >
         <el-button
-          v-if="orderFormShow(props.scope.row) && false"
+          v-if="orderFormShow(props.scope.row)"
+          :disabled="props.scope.row.checkStatus !== 1"
           type="text"
           @click="handelClick(props.scope.row, 1)"
           >学员审核</el-button
@@ -267,7 +269,6 @@
       @search="search"
       :type="2"
       :orderSn="orderSn"
-      :checkRoleName="orderInfo.refundName"
     ></dislog-set>
     <dislog-set-trainee
       :dialogVisible.sync="dialogVisibleTrainee"
@@ -455,12 +456,6 @@ export default {
             { label: "支付失败", value: 6 },
           ],
         },
-        {
-          prop: "abc",
-          placeholder: "学员状态",
-          scope: "select",
-          options: [{ label: "未设置", value: 1 }],
-        },
         {
           prop: "creditStatus",
           placeholder: "账款状态",
@@ -944,25 +939,20 @@ export default {
   & > .list {
     user-select: none;
     cursor: pointer;
-    transition: all 0.3s;
-    box-shadow: 0px 0px 4px 1px rgba(0, 0, 0, 0.2);
     background-color: rgb(243,249,255);
     padding: 4px;
-    &:hover {
-      transform: scale(1.04);
-    }
-    width: 136px;
-    height: 44px;
-    border-radius: 6px;
+    width: 170px;
+    height: 60px;
+    border-radius: 3px;
     display: flex;
     align-items: center;
     flex-shrink: 0;
     margin-right: 10px;
     margin-bottom: 10px;
     & > img {
-      margin-left: 2px;
-      width: 32px;
-      height: 32px;
+      margin-left: 10px;
+      width: 36px;
+      height: 36px;
     }
     & > .right {
       flex: 1;