You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

763 lines
27 KiB

Squashed commit of the following: commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo <wan.ren@foxmail.com> Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo <wan.ren@foxmail.com> Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js
2 years ago
<template>
<basic-container>
<div class="avue-crud">
<el-row :hidden="!search" style="margin-bottom: 5%">
<!-- 列表模块 -->
<el-table ref="table" v-loading="loading"
:data="data"
height="20%"
style="width: 100%"
:border="option.border">
<template v-for="(item,index) in option.columnBasic">
<!-- 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>
</el-row>
<!-- <el-row style="margin-bottom: 5%">
&lt;!&ndash; 列表模块 &ndash;&gt;
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
height="20%"
style="width: 100%"
:border="option.border">
<template v-for="(item,index) in option.columnTakeOver">
&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>
</el-table>
</el-row>
<el-row style="margin-bottom: 5%">
&lt;!&ndash; 列表模块 &ndash;&gt;
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data"
style="width: 100%"
:border="option.border">
<template v-for="(item,index) in option.columnStockUp">
&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>
</el-table>
</el-row>-->
<el-row>
<el-tabs
type="card"
class="demo-tabs"
style="width: 100%"
v-model="activeName"
@tab-click="handleClick"
>
<el-tab-pane label="预约列表" name="reservation">
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data3"
: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.columnReservation">
<!-- 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}">-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page3.currentPage"
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="page3.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page3.total">
</el-pagination>
</div>
</el-tab-pane>
<el-tab-pane label="订单列表" name="library">
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="dataPare"
: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.columnStockOrder">
<!-- 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}">-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<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="[10, 20, 30, 40, 50, 100]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
</el-pagination>
</div>
</el-tab-pane>
<el-tab-pane label="备货包件" name="outbound">
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data1"
: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.columnStockingBag">
<!-- 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>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page1.currentPage"
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="page1.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page1.total">
</el-pagination>
</div>
</el-tab-pane>
<el-tab-pane label="库存品" name="enter">
<el-table ref="table" v-loading="loading"
@selection-change="selectionChange"
:data="data2"
:height="height"
style="width: 100%"
:border="option.border">
<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.columnInventory">
<!-- 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>
<div class="avue-crud__pagination" style="width:100%">
<!-- 分页模块 -->
<el-pagination align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page2.currentPage"
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="page2.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page2.total">
</el-pagination>
</div>
</el-tab-pane>
</el-tabs>
</el-row>
<!-- <el-row>
<div class="avue-crud__pagination" style="width:100%">
&lt;!&ndash; 分页模块 &ndash;&gt;
<el-pagination align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
:current-page="page.currentPage"
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
</el-pagination>
</div>
</el-row>-->
<el-dialog v-model="dialogFormCustomer" title="修改客户信息">
<el-form :model="formCustomer">
<el-form-item label="姓名" :label-width="formLabelWidth">
<el-input v-model="formCustomer.name" autocomplete="off" />
</el-form-item>
<el-form-item label="电话" :label-width="formLabelWidth">
<el-input v-model="formCustomer.phone" autocomplete="off" />
</el-form-item>
<el-form-item label="地址" :label-width="formLabelWidth">
<el-input
v-model="formCustomer.address"
:rows="2"
type="textarea"
placeholder="请填写地址"
/>
</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>
</template>
</el-dialog>
</div>
</basic-container>
</template>
<script>
import {
getList,
getDetail,
add,
update,
remove,
getDetailStockupOwn,
getDetailReservationOwn, getDetailOrderOwn, getDetailInventoryOwn
} from '@/api/distribution/distributionStockup';
import option from "@/option/distribution/distributionStockup";
import { mapGetters } from "vuex";
import { getDictionaryBiz } from '@/api/system/dict';
import { getParcelListOwn } from '@/api/distribution/distributionParcelList';
export default {
data () {
return {
height: 0,
activeName: 'reservation',
// 弹框标题
title: '',
// 是否展示弹框
box: false,
// 是否显示查询
search: true,
// 加载中
loading: true,
// 是否为查看模式
view: false,
// 查询信息
query: {},
// 分页信息
page: {
currentPage: 1,
pageSize: 10,
total: 40
},
// 分页信息
page1: {
currentPage: 1,
pageSize: 10,
total: 40
},
// 分页信息
page2: {
currentPage: 1,
pageSize: 10,
total: 40
},
// 分页信息
page3: {
currentPage: 1,
pageSize: 10,
total: 40
},
// 表单数据
form: {},
formCall: {},// 通知
formService: {}, // 服务
formCustomer: {}, // 客户
// 选择行
selectionList: [],
// 表单配置
option: option,
// 表单列表
data: [],
data1: [],
data2: [],
dataPare: [],
data3: [],
distributionType: [],
serveTypeList: [],
deliveryWayList: [],
stockupStatusList: [],
dialogTableVisible: false,
dialogFormVisible: false,
dialogFormCustomer: false,
dialogFormService: false,
formLabelWidth: '120px',
handler:true, //首次
trade:false, // 商
municipal:true, // 市
taker:true, // 自提
}
},
mounted () {
this.init();
},
watch:{
'$route.query.id':{
handler(newVal, oldVal) {
// console.log(newVal, oldVal);
this.init();
},
deep: true,
immediate: true
}
},
computed: {
...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)
};
},
ids () {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
},
methods: {
handleClick (tab, event) {
console.log(tab, event)
console.log(tab.props.name);
this.leibiao = tab.props.name;
if( this.leibiao == 'library'){
//订单
this.getOrderList(this.page);
}else if( this.leibiao == 'outbound'){
//包件
this.getStockUpParcelsList(this.page1);
}else if( this.leibiao == 'enter'){
//库存品
this.getInventoryList(this.page2);
}
},
init () {
this.height = this.setPx(document.body.clientHeight - 570);
getDictionaryBiz('distribution_type').then(res => { //配送类型
this.distributionType = res.data.data;
});
// console.log("配送方式123", this.deliveryWayList);
Squashed commit of the following: commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo <wan.ren@foxmail.com> Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo <wan.ren@foxmail.com> Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js
2 years ago
getDictionaryBiz('delivery_way').then(res => { //配送方式
this.deliveryWayList = res.data.data;
console.log("配送方式123", this.deliveryWayList);
Squashed commit of the following: commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo <wan.ren@foxmail.com> Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo <wan.ren@foxmail.com> Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js
2 years ago
});
getDictionaryBiz('stockup_status').then(res => { //配送方式
this.stockupStatusList = res.data.data;
});
getDictionaryBiz('addvalue_serve_type').then(res => { //服务类型
this.serveTypeList = res.data.data;
});
this.onLoad(this.page);
},
searchHide () {
this.search = !this.search;
},
searchChange () {
this.onLoad(this.page);
},
searchReset () {
this.query = {};
this.page.currentPage = 1;
this.onLoad(this.page);
},
handleSubmit () {
if (!this.form.id) {
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
} else {
update(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
})
}
},
//全部
handleEntire(){
this.handler = true;
this.taker = true;
this.trade = false;
},
//商配
handleTrade(){
// this.handler = true;
this.trade = true;
},
//商配
handleMunicipal(){
// this.handler = true;
// this.taker = true;
},
//自提
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();
this.handler = false;
this.taker = false;
});
}, //自提的通知
handleInform(index){
this.loading = true;
// console.log("this.query",this.query);
let params = {};
this.query.typeService = '1';
switch (index) {
case '1':
this.query.notification = index;
break;
case '2':
this.query.notification = index;
break;
}
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();
this.handler = false;
this.taker = false;
});
},
handleAdd () {
this.title = '新增'
this.form = {}
this.box = true
},
handleEdit (row) {
this.title = '编辑'
this.box = true
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
handleView (row) {
this.title = '查看'
this.view = true;
this.box = true;
getDetail(row.id).then(res => {
this.form = res.data.data;
});
},
handleDelete () {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.selectionClear();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
rowDel (row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
beforeClose (done) {
done()
this.form = {};
this.view = false;
},
selectionChange (list) {
// console.log("添加阿斯顿发生",list);
this.selectionList = list;
},
selectionClear () {
this.selectionList = [];
// this.$refs.table.clearSelection();
},
currentChange (currentPage) {
if(!!this.leibiao && this.leibiao == 'library'){
this.page.currentPage = currentPage;
this.getOrderList(this.page);
}else if(!!this.leibiao && this.leibiao == 'outbound'){
this.page1.currentPage = currentPage;
this.getStockUpParcelsList(this.page1);
}
else if(!!this.leibiao && this.leibiao == 'enter'){
this.page2.currentPage = currentPage;
this.getInventoryList(this.page2);
}
else {
this.page3.currentPage = currentPage;
this.getReservationList(this.page3);
}
},
sizeChange (pageSize) {
if(!!this.leibiao && this.leibiao == 'library'){
this.page.pageSize = pageSize;
this.getOrderList(this.page);
}else if(!!this.leibiao && this.leibiao == 'outbound'){
this.page1.pageSize = pageSize;
this.getStockUpParcelsList(this.page1);
}
else if(!!this.leibiao && this.leibiao == 'enter'){
this.page2.pageSize = pageSize;
this.getInventoryList(this.page2);
}
else{
this.page3.pageSize = pageSize;
this.getReservationList(this.page3);
}
},
onLoad (page, params = {}) {
this.loading = true;
this.query.id = this.$route.query.id;
getDetailStockupOwn(this.$route.query.id).then(res => {
console.log("返回的值",res.data.data);
Squashed commit of the following: commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo <wan.ren@foxmail.com> Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo <wan.ren@foxmail.com> Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js
2 years ago
const data = res.data.data;
this.data[0] = data;
const { serveType, deliveryWay, deliveryType } = this.data[0];
2 years ago
const serveTypes = !!serveType ? serveType.split(',') : null;
const deliveryWays = !!deliveryWay ? deliveryWay.split(',') : null;
const deliveryTypes = !!deliveryType ? deliveryType.split(',') : null;
const serveTypeName =!!serveTypes ? this.getOwnServer(serveTypes, '', this.serveTypeList) || null : null;
const deliveryWayName =!!deliveryWays ? this.getOwnServer(deliveryWays, '', this.deliveryWayList) || null : null;
const deliveryTypeName =!!deliveryTypes ? this.getOwnServer(deliveryTypes, '', this.distributionType) || null : null;
Squashed commit of the following: commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo <wan.ren@foxmail.com> Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo <wan.ren@foxmail.com> Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js
2 years ago
Object.assign(this.data[0], {
serveTypeName,
deliveryWayName,
deliveryTypeName
});
this.loading = false;
this.getReservationList(page);
// console.log(">>>>>",this.data[0],deliveryTypeName,deliveryWayName,serveTypeName);
this.selectionClear();
});
} ,
//查询预约列表
async getReservationList(page){
let a =await getDetailReservationOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
console.log("......",a.data);
Squashed commit of the following: commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo <wan.ren@foxmail.com> Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo <wan.ren@foxmail.com> Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js
2 years ago
const data = a.data.data;
this.data3 = data.records;
Squashed commit of the following: commit bb7cdb8d1e6c95cbc9150cec2d3634a4e1554180 Merge: fab70c4 cbb2a85 Author: big-y <804609860@qq.com> Date: Fri Aug 11 09:35:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/views/distribution/inventory/distributionStockArticleDetails.vue commit cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 22:14:50 2023 +0800 修改订单详细字段 commit 7b99fabb027b28d8f307b79ef71bf8c9b08d1566 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 21:36:15 2023 +0800 修改订单查询条件 commit 3d9a02978df8e0115cbead4d5b58171985a39791 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 20:41:59 2023 +0800 修改客户信息编辑编码校验 commit d8aa2f2c1d693721c4412cf238dbff106c5a1e7e Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 19:39:39 2023 +0800 修改客户服务仓添加 commit fab70c4b27fbbe5e77133ca5902b75ec65a3d8c7 Author: big-y <804609860@qq.com> Date: Thu Aug 10 19:11:23 2023 +0800 标签渲染 commit ae4f8315959741b7db778804919b24825bb42f0d Author: big-y <804609860@qq.com> Date: Thu Aug 10 18:49:31 2023 +0800 标签渲染 commit 9cca1d753a662e4c7dcaa57573e81668c0d55624 Merge: 9aa102a b2e7078 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:30:00 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9aa102af6dcb6a45cc6263641ef4b83fa46e0ed6 Author: caoyizhong <1270296080@qq.com> Date: Thu Aug 10 17:29:35 2023 +0800 修改班组添加操作 commit 5cbd76720706977e143a8419fd1af3e7f2fc8d1c Author: big-y <804609860@qq.com> Date: Thu Aug 10 16:19:29 2023 +0800 标签渲染 commit b2e7078fbe3297fffaa54926e533f809f2ac6546 Merge: 553e8d3 37356e4 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:33:28 2023 +0800 Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev commit 553e8d3c4e0f7474c8d6e5f8a667a504ec6eab60 Author: pref_mail@163.com <123456> Date: Thu Aug 10 14:32:55 2023 +0800 没有修改二维码包间生成 commit 37356e4d770abad99969e7fd25b5f27d8a6f3517 Author: 0.0 <1092404103.qq.com> Date: Thu Aug 10 09:08:11 2023 +0800 1.隐藏按钮 commit 1272b45ea75a3c1a1ffa7411a55972dade77e8df Author: kilo <wan.ren@foxmail.com> Date: Wed Aug 9 21:56:21 2023 +0800 订单新增调整 commit e3c6e255ffbda3ff7d823b9014855ac1419b607e Author: 0.0 <1092404103.qq.com> Date: Wed Aug 9 21:40:34 2023 +0800 1.物料导出导入,托盘报损 commit b598c7054284296ec7ebe5fd73ef19b324dd18aa Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 21:02:55 2023 +0800 修改批量补充物料 commit 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 15:56:56 2023 +0800 添加订单字段 commit 921ea4ffd0d7689f517a3c7da529500352681053 Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 14:02:16 2023 +0800 添加三方物料 commit d78b8a9da4bbba55cd44afac088abd2fc1d5c6ea Merge: 1b1efea 454ce4c Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1b1efea6a5327ee0375fe5596c4dddb803a48f1a Author: caoyizhong <1270296080@qq.com> Date: Wed Aug 9 11:30:31 2023 +0800 修改文字提醒
2 years ago
if(!!this.data3 && this.data3.length > 0){
this.data3.forEach(i =>{
let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus);
if(!!b){
i.stockupStatusName = b.dictValue;
}
})
}
Squashed commit of the following: commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo <wan.ren@foxmail.com> Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo <wan.ren@foxmail.com> Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js
2 years ago
this.page3.total = a.data.data.total;
this.loading = false;
this.selectionClear();
},
//查询包件列表
async getStockUpParcelsList(page){
let a = await getParcelListOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
console.log("包件...",a.data);
Squashed commit of the following: commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo <wan.ren@foxmail.com> Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo <wan.ren@foxmail.com> Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js
2 years ago
const data = a.data.data;
this.data1 = data.records;
this.data1.forEach(i =>{
let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus);
if(!!b){
i.stockupStatusName = b.dictValue;
}
})
this.page1.total = a.data.data.total;
this.loading = false;
this.selectionClear();
},
//查询订单列表
async getOrderList(page){
let a =await getDetailOrderOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
// console.log("订单...",a.data);
Squashed commit of the following: commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo <wan.ren@foxmail.com> Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo <wan.ren@foxmail.com> Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js
2 years ago
const data = a.data.data;
this.dataPare = data.records;
this.dataPare.forEach(i =>{
let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus);
if(!!b){
i.stockupStatusName = b.dictValue;
}
})
this.page.total = a.data.data.total;
this.loading = false;
this.selectionClear();
},
//查询库存品列表
async getInventoryList(page){
let a =await getDetailInventoryOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
// console.log("库存品...",a.data);
Squashed commit of the following: commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo <wan.ren@foxmail.com> Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo <wan.ren@foxmail.com> Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js
2 years ago
const data = a.data.data;
this.data2 = data.records;
this.data2.forEach(i =>{
let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus);
if(!!b){
i.stockupStatusName = b.dictValue;
}
})
this.page2.total = a.data.data.total;
this.loading = false;
this.selectionClear();
},
//转换类型
getOwnServer(row,name,list){
// console.log(">>>>>",row,name,list);
// console.log(">>>>>",row);
// console.log(">>>>>",name);
// console.log(">>>>>",list);
Squashed commit of the following: commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo <wan.ren@foxmail.com> Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo <wan.ren@foxmail.com> Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js
2 years ago
row.forEach( i =>{
// console.log(i,"-=-=-=-");
Squashed commit of the following: commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo <wan.ren@foxmail.com> Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo <wan.ren@foxmail.com> Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js
2 years ago
let a = list.find( s => s.dictKey == i);
// console.log("aaaa",a);
if(!!a){
name += a.dictValue;
}
Squashed commit of the following: commit 90291a00b04155608041d88f7b7b8d88b55bb318 Merge: be19329 ee582b8 Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:25 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit be1932929cf12e3e061d49c663381af50cea1dfa Author: caoyizhong <1270296080@qq.com> Date: Mon Jul 24 09:45:19 2023 +0800 修改备货详情分页 commit ee582b870f1382e394f43a745fcff62a8f9c907d Author: kilo <wan.ren@foxmail.com> Date: Mon Jul 24 09:37:21 2023 +0800 商配订单编辑按钮功能 commit 69e78881de7d88bf71f5eed0e2448ed00e326295 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 18:18:28 2023 +0800 修改备货查询页面 commit 1f88807491dc926b7ba2bceb31b597625d589c82 Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 16:38:46 2023 +0800 完成对客户仓库的绑定 commit 5115291ed0f71450c509b26f932d271e3807a64f Author: ‘chaoosc’ <‘chaoosc@gmail.com’> Date: Sat Jul 22 15:48:57 2023 +0800 修改服务仓绑定 commit 2e91cd33f73690aabe1d7ded6f0034df67f4f119 Author: pref_mail@163.com <123456> Date: Sat Jul 22 14:27:45 2023 +0800 增加未客户指定服务仓库 commit 27bad3bf5e511e724290b8713c8419ff45ad3547 Author: caoyizhong <1270296080@qq.com> Date: Sat Jul 22 10:47:18 2023 +0800 修改备货页面 commit 90216258bfe6cac9216b656b9f6650003e445c42 Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Fri Jul 21 08:57:04 2023 +0800 修改客户列表bug commit b47b37d5a5057fa4e7ba691ca71194b7d28f7235 Merge: a36232b 64a011b Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a36232b89bec58b13c05dcec0f218b5efbc0783d Author: caoyizhong <1270296080@qq.com> Date: Thu Jul 20 20:35:08 2023 +0800 修改添加备货页面 commit 64a011b966b85a494a1b385d316e8f7c26560cec Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 19:00:42 2023 +0800 托盘、货位增加老系统数据维护 commit d2cec50b73fc4a2254fba1ec32efe6f76137622b Merge: 886221c cd7883d Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 18:59:38 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cd7883da6994a9b89bfd807deb6ad49e301588f6 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 18:15:04 2023 +0800 1.库存品详情 commit 886221c46b13b7a8f291c85842d1c60c44dab0c4 Merge: 8869a82 c3a675b Author: kilo <wan.ren@foxmail.com> Date: Thu Jul 20 17:33:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c3a675b9f61fc672a2e0bcec4ea2f2ea07a0b15b Author: zhenghaoyu <zhenghaoyu@superbgrace.com> Date: Thu Jul 20 09:55:37 2023 +0800 在库运单功能模块提交 commit 67f50c40e1d93f6521fb2e2ac7ecfaa6047edb53 Author: 0.0 <1092404103.qq.com> Date: Thu Jul 20 08:58:19 2023 +0800 1.文员签收时间 commit 8869a82210e04b460d73b9e5d15c3aa4b73ed8d5 Author: kilo <wan.ren@foxmail.com> Date: Wed Jul 19 19:00:24 2023 +0800 预约查看页面 commit b51ac6154176b6eb11dfc31400434066fbe7f85d Merge: cdbe2c9 2db4ddc Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit cdbe2c90ad65a6d8356a70140c278fad40adb943 Author: 0.0 <1092404103.qq.com> Date: Wed Jul 19 18:13:28 2023 +0800 1.原型修改 commit 2db4ddcc230b99d1ba1385e3384f08c6fb147062 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 18:09:19 2023 +0800 修改库存品查看页面 commit 95d1eef069ff23f7038a027c2cfdf3b02996ca72 Author: caoyizhong <1270296080@qq.com> Date: Wed Jul 19 11:02:20 2023 +0800 修改库存品页面 # Conflicts: # vite.config.js
2 years ago
});
return name;
},
}
};
</script>
<style scoped>
.el-button--text {
margin-right: 15px;
}
.el-select {
width: 300px;
}
.el-input {
width: 300px;
}
.dialog-footer button:first-child {
margin-right: 10px;
}
</style>