From d3c2017d15fbbe426a301d2bb2f93045cc035b78 Mon Sep 17 00:00:00 2001 From: luojie <125330818@qq.com> Date: Thu, 22 Jan 2026 18:23:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][sp0?= =?UTF-8?q?03]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/BaseInfoFormPcakge.vue | 19 +- src/components/Template/CustomTable.vue | 53 ++- src/components/Template/HandleFormItem.vue | 3 + src/utils/index.js | 499 +++++++++++---------- .../comps/template/comps/sp/SWYPBQGZYZBB.vue | 33 +- .../comps/template/comps/sp/SWYPNBGZYZBB.vue | 23 +- .../template/formConfig/paralleAndLadderConfig.js | 2 +- .../comps/template/mixins/templateMixin.js | 5 +- 8 files changed, 357 insertions(+), 280 deletions(-) diff --git a/src/components/Template/BaseInfoFormPcakge.vue b/src/components/Template/BaseInfoFormPcakge.vue index f9b9489..20b84f0 100644 --- a/src/components/Template/BaseInfoFormPcakge.vue +++ b/src/components/Template/BaseInfoFormPcakge.vue @@ -83,6 +83,7 @@
@@ -129,6 +130,7 @@
{{sItem.otherLabel ? $t(sItem.otherLabel) : $t("template.common.other") }}
@@ -158,12 +160,14 @@
@@ -213,6 +217,7 @@ export default { allFieldsConfig: {},//包含config的所有字段,主要用于校验表单是否填写 errors: {},//存储表单错误信息,用于标红提示 orangeBgFields: {},// 存储需要橙色背景的字段 + oldFormFields: {},// 存储旧的表单数据,用于比较变化 }; }, watch: { @@ -268,7 +273,16 @@ export default { } }, //更新表单数据 - updateFormData(key, value) { + updateFormData(key, value,oldKeys = []) { + + if(oldKeys.length){ + // 深拷贝当前表单数据,避免直接修改原数据 + const cloneFormFields = JSON.parse(JSON.stringify(this.formFields)); + oldKeys.forEach(oldKey => { + //需要把记录一下被更新的旧值,用于取消的时候回填,主要用于clickable类型 + this.oldFormFields[oldKey] = cloneFormFields[oldKey]; + }) + } this.formFields[key] = value; // 清除该表单项的错误状态 if (this.errors[key]) { @@ -557,6 +571,9 @@ console.log(key,val,compKey,"compKey") this.onBlur(key, formFields[key]); } }, + resetRecord(key){ + this.formFields = {...this.formFields, ...this.oldFormFields} + }, }, } diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue index 3c6853b..ab8491f 100644 --- a/src/components/Template/CustomTable.vue +++ b/src/components/Template/CustomTable.vue @@ -76,12 +76,14 @@ @update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)" :orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" /> - @@ -207,7 +211,7 @@ export default { const { stepTableFormData = [], headerSelectFields = {} } = newData; this.updateDataSource(stepTableFormData); this.headerSelectFields = JSON.parse(JSON.stringify(headerSelectFields)); - + // 在数据加载后检查 compareTo 逻辑 this.checkCompareToOnDataLoad(); } @@ -238,7 +242,10 @@ export default { } }, //判断是否显示其他输入框 - isShowOther(v = []) { + isShowOther(v = [],col) { + if(!col.otherCode){ + return false; + } // 确保v是数组类型,以避免类型错误 const arr = Array.isArray(v) ? v : [v]; //和凡哥商量,只要value为负数都显示其他 @@ -431,11 +438,11 @@ export default { // 检查并应用 compareTo 逻辑 checkCompareToLogic(rowIndex, colIndex, colKey, value) { const col = this.columns[colIndex]; - + // 检查主字段的 compareTo 逻辑 if (col && col.bodyFillType === "actFill" && col.compareTo) { const compareToValue = this.localDataSource[rowIndex][col.compareTo]; - + // 比较当前值和compareTo值,如果不相等则设置橙色背景 if (value !== compareToValue) { this.setOrangeBg(rowIndex, colIndex, colKey, true); @@ -445,15 +452,15 @@ export default { } } }, - + // 在数据加载时检查 compareTo 逻辑 checkCompareToOnDataLoad() { // 遍历所有行和列,检查 compareTo 逻辑 this.localDataSource.forEach((row, rowIndex) => { this.columns.forEach((col, colIndex) => { - const currentValue = row[col.prop]; - const compareToValue = row[col.compareTo]; - if ( col.compareTo && currentValue && compareToValue) { + const currentValue = row[col.prop]; + const compareToValue = row[col.compareTo]; + if (col.compareTo && currentValue && compareToValue) { // 比较当前值和compareTo值,如果不相等则设置橙色背景 if (!isEqual(currentValue, compareToValue)) { this.setOrangeBg(rowIndex, colIndex, col.prop, true); @@ -462,13 +469,13 @@ export default { this.setOrangeBg(rowIndex, colIndex, col.prop, false); } } - + // 检查子字段的 compareTo 逻辑 if (col.bodySubFillType === "actFill" && col.bodySubCompareTo) { const currentValue = row[col.bodySubKey]; const compareToValue = row[col.bodySubCompareTo]; - - if (!!currentValue&& !!compareToValue) { + + if (!!currentValue && !!compareToValue) { // 比较当前值和compareTo值,如果不相等则设置橙色背景 if (!isEqual(currentValue, compareToValue)) { this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, true); @@ -481,15 +488,15 @@ export default { }); }); }, - + // 表体值变化 onBodyValueChange(rowIndex, colIndex, value) { const col = this.columns[colIndex]; this.localDataSource[rowIndex][col.prop] = value; - + // 检查并应用 compareTo 逻辑 this.checkCompareToLogic(rowIndex, colIndex, col.prop, value); - + // 输入时清除对应表单项的错误状态 this.formErrors = this.formErrors.filter(error => !(error.rowIndex === rowIndex && @@ -502,11 +509,11 @@ export default { onBodySubValueChange(rowIndex, colIndex, value) { const col = this.columns[colIndex]; this.localDataSource[rowIndex][col.bodySubKey] = value; - + // 检查子字段的 compareTo 逻辑 if (col && col.bodySubFillType === "actFill" && col.bodySubCompareTo) { const compareToValue = this.localDataSource[rowIndex][col.bodySubCompareTo]; - + // 比较当前值和compareTo值,如果不相等则设置橙色背景 if (value !== compareToValue) { this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, true); @@ -515,7 +522,7 @@ export default { this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, false); } } - + // 输入时清除对应表单项的错误状态 this.formErrors = this.formErrors.filter(error => !(error.rowIndex === rowIndex && @@ -822,4 +829,8 @@ export default { color: #606266; width: auto; } + +.body-span { + text-align: center; +} \ No newline at end of file diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue index b6e3820..fce2b75 100644 --- a/src/components/Template/HandleFormItem.vue +++ b/src/components/Template/HandleFormItem.vue @@ -387,6 +387,9 @@ export default { this.$emit('input', this.inputValue); // 触发 v-model 更新 this.$emit("blur", this.oldValue); this.$emit("change", this.oldValue); + if(this.item.type === "clickable"){ + this.$emit("resetRecord"); + } }, //处理更新记录 diff --git a/src/utils/index.js b/src/utils/index.js index 3b1617e..70a1657 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,18 +1,19 @@ import { parseTime } from './ruoyi' -import { encrypt,decrypt } from '@/utils/encryptUtil' +import { encrypt, decrypt } from '@/utils/encryptUtil'; +import moment from 'moment'; /** * 表格时间格式化 */ 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 + 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 } /** @@ -21,41 +22,41 @@ export function formatDate(cellValue) { * @returns {string} */ export function formatTime(time, option) { - if (('' + time).length === 10) { - time = parseInt(time) * 1000 - } else { - time = +time - } - const d = new Date(time) - const now = Date.now() - - const diff = (now - d) / 1000 - - if (diff < 30) { - return '刚刚' - } else if (diff < 3600) { - // less 1 hour - return Math.ceil(diff / 60) + '分钟前' - } else if (diff < 3600 * 24) { - return Math.ceil(diff / 3600) + '小时前' - } else if (diff < 3600 * 24 * 2) { - return '1天前' - } - if (option) { - return parseTime(time, option) - } else { - return ( - d.getMonth() + - 1 + - '月' + - d.getDate() + - '日' + - d.getHours() + - '时' + - d.getMinutes() + - '分' - ) - } + if (('' + time).length === 10) { + time = parseInt(time) * 1000 + } else { + time = +time + } + const d = new Date(time) + const now = Date.now() + + const diff = (now - d) / 1000 + + if (diff < 30) { + return '刚刚' + } else if (diff < 3600) { + // less 1 hour + return Math.ceil(diff / 60) + '分钟前' + } else if (diff < 3600 * 24) { + return Math.ceil(diff / 3600) + '小时前' + } else if (diff < 3600 * 24 * 2) { + return '1天前' + } + if (option) { + return parseTime(time, option) + } else { + return ( + d.getMonth() + + 1 + + '月' + + d.getDate() + + '日' + + d.getHours() + + '时' + + d.getMinutes() + + '分' + ) + } } /** @@ -63,18 +64,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 - search.replace(reg, (rs, $1, $2) => { - const name = decodeURIComponent($1) - let val = decodeURIComponent($2) - val = String(val) - obj[name] = val - return rs - }) - return obj + 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 } /** @@ -82,15 +83,15 @@ export function getQueryObject(url) { * @returns {number} output value */ export function byteLength(str) { - // returns the byte length of an utf8 string - 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-- - } - return s + // returns the byte length of an utf8 string + 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-- + } + return s } /** @@ -98,13 +99,13 @@ export function byteLength(str) { * @returns {Array} */ export function cleanArray(actual) { - const newArray = [] - for (let i = 0; i < actual.length; i++) { - if (actual[i]) { - newArray.push(actual[i]) - } - } - return newArray + const newArray = [] + for (let i = 0; i < actual.length; i++) { + if (actual[i]) { + newArray.push(actual[i]) + } + } + return newArray } /** @@ -112,13 +113,13 @@ export function cleanArray(actual) { * @returns {Array} */ export function param(json) { - if (!json) return '' - return cleanArray( - Object.keys(json).map(key => { - if (json[key] === undefined) return '' - return encodeURIComponent(key) + '=' + encodeURIComponent(json[key]) - }) - ).join('&') + if (!json) return '' + return cleanArray( + Object.keys(json).map(key => { + if (json[key] === undefined) return '' + return encodeURIComponent(key) + '=' + encodeURIComponent(json[key]) + }) + ).join('&') } /** @@ -126,21 +127,21 @@ export function param(json) { * @returns {Object} */ export function param2Obj(url) { - const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') - if (!search) { - return {} - } - 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 - } - }) - return obj + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') + if (!search) { + return {} + } + 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 + } + }) + return obj } /** @@ -148,9 +149,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 +161,21 @@ export function html2Text(val) { * @returns {Object} */ export function objectMerge(target, source) { - if (typeof target !== 'object') { - target = {} - } - if (Array.isArray(source)) { - return source.slice() - } - Object.keys(source).forEach(property => { - const sourceProperty = source[property] - if (typeof sourceProperty === 'object') { - target[property] = objectMerge(target[property], sourceProperty) - } else { - target[property] = sourceProperty - } - }) - return target + if (typeof target !== 'object') { + target = {} + } + if (Array.isArray(source)) { + return source.slice() + } + Object.keys(source).forEach(property => { + const sourceProperty = source[property] + if (typeof sourceProperty === 'object') { + target[property] = objectMerge(target[property], sourceProperty) + } else { + target[property] = sourceProperty + } + }) + return target } /** @@ -182,19 +183,19 @@ export function objectMerge(target, source) { * @param {string} className */ export function toggleClass(element, className) { - if (!element || !className) { - return - } - let classString = element.className - const nameIndex = classString.indexOf(className) - if (nameIndex === -1) { - classString += '' + className - } else { - classString = - classString.substr(0, nameIndex) + - classString.substr(nameIndex + className.length) - } - element.className = classString + if (!element || !className) { + return + } + let classString = element.className + const nameIndex = classString.indexOf(className) + if (nameIndex === -1) { + classString += '' + className + } else { + classString = + classString.substr(0, nameIndex) + + classString.substr(nameIndex + className.length) + } + element.className = classString } /** @@ -202,11 +203,11 @@ export function toggleClass(element, className) { * @returns {Date} */ export function getTime(type) { - if (type === 'start') { - return new Date().getTime() - 3600 * 1000 * 24 * 90 - } else { - return new Date(new Date().toDateString()) - } + if (type === 'start') { + return new Date().getTime() - 3600 * 1000 * 24 * 90 + } else { + return new Date(new Date().toDateString()) + } } /** @@ -216,38 +217,38 @@ export function getTime(type) { * @return {*} */ export function debounce(func, wait, immediate) { - let timeout, args, context, timestamp, result - - const later = function() { - // 据上一次触发时间间隔 - const last = +new Date() - timestamp - - // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait - if (last < wait && last > 0) { - timeout = setTimeout(later, wait - last) - } else { - timeout = null - // 如果设定为immediate===true,因为开始边界已经调用过了此处无需调用 - if (!immediate) { - result = func.apply(context, args) - if (!timeout) context = args = null - } - } - } - - return function(...args) { - context = this - timestamp = +new Date() - const callNow = immediate && !timeout - // 如果延时不存在,重新设定延时 - if (!timeout) timeout = setTimeout(later, wait) - if (callNow) { - result = func.apply(context, args) - context = args = null - } - - return result - } + let timeout, args, context, timestamp, result + + const later = function () { + // 据上一次触发时间间隔 + const last = +new Date() - timestamp + + // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait + if (last < wait && last > 0) { + timeout = setTimeout(later, wait - last) + } else { + timeout = null + // 如果设定为immediate===true,因为开始边界已经调用过了此处无需调用 + if (!immediate) { + result = func.apply(context, args) + if (!timeout) context = args = null + } + } + } + + return function (...args) { + context = this + timestamp = +new Date() + const callNow = immediate && !timeout + // 如果延时不存在,重新设定延时 + if (!timeout) timeout = setTimeout(later, wait) + if (callNow) { + result = func.apply(context, args) + context = args = null + } + + return result + } } /** @@ -258,18 +259,18 @@ export function debounce(func, wait, immediate) { * @returns {Object} */ export function deepClone(source) { - 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]) - } else { - targetObj[keys] = source[keys] - } - }) - return targetObj + 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]) + } else { + targetObj[keys] = source[keys] + } + }) + return targetObj } /** @@ -277,16 +278,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 +297,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 +306,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 } /** @@ -314,98 +315,106 @@ export function addClass(ele, cls) { * @param {string} cls */ export function removeClass(ele, cls) { - if (hasClass(ele, cls)) { - const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)') - ele.className = ele.className.replace(reg, ' ') - } + if (hasClass(ele, cls)) { + 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(',') - for (let i = 0; i < list.length; i++) { - map[list[i]] = true - } - return expectsLowerCase - ? val => map[val.toLowerCase()] - : val => map[val] + const map = Object.create(null) + const list = str.split(',') + for (let i = 0; i < list.length; i++) { + map[list[i]] = true + } + return expectsLowerCase + ? val => map[val.toLowerCase()] + : val => map[val] } export const exportDefault = 'export default ' export const beautifierConf = { - html: { - 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', - space_before_conditional: true, - unescape_strings: false, - jslint_happy: false, - end_with_newline: true, - wrap_line_length: '110', - indent_inner_html: true, - comma_first: false, - e4x: true, - indent_empty_lines: true - }, - js: { - 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', - space_before_conditional: true, - unescape_strings: false, - jslint_happy: true, - end_with_newline: true, - wrap_line_length: '110', - indent_inner_html: true, - comma_first: false, - e4x: true, - indent_empty_lines: true - } + html: { + 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', + space_before_conditional: true, + unescape_strings: false, + jslint_happy: false, + end_with_newline: true, + wrap_line_length: '110', + indent_inner_html: true, + comma_first: false, + e4x: true, + indent_empty_lines: true + }, + js: { + 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', + space_before_conditional: true, + unescape_strings: false, + jslint_happy: true, + end_with_newline: true, + wrap_line_length: '110', + indent_inner_html: true, + comma_first: false, + e4x: 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 caesarCipher(str) { - return btoa(encrypt(str)) + return btoa(encrypt(str)) } // 解码 export function caesarDecipher(str) { - return decrypt(atob(str)); + return decrypt(atob(str)); } //比较值是否相等,不需要比较类型 -export const isEqual = (oldValue, nowValue) =>{ - if (oldValue === null || nowValue === null) { - return oldValue === nowValue; - } - if (typeof oldValue === 'object' && typeof nowValue === 'object') { - return JSON.stringify(oldValue) === JSON.stringify(nowValue); - } - return oldValue == nowValue; +export const isEqual = (oldValue, nowValue) => { + if (oldValue === null || nowValue === null) { + return oldValue === nowValue; + } + if (typeof oldValue === 'object' && typeof nowValue === 'object') { + return JSON.stringify(oldValue) === JSON.stringify(nowValue); + } + return oldValue == nowValue; +} +//计算过期时间 +export const getExpireDate = (startDate, effectivePeriod, effectivePeriodUnit) => { + const start = moment(startDate) + const unit = effectivePeriodUnit === '天' ? 'days' : 'hours'; + const end = start + .add(Number(effectivePeriod), unit) + .format('YYYY-MM-DD HH:mm:ss'); + return end; } - diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue index 8258944..6633ee0 100644 --- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue @@ -16,7 +16,7 @@
-