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

更新

dev-warehouse
zhangsiyu 2 years ago
parent
0a44c50aa3
commit
2430fd4557
2 changed files with 173 additions and 92 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/components/tablecmt/tablecmt.vue
  2. 263
      src/views/distribution/turndelivery/deliveryInfo.vue

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

@ -79,7 +79,7 @@
<template #default="scope">
<el-text class="mx-2" v-if="Number(column.type)<6&&Number(column.type)>0">{{ scope.row[column.prop] }}</el-text>
<slot v-if="column.type == 6" :scope="scope"></slot>
<el-image preview-teleported v-if="column.type==7" style="width: 60px; height: 60px;margin-left: 10px;" :initial-index="index" :z-index="2040" v-for="(item,index) in scope.row[column.prop].split(',')" :src="item" :preview-src-list="scope.row[column.prop].split(',')"/>
<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(',')"/>
<!-- <slot v-if="column.type == 7" name="test" :testdata="scope"></slot> -->
<!-- <el-button
v-if="column.type == 6"

263
src/views/distribution/turndelivery/deliveryInfo.vue
Unescape View File

@ -18,12 +18,8 @@
</el-row>
</div> -->
<div class="tabbertop">
<div class="xz">
自主配送
</div>
<div>
外协配送
</div>
<div @click="ccc" :class="aaa ? 'xz' : ''">自主配送</div>
<div @click="ddd" :class="bbb ? 'xz' : ''">外协配送</div>
</div>
<!-- <div style="border: 3px solid pink; margin: 2%" v-if="aaa">
<el-form ref="form" :model="form" label-width="100px" style="margin: 3px">
@ -147,66 +143,132 @@
</el-form>
</div> -->
<div class="maboxc">
<div class="minbox">
<div class="minbox" v-if="aaa">
<div>
<span>*</span>
车辆信息
</div>
<div>
<el-scrollbar height="140px" style="border: 1px solid #D3832A;border-radius: 3px;">
<el-scrollbar height="140px" style="border: 1px solid #d3832a; border-radius: 3px">
<div class="itemmabox">
<span v-for="item in [1,3,45,5,1,123,1,1241,1,151,13,1]">
<span v-for="item in [1, 3, 45, 5, 1, 123, 1, 1241, 1, 151, 13, 1]">
{{ item }}
</span>
</div>
</el-scrollbar>
</div>
</div>
<div class="minbox">
<div class="minbox" v-if="aaa">
<div>
<span>*</span>
司机负责人
</div>
<div>
<el-scrollbar height="140px" style="border: 1px solid #D3832A;border-radius: 3px;">
<el-scrollbar height="140px" style="border: 1px solid #d3832a; border-radius: 3px">
<div class="itemmabox">
<span v-for="item in [1,3,45,5,1,123,1,1241,1,151,13,1]">
<span v-for="item in [1, 3, 45, 5, 1, 123, 1, 1241, 1, 151, 13, 1]">
{{ item }}
</span>
</div>
</el-scrollbar>
</div>
</div>
<div class="minbox">
<div class="minbox" v-if="aaa">
<div>
<span>*</span>
配送司机信息
</div>
<div>
<el-scrollbar height="140px" style="border: 1px solid #D3832A;border-radius: 3px;">
<el-scrollbar height="140px" style="border: 1px solid #d3832a; border-radius: 3px">
<div class="itemmabox">
<span v-for="item in [1,3,45,5,1,123,1,1241,1,151,13,1]">
<span v-for="item in [1, 3, 45, 5, 1, 123, 1, 1241, 1, 151, 13, 1]">
{{ item }}
</span>
</div>
</el-scrollbar>
</div>
</div>
<el-col style="margin-right: 20px;" :span="6" v-if="bbb">
<el-form-item label="外协来源:" prop="goodsShelfId">
<el-select v-model="form.tripartiteSource" placeholder="请选择来源">
<el-option
v-for="item in tripartiteSourceData"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictValue"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col style="margin-right: 20px;" :span="6" v-if="bbb">
<el-form-item label="司机名称:" prop="goodsShelfId">
<el-input v-model="form.driverName" placeholder="请输入司机名称"></el-input>
</el-form-item>
</el-col>
<el-col style="margin-right: 20px;" :span="6" v-if="bbb">
<el-form-item label="司机电话:" prop="goodsShelfId">
<el-input v-model="form.deiverPhone" placeholder="请输入本次费用"></el-input>
</el-form-item>
</el-col>
<el-col style="margin-right: 20px;" :span="6" v-if="bbb">
<el-form-item label="车辆车牌:" prop="goodsShelfId">
<el-input v-model="form.vehicleNum" placeholder="请输入本次费用"></el-input>
</el-form-item>
</el-col>
<el-col style="margin-right: 20px;" :span="6" v-if="bbb">
<el-form-item label="配送费用:" prop="goodsShelfId">
<el-input v-model="form.deliveryFee" placeholder="请输入本次费用"></el-input>
</el-form-item>
</el-col>
<div class="minbox">
<div>
<span>*</span>
叉车司机
</div>
<div>
<el-scrollbar height="140px" style="border: 1px solid #D3832A;border-radius: 3px;">
<el-scrollbar height="140px" style="border: 1px solid #d3832a; border-radius: 3px">
<div class="itemmabox">
<span v-for="item in [1,3,45,5,1,123,1,1241,1,151,13,1]">
<span v-for="item in [1, 3, 45, 5, 1, 123, 1, 1241, 1, 151, 13, 1]">
{{ item }}
</span>
</div>
</el-scrollbar>
</div>
</div>
<div class="duoxuan">
<el-checkbox-group v-model="this.loadAndUnload">
<el-checkbox
v-for="item in loadAndUnloadData"
:label="item.dictKey"
:value="item.dictKey"
>{{ item.dictValue }}</el-checkbox
>
</el-checkbox-group>
</div>
<div class="beihuobox">
<div>备货</div>
<div>
<el-date-picker
v-model="timevalue"
type="datetime"
placeholder="Pick a Date"
format="YYYY/MM/DD hh:mm:ss"
value-format="x"
/>
</div>
</div>
<div class="remarksbox">
<div class="titl">备注</div>
<el-input
v-model="remarks"
maxlength="300"
placeholder="Please input"
show-word-limit
rows="2"
type="textarea"
/>
</div>
</div>
<div style="border: 3px solid pink; margin: 2%" v-if="bbb">
<el-form ref="form" :model="form" label-width="100px" style="margin: 3px">
@ -321,20 +383,19 @@
<el-row>
<!-- 列表模块 -->
<tablecmt
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)">查看</el-button>
</template>
</tablecmt>
:columnList="columnList"
:tableData="data"
:loading="loading"
@inputTxt="inputsc"
@timeCheck="timesc"
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionsc"
>
<template #default="slotProps">
<el-button size="small" @click="editsolt(slotProps.scope)">查看</el-button>
</template>
</tablecmt>
</el-row>
<el-form-item style="margin-left: 45%; margin-top: 10px">
<el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder"
@ -615,6 +676,9 @@ export default {
loadAndUnloadData: [],
tripartiteSourceData: [],
loadAndUnload: [],
checkList: [],
timevalue: '',
remarks: '',
};
},
created() {
@ -641,7 +705,7 @@ export default {
* 初始化获取本地缓存的编辑隐藏的列表
* 固定搭配，不能更改
*/
let newarr = this.$functions.getStorage(window.location.pathname);
let newarr = this.$functions.getStorage(window.location.pathname);
if (newarr) {
this.columnList.map(item => {
item.head = false;
@ -656,8 +720,8 @@ export default {
}
},
methods: {
showdrawer(value){
this.drawerShow=value
showdrawer(value) {
this.drawerShow = value;
},
/**
* 弹窗的勾选回调，用于更改头部数组
@ -986,72 +1050,89 @@ export default {
</script>
<style lang="scss" scoped>
.tabbertop{
width: 100%;
// height: 6px;
background-color: #ffffff;
.beihuobox {
display: flex;
align-items: center;
margin-right: 20px;
margin-left: 20px;
> div:nth-of-type(1) {
margin-right: 20px;
}
}
.remarksbox {
display: flex;
align-items: flex-start;
width: 100%;
min-height: 150px;
> .titl {
width: 40px;
}
}
.tabbertop {
width: 100%;
// height: 6px;
background-color: #ffffff;
display: flex;
align-items: center;
padding-left: 50px;
box-sizing: border-box;
> div {
width: 150px;
font-size: 20px;
height: 50px;
display: flex;
align-items: center;
padding-left: 50px;
box-sizing: border-box;
>div{
width: 150px;
font-size: 20px;
height: 50px;
display: flex;
align-items: center;
justify-content: center;
}
.xz{
color: #D3832A;
border-bottom: 5px solid #D3832A;
}
justify-content: center;
border-bottom: 5px solid #d3832a00;
}
.xz {
color: #d3832a;
border-bottom: 5px solid #d3832a;
}
.maboxc{
width: 98%;
margin: auto;
padding: 20px;
}
.maboxc {
width: 98%;
margin: auto;
padding: 20px;
display: flex;
align-items: center;
flex-wrap: wrap;
box-sizing: border-box;
background-color: #ffffff;
margin-bottom: 20px;
border-radius: 5px;
margin-top: 10px;
box-sizing: border-box;
> .minbox {
display: flex;
align-items: center;
flex-wrap: wrap;
box-sizing: border-box;
background-color: #ffffff;
align-items: flex-start;
margin-right: 30px;
margin-bottom: 20px;
border-radius: 5px;
margin-top: 10px;
box-sizing: border-box;
>.minbox{
> div:nth-of-type(1) {
display: flex;
align-items: flex-start;
margin-right: 30px;
margin-bottom: 20px;
>div:nth-of-type(1){
display: flex;
align-items: center;
>span{
color: #ff0000;
font-size: 20px;
}
align-items: center;
> span {
color: #ff0000;
font-size: 20px;
}
>div:nth-of-type(2){
width: 220px;
margin-left: 10px;
border-radius: 3px;
.itemmabox{
display: flex;
flex-direction: column;
>span{
width: 100%;
// height: 32px;
// background-color: #ffffff;
border: 1px solid #EEEEEE;
box-sizing: border-box;
padding: 5px;
}
}
> div:nth-of-type(2) {
width: 220px;
margin-left: 10px;
border-radius: 3px;
.itemmabox {
display: flex;
flex-direction: column;
> span {
width: 100%;
// height: 32px;
// background-color: #ffffff;
border: 1px solid #eeeeee;
box-sizing: border-box;
padding: 5px;
}
}
}
}
}
</style>

Write Preview
Loading…
Cancel
Save