diff --git a/src/api/financialsector/index.js b/src/api/financialsector/index.js index 604d8692..0c37a108 100644 --- a/src/api/financialsector/index.js +++ b/src/api/financialsector/index.js @@ -60,3 +60,15 @@ export const $_tempDelpriceTemplate = params => { params, }); }; + +// 导出模板 + + +export const $_getexport= params => { + return request({ + url: '/api/logpm-basicdata/basicdataPrice/export', + method: 'get', + params, + responseType: 'blob', + }); +}; \ No newline at end of file diff --git a/src/option/Pricesystem/index.js b/src/option/Pricesystem/index.js index 6f0078a3..19707098 100644 --- a/src/option/Pricesystem/index.js +++ b/src/option/Pricesystem/index.js @@ -41,7 +41,7 @@ export const columnList = [ { prop: 'serviceType', label: '服务类型', - type: 2, + type: 1, values: '', width: '150', checkarr: [], @@ -55,7 +55,16 @@ export const columnList = [ type: 3, values: '', width: '150', - checkarr: [], + checkarr: [ + { + label: '未维护', + value: '未维护', + }, + { + label: '已维护', + value: '已维护', + } + ], fixed: false, sortable: true, head: false, diff --git a/src/option/financialsector/index.js b/src/option/financialsector/index.js index 8568550f..8a03736c 100644 --- a/src/option/financialsector/index.js +++ b/src/option/financialsector/index.js @@ -39,7 +39,7 @@ export const columnList = [ { prop: 'serviceType', label: '服务类型', - type: 2, + type: 1, values: '', width: '150', checkarr: [], @@ -50,7 +50,7 @@ export const columnList = [ { prop: 'createTime', label: '创建时间', - type: 4, + type: 1, values: '', width: '150', checkarr: [], @@ -61,7 +61,7 @@ export const columnList = [ { prop: 'userName', label: '创建人', - type: 4, + type: 1, values: '', width: '150', checkarr: [], @@ -72,7 +72,7 @@ export const columnList = [ { prop: 'templateType', label: '模板类型', - type: 4, + type: 1, values: '', width: '150', checkarr: [], diff --git a/src/views/Pricesystem/ListOfPriceSystems.vue b/src/views/Pricesystem/ListOfPriceSystems.vue index 4adfdcd2..2bf91694 100644 --- a/src/views/Pricesystem/ListOfPriceSystems.vue +++ b/src/views/Pricesystem/ListOfPriceSystems.vue @@ -20,7 +20,7 @@
搜 索 - 清 空 + 清 空 @@ -30,7 +30,7 @@ @@ -224,8 +224,8 @@ const details = reactive({ drawerShow: false, /** 分页参数 */ page: { - currentPage: 1, - pageSize: 50, + current: 1, + size: 50, total: 0, }, /** 弹出层显示 */ @@ -283,7 +283,8 @@ const inputsc = (index, row) => { if (!index) delete details.query[row.prop]; - processRowProperty(index, row, details); + processRowProperty(index, row, details);; + onLoad() }; /** 表格表头时间选择 */ @@ -296,6 +297,7 @@ const timesc = (index, row) => { if (!index) { delete details.query[row.prop]; } + onLoad() }; /** 表格表头输入框搜索 */ @@ -305,23 +307,35 @@ const btnsc = val => { /** 表格表头下拉框选择 */ const selectsc = (index, row) => { processRowProperty(index, row, details); + onLoad() }; /** 表格表头复选框选择 */ const selectionChange = list => { console.log(list); details.selectionList = list; + }; // 网页顶部搜索按钮 const searchChange = () => { - details.search = false; //关闭搜索 + onLoad() }; +// 清空按钮 +const searchReset=()=>{ + details.columnList.forEach(item=>{ + item.values='' + }) + details.query={} + onLoad() +} // 每页多少条 const sizeChange = val => { - page.value.pageSize = val; + details.page.size = val; + onLoad() }; /** 页码改变执行的回调 */ const currentChange = val => { - page.value.currentPage = val; + details.page.current = val; + onLoad(); }; // 刷新按钮 const searchChangeS = () => { diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index f29f9e27..69c60718 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -1748,7 +1748,16 @@ export default { sortable: true, head: false, }, - + { + label: '物料名称', + prop: 'materialName', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'trainNumber', label: '入库车次', @@ -2650,6 +2659,16 @@ export default { fixed: false, sortable: true, }, + { + label: '物料名称', + prop: 'materialName', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, { label: '仓库', prop: 'warehouse', diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index 0ed6459b..b2804e08 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -977,8 +977,11 @@ async function Info() { let data = []; //备货人员信息临时保存 console.log(res, '备货人员'); console.log(res.data.data); - console.log(res.data.data[0].deptId, '关键参数'); - deptId.value = res.data.data[0].deptId; //目前取第一个，TGG说参数都是一样 + if(res.data.data.length){ + if(res.data.data && res.data.data.length){ + console.log(res.data.data[0].deptId, '关键参数'); + deptId.value = res.data.data[0].deptId; //目前取第一个，TGG说参数都是一样 + } // 确保请求到的内容有数据,防止报错 if (res.data.data.length > 0) { res.data.data.forEach(item => { @@ -986,23 +989,28 @@ async function Info() { data.push({ realName: item.realName, id: item.id }); }); } + console.log(data, '备货人员'); StockInfo.value.StockPersonnel = data; - }); - // 备货区域 - await $_stockUpInfo({ + // 备货区域 + $_stockUpInfo({ params: deptId.value, }).then(res => { console.log(res, '备货区域'); StockInfo.value.StockUpArea = res.data.data; console.log(StockInfo.value.StockUpArea, ' StockInfo.value.StockUpArea'); }); - // 装卸班组 - await getListTeamInfo(deptId.value).then(res => { + // 装卸班组 + getListTeamInfo(deptId.value).then(res => { console.log(res.data.data, '装卸班组'); StockInfo.value.UnloadingTeam = res.data.data; //卸车 StockInfo.value.LoadingTeam = res.data.data; //装车 }); + } + + }); + + // 外协来源-数据字典数据获取 await getDictionaryBiz('tripartite_source').then(res => { StockInfo.value.OutsourcingSources = res.data.data; @@ -1731,6 +1739,8 @@ onMounted(() => { // wrapLoading.value = true; //表示这是编辑状态 editLoading.value = true; //开启加载 getDeliveryList(route.query.id).then(res => { + console.log(res,'页面信息'); + //司机配置 if (res.data.data.kind == 2) { if(!res.data.data.deliveryTripartiteVO){ @@ -1739,7 +1749,7 @@ onMounted(() => { DataSubmit.value.tripartite.distributionCompany = res.data.data.distributionCompany; //外协来源 DataSubmit.value.tripartite.driverName = res.data.data.deliveryTripartiteVO.driverName; //司机名称 DataSubmit.value.tripartite.vehicleNum = res.data.data.deliveryTripartiteVO.vehicleNum; //司机车牌 - DataSubmit.value.tripartite.deliveryFee = res.data.data.deliveryTripartiteVO.deliveryFee; //配送费用 + DataSubmit.value.tripartite.deliveryFee = res.data.data.deliveryTripartiteVO.deliveryFee || 0; //配送费用 DataSubmit.value.tripartite.driverPhone = res.data.data.deliveryTripartiteVO.driverPhone; //司机电话 numTab.value[0].name = '1'; //切换外协选项卡 numTab.value[1].name = '0'; diff --git a/src/views/financialsector/CustomerBaseprice.vue b/src/views/financialsector/CustomerBaseprice.vue index ec1c3319..7baa4bdc 100644 --- a/src/views/financialsector/CustomerBaseprice.vue +++ b/src/views/financialsector/CustomerBaseprice.vue @@ -7,9 +7,7 @@ - - - + @@ -25,11 +23,17 @@ 删 除 + + 导出模板 + + 导入模板
搜 索 - 清 空 + 清 空 @@ -42,7 +46,7 @@ import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue'; import { columnList } from '@/option/financialsector/index.js'; -import { $_getpriceTemplate, $_deletelpriceTemplate } from '@/api/financialsector/index'; //价格模板 +import { + $_getpriceTemplate, + $_deletelpriceTemplate, + $_getexport, +} from '@/api/financialsector/index'; //价格模板 import { getDictionaryBiz } from '@/api/system/dict'; //字典 -import { processRowProperty, setNodeHeight, deepClone } from '@/utils/util'; +import { processRowProperty, setNodeHeight, deepClone, downloadXls } from '@/utils/util'; import functions from '@/utils/functions.js'; import { ElMessageBox, ElMessage } from 'element-plus'; -import { downloadXls } from '@/utils/util'; import { useStore } from 'vuex'; import dayjs from 'dayjs'; const $router = useRouter(); //跳转 @@ -251,15 +258,17 @@ const selectionChange = list => { }; // 网页顶部搜索按钮 const searchChange = () => { - details.search = false; //关闭搜索 + priceTemplate(); }; // 每页多少条 const sizeChange = val => { - page.value.pageSize = val; + details.page.pageSize = val; + priceTemplate(); }; /** 页码改变执行的回调 */ const currentChange = val => { - page.value.currentPage = val; + details.page.currentPage = val; + priceTemplate(); }; // 刷新按钮 const searchChangeS = () => { @@ -290,6 +299,7 @@ const priceTemplate = () => { let data = { current: details.page.currentPage, size: details.page.pageSize, + ...details.query, }; details.loadingObj.list = true; $_getpriceTemplate(data) @@ -303,6 +313,14 @@ const priceTemplate = () => { details.loadingObj.list = false; }); }; +// 清空 +const searchReset = () => { + details.columnList.forEach(item => { + item.values = ''; + }); + details.query = {}; + priceTemplate(); +}; priceTemplate(); // 新增模板 const Addtemplate = () => { @@ -359,6 +377,22 @@ const Modifytemplate = row => { path: '/financialsector/FinanceHome', }); }; +// 导出模板 +const exporTemp = () => { + ElMessageBox.confirm('是否导出价格模板', 'Warning', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }).then(() => { + $_getexport().then(res => { + downloadXls(res.data, `价格模板.xlsx`); + }); + }); +}; +// 导入模板 +const ImportTemplate=()=>{ + +}