Merge branch 'contentManagerTemp' into test

src/api/orderManager.js

@@ -256,3 +256,11 @@ export function updateRouteOrder (data) {
   })
 }
 
+// 根据合作单位id获取学校缴费
+export function getCalenders(data) {
+  return request2({
+    url: api + '/cooperationOrgan/getCalenders',
+    method: 'get',
+    params: data
+  })
+}

src/views/arrearage-students/index.vue

@@ -166,7 +166,7 @@
         @pagination="FetchList"
       />
     </div>
-    <el-dialog width="1000px" title="缴费记录" :visible.sync="visible">
+    <el-dialog width="1100px" title="缴费记录" :visible.sync="visible">
       <list-dialog
         v-if="visible && detail"
         @close="visible = false"

src/views/arrearage-students/modals/list.vue

@@ -65,6 +65,14 @@
       </el-table-column>
       <el-table-column
         prop="paymentStatus"
+        label="缴费类型"
+      >
+        <div slot-scope="scope">
+          {{ scope.row.paymentType | userPaymentTypeFormat }}
+        </div>
+      </el-table-column>
+      <el-table-column
+        prop="paymentStatus"
         label="缴费状态"
       >
         <div slot-scope="scope">

src/views/businessManager/orderManager/financeManager.vue

@@ -413,11 +413,14 @@
             :label-width="formLabelWidth"
              :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
           >
-            <el-input
+            <!-- <el-input
               v-model.trim="form.calenderId"
               :disabled="!isAdd"
               placeholder="请输入缴费单号"
-            ></el-input>
+            ></el-input> -->
+            <el-select v-model="form.calenderId" :disabled="!isAdd" placeholder="请选择缴费单号" style="width: 100% !important" filterable>
+              <el-option v-for="(item, index) in getCalenderList" :key="index" :label="item.id" :value="item.id"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item
             label="学员编号"
@@ -625,6 +628,7 @@ import {
   routeOrderAdd,
   getOrderInfo,
   orderDelete,
+  getCalenders
 } from "@/api/orderManager";
 import { goodsQuery } from "@/api/businessManager";
 import { getEmployeeOrgan, getAddress, getCooperation } from "@/api/buildTeam";
@@ -751,6 +755,7 @@ export default {
       headers: {
         Authorization: getToken(),
       },
+      getCalenderList: []
     };
   },
   created() {
@@ -1071,6 +1076,7 @@ export default {
     },
     changeOrgin(val) {
       this.$set(this.form, "schoolId", null);
+      this.form.calenderId = null
       if (val) {
         getCooperation({ rows: 9999, organId: val }).then((res) => {
           if (res.code === 200) {
@@ -1079,7 +1085,15 @@ export default {
         });
       }
     },
-    checkSchool(val) {},
+    async checkSchool(val) {
+      this.form.calenderId = null
+      try {
+        let res = await getCalenders({id : val})
+        this.getCalenderList = res.data
+      } catch {
+        //
+      }
+    },
     checkgoods(val) {
       for (let i = 0; i <= this.form.goodsList.length - 1; i++) {
         if (
@@ -1090,11 +1104,10 @@ export default {
         }
       }
     },
-    lookOrderInfo(row) {
+    async lookOrderInfo(row) {
       //orderNo
       this.isAdd = false;
-
-      getOrderInfo({ orderId: row.id }).then((res) => {
+      await getOrderInfo({ orderId: row.id }).then((res) => {
         if (res.code === 200) {
           this.$nextTick((some) => {
             let orderInfo = res.data.studentPaymentOrder;
@@ -1125,6 +1138,14 @@ export default {
           });
         }
       });
+      if(this.form.calenderId) {
+        try {
+          let res = await getCalenders({id : this.form.calenderId})
+          this.getCalenderList = res.data
+        } catch {
+          //
+        }
+      }
     },
     removeOrderInfo(row) {
       this.$confirm("确定删除?", "提示", {