Merge branch 'dev' into x_d_5.1

src/components/audit/auditProgress.vue

@@ -10,32 +10,34 @@
       :confirmStatus="false"
     >
       <el-timeline>
-        <el-timeline-item timestamp="2018/4/12" placement="top" color="#0bbd87">
+        <el-timeline-item
+          v-for="(item, index) in checkLogVos"
+          :timestamp="$methodsTools.onlyForma(item.checkTime)"
+          placement="top"
+          :color="
+            item.checkSign === 1
+              ? '#409EFF'
+              : item.checkStatus === 1
+              ? '#67C23A'
+              : item.checkStatus === -1
+              ? '#F56C6C'
+              : '#e4e4e4'
+          "
+        >
           <el-card>
-            <h4>负责人：会计</h4>
-            <p>审核状态：已通过</p>
-            <p>审核意见：——————</p>
-          </el-card>
-        </el-timeline-item>
-        <el-timeline-item timestamp="2018/4/3" placement="top" color="#0bbd87">
-          <el-card>
-            <h4>负责人：财务</h4>
-            <p>审核状态：待审核</p>
-            <p>审核意见：——————</p>
-          </el-card>
-        </el-timeline-item>
-        <el-timeline-item timestamp="2018/4/2" placement="top">
-          <el-card>
-            <h4>负责人：总经理</h4>
-            <p>审核状态：未通过</p>
-            <p>审核意见：</p>
-          </el-card>
-        </el-timeline-item>
-        <el-timeline-item timestamp="2018/4/2" placement="top">
-          <el-card>
-            <h4>负责人：出纳</h4>
-            <p>审核状态：待支付</p>
-            <p>审核意见：</p>
+            <h4>负责人：{{ item.roleName }}</h4>
+            <p>
+              审核状态：{{
+                item.checkStatus === 0
+                  ? "待审核"
+                  : item.checkStatus === 1
+                  ? "已通过"
+                  : item.checkStatus === -1
+                  ? "未通过"
+                  : ""
+              }}
+            </p>
+            <p>审核意见：{{ item.checkReason }}</p>
           </el-card>
         </el-timeline-item>
       </el-timeline>
@@ -51,6 +53,12 @@ export default {
       type: Boolean,
       default: false,
     },
+    checkLogVos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
   },
   data() {
     return {
@@ -61,7 +69,9 @@ export default {
   mounted() {},
 
   methods: {
-    init() {},
+    init() {
+      console.log(this.checkLogVos, "checkLogVos");
+    },
     close() {},
     submitForm() {
       this.isShow = false;

src/components/audit/dislogSet.vue

@@ -1,76 +1,133 @@
 <template>
   <div>
     <BaseDialog
+      :disabledBtn="disabledBtn"
       width="600px"
       :isShow.sync="isShow"
       :title="ShowStatus() ? '付款审核' : '退款审核'"
       @close="close"
       @submit="submitForm"
-      :confirmName="form.step === 4 ? '确定支付' : '确定'"
+      :confirmName="
+        form.checkType === 3 || form.checkType === 6 ? '确定支付' : '确定'
+      "
     >
-      <template v-if="form.step !== 4">
-        <p style="margin-top: 0">下单时间：2023-12-12 16:16:10</p>
-        <p style="margin-top: 0" v-if="ShowStatus()">订单单号：123456789123</p>
+      <template
+        v-if="
+          form.checkType === 1 || form.checkType === 2 || form.checkType === 5
+        "
+      >
+        <p style="margin-top: 0">
+          {{ type === 1 ? "下单时间" : "申请时间" }}：{{
+            $methodsTools.onlyForma(type === 1 ? form.buyTime : form.applyTime)
+          }}
+        </p>
+        <p style="margin-top: 0" v-if="ShowStatus()">
+          订单单号：{{ form.orderSn }}
+        </p>
         <p>
-          <span class="color_1890ff">机构名称：广东中正教育科技有限公司</span>
+          <span class="color_1890ff">{{ form.applyName }}</span>
           <span v-if="!ShowStatus()">,发起退款申请</span>
         </p>
         <div class="bgc_pink" v-if="ShowStatus()">
-          <p>待付账款：<span class="color_red">￥252.00</span></p>
-          <p>预付时间：2023-12-12 10:10:10</p>
-          <p>剩余天数：10</p>
+          <p>
+            待付账款：<span class="color_red">￥{{ form.payPrice }}</span>
+          </p>
         </div>
         <div class="bgc_pink" v-else>
-          <p>本次退款金额：<span class="color_red">￥252.00</span></p>
-          <p>退款理由：321213561243891423</p>
+          <p>
+            本次退款金额：<span class="color_red">￥{{ form.refundFee }}</span>
+          </p>
+          <p>退款理由：{{ form.refundReason }}</p>
         </div>
-        <el-form :model="form" :rules="rules" ref="form" label-width="100px">
-          <el-form-item prop="data1" label="审核结果：">
-            <el-radio-group v-model="form.data1">
-              <el-radio label="同意" name="1"></el-radio>
-              <el-radio label="拒绝" name="0"></el-radio>
+        <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="data2" label="审核意见：">
+          <el-form-item prop="checkReason" label="审核意见：">
             <el-input
               type="textarea"
               placeholder="请输入审核意见"
-              v-model="form.data2"
+              v-model="formData.checkReason"
             ></el-input> </el-form-item
         ></el-form>
         <template slot="slotBtn">
           <el-button @click="auditProgress = true">审核进度</el-button>
         </template>
-        <audit-progress :auditProgress.sync="auditProgress"></audit-progress>
+        <audit-progress
+          :auditProgress.sync="auditProgress"
+          :checkLogVos="form.checkLogVos"
+        ></audit-progress>
       </template>
-      <template v-else>
+      <template v-if="form.checkType === 3 || form.checkType === 6">
         <em>收款信息：</em>
-        <p>开户名称：<em>广东中正教育科技有限公司</em></p>
-        <p>开户银行：<em>农业银行燕塘支行</em></p>
-        <p>收款账号：<em>4565 1561 1515 1222</em></p>
+        <el-form
+          :model="formPay"
+          :rules="rulesPay"
+          ref="rulesPay"
+          label-width="100px"
+          class="demo-ruleForm"
+        >
+          <el-form-item label="银行账号：" prop="toBankAcount">
+            <el-input v-model="formPay.toBankAcount"></el-input>
+          </el-form-item>
+          <el-form-item label="账号名称：" prop="toBankName">
+            <el-input v-model="formPay.toBankName"></el-input>
+          </el-form-item>
+          <el-form-item label="银行名称：" prop="toBankTypeName">
+            <el-input v-model="formPay.toBankTypeName"></el-input>
+          </el-form-item>
+          <el-form-item label="备注：" prop="remark">
+            <el-input
+              type="textarea"
+              :rows="4"
+              v-model="formPay.remark"
+            ></el-input>
+          </el-form-item>
+        </el-form>
         <el-divider></el-divider>
         <em>订单信息：</em>
         <p>
           支付金额：<span
             class="color_red"
             style="font-size: 28px; font-weight: 400"
-            >¥ 5,107.49</span
+            >¥
+            {{
+              checkFrom === 2
+                ? form.divideCompanyMoney
+                : checkFrom === 3
+                ? form.divideSellerMoney
+                : 0
+            }}</span
           >
         </p>
-        <p>
+        <!-- <p>
           支付方式：<el-radio v-model="form.payType" :label="1"
             >微信支付</el-radio
           >
           <el-radio v-model="form.payType" :label="2" v-if="!ShowStatus()"
             >网银支付、对公转账</el-radio
           >
+        </p> -->
+        <p>
+          下单时间：<em>{{
+            $methodsTools.onlyForma(type === 1 ? form.buyTime : form.applyTime)
+          }}</em>
         </p>
-        <p>下单时间：<em>2022-12-12</em></p>
-        <p>订单单号：<em>54664666661464154</em></p>
-        <el-divider></el-divider>
+        <p>
+          订单单号：<em>{{ form.orderSn }}</em>
+        </p>
+        <!-- <el-divider></el-divider>
         <em>支付方式：</em>
         <el-tag type="success" v-if="form.payType === 1">原路返回</el-tag>
-        <el-tag type="danger" v-if="form.payType === 2">网银支付</el-tag>
+        <el-tag type="danger" v-if="form.payType === 2">网银支付</el-tag> -->
       </template>
     </BaseDialog>
   </div>
@@ -88,22 +145,55 @@ export default {
       type: Boolean,
       default: false,
     },
+    type: {
+      type: Number,
+      default: 0, //1付款  2退款
+    },
+    orderSn: {
+      type: String,
+      default: "",
+    },
+    checkFrom: {
+      type: Number,
+      default: 0, //1退款  2机构 3业务员
+    },
   },
   data() {
     return {
+      disabledBtn: false,
       auditProgress: false,
+      formData: {
+        checkResult: "",
+        checkReason: "",
+      },
       form: {
-        type: 1, //1付款2退款
-        step: 4, //1会计2财务3总经理4出纳
-        payType: 1, //1微信支付2其他支付
-        data1: "",
-        data2: "",
+        checkLogVos: [],
       },
       rules: {
-        data1: [
+        checkResult: [
           { required: true, message: "请选择审核结果", trigger: "change" },
         ],
-        data2: [{ required: true, message: "请输入审核意见", trigger: "blur" }],
+        checkReason: [
+          { required: true, message: "请输入审核意见", trigger: "blur" },
+        ],
+      },
+      formPay: {
+        toBankAcount: "",
+        toBankName: "",
+        toBankTypeName: "",
+        remark: "",
+      },
+      rulesPay: {
+        remark: [{ required: false, message: "请输入备注", trigger: "blur" }],
+        toBankAcount: [
+          { required: true, message: "请输入银行账号", trigger: "blur" },
+        ],
+        toBankName: [
+          { required: true, message: "请输入账号名称", trigger: "blur" },
+        ],
+        toBankTypeName: [
+          { required: true, message: "请输入银行名称", trigger: "blur" },
+        ],
       },
     };
   },
@@ -112,48 +202,94 @@ export default {
 
   methods: {
     ShowStatus() {
-      return this.form.type === 1 ? true : false;
+      return this.type === 1 ? true : false;
     },
     init() {
       this.resetForm();
-      if (this.id) {
-      }
+      this.$api[
+        this.type === 1
+          ? "systemtoporderdividedetail"
+          : "systemtoporderrefunddetail"
+      ](this.orderSn).then((res) => {
+        this.form = res.data;
+      });
     },
     close() {
-      if (this.form.step !== 4) {
-        this.$refs["form"].resetFields();
+      if (
+        this.form.checkType === 1 ||
+        this.form.checkType === 2 ||
+        this.form.checkType === 5
+      ) {
+        this.$refs["formData"].resetFields();
+      }
+      if (this.form.checkType === 3 || this.form.checkType === 6) {
+        this.$refs["rulesPay"].resetFields();
       }
     },
     resetForm() {
       this.form = {
-        type: 1, //1付款2退款
-        step: 4, //1会计2财务3总经理4出纳
-        payType: 1, //1微信支付2其他支付
-        data1: "",
-        data2: "",
+        checkLogVos: [],
+      };
+      this.formData = {
+        checkResult: "",
+        checkReason: "",
       };
     },
     submitForm() {
-      if (this.form.step === 4) {
-        this.$confirm("确定支付账款吗？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.isShow = false;
-            this.$emit("search");
-            this.$message({
-              type: "success",
-              message: "支付成功!",
-            });
-          })
-          .catch(() => {});
+      if (this.form.checkType === 3 || this.form.checkType === 6) {
+        this.$refs["rulesPay"].validate((valid) => {
+          if (valid) {
+            this.$confirm("确定支付账款吗？", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            })
+              .then(() => {
+                let c = {
+                  divideModel: this.form.divideModel,
+                  orderSn: this.form.orderSn,
+                  tenantId: this.form.tenantId,
+                  ...this.formPay,
+                };
+                this.$api.orderbankpay(c).then((res) => {
+                  this.isShow = false;
+                  this.$emit("search");
+                  this.$message({
+                    type: "success",
+                    message: "支付成功!",
+                  });
+                });
+              })
+              .catch(() => {
+                this.$message({
+                  type: "info",
+                  message: "已取消删除",
+                });
+              });
+          } else {
+            return false;
+          }
+        });
       } else {
-        this.$refs["form"].validate((valid) => {
+        this.$refs["formData"].validate((valid) => {
           if (valid) {
-            this.isShow = false;
-            this.$emit("search");
+            this.disabledBtn = true;
+            this.$api[
+              this.type === 1
+                ? "checkorderlogeditDivide"
+                : "systemtoporderrefundcheck"
+            ]({
+              checkFrom: this.type === 1 ? this.checkFrom : undefined,
+              orderSn: this.orderSn,
+              ...this.formData,
+            })
+              .then((res) => {
+                this.isShow = false;
+                this.$emit("search");
+              })
+              .finally(() => {
+                this.disabledBtn = false;
+              });
           } else {
             return false;
           }

src/components/searchBoxNew.vue

@@ -121,7 +121,11 @@
                 (item.filter && items.educationName === '继续教育')
               "
               :key="indexs"
-              :label="items.educationName"
+              :label="
+                item.schemeName && items.schemeName
+                  ? items.schemeName + ' - ' + items.educationName
+                  : items.educationName
+              "
               :value="items.id"
             ></el-option>
           </el-select>
@@ -205,7 +209,20 @@
               :value="items.id"
             ></el-option>
           </el-select>
-
+          <!-- 角色列表 -->
+          <el-select
+            v-else-if="item.scope === 'roleList'"
+            v-model="formData[item.prop]"
+            :placeholder="item.placeholder"
+            :size="size"
+          >
+            <el-option
+              v-for="(items, indexs) in roleList"
+              :key="indexs"
+              :label="items.roleName"
+              :value="items.roleId"
+            ></el-option>
+          </el-select>
           <!-- 专业 -->
           <el-select
             v-else-if="item.scope === 'ProfessionalList'"
@@ -719,6 +736,7 @@ export default {
       "applySiteAddress",
       "certificate",
       "systemtenantlist",
+      "roleList",
     ]),
     /**
      * @remarks 过滤选择器列表
@@ -741,13 +759,13 @@ export default {
                 });
                 if (
                   items.scope === "businessLevel" &&
-                  this.educationType[indexType].tireStatus.indexOf("2") !== -1
+                  this.educationType[indexType].tireStatus?.indexOf("2") !== -1
                 ) {
                   return items;
                 }
                 if (
                   items.scope === "schoolList" &&
-                  this.educationType[indexType].tireStatus.indexOf("3") !==
+                  this.educationType[indexType].tireStatus?.indexOf("3") !==
                     -1 &&
                   this.formData["businessId"]
                 ) {
@@ -755,7 +773,7 @@ export default {
                 }
                 if (
                   items.scope === "Professional" &&
-                  this.educationType[indexType].tireStatus.indexOf("4") !==
+                  this.educationType[indexType].tireStatus?.indexOf("4") !==
                     -1 &&
                   this.formData["businessId"]
                 ) {
@@ -949,7 +967,7 @@ export default {
       const indexs = this.educationType.findIndex((item) => {
         return item.id === id;
       });
-      this.tireStatus = this.educationType[indexs].tireStatus;
+      this.tireStatus = this.educationType[indexs].tireStatus || '';
       if (!status1) {
         if (this.formData.projectId) {
           this.formData.projectId = "";

src/fxApi/orderManageList.js

@@ -24,5 +24,122 @@ export default {
             data
         })
     },
+    //获取订单详细信息
+    systemtoporderid(data) {
+        return request({
+            url: '/system/top/order/' + data,
+            method: 'get',
+        })
+    },
+    //获取订单商品信息
+    systemtopordergoodslist(data) {
+        return request({
+            url: '/system/top/order/goods/list',
+            method: 'get',
+            params: data
+        })
+    },
+    //订单退款审核
+    systemtoporderrefundcheck(data) {
+        return request({
+            url: '/system/top/order/refund/check',
+            method: 'post',
+            data
+        })
+    },
+    //订单审核
+    systemtopordercheck(data) {
+        return request({
+            url: '/system/top/order/check',
+            method: 'post',
+            data
+        })
+    },
+    
+    //订单退款审核详情
+    systemtoporderrefunddetail(data) {
+        return request({
+            url: '/system/top/order/refund/detail/' + data,
+            method: 'get',
+        })
+    },
+    //订单应付审核详情
+    systemtoporderdividedetail(data) {
+        return request({
+            url: '/system/top/order/divide/detail/' + data,
+            method: 'get',
+        })
+    },
+    //获取订单成本设置
+    systemtopordercost(data) {
+        return request({
+            url: '/system/top/order/cost/' + data,
+            method: 'get',
+        })
+    },
+    //批量订单成本修改
+    systemtoporderupdatecost(data) {
+        return request({
+            url: '/system/top/order/update/cost',
+            method: 'post',
+            data
+        })
+    },
+    //查询审核记录列表
+    checkorderloglist(data) {
+        return request({
+            url: '/check/order/log/list',
+            method: 'get',
+            params: data
+        })
+    },
+    //修改订单退款审核记录
+    checkorderlogedit(data) {
+        return request({
+            url: '/check/order/log/edit',
+            method: 'post',
+            data
+        })
+    },
+    //修改订单分成审核记录
+    checkorderlogeditDivide(data) {
+        return request({
+            url: '/check/order/log/editDivide',
+            method: 'post',
+            data
+        })
+    },
+    //导出订单列表
+    systemtoporderexport(data) {
+        return request({
+            url: '/system/top/order/export',
+            method: 'get',
+            params: data
+        })
+    },
+    //订单操作记录
+    systemtoporderlog(data) {
+        return request({
+            url: '/system/top/order/log',
+            method: 'get',
+            params: data
+        })
+    },
+    //批量完单
+    systemtoporderfinish(data) {
+        return request({
+            url: '/system/top/order/finish',
+            method: 'post',
+            data
+        })
+    },
+    //新增订单网银打款
+    orderbankpay(data) {
+        return request({
+            url: '/order/bank/pay',
+            method: 'post',
+            data
+        })
+    },
     
 }

src/utils/index.js

@@ -394,7 +394,7 @@ export function isNumberStr(str) {
 }
 
 export function exportFn(str, name) {
-  let url = process.env.VUE_APP_BASE_API + "common/download?fileName=" + str;
+  let url = process.env.VUE_APP_BASE_API + "sys/common/download?fileName=" + str;
   let link = document.createElement("a");
   let fileName = name + ".xlsx";
   document.body.appendChild(link);

src/utils/request.js

@@ -7,9 +7,9 @@ import methods from '@/utils/methodsTool';
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
-export const baseURL = process.env.VUE_APP_BASE_API
+// export const baseURL = process.env.VUE_APP_BASE_API
 // export const baseURL = 'https://ptapi.gdzzkj.net/'
-// export const baseURL = 'http://192.168.1.7:7077/'
+export const baseURL = 'http://192.168.1.7:7077/'
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分

src/views/financed/arap/index.vue

@@ -60,13 +60,9 @@
           <div>{{ props.scope.row.dayTime }}</div>
         </div>
       </template>
-      <template slot="refundStatus" slot-scope="props">
+      <template slot="divideCheckStatus" slot-scope="props">
         <div>
-          {{
-            ["待审核", "未通过", "未退款", "已完成"][
-              props.scope.row.refundStatus
-            ]
-          }}
+          {{ divideCheckStatus(props.scope.row.divideCheckStatus) }}
           <span style="color: #409eff" v-if="props.scope.row.roleName">
             ({{ props.scope.row.roleName }})
           </span>
@@ -90,7 +86,10 @@
         <template v-else>
           <el-button
             type="text"
-            :disabled="props.scope.row.creditStatus == 1"
+            :disabled="
+              props.scope.row.creditStatus == 1 ||
+              props.scope.row.divideCheckStatus == 3
+            "
             @click="openDialog(props.scope.row, 2)"
           >
             点击审核
@@ -117,17 +116,30 @@
       @search="search"
     />
     <!-- 订单详情 -->
-    <dislog-order-details :dialogVisible.sync="orderDialogVisible" />
+    <dislog-order-details
+      :orderSn="activeOrderInfo.orderSn"
+      :orderFrom="activeOrderInfo.orderFrom"
+      :dialogVisible.sync="orderDialogVisible"
+    />
     <arap-remarks
       :orderSn="activeOrderInfo.orderSn"
       :remark="activeOrderInfo.remark"
       @search="search"
       :dialogVisible.sync="remarkDialogVisible"
     ></arap-remarks>
+
+    <dislog-set
+      :dialogVisible.sync="examineDialogVisible"
+      @search="search"
+      :type="1"
+      :orderSn="activeOrderInfo.orderSn"
+      :checkFrom="type + 1"
+    ></dislog-set>
   </div>
 </template>
 
 <script>
+import dislogSet from "@/components/audit/dislogSet.vue";
 import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
@@ -153,6 +165,7 @@ export default {
     dislogTip,
     dislogOrderDetails,
     arapRemarks,
+    dislogSet,
   },
   data() {
     return {
@@ -307,10 +320,10 @@ export default {
         },
         {
           label: "审核状态",
-          prop: "refundStatus",
+          prop: "divideCheckStatus",
           hidden: true,
           scope: "solt",
-          soltName: "refundStatus",
+          soltName: "divideCheckStatus",
         },
         {
           label: "备注",
@@ -362,10 +375,10 @@ export default {
         },
         {
           label: "审核状态",
-          prop: "refundStatus",
+          prop: "divideCheckStatus",
           hidden: true,
           scope: "solt",
-          soltName: "refundStatus",
+          soltName: "divideCheckStatus",
         },
         {
           label: "备注",
@@ -378,6 +391,7 @@ export default {
       tipDialogVisible: false,
       orderDialogVisible: false,
       remarkDialogVisible: false,
+      examineDialogVisible: false,
       type: 0,
       activeOrderInfo: {},
       roleList: [],
@@ -388,6 +402,30 @@ export default {
     this.init();
   },
   methods: {
+    divideCheckStatus(e) {
+      var a = "";
+      switch (e) {
+        case -1:
+          a = "未通过";
+          break;
+        case 0:
+          a = "待审核";
+          break;
+        case 1:
+          a = "已通过";
+          break;
+        case 2:
+          a = "待支付";
+          break;
+        case 3:
+          a = "已支付";
+          break;
+
+        default:
+          break;
+      }
+      return a;
+    },
     openDialog(data, type) {
       this.activeOrderInfo = data;
       this[

src/views/financed/components/arapRemarks.vue

@@ -26,7 +26,7 @@ export default {
       default: false,
     },
     orderSn: {
-      type: Number,
+      type: String,
     },
     remark: {
       type: String,

src/views/financed/components/dislogOrderDetails.vue

@@ -8,8 +8,28 @@
       :isShowFooter="false"
     >
       <div class="head">
-        订单号：<span>1561653316541656313</span> 退款状态：<span>——</span>
-        审核状态：<span>已通过</span>
+        订单号：<span>{{ detailInfo.orderSn }}</span> 退款状态：<span>{{
+          refundStatus(detailInfo.refundStatus)
+        }}</span>
+        <span v-if="orderFrom === 3"
+          >审核状态：{{ checkStatus(detailInfo.checkStatus) }}</span
+        >
+        <i v-if="ShowStatus" style="float: right">
+          <el-button
+            type="success"
+            size="small"
+            @click="success"
+            :disabled="orderFrom !== 3"
+            >审核通过</el-button
+          >
+          <el-button
+            type="danger"
+            size="small"
+            @click="error"
+            :disabled="orderFrom !== 3"
+            >审核不通过</el-button
+          >
+        </i>
       </div>
       <div class="mian">
         <el-descriptions class="margin-top" :column="3" border>
@@ -29,12 +49,20 @@
               <el-image
                 v-if="desc.type === 'image'"
                 style="width: 40px; height: 20px"
-                :src="$methodsTools.splitImgHost(detailInfo[desc.key])"
-                :preview-src-list="[
-                  $methodsTools.splitImgHost(detailInfo[desc.key]),
-                ]"
+                :src="detailInfo[desc.key][0]"
+                :preview-src-list="detailInfo[desc.key]"
               >
               </el-image>
+              <div v-if="desc.type === 'time'">
+                {{ $methodsTools.onlyForma(detailInfo[desc.key]) }}
+              </div>
+              <div v-if="desc.type === 'options'">
+                <template v-for="(i, k) in desc.options">
+                  <span v-if="i.value === detailInfo[desc.key]">
+                    {{ i.label }}
+                  </span>
+                </template>
+              </div>
             </div>
             <div v-else>
               {{ detailInfo[desc.key] }}
@@ -52,7 +80,11 @@
           </el-descriptions-item>
         </el-descriptions>
       </div>
-      <student-details></student-details>
+      <student-details
+        v-if="isShow"
+        :orderSn="orderSn"
+        :orderFrom="orderFrom"
+      ></student-details>
     </BaseDialog>
   </div>
 </template>
@@ -66,37 +98,57 @@ export default {
       type: Boolean,
       default: false,
     },
-    id: {
+    orderSn: {
       type: String,
-      default: "",
+    },
+    orderFrom: {
+      type: Number,
+    },
+    ShowStatus: {
+      type: Boolean,
+      default: false,
     },
   },
   data() {
     return {
       descList: [
-        { label: "机构名称", key: "123" },
-        { label: "业务员", key: "123" },
-        { label: "业务号", key: "123" },
-        { label: "业务分类", key: "123" },
-        { label: "订单来源", key: "123" },
-        { label: "申请时间", key: "123" },
-        { label: "盈亏(元)", key: "888" },
-        { label: "成本(元)", key: "123" },
-        { label: "合同金额(元)", key: "123" },
-        { label: "已收账款(元)", key: "123" },
-        { label: "申请退款", key: "123" },
-        { label: "已退账款(元)", key: "123" },
-        { label: "未收账款(元)", key: "999" },
-        { label: "实际账款(元)", key: "123" },
-        { label: "下单企业", key: "123" },
+        { label: "机构名称", key: "tenantName" },
+        { label: "业务员", key: "createUsername" },
+        { label: "业务号", key: "createNo" },
+        { label: "业务分类", key: "schemeName" },
+        { label: "订单来源", key: "orderOrg" },
+        { label: "申请时间", key: "buyTime", type: "time" },
+        { label: "盈亏(元)", key: "orderProfit" },
+        { label: "成本(元)", key: "orderCost" },
+        { label: "合同金额(元)", key: "orderPrice" },
+        { label: "已收账款(元)", key: "orderReceived" },
+        { label: "申请退款", key: "orderRefund" },
+        { label: "已退账款(元)", key: "orderRefunded" },
+        { label: "未收账款(元)", key: "orderUncollected" },
+        { label: "实际账款(元)", key: "orderPractical" },
+        { label: "下单企业", key: "tenantName" },
         { label: "转账开户名", key: "123" },
-        { label: "转账凭证", key: "avatar", type: "image" },
-        { label: "发票状态", key: "123" },
-        { label: "备注", key: "123" },
+        { label: "转账凭证", key: "attachmentList", type: "image" },
+        {
+          label: "发票状态",
+          key: "invoiceStatus",
+          type: "options",
+          options: [
+            {
+              label: "未开票",
+              value: 0,
+            },
+            {
+              label: "已开票",
+              value: 1,
+            },
+          ],
+        },
+        { label: "备注", key: "remark" },
         { label: "附件", type: "dowm" },
       ],
       detailInfo: {
-        avatar: "oss/images/avatar/20211103/1635931027923_941464701",
+        attachmentList: [],
       },
     };
   },
@@ -104,28 +156,120 @@ export default {
   mounted() {},
 
   methods: {
+    //退款状态
+    refundStatus(i) {
+      var str = "";
+      switch (i) {
+        case 0:
+          str = "待审核";
+          break;
+        case 1:
+          str = "正常";
+          break;
+        case 2:
+          str = "未退款";
+          break;
+        case 3:
+          str = "已完成";
+          break;
+        case 4:
+          str = "未通过";
+          break;
+
+        default:
+          break;
+      }
+      return str;
+    },
+    //审核状态
+    checkStatus(i) {
+      var str = "";
+      switch (i) {
+        case 0:
+          str = "待审核";
+          break;
+        case 1:
+          str = "已通过";
+          break;
+        case 2:
+          str = "未通过";
+          break;
+        case 3:
+          str = "已撤销";
+          break;
+        default:
+          break;
+      }
+      return str;
+    },
     init() {
       this.getOrderDetail();
     },
-    getOrderDetail() {},
-    close() {
-      this.$refs["form"].resetFields();
-    },
-    submit() {},
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          this.isShow = false;
-          this.$emit("search");
+    getOrderDetail() {
+      this.$api.systemtoporderid(this.orderSn).then((res) => {
+        if (res.data.attachmentList?.length > 0) {
+          res.data.attachmentList = res.data.attachmentList.map(
+            (i) => i.attachmentUrl
+          );
         } else {
-          return false;
+          res.data.attachmentList = [];
         }
+        console.log(res.data);
+        this.detailInfo = res.data;
       });
     },
+    close() {},
+    submit() {},
+    submitForm() {
+      this.isShow = false;
+      this.$emit("search");
+    },
+    success() {
+      this.$confirm("确定审核通过吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api
+            .systemtopordercheck({
+              checkStatus: 1,
+              orderSn: this.orderSn,
+            })
+            .then((res) => {
+              this.init();
+              this.$message.success("操作成功");
+            });
+        })
+        .catch(() => {});
+    },
+    error() {
+      this.$prompt("确定审核不通过吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        inputPlaceholder: "输入不通过原因",
+      })
+        .then(({ value }) => {
+          this.$api
+            .systemtopordercheck({
+              checkReason: value || "",
+              checkStatus: 2,
+              orderSn: this.orderSn,
+            })
+            .then((res) => {
+              this.init();
+              this.$message.success("操作成功");
+            });
+        })
+        .catch(() => {});
+    },
   },
   computed: {
     isShow: {
       get() {
+        if (this.dialogVisible) {
+          this.init();
+        }
         return this.dialogVisible;
       },
       set(val) {

src/views/financed/components/studentDetails.vue

@@ -4,16 +4,53 @@
       <el-tab-pane label="学员详情" name="1">
         <div style="margin-bottom: 10px">
           <!-- 搜索框 -->
+          <el-select
+          v-if="false"
+            style="width: 230px; margin-right: 10px"
+            size="small"
+            v-model="formData.studyStatus"
+            clearable
+            placeholder="请选择学习状态"
+          >
+            <el-option
+              v-for="item in studyStatusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-select
+            style="width: 230px; margin-right: 10px"
+            size="small"
+            v-model="formData.refundStatus"
+            clearable
+            placeholder="请选择退款状态"
+          >
+            <el-option
+              v-for="item in refundStatusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-input
+            style="width: 230px; margin-right: 10px"
+            size="small"
+            v-model="formData.userName"
+            placeholder="姓名"
+          ></el-input>
           <el-input
             style="width: 230px; margin-right: 10px"
             size="small"
-            v-model="form.templateName"
-            placeholder="姓名/身份证号"
+            v-model="formData.userCard"
+            placeholder="身份证号"
           ></el-input>
-          <el-button size="small" type="primary" @click="search(form.goodsId)"
+          <el-button size="small" type="primary" @click="search"
             >查询</el-button
           >
-          <el-button size="small">重置</el-button>
+          <el-button size="small" @click="search('init')">重置</el-button>
         </div>
         <table-list
           :tableSets="tableSet1"
@@ -51,54 +88,96 @@ import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
   name: "SaasMasterPlatformStudentDetails",
-
+  props: {
+    orderSn: {
+      type: String,
+    },
+    orderFrom: {
+      type: Number,
+    },
+  },
   data() {
     return {
-      form: {},
+      studyStatusList: [
+        {
+          label: "未开始",
+          value: 0,
+        },
+        {
+          label: "学习中",
+          value: 1,
+        },
+        {
+          label: "已结束",
+          value: 2,
+        },
+      ],
+      refundStatusList: [
+        {
+          label: "待审核",
+          value: 0,
+        },
+        {
+          label: "正常",
+          value: 1,
+        },
+        {
+          label: "未退款",
+          value: 2,
+        },
+        {
+          label: "已完成",
+          value: 3,
+        },
+        {
+          label: "未通过",
+          value: 4,
+        },
+      ],
       tableSet1: [
         {
           label: "姓名",
-          prop: "educationName",
+          prop: "userName",
           hidden: true,
         },
         {
           label: "身份证号",
-          prop: "businessName",
+          prop: "userCard",
           hidden: true,
         },
         {
           label: "手机号",
-          prop: "name",
+          prop: "userPhone",
           hidden: true,
         },
         {
           label: "课程",
-          prop: "specNumber",
+          prop: "goodsName",
           hidden: true,
         },
         {
           label: "专业",
-          prop: "specNumber",
+          prop: "majorName",
           hidden: true,
         },
         {
           label: "业务",
-          prop: "specNumber",
+          prop: "businessName",
           hidden: true,
         },
         {
           label: "原价(元)",
-          prop: "specNumber",
+          prop: "goodsPrice",
           hidden: true,
         },
         {
           label: "单价(元)",
-          prop: "specNumber",
+          prop: "goodsRealPrice",
           hidden: true,
         },
         {
           label: "学习状态",
-          prop: "specNumber",
+          prop: "studyStatus",
           hidden: true,
         },
       ],
@@ -106,32 +185,48 @@ export default {
       tableSet2: [
         {
           label: "时间",
-          prop: "educationName",
+          prop: "createTime",
           hidden: true,
+          scope: "aTimeList",
         },
         {
           label: "操作者",
-          prop: "businessName",
+          prop: "createBy",
           hidden: true,
         },
         {
           label: "动作",
-          prop: "name",
+          prop: "action",
           hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "修改",
+              value: "update",
+            },
+            {
+              label: "新增",
+              value: "insert",
+            },
+            {
+              label: "删除",
+              value: "delete",
+            },
+          ],
         },
         {
           label: "字段",
-          prop: "specNumber",
+          prop: "field",
           hidden: true,
         },
         {
           label: "操作前",
-          prop: "specNumber",
+          prop: "fieldBefore",
           hidden: true,
         },
         {
           label: "操作后",
-          prop: "specNumber",
+          prop: "fieldAfter",
           hidden: true,
         },
       ],
@@ -161,13 +256,36 @@ export default {
       tabType: "1",
     };
   },
-
+  created() {
+    this.search("init");
+  },
   mounted() {},
 
   methods: {
-    search() {},
+    search(e) {
+      if (e === "init") {
+        this.formData = {
+          pageSize: 10,
+          pageNum: 1,
+          orderSn: this.orderSn,
+          orderFrom: this.orderFrom,
+        };
+      }
+      this.$api[
+        this.tabType === "1" ? "systemtopordergoodslist" : "systemtoporderlog"
+      ](this.formData).then((res) => {
+        if (this.tabType === "1") {
+          this.tableData1 = res.rows;
+          this.total = res.total;
+        }
+        if (this.tabType === "2") {
+          this.tableData2 = res.rows;
+          this.total = res.total;
+        }
+      });
+    },
     handleClick(tab) {
-      console.log(tab);
+      this.search("init");
     },
   },
   components: {

src/views/financed/cost/dislogSet.vue

@@ -142,7 +142,7 @@
           >
             <el-col :span="11">
               <el-input
-                v-int="{ set: 0 }"
+                v-int
                 placeholder="最低价"
                 v-model.number="item.minValue"
               ></el-input>
@@ -150,10 +150,10 @@
             <el-col class="line" :span="2" style="magrin: 10px">-</el-col>
             <el-col :span="11">
               <el-input
-                @keyup.native="regValue(item)"
+                v-int
                 placeholder="最高价"
                 @change="changeMaxValue('itemList.' + index + '.minValue')"
-                v-model="item.maxValue"
+                v-model.number="item.maxValue"
               ></el-input>
             </el-col>
           </el-form-item>
@@ -210,7 +210,7 @@ export default {
       type: Boolean,
       default: false,
     },
-    // 0 新增  1修改  2复制
+    // 0 新增  1修改  2复制  3订单成本设置  4批量设置
     type: {
       type: [String, Number],
       default: 0,
@@ -279,12 +279,29 @@ export default {
     };
   },
   methods: {
-    init() {
+    init() { 
       this.resetForm();
-      this.tpId && this.getCostDetail();
+      if (this.type === 3) {
+        this.getOrderCostDetail();
+      } else if (this.type === 4) {
+      } else {
+        this.tpId && this.getCostDetail();
+      }
       this.getTenantList();
       this.getEduList();
     },
+    getOrderCostDetail() {
+      this.$api.systemtopordercost(this.tpId).then((res) => {
+        Object.keys(this.form).map((key) => {
+          this.form[key] = res.data[key];
+        });
+        this.form.itemList.forEach((ele) => {
+          if (ele.maxValue == -1) {
+            ele.maxValue = "*";
+          }
+        });
+      });
+    },
     getCostDetail() {
       costDetail(this.tpId).then((res) => {
         if (this.type == 2) delete this.form["tpId"];
@@ -383,10 +400,18 @@ export default {
               ele.maxValue = -1;
             }
           });
-          if (this.type !== 1) {
-            addCost(form).then(this.cb);
+          if (this.type === 3 || this.type === 4) {
+            this.$api
+              .systemtoporderupdatecost({
+                costTpVo: this.form,
+                orderSnList:
+                  this.type === 3 ? [this.tpId] : this.tpId?.split(","),
+              })
+              .then(this.cb);
+          } else if (this.type !== 1) {
+            addCost(this.form).then(this.cb);
           } else {
-            editCost(form).then(this.cb);
+            editCost(this.form).then(this.cb);
           }
         } else {
           return false;
@@ -447,7 +472,9 @@ export default {
       },
     },
     title() {
-      return ["新增", "修改", "复制"][this.type];
+      return ["新增", "修改", "复制", "订单成本设置", "批量成本设置"][
+        this.type
+      ];
     },
     itemList() {
       return this.form.itemList;

src/views/financed/orderManageList/index.vue

@@ -8,11 +8,16 @@
       @init="init"
     />
     <div style="margin-bottom: 12px">
-      <el-button type="primary" size="small">成本设置</el-button>
+      <el-button type="primary" size="small" @click="editCost"
+        >成本设置</el-button
+      >
+      <el-button type="primary" size="small" @click="completeOrder(false)"
+        >完单确认</el-button
+      >
       <el-button type="primary" size="small" @click="editRemarks(1)"
         >修改备注</el-button
       >
-      <el-button size="small">导出excel</el-button>
+      <el-button size="small" @click="exportExcel()">导出excel</el-button>
     </div>
     <div class="dis_flex_order_li">
       <div class="list" v-for="(item, index) in ShowTabList" :key="index">
@@ -38,11 +43,13 @@
       :loading="loading"
     >
       <template slot="orderInfo" slot-scope="props">
-        <div>机构名称：{{ props.scope.row["createOrg"] }}</div>
-        <div>业务员：{{ props.scope.row["createNo"] }}</div>
-        <div>业务号：{{ props.scope.row["createSysUserId"] }}</div>
-        <div>订单来源：{{ props.scope.row["orderFrom"] }}</div>
-        <div>订单日期：{{ props.scope.row["orderCost"] }}</div>
+        <div>机构名称：{{ props.scope.row["tenantName"] }}</div>
+        <div>业务员：{{ props.scope.row["createUsername"] }}</div>
+        <div>业务号：{{ props.scope.row["createNo"] }}</div>
+        <div>订单来源：{{ props.scope.row["orderOrg"] }}</div>
+        <div>
+          订单日期：{{ $methodsTools.onlyForma(props.scope.row["buyTime"]) }}
+        </div>
         <div>订单号：{{ props.scope.row["orderSn"] }}</div>
       </template>
       <template slot="orderPrice" slot-scope="props">
@@ -54,7 +61,7 @@
         <div style="color: red">
           (预计收款时间){{ props.scope.row["predictReceiveTime"] }}
         </div>
-        <div>实际账款：1234.00</div>
+        <div>实际账款：{{ props.scope.row["orderPractical"] }}</div>
       </template>
       <template slot="inon" slot-scope="props">
         <div>成本（元）：{{ props.scope.row["orderCost"] }}</div>
@@ -66,7 +73,9 @@
       <template slot="statusRoles" slot-scope="props">
         <div>
           {{ refundStatus(props.scope.row["refundStatus"])
-          }}<span style="color: red">(总经理)</span>
+          }}<span style="color: red" v-if="props.scope.row['refundName']"
+            >({{ props.scope.row["refundName"] }})</span
+          >
         </div>
       </template>
       <template slot="type" slot-scope="props">
@@ -75,14 +84,38 @@
         </div>
       </template>
       <template slot="btn" slot-scope="props">
-        <el-button type="text">查看详情</el-button>
-        <el-button type="text">成本设置</el-button>
-        <el-button type="text">订单审核</el-button>
-        <el-button type="text" @click="handelClick">退款审核</el-button>
+        <el-button type="text" @click="openDialog(props.scope.row)"
+          >查看详情</el-button
+        >
+        <el-button type="text" @click="handelClickCost(props.scope.row)"
+          >成本设置</el-button
+        >
+        <el-button
+          type="text"
+          @click="openDialog(props.scope.row, 1)"
+          :disabled="
+            props.scope.row.orderFrom !== 3 || props.scope.row.checkStatus === 3
+          "
+          >订单审核</el-button
+        >
+        <el-button
+          type="text"
+          @click="handelClick(props.scope.row)"
+          :disabled="
+            props.scope.row.refundStatus !== 0 &&
+            props.scope.row.refundStatus !== 2
+          "
+          >退款审核</el-button
+        >
         <el-button type="text" @click="editRemarks(props.scope.row)"
           >修改备注</el-button
         >
-        <el-button type="text">转账凭证</el-button>
+        <el-button type="text" @click="seePZ(props.scope.row.attachmentList)"
+          >转账凭证</el-button
+        >
+        <el-button type="text" @click="completeOrder(props.scope.row.orderSn)"
+          >完单确认</el-button
+        >
       </template>
     </table-list>
     <pagination
@@ -91,29 +124,68 @@
       :currentPage.sync="formData.pageNum"
       @search="search"
     />
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="
+        () => {
+          showViewer = false;
+        }
+      "
+      :url-list="imgList"
+    >
+    </el-image-viewer>
     <dislog-set
       :dialogVisible.sync="dialogVisible"
       @search="search"
+      :type="2"
+      :orderSn="orderSn"
     ></dislog-set>
     <remarks
       :dialogVisible.sync="remarksVisible"
       @search="search"
       :options="remarksOptions"
     ></remarks>
+    <dislogOrderDetails
+      :dialogVisible.sync="orderDialogVisible"
+      :orderSn="orderSn"
+      :orderFrom="orderFrom"
+      :ShowStatus="ShowStatus"
+    ></dislogOrderDetails>
+    <dislog-set-cost
+      :dialogVisible.sync="dialogVisiblecost"
+      :tpId="tpId"
+      :type="type"
+      @search="search"
+    ></dislog-set-cost>
   </div>
 </template>
 
 <script>
+import { exportFn } from "@/utils/index.js";
+import dislogSetCost from "../cost/dislogSet.vue";
 import dislogSet from "@/components/audit/dislogSet.vue";
 import remarks from "../components/remarks.vue";
 import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
+import dislogOrderDetails from "../components/dislogOrderDetails.vue";
 export default {
   name: "orderManageList",
-  components: { searchBoxNew, tableList, pagination, dislogSet, remarks },
+  components: {
+    searchBoxNew,
+    tableList,
+    pagination,
+    dislogSet,
+    remarks,
+    dislogOrderDetails,
+    dislogSetCost,
+    "el-image-viewer": () =>
+      import("element-ui/packages/image/src/image-viewer"),
+  },
   data() {
     return {
+      showViewer: false,
+      imgList: [],
       ShowTabList: [
         {
           label: "盈亏",
@@ -198,79 +270,87 @@ export default {
       //搜索
       formList: [
         {
-          prop: "name",
+          prop: "roleId",
           placeholder: "角色分类",
-          scope: "select",
-          options: [
-            { label: "会计", value: 1 },
-            { label: "财务", value: 2 },
-            { label: "总经理", value: 3 },
-            { label: "出纳", value: 4 },
-          ],
+          scope: "roleList",
         },
+        // {
+        //   prop: "businessFullName",
+        //   placeholder: "业务分类",
+        //   scope: "select",
+        //   options: [
+        //     { label: "学校业务", value: 1 },
+        //     { label: "办证质询", value: 2 },
+        //   ],
+        // },
         {
-          prop: "name",
-          placeholder: "业务分类",
-          scope: "select",
-          options: [
-            { label: "学校业务", value: 1 },
-            { label: "办证质询", value: 2 },
-          ],
+          prop: "educationTypeId",
+          placeholder: "教育类型",
+          scope: "educationType",
+          schemeName: true,
         },
         {
-          prop: "name",
+          prop: "businessId",
+          placeholder: "业务层次",
+          scope: "businessLevel",
+          edu: "educationTypeId",
+        },
+        {
+          prop: "checkStatus",
           placeholder: "审核状态",
           scope: "select",
           options: [
-            { label: "待审核", value: 1 },
-            { label: "已通过", value: 2 },
-            { label: "未通过", value: 3 },
-            { label: "已撤销", value: 4 },
+            { label: "待审核", value: 0 },
+            { label: "已通过", value: 1 },
+            { label: "未通过", value: 2 },
+            { label: "已撤销", value: 3 },
           ],
         },
         {
-          prop: "name",
+          prop: "refundStatusList",
           placeholder: "退款状态",
           scope: "select",
           options: [
-            { label: "待审核", value: 1 },
-            { label: "未通过", value: 2 },
-            { label: "带退款", value: 3 },
-            { label: "已完成", value: 4 },
+            { label: "待审核", value: 0 },
+            { label: "正常", value: 1 },
+            { label: "未退款", value: 2 },
+            { label: "已完成", value: 3 },
+            { label: "未通过", value: 4 },
           ],
         },
         {
-          prop: "name",
+          prop: "creditStatus",
           placeholder: "账款状态",
           scope: "select",
           options: [
             { label: "已结清", value: 1 },
-            { label: "未结清", value: 2 },
+            { label: "未结清", value: 0 },
           ],
         },
         {
-          prop: "name",
+          prop: "invoiceStatus",
           placeholder: "开票状态",
           scope: "select",
           options: [
             { label: "已开票", value: 1 },
-            { label: "未开票", value: 2 },
+            { label: "未开票", value: 0 },
           ],
         },
         {
           placeholder: "时间",
-          prop1: "validityStartTime",
-          prop2: "validityEndTime",
+          prop1: "startTime",
+          prop2: "endTime",
           placeholder1: "开始日期",
           placeholder2: "结束日期",
           scope: "moreDataPicker",
+          Diszing: true,
         },
         {
-          prop: "name",
-          placeholder: "机构/订单号/业务号/下单企业",
+          prop: "orderSn",
+          placeholder: "订单号",
         },
         {
-          prop: "name",
+          prop: "userCard",
           placeholder: "身份号",
         },
       ],
@@ -304,6 +384,7 @@ export default {
         {
           label: "审核状态",
           prop: "checkStatus",
+          scope: "isOptions",
           hidden: true,
           options: [
             {
@@ -333,7 +414,7 @@ export default {
         },
         {
           label: "下单企业",
-          prop: "tenantName",
+          prop: "orderOrg",
           hidden: true,
         },
         {
@@ -369,9 +450,16 @@ export default {
       total: 0, //一共多少条
       dialogVisible: false,
       remarksVisible: false,
+      orderDialogVisible: false,
       id: "",
       statisticsData: {},
       remarksOptions: [],
+      orderSn: null,
+      orderFrom: null,
+      ShowStatus: false,
+      dialogVisiblecost: false,
+      tpId: "",
+      type: null,
     };
   },
   created() {
@@ -404,6 +492,91 @@ export default {
       }
       return str;
     },
+    exportExcel() {
+      if (this.$refs.tableList.allCheckData.length === 0) {
+        this.$message.error("请勾选数据");
+        return;
+      }
+      this.$api
+        .systemtoporderexport({
+          orderSnList: this.$refs.tableList.allCheckData.map((i) => i.orderSn),
+        })
+        .then((res) => {
+          exportFn(res.msg, `导出数据`);
+        });
+    },
+
+    editCost() {
+      if (this.$refs.tableList.allCheckData.length === 0) {
+        this.$message.error("请勾选数据");
+        return;
+      }
+      this.dialogVisiblecost = true;
+      this.type = 4;
+      this.tpId = this.$refs.tableList.allCheckData
+        .map((i) => i.orderSn)
+        .toString();
+    },
+    completeOrder(orderSn) {
+      let A = (status) => {
+        this.$api
+          .systemtoporderfinish({
+            finishStatus: status,
+            orderSnList: orderSn
+              ? [orderSn]
+              : this.$refs.tableList.allCheckData.map((i) => i.orderSn),
+          })
+          .then((res) => {
+            this.$message({
+              type: "success",
+              message: "操作成功!",
+            });
+          });
+      };
+      if (!orderSn && this.$refs.tableList.allCheckData.length === 0) {
+        this.$message.error("请勾选数据");
+        return;
+      }
+      this.$confirm("确定已完单吗?", "提示", {
+        confirmButtonText: "确定完单",
+        cancelButtonText: "取消完单",
+        type: "warning",
+        distinguishCancelAndClose: true,
+      })
+        .then(() => {
+          A(1);
+        })
+        .catch((err) => {
+          if (err === "cancel") {
+            A(0);
+          }
+        });
+    },
+    handelClickCost(item) {
+      this.dialogVisiblecost = true;
+      this.type = 3;
+      this.tpId = item.orderSn;
+    },
+    openDialog(data, e) {
+      if (e === 1) {
+        this.ShowStatus = true;
+      } else {
+        this.ShowStatus = false;
+      }
+      this.orderSn = data.orderSn;
+      this.orderFrom = data.orderFrom;
+      this.orderDialogVisible = true;
+    },
+    seePZ(ary) {
+      if (ary?.length > 0) {
+        this.imgList = ary.map((item) => item.attachmentUrl);
+        this.showViewer = true;
+      } else {
+        this.$message.warning("暂无转账凭证");
+        this.imgList = [];
+        return;
+      }
+    },
     getStatistics() {
       this.$api.systemtoporderstatistics().then((res) => {
         this.statisticsData = res.data || {};
@@ -422,7 +595,8 @@ export default {
         this.remarksVisible = true;
       }
     },
-    handelClick() {
+    handelClick(data) {
+      this.orderSn = data.orderSn;
       this.dialogVisible = true;
     },
     changeStatus(val) {
@@ -458,6 +632,10 @@ export default {
     },
     search(v) {
       this.loading = true;
+      if (this.type === 4) {
+        this.$refs.tableList.clearMoreActive();
+        this.type = null;
+      }
       if (v === 2) {
         this.formData = {
           pageSize: 10,
@@ -465,12 +643,12 @@ export default {
         };
       }
       var data = JSON.parse(JSON.stringify(this.formData));
-      // if (this.formData.classStartTime) {
-      //   data.classStartTime = parseInt(data.classStartTime / 1000);
-      // }
-      // if (this.formData.classEndTime) {
-      //   data.classEndTime = parseInt(data.classEndTime / 1000);
-      // }
+      if (this.formData.startTime) {
+        data.startTime = parseInt(data.startTime / 1000);
+      }
+      if (this.formData.endTime) {
+        data.endTime = parseInt(data.endTime / 1000);
+      }
       this.$api
         .systemtoporderlist(data)
         .then((res) => {

src/views/resource/baseManageInfos/resource/businessLevel/index.vue

@@ -16,22 +16,10 @@
       @addClick="addClick"
       :loading="loading"
       @editInfo="editInfo"
-      @emitData="openPZDowm"
       @sortFunc="sortFunc"
       @editName="editName"
     >
-      <!-- <template slot="customize">
-        <el-button size="small" type="success" @click="setOptions"
-          >配置“视频节和测试卷”的学习顺序</el-button
-        >
-      </template> -->
       <template slot="btn" slot-scope="props">
-        <el-button type="text" @click="setOptions(props.scope.row, 1)"
-          >学习顺序</el-button
-        >
-        <el-button type="text" @click="openPZDowm(props.scope.row, 1)"
-          >下单模板</el-button
-        >
         <el-button type="text" @click="addClick(props.scope.row, 0)"
           >修改</el-button
         >
@@ -159,85 +147,6 @@
         >
       </span>
     </el-dialog>
-    <el-dialog
-      :visible.sync="dialogVisiblePZDown"
-      width="560px"
-      :show-close="false"
-      @closed="loadingClose"
-      :close-on-click-modal="false"
-    >
-      <div slot="title" class="hearders">
-        <div class="leftTitle">配置下单填选模板</div>
-        <div class="rightBoxs">
-          <img src="@/assets/images/Close@2x.png" alt="" @click="closePZ" />
-        </div>
-      </div>
-      <div>
-        <el-radio-group v-model="radioActives">
-          <el-radio
-            v-for="(item, index) in plateList"
-            :key="index"
-            :label="item.id"
-            >{{ item.name }}</el-radio
-          >
-        </el-radio-group>
-        <el-button
-          style="margin-left: 10px"
-          size="mini"
-          v-if="radioActives"
-          @click="radioActives = ''"
-          >清除选择</el-button
-        >
-        <span style="margin-left: 14px">注：该配置只适用于视频商品</span>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closePZ">取 消</el-button>
-        <el-button type="primary" @click="submitPZ" :loading="disabledBtn"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog>
-    <el-dialog
-      :visible.sync="dialogVisibleSet"
-      width="430px"
-      :show-close="false"
-      @closed="loadingClose"
-      :close-on-click-modal="false"
-    >
-      <div slot="title" class="hearders">
-        <div class="leftTitle">配置“视频节和测试卷”的学习顺序</div>
-        <div class="rightBoxs">
-          <img
-            src="@/assets/images/Close@2x.png"
-            alt=""
-            @click="closeOptions"
-          />
-        </div>
-      </div>
-      <div>
-        <p>注：该配置只适用于视频商品</p>
-        <el-radio-group v-model="learningOrder">
-          <el-radio :label="0">不限制顺序</el-radio>
-          <!-- <el-radio :label="1">限制顺序1</el-radio> -->
-          <el-radio :label="2">限制顺序</el-radio>
-        </el-radio-group>
-        <p v-if="learningOrder === 1 || learningOrder === 2" style="color: red">
-          {{
-            learningOrder === 1
-              ? "单个章对应的【所有节视频】学完才可以【测试】"
-              : learningOrder === 2
-              ? "必须要按照【目录顺序】进行学习，不可以乱序学习"
-              : ""
-          }}
-        </p>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closeOptions">取 消</el-button>
-        <el-button type="primary" @click="submitLearn" :loading="disabledBtn"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog>
   </div>
 </template>
 
@@ -250,7 +159,6 @@ export default {
   components: { searchBoxNew, tableList, pagination },
   data() {
     return {
-      activeId: "",
       disabledBtn: false,
       loading: false, //当前表单加载是否加载动画
       navText: {
@@ -261,7 +169,7 @@ export default {
         choice: true,
         addHide: false,
         openCheckMore: true,
-        changeWidth: "260px",
+        changeWidth: "130px",
         backFatherBtn: {
           status: false,
           title: "配置下单填选模板",
@@ -341,31 +249,6 @@ export default {
           prop: "educationName",
           hidden: true,
         },
-        {
-          label: "下单模板",
-          prop: "templateName",
-          hidden: true,
-        },
-        {
-          label: "学习顺序",
-          prop: "goodsLearningOrder",
-          scope: "isOptions",
-          hidden: true,
-          options: [
-            {
-              label: "不限制顺序",
-              value: 0,
-            },
-            {
-              label: "限制顺序1",
-              value: 1,
-            },
-            {
-              label: "限制顺序",
-              value: 2,
-            },
-          ],
-        },
         {
           label: "状态",
           prop: "status",
@@ -399,36 +282,6 @@ export default {
           scope: "numType",
           ch: "年",
         },
-        {
-          label: "学习审核类型",
-          prop: "periodType",
-          scope: "status",
-          options: [
-            {
-              label: "人工审核",
-              value: 1,
-            },
-            {
-              label: "自动审核",
-              value: 2,
-            },
-          ],
-        },
-        {
-          label: "学习审核层级",
-          prop: "periodNumber",
-          scope: "status",
-          options: [
-            {
-              label: "初审",
-              value: 1,
-            },
-            {
-              label: "初审+复审",
-              value: 2,
-            },
-          ],
-        },
         {
           label: "状态",
           prop: "status",
@@ -459,12 +312,8 @@ export default {
       listData: {},
       statusPop: -1,
       dialogVisible: false,
-      dialogVisiblePZDown: false,
       optionsSF: [], //教育类型
       optionsXM: [], //项目类型
-      plateList: [], //模板列表
-      activeLists: [], //选中列表
-      radioActives: "",
       //表单验证
       rules: {
         educationId: [
@@ -486,25 +335,15 @@ export default {
         ],
         sort: [{ required: true, message: "请输入排序", trigger: "blur" }],
         schoolYear: [{ required: false, message: "学年不能为空" }],
-        periodType: [
-          { required: true, message: "请选择学时审核类型", trigger: "change" },
-        ],
-        periodNumber: [
-          { required: true, message: "请选择学时审核层级", trigger: "change" },
-        ],
         status: [{ required: true, message: "请选择状态", trigger: "change" }],
       },
-      dialogVisibleSet: false,
-      learningOrder: "", //0不限制，1限制1，2限制2
     };
   },
   mounted() {
     this.search();
-    this.initPlate();
   },
   activated() {
     this.search();
-    this.initPlate();
   },
   methods: {
     /**
@@ -559,127 +398,6 @@ export default {
         return;
       }
     },
-    submitLearn() {
-      this.disabledBtn = true;
-      // if (!this.$refs.tableList.allCheckData.length) {
-      //   this.$message.warning("请勾选需要配置的业务层次");
-      //   this.disabledBtn = false;
-      //   return;
-      // }
-      if (
-        this.learningOrder !== 0 &&
-        this.learningOrder !== 1 &&
-        this.learningOrder !== 2
-      ) {
-        this.$message.warning("请选择是否限制顺序");
-        this.disabledBtn = false;
-        return;
-      }
-      // var ast = this.$refs.tableList.allCheckData.map((item) => {
-      //   return item.id;
-      // });
-      this.$api
-        .editLearningOrderCourseBusiness({
-          businessIds: [this.activeId],
-          goodsLearningOrder: this.learningOrder,
-        })
-        .then((res) => {
-          this.$message.success("配置成功");
-          this.learningOrder = "";
-          this.dialogVisibleSet = false;
-          this.$refs.tableList.clearMoreActive();
-          this.search();
-        })
-        .catch(() => {
-          this.disabledBtn = false;
-        });
-    },
-    setOptions(v, int) {
-      if (int) {
-        this.learningOrder = v.goodsLearningOrder;
-        this.activeId = v.id;
-        this.dialogVisibleSet = true;
-      } else {
-        if (!this.$refs.tableList.allCheckData.length) {
-          this.$message.warning("请勾选需要配置的业务层次");
-          return;
-        }
-        const EXAMSORT = this.$refs.tableList.allCheckData.every((item) => {
-          return item.goodsLearningOrder === 0;
-        });
-        if (EXAMSORT) {
-          this.dialogVisibleSet = true;
-        } else {
-          this.$message.warning("只允许设置当前学习顺序为不限制顺序的列表");
-          return;
-        }
-      }
-    },
-    closeOptions() {
-      this.dialogVisibleSet = false;
-    },
-    initPlate() {
-      this.$api.orderinputtemplatelist({ status: 1 }).then((res) => {
-        this.plateList = res.rows;
-      });
-    },
-    openPZDowm(item, int) {
-      if (int === 1) {
-        this.activeLists = [item];
-        if (item.templateStatus) {
-          this.radioActives = item.templateStatus;
-        } else {
-          this.radioActives = "";
-        }
-        this.dialogVisiblePZDown = true;
-      } else {
-        if (item.length) {
-          this.activeLists = item;
-          this.radioActives = "";
-          this.dialogVisiblePZDown = true;
-        } else {
-          this.$message.warning("请勾选需要配置下单填选模板的业务层级");
-        }
-      }
-    },
-    closePZ() {
-      this.dialogVisiblePZDown = false;
-    },
-    submitPZ() {
-      // if (!this.radioActives) {
-      //   this.$message.warning("请选择模板");
-      // } else {
-      this.submitPZs();
-      // }
-    },
-    submitPZs() {
-      var ast = [];
-      this.activeLists.map((item) => {
-        ast.push(item.id);
-      });
-      var data = {
-        businessIds: ast,
-        templateStatus: this.radioActives,
-      };
-      this.disabledBtn = true;
-      this.$api
-        .editModelCourseBusiness(data)
-        .then((res) => {
-          this.$message.success("配置修改成功");
-          this.dialogVisiblePZDown = false;
-          this.activeLists = [];
-          this.radioActives = "";
-          this.$refs.tableList.clearMoreActive();
-          this.search();
-        })
-        .catch(() => {
-          this.disabledBtn = false;
-        });
-    },
-    loadingClose() {
-      this.learningOrder = "";
-      this.disabledBtn = false;
-    },
     changeXMList(option) {
       if (!option.educationId) {
         this.optionsXM.map((item, index) => {
@@ -711,6 +429,9 @@ export default {
         this.optionsSF = arrays;
       });
     },
+    loadingClose() {
+      this.disabledBtn = false;
+    },
     getXMType(id) {
       this.$api
         .inquireCourseProjectType({
@@ -787,8 +508,6 @@ export default {
         this.statusPop = 1;
         this.listData = {
           status: 1,
-          periodType: 1,
-          periodNumber: 2,
         };
       } else {
         this.statusPop = int;

src/views/resource/baseManageInfos/resource/educationTypes/index.vue

@@ -64,10 +64,13 @@
                 >{{ item.label }}</el-radio
               >
             </el-radio-group>
-            <div v-else-if="items.scope === 'tireStatus'">
-              <span>{{ getSpan() }}</span>
-              <span class="againSet" @click="openSet">重新配置</span>
-            </div>
+
+            <el-checkbox
+              v-else-if="items.scope === 'schemeName'"
+              v-model="listData[items.prop]"
+              true-label="学校业务"
+              false-label=""
+            >学校业务</el-checkbox>
             <el-input
               :disabled="statusPop === 2"
               v-else-if="items.scope === 'textarea'"
@@ -101,35 +104,6 @@
         >
       </span>
     </el-dialog>
-    <el-dialog
-      :visible.sync="dialogVisibleSet"
-      width="560px"
-      :show-close="false"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <div slot="title" class="hearders">
-        <div class="leftTitle">业务层级配置</div>
-        <div class="rightBoxs">
-          <img src="@/assets/images/Close@2x.png" alt="" @click="closeSet" />
-        </div>
-      </div>
-      <div>
-        <el-checkbox-group v-model="activeCheckBox">
-          <el-checkbox
-            v-for="(item, index) in setDatas"
-            :key="index"
-            :label="item.value"
-            :disabled="item.disabled"
-            >{{ item.label }}</el-checkbox
-          >
-        </el-checkbox-group>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closeSet">取 消</el-button>
-        <el-button type="primary" @click="submitSet">确 定</el-button>
-      </span>
-    </el-dialog>
   </div>
 </template>
 
@@ -214,9 +188,9 @@ export default {
           scope: "NumberSort",
         },
         {
-          label: "业务层级配置",
-          prop: "tireStatus",
-          scope: "tireStatus",
+          label: "是否学校业务",
+          prop: "schemeName",
+          scope: "schemeName",
         },
         {
           label: "备注",
@@ -225,10 +199,11 @@ export default {
         },
       ],
       //   弹窗数据
-      listData: {},
+      listData: {
+        schemeName:""
+      },
       statusPop: -1,
       dialogVisible: false,
-      dialogVisibleSet: false,
       setDatas: [
         {
           label: "项目类型",
@@ -249,7 +224,6 @@ export default {
           value: 4,
         },
       ],
-      activeCheckBox: [1, 2],
       //表单验证
       rules: {
         educationName: [
@@ -337,7 +311,7 @@ export default {
         this.statusPop = 1;
         this.listData = {
           status: 1,
-          tireStatus: "1,2",
+          schemeName:""
         };
       } else {
         this.statusPop = int;
@@ -386,42 +360,9 @@ export default {
           });
       }
     },
-    getSpan() {
-      if (this.listData.tireStatus) {
-        var ast = this.listData.tireStatus.split(",").map(Number);
-        var spans = [];
-        for (let i = 0; i < ast.length; i++) {
-          if (ast[i] === 1) {
-            spans.push("项目类型");
-          } else if (ast[i] === 2) {
-            spans.push("业务层次");
-          } else if (ast[i] === 3) {
-            spans.push("院校");
-          } else if (ast[i] === 4) {
-            spans.push("专业");
-          }
-        }
-        return spans.join(">");
-      }
-    },
-    openSet() {
-      if (this.listData.tireStatus) {
-        this.activeCheckBox = this.listData.tireStatus.split(",").map(Number);
-      } else {
-        this.activeCheckBox = [1, 2];
-      }
-      this.dialogVisibleSet = true;
-    },
-    submitSet() {
-      this.listData.tireStatus = this.activeCheckBox.toString();
-      this.dialogVisibleSet = false;
-    },
     close() {
       this.dialogVisible = false;
     },
-    closeSet() {
-      this.dialogVisibleSet = false;
-    },
     handleSizeChange(v) {
       this.pageSize = v;
       this.currentPage = 1;
@@ -531,4 +472,3 @@ export default {
   cursor: pointer;
 }
 </style>
-