Merge branch 'x_d_5.1' of http://120.79.166.78:19005/zhongzheng-edu/saas_masterPlatform into dev

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE =中正平台
 ENV = 'development'
 
 # 中正云教育管理后台/开发环境
-VUE_APP_BASE_API = 'http://192.168.1.222:7077/'
+VUE_APP_BASE_API = 'http://192.168.1.24:7077/'
 # VUE_APP_BASE_API = 'http://192.168.1.24:5030/'
 VUE_APP_IMG_API = 'https://file-dev.xyyxt.net'
 

src/api/financed/index.js

@@ -0,0 +1,100 @@
+import request from "@/utils/request";
+// 成本模板列表
+export function costList(query) {
+  return request({
+    url: "/financial/tp/list",
+    method: "post",
+    method: "get",
+    params: query,
+  });
+}
+// 查询生成表数据
+export function eduList(query) {
+  return request({
+    url: "/course/educationType/allList",
+    method: "get",
+    params: query,
+  });
+}
+// 新增模板
+export function addCost(data) {
+  return request({
+    url: "/financial/tp",
+    method: "post",
+    data,
+  });
+}
+// 修改状态
+export function editDefaultStatus(data) {
+  return request({
+    url: "/financial/tp/editDefaultStatus",
+    method: "post",
+    data,
+  });
+}
+// 批量删除
+export function batchCost(data) {
+  return request({
+    url: "/financial/tp/deleteBatch",
+    method: "post",
+    data,
+  });
+}
+// 修改模板
+export function editCost(data) {
+  return request({
+    url: "/financial/tp/edit",
+    method: "post",
+    data,
+  });
+}
+// 查询模板
+export function costDetail(id) {
+  return request({
+    url: "/financial/tp/" + id,
+    method: "get",
+  });
+}
+
+// 应收应付列表
+export function orderList(query) {
+  return request({
+    url: "/receive/order/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 应收应付导出
+export function orderExport(query) {
+  return request({
+    url: "/receive/order/listExport",
+    method: "get",
+    params: query,
+  });
+}
+// 新增催款提醒
+export function orderNote(data) {
+  return request({
+    url: "/receive/order/note",
+    method: "post",
+    data,
+  });
+}
+// 修改催款提醒
+export function orderNoteEdit(data) {
+  return request({
+    url: "/receive/order/note/edit",
+    method: "post",
+    data,
+  });
+}
+
+// 业务员提成列表
+export function sellerList(query) {
+  return request({
+    url: "/system/top/order/divSellerList",
+    method: "get",
+    params: query,
+  });
+}

src/components/tableList.vue

@@ -15,7 +15,7 @@
           >添加</el-button
         >
         <el-button
-          v-if="navText.backFatherBtn.status"
+          v-if="navText.backFatherBtn && navText.backFatherBtn.status"
           size="medium"
           type="warning"
           @click="backFather"
@@ -82,6 +82,7 @@
       style="width: 100%"
       @select-all="selectAll"
       @select="select"
+      @sort-change="sortChange"
       :row-key="rowKey"
       :load="load"
       :cell-style="timeStyle"
@@ -123,7 +124,6 @@
         fixed="left"
       >
       </el-table-column>
-      <!-- v-if="navText.num" ↓ -->
       <el-table-column
         v-if="navText.dontNum ? false : true"
         type="index"
@@ -1293,6 +1293,9 @@ export default {
         return a.sort > b.sort ? -1 : 1;
       }
     },
+    sortChange(column) {
+      this.$emit("sortChange", column);
+    },
     openSpec(id) {
       this.$emit("openClassNum", id);
     },

src/directive/common/int.js

@@ -0,0 +1,22 @@
+import { checkNum } from "@/utils/index";
+import { set } from "nprogress";
+export default {
+  inserted(el, binding, vnode) {
+    el.addEventListener("keyup", (e) => {
+      let value = e.target.value;
+      if (!value) {
+        return;
+      }
+      const { max, set = 2 } = binding.value || {};
+      if (max && value > max) {
+        value = max + "";
+      }
+      e.target.value = checkNum(value, set) || null;
+      el.firstElementChild.dispatchEvent(
+        new Event("input", {
+          bubbles: true,
+        })
+      );
+    });
+  },
+};

src/directive/index.js

@@ -1,23 +1,25 @@
-import hasRole from './permission/hasRole'
-import hasPermi from './permission/hasPermi'
-import dialogDrag from './dialog/drag'
-import dialogDragWidth from './dialog/dragWidth'
-import dialogDragHeight from './dialog/dragHeight'
-import throttle from "./common/throttle"
+import hasRole from "./permission/hasRole";
+import hasPermi from "./permission/hasPermi";
+import dialogDrag from "./dialog/drag";
+import dialogDragWidth from "./dialog/dragWidth";
+import dialogDragHeight from "./dialog/dragHeight";
+import throttle from "./common/throttle";
+import int from "./common/int";
 
 const install = function (Vue) {
-  Vue.directive('hasRole', hasRole)
-  Vue.directive('hasPermi', hasPermi)
-  Vue.directive('dialogDrag', dialogDrag)
-  Vue.directive('dialogDragWidth', dialogDragWidth)
-  Vue.directive('dialogDragHeight', dialogDragHeight)
-  Vue.directive('throttle', throttle)
-}
+  Vue.directive("hasRole", hasRole);
+  Vue.directive("hasPermi", hasPermi);
+  Vue.directive("dialogDrag", dialogDrag);
+  Vue.directive("dialogDragWidth", dialogDragWidth);
+  Vue.directive("dialogDragHeight", dialogDragHeight);
+  Vue.directive("throttle", throttle);
+  Vue.directive("int", int);
+};
 
 if (window.Vue) {
-  window['hasRole'] = hasRole
-  window['hasPermi'] = hasPermi
+  window["hasRole"] = hasRole;
+  window["hasPermi"] = hasPermi;
   Vue.use(install); // eslint-disable-line
 }
 
-export default install
+export default install;

src/utils/index.js

@@ -1,18 +1,25 @@
-import { parseTime } from './ruoyi'
-
+import { parseTime } from "./ruoyi";
+import * as baseUrls from "@/utils/request.js";
 /**
  * 表格时间格式化
  */
 export function formatDate(cellValue) {
   if (cellValue == null || cellValue == "") return "";
-  var date = new Date(cellValue)
-  var year = date.getFullYear()
-  var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
-  var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
-  var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
-  var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
-  var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
-  return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+  var date = new Date(cellValue);
+  var year = date.getFullYear();
+  var month =
+    date.getMonth() + 1 < 10
+      ? "0" + (date.getMonth() + 1)
+      : date.getMonth() + 1;
+  var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+  var hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
+  var minutes =
+    date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+  var seconds =
+    date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+  return (
+    year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds
+  );
 }
 
 /**
@@ -21,40 +28,40 @@ export function formatDate(cellValue) {
  * @returns {string}
  */
 export function formatTime(time, option) {
-  if (('' + time).length === 10) {
-    time = parseInt(time) * 1000
+  if (("" + time).length === 10) {
+    time = parseInt(time) * 1000;
   } else {
-    time = +time
+    time = +time;
   }
-  const d = new Date(time)
-  const now = Date.now()
+  const d = new Date(time);
+  const now = Date.now();
 
-  const diff = (now - d) / 1000
+  const diff = (now - d) / 1000;
 
   if (diff < 30) {
-    return '刚刚'
+    return "刚刚";
   } else if (diff < 3600) {
     // less 1 hour
-    return Math.ceil(diff / 60) + '分钟前'
+    return Math.ceil(diff / 60) + "分钟前";
   } else if (diff < 3600 * 24) {
-    return Math.ceil(diff / 3600) + '小时前'
+    return Math.ceil(diff / 3600) + "小时前";
   } else if (diff < 3600 * 24 * 2) {
-    return '1天前'
+    return "1天前";
   }
   if (option) {
-    return parseTime(time, option)
+    return parseTime(time, option);
   } else {
     return (
       d.getMonth() +
       1 +
-      '月' +
+      "月" +
       d.getDate() +
-      '日' +
+      "日" +
       d.getHours() +
-      '时' +
+      "时" +
       d.getMinutes() +
-      '分'
-    )
+      "分"
+    );
   }
 }
 
@@ -63,18 +70,18 @@ export function formatTime(time, option) {
  * @returns {Object}
  */
 export function getQueryObject(url) {
-  url = url == null ? window.location.href : url
-  const search = url.substring(url.lastIndexOf('?') + 1)
-  const obj = {}
-  const reg = /([^?&=]+)=([^?&=]*)/g
+  url = url == null ? window.location.href : url;
+  const search = url.substring(url.lastIndexOf("?") + 1);
+  const obj = {};
+  const reg = /([^?&=]+)=([^?&=]*)/g;
   search.replace(reg, (rs, $1, $2) => {
-    const name = decodeURIComponent($1)
-    let val = decodeURIComponent($2)
-    val = String(val)
-    obj[name] = val
-    return rs
-  })
-  return obj
+    const name = decodeURIComponent($1);
+    let val = decodeURIComponent($2);
+    val = String(val);
+    obj[name] = val;
+    return rs;
+  });
+  return obj;
 }
 
 /**
@@ -83,14 +90,14 @@ export function getQueryObject(url) {
  */
 export function byteLength(str) {
   // returns the byte length of an utf8 string
-  let s = str.length
+  let s = str.length;
   for (var i = str.length - 1; i >= 0; i--) {
-    const code = str.charCodeAt(i)
-    if (code > 0x7f && code <= 0x7ff) s++
-    else if (code > 0x7ff && code <= 0xffff) s += 2
-    if (code >= 0xDC00 && code <= 0xDFFF) i--
+    const code = str.charCodeAt(i);
+    if (code > 0x7f && code <= 0x7ff) s++;
+    else if (code > 0x7ff && code <= 0xffff) s += 2;
+    if (code >= 0xdc00 && code <= 0xdfff) i--;
   }
-  return s
+  return s;
 }
 
 /**
@@ -98,13 +105,13 @@ export function byteLength(str) {
  * @returns {Array}
  */
 export function cleanArray(actual) {
-  const newArray = []
+  const newArray = [];
   for (let i = 0; i < actual.length; i++) {
     if (actual[i]) {
-      newArray.push(actual[i])
+      newArray.push(actual[i]);
     }
   }
-  return newArray
+  return newArray;
 }
 
 /**
@@ -112,13 +119,13 @@ export function cleanArray(actual) {
  * @returns {Array}
  */
 export function param(json) {
-  if (!json) return ''
+  if (!json) return "";
   return cleanArray(
-    Object.keys(json).map(key => {
-      if (json[key] === undefined) return ''
-      return encodeURIComponent(key) + '=' + encodeURIComponent(json[key])
+    Object.keys(json).map((key) => {
+      if (json[key] === undefined) return "";
+      return encodeURIComponent(key) + "=" + encodeURIComponent(json[key]);
     })
-  ).join('&')
+  ).join("&");
 }
 
 /**
@@ -126,21 +133,21 @@ export function param(json) {
  * @returns {Object}
  */
 export function param2Obj(url) {
-  const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
+  const search = decodeURIComponent(url.split("?")[1]).replace(/\+/g, " ");
   if (!search) {
-    return {}
+    return {};
   }
-  const obj = {}
-  const searchArr = search.split('&')
-  searchArr.forEach(v => {
-    const index = v.indexOf('=')
+  const obj = {};
+  const searchArr = search.split("&");
+  searchArr.forEach((v) => {
+    const index = v.indexOf("=");
     if (index !== -1) {
-      const name = v.substring(0, index)
-      const val = v.substring(index + 1, v.length)
-      obj[name] = val
+      const name = v.substring(0, index);
+      const val = v.substring(index + 1, v.length);
+      obj[name] = val;
     }
-  })
-  return obj
+  });
+  return obj;
 }
 
 /**
@@ -148,9 +155,9 @@ export function param2Obj(url) {
  * @returns {string}
  */
 export function html2Text(val) {
-  const div = document.createElement('div')
-  div.innerHTML = val
-  return div.textContent || div.innerText
+  const div = document.createElement("div");
+  div.innerHTML = val;
+  return div.textContent || div.innerText;
 }
 
 /**
@@ -160,21 +167,21 @@ export function html2Text(val) {
  * @returns {Object}
  */
 export function objectMerge(target, source) {
-  if (typeof target !== 'object') {
-    target = {}
+  if (typeof target !== "object") {
+    target = {};
   }
   if (Array.isArray(source)) {
-    return source.slice()
+    return source.slice();
   }
-  Object.keys(source).forEach(property => {
-    const sourceProperty = source[property]
-    if (typeof sourceProperty === 'object') {
-      target[property] = objectMerge(target[property], sourceProperty)
+  Object.keys(source).forEach((property) => {
+    const sourceProperty = source[property];
+    if (typeof sourceProperty === "object") {
+      target[property] = objectMerge(target[property], sourceProperty);
     } else {
-      target[property] = sourceProperty
+      target[property] = sourceProperty;
     }
-  })
-  return target
+  });
+  return target;
 }
 
 /**
@@ -183,18 +190,18 @@ export function objectMerge(target, source) {
  */
 export function toggleClass(element, className) {
   if (!element || !className) {
-    return
+    return;
   }
-  let classString = element.className
-  const nameIndex = classString.indexOf(className)
+  let classString = element.className;
+  const nameIndex = classString.indexOf(className);
   if (nameIndex === -1) {
-    classString += '' + className
+    classString += "" + className;
   } else {
     classString =
       classString.substr(0, nameIndex) +
-      classString.substr(nameIndex + className.length)
+      classString.substr(nameIndex + className.length);
   }
-  element.className = classString
+  element.className = classString;
 }
 
 /**
@@ -202,10 +209,10 @@ export function toggleClass(element, className) {
  * @returns {Date}
  */
 export function getTime(type) {
-  if (type === 'start') {
-    return new Date().getTime() - 3600 * 1000 * 24 * 90
+  if (type === "start") {
+    return new Date().getTime() - 3600 * 1000 * 24 * 90;
   } else {
-    return new Date(new Date().toDateString())
+    return new Date(new Date().toDateString());
   }
 }
 
@@ -216,38 +223,38 @@ export function getTime(type) {
  * @return {*}
  */
 export function debounce(func, wait, immediate) {
-  let timeout, args, context, timestamp, result
+  let timeout, args, context, timestamp, result;
 
   const later = function () {
     // 据上一次触发时间间隔
-    const last = +new Date() - timestamp
+    const last = +new Date() - timestamp;
 
     // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
     if (last < wait && last > 0) {
-      timeout = setTimeout(later, wait - last)
+      timeout = setTimeout(later, wait - last);
     } else {
-      timeout = null
+      timeout = null;
       // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
       if (!immediate) {
-        result = func.apply(context, args)
-        if (!timeout) context = args = null
+        result = func.apply(context, args);
+        if (!timeout) context = args = null;
       }
     }
-  }
+  };
 
   return function (...args) {
-    context = this
-    timestamp = +new Date()
-    const callNow = immediate && !timeout
+    context = this;
+    timestamp = +new Date();
+    const callNow = immediate && !timeout;
     // 如果延时不存在，重新设定延时
-    if (!timeout) timeout = setTimeout(later, wait)
+    if (!timeout) timeout = setTimeout(later, wait);
     if (callNow) {
-      result = func.apply(context, args)
-      context = args = null
+      result = func.apply(context, args);
+      context = args = null;
     }
 
-    return result
-  }
+    return result;
+  };
 }
 
 /**
@@ -258,18 +265,18 @@ export function debounce(func, wait, immediate) {
  * @returns {Object}
  */
 export function deepClone(source) {
-  if (!source && typeof source !== 'object') {
-    throw new Error('error arguments', 'deepClone')
+  if (!source && typeof source !== "object") {
+    throw new Error("error arguments", "deepClone");
   }
-  const targetObj = source.constructor === Array ? [] : {}
-  Object.keys(source).forEach(keys => {
-    if (source[keys] && typeof source[keys] === 'object') {
-      targetObj[keys] = deepClone(source[keys])
+  const targetObj = source.constructor === Array ? [] : {};
+  Object.keys(source).forEach((keys) => {
+    if (source[keys] && typeof source[keys] === "object") {
+      targetObj[keys] = deepClone(source[keys]);
     } else {
-      targetObj[keys] = source[keys]
+      targetObj[keys] = source[keys];
     }
-  })
-  return targetObj
+  });
+  return targetObj;
 }
 
 /**
@@ -277,16 +284,16 @@ export function deepClone(source) {
  * @returns {Array}
  */
 export function uniqueArr(arr) {
-  return Array.from(new Set(arr))
+  return Array.from(new Set(arr));
 }
 
 /**
  * @returns {string}
  */
 export function createUniqueString() {
-  const timestamp = +new Date() + ''
-  const randomNum = parseInt((1 + Math.random()) * 65536) + ''
-  return (+(randomNum + timestamp)).toString(32)
+  const timestamp = +new Date() + "";
+  const randomNum = parseInt((1 + Math.random()) * 65536) + "";
+  return (+(randomNum + timestamp)).toString(32);
 }
 
 /**
@@ -296,7 +303,7 @@ export function createUniqueString() {
  * @returns {boolean}
  */
 export function hasClass(ele, cls) {
-  return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'))
+  return !!ele.className.match(new RegExp("(\\s|^)" + cls + "(\\s|$)"));
 }
 
 /**
@@ -305,7 +312,7 @@ export function hasClass(ele, cls) {
  * @param {string} cls
  */
 export function addClass(ele, cls) {
-  if (!hasClass(ele, cls)) ele.className += ' ' + cls
+  if (!hasClass(ele, cls)) ele.className += " " + cls;
 }
 
 /**
@@ -315,76 +322,95 @@ export function addClass(ele, cls) {
  */
 export function removeClass(ele, cls) {
   if (hasClass(ele, cls)) {
-    const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)')
-    ele.className = ele.className.replace(reg, ' ')
+    const reg = new RegExp("(\\s|^)" + cls + "(\\s|$)");
+    ele.className = ele.className.replace(reg, " ");
   }
 }
 
 export function makeMap(str, expectsLowerCase) {
-  const map = Object.create(null)
-  const list = str.split(',')
+  const map = Object.create(null);
+  const list = str.split(",");
   for (let i = 0; i < list.length; i++) {
-    map[list[i]] = true
+    map[list[i]] = true;
   }
-  return expectsLowerCase
-    ? val => map[val.toLowerCase()]
-    : val => map[val]
+  return expectsLowerCase ? (val) => map[val.toLowerCase()] : (val) => map[val];
 }
 
-export const exportDefault = 'export default '
+export const exportDefault = "export default ";
 
 export const beautifierConf = {
   html: {
-    indent_size: '2',
-    indent_char: ' ',
-    max_preserve_newlines: '-1',
+    indent_size: "2",
+    indent_char: " ",
+    max_preserve_newlines: "-1",
     preserve_newlines: false,
     keep_array_indentation: false,
     break_chained_methods: false,
-    indent_scripts: 'separate',
-    brace_style: 'end-expand',
+    indent_scripts: "separate",
+    brace_style: "end-expand",
     space_before_conditional: true,
     unescape_strings: false,
     jslint_happy: false,
     end_with_newline: true,
-    wrap_line_length: '110',
+    wrap_line_length: "110",
     indent_inner_html: true,
     comma_first: false,
     e4x: true,
-    indent_empty_lines: true
+    indent_empty_lines: true,
   },
   js: {
-    indent_size: '2',
-    indent_char: ' ',
-    max_preserve_newlines: '-1',
+    indent_size: "2",
+    indent_char: " ",
+    max_preserve_newlines: "-1",
     preserve_newlines: false,
     keep_array_indentation: false,
     break_chained_methods: false,
-    indent_scripts: 'normal',
-    brace_style: 'end-expand',
+    indent_scripts: "normal",
+    brace_style: "end-expand",
     space_before_conditional: true,
     unescape_strings: false,
     jslint_happy: true,
     end_with_newline: true,
-    wrap_line_length: '110',
+    wrap_line_length: "110",
     indent_inner_html: true,
     comma_first: false,
     e4x: true,
-    indent_empty_lines: true
-  }
-}
+    indent_empty_lines: true,
+  },
+};
 
 // 首字母大小
 export function titleCase(str) {
-  return str.replace(/( |^)[a-z]/g, L => L.toUpperCase())
+  return str.replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
 }
 
 // 下划转驼峰
 export function camelCase(str) {
-  return str.replace(/-[a-z]/g, str1 => str1.substr(-1).toUpperCase())
+  return str.replace(/-[a-z]/g, (str1) => str1.substr(-1).toUpperCase());
 }
 
 export function isNumberStr(str) {
-  return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
+  return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str);
 }
 
+export function exportFn(str, name) {
+  let url = process.env.VUE_APP_BASE_API + "common/download?fileName=" + str;
+  let link = document.createElement("a");
+  let fileName = name + ".xlsx";
+  document.body.appendChild(link);
+  link.href = url;
+  link.dowmload = fileName;
+  link.click();
+  link.remove();
+}
+
+// 保留x位小数
+export function checkNum(val, int = 2) {
+  if (int === 0) {
+    return val.replace(/[^0-9]/g, "");
+  } else if (int === 1) {
+    return val.replace(/^\D*(\d*(?:\.\d{0,1})?).*$/g, "$1");
+  } else {
+    return val.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, "$1");
+  }
+}

src/views/financed/arap/dislogTip.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="dislogTipBox">
     <BaseDialog
-      width="620px"
+      width="900px"
       :isShow.sync="isShow"
       title="催款提醒"
       @close="close"
@@ -16,32 +16,27 @@
         label-width="100px"
       >
         <div>
-          <el-form-item label="最新提醒：">2023-12-12 12:12:12 </el-form-item>
+          <el-form-item label="最新提醒：">
+            {{ $methodsTools.onlyForma(orderInfo.lastTime) || "--" }}
+          </el-form-item>
         </div>
 
         <div>
-          <el-form-item prop="email" label="提醒设置：">
-            <el-select v-model="form.email" placeholder="请选择提醒类型">
-              <el-option label="立即提醒" value="1"></el-option>
-              <el-option label="每天提醒" value="2"></el-option>
-              <el-option label="每周提醒" value="3"></el-option>
-              <el-option label="每月提醒" value="4"></el-option>
+          <el-form-item prop="noteType" label="提醒设置：">
+            <el-select v-model="form.noteType" placeholder="请选择提醒类型">
+              <el-option label="立即提醒" :value="1"></el-option>
+              <el-option label="每天提醒" :value="2"></el-option>
+              <el-option label="每周提醒" :value="3"></el-option>
+              <el-option label="每月提醒" :value="4"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="email1" label="" v-if="form.email == 2"
-            ><el-time-select
-              v-model="form.email1"
-              :picker-options="{
-                start: '08:30',
-                step: '00:15',
-                end: '18:30',
-              }"
-              placeholder="选择时间"
+          <el-form-item prop="weekTime" label="" v-if="form.noteType == 3">
+            <el-select
+              v-model="form.weekTime"
+              multiple
+              placeholder="请选择星期"
+              key="3"
             >
-            </el-time-select>
-          </el-form-item>
-          <el-form-item prop="email2" label="" v-if="form.email == 3">
-            <el-select v-model="form.email2" placeholder="请选择成本类型">
               <el-option
                 v-for="week in weekList"
                 :key="week.value"
@@ -50,14 +45,39 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="email3" label="" v-if="form.email == 4"
-            ><el-date-picker
-              v-model="form.email3"
-              type="datetime"
+          <el-form-item prop="monthTime" label="" v-if="form.noteType == 4">
+            <el-select
+              v-model="form.monthTime"
+              multiple
+              placeholder="请选择日期"
+              key="4"
+            >
+              <el-option
+                v-for="day in 31"
+                :key="day"
+                :label="day"
+                :value="day"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item prop="monthTime" label="" v-if="form.noteType == 4">
+            <el-date-picker
+              format="d"
+              value-format="yyyy-MM-dd"
+              v-model="value"
+              type="dates"
               placeholder="选择日期时间"
-              default-time="8:00:00"
             >
             </el-date-picker>
+          </el-form-item> -->
+          <el-form-item prop="dayTime" label="" v-if="form.noteType !== 1"
+            ><el-time-picker
+              format="HH:mm"
+              value-format="HH:mm"
+              v-model="form.dayTime"
+              placeholder="选择时间"
+            >
+            </el-time-picker>
           </el-form-item>
         </div>
       </el-form>
@@ -66,6 +86,7 @@
 </template>
 
 <script>
+import { orderNote, orderNoteEdit } from "@/api/financed/index";
 export default {
   name: "DislogTip",
   props: {
@@ -73,34 +94,34 @@ export default {
       type: Boolean,
       default: false,
     },
-    id: {
-      type: String,
-      default: "",
+    orderInfo: {
+      type: Object,
+      default: () => {
+        return {};
+      },
     },
   },
   data() {
     return {
       form: {},
       rules: {
-        email: [
-          { required: true, message: "请选择提现类型", trigger: "change" },
-        ],
-        email1: [{ required: true, message: "请选择时间", trigger: "change" }],
-        email2: [{ required: true, message: "请选择星期", trigger: "change" }],
-        email3: [{ required: true, message: "请选择日期", trigger: "blur" }],
-        email4: [
-          { required: true, message: "请输入百分比成本", trigger: "blur" },
+        dayTime: [{ required: true, message: "请选择时间", trigger: "change" }],
+        weekTime: [
+          { required: true, message: "请选择星期", trigger: "change" },
         ],
+        monthTime: [{ required: true, message: "请选择日期", trigger: "blur" }],
       },
       weekList: [
         { label: "星期一", value: "1" },
-        { label: "星期二", value: 2 },
-        { label: "星期三", value: 3 },
-        { label: "星期四", value: 4 },
-        { label: "星期五", value: 5 },
-        { label: "星期六", value: 6 },
-        { label: "星期日", value: 7 },
+        { label: "星期二", value: "2" },
+        { label: "星期三", value: "3" },
+        { label: "星期四", value: "4" },
+        { label: "星期五", value: "5" },
+        { label: "星期六", value: "6" },
+        { label: "星期日", value: "7" },
       ],
+      dayList: [],
+      value: [],
     };
   },
 
@@ -109,26 +130,57 @@ export default {
   methods: {
     init() {
       this.resetForm();
-      if (this.id) {
-      }
     },
     close() {
       this.$refs["form"].resetFields();
     },
     submit() {},
     resetForm() {
+      let {
+        noteId,
+        orderSn,
+        tenantId,
+        dayTime,
+        weekTime,
+        monthTime,
+        noteType,
+      } = this.orderInfo;
       this.form = {
-        email: undefined,
-        email1: undefined,
-        email2: undefined,
-        email3: undefined,
+        noteType: noteType || 1,
+        id: noteId,
+        dayTime: dayTime,
+        weekTime: weekTime ? weekTime.split(",") : [],
+        monthTime: monthTime ? monthTime.split(",") : [],
+        orderSn: orderSn,
+        tenantId: tenantId,
       };
     },
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          this.isShow = false;
-          this.$emit("search");
+          let form = JSON.parse(JSON.stringify(this.form));
+          let { noteType, weekTime, monthTime } = form;
+          delete form.weekTime;
+          delete form.monthTime;
+          if (noteType == 3) {
+            form.weekTime = weekTime.toString();
+          }
+          if (noteType == 4) {
+            form.monthTime = monthTime.toString();
+          }
+          if (form.id) {
+            orderNoteEdit(form).then((res) => {
+              this.$message.success("催款提醒修改成功");
+              this.isShow = false;
+              this.$emit("search");
+            });
+          } else {
+            orderNote(form).then((res) => {
+              this.$message.success("催款提醒设置成功");
+              this.isShow = false;
+              this.$emit("search");
+            });
+          }
         } else {
           return false;
         }
@@ -148,14 +200,23 @@ export default {
       },
     },
   },
+  watch: {
+    orderInfo(val) {
+      console.log(val, 666);
+    },
+  },
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+// /deep/ .el-date-editor {
+//   width: 144px;
+// }
+</style>
 <style lang="scss">
-.el-picker-panel__body-wrapper {
-  .el-date-picker__header {
-    display: none !important;
-  }
-}
+// .el-picker-panel__body-wrapper {
+//   .el-date-picker__header {
+//     display: none !important;
+//   }
+// }
 </style>

src/views/financed/arap/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="ActivityList">
     <el-radio-group
-      v-model="radio1"
+      v-model="type"
       @change="changeSearch"
       style="margin-bottom: 10px"
     >
@@ -17,7 +17,7 @@
       @init="init"
     />
     <table-list
-      :key="radio1"
+      :key="type"
       rowKey="id"
       ref="tableList"
       @openDialog="openDialog"
@@ -29,13 +29,37 @@
       <template slot="customize">
         <el-button @click="batchExport" type="primary"> 导出excel </el-button>
       </template>
-      <template slot="pcost" slot-scope="props">
-        <div>税收：40%</div>
-        <div>税收：40%</div>
+      <template slot="predictPayTime" slot-scope="props">
+        <span v-if="props.scope.row.creditStatus == 1">已结清</span>
+        <span style="color: red" v-else>
+          {{ $methodsTools.onlyForma(props.scope.row.predictPayTime) || "--" }}
+        </span>
       </template>
-      <template slot="fcost" slot-scope="props">
-        <div>税收：40</div>
-        <div>税收：40</div>
+      <template slot="noteType" slot-scope="props">
+        <div v-if="!props.scope.row.noteId || props.scope.row.noteType == 1">
+          --
+        </div>
+        <div v-else>
+          <div :class="'tip' + props.scope.row.noteType">
+            <span v-for="(text, idx) in backText(props.scope.row)" :key="idx">
+              <span v-if="props.scope.row.noteType == 3">周</span>
+              {{ text }}
+              <span v-if="props.scope.row.noteType == 4">日</span>
+              <i></i>
+            </span>
+          </div>
+          <div>{{ props.scope.row.dayTime }}</div>
+        </div>
+      </template>
+      <template slot="refundStatus" slot-scope="props">
+        <div>
+          {{
+            ["待审核", "未通过", "未退款", "已完成"][
+              props.scope.row.refundStatus
+            ]
+          }}
+          <span></span>
+        </div>
       </template>
       <template slot="status" slot-scope="props">
         <el-checkbox
@@ -44,7 +68,11 @@
         ></el-checkbox>
       </template>
       <template slot="btn" slot-scope="props">
-        <el-button type="text" :disabled="false" @click="handelClick">
+        <el-button
+          type="text"
+          :disabled="props.scope.row.creditStatus == 1"
+          @click="handelClick(props.scope.row)"
+        >
           催款提醒
         </el-button>
       </template>
@@ -55,7 +83,14 @@
       :currentPage.sync="formData.pageNum"
       @search="search"
     />
-    <dislog-tip :dialogVisible.sync="dialogVisible"></dislog-tip>
+    <dislog-tip
+      :dialogVisible.sync="dialogVisible"
+      :orderInfo="activeOrderInfo"
+      @search="search"
+    ></dislog-tip>
+    <dislogOrderDetails
+      :dialogVisible.sync="orderDialogVisible"
+    ></dislogOrderDetails>
   </div>
 </template>
 
@@ -64,9 +99,18 @@ import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 import dislogTip from "./dislogTip.vue";
+import dislogOrderDetails from "../components/dislogOrderDetails.vue";
+import { exportFn } from "@/utils/index.js";
+import { orderList, sellerList, orderExport } from "@/api/financed/index";
 export default {
   name: "cost",
-  components: { searchBoxNew, tableList, pagination, dislogTip },
+  components: {
+    searchBoxNew,
+    tableList,
+    pagination,
+    dislogTip,
+    dislogOrderDetails,
+  },
   data() {
     return {
       loading: false, //当前表单加载是否加载动画
@@ -75,15 +119,11 @@ export default {
         index: 0,
         ch: "条",
         num: true,
-        choice: true,
+        choice: false,
         addHide: true,
         openCheckMore: true,
         changeWidth: "160px",
         custom: false,
-        backFatherBtn: {
-          status: false,
-          title: "配置下单填选模板",
-        },
       },
       formData: {
         pageSize: 10,
@@ -93,64 +133,67 @@ export default {
       tableSet1: [
         {
           label: "下单时间",
-          prop: "startTime",
+          prop: "buyTime",
           hidden: true,
           scope: "aTimeList",
         },
         {
           label: "订单单号",
-          prop: "name",
+          prop: "orderSn",
           hidden: true,
           scope: "openDialog",
         },
         {
           label: "机构名称",
-          prop: "name",
+          prop: "tenantName",
           hidden: true,
         },
         {
           label: "业务员",
-          prop: "name",
+          prop: "createUsername",
           hidden: true,
         },
         {
           label: "业务号",
-          prop: "name",
+          prop: "createNo",
           hidden: true,
         },
         {
           label: "合同金额(元)",
-          prop: "name",
+          prop: "orderPrice",
           hidden: true,
         },
         {
           label: "已收账款(元)",
-          prop: "name",
+          prop: "orderReceived",
           hidden: true,
         },
         {
           label: "未收账款(元)",
-          prop: "name",
+          prop: "orderUncollected",
           hidden: true,
         },
         {
           label: "预收时间",
-          prop: "name",
           hidden: true,
+          scope: "solt",
+          soltName: "predictPayTime",
         },
         {
           label: "剩余天数",
-          prop: "name",
+          prop: "predictPayDay",
           hidden: true,
         },
         {
           label: "提醒设置",
-          prop: "name",
+          prop: "noteType",
+          scope: "solt",
+          soltName: "noteType",
           hidden: true,
         },
         {
           label: "最新提醒",
-          prop: "posterTempName",
+          prop: "lastTime",
           hidden: true,
         },
       ],
@@ -200,94 +243,98 @@ export default {
       tableSet3: [
         {
           label: "下单时间",
-          prop: "startTime",
+          prop: "lastTime",
           hidden: true,
           scope: "aTimeList",
         },
         {
           label: "订单单号",
-          prop: "name",
+          prop: "orderSn",
           hidden: true,
         },
         {
           label: "机构名称",
-          prop: "name",
+          prop: "tenantName",
           hidden: true,
         },
         {
           label: "业务员",
-          prop: "name",
+          prop: "createUsername",
           hidden: true,
         },
         {
           label: "业务号",
-          prop: "name",
+          prop: "createNo",
           hidden: true,
         },
         {
           label: "待付账款(元)",
-          prop: "name",
+          prop: "divideSellerMoney",
           hidden: true,
         },
         {
           label: "预付时间",
-          prop: "name",
+          prop: "predictReceiveTime",
           hidden: true,
         },
         {
           label: "剩余天数",
-          prop: "name",
+          prop: "predictReceiveDay",
           hidden: true,
         },
         {
           label: "审核状态",
-          prop: "name",
+          prop: "refundStatus",
           hidden: true,
+          scope: "solt",
+          soltName: "refundStatus",
         },
       ],
       tableData: [], //表单数据
       total: 0, //一共多少条
       dialogVisible: false,
-      radio1: 1,
+      orderDialogVisible: false,
+      type: 1,
+      activeOrderInfo: {},
     };
   },
   created() {
-    this.search();
+    this.search(2);
   },
   methods: {
     openDialog(data) {
       console.log(data);
+      this.orderDialogVisible = true;
     },
     batchExport() {
-      let len = this.$refs.tableList.allCheckData.length;
-      if (!len) {
-        return this.$message.warning("请先勾应收应付");
+      const fn = [orderExport, orderExport, orderExport][this.type - 1];
+      fn(this.backData()).then((res) => {
+        if (res.msg) {
+          exportFn(res.msg, "导出应收应付数据");
+        } else {
+          this.$message.error("导出失败");
+        }
+      });
+    },
+    backText(row) {
+      const type = row.noteType;
+      if (type == 2) {
+        return ["每天"];
       }
-      const ids = this.$refs.tableList.allCheckData.map((item) => item.id);
+      const key = ["weekTime", "monthTime"][type - 3];
+      let data = row[key].split(",").sort((a, b) => a - b);
+      return data;
     },
     changeSearch() {
       this.init();
     },
-    handelClick() {
-      this.dialogVisible = false;
+    handelClick(row) {
+      this.activeOrderInfo = row;
+      this.dialogVisible = true;
     },
-    search(v) {
-      this.loading = true;
-      if (v === 2) {
-        this.formData = {
-          pageSize: 10,
-          pageNum: 1,
-        };
-      }
-      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);
-      // }
-      this.$api
-        .distributiontemplist(data)
+    getDataList(data) {
+      const fn = [orderList, orderList, sellerList][this.type - 1];
+      fn(data)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;
@@ -297,48 +344,84 @@ export default {
           this.loading = false;
         });
     },
+    search(v) {
+      this.loading = true;
+      if (v === 2) {
+        this.formData = {
+          pageSize: 10,
+          pageNum: 1,
+        };
+      }
+      this.getDataList(this.backData());
+    },
+    backData() {
+      let data = this.formData;
+      let { startTime, endTime } = this.formData;
+      if (startTime || endTime) {
+        data = JSON.parse(JSON.stringify(this.formData));
+        if (startTime) {
+          data.startTime = parseInt(startTime / 1000);
+        }
+        if (endTime) {
+          data.endTime = parseInt(endTime / 1000);
+        }
+      }
+      return data;
+    },
     init() {
       this.search(2);
     },
   },
   computed: {
     tableSet() {
-      return this["tableSet" + this.radio1];
+      return this["tableSet" + this.type];
     },
     formList() {
       let data = [
         {
-          prop: "status1",
+          prop: "creditStatus",
           placeholder: "账款状态",
           scope: "select",
           options: [
-            { label: "不限", value: 2 },
             { label: "已结清", value: 1 },
             { label: "未结清", value: 0 },
           ],
         },
         {
-          prop1: "classStartTime",
-          prop2: "classEndTime",
+          prop1: "startTime",
+          prop2: "endTime",
           placeholder1: "开始时间",
           placeholder2: "结束时间",
           scope: "moreDataPicker",
         },
-        {
-          prop: "name",
-          placeholder: "机构/业务号",
-        },
       ];
-      if (this.radio1 != 1) {
-        data.unshift({
-          prop: "status1",
-          placeholder: "角色选择",
-          scope: "select",
-          options: [
-            { label: "不限", value: 2 },
-            { label: "已结清", value: 1 },
-            { label: "未结清", value: 0 },
-          ],
+      if (this.type != 1) {
+        data.unshift(
+          {
+            prop: "status1",
+            placeholder: "角色选择",
+            scope: "select",
+            options: [
+              { label: "已结清", value: 1 },
+              { label: "未结清", value: 0 },
+            ],
+          },
+          {
+            prop: "checkStatus",
+            placeholder: "审核状态",
+            scope: "select",
+            options: [
+              { label: "待审核", value: 0 },
+              { label: "已通过", value: 1 },
+              { label: "未通过", value: 2 },
+              { label: "已撤销", value: 3 },
+            ],
+          }
+        );
+      } else {
+        data.push({
+          prop: "keyNo",
+          placeholder: "机构/业务号",
         });
       }
       return data;
@@ -347,4 +430,12 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.tip4,
+.tip3 {
+  white-space: normal;
+  i::before {
+    content: "，";
+  }
+}
+</style>

src/views/financed/components/dislogOrderDetails.vue

@@ -0,0 +1,150 @@
+<template>
+  <div class="orderDetail">
+    <BaseDialog
+      width="1200px"
+      :isShow.sync="isShow"
+      title="订单详情"
+      @close="close"
+      :isShowFooter="false"
+    >
+      <div class="head">
+        订单号：<span>1561653316541656313</span> 退款状态：<span>——</span>
+        审核状态：<span>已通过</span>
+      </div>
+      <div class="mian">
+        <el-descriptions class="margin-top" :column="3" border>
+          <el-descriptions-item
+            :label="desc.label"
+            v-for="(desc, index) in descList"
+            :key="index"
+          >
+            <div v-if="desc.type">
+              <el-link
+                :underline="false"
+                v-if="desc.type === 'dowm'"
+                href="https://element.eleme.io"
+                target="_blank"
+                >资料下载</el-link
+              >
+              <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]),
+                ]"
+              >
+              </el-image>
+            </div>
+            <div v-else>
+              {{ detailInfo[desc.key] }}
+              <span
+                v-if="desc.key === '888'"
+                :style="{ color: true ? '#409eff' : '#f56c6c' }"
+                >【{{ true ? "盈" : "亏" }}】</span
+              >
+              <span
+                v-if="desc.key === '999'"
+                :style="{ color: false ? '#409eff' : '#f56c6c' }"
+                >（{{ true ? "已结清" : "未结清" }}）</span
+              >
+            </div>
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+      <student-details></student-details>
+    </BaseDialog>
+  </div>
+</template>
+
+<script>
+import studentDetails from "./studentDetails.vue";
+export default {
+  name: "dislogOrderDetails",
+  props: {
+    dialogVisible: {
+      type: Boolean,
+      default: false,
+    },
+    id: {
+      type: String,
+      default: "",
+    },
+  },
+  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: "123" },
+        { label: "转账凭证", key: "avatar", type: "image" },
+        { label: "发票状态", key: "123" },
+        { label: "备注", key: "123" },
+        { label: "附件", type: "dowm" },
+      ],
+      detailInfo: {
+        avatar: "oss/images/avatar/20211103/1635931027923_941464701",
+      },
+    };
+  },
+
+  mounted() {},
+
+  methods: {
+    init() {
+      this.getOrderDetail();
+    },
+    getOrderDetail() {},
+    close() {
+      this.$refs["form"].resetFields();
+    },
+    submit() {},
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.isShow = false;
+          this.$emit("search");
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+  computed: {
+    isShow: {
+      get() {
+        return this.dialogVisible;
+      },
+      set(val) {
+        this.$emit("update:dialogVisible", false);
+      },
+    },
+  },
+  components: { studentDetails },
+};
+</script>
+
+<style lang="scss" scoped>
+.orderDetail {
+  .head {
+    margin-bottom: 20px;
+    span {
+      padding-right: 20px;
+      color: #409eff;
+    }
+  }
+}
+</style>

src/views/financed/components/studentDetails.vue

@@ -0,0 +1,187 @@
+<template>
+  <div class="studentDetails">
+    <el-tabs v-model="tabType" @tab-click="handleClick">
+      <el-tab-pane label="学员详情" name="1">
+        <div style="margin-bottom: 10px">
+          <!-- 搜索框 -->
+          <el-input
+            style="width: 230px; margin-right: 10px"
+            size="small"
+            v-model="form.templateName"
+            placeholder="姓名/身份证号"
+          ></el-input>
+          <el-button size="small" type="primary" @click="search(form.goodsId)"
+            >查询</el-button
+          >
+          <el-button size="small">重置</el-button>
+        </div>
+        <table-list
+          :tableSets="tableSet1"
+          :tableData="tableData1"
+          :navText="dialogNavText"
+        >
+        </table-list>
+        <pagination
+          :total="total"
+          :pageSize.sync="formData.pageSize"
+          :currentPage.sync="formData.pageNum"
+          @search="search"
+        />
+      </el-tab-pane>
+      <el-tab-pane label="操作历史" name="2">
+        <table-list
+          :tableSets="tableSet2"
+          :tableData="tableData2"
+          :navText="dialogNavText"
+        >
+        </table-list>
+        <pagination
+          :total="total"
+          :pageSize.sync="formData.pageSize"
+          :currentPage.sync="formData.pageNum"
+          @search="search"
+        />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import tableList from "@/components/tableList";
+import pagination from "@/components/pagination";
+export default {
+  name: "SaasMasterPlatformStudentDetails",
+
+  data() {
+    return {
+      form: {},
+      tableSet1: [
+        {
+          label: "姓名",
+          prop: "educationName",
+          hidden: true,
+        },
+        {
+          label: "身份证号",
+          prop: "businessName",
+          hidden: true,
+        },
+        {
+          label: "手机号",
+          prop: "name",
+          hidden: true,
+        },
+        {
+          label: "课程",
+          prop: "specNumber",
+          hidden: true,
+        },
+        {
+          label: "专业",
+          prop: "specNumber",
+          hidden: true,
+        },
+        {
+          label: "业务",
+          prop: "specNumber",
+          hidden: true,
+        },
+        {
+          label: "原价(元)",
+          prop: "specNumber",
+          hidden: true,
+        },
+        {
+          label: "单价(元)",
+          prop: "specNumber",
+          hidden: true,
+        },
+        {
+          label: "学习状态",
+          prop: "specNumber",
+          hidden: true,
+        },
+      ],
+      tableData1: [],
+      tableSet2: [
+        {
+          label: "时间",
+          prop: "educationName",
+          hidden: true,
+        },
+        {
+          label: "操作者",
+          prop: "businessName",
+          hidden: true,
+        },
+        {
+          label: "动作",
+          prop: "name",
+          hidden: true,
+        },
+        {
+          label: "字段",
+          prop: "specNumber",
+          hidden: true,
+        },
+        {
+          label: "操作前",
+          prop: "specNumber",
+          hidden: true,
+        },
+        {
+          label: "操作后",
+          prop: "specNumber",
+          hidden: true,
+        },
+      ],
+      tableData2: [],
+      dialogNavText: {
+        index: 0,
+        num: true,
+        border: true,
+        choice: false,
+        choiceRadio: false,
+        radioKey: "specTemplateId",
+        radioFixed: false,
+        addHide: !false,
+        tableHide: true,
+        dontNum: false,
+        headShow: false,
+        backFatherBtn: {
+          status: false,
+          title: "未定义",
+        },
+      },
+      formData: {
+        pageSize: 10,
+        pageNum: 1,
+      },
+      total: 0,
+      tabType: "1",
+    };
+  },
+
+  mounted() {},
+
+  methods: {
+    search() {},
+    handleClick(tab) {
+      console.log(tab);
+    },
+  },
+  components: {
+    tableList,
+    pagination,
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.studentDetails {
+  margin-top: 10px;
+  #tableList {
+    padding: 0;
+  }
+}
+</style>

src/views/financed/cost/dislogSet.vue

@@ -1,97 +1,196 @@
 <template>
   <div>
     <BaseDialog
-      width="1200px"
+      width="1400px"
       :isShow.sync="isShow"
-      :title="['新增', '修改', '复制'][type]"
+      :title="title"
       @close="close"
       @submit="submitForm"
     >
+      <div class="bop-tip">
+        <div><i class="el-icon-warning-outline"></i>说明</div>
+        <div>
+          ●
+          如果提成方式是按阶梯价计算，则需设置阶梯价格区间（最高价无穷大，则填写
+          “ * ” ）。如果无需按阶梯价计算提成，留空即可。
+        </div>
+      </div>
       <el-form
         inline
         hide-required-asterisk
         :model="form"
         :rules="rules"
         ref="form"
-        label-width="100px"
       >
         <div>
-          <el-form-item prop="name" label="模板名称：">
+          <el-form-item prop="tpName" label="模板名称：" label-width="100px">
             <el-input
               placeholder="请输入模板名称"
-              v-model="form.name"
+              v-model="form.tpName"
             ></el-input>
           </el-form-item>
+          <el-form-item prop="tenantId" label="">
+            <el-select
+              filterable
+              v-model="form.tenantId"
+              placeholder="请选择关联机构"
+            >
+              <el-option
+                v-for="item in companyList"
+                :key="item.tenantId"
+                :label="item.tenantName"
+                :value="item.tenantId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="">
+            <el-checkbox
+              :true-label="1"
+              :false-label="0"
+              v-model="form.defaultStatus"
+              >默认</el-checkbox
+            >
+          </el-form-item>
         </div>
 
-        <div v-for="(item, index) in form.list" :key="index">
+        <div v-for="(item, index) in form.itemList" :key="index">
           <el-form-item
-            :prop="'list.' + index + '.email'"
+            :prop="'itemList.' + index + '.itemName'"
             :label="index == 0 ? '成本设置：' : ' '"
-            :rules="rules['email']"
+            :rules="rules['itemName']"
+            label-width="100px"
           >
             <el-input
               placeholder="请输入成本项名称"
-              v-model="item.email"
+              v-model="item.itemName"
             ></el-input>
           </el-form-item>
           <el-form-item
-            style="margin-left: 10px"
             label=""
-            label-width="4px"
-            :prop="'list.' + index + '.email1'"
-            :rules="rules['email1']"
+            :prop="'itemList.' + index + '.itemCategory'"
+            :rules="rules['itemCategory']"
           >
-            <el-select v-model="item.email1" placeholder="请选择是否分成">
-              <el-option label="分成成本" value="1"></el-option>
-              <el-option label="非分成成本" value="2"></el-option>
+            <el-select v-model="item.itemCategory" placeholder="请选择成本类型">
+              <el-option label="业务类型" :value="1"></el-option>
+              <el-option label="非分成" :value="2"></el-option>
             </el-select>
           </el-form-item>
+          <template v-if="item.itemCategory == 1">
+            <el-form-item
+              label=""
+              :prop="'itemList.' + index + '.educationTypeId'"
+              :rules="rules['educationTypeId']"
+            >
+              <el-select
+                @change="changeEdu(item)"
+                v-model="item.educationTypeId"
+                placeholder="请选择教育类型"
+              >
+                <el-option
+                  v-for="item in eduList"
+                  :key="item.id"
+                  :label="
+                    item.schemeName +
+                    (item.schemeName ? '-' : '') +
+                    item.educationName
+                  "
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item
+              label=""
+              :prop="'itemList.' + index + '.businessId'"
+              :rules="rules['businessId']"
+            >
+              <el-select
+                filterable
+                v-model="item.businessId"
+                placeholder="请选择业务层次"
+              >
+                <el-option
+                  v-for="level in backbusinessList(item.educationTypeId)"
+                  :key="level.businessId"
+                  :label="level.aliasName"
+                  :value="level.businessId"
+                  @click.native="changeBus(item, level.projectId)"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </template>
           <el-form-item
-            style="margin-left: 10px"
             label=""
-            label-width="4px"
-            :prop="'list.' + index + '.email2'"
-            :rules="rules['email2']"
+            :prop="'itemList.' + index + '.itemType'"
+            :rules="rules['itemType']"
           >
-            <el-select v-model="item.email2" placeholder="请选择成本类型">
-              <el-option label="百分比成本" value="1"></el-option>
-              <el-option label="固定成本" value="2"></el-option>
+            <el-select v-model="item.itemType" placeholder="请选择成本类型">
+              <el-option label="百分比成本" :value="1"></el-option>
+              <el-option label="固定成本" :value="2"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item
-            v-if="item.email2 == 1"
-            label-width="0"
-            :prop="'list.' + index + '.email3'"
-            label=" "
-            :rules="rules['email3']"
+            label=""
+            :prop="'itemList.' + index + '.minValue'"
+            :rules="rules['minValue']"
+            class="range"
           >
-            <el-input placeholder="请输入固定成本" v-model="item.email3">
-              <template slot="append">元</template>
-            </el-input>
+            <el-col :span="11">
+              <el-input
+                v-int
+                placeholder="最低价"
+                v-model.number="item.minValue"
+              ></el-input>
+            </el-col>
+            <el-col class="line" :span="2" style="magrin: 10px">-</el-col>
+            <el-col :span="11">
+              <el-input
+                v-int
+                placeholder="最高价"
+                @change="changeMaxValue('itemList.' + index + '.minValue')"
+                v-model.number="item.maxValue"
+              ></el-input>
+            </el-col>
           </el-form-item>
           <el-form-item
-            v-if="item.email2 == 2"
+            v-if="item.itemType"
+            class="ddd"
             label-width="0"
-            :prop="'list.' + index + '.email4'"
+            :prop="'itemList.' + index + '.typeValue'"
             label=" "
-            :rules="rules['email4']"
+            :rules="rules['typeValue']"
           >
-            <el-input placeholder="请输入百分比成本" v-model="form.email4">
-              <template slot="append">%</template>
+            <el-input
+              v-if="item.itemType == 1"
+              placeholder="百分比成本"
+              v-model="item.typeValue"
+              key="2"
+              v-int="{ max: 100 }"
+            >
+              <template slot="append"> % </template>
+            </el-input>
+            <el-input
+              key="1"
+              v-else
+              placeholder="固定成本"
+              v-model="item.typeValue"
+              v-int
+            >
+              <template slot="append"> 元 </template>
             </el-input>
           </el-form-item>
-          <i
-            @click="add(index)"
-            style="font-size: 24px; margin: 5px; cursor: pointer"
-            class="el-icon-circle-plus-outline"
-          ></i>
-          <i
-            v-if="index != 0"
-            @click="del(index)"
-            style="font-size: 24px; margin: 5px; cursor: pointer"
-            class="el-icon-remove-outline"
-          ></i>
+          <el-form-item label-width="0" label=" ">
+            <div class="btns">
+              <i @click="add(index, item)" class="el-icon-connection"></i>
+              <i @click="add(index)" class="el-icon-circle-plus-outline"></i>
+              <i
+                v-if="index != 0"
+                @click="del(index)"
+                class="el-icon-remove-outline"
+              ></i>
+            </div>
+          </el-form-item>
         </div>
       </el-form>
     </BaseDialog>
@@ -99,6 +198,7 @@
 </template>
 
 <script>
+import { eduList, addCost, costDetail, editCost } from "@/api/financed/index";
 export default {
   name: "DislogSet",
   props: {
@@ -106,92 +206,188 @@ export default {
       type: Boolean,
       default: false,
     },
-    // 1 新增  2修改  3复制
+    // 0 新增  1修改  2复制
     type: {
       type: [String, Number],
       default: 0,
     },
-    id: {
-      type: String,
+    tpId: {
+      type: [String, Number],
       default: "",
     },
   },
   data() {
+    var checkMinValue = (rule, value, callback) => {
+      const list = this.itemList[rule.field.split(".")[1]];
+      const { maxValue, businessId } = list;
+      if (maxValue || value) {
+        if (!value) {
+          callback(new Error("请输入最低价"));
+        } else if (!maxValue) {
+          callback(new Error("请输入最高价"));
+        } else if (maxValue <= value) {
+          callback(new Error("最低价不能小于最高价"));
+        }
+      }
+      if (businessId) {
+        const levelList = this.itemList.filter(
+          (e) => e.businessId == list.businessId
+        );
+        if (levelList.length > 1) {
+          const text = this.isHaveIntersect(levelList);
+          text && callback(new Error(text));
+        }
+      }
+      callback();
+    };
     return {
       form: {},
       rules: {
-        name: [
-          { required: true, message: "请输入活动名称", trigger: "blur" },
-          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
+        tpName: [
+          { required: true, message: "请输入模板名称", trigger: "blur" },
+        ],
+        tenantId: [
+          { required: true, message: "请选择关联机构", trigger: "change" },
         ],
-        email: [
+        itemName: [
           { required: true, message: "请输入成本项名称", trigger: "blur" },
-          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
         ],
-        email1: [
-          { required: true, message: "请选择是否分成", trigger: "change" },
+        businessId: [
+          { required: true, message: "请选择业务层次", trigger: "blur" },
         ],
-        email2: [
-          { required: true, message: "请选择成本类型", trigger: "change" },
+        educationTypeId: [
+          { required: true, message: "请选择教育类型", trigger: "change" },
         ],
-        email3: [
-          { required: true, message: "请输入固定成本", trigger: "blur" },
+        itemCategory: [
+          { required: true, message: "请选择业务类型", trigger: "change" },
         ],
-        email4: [
+        itemType: [
+          { required: true, message: "请选择成本类型", trigger: "change" },
+        ],
+        typeValue: [
           { required: true, message: "请输入百分比成本", trigger: "blur" },
         ],
+        minValue: [{ validator: checkMinValue, trigger: "blur" }],
       },
+      companyList: [],
+      eduList: [],
     };
   },
-
-  mounted() {},
-
   methods: {
     init() {
       this.resetForm();
-      if (this.id) {
-      }
+      this.tpId && this.getCostDetail();
+      this.getCompanyList();
+      this.getEduList();
+    },
+    getCostDetail() {
+      costDetail(this.tpId).then((res) => {
+        if (this.type == 2) delete this.form["tpId"];
+        Object.keys(this.form).map((key) => {
+          this.form[key] = res.data[key];
+        });
+      });
     },
-    add(index) {
-      this.form.list.splice(index + 1, 0, {
-        email: undefined,
-        email1: undefined,
-        email2: undefined,
-        email3: undefined,
-        email4: undefined,
+    getEduList() {
+      if (this.eduList.length) return;
+      eduList({}).then((res) => {
+        this.eduList = res.rows;
       });
     },
+    backbusinessList(eduId) {
+      if (!eduId || !this.eduList.length) return [];
+      let data = this.eduList.find((e) => e.id == eduId);
+      return data.businessList || [];
+    },
+    getCompanyList() {
+      if (this.companyList.length) return;
+      this.$api.systemtenantlist(this.formData).then((res) => {
+        this.companyList = res.rows;
+      });
+    },
+    changeEdu(data) {
+      data.businessId = undefined;
+      data.projectId = undefined;
+    },
+    changeBus(data, projectId) {
+      data.projectId = projectId;
+    },
+    add(index, data) {
+      data = data || {
+        projectId: undefined,
+        itemName: undefined,
+        itemCategory: undefined,
+        businessId: undefined,
+        educationTypeId: undefined,
+        itemType: undefined,
+        typeValue: undefined,
+        minValue: undefined,
+        maxValue: undefined,
+      };
+      this.itemList.splice(index + 1, 0, data);
+    },
     del(index) {
-      this.form.list.splice(index, 1);
+      this.itemList.splice(index, 1);
     },
     close() {
       this.$refs["form"].resetFields();
     },
-    submit() {},
     resetForm() {
       this.form = {
-        list: [
+        itemList: [
           {
-            email: undefined,
-            email1: undefined,
-            email2: undefined,
-            email3: undefined,
-            email4: undefined,
+            projectId: undefined,
+            itemName: undefined,
+            itemCategory: undefined,
+            businessId: undefined,
+            educationTypeId: undefined,
+            itemType: undefined,
+            typeValue: undefined,
+            minValue: undefined,
+            maxValue: undefined,
           },
         ],
-        name: undefined,
+        tpId: undefined,
+        tpName: undefined,
+        defaultStatus: 0,
+        tenantId: undefined,
       };
     },
+    cb() {
+      this.$message.success(this.title + "成功");
+      this.isShow = false;
+      this.$emit("search");
+    },
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          this.isShow = false;
-          this.$emit("search");
+          if (this.type !== 1) {
+            addCost(this.form).then(this.cb);
+          } else {
+            editCost(this.form).then(this.cb);
+          }
         } else {
           return false;
         }
       });
     },
+    changeMaxValue(prop) {
+      this.$refs.form.validateField(prop);
+    },
+    // 阶梯校验
+    isHaveIntersect(list) {
+      const isEmpty = list.some((e) => !e.minValue && !e.maxValue);
+      if (isEmpty) {
+        return "非阶梯计价只能存在一个";
+      }
+      list = list.sort((a, b) => a.minValue - b.minValue);
+      for (let i = 0, len = list.length - 1; i < len; i++) {
+        if (list[i].maxValue >= list[i + 1].minValue) {
+          return "阶梯计价存在范围冲突";
+        }
+      }
+      return;
+    },
   },
   computed: {
     isShow: {
@@ -205,8 +401,54 @@ export default {
         this.$emit("update:dialogVisible", false);
       },
     },
+    title() {
+      return ["新增", "修改", "复制"][this.type];
+    },
+    itemList() {
+      return this.form.itemList;
+    },
   },
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+/deep/.el-input--medium .el-input__inner {
+  width: 144px;
+}
+/deep/ .range {
+  .el-form-item__content {
+    width: 170px;
+  }
+  .el-input--medium .el-input__inner {
+    width: 76px;
+  }
+}
+/deep/ .ddd {
+  margin-left: -10px;
+  .el-input--medium .el-input__inner {
+    width: 105px;
+  }
+}
+.line {
+  text-align: center;
+}
+.btns {
+  height: 36px;
+  display: flex;
+  align-items: center;
+  i {
+    font-size: 24px;
+    cursor: pointer;
+    margin-left: 5px;
+  }
+}
+.bop-tip {
+  background: #fff6f7;
+  margin: 0 0 20px 10px;
+  padding: 8px 10px;
+  i {
+    font-size: 16px;
+    color: #e6a23c;
+  }
+}
+</style>

src/views/financed/cost/index.vue

@@ -13,34 +13,30 @@
       :tableSets="tableSet"
       :tableData="tableData"
       :navText="navText"
+      @sortChange="sortChange"
       :loading="loading"
     >
       <template slot="customize">
         <el-button type="primary" @click="handelClick(0)"> 新增 </el-button>
         <el-button @click="batchDel" type="warning"> 批量删除 </el-button>
       </template>
-      <template slot="pcost" slot-scope="props">
-        <div>税收：40%</div>
-        <div>税收：40%</div>
-      </template>
-      <template slot="fcost" slot-scope="props">
-        <div>税收：40</div>
-        <div>税收：40</div>
-      </template>
       <template slot="status" slot-scope="props">
         <el-checkbox
-          @change="changeStatus"
-          :checked="!!props.scope.row.status"
-        ></el-checkbox>
+          :true-label="1"
+          :false-label="0"
+          @change="(val) => changeStatus(props.scope.row, val)"
+          v-model="props.scope.row.defaultStatus"
+        >
+        </el-checkbox>
       </template>
       <template slot="btn" slot-scope="props">
-        <el-button type="text" @click="handelClick(2, props.scope.row)"
+        <el-button type="text" @click="handelClick(2, props.scope.row.tpId)"
           >复制</el-button
         >
-        <el-button type="text" @click="handelClick(1, props.scope.row)"
+        <el-button type="text" @click="handelClick(1, props.scope.row.tpId)"
           >修改</el-button
         >
-        <el-button type="text" @click="handelDel(props.scope.row.id)"
+        <el-button type="text" @click="handelDel(props.scope.row.tpId)"
           >删除</el-button
         >
       </template>
@@ -53,7 +49,7 @@
     />
     <dislog-set
       :dialogVisible.sync="dialogVisible"
-      :id="id"
+      :tpId="tpId"
       :type="type"
       @search="search"
     ></dislog-set>
@@ -65,12 +61,18 @@ import dislogSet from "./dislogSet.vue";
 import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
+import {
+  costList,
+  editDefaultStatus,
+  editCost,
+  batchCost,
+} from "@/api/financed/index";
 export default {
   name: "cost",
   components: { searchBoxNew, tableList, pagination, dislogSet },
   data() {
     return {
-      loading: false, //当前表单加载是否加载动画
+      loading: false, 
       navText: {
         title: "成本模板",
         index: 0,
@@ -79,44 +81,26 @@ export default {
         choice: true,
         addHide: true,
         openCheckMore: true,
-        changeWidth: "160px",
         custom: false,
-        backFatherBtn: {
-          status: false,
-          title: "配置下单填选模板",
-        },
       },
-      //搜索
       formList: [
         {
-          prop: "name",
+          prop: "tpName",
           placeholder: "请输入模板名称",
         },
       ],
-      formData: {
-        pageSize: 10,
-        pageNum: 1,
-      },
-      // 表单
+      formData: {},
       tableSet: [
         {
           label: "模板名称",
-          prop: "name",
-          hidden: true,
-        },
-        {
-          label: "百分比成本",
-          prop: "posterTempName",
+          prop: "tpName",
           hidden: true,
-          scope: "solt",
-          soltName: "pcost",
         },
         {
-          label: "固定成本成本",
-          prop: "posterTempName1",
+          label: "关联机构",
+          prop: "tenantName",
           hidden: true,
-          scope: "solt",
-          soltName: "fcost",
+          sort: "custom",
         },
         {
           label: "默认状态",
@@ -126,47 +110,59 @@ export default {
           soltName: "status",
         },
       ],
-      tableData: [], //表单数据
-      total: 0, //一共多少条
+      tableData: [],
+      total: 0,
       dialogVisible: false,
-      id: "",
+      tpId: "",
       type: 0,
     };
   },
   created() {
-    this.search();
+    this.search(2);
   },
   methods: {
-    handelClick(type, id) {
+    handelClick(type, tpId) {
       this.dialogVisible = true;
       this.type = type;
-      if (type !== 0) {
-        this.id = id;
-      }
+      this.tpId = tpId;
     },
-    changeStatus(val) {
-      console.log(val);
+    changeStatus({ tpId, tenantId }, defaultStatus) {
+      editDefaultStatus({ tpId, tenantId, defaultStatus }).then((res) => {
+        this.$message.success("状态修改成功");
+        this.search();
+      });
     },
     batchDel() {
-      let len = this.$refs.tableList.allCheckData.length;
-      if (!len) {
+      const ids = this.$refs.tableList.allCheckData.map((item) => item.tpId);
+      if (!ids.length) {
         return this.$message.warning("请先勾选模板");
       }
-      const ids = this.$refs.tableList.allCheckData.map((item) => item.id);
+      this.handelDel(ids, 1);
     },
-    handelDel(id) {
-      this.$confirm("此操作将删除该模板, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
+    handelDel(tpId, type = 0) {
+      this.$confirm(
+        `此操作将删除${type ? "批量" : "该"}模板, 是否继续?`,
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
         .then(() => {
-          this.$api.editUser(id).then((res) => {
-            if (res.code === 200) {
+          if (type) {
+            batchCost({ ids: tpId }).then((res) => {
               this.$message.success("删除成功");
+              this.$refs.tableList.clearMoreActive();
               this.search();
-            }
-          });
+            });
+          } else {
+            editCost({ tpId, status: -1 }).then((res) => {
+              this.$message.success("删除成功");
+              this.$refs.tableList.clearMoreActive();
+              this.search();
+            });
+          }
         })
         .catch(() => {
           this.$message({
@@ -181,17 +177,10 @@ export default {
         this.formData = {
           pageSize: 10,
           pageNum: 1,
+          tenantSort: undefined,
         };
       }
-      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);
-      // }
-      this.$api
-        .distributiontemplist(data)
+      costList(this.formData)
         .then((res) => {
           this.tableData = res.rows;
           this.total = res.total;
@@ -201,6 +190,15 @@ export default {
           this.loading = false;
         });
     },
+    sortChange(data) {
+      this.formData.tenantSort = data.order
+        ? data.order == "ascending"
+          ? 1
+          : 0
+        : undefined;
+      this.formData.pageNum = 1;
+      this.search();
+    },
     init() {
       this.search(2);
     },