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

Merge remote-tracking branch 'origin/dev' into dev

fix_bug_pro20231227
caoyizhong 1 year ago
parent
660dc5f466 f9c205eb41
commit
94ea0b9721
8 changed files with 588 additions and 259 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/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
  2. 516
      src/views/distribution/inventory/distributionStockRoute.vue
  3. 2
      src/views/distribution/inventory/distrilbutionBillLading.vue
  4. 313
      src/views/distribution/signfor/distributionSignforedt.vue
  5. 0
      src/views/distribution/signfor/distributionSignforedtDT.vue
  6. 4
      src/views/distribution/signfor/distributionSignfortreat.vue
  7. 7
      src/views/distribution/turndelivery/deliveryDiscuss.vue
  8. 3
      src/views/system/user.vue

2
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue
Unescape View File

@ -333,7 +333,7 @@
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmitly"
>提 交</el-button
>
<el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
<el-button icon="el-icon-circle-close" @click="box3 = false">取 消</el-button>
</span>
</template>
</el-dialog>

516
src/views/distribution/inventory/distributionStockRoute.vue
Unescape View File

@ -1,7 +1,7 @@
<template>
<basic-container>
<div class="avue-crud">
<el-row v-if="!search" style="padding:6px 18px">
<el-row v-if="!search" style="padding: 6px 18px">
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<el-form-item label="商场名称:">
@ -22,12 +22,12 @@
<el-form-item label="服务类型:">
<el-input v-model="query.typeService" placeholder="请输入服务类型"></el-input>
</el-form-item>
<!-- <el-form-item label="类型;1 预约单 2库存单:">-->
<!-- <el-input v-model="query.genre" placeholder="请输入类型;1 预约单 2库存单"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="状态;1 配送 2 待配送:">-->
<!-- <el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="类型;1 预约单 2库存单:">-->
<!-- <el-input v-model="query.genre" placeholder="请输入类型;1 预约单 2库存单"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="状态;1 配送 2 待配送:">-->
<!-- <el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></el-input>-->
<!-- </el-form-item>-->
<!-- 查询按钮 -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
@ -39,86 +39,119 @@
<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-button type="primary" icon="el-icon-plus" @click="handlePickUpStore" v-if="permission.stockArticle_add" >自提</el-button>
<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-button
type="primary"
icon="el-icon-plus"
@click="handlePickUpStore"
v-if="permission.stockArticle_add"
>自提</el-button
>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete">全部</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">未通知</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete">已通知</el-button>
</div>
<!-- 头部右侧按钮模块 -->
<!-- <div class="avue-crud__right">-->
<!-- <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__right">-->
<!-- <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>-->
<!-- <el-button icon="el-icon-search" @click="searchHide" circle></el-button>-->
<!-- </div>-->
</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" >转预约单</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleStockList">批量加配转库存品</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('3')" >修改客户信息</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('2')" >修改服务类型</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete"
>转预约单</el-button
>
<el-button type="primary" icon="el-icon-plus" @click="handleStockList"
>批量加配转库存品</el-button
>
<el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('3')"
>修改客户信息</el-button
>
<el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('2')"
>修改服务类型</el-button
>
</div>
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handlebill">创建提货单</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1')" >再次通知</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1')">通知提货</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1')"
>再次通知</el-button
>
<el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1')"
>通知提货</el-button
>
</div>
<!-- 头部右侧按钮模块 -->
<!-- <div class="avue-crud__right">-->
<!-- <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__right">-->
<!-- <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>-->
<!-- <el-button icon="el-icon-search" @click="searchHide" circle></el-button>-->
<!-- </div>-->
</div>
</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
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="60" align="center">
</el-table-column>
<template v-for="(item,index) in option.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
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 #="{ 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>
</el-row>
<el-row>
<div class="avue-crud__pagination" style="width:100%">
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
<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
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>
@ -141,29 +174,27 @@
placeholder="请填写内容"
/>
</el-form-item>
<el-form-item label="历史跟进" :label-width="formLabelWidth">
</el-form-item>
<el-form-item label="历史跟进" :label-width="formLabelWidth"> </el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogFormVisible = false">取消</el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<el-button type="primary" @click="callFordelivery('1')"> 确定 </el-button>
</span>
<span class="dialog-footer">
<el-button @click="dialogFormVisible = false">取消</el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<el-button type="primary" @click="callFordelivery('1')"> 确定 </el-button>
</span>
</template>
</el-dialog>
<el-dialog v-model="dialogFormService" title="修改服务类型">
<el-form :model="formService">
<el-form-item label="服务类型" :label-width="formLabelWidth">
<!-- <el-input v-model="formService.typeService" autocomplete="off" />-->
<!-- <el-input v-model="formService.typeService" autocomplete="off" />-->
<el-select v-model="formService.typeService" clearable placeholder="请选择服务类型">
<el-option
v-for="item in distributionType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey">
v-for="item in distributionType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
>
</el-option>
</el-select>
</el-form-item>
@ -180,11 +211,11 @@
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogFormService = false">取消</el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<el-button type="primary" @click="callFordelivery('2')"> 确定 </el-button>
</span>
<span class="dialog-footer">
<el-button @click="dialogFormService = false">取消</el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<el-button type="primary" @click="callFordelivery('2')"> 确定 </el-button>
</span>
</template>
</el-dialog>
<el-dialog v-model="dialogFormCustomer" title="修改客户信息">
@ -205,38 +236,40 @@
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogFormCustomer = false">取消</el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
</span>
<span class="dialog-footer">
<el-button @click="dialogFormCustomer = false">取消</el-button>
<!-- <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
<el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
</span>
</template>
</el-dialog>
<!-- 表单模块 -->
<el-dialog :title="title"
v-model="box"
width="50%"
:before-close="beforeClose"
append-to-body>
<el-dialog
:title="title"
v-model="box"
width="50%"
:before-close="beforeClose"
append-to-body
>
<el-form :disabled="view" ref="form" :model="form" label-width="80px">
<!-- 表单字段 -->
<el-form-item label="服务号" prop="serviceNumber">
<el-input v-model="form.serviceNumber" placeholder="请输入服务号"/>
<el-input v-model="form.serviceNumber" placeholder="请输入服务号" />
</el-form-item>
<el-form-item label="订单自编号" prop="orderCode">
<el-input v-model="form.orderCode" placeholder="请输入订单自编号"/>
<el-input v-model="form.orderCode" placeholder="请输入订单自编号" />
</el-form-item>
<el-form-item label="商场名称" prop="mallName">
<el-input v-model="form.mallName" placeholder="请输入商场名称"/>
<el-input v-model="form.mallName" placeholder="请输入商场名称" />
</el-form-item>
<el-form-item label="货物名称" prop="descriptionGoods">
<el-input v-model="form.descriptionGoods" placeholder="请输入货物名称"/>
<el-input v-model="form.descriptionGoods" placeholder="请输入货物名称" />
</el-form-item>
<el-form-item label="仓库" prop="warehouse">
<el-input v-model="form.warehouse" placeholder="请输入仓库"/>
<el-input v-model="form.warehouse" placeholder="请输入仓库" />
</el-form-item>
<el-form-item label="入库时间" prop="warehouseEntryTime">
<!-- <el-input v-model="form.warehouseEntryTime" placeholder="请输入入库时间"/>-->
<!-- <el-input v-model="form.warehouseEntryTime" placeholder="请输入入库时间"/>-->
<el-date-picker
v-model="form.warehouseEntryTime"
type="datetime"
@ -246,71 +279,71 @@
/>
</el-form-item>
<el-form-item label="在库时长" prop="storeTime">
<el-input v-model="form.storeTime" placeholder="请输入在库时长"/>
<el-input v-model="form.storeTime" placeholder="请输入在库时长" />
</el-form-item>
<el-form-item label="订单总件数" prop="totalNumber">
<el-input v-model="form.totalNumber" placeholder="请输入订单总件数"/>
<el-input v-model="form.totalNumber" placeholder="请输入订单总件数" />
</el-form-item>
<el-form-item label="在库件数" prop="handQuantity">
<el-input v-model="form.handQuantity" placeholder="请输入在库件数"/>
<el-input v-model="form.handQuantity" placeholder="请输入在库件数" />
</el-form-item>
<el-form-item label="是否齐套" prop="completeSet">
<el-select v-model="form.completeSet" clearable placeholder="请选择是否齐套">
<!-- <el-option-->
<!-- v-for="item in completeSetData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<!-- <el-option-->
<!-- v-for="item in completeSetData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<el-option label="是" value="2">是</el-option>
<el-option label="否" value="1">否</el-option>
</el-select>
</el-form-item>
<el-form-item label="品牌" prop="brand">
<el-input v-model="form.brand" placeholder="请输入品牌"/>
<el-input v-model="form.brand" placeholder="请输入品牌" />
</el-form-item>
<el-form-item label="服务类型" prop="typeService">
<el-select v-model="form.typeService" clearable placeholder="请选择服务类型">
<!-- <el-option-->
<!-- v-for="item in typeServiceData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<!-- <el-option-->
<!-- v-for="item in typeServiceData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<el-option label="干" value="1">干</el-option>
<el-option label="仓" value="2">仓</el-option>
<el-option label="配" value="3">配</el-option>
</el-select>
</el-form-item>
<el-form-item label="顾客名字" prop="customerName">
<el-input v-model="form.customerName" placeholder="请输入顾客名字"/>
<el-input v-model="form.customerName" placeholder="请输入顾客名字" />
</el-form-item>
<el-form-item label="顾客电话" prop="customerTelephone">
<el-input v-model="form.customerTelephone" placeholder="请输入顾客电话"/>
<el-input v-model="form.customerTelephone" placeholder="请输入顾客电话" />
</el-form-item>
<el-form-item label="顾客地址" prop="customerAddress">
<el-input v-model="form.customerAddress" placeholder="请输入顾客地址"/>
<el-input v-model="form.customerAddress" placeholder="请输入顾客地址" />
</el-form-item>
<el-form-item label="类型;1 预约单 2库存单" prop="genre">
<el-select v-model="form.genre" clearable placeholder="请选择类型;1 预约单 2库存单">
<!-- <el-option-->
<!-- v-for="item in genreData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<!-- <el-option-->
<!-- v-for="item in genreData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<el-option label="库存单" value="2">库存单</el-option>
<el-option label="预约单" value="1">预约单</el-option>
</el-select>
</el-form-item>
<el-form-item label="状态;1 配送 2 待配送" prop="state">
<el-select v-model="form.state" clearable placeholder="请选择状态;1 配送 2 待配送">
<!-- <el-option-->
<!-- v-for="item in stateData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<!-- <el-option-->
<!-- v-for="item in stateData"-->
<!-- :key="item.dictKey"-->
<!-- :label="item.dictValue"-->
<!-- :value="item.dictKey">-->
<!-- </el-option>-->
<el-option label="待配送" value="2">待配送</el-option>
<el-option label="配送" value="1">配送</el-option>
</el-select>
@ -319,7 +352,9 @@
<!-- 表单按钮 -->
<template #footer>
<span v-if="!view" class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
>提 交</el-button
>
<el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
</span>
</template>
@ -329,16 +364,23 @@
</template>
<script>
import { getList, getDetail, add, update, remove,addStock } from "@/api/distribution/distributionStockArticle";
import { addCallDelivery } from "@/api/distribution/distrilbutionCallDelivery";
import { addClient } from "@/api/distribution/distributionClientMessage";
import { addService } from "@/api/distribution/distributionServiceLog";
import option from "@/option/distribution/distributionStockArticle";
import { mapGetters } from "vuex";
import {
getList,
getDetail,
add,
update,
remove,
addStock,
} from '@/api/distribution/distributionStockArticle';
import { addCallDelivery } from '@/api/distribution/distrilbutionCallDelivery';
import { addClient } from '@/api/distribution/distributionClientMessage';
import { addService } from '@/api/distribution/distributionServiceLog';
import option from '@/option/distribution/distributionStockArticle';
import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
export default {
data () {
data() {
return {
height: 0,
// 弹框标题
@ -357,11 +399,11 @@ export default {
page: {
currentPage: 1,
pageSize: 30,
total: 40
total: 40,
},
// 表单数据
form: {},
formCall: {},// 通知
formCall: {}, // 通知
formService: {}, // 服务
formCustomer: {}, // 客户
// 选择行
@ -375,41 +417,41 @@ export default {
dialogFormVisible: false,
dialogFormCustomer: false,
dialogFormService: false,
formLabelWidth: '120px'
}
formLabelWidth: '120px',
};
},
mounted () {
mounted() {
this.init();
this.onLoad(this.page);
},
computed: {
...mapGetters(["permission"]),
...mapGetters(['permission']),
permissionList() {
return {
addBtn: this.validData(this.permission.basicdataBrandCategory_add, false),
viewBtn: this.validData(this.permission.basicdataBrandCategory_view, false),
delBtn: this.validData(this.permission.basicdataBrandCategory_delete, false),
editBtn: this.validData(this.permission.basicdataBrandCategory_edit, false)
editBtn: this.validData(this.permission.basicdataBrandCategory_edit, false),
};
},
ids () {
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
return ids.join(',');
},
},
methods: {
handleStockList(){
handleStockList() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
this.$message.warning('请选择至少一条数据');
return;
}
this.$confirm("确定将选择的订单转为库存品吗？", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
this.$confirm('确定将选择的订单转为库存品吗？', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return addStock(this.ids);
@ -418,115 +460,109 @@ export default {
this.selectionClear();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
});
},
//确定通知提货按钮
callFordelivery(inde){
callFordelivery(inde) {
switch (inde) {
case '1':
console.log(this.formCall);
this.formCall.waybillNumber = this.ids;
this.formCall.waybillNumber = this.ids;
addCallDelivery(this.formCall).then(() => {
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
this.dialogFormVisible = false;
this.formCall={}
this.formCall = {};
});
break;
case '2':
// console.log("服务类型",this.formService);
addService(this.formService).then(() =>{
addService(this.formService).then(() => {
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
this.dialogFormService = false;
this.formService={}
})
this.formService = {};
});
break;
case '3':
console.log("客户信息！！！",this.formCustomer);
console.log('客户信息！！！', this.formCustomer);
this.formCustomer.stockArticleId = this.ids;
addClient(this.formCustomer).then(() =>{
addClient(this.formCustomer).then(() => {
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
this.dialogFormCustomer = false;
this.formCustomer={}
})
this.formCustomer = {};
});
break;
}
},
//提货跳转
handlebill(row){
console.log(">>>>",this.ids);
handlebill(row) {
console.log('>>>>', this.ids);
this.$router.push({
path: '/distribution/inventory/distrilbutionBillLading',
query:{
query: {
id: this.ids,
}
},
});
},
//通知提货
handleCallDelivery(ind){
handleCallDelivery(ind) {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
this.$message.warning('请选择至少一条数据');
return;
}
switch (ind) {
case '1':
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.orderCode);
});
this.formCall.waybill = ids;
this.dialogFormVisible = true;
break;
case '2':
this.dialogFormService = true;
break;
case '3':
this.dialogFormCustomer = true;
break;
case '1':
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.orderCode);
});
this.formCall.waybill = ids;
this.dialogFormVisible = true;
break;
case '2':
this.dialogFormService = true;
break;
case '3':
this.dialogFormCustomer = true;
break;
}
},
init () {
init() {
this.height = this.setPx(document.body.clientHeight - 340);
getDictionaryBiz('distribution_type').then(res => {
this.distributionType = res.data.data;
});
},
searchHide () {
searchHide() {
this.search = !this.search;
},
searchChange () {
searchChange() {
this.onLoad(this.page);
},
searchReset () {
searchReset() {
this.query = {};
this.page.currentPage = 1;
this.onLoad(this.page);
},
handleSubmit () {
handleSubmit() {
if (!this.form.id) {
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
});
} else {
@ -534,55 +570,57 @@ export default {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
})
});
}
},
//自提
handlePickUpStore(){
handlePickUpStore() {
this.loading = true;
// console.log("this.query",this.query);
let params = {};
this.query.typeService = '1';
getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
});
getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(
res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
}
);
},
handleAdd () {
this.title = '新增'
this.form = {}
this.box = true
handleAdd() {
this.title = '新增';
this.form = {};
this.box = true;
},
handleEdit (row) {
this.title = '编辑'
this.box = true
handleEdit(row) {
this.title = '编辑';
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
handleView (row) {
this.title = '查看'
handleView(row) {
this.title = '查看';
this.view = true;
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
handleDelete () {
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
this.$message.warning('请选择至少一条数据');
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(this.ids);
@ -591,16 +629,16 @@ export default {
this.selectionClear();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
});
},
rowDel (row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(row.id);
@ -608,33 +646,33 @@ export default {
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
});
},
beforeClose (done) {
done()
beforeClose(done) {
done();
this.form = {};
this.view = false;
},
selectionChange (list) {
selectionChange(list) {
// console.log("添加阿斯顿发生",list);
this.selectionList = list;
},
selectionClear () {
selectionClear() {
this.selectionList = [];
// this.$refs.table.clearSelection();
},
currentChange (currentPage) {
currentChange(currentPage) {
this.page.currentPage = currentPage;
this.onLoad(this.page);
},
sizeChange (pageSize) {
sizeChange(pageSize) {
this.page.pageSize = pageSize;
this.onLoad(this.page);
},
onLoad (page, params = {}) {
onLoad(page, params = {}) {
this.loading = true;
this.query.genre = 1;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
@ -644,8 +682,8 @@ export default {
this.loading = false;
this.selectionClear();
});
}
}
},
},
};
</script>
<style scoped>

2
src/views/distribution/inventory/distrilbutionBillLading.vue
Unescape View File

@ -314,7 +314,7 @@
:total="pageStock.total"
>
</el-pagination>
</div>
</div>
<template #footer>
<span class="dialog-footer">

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

@ -391,6 +391,130 @@
</el-tab-pane>
</template>
</el-tabs>
<!-- 增值服务信息 -->
<el-divider content-position="left">增值服务信息</el-divider>
<el-tabs
v-loading="editLoading"
element-loading-text="数据正在更新中..."
type="border-card"
@tab-click="tabClickB"
>
<template v-for="(item, indexS) in TabB" :key="item.name">
<el-tab-pane :label="item.label" :name="item.name">
<template v-for="(itemT, index) in TabTitle" :key="index">
<div v-if="index == TabIndex" class="tab-title">
<span v-for="item in itemT" :key="item.name">
<el-icon><component :is="item.icon" /></el-icon> {{ item.name }} {{ item.value }}
{{ item.tap }}
</span>
</div>
</template>
<div class="el-Cart">
<!-- 表格列开始 -->
<el-table
:data="dataAdded"
row-key="name"
border
height="500"
style="width: 100%"
ref="tableRef"
@select-all="selectAll"
@select="selectChange"
>
<el-table-column type="selection" width="55" fixed />
<el-table-column
type="index"
fixed
width="50"
height="100"
label="#"
align="center"
/>
<!--
Type ===1 普通文本
Type ===2 图片显示
Type ===3 操作功能
label: 标题
width: 宽度
prop: 数据字段
-->
<el-table-column
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
align="center"
v-for="(item, index) in menuDataB"
:key="item.label"
>
<template #default="props">
<img :src="props.row[item.prop]" class="el-Img" v-if="item.type === 2" />
<!-- <div :class="ElBtnClass" v-if="item.type === 3">
<el-button
:link="ElButtonS[0].link"
:class="ElButtonS[0].class"
:auto-insert-space="ElButtonS[0].space"
:size="ElButtonS[0].size"
:icon="ElButtonS[0].icon"
@click="DeleteEvent(scope.row)"
>删除</el-button
>
<el-button
:link="ElButtonS[1].link"
:class="ElButtonS[1].class"
:auto-insert-space="ElButtonS[1].space"
:size="ElButtonS[1].size"
:icon="ElButtonS[1].icon"
@click="EditEvent(scope.row)"
>编辑</el-button
>
<el-button
:link="ElButtonS[2].link"
:class="ElButtonS[2].class"
:auto-insert-space="ElButtonS[2].space"
:size="ElButtonS[2].size"
:icon="ElButtonS[2].icon"
@click="ViewEvent(scope.row)"
>查看</el-button
>
</div> -->
<span v-else>{{ props.row[item.prop] ? props.row[item.prop] : '/' }}</span>
</template>
</el-table-column>
<template>
<el-table-column
v-if="item.head"
fixed="right"
label="操作"
width="280"
align="center "
>
<!-- <template #default="scope">
</template> -->
</el-table-column>
</template>
</el-table>
<!-- 表格翻页功能 -->
<!-- <div class="demo-pagination-block">
<el-pagination
v-model:current-page="currentPage"
v-model:page-size="pageSize"
:page-sizes="pageList"
:disabled="disabled"
:background="background"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
@size-change="PageSizeChange"
@current-change="SizeChange"
/>
</div> -->
</div>
</el-tab-pane>
</template>
</el-tabs>
</el-card>
</template>
@ -401,10 +525,11 @@ import {
getDetail,
signforPackageList,
signforInventoryList,
addvalueInfoList,
} from '@/api/distribution/distributionSignfor';
import { getToken } from '@/utils/auth';
const form = ref({}); //基础信息
const RouterId = ref(); //编辑ID
const RouterId = ref('1721707916601487362'); //编辑ID
const DoorstepPhoto = ref([]); // 上门照
const StackingPhoto = ref([]); // 堆门照
const FragilePhotos = ref([]); // 易碎照
@ -413,6 +538,7 @@ const SignForPhotos = ref([]); //签收照
const data = ref([]); //表格数据展示切换
const InitializeTable = ref([]); //初始化展示信息（不可被修改）
const menuData = ref([]); //表格头部
const menuDataB = ref([]); //增值服务表格头部
const editLoading = ref(false); //表格切换加载
const currentPage = ref(1); // 默认页码
const pageSize = ref(30); // 默认每一页几条
@ -420,19 +546,21 @@ const total = ref(0); //页码总页数
const pageList = ref([5, 10, 50, 100, 200]); // 选择每页显示多少条
const background = ref(true); // 是否开启背景颜色
const disabled = ref(false); // 是否禁止使用页码功能
const dialogImageUrlA = ref('');
const dialogImageUrlA = ref('');
const dialogImageUrlB = ref('');
const dialogImageUrlC = ref('');
const dialogImageUrlD = ref('');
const dialogImageUrlE = ref('');
const dialogImageUrlC = ref('');
const dialogImageUrlD = ref('');
const dialogImageUrlE = ref('');
const dialogVisibleA = ref(false); //是否显放大图片
const dialogVisibleB = ref(false);
const dialogVisibleC = ref(false);
const dialogVisibleD = ref(false);
const dialogVisibleE = ref(false);
const dialogVisibleB = ref(false);
const dialogVisibleC = ref(false);
const dialogVisibleD = ref(false);
const dialogVisibleE = ref(false);
const active = ref(1); //签收状态
const route = useRoute();
const router = useRouter();
const router = useRouter(); //参数ID
const dataAdded = ref([]); //增值服务表格渲染参数
const TabIndex = ref(0); //增值服务标题默认显示
const enlargeImage = (dialogImageUrl, dialogVisible) => {
return uploadFile => {
console.log(uploadFile, '点击放大的内容');
@ -461,6 +589,74 @@ const Tabs = ref([
name: '2',
},
]);
// 增值服务标题栏
const TabB = ref([
{
label: '上楼',
name: '0',
},
{
label: '超区',
name: '1',
},
{
label: '平移',
name: '2',
},
{
label: '搬运',
name: '3',
},
{
label: '分拣',
name: '4',
},
{
label: '专车',
name: '5',
},
]);
const TabTitle = ref([
// 上楼
[
{ name: '操作人:', value: '汤建军', tap: null, icon: 'Avatar' },
{ name: '楼层:', value: 5, tap: '层', icon: 'School' },
{ name: '件数:', value: 13, tap: '件', icon: 'Box' },
{ name: '费用:', value: 999.9, tap: '￥', icon: 'Coin' },
// 超区
],
[
{ name: '操作人:', value: '曹遇宗', tap: null, icon: 'Avatar' },
{ name: '公里数:', value: 15, tap: '公里', icon: 'Van' },
{ name: '件数:', value: 13, tap: '件', icon: 'Box' },
{ name: '费用:', value: 888.9, tap: '￥', icon: 'Coin' },
],
// 平移
[
{ name: '公里数:', value: 15, tap: '公里', icon: 'Van' },
{ name: '件数:', value: 13, tap: '件', icon: 'Box' },
{ name: '费用:', value: 888.9, tap: '￥', icon: 'Coin' },
],
// 搬运
[
{ name: '操作人:', value: '漆标', tap: null, icon: 'Avatar' },
{ name: '件数:', value: 15, tap: '', icon: 'Box' },
{ name: '费用:', value: 13, tap: '￥', icon: 'Coin' },
{ name: '班组:', value: 888.9, tap: null, icon: 'ScaleToOriginal' },
],
// 分拣
[
{ name: '操作人:', value: '小马', tap: null, icon: 'Avatar' },
{ name: '件数:', value: 15, tap: '公里', icon: 'Box' },
{ name: '费用:', value: 13, tap: '￥', icon: 'Coin' },
],
// 专车
[
{ name: '操作人:', value: '小东', tap: null, icon: 'Avatar' },
{ name: '件数:', value: 15, tap: '公里', icon: 'Box' },
{ name: '费用:', value: 13, tap: '￥', icon: 'Coin' },
],
]);
// 订单列表
const menuData1 = ref([
{
@ -619,18 +815,18 @@ const menuData1 = ref([
head: true,
},
{
prop: 'customerTelephone',
prop: 'customerAddress',
label: '终端收获地址',
type: 4,
values: '',
width: '350',
width: '400',
checkarr: [],
fixed: false,
sortable: true,
head: true,
},
{
prop: 'customerAddress',
prop: 'customerTelephone',
label: '终端收获电话',
type: 4,
values: '',
@ -1102,12 +1298,73 @@ const ElButtonS = ref([
table: '删除',
},
]);
// menuDataB 增值服务公共表头
const menuDataB1 = ref([
{
prop: 'orderCode',
label: '订单自编号',
type: 4,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: true,
},
{
prop: 'materialName',
label: '货物名称',
type: 4,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: true,
},
{
prop: 'orderPackageCode',
label: '包条码',
type: 4,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: true,
},
{
prop: 'quantity',
label: '数量',
type: 4,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: true,
},
{
prop: 'conditions',
label: '包条类型',
type: 4,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: true,
},
]);
// 页面初始化需要请求的参数
const onLoad = () => {
menuData.value = menuData1.value; //页面初始化默认显示第一个表格
data.value = InitializeTable.value; //默认显示第一个表格数据
};
RouterId.value = route.query.id; //获取当前路由参数ID
// RouterId.value = route.query.id; //获取当前路由参数ID
console.log(route.query.id, '当前路由参数');
// 图片上传必须携带TOKEN
const headers = computed(() => {
@ -1197,6 +1454,24 @@ const tabClick = val => {
break;
}
};
// 上楼
const goUpstairs = () => {
addvalueInfoList({
addvalueId: 1,
signforId: RouterId.value,
}).then(res => {
dataAdded.value = res.data.data.packageEntityList;
console.log(res, '增值服务上楼的返回值');
});
};
// 增值服务信息tab切换
const tabClickB = val => {
TabIndex.value = val.props.name;
if (val.props.name == 0) {
menuDataB.value = menuDataB1.value;
goUpstairs();
}
};
//商品信息切换
const switchTableFields = fields => {
menuData.value = fields; //切换表格展示字段
@ -1341,4 +1616,14 @@ const ImgSuccessE = (response, uploadFile) => {
width: 100%;
}
}
.tab-title {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 10px;
span {
display: flex;
align-items: center;
}
}
</style>

0
src/views/distribution/signfor/distributionSignforedtYL.vue → src/views/distribution/signfor/distributionSignforedtDT.vue
Unescape View File

4
src/views/distribution/signfor/distributionSignfortreat.vue
Unescape View File

@ -478,7 +478,7 @@ import dayjs from 'dayjs';
import { getDeliveryListExport } from '@/api/distribution/distributionDeliveryList';
import { downloadXls } from '@/utils/util';
import { getToken } from '@/utils/auth';
import { ElMessage } from 'element-plus'
import { ElMessage } from 'element-plus';
export default {
data() {
return {
@ -494,7 +494,6 @@ export default {
dialogVisibleC: false,
dialogVisibleD: false,
dialogVisibleE: false,
TcForm: {}, //弹窗表单
// 上门照
DoorstepPhoto: [],
@ -1944,7 +1943,6 @@ export default {
},
};
</script>
<style scoped lang="scss">
.el-fr-zy {
display: flex;

7
src/views/distribution/turndelivery/deliveryDiscuss.vue
Unescape View File

@ -490,7 +490,7 @@
:height="searchSo ? '480' : '550'"
style="width: 100%"
ref="tableRefs"
@select-all="selectAll"
@select-all="TCselectAll"
@select="selectChange"
v-loading="loading"
element-loading-text="数据正在更新中..."
@ -1715,6 +1715,11 @@ const CheckBox = (scope, type: number) => {
const selectAll = val => {
console.log(val);
};
// 弹窗全选
const TCselectAll = val => {
console.log(val, '弹窗全选框');
dataTmp.value=val
};
// 弹窗表格单个选中触发事件
const selectChange = (selection, row) => {
// 把选择的数据放到临时存储里面

3
src/views/system/user.vue
Unescape View File

@ -1111,4 +1111,7 @@ export default {
:deep(.el-form-item__label){
width:auto !important;
}
:deep(.el-row){
flex-direction: row !important;
}
</style>

Write Preview
Loading…
Cancel
Save