java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 1 month ago
parent
de8ad526c6 013fa92c84
commit
e80c00e077
10 changed files with 227 additions and 243 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/api/financialsector/index.js
  2. 41
      src/option/Pricesystem/index.js
  3. 2
      src/option/distribution/VehicleArrivalManagement.js
  4. 21
      src/utils/exportData.js
  5. 28
      src/views/Pricesystem/ListOfPriceSystems.vue
  6. 124
      src/views/basic/forklift/basicForklift.vue
  7. 100
      src/views/basicdata/team/basicdataTeamGroup.vue
  8. 108
      src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
  9. 33
      src/views/distribution/artery/VehicleStowageDetails.vue
  10. 11
      src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

2
src/api/financialsector/index.js
Unescape View File

@ -74,7 +74,7 @@ export const $_tempDelpriceTemplate = params => {
export const $_getexport= params => {
return request({
url: '/api/logpm-basicdata/basicdataPrice/export',
url: '/api/logpm-basicdata/basicdataPrice//export/v2',
method: 'get',
params,
responseType: 'blob',

41
src/option/Pricesystem/index.js
Unescape View File

@ -91,17 +91,17 @@ export const columnList = [
sortable: true,
head: false,
},
{
prop: 'expiryTime',
label: '到期时间',
type: 4,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
// {
// prop: 'expiryTime',
// label: '到期时间',
// type: 4,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'templateName',
label: '模板名称',
@ -157,8 +157,8 @@ export const HistoricalList = [
head: false,
},
{
prop: 'effectiveStatus',
label: '状态',
prop: 'maintenanceStatus',
label: '维护状态',
type: 1,
values: '',
width: '80',
@ -179,8 +179,8 @@ export const HistoricalList = [
head: false,
},
{
prop: 'expiryTime',
label: '过期时间',
prop: 'effectiveStatus',
label: '生效状态',
type: 1,
values: '',
width: '90',
@ -189,6 +189,17 @@ export const HistoricalList = [
sortable: true,
head: false,
},
// {
// prop: 'expiryTime',
// label: '过期时间',
// type: 1,
// values: '',
// width: '90',
// checkarr: [],
// fixed: false,
// sortable: true,
// head: false,
// },
{
prop: 'createUserName',

2
src/option/distribution/VehicleArrivalManagement.js
Unescape View File

@ -360,7 +360,7 @@ export const columnList = [
label: '操作',
type: 6,
values: '',
width: '250',
width: '300',
checkarr: [],
fixed: 'right',
sortable: false,

21
src/utils/exportData.js
Unescape View File

@ -9,17 +9,25 @@ export function exportExcel(columnList = [], listData = [], name = 'excel') {
const blackArr = ['序号', '复选框', '操作', '全选'];
const _columnData = columnList.filter(item => !blackArr.includes(item.label));
const data = [];
const marginList = [];
for (let j = 0; j < listData.length; j++) {
const item = listData[j];
const arr = [];
for (let i = 0; i < columnList.length; i++) {
const val = columnList[i];
for (let i = 0; i < _columnData.length; i++) {
const val = _columnData[i];
if (blackArr.includes(val.label) || val.head) continue;
if (val.isColumnMerge && isNumber(item.mergeColumnIndex) && item.mergeColumnIndex > 1) {
marginList.push({ s: { r: j, c: i }, e: { r: j + item.mergeColumnIndex, c: i } });
}
if (j === 0) headers.push(val.label);
arr.push(item[val.prop] || item[val.prop] === 0 ? item[val.prop] : '');
}
@ -56,7 +64,7 @@ export function exportExcel(columnList = [], listData = [], name = 'excel') {
let valueWidth = 0;
if (value)
if (/.*[\u4e00-\u9fa5]+.*$/.test(value)) {
valueWidth = parseFloat(value.trim().toString().length * 2.1) + 4;
valueWidth = parseFloat(value.trim().toString().length * 1.5) + 4;
} else {
valueWidth = parseFloat(value.toString().length * 1.1) + 4;
}
@ -75,9 +83,9 @@ export function exportExcel(columnList = [], listData = [], name = 'excel') {
// 3.对比每列最大值
let aotuWidth = [];
rowsWidth.map((row, index) => {
rowsWidth.forEach((row, index) => {
let maxWidth = [];
row.map((value, i) => {
row.forEach((value, i) => {
if (index === 0) {
maxWidth.push({
wch: value,
@ -94,6 +102,7 @@ export function exportExcel(columnList = [], listData = [], name = 'excel') {
// 4.给excel设置自适应宽度
ws['!cols'] = aotuWidth;
ws['!merges'] = marginList;
const excludes = ['!cols', '!fullref', '!merges', '!ref', '!rows'];
console.log('ws :>> ', ws);
for (let key in ws) {
@ -102,7 +111,7 @@ export function exportExcel(columnList = [], listData = [], name = 'excel') {
ws[key].s = {
alignment: {
// horizontal: 'center', //水平居中对齐
// vertical: 'center', // 垂直居中
vertical: 'center', // 垂直居中
wrapText: true,
},
border: {

28
src/views/Pricesystem/ListOfPriceSystems.vue
Unescape View File

@ -21,6 +21,9 @@
<el-button type="primary" @click="ImportTemplate">
<el-icon><Upload /></el-icon>导入价格</el-button
>
<el-button type="primary" @click="updateImportTemplate">
<el-icon><Upload /></el-icon>更 新导入价格</el-button
>
<el-button type="primary" @click="addition">
<el-icon><Plus /></el-icon>新增</el-button
>
@ -116,16 +119,17 @@
prop="effectiveTime"
>
<!-- :disabled-date="time1" -->
<el-date-picker
v-model="details.form.effectiveTime"
type="date"
placeholder="请选择生效时间"
:disabled-date="time1"
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
/>
</el-form-item>
<el-form-item
<!-- <el-form-item
label="到期时间"
:rules="{ required: true, message: '请选择到期时间', trigger: ['change', 'blur'] }"
prop="expiryTime"
@ -138,7 +142,7 @@
:shortcuts="shortcuts"
value-format="YYYY-MM-DD"
/>
</el-form-item>
</el-form-item> -->
<el-form-item
label="价格体系模板"
:rules="{ required: true, message: '请选择体系模板', trigger: ['change', 'blur'] }"
@ -167,11 +171,11 @@
</template>
</el-dialog>
<!-- 导入模板 -->
<el-dialog v-model="dialogTemp" title="导入模板" width="500">
<el-dialog v-model="dialogTemp" :title="uptitle" width="500">
<el-upload
class="upload-demo"
drag
action="/api/logpm-basicdata/basicdataPrice/upload/v2"
:action="importaction"
:headers="headers"
:on-success="handleSuccess"
:before-upload="beforeAvatarUpload"
@ -190,6 +194,8 @@
</div>
</template>
</el-dialog>
<!-- 历史版本 -->
<el-dialog v-model="Historical.popUpShow" title="历史版本">
<tablecmt
@ -259,6 +265,8 @@ const $useStore = useStore(); //权限
const $route = useRoute(); //获取地址栏参数
const dialogTemp = ref(false);
const loadstate=ref(true);//tru新增
const importaction=ref('/api/logpm-basicdata/basicdataPrice/upload/v2')
const uptitle=ref('导入模板')
const Historical = reactive({
popUpShow: false, //历史版本弹窗
data: [], //历史版本数据
@ -385,8 +393,15 @@ const exporTemp = () => {
};
// 导入模板
const ImportTemplate = () => {
uptitle.value='导入模板'
importaction.value='/api/logpm-basicdata/basicdataPrice/upload/v2'
dialogTemp.value = true;
};
const updateImportTemplate=()=>{
uptitle.value='更新导入模板'
importaction.value='/api/logpm-basicdata/basicdataPrice/upload/upload/v3'
dialogTemp.value = true;
}
/** 生效时间 -- 生效时间不能大于到期时间 */
const time1 = time => {
if (!details.form.expiryTime) return false;
@ -505,7 +520,7 @@ const onLoad = async () => {
...details.page,
...details.query,
};
details.loadingObj.list=true;
const res = await getBasicdataPrice(submitData);
const { code, data } = res.data;
@ -751,6 +766,7 @@ const handleSubmitBasic = () => {
}
ElMessage.success(msg);
Historicalversion(HistoriBt.value)
onLoad();
} catch (error) {
console.log('error :>> ', error);

124
src/views/basic/forklift/basicForklift.vue
Unescape View File

@ -46,76 +46,64 @@
</el-form-item>
</el-form>
</div>
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
>删 除</el-button
>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="Download" @click="handleExportData" circle></el-button>
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
</el-row>
<el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<el-text
type="primary"
text
icon="el-icon-view"
@click="handleView(slotProps.scope.row)"
>查看</el-text
>
<el-text
type="primary"
text
icon="el-icon-edit"
@click="handleEdit(slotProps.scope.row)"
>编辑</el-text
>
<el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)"
>删除</el-text
>
</template>
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
>删 除</el-button
>
</el-pagination>
</div>
</el-row>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="Download" @click="handleExportData" circle></el-button>
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope.row)"
>查看</el-text
>
<el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope.row)"
>编辑</el-text
>
<el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)"
>删除</el-text
>
</template>
</tablecmt>
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
<!-- 分页模块 -->
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120, 5000]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
<!-- 表单模块 -->
<el-dialog
:title="title"

100
src/views/basicdata/team/basicdataTeamGroup.vue
Unescape View File

@ -14,64 +14,48 @@
</el-form-item>
</el-form>
</div>
<el-row>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
>删 除</el-button
>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="Download" @click="handleExportData" circle></el-button>
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
>删 除</el-button
>
</div>
</el-row>
<el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<el-text
type="primary"
text
icon="el-icon-view"
@click="handleView(slotProps.scope.row)"
>查看</el-text
>
<el-text
type="primary"
text
icon="el-icon-view"
@click="handleList(slotProps.scope.row)"
>人员列表</el-text
>
<el-text
type="primary"
text
icon="el-icon-edit"
@click="handleEdit(slotProps.scope.row)"
>编辑</el-text
>
<el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)"
>删除</el-text
>
</template>
</tablecmt>
</el-row>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
<el-button icon="Download" @click="handleExportData" circle></el-button>
<el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
<el-button icon="el-icon-search" @click="searchHide" circle></el-button>
</div>
</div>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope.row)"
>查看</el-text
>
<el-text type="primary" text icon="el-icon-view" @click="handleList(slotProps.scope.row)"
>人员列表</el-text
>
<el-text type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope.row)"
>编辑</el-text
>
<el-text type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope.row)"
>删除</el-text
>
</template>
</tablecmt>
<el-row>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
@ -81,7 +65,7 @@
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-sizes="[30, 50, 80, 120, 5000]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"

108
src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
Unescape View File

@ -37,7 +37,7 @@
<el-tab-pane label="到期" :name="3">到期</el-tab-pane>
</el-tabs>
<div>
<div class="el_top_btn">
<div class="el_top_btn mt10">
<div>
<el-button
type="primary"
@ -62,66 +62,58 @@
</div>
</div>
<el-row>
<!-- 列表模块 -->
<tablecmt
class="tableNode"
:columnList="details.columnList"
:tableData="data"
:checkselect="selectList"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<div class="ElBtnClass">
<el-text
v-if="accessControl.Expand_configuration"
@click="Expandconfiguration(slotProps.scope.row)"
>扩展配置</el-text
>
<el-text
v-if="accessControl.warehouseWarehouse_view"
@click="view(slotProps.scope)"
>查看</el-text
>
<el-text
v-if="accessControl.warehouseWarehouse_edit"
@click="edit(slotProps.scope)"
>编辑</el-text
>
<el-text
v-if="accessControl.warehouseWarehouse_delete"
@click="DeleteInformation(slotProps.scope)"
>删除</el-text
>
</div>
</template>
<!-- 列表模块 -->
<tablecmt
class="tableNode mt10"
:columnList="details.columnList"
:tableData="data"
:checkselect="selectList"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '操作'">
<div class="ElBtnClass">
<el-text
v-if="accessControl.Expand_configuration"
@click="Expandconfiguration(slotProps.scope.row)"
>扩展配置</el-text
>
<el-text v-if="accessControl.warehouseWarehouse_view" @click="view(slotProps.scope)"
>查看</el-text
>
<el-text v-if="accessControl.warehouseWarehouse_edit" @click="edit(slotProps.scope)"
>编辑</el-text
>
<el-text
v-if="accessControl.warehouseWarehouse_delete"
@click="DeleteInformation(slotProps.scope)"
>删除</el-text
>
</div>
</template>
</tablecmt>
</el-row>
</template>
</tablecmt>
<!-- 分页模块 -->
<el-row class="el-fy">
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div></div>
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</el-row>
<div class="avue-crud__pagination flex-c-sb" style="width: 100%">
<div></div>
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120, 500]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"
>
</el-pagination>
</div>
</div>
</div>

33
src/views/distribution/artery/VehicleStowageDetails.vue
Unescape View File

@ -212,21 +212,6 @@
</template>
</template>
</tablecmt>
<div style="overflow: hidden; width: 0; height: 0">
<tablecmt
ref="exportColumnListNode"
:columnList="tableColumnList"
:tableData="detailsRenderData"
:arraySpanMethod="row => arraySpanMethod(row)"
>
<template #default="slotProps">
<template v-if="slotProps.scope.column.label === '运单号'">
{{ slotProps.scope.row.waybillNo }}
</template>
</template>
</tablecmt>
</div>
</el-tab-pane>
<el-tab-pane label="日 志 跟 踪" name="tab2">
@ -487,6 +472,7 @@ import { useStore } from 'vuex';
import { ElMessage, ElMessageBox } from 'element-plus';
import { exportExcelByDom } from '@/utils/export';
import { dateNow } from '@/utils/date';
import { exportExcel } from '@/utils/exportData';
/** 被合并的列 */
const mergeColumn = [];
@ -1158,20 +1144,13 @@ const handleBatchDelete = () => {
const handleExport = () => {
console.log('exportColumnListNode.value.$el :>> ', exportColumnListNode.value.$el);
console.log('detailsRenderData.value :>> ', detailsRenderData.value);
exportExcelByDom(exportColumnListNode.value.$el, `${details.form.carsNo} - ${dateNow()}.xlsx`);
exportExcel(
details.detailsColumnList,
detailsRenderData.value,
`${details.form.carsNo} - ${dateNow()}.xlsx`
);
};
// watch(
// () => $route.query,
// () => {
// console.log('1231 :>> ', 1231);
// if ($route.path !== '/distribution/artery/VehicleStowageDetails') return;
// onLoad();
// },
// {
// immediate: true,
// }
// );
onLoad();
</script>

11
src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
Unescape View File

@ -55,8 +55,13 @@
</el-button>
<!-- 修改运单收货人 -->
<el-button type="danger" icon="Edit" @click="Modifywaybillrecipient"
>修改运单收货人
<el-button
type="danger"
icon="Edit"
@click="Modifywaybillrecipient"
v-if="$store.getters.permission.distributionStockArticleSelf_changeWaybill"
>
修改运单收货人
</el-button>
<!-- 修改收货单位 -->
@ -186,7 +191,7 @@
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[30, 50, 80, 120,200]"
:page-sizes="[30, 50, 80, 120, 200]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total"

Write Preview
Loading…
Cancel
Save