diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js index 571859ad..5eb05bfd 100644 --- a/src/api/aftersales/aftersalesWorkOrder.js +++ b/src/api/aftersales/aftersalesWorkOrder.js @@ -217,7 +217,7 @@ export const $_getBusinessDepartmentUser = (params) => { // 回复调查接口 export const $_savaSurveyRecord = (data) => { return request({ - url: '/api/logpm-aftersales/aftersalesWorkOrder/savaSurveyRecord ', + url: '/api/logpm-aftersales/aftersalesWorkOrder/savaSurveyRecord', method: 'post', data }) diff --git a/src/api/financialsector/index.js b/src/api/financialsector/index.js index 0c37a108..aa7e485c 100644 --- a/src/api/financialsector/index.js +++ b/src/api/financialsector/index.js @@ -51,6 +51,14 @@ export const $_InfopriceTemplate = params => { method: 'get', }); }; +// 删除带生效 +export const $_DELETEID = params => { + return request({ + url: '/api/logpm-basicdata/basicdataPrice/' + params.id, + method: 'DELETE', + }); +}; + // 菜单临时删除模 export const $_tempDelpriceTemplate = params => { @@ -71,4 +79,13 @@ export const $_getexport= params => { params, responseType: 'blob', }); -}; \ No newline at end of file +}; + +// 历史版本查询 +export const $_gethisPage = params => { + return request({ + url: '/api/logpm-basicdata/basicdataPrice/hisPage', + method: 'get', + params, + }); +}; diff --git a/src/option/Pricesystem/index.js b/src/option/Pricesystem/index.js index de471727..f58f1182 100644 --- a/src/option/Pricesystem/index.js +++ b/src/option/Pricesystem/index.js @@ -102,6 +102,85 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '300', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; + + + +export const HistoricalList = [ + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'clientName', + label: '客户名称', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'brandName', + label: '品牌', + type: 1, + values: '', + width: '80', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'effectiveStatus', + label: '状态', + type: 1, + values: '', + width: '80', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'effectiveTime', + label: '生效时间', + type: 1, + values: '', + width: '90', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'expiryTime', + label: '过期时间', + type: 1, + values: '', + width: '90', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { prop: 'createUserName', label: '操作', diff --git a/src/router/views/index.js b/src/router/views/index.js index a9005dec..0b44cea3 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1379,7 +1379,7 @@ export default [ { meta: { i18n: 'dict', - keepAlive: false, + keepAlive: true, }, path: '/aftersales/aftersalesWorkOrderAdd', name: '工单新增', diff --git a/src/views/Pricesystem/ListOfPriceSystems.vue b/src/views/Pricesystem/ListOfPriceSystems.vue index 253b17f6..67fdfd71 100644 --- a/src/views/Pricesystem/ListOfPriceSystems.vue +++ b/src/views/Pricesystem/ListOfPriceSystems.vue @@ -19,7 +19,10 @@ 导出价格 - 导入价格导入价格 + + 新增 @@ -47,12 +50,15 @@ @@ -89,10 +95,10 @@ > - + - + + + + + + +
import { ref, reactive, toRefs, computed, onMounted, nextTick, watch, onActivated } from 'vue'; -import { columnList } from '@/option/Pricesystem/index.js'; +import { columnList,HistoricalList} from '@/option/Pricesystem/index.js'; import { $_getpriceTemplate, $_deletelpriceTemplate, $_getexport, + $_gethisPage, + $_DELETEID, } from '@/api/financialsector/index'; //价格模板 import { getBasicdataPrice, postBasicdataPrice } from '@/api/Pricesystem/index'; //价格模板 import { getDictionaryBiz } from '@/api/system/dict'; //字典 @@ -202,10 +234,17 @@ import { popmsg } from '@/utils/poptxt'; import { downloadXls, deepClone } from '@/utils/util'; import { useStore } from 'vuex'; import dayjs from 'dayjs'; +import error from '@/error'; const $router = useRouter(); //跳转 const $useStore = useStore(); //权限 const $route = useRoute(); //获取地址栏参数 const dialogTemp = ref(false); +const Historical=reactive({ + popUpShow:false,//历史版本弹窗 + data:[],//历史版本数据 + loading:false,//历史版本弹窗 + columnList:deepClone(HistoricalList), +}) const details = reactive({ /** 是否开启搜索 */ search: false, @@ -524,7 +563,6 @@ const Deletetemplate = () => { const Modifytemplate = row => { console.log(row); $useStore.commit('DEL_ONCE_TAG', '/Pricesystem/PricesyHome'); - $router.push({ query: { id: row.id, @@ -533,7 +571,79 @@ const Modifytemplate = row => { path: '/Pricesystem/PricesyHome', }); }; - +// 查看详情 +const Viewdetails=(row)=>{ + $useStore.commit('DEL_ONCE_TAG', '/Pricesystem/PricesyHome'); + $router.push({ + query: { + id: row.id, + templateId: row.templateId, + Viewdetails:false, + }, + path: '/Pricesystem/PricesyHome', + }); +} +const HistoriBt=ref({});//历史版本 +// 查看历史版本 +const Historicalversion=(row)=>{ +HistoriBt.value=row +Historical.popUpShow=true +Historical.loading=true +let _data={ + id:row.id, + brandId:row.brandId, + clientId:row.clientId, +} +$_gethisPage(_data).then(res=>{ +console.log(res); + if(res.data.code == 200){ + Historical.data = res.data.data.records||[] + const _node = document.querySelector('.Historical'); + setNodeHeight(_node, '', true); + } +}).catch(error=>{ +console.log(error,'error'); +}).finally(()=>{ + Historical.loading=false +}) +} +// 删除待生效 +const deletetails=(row)=>{ + let data={ + id:row.id + } + const message = `是否删除该数据,删除后不可恢复是否确认?`; + ElMessageBox.confirm( + message, + '提示', + { + dangerouslyUseHTMLString: true, // 如果组件支持，启用此选项以解析 HTML + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + } + ) + .then(() => { + Historical.loading=true + $_DELETEID(data).then(res=>{ + console.log(res); + if(res.data.code ==200){ + ElMessage({ + message:res.data.msg, + type:'success' + }) + Historicalversion(row) + } + }).catch(error=>{ + console.log(error,'error'); + }).finally(()=>{ + Historical.loading=false + }) + }) + .catch(() => { + + }) +} /** 设置客户 */ const handleClient = async row => { try { @@ -550,7 +660,7 @@ const handleClient = async row => { await nextTick(); // 重置表单状态 basicForm.value.resetFields(); - + add.value=true details.form = { ...row }; } catch (error) { console.log('error :>> ', error); @@ -559,23 +669,61 @@ const handleClient = async row => { } console.log('row :>> ', row); }; - +const add=ref(true) +// 新增 +const addition=async()=>{ + if(!details.selectionList.length){ + ElMessage({ + message: '请勾选一条数据', + type: 'warning', + }) + return + } + if(details.selectionList.length>1){ + ElMessage({ + message: '只能勾选单条数据操作', + type: 'warning', + }) + return + } + console.log(details.selectionList,'details.selectionList'); + let _row=details.selectionList[0] + console.log(_row,'_row'); + details.loadingObj.pageLoading = true; + const res = await $_getpriceTemplate({ brandId: _row.brandId }); + details.loadingObj.pageLoading = false; + const { code, data } = res.data; + if (code == 200) { + details.templateArr = data.records || []; + details.popUpShow.basicVisted = true; + await nextTick(); + // 重置表单状态 + basicForm.value.resetFields(); + details.form = { ..._row }; + details.form.templateId=null + details.form.expiryTime=null + details.form.effectiveTime=null + }; + add.value=false +} /** 提交设置基础配置 */ const handleSubmitBasic = () => { basicForm.value.validate(async (valid, fields) => { if (!valid) return; - try { details.loadingObj.pageLoading = true; details.popUpShow.basicVisted = false; - const submitData = { effectiveTime: details.form.effectiveTime + ' 00:00:00', - id: details.form.id, + + brandId:details.form.brandId, + clientId:details.form.clientId, expiryTime: details.form.expiryTime + ' 00:00:00', templateId: details.form.templateId, }; - + if(add.value){ + submitData.id=details.form.id; + } const res = await postBasicdataPrice(submitData); const { code, msg } = res.data; @@ -583,6 +731,7 @@ const handleSubmitBasic = () => { ElMessage.success(msg); onLoad(); + Historicalversion(HistoriBt.value) } catch (error) { console.log('error :>> ', error); } finally { diff --git a/src/views/Pricesystem/Price/PriceBill.vue b/src/views/Pricesystem/Price/PriceBill.vue index 108311bc..9b54dd62 100644 --- a/src/views/Pricesystem/Price/PriceBill.vue +++ b/src/views/Pricesystem/Price/PriceBill.vue @@ -73,7 +73,7 @@ /> - + -
+
重置 保存
@@ -215,7 +215,7 @@
提货路径 - + 新 增
@@ -228,7 +228,7 @@ :loading="details.loadingObj.list" >