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

待签收详情查看

fix_bug_pro20231227
kilo 1 year ago
parent
97a5226db9
commit
b147d8860b
2 changed files with 521 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 584
      src/views/distribution/signfor/distributionSignforedt.vue
  2. 40
      src/views/distribution/turndelivery/deliveryMarket.vue

584
src/views/distribution/signfor/distributionSignforedt.vue
Unescape View File

@ -70,77 +70,77 @@
<span>客户备注：{{ signfordata.remarks }} </span> <span>客户备注：{{ signfordata.remarks }} </span>
</el-col> </el-col>
</el-row> </el-row>
<el-dialog v-model="fbox" title="增值服务" width="30%"> <!-- <el-dialog v-model="fbox" title="增值服务" width="30%">-->
<!-- :before-close="handleClose"--> <!-- &lt;!&ndash; :before-close="handleClose"&ndash;&gt;-->
<el-form-item label="增值服务" prop="freightMark"> <!-- <el-form-item label="增值服务" prop="freightMark">-->
<el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange"> <!-- <el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">-->
<el-checkbox <!-- <el-checkbox-->
style="width: 100%; margin-bottom: 3%" <!-- style="width: 100%; margin-bottom: 3%"-->
:disabled="true" <!-- :disabled="true"-->
v-for="(item, index) in addvalueServeTypeData" <!-- v-for="(item, index) in addvalueServeTypeData"-->
:key="item.dictKey" <!-- :key="item.dictKey"-->
:label="item.dictKey" <!-- :label="item.dictKey"-->
>{{ item.dictValue }} <!-- >{{ item.dictValue }}-->
<span v-if="index === 0 || index === 6 || index === 2 || index === 4" <!-- <span v-if="index === 0 || index === 6 || index === 2 || index === 4"-->
>&nbsp;件数: <!-- >&nbsp;件数:-->
<el-input <!-- <el-input-->
v-model="item.f" <!-- v-model="item.f"-->
:disabled="true" <!-- :disabled="true"-->
style="width: 10%; border: none; border-bottom: 2px solid #eee" <!-- style="width: 10%; border: none; border-bottom: 2px solid #eee"-->
/> <!-- />-->
</span> <!-- </span>-->
<span v-if="index === 1" <!-- <span v-if="index === 1"-->
>公里: <!-- >公里:-->
<el-input <!-- <el-input-->
v-model="item.a" <!-- v-model="item.a"-->
:disabled="true" <!-- :disabled="true"-->
style="width: 10%; border: none; border-bottom: 2px solid #eee" <!-- style="width: 10%; border: none; border-bottom: 2px solid #eee"-->
/> <!-- />-->
</span> <!-- </span>-->
<span v-if="index === 3" <!-- <span v-if="index === 3"-->
>距离: <!-- >距离:-->
<el-input <!-- <el-input-->
v-model="item.b" <!-- v-model="item.b"-->
:disabled="true" <!-- :disabled="true"-->
style="width: 10%; border: none; border-bottom: 2px solid #eee" <!-- style="width: 10%; border: none; border-bottom: 2px solid #eee"-->
/> <!-- />-->
</span> <!-- </span>-->
<span v-if="index === 5" <!-- <span v-if="index === 5"-->
>人数: <!-- >人数:-->
<el-input <!-- <el-input-->
v-model="item.c" <!-- v-model="item.c"-->
:disabled="true" <!-- :disabled="true"-->
style="width: 10%; border: none; border-bottom: 2px solid #eee" <!-- style="width: 10%; border: none; border-bottom: 2px solid #eee"-->
/> <!-- />-->
</span> <!-- </span>-->
<span v-if="index === 0" <!-- <span v-if="index === 0"-->
>楼层: <!-- >楼层:-->
<el-input <!-- <el-input-->
v-model="item.d" <!-- v-model="item.d"-->
:disabled="true" <!-- :disabled="true"-->
style="width: 10%; border: none; border-bottom: 2px solid #eee" <!-- style="width: 10%; border: none; border-bottom: 2px solid #eee"-->
/> <!-- />-->
</span> <!-- </span>-->
<span v-if="item" <!-- <span v-if="item"-->
>预计费用: <!-- >预计费用:-->
<el-input <!-- <el-input-->
v-model="item.e" <!-- v-model="item.e"-->
:disabled="true" <!-- :disabled="true"-->
style="width: 20%; border: none; border-bottom: 2px solid #eee" <!-- style="width: 20%; border: none; border-bottom: 2px solid #eee"-->
/> <!-- />-->
</span> <!-- </span>-->
</el-checkbox> <!-- </el-checkbox>-->
</el-checkbox-group> <!-- </el-checkbox-group>-->
</el-form-item> <!-- </el-form-item>-->
<template #footer> <!-- <template #footer>-->
<span class="dialog-footer"> <!-- <span class="dialog-footer">-->
<el-button @click="dialogVisible = false">关闭</el-button> <!-- <el-button @click="dialogVisible = false">关闭</el-button>-->
<!-- <el-button type="primary" @click="dialogVisible = false">--> <!-- &lt;!&ndash; <el-button type="primary" @click="dialogVisible = false">&ndash;&gt;-->
<!-- 确定(增值服务)--> <!-- &lt;!&ndash; 确定(增值服务)&ndash;&gt;-->
<!-- </el-button>--> <!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
</span> <!-- </span>-->
</template> <!-- </template>-->
</el-dialog> <!-- </el-dialog>-->
<!-- <el-dialog :title="title"--> <!-- <el-dialog :title="title"-->
<!-- v-model="fbox"--> <!-- v-model="fbox"-->
@ -337,22 +337,304 @@
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-divider><h5>增值服务信息</h5></el-divider>
<el-tabs type="border-card" v-model="activeTab" @tab-click="handleAddvalueTabClick">
<el-tab-pane label="上&emsp;楼" name="tabs1">
<!-- 列表模块 -->
<el-row :gutter="24" class="rows">
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>楼层:{{addvalueinfo.floolNum}} 层</span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>件数：{{addvalueinfo.num}} 件</span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>费用：{{addvalueinfo.fee}} ￥</span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>操作人：{{addvalueinfo.createUser}} </span>
</el-col>
</el-row>
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="addvalueData"
:height="height"
style="width: 100%"
:border="addvalueOption.border"
>
<!-- align="center"-->
<el-table-column type="expand" v-if="addvalueOption.expand"></el-table-column>
<template v-for="(item,index) in addvalueOption.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:show-overflow-tooltip="true"
:width="item.width"
:key="index">
<!-- :align="center"
-->
</el-table-column>
</template>
<!-- <el-table-column prop="menu" label="操作" :width="250">-->
<!-- <template #="{row}">-->
<!-- <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查 看-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</el-tab-pane>
<el-tab-pane label="超&emsp;区" name="tabs2">
<!-- 列表模块 -->
<el-row :gutter="24" class="rows">
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>公里数:{{addvalueinfo.distance}}公里 </span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>件数:{{addvalueinfo.num}} 件</span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>费用：{{addvalueinfo.fee}} ￥</span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>操作人：{{addvalueinfo.createUser}} </span>
</el-col>
</el-row>
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="addvalueData"
:height="height"
style="width: 100%"
:border="addvalueOption.border"
>
<!-- align="center"-->center
<el-table-column type="expand" v-if="addvalueOption.expand"></el-table-column>
<template v-for="(item,index) in addvalueOption.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:show-overflow-tooltip="true"
:width="item.width"
:key="index">
<!-- :align="center"-->
</el-table-column>
</template>
</el-table>
</el-tab-pane>
<el-tab-pane label="平&emsp;移" name="tabs3">
<!-- 列表模块 -->
<el-row :gutter="24" class="rows">
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>距离:{{addvalueinfo.distance}}米 </span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>件数:{{addvalueinfo.num}} 件</span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>费用：{{addvalueinfo.fee}} ￥</span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>操作人：{{addvalueinfo.deliveryAddress}} </span>
</el-col>
</el-row>
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="addvalueData"
:height="height"
style="width: 100%"
:border="addvalueOption.border"
>
<!-- align="center"-->center
<el-table-column type="expand" v-if="addvalueOption.expand"></el-table-column>
<template v-for="(item,index) in addvalueOption.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:show-overflow-tooltip="true"
:width="item.width"
:key="index">
<!-- :align="center"-->
</el-table-column>
</template>
</el-table>
</el-tab-pane>
<el-tab-pane label="搬&emsp;运" name="tabs4">
<!-- 列表模块 -->
<el-row :gutter="24" class="rows">
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>班组:{{addvalueinfo.consignee}} </span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>件数:{{addvalueinfo.num}} </span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>费用：{{addvalueinfo.fee}} </span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>操作人：{{addvalueinfo.deliveryAddress}} </span>
</el-col>
</el-row>
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="addvalueData"
:height="height"
style="width: 100%"
:border="addvalueOption.border"
>
<!-- align="center"-->center
<el-table-column type="expand" v-if="addvalueOption.expand"></el-table-column>
<template v-for="(item,index) in addvalueOption.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:show-overflow-tooltip="true"
:width="item.width"
:key="index">
<!-- :align="center"-->
</el-table-column>
</template>
</el-table>
</el-tab-pane>
<el-tab-pane label="分&emsp;拣" name="tabs5">
<!-- 列表模块 -->
<el-row :gutter="24" class="rows">
<!-- <el-col :xl="6" :lg="7" :md="10" :sm="24" >-->
<!-- <span>距离:{{signfordata.consignee}} </span>-->
<!-- </el-col>-->
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>件数:{{addvalueinfo.num}} 件</span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>费用：{{addvalueinfo.fee}} ￥</span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>操作人：{{addvalueinfo.deliveryAddress}} </span>
</el-col>
</el-row>
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="addvalueData"
:height="height"
style="width: 100%"
:border="addvalueOption.border"
>
<!-- align="center"-->center
<el-table-column type="expand" v-if="addvalueOption.expand"></el-table-column>
<template v-for="(item,index) in addvalueOption.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:show-overflow-tooltip="true"
:width="item.width"
:key="index">
<!-- :align="center"-->
</el-table-column>
</template>
</el-table>
</el-tab-pane>
<el-tab-pane label="专&emsp;车" name="tabs6">
<!-- 列表模块 -->
<el-row :gutter="24" class="rows">
<!-- <el-col :xl="6" :lg="7" :md="10" :sm="24" >-->
<!-- <span>距离:{{signfordata.consignee}} </span>-->
<!-- </el-col>-->
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>件数:{{addvalueinfo.num}} 件</span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>费用：{{addvalueinfo.fee}} ￥</span>
</el-col>
<el-col :xl="6" :lg="7" :md="10" :sm="24">
<span>操作人：{{addvalueinfo.deliveryAddress}} </span>
</el-col>
</el-row>
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="addvalueData"
:height="height"
style="width: 100%"
:border="addvalueOption.border"
>
<!-- align="center"-->center
<el-table-column type="expand" v-if="addvalueOption.expand"></el-table-column>
<template v-for="(item,index) in addvalueOption.column">
<!-- table字段 -->
<el-table-column v-if="item.hide!==true"
:prop="item.prop"
:label="item.label"
:show-overflow-tooltip="true"
:width="item.width"
:key="index">
<!-- :align="center"-->
</el-table-column>
</template>
</el-table>
</el-tab-pane>
<!-- <el-tab-pane label="平移。搬运。分拣。专车" name="tab4">-->
<!-- &lt;!&ndash; 列表模块 &ndash;&gt;-->
<!-- <el-table ref="table" v-loading="loading"-->
<!-- @selection-change="selectionChange"-->
<!-- :data="inventoryData"-->
<!-- :height="height"-->
<!-- style="width: 100%"-->
<!-- :border="inventory.border"-->
<!-- >-->
<!-- &lt;!&ndash; align="center"&ndash;&gt;center-->
<!-- <el-table-column type="expand" v-if="inventory.expand"></el-table-column>-->
<!-- <template v-for="(item,index) in inventory.column">-->
<!-- &lt;!&ndash; table字段 &ndash;&gt;-->
<!-- <el-table-column v-if="item.hide!==true"-->
<!-- :prop="item.prop"-->
<!-- :label="item.label"-->
<!-- :show-overflow-tooltip="true"-->
<!-- :width="item.width"-->
<!-- :key="index">-->
<!-- &lt;!&ndash; :align="center"&ndash;&gt;-->
<!-- </el-table-column>-->
<!-- </template>-->
<!-- &lt;!&ndash; <el-table-column prop="menu" label="操作" :width="220" align="center">&ndash;&gt;-->
<!-- &lt;!&ndash; <template #="{row}">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-view" @click="handleInventoryView(row)">查看详情</el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-table-column>&ndash;&gt;-->
<!-- </el-table>-->
<!-- </el-tab-pane>-->
</el-tabs>
</div> </div>
</basic-container> </basic-container>
</template> </template>
<script> <script>
import { import {
getList, getList,
getDetail, getDetail,
add, add,
update, update,
remove, remove,
getDetailById, getDetailById,
getListOrder, getListOrder,
signforPackageList, signforPackageList,
signforInventoryList, signforInventoryList, addvalueInfoList
} from '@/api/distribution/distributionSignfor'; } from '@/api/distribution/distributionSignfor';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict'; import { getDictionaryBiz } from '@/api/system/dict';
@ -396,6 +678,7 @@ export default {
activeTab: 'tab1', activeTab: 'tab1',
//订单数据: //订单数据:
orderData: [], orderData: [],
addvalueinfo:{},
// 步骤条 // 步骤条
stepsList: [ stepsList: [
{ {
@ -421,6 +704,78 @@ export default {
], ],
// 步骤条激活步骤 // 步骤条激活步骤
stepActive: 0, stepActive: 0,
addvalueData:[],
addvalueOption: {
expand: false,
index: true,
border: true,
selection: true,
column: [
{
prop: 'orderCode',
label: '订单自编号',
type: 2,
values: '',
width: '300',
checkarr: [],
fixed: true,
sortable: true
// head: true,
},
{
label: '货物名称',
prop: 'materialName',
type: 1,
values: '',
width: '300',
checkarr: [],
fixed: false,
sortable: true
},
{
label: '包条码',
prop: 'orderPackageCode',
type: 1,
values: '',
width: '300',
checkarr: [],
fixed: false,
sortable: true
},
{
label: '数量',
prop: 'quantity',
type: 1,
values: '',
width: '220',
checkarr: [],
fixed: false,
sortable: true
},
{
label: '包条类型',
prop: 'conditions',
type: 1,
values: '',
width: '220',
checkarr: [],
fixed: false,
sortable: true
},
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '300',
checkarr: [],
fixed: 'right',
sortable: false
}
// 更多列的配置...
],
},
//卡片列表 //卡片列表
ordoption: { ordoption: {
expand: false, expand: false,
@ -1566,6 +1921,70 @@ export default {
}); });
}); });
}, },
handleAddvalueTabClick(tab, event) {
console.log('tab>>>>>>>>', tab.paneName);
let tabName = tab.paneName;
let addvalueId = 0;
switch (tabName) {
case 'tabs1':
//上楼
console.log('上楼');
addvalueId = 1;
break;
case 'tabs2':
//超区
console.log('超区');
addvalueId = 2;
break;
case 'tabs3':
//平移
console.log('平移');
addvalueId = 3;
break;
case 'tabs4':
//搬运
console.log('搬运');
addvalueId = 4;
break;
case 'tabs5':
//分拣
console.log('分拣');
addvalueId = 5;
break;
case 'tabs6':
//专车
console.log('专车');
addvalueId = 6;
break;
}
let a ={
signforId:this.$route.query.id,
addvalueId:addvalueId,
}
addvalueInfoList(a).then(res=>{
console.log("res------------->",res.data.data);
const data = res.data.data;
if (data === null){
this.addvalueData = [];
this.addvalueinfo = { };
}else {
this.addvalueinfo = data;
this.addvalueData = data.packageEntityList;
}
// if (data !== null ){
// if (!!data.packageEntityList){
// this.addvalueData = data.packageEntityList;
// }
// }
})
},
rowDel(row) { rowDel(row) {
this.$confirm('确定将选择数据删除?', { this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -1664,7 +2083,6 @@ export default {
this.addvalueData = data.packageEntityList; this.addvalueData = data.packageEntityList;
} }
}); });
this.loading = false; this.loading = false;
}, },
getListOrders(page, params = {}) { getListOrders(page, params = {}) {

40
src/views/distribution/turndelivery/deliveryMarket.vue
Unescape View File

@ -737,7 +737,7 @@
{ immediate: true } { immediate: true }
); );
this.getDictionary(); this.getDictionary();
this.getFork(); // this.getFork();
this.getTeam(); this.getTeam();
this.getvehicleData(); this.getvehicleData();
this.getMasterDriverData(); this.getMasterDriverData();
@ -793,8 +793,8 @@
}); });
this.forkliftData = fo; this.forkliftData = fo;
}); });
await this.getStorageArea(); // await this.getStorageArea();
await this.getTeam(); // await this.getTeam();
}, },
//查询班组 //查询班组
async getTeam() { async getTeam() {
@ -813,23 +813,23 @@
this.loaderData = fo; this.loaderData = fo;
}); });
}, },
//备货区 // //备货区
async getStorageArea() { // async getStorageArea() {
let params = this.deptId; // let params = this.deptId;
console.log('^^^^^^^^^^^^^', params); // console.log('^^^^^^^^^^^^^', params);
stockUpInfo(params).then(res => { // stockUpInfo(params).then(res => {
console.log('=========================》', res); // console.log('=========================》', res);
let fo = []; // let fo = [];
res.data.data.forEach(i => { // res.data.data.forEach(i => {
let v = { // let v = {
dictKey: i.id, // dictKey: i.id,
dictValue: i.headline // dictValue: i.headline
}; // };
fo.push(v); // fo.push(v);
}); // });
this.goodsAreaData = fo; // this.goodsAreaData = fo;
}); // });
}, // },
//查询司机信息 //查询司机信息
getMasterDriverData() { getMasterDriverData() {
return new Promise((rv, rev) => { return new Promise((rv, rev) => {

Write Preview
Loading…
Cancel
Save