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

1.修改接口

fix_bug_pro20231227
0.0 2 years ago
parent
9fc638dcd3
commit
33d5d10e9a
3 changed files with 66 additions and 311 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/api/basicdata/basicdataGoodsAllocation.js
  2. 14
      src/views/warehouse/parcelList/distributionParcelList.vue
  3. 361
      src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

2
src/api/basicdata/basicdataGoodsAllocation.js
Unescape View File

@ -51,7 +51,7 @@ export const add = (row) => {
export const update = (row) => {
return request({
url: '/api/logpm-warehouse/goodsAllocation/update',
url: '/api/logpm-warehouse/warehouseGoodsAllocation/update',
method: 'post',
data: row
})

14
src/views/warehouse/parcelList/distributionParcelList.vue
Unescape View File

@ -50,13 +50,13 @@
</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-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>
</el-row>
<el-row>

361
src/views/warehouse/warehousesignedorder/distributionStockArticle.vue
Unescape View File

@ -16,37 +16,11 @@
</el-form>
</el-row>
<el-row>
<!-- <div class="avue-crud__header">
&lt;!&ndash; 头部左侧按钮模块 &ndash;&gt;
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleTrade" v-if="handler && taker || handler && trade"> 商配</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleMunicipal" v-if="handler && taker || handler && trade">市配</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handlePickUpStore" v-if="permission.stockArticle_add && handler && !trade || permission.stockArticle_add && !taker" >自提</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleEntire" >全部</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleInform('2')" v-if = "!handler && !taker">未通知</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleInform('1')" v-if = "!handler && !taker">已通知</el-button>
</div>
&lt;!&ndash; 头部右侧按钮模块 &ndash;&gt;
&lt;!&ndash; <div class="avue-crud__right">&ndash;&gt;
&lt;!&ndash; <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>&ndash;&gt;
&lt;!&ndash; <el-button icon="el-icon-search" @click="searchHide" circle></el-button>&ndash;&gt;
&lt;!&ndash; </div>&ndash;&gt;
</div>-->
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if = "handler">创建异常</el-button>-->
<!-- <el-button type="danger" icon="el-icon-edit" @click="handleMoke" v-if = "handler">转预约单</el-button>-->
<!-- <el-button type="primary" icon="el-icon-edit" @click="handleStockList" v-if = "handler">批量加配转库存品</el-button>-->
<!-- <el-button type="danger" icon="el-icon-edit" @click="handleCallDelivery('3')" v-if = "handler">修改客户信息</el-button>-->
<!-- <el-button type="danger" icon="el-icon-edit" @click="handleCallDelivery('2')" v-if = "handler">修改服务类型</el-button>-->
<!-- <el-button type="danger" icon="el-icon-plus" v-if = "handler">转配送</el-button>-->
</div>
<div class="avue-crud__left">
<!-- <el-button type="primary" icon="el-icon-plus" @click="handlebill" v-if = "!handler">创建提货单</el-button>-->
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1')" v-if = "!handler">再次通知</el-button>-->
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1')" v-if = "!handler">通知提货</el-button>-->
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
@ -89,208 +63,6 @@
</el-pagination>
</div>
</el-row>
<el-dialog v-model="dialogFormVisible" title="通知提货">
<el-form :model="formCall">
<el-form-item label="顾客姓名" :label-width="formLabelWidth">
<el-input v-model="formCall.customerName" autocomplete="off" />
</el-form-item>
<el-form-item label="顾客电话" :label-width="formLabelWidth">
<el-input v-model="formCall.customerTelephone" autocomplete="off" />
</el-form-item>
<el-form-item label="运单" :label-width="formLabelWidth">
<el-input v-model="formCall.waybill" autocomplete="off" />
</el-form-item>
<el-form-item label="跟进记录" :label-width="formLabelWidth">
<el-input
v-model="formCall.followUpRecord"
:rows="2"
type="textarea"
placeholder="请填写内容"
/>
</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>
</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-select v-model="formService.typeService" clearable placeholder="请选择服务类型">
<el-option
v-for="item in distributionType"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="费用" :label-width="formLabelWidth">
<el-input v-model="formService.cost" autocomplete="off" />
</el-form-item>
<el-form-item label="原因" :label-width="formLabelWidth">
<el-input
v-model="formService.cause"
:rows="2"
type="textarea"
placeholder="请填写原因"
/>
</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>
</template>
</el-dialog>
<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>
<!-- 表单模块 -->
<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-form-item>
<el-form-item label="订单自编号" prop="orderCode">
<el-input v-model="form.orderCode" placeholder="请输入订单自编号"/>
</el-form-item>
<el-form-item label="商场名称" prop="mallName">
<el-input v-model="form.mallName" placeholder="请输入商场名称"/>
</el-form-item>
<el-form-item label="货物名称" prop="descriptionGoods">
<el-input v-model="form.descriptionGoods" placeholder="请输入货物名称"/>
</el-form-item>
<el-form-item label="仓库" prop="warehouse">
<el-input v-model="form.warehouse" placeholder="请输入仓库"/>
</el-form-item>
<el-form-item label="入库时间" prop="warehouseEntryTime">
<!-- <el-input v-model="form.warehouseEntryTime" placeholder="请输入入库时间"/>-->
<el-date-picker
v-model="form.warehouseEntryTime"
type="datetime"
placeholder="请输入入库时间"
format="YYYY-MM-DD hh:mm:ss"
value-format="YYYY-MM-DD hh:mm:ss"
/>
</el-form-item>
<el-form-item label="在库时长" prop="storeTime">
<el-input v-model="form.storeTime" placeholder="请输入在库时长"/>
</el-form-item>
<el-form-item label="订单总件数" prop="totalNumber">
<el-input v-model="form.totalNumber" placeholder="请输入订单总件数"/>
</el-form-item>
<el-form-item label="在库件数" prop="handQuantity">
<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 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-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 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-form-item>
<el-form-item label="顾客电话" prop="customerTelephone">
<el-input v-model="form.customerTelephone" placeholder="请输入顾客电话"/>
</el-form-item>
<el-form-item label="顾客地址" prop="customerAddress">
<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 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 label="待配送" value="2">待配送</el-option>
<el-option label="配送" value="1">配送</el-option>
</el-select>
</el-form-item>
</el-form>
<!-- 表单按钮 -->
<template #footer>
<span v-if="!view" class="dialog-footer">
<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>
</el-dialog>
</div>
</basic-container>
<edittablehead
@ -525,28 +297,20 @@ export default {
],
fixed: false,
sortable: true,
},{
prop: 'allocation',
label: '货区-货位-货架',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},{
prop: 'resource',
label: '订单来源',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'allocation',
// label: '货区-货位-货架',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'trays',
label: '所在托盘',
prop: 'resource',
label: '订单来源',
type: 1,
values: '',
width: '150',
@ -554,25 +318,35 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'freezeStatusName',
label: '冻结状态',
type: 3,
values: '',
width: '150',
checkarr: [
// {
// value: '1',
// label: '已冻结',
// },
// {
// value: '0',
// label: '未冻结',
// },
],
fixed: false,
sortable: true,
},
// {
// prop: 'trays',
// label: '所在托盘',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'freezeStatusName',
// label: '冻结状态',
// type: 3,
// values: '',
// width: '150',
// checkarr: [
// // {
// // value: '1',
// // label: '已冻结',
// // },
// // {
// // value: '0',
// // label: '未冻结',
// // },
// ],
// fixed: false,
// sortable: true,
// },
{
prop: 'orderStatusName',
label: '订单状态',
@ -593,16 +367,16 @@ export default {
fixed: false,
sortable: true,
},
{
prop: 'stockupStatusName',
label: '备货状态',
type: 3,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
},
// {
// prop: 'stockupStatusName',
// label: '备货状态',
// type: 3,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
{
prop: 'completeSetName',
label: '是否齐套',
@ -702,36 +476,17 @@ export default {
fixed: false,
sortable: true,
},
// {
// prop: 'inventoryDate',
// label: '最新盘点时间',
// type: 1,
// values: '',
// width: '150',
// checkarr: [],
// fixed: false,
// sortable: true,
// },
// {
// prop: 'inventoryPerson',
// label: '盘点人',
// type: 1,
// prop: '',
// label: '操作',
// type: 6,
// values: '',
// width: '150',
// width: '230',
// checkarr: [],
// fixed: false,
// sortable: true,
// fixed: 'right',
// hide: true,
// },
{
prop: '',
label: '操作',
type: 6,
values: '',
width: '230',
checkarr: [],
fixed: 'right',
hide: true,
},
// 更多列的配置...
],
columnListedit: [],

Write Preview
Loading…
Cancel
Save