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

暂存更改

fix_bug_pro20231227
zhangsiyu 2 years ago
parent
ea10e1ce97
commit
53bb13343d
8 changed files with 1475 additions and 313 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. 1
      src/App.vue
  2. 115
      src/components/tablecmt/tablecmt.vue
  3. 10
      src/utils/watermark.js
  4. 95
      src/views/basic/coderule/basicTenantCode.vue
  5. 1297
      src/views/basic/forklift/basicForklift.vue
  6. 213
      src/views/basicdata/team/basicdataTeamStaff.vue
  7. 52
      src/views/distribution/deliverylist/distributionDeliveryList.vue
  8. 5
      src/views/distribution/signfor/distributionSignfor.vue

1
src/App.vue
Unescape View File

@ -14,6 +14,7 @@ body,
width: 100%;
height: 100%;
}
.BMap_cpyCtrl,
.anchorBL {
display: none !important;

115
src/components/tablecmt/tablecmt.vue
Unescape View File

@ -7,7 +7,8 @@
v-loading="loading"
@selection-change="handleSelectionChange"
border
height="600"
height="700"
:row-class-name="tableRowClassName"
>
<el-table-column
:type="column.type == 0 ? 'selection' : ''"
@ -20,11 +21,15 @@
:sortable="column.sortable"
v-show="column.head"
>
<!-- <template #header>
<el-text class="mx-1">{{ column.label }}</el-text>
</template> -->
<el-table-column
:width="column.width"
:prop="column.prop"
:label="column.label"
v-if="column.type != 0"
flexible
>
<template #header>
<!-- <el-text class="mx-1">{{ column.label }}</el-text> -->
@ -40,7 +45,7 @@
<el-select
v-if="column.type == 3"
v-model="column.values"
class="m-2"
class="m-2 selectbr"
clearable
:placeholder="`请选择${column.label}`"
@change="selectchange($event,column)"
@ -77,15 +82,18 @@
</template>
<template #default="scope">
<el-text class="mx-2" v-if="(Number(column.type)<6&&Number(column.type)>0)&&column.isextrahide">{{ scope.row[column.prop] }}</el-text>
<el-text class="mx-2 tabculconte" v-if="(Number(column.type)<6&&Number(column.type)>0)&&column.isextrahide">{{ scope.row[column.prop] }}</el-text>
<!-- <div v-if="Number(column.type)==8">
<div></div>
</div> -->
<slot v-if="column.type == 6" :scope="scope"></slot>
<div class="slotbuts" v-if="column.type == 6">
<slot v-if="column.type == 6" :scope="scope">
</slot>
</div>
<el-image preview-teleported v-if="column.type==7" style="width: 60px; height: 60px;margin-left: 10px;" :initial-index="index" :z-index="100" v-for="(item,index) in scope.row[column.prop].split(',')" :src="item" :preview-src-list="scope.row[column.prop].split(',')"/>
<el-tooltip placement="top" v-if="(Number(column.type)<6&&Number(column.type)>0)&&!column.isextrahide">
<template #content>{{ scope.row[column.prop] }}</template>
<div class="on">{{ scope.row[column.prop] }}</div>
<div class="on tabculconte">{{ scope.row[column.prop] }}</div>
</el-tooltip>
<!-- <slot v-if="column.type == 7" name="test" :testdata="scope"></slot> -->
<!-- <el-button
@ -105,7 +113,7 @@
</el-table-column>
<template #header>
<el-text class="mx-1">{{ column.label }}</el-text>
<el-text class="mx-1 tabtitles">{{ column.label }}</el-text>
<!-- <el-input
v-if="column.type == 2"
v-model="column.values"
@ -198,6 +206,21 @@ let props = defineProps({
required: true,
}
});
let selectarr=ref([])
const tableRowClassName = ({
row,
rowIndex,
}: {
row: TableDataType
rowIndex: number
}) => {
if (rowIndex === 1) {
return 'warning-row'
} else if (rowIndex === 3) {
return 'success-row'
}
return ''
}
let emit =defineEmits(['inputTxt','timeCheck','selectCheck','selection'])
let newcolumnList=ref<TableColumnType[]>([])
watchEffect(()=>{
@ -374,7 +397,8 @@ function timechange(value,column:TableColumnType){
emit('timeCheck',value,column)
}
const handleSelectionChange=(param:TableDataType[])=>{
console.log(param)
// console.log(param)
selectarr.value=param
emit('selection',param)
}
function inputclear(value,column:TableColumnType){
@ -427,15 +451,82 @@ watchEffect(()=>{
</script>
<style lang="scss">
.el-table .warning-row {
--el-table-tr-bg-color: var(--el-color-warning-light-9);
}
.el-table .success-row {
--el-table-tr-bg-color: var(--el-color-success-light-9);
// :root{
// --el-checkbox-checked-bg-color:'#D3832A';
// --el-checkbox-checked-input-border-color:'#D3832A';
// }
.el-table {
//悬停
--el-table-row-hover-background-color: #f0f9eb !important;
//选中
--el-table-current-row-background-color: #f0f9eb !important;
}
.on{
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.selectbr{
border: none !important;
}
.tabtitles{
color: #092C4D !important;
}
.el-table .ascending .sort-caret.ascending{
border-bottom-color: #D3832A !important;
}
.el-table .descending .sort-caret.descending{
border-top-color: #D3832A !important;
}
.tabculconte{
color: #333333 !important;
font-size: 13px;
}
.slotbuts{
height: 25px;
display: flex;
align-items: center;
justify-content: center;
}
.slotbuts .el-text{
color: #D3832A !important;
margin-right: 10px !important;
cursor: pointer;
&:nth-last-child(1){
margin-right: 0px !important;
}
}
// .el-checkbox__input.is-checked .el-checkbox__inner{
// background-color: #D3832A !important;
// border-color: #D3832A !important;
// }
// .is .el-checkbox__input.is-checked .el-checkbox__inner{
// background-color: #D3832A !important;
// border-color: #D3832A !important;
// }
// .is-checked .el-checkbox__inner:hover{
// border-color: #D3832A !important;
// }
// .el-checkbox__input.is-indeterminate .el-checkbox__inner{
// background-color: #D3832A !important;
// border-color: #D3832A !important;
// }
.el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
border-color: #D3832A!important;
background-color: #D3832A!important;
}
.el-checkbox__input.is-focus .el-checkbox__inner{
border-color: #D3832A!important;
}
//修改选中后文本的颜色
.el-checkbox__input.is-checked+.el-checkbox__label{
color:#D3832A!important;
}
.el-checkbox__inner:hover{
border-color: #D3832A!important;
}
</style>

10
src/utils/watermark.js
Unescape View File

@ -11,12 +11,12 @@ let setWatermark = (str) => {
}
let can = document.createElement('canvas')
can.width = 700
can.height = 650
can.width = 800
can.height = 800
let cans = can.getContext('2d')
cans.rotate(-15 * Math.PI / 150)
cans.font = '40px Vedana'
cans.font = '70px Vedana'
cans.fillStyle = 'rgba(17, 17, 17, 0.10)'
cans.textAlign = 'left'
cans.textBaseline = 'Middle'
@ -26,12 +26,12 @@ let setWatermark = (str) => {
div.id = id
div.style.pointerEvents = 'none'
div.style.top = '50px'
div.style.left = '60px'
div.style.left = '100px'
div.style.position = 'fixed'
div.style.zIndex = '1000000'
div.style.width = document.documentElement.clientWidth + 'px'
div.style.height = document.documentElement.clientHeight + 'px'
div.style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat'
div.style.background = 'url(' + can.toDataURL('image/png') + ') left top no-repeat'
document.body.appendChild(div)
return id
}

95
src/views/basic/coderule/basicTenantCode.vue
Unescape View File

@ -47,7 +47,23 @@
</el-row>
<el-row>
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
<tablecmt
: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-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
@ -58,7 +74,6 @@
<el-table-column v-if="option.index" label="序号" type="index" width="80" align="center">
</el-table-column>
<template v-for="(item,index) in option.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
@ -66,7 +81,6 @@
:key="index">
</el-table-column>
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
@ -74,7 +88,7 @@
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-table> -->
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width:100%">
@ -163,6 +177,59 @@ import {getDictionaryBiz} from '@/api/system/dict';
export default {
data () {
return {
columnList:[
{
prop: '',
label: '序号',
type: 0,
values: '',
width: 60,
checkarr: [],
fixed: true,
},
{
prop: 'codeType',
label: '编码类型',
type: 2,
values: '',
width: '300',
checkarr: [],
fixed: false,
sortable: true
// head: true,
},
{
prop: 'showType',
label: '展示类型',
type: 2,
values: '',
width: '',
checkarr: [],
fixed: false,
sortable: true
// head: true,
},
{
prop: 'code',
label: '编码',
type: 2,
values: '',
width: '300',
checkarr: [],
fixed: false,
sortable: true
},
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '300',
checkarr: [],
fixed: 'right',
sortable: false
}
],
height: 0,
// 弹框标题
title: '',
@ -232,6 +299,24 @@ export default {
}
},
methods: {
/**
* 弹窗的勾选回调，用于更改头部数组
* 固定搭配，只需要更换 columnList
*/
setnewcolum(newarr, headarr,type) {
// console.log(newarr,'+++++++++++')
if(type==1){
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'checkList', headarr);
}else if(type==2){
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'flexList', headarr);
}else if(type==3){
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
}
},
//获取字典数据
getDictionaryBizInfo(){
getDictionaryBiz("basic_tenant_code").then(res=>{
@ -360,7 +445,7 @@ export default {
},
selectionClear () {
this.selectionList = [];
this.$refs.table.clearSelection();
// this.$refs.table.clearSelection();
},
currentChange (currentPage) {
this.page.currentPage = currentPage;

1297
src/views/basic/forklift/basicForklift.vue
View File

File diff suppressed because it is too large Load Diff

213
src/views/basicdata/team/basicdataTeamStaff.vue
Unescape View File

@ -34,34 +34,22 @@
</el-row>
<el-row>
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
:height="height"
style="width: 100%"
:border="option.border">
<el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
<el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
<el-table-column v-if="option.index" label="序号" type="index" width="70" align="center">
</el-table-column>
<template v-for="(item,index) in option.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:width="item.width"
:key="index">
</el-table-column>
</template>
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<template #="{row}">
<el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
<el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
<el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-text @click="handleView(slotProps.scope.row)">查 看</el-text>
<el-text @click="handleEdit(slotProps.scope.row)">编 辑</el-text>
<el-text @click="rowDel(slotProps.scope.row)">删 除</el-text>
</template>
</tablecmt>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width:100%">
@ -132,6 +120,12 @@
</el-dialog>
</div>
</basic-container>
<edittablehead
@setcolum="setnewcolum"
@closce="showdrawer"
:drawerShow="drawerShow"
:columnList="columnList"
></edittablehead>
</template>
<script>
@ -148,6 +142,71 @@ import { getListOwn } from '@/api/system/user';
export default {
data () {
return {
columnList: [
{
prop: '',
label: '序号',
type: 0,
values: '',
width: 55,
checkarr: [],
fixed: true,
},
{
prop: 'name',
label: '姓名',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true
// head: true,
},
{
prop: 'teamGroupName',
label: '班组名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true
// head: true,
},
{
prop: 'departmentName',
label: '所属部门名称',
type: 2,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true
},
{
prop: 'warehouseName',
label: '仓库名称',
type: 2,
values: '',
width: '180',
checkarr: [],
fixed: false,
sortable: true
},
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '150',
checkarr: [],
fixed: 'right',
sortable: false
}
// 更多列的配置...
],
height: 0,
// 弹框标题
title: '',
@ -196,6 +255,77 @@ export default {
mounted () {
this.init();
this.onLoad(this.page);
/**
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
*/
let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
if (checkListnewarr) {
this.columnList.map(item => {
item.head = false;
});
checkListnewarr.map(ite => {
this.columnList.map(item => {
if (ite == item.label) {
item.head = true;
}
});
});
} else {
let arr = [];
this.columnList.map(item => {
if (item.head) {
arr.push(item.label);
}
});
this.$functions.setStorage(window.location.pathname + 'checkList', arr);
}
if (flexListnewarr) {
this.columnList.map(item => {
item.fixed = false;
});
flexListnewarr.map(ite => {
this.columnList.map(item => {
if (ite == item.label) {
if (item.type == 6) {
item.fixed = 'right';
} else {
item.fixed = true;
}
}
});
});
} else {
let arr = [];
this.columnList.map(item => {
if (item.fixed) {
arr.push(item.label);
}
});
this.$functions.setStorage(window.location.pathname + 'flexList', arr);
}
if (sortlistnewarr) {
this.columnList.map(item => {
item.sortable = false;
});
sortlistnewarr.map(ite => {
this.columnList.map(item => {
if (ite == item.label) {
item.sortable = true;
}
});
});
} else {
let arr = [];
this.columnList.map(item => {
if (item.sortable) {
arr.push(item.label);
}
});
this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
}
},
computed: {
...mapGetters(["permission"]),
@ -208,6 +338,31 @@ export default {
}
},
methods: {
showdrawer(value) {
this.drawerShow = value;
},
/**
* 弹窗的勾选回调，用于更改头部数组
* 固定搭配，只需要更换 columnList
*/
setnewcolum(newarr, headarr, type) {
// console.log(newarr,'+++++++++++')
if (type == 1) {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
} else if (type == 2) {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
} else if (type == 3) {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
}
},
selectionsc(value) {
console.log('进来了>>>>>>>>>>>>>', value);
this.selectionList = value;
},
//点击部门
async clickDept(row){
// console.log("进发了部门",row);
@ -400,7 +555,7 @@ export default {
},
selectionClear () {
this.selectionList = [];
this.$refs.table.clearSelection();
// this.$refs.table.clearSelection();
},
currentChange (currentPage) {
this.page.currentPage = currentPage;

52
src/views/distribution/deliverylist/distributionDeliveryList.vue
Unescape View File

@ -115,39 +115,11 @@
@selection="selectionsc"
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
<el-button size="small" @click="editmap(slotProps.scope)">地 图</el-button>
<!-- <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
<el-text @click="editsolt(slotProps.scope)">查 看</el-text>
<el-text @click="editmap(slotProps.scope)">地 图</el-text>
</template>
</tablecmt>
<!-- <el-table ref="table" v-loading="loading"-->
<!-- @selection-change="selectionChange"-->
<!-- :data="data"-->
<!-- :height="height"-->
<!-- style="width: 100%"-->
<!-- :border="option.border">-->
<!--&lt;!&ndash; <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>&ndash;&gt;-->
<!-- <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
<!--&lt;!&ndash; <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">&ndash;&gt;-->
<!--&lt;!&ndash; </el-table-column>&ndash;&gt;-->
<!-- <template v-for="(item,index) in option.column">-->
<!-- &lt;!&ndash; table字段 &ndash;&gt;-->
<!-- <el-table-column v-if="item.hide!==true"-->
<!-- :prop="item.prop"-->
<!-- :label="item.label"-->
<!-- :width="item.width"-->
<!-- :key="index">-->
<!-- </el-table-column>-->
<!-- </template>-->
<!-- &lt;!&ndash; 操作栏模块 &ndash;&gt;-->
<!-- <el-table-column prop="menu" label="操作" :width="220" align="center">-->
<!-- <template #="{row}">-->
<!--&lt;!&ndash; <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看</el-button>-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看地图</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width:100%">
@ -289,15 +261,15 @@
// 选择行
selectionList: [],
columnList: [
// {
// prop: '',
// label: '序号',
// type: 0,
// values: '',
// width: 55,
// checkarr: [],
// fixed: true,
// },
{
prop: '',
label: '序号',
type: 0,
values: '',
width: 55,
checkarr: [],
fixed: true,
},
{
prop: 'trainNumber',
label: '车次',

5
src/views/distribution/signfor/distributionSignfor.vue
Unescape View File

@ -136,10 +136,7 @@
@selection="selectionChange"
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
<!-- <el-button size="small" @click="editsolt(slotProps.scope)">签 收</el-button>-->
<!-- <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
<!-- >Delete</el-button>-->
<el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
</template>
</tablecmt>
</el-row>

Write Preview
Loading…
Cancel
Save