修改了筛选项名额

375499eb · cmosquito · 639a14cb · 375499eb · 375499eb · 375499eb
Commit 375499eb authored Mar 29, 2024 by cmosquito
9 changed files
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -263,7 +263,7 @@ export const asyncRouterMap = [
        path: "selectcourseunconfirm",
        name: "selectCourseUnConfirm-xfm",
        component: () => import("@/views/dailyTask/selectCourseUnConfirm"),
-        meta: { title: "审课待确认学员", icon: "product-list" }
+        meta: { title: "审课待提交学员", icon: "product-list" }
      },
      {
        path: "selecting",
@@ -381,7 +381,7 @@ export const asyncRouterMap = [
        path: "selectcourseunconfirm",
        name: "selectCourseUnConfirm-xf",
        component: () => import("@/views/dailyTask/selectCourseUnConfirm"),
-        meta: { title: "审课待确认学员", icon: "product-list" }
+        meta: { title: "审课待提交学员", icon: "product-list" }
      },
      {
        path: "selecting",
@@ -843,7 +843,7 @@ export const asyncRouterMap = [
        path: "selectcourseunconfirm",
        name: "selectCourseUnConfirm",
        component: () => import("@/views/dailyTask/selectCourseUnConfirm"),
-        meta: { title: "审课待确认学员", icon: "product-list" }
+        meta: { title: "审课待提交学员", icon: "product-list" }
      },
      {
        path: "needscorestu",

--- a/src/views/dailyTask/newAllocate.vue
+++ b/src/views/dailyTask/newAllocate.vue
@@ -134,7 +134,7 @@
          </template>
        </el-table-column>
-        <el-table-column label="已通过微信" align="center">
+        <el-table-column label="已确认学生课程" align="center">
          <template slot-scope="scope">
            <el-button size="mini" @click="handleWeChatState(scope.row.userId)"
              >确认</el-button

--- a/src/views/homePage/csoMasterHome.vue
+++ b/src/views/homePage/csoMasterHome.vue
@@ -97,7 +97,7 @@
                    >
                    <el-col :span="6" class="overview-item-title">
                      <span @click="goSelectCourseUnConfirm"
-                        >审课待确认学员</span
+                        >审课待提交学员</span
                      >
                    </el-col>
                    <!-- <el-col :span="6" class="overview-item-title">

--- a/src/views/homePage/xuefuHome.vue
+++ b/src/views/homePage/xuefuHome.vue
@@ -44,7 +44,7 @@
                    >
                    <el-col :span="6" class="overview-item-title">
                      <span @click="goSelectCourseUnConfirm"
-                        >审课待确认学员</span
+                        >审课待提交学员</span
                      >
                    </el-col>
                    <!-- <el-col :span="6" class="overview-item-title">

--- a/src/views/homePage/xuefuMasterHome.vue
+++ b/src/views/homePage/xuefuMasterHome.vue
@@ -45,7 +45,7 @@
                    >
                    <el-col :span="6" class="overview-item-title">
                      <span @click="goSelectCourseUnConfirm"
-                        >审课待确认学员</span
+                        >审课待提交学员</span
                      >
                    </el-col>
                    <!-- <el-col :span="6" class="overview-item-title">

--- a/src/views/pms/product/components/payCostInfo.vue
+++ b/src/views/pms/product/components/payCostInfo.vue
@@ -150,6 +150,21 @@
              </el-option>
            </el-select>
          </el-form-item>
+           <el-form-item
+            label="学员状态"
+            prop="userStatus"
+            :label-width="formLabelWidth"
+          >
+            <el-select v-model="payRecord.userStatus" clearable>
+              <el-option
+                v-for="item in userStatusList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
        </div>
        <div class="line">
          <el-form-item
@@ -167,7 +182,16 @@
              </el-option>
            </el-select>
          </el-form-item>
+            <el-form-item
+            label="课程形式"
+            prop="teachWay"
+            :label-width="formLabelWidth"
+          >
+            <el-input v-model="payRecord.teachWay"> </el-input>
+          </el-form-item>
        </div>
        <div class="line">
          <el-form-item
            label="课程时间"
@@ -199,14 +223,34 @@
          >
            <el-input v-model="payRecord.discountMoney"> </el-input>
          </el-form-item>
+           <el-form-item
+            label="优惠活动"
+            prop="discountActivity"
+            :label-width="formLabelWidth"
+          >
+            <el-input v-model="payRecord.discountActivity"> </el-input>
+          </el-form-item>
        </div>
        <div class="line">
          <el-form-item label="备注" prop="note" :label-width="formLabelWidth">
            <el-input v-model="payRecord.note"> </el-input>
          </el-form-item>
+            <el-form-item label="来源" prop="channelSource" :label-width="formLabelWidth">
+            <el-input v-model="payRecord.channelSource"> </el-input>
+          </el-form-item>
        </div>
-        <el-form-item label="上传缴费截图" prop="picUrlList">
+          <div class="line">
-          <el-upload
+              <el-form-item label="缴费时间：" prop="addTime" :label-width="formLabelWidth">
+           <el-date-picker
+      v-model="payRecord.addTime"
+      type="datetime"
+      placeholder="选择日期时间">
+    </el-date-picker>
+    </el-form-item>
+        </div>
+        <el-form-item label="*上传缴费截图" prop="picUrlList1">
+          <!-- <el-upload
            :action="`${$UPLOAD_BASE_URL}/storage/upload`"
            :headers="headers"
            list-type="picture-card"
@@ -215,7 +259,21 @@
            :file-list="picUrlList"
          >
            <i class="el-icon-plus"></i>
-          </el-upload>
+          </el-upload> -->
+          <el-upload
+  class="upload-demo"
+  drag
+ :action="`${$UPLOAD_BASE_URL}/storage/upload`"
+            :headers="headers"
+            list-type="picture-card"
+            :on-remove="handleContImgRemove"
+            :on-success="uploadLanternUrl"
+            :file-list="picUrlList"
+  multiple>
+  <i class="el-icon-upload"></i>
+  <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+  <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
+</el-upload>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -253,13 +311,17 @@
      title="财务模板"
      :visible.sync="pdfInfo"
      @close="handleClose"
    >
-      <el-descriptions :title="pdfItem.nameCn">
+       <el-descriptions  :colon='false'>
+        <el-descriptions-item >1、姓名：{{
+          pdfItem.nameCn
+        }}</el-descriptions-item>
        <!-- <el-descriptions-item label="姓名">nameCn</el-descriptions-item> -->
-        <el-descriptions-item label="学校">{{
+        <el-descriptions-item >2、学校：{{
          pdfItem.school
        }}</el-descriptions-item>
-        <el-descriptions-item label="费用类型">{{
+        <el-descriptions-item >3、费用类型：{{
          pdfItem.status == 1
            ? "定金"
            : pdfItem.status == 2
@@ -268,29 +330,41 @@
            ? "全款"
            : ""
        }}</el-descriptions-item>
-        <el-descriptions-item label="课程数量">{{
+        <el-descriptions-item >4、课程数量：{{
          pdfItem.courseNum
        }}</el-descriptions-item>
-        <!-- <el-descriptions-item label="课程形式">???</el-descriptions-item> -->
+        <el-descriptions-item >5、课程形式：{{pdfItem.teachWay || "无"}}</el-descriptions-item>
-        <el-descriptions-item label="课程时间">{{
+        <el-descriptions-item >6、课程时间：{{
          pdfItem.courseTime
        }}</el-descriptions-item>
-        <el-descriptions-item label="校园大使">{{
+        <el-descriptions-item >7、推荐大使：{{
          pdfItem.campusAgent
        }}</el-descriptions-item>
-        <el-descriptions-item label="市场负责人">{{
+        <el-descriptions-item >8、市场负责人：{{
          pdfItem.marketLeader || "无"
        }}</el-descriptions-item>
-        <el-descriptions-item label="客服">{{
+        <el-descriptions-item >9、负责老师：{{
          pdfItem.adminNick
        }}</el-descriptions-item>
-        <el-descriptions-item label="优惠">{{
+        <el-descriptions-item >10、优惠金额：{{
          pdfItem.discountMoney || "无"
        }}</el-descriptions-item>
-        <el-descriptions-item label="支付方式">{{
+          <el-descriptions-item >11、优惠活动：{{pdfItem.discountActivity || "无"}}</el-descriptions-item>
+        <el-descriptions-item >12、支付方式：{{
          pdfItem.paymentWay || "无"
        }}</el-descriptions-item>
+          <el-descriptions-item >13、分配学服：{{h5Info.studyCareName || "无"}}
+          </el-descriptions-item>
+                 <el-descriptions-item >14、备注：{{
+          pdfItem.note || "无"
+        }}</el-descriptions-item>
+               <el-descriptions-item >15、来源：{{
+          pdfItem.channelSource || "无"
+        }}</el-descriptions-item>
      </el-descriptions>
      <div slot="footer" class="dialog-footer">
        <el-button @click="handleClose">取 消</el-button>
        <!-- <el-button type="primary" @click="submitEditReturnNoteInfo"
@@ -331,6 +405,7 @@ export default {
      payInfoList: [],
      editPayInfoListItemId: "",
      payVisible: false,
      editReturnNoteInfo: false,
      pdfInfo: false,
      payRecord: {
@@ -341,7 +416,13 @@ export default {
        marketLeader: "",
        costMoney: "",
        discountMoney: "",
-        note: ""
+        note: "",
+        userStatus:"",
+        addTime:"",
+        channelSource:"",
+        discountActivity:"",
+        teachWay:""
      },
      allPayCode: [],
      allStatus: [
@@ -358,6 +439,28 @@ export default {
          label: "全款"
        }
      ],
+        userStatusList: [
+            {
+          value: "0",
+          label: "无意向"
+        },
+        {
+          value: "1",
+          label: "正在跟进"
+        },
+        {
+          value: "2",
+          label: "已交定金"
+        },
+        {
+          value: "3",
+          label: "补齐尾款"
+        },
+         {
+          value: "4",
+          label: "退款"
+        },
+      ],
      formLabelWidth: "120px",
      picUrlList: [],
      rules: {
@@ -365,6 +468,9 @@ export default {
        status: [
          { required: true, message: "请选择费用类型", trigger: "change" }
        ],
+          userStatus: [
+          { required: true, message: "请填写学员状态", trigger: "change" }
+        ],
        courseNum: [
          { required: true, message: "请选择课程数量", trigger: "change" }
        ],
@@ -380,7 +486,11 @@ export default {
        ],
        discountMoney: [
          { required: true, message: "请填写优惠", trigger: "blur" }
-        ]
+        ],
+        //   picUrlList1: [
+        //   { required: true, message: "请上传缴费截图", trigger: "blur" }
+        // ]
      },
      textarea: "",
      pdfItem: "",
@@ -437,10 +547,11 @@ export default {
    },
    submitForm(formName) {
-      // console.log(this.picUrlList.length, "this.picUrlList.length");
+      console.log(this.picUrlList.length, "this.picUrlList.length");
      this.payRecord.userId = this.userId;
      this.$refs[formName].validate(valid => {
        if (valid && this.picUrlList.length > 0) {
          this.$confirm("是否提交", "提示", {
            confirmButtonText: "确定",
            cancelButtonText: "取消",
@@ -571,6 +682,18 @@ export default {
  display: flex;
  align-items: center;
 }
+.upload-demo{
+  width: 240px;
+  .el-upload__text{
+    // color: red;
+    margin-top: -120px;
+  }
+  .el-upload__tip{
+    margin-top: 20px;
+    width: 240px;
+  }
+}
 .payInfoItem {
  margin-top: 20px;
  padding: 20px;

--- a/src/views/pms/product/components/stuDetailInfo.vue
+++ b/src/views/pms/product/components/stuDetailInfo.vue
@@ -288,7 +288,7 @@
            <el-select
              clearable
              v-model="UserInfoDetail.channel"
-              placeholder="渠道为'主动推荐引流',必须填写校园大使"
+              placeholder="渠道为'校园大使',必须填写校园大使"
            >
               <el-option label="市场活动" :value="1"></el-option>
              <el-option label="网络投放" :value="2"></el-option>

--- a/src/views/xfHome/index.vue
+++ b/src/views/xfHome/index.vue
@@ -41,7 +41,7 @@
                    >
                    <el-col :span="6" class="overview-item-title">
                      <span @click="goSelectCourseUnConfirm"
-                        >审课待确认学员</span
+                        >审课待提交学员</span
                      >
                    </el-col>
                    <!-- <el-col :span="6" class="overview-item-title">

--- a/src/views/xfmHome/index.vue
+++ b/src/views/xfmHome/index.vue
@@ -42,7 +42,7 @@
                    >
                    <el-col :span="6" class="overview-item-title">
                      <span @click="goSelectCourseUnConfirm"
-                        >审课待确认学员</span
+                        >审课待提交学员</span
                      >
                    </el-col>
                    <!-- <el-col :span="6" class="overview-item-title">