谢杰标 2 years ago
parent
commit
889bb90267

+ 17 - 0
src/directive/common/int.js

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

+ 18 - 16
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;

+ 156 - 142
src/utils/index.js

@@ -1,18 +1,25 @@
-import { parseTime } from './ruoyi'
+import { parseTime } from "./ruoyi";
 
 /**
  * 表格时间格式化
  */
 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,83 @@ 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);
+}
+// 保留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");
+  }
 }
-

+ 26 - 13
src/views/financed/arap/index.vue

@@ -335,21 +335,34 @@ export default {
           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 },
-          ],
+        data.unshift(
+          {
+            prop: "status1",
+            placeholder: "角色选择",
+            scope: "select",
+            options: [
+              { label: "不限", value: 2 },
+              { label: "已结清", value: 1 },
+              { label: "未结清", value: 0 },
+            ],
+          },
+          {
+            prop: "status1",
+            placeholder: "审核状态",
+            scope: "select",
+            options: [
+              { label: "不限", value: 2 },
+              { label: "已结清", value: 1 },
+              { label: "未结清", value: 0 },
+            ],
+          }
+        );
+      } else {
+        data.push({
+          prop: "name",
+          placeholder: "机构/业务号",
         });
       }
       return data;

+ 104 - 26
src/views/financed/cost/dislogSet.vue

@@ -124,40 +124,63 @@
           </el-form-item>
           <el-form-item
             label=""
-            :prop="'itemList.' + index + '.email2'"
-            :rules="rules['email2']"
+            :prop="'itemList.' + index + '.minValue'"
+            :rules="rules['minValue']"
             class="range"
           >
             <el-col :span="11">
-              <el-input placeholder="最低价" v-model="item.minValue"></el-input>
+              <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 placeholder="最高价" v-model="item.maxValue"></el-input>
+              <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
-            class="ddd"
-            v-if="item.itemType == 1"
-            label-width="0"
-            :prop="'itemList.' + index + '.typeValue'"
-            label=" "
-            :rules="rules['typeValue']"
+
+          <!-- <el-form-item
+            label=""
+            :prop="'itemList.' + index + '.minValue'"
+            :rules="rules['minValue']"
+            class="range"
           >
-            <el-input placeholder="百分比成本" v-model="item.typeValue">
-              <template slot="append">%</template>
-            </el-input>
+            <el-input placeholder="最低价" v-model="item.minValue"></el-input>
           </el-form-item>
+
+          <div class="line">-</div>
           <el-form-item
-            v-if="item.itemType == 2"
+            label=""
+            :prop="'itemList.' + index + '.maxValue'"
+            :rules="rules['maxValue']"
+            class="range"
+          >
+            <el-input placeholder="最高价" v-model="item.maxValue"></el-input>
+          </el-form-item> -->
+
+          <el-form-item
+            v-if="item.itemType"
             class="ddd"
             label-width="0"
             :prop="'itemList.' + index + '.typeValue'"
             label=" "
             :rules="rules['typeValue']"
           >
-            <el-input placeholder="固定成本" v-model="item.typeValue">
-              <template slot="append">元</template>
+            <el-input
+              :placeholder="item.itemType == 1 ? '百分比成本' : '固定成本'"
+              v-model="item.typeValue"
+              v-int
+            >
+              <template slot="append">
+                {{ item.itemType == 1 ? "%" : "元" }}
+              </template>
             </el-input>
           </el-form-item>
           <el-form-item label-width="0" label=" ">
@@ -198,6 +221,35 @@ export 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) {
+        callback();
+      }
+      const levelList = this.itemList.filter(
+        (e) => e.businessId == list.businessId
+      );
+      if (levelList.length > 1) {
+        const isEmpty = levelList.some((e) => !e.minValue && !e.maxValue);
+        if (isEmpty) {
+          callback(new Error("同层级成本设置不是阶梯计价只能存在一个"));
+        } else {
+          this.isHaveIntersect(levelList) &&
+            callback(new Error("阶梯计价存在范围冲突"));
+        }
+      }
+      callback();
+    };
     return {
       form: {},
       rules: {
@@ -222,12 +274,10 @@ export default {
         itemType: [
           { required: true, message: "请选择成本类型", trigger: "change" },
         ],
-        email3: [
-          { required: true, message: "请输入固定成本", trigger: "blur" },
-        ],
         typeValue: [
           { required: true, message: "请输入百分比成本", trigger: "blur" },
         ],
+        minValue: [{ validator: checkMinValue, trigger: "blur" }],
       },
       companyList: [],
       eduList: [],
@@ -242,7 +292,7 @@ export default {
     },
     getCostDetail() {
       costDetail(this.tpId).then((res) => {
-        if (this.type == 2) delete res.data["tpId"];
+        if (this.type == 2) delete this.form["tpId"];
         Object.keys(this.form).map((key) => {
           this.form[key] = res.data[key];
         });
@@ -276,18 +326,18 @@ export default {
       data = data || {
         projectId: undefined,
         itemName: 456,
-        itemCategory: "1",
+        itemCategory: 1,
         businessId: undefined,
         educationTypeId: 21,
-        itemType: "1",
+        itemType: 1,
         typeValue: undefined,
         minValue: undefined,
         maxValue: undefined,
       };
-      this.form.itemList.splice(index + 1, 0, data);
+      this.itemList.splice(index + 1, 0, data);
     },
     del(index) {
-      this.form.itemList.splice(index, 1);
+      this.itemList.splice(index, 1);
     },
     close() {
       this.$refs["form"].resetFields();
@@ -300,7 +350,18 @@ export default {
             projectId: undefined,
             itemName: 456,
             itemCategory: 1,
-            businessId: undefined,
+            businessId: 151,
+            educationTypeId: 21,
+            itemType: 1,
+            typeValue: undefined,
+            minValue: undefined,
+            maxValue: undefined,
+          },
+          {
+            projectId: undefined,
+            itemName: 456,
+            itemCategory: 1,
+            businessId: 151,
             educationTypeId: 21,
             itemType: 1,
             typeValue: undefined,
@@ -322,6 +383,8 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          console.log(valid, 666);
+          return;
           if (this.type !== 1) {
             addCost(this.form).then(this.cb);
           } else {
@@ -332,6 +395,18 @@ export default {
         }
       });
     },
+    changeMaxValue(prop) {
+      this.$refs.form.validateField(prop);
+    },
+    isHaveIntersect(list) {
+      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 true;
+        }
+      }
+      return false;
+    },
   },
   computed: {
     isShow: {
@@ -348,6 +423,9 @@ export default {
     title() {
       return ["新增", "修改", "复制"][this.type];
     },
+    itemList() {
+      return this.form.itemList;
+    },
   },
 };
 </script>

+ 2 - 2
src/views/financed/cost/index.vue

@@ -119,8 +119,8 @@ export default {
       ],
       tableData: [],
       total: 0,
-      dialogVisible: false,
-      tpId: "1",
+      dialogVisible: true,
+      tpId: "",
       type: 0,
     };
   },