Skip to content

J
jiedao-app-operator-master
Commit 97a3043f authored by huhaiqing's avatar huhaiqing
Browse files
Options

装柜功能开发

parent e32d2198
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 607 additions and 178 deletions
src/api/ecw/boxSea.js
View file @ 97a3043f
...@@ -443,6 +443,82 @@ export function loadSecGoodsList(params) { ...@@ -443,6 +443,82 @@ export function loadSecGoodsList(params) {
}); });
} }
/**
* 订单装箱编号列表
*
* @export
* @param {*} data
* @return {*}
*/
export function orderTagList(data) {
return request({
url: "/ecw/box-load-info/orderTagList",
method: "post",
headers: { "Content-Type": "application/x-www-form-urlencoded" },
data: jsonToFormData(data),
});
}
/**
* 批量装柜
*
* @export
* @param {*} data
* @return {*}
*/
export function batchCreate(data) {
return request({
url: "/ecw/box-load-info/batchCreate",
method: "post",
data,
});
}
/**
* 批量删除已装柜标签
*
* @export
* @param {*} data
* @return {*}
*/
export function batchDelete(data) {
return request({
url: "/ecw/box-load-info/batchDelete",
method: "post",
data,
});
}
/**
* 移出
*
* @export
* @param {*} data
* @return {*}
*/
export function remove(data) {
return request({
url: "/ecw/box-load-info/remove",
method: "post",
data,
});
}
/**
* 修改柜信息
*
* @export
* @param {*} data
* @return {*}
*/
export function boxUpdate(data) {
return request({
url: "/ecw/box-load-info/boxUpdate",
method: "post",
data,
});
}
/***************************** 装柜 end **********************************/ /***************************** 装柜 end **********************************/
/** /**
......
src/views/ecw/box/shippingSea/nodePage/cabinet/index.vue
View file @ 97a3043f
...@@ -75,26 +75,22 @@ export default { ...@@ -75,26 +75,22 @@ export default {
onSubmit(operateType) { onSubmit(operateType) {
this.$refs["cabinetForm"].validate((valid) => { this.$refs["cabinetForm"].validate((valid) => {
if (valid) { if (valid) {
if (operateType === 2) {
const { currNode, shipmentObj } = this.$attrs;
const status = shipmentObj[currNode.keyName];
if (status !== 46) {
this.$message.error("请先进行装柜->审批->确认封柜");
return;
}
}
cabinetCreate({ cabinetCreate({
shipmentId: this.$attrs.shipmentObj.id, shipmentId: this.$attrs.shipmentObj.id,
...this.cabinetObj, ...this.cabinetObj,
operateType, operateType,
}).then((res) => { }).then((res) => {
if (operateType === 2) { serviceMsg(res, this).then(() => {
approvalCreate({ this.cancel("submit");
shipmentId: this.$attrs.shipmentObj.id, });
approvalStatus: 0,
approvalType: 2,
}).then((res) => {
serviceMsg(res, this).then(() => {
this.cancel("submit");
});
});
} else {
serviceMsg(res, this).then(() => {
this.cancel("submit");
});
}
}); });
} }
}); });
......
src/views/ecw/box/shippingSea/nodePage/preinstall.vue
View file @ 97a3043f
...@@ -120,41 +120,45 @@ ...@@ -120,41 +120,45 @@
<el-button type="primary" size="small" @click="foldTable(index, part)">{{part.fold ? '展开' : '收起'}}</el-button> <el-button type="primary" size="small" @click="foldTable(index, part)">{{part.fold ? '展开' : '收起'}}</el-button>
</div> </div>
</el-row> </el-row>
<el-table v-loading="preLoading" border :data="part.sectionGoodsList" v-show="!part.fold" @select="(selection)=>checkboxSelect(selection, part)" @select-all="(selection)=>checkboxSelect(selection, part)"> <el-collapse-transition>
<el-table-column type="selection" align="center" width="55" fixed="left" /> <div v-show="!part.fold">
<el-table-column label="订单号" align="center" prop="orderId" width="120" /> <el-table v-loading="preLoading" border :data="part.sectionGoodsList" @select="(selection)=>checkboxSelect(selection, part)" @select-all="(selection)=>checkboxSelect(selection, part)">
<el-table-column label="目的地" align="center" prop="destWarehouseName" width="120" /> <el-table-column type="selection" align="center" width="55" fixed="left" />
<el-table-column label="入仓时间" align="center" prop="rucangtime" width="120" /> <el-table-column label="订单号" align="center" prop="orderNo" width="120" />
<el-table-column label="品名" align="center" prop="prodTitleZh" width="120" /> <el-table-column label="目的地" align="center" prop="destWarehouseName" width="120" />
<el-table-column label="箱数" align="center" prop="num" /> <el-table-column label="入仓时间" align="center" prop="rucangtime" width="120" />
<el-table-column label="体积/重量/重货比" align="center" width="140" prop="volumeWeight"> <el-table-column label="品名" align="center" prop="prodTitleZh" width="120" />
<template slot-scope="scope"> <el-table-column label="箱数" align="center" prop="num" />
<p v-if="scope.row.volume">{{scope.row.volume}}m³</p> <el-table-column label="体积/重量/重货比" align="center" width="140" prop="volumeWeight">
<p v-if="scope.row.weight">{{scope.row.weight}}kg</p> <template slot-scope="scope">
</template> <p v-if="scope.row.volume">{{scope.row.volume}}m³</p>
</el-table-column> <p v-if="scope.row.weight">{{scope.row.weight}}kg</p>
<el-table-column label="报关方式" align="center" prop="customsType" width="120"> </template>
<template slot-scope="scope"> </el-table-column>
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" /> <el-table-column label="报关方式" align="center" prop="customsType" width="120">
</template> <template slot-scope="scope">
</el-table-column> <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
<el-table-column label="备案" align="center" prop="productRecord" width="100"> </template>
<template slot-scope="scope"> </el-table-column>
<dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="scope.row.productRecord" /> <el-table-column label="备案" align="center" prop="productRecord" width="100">
</template> <template slot-scope="scope">
</el-table-column> <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="scope.row.productRecord" />
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width" fixed="right"> </template>
<template slot-scope="scope"> </el-table-column>
<el-dropdown trigger="click" @command="(command)=>handleGoods('singele',scope.row,command)"> <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
<el-button type="primary" size="small" icon="el-icon-edit-outline" circle></el-button> <template slot-scope="scope">
<el-dropdown-menu slot="dropdown"> <el-dropdown trigger="click" @command="(command)=>handleGoods('singele',scope.row,command)">
<el-dropdown-item :command="bPart" v-for="(bPart, index) in preList" :key="bPart.id" v-show="bPart.id !== part.id">第{{index+1}}部分</el-dropdown-item> <el-button type="primary" size="small" icon="el-icon-edit-outline" circle></el-button>
</el-dropdown-menu> <el-dropdown-menu slot="dropdown">
</el-dropdown> <el-dropdown-item :command="bPart" v-for="(bPart, index) in preList" :key="bPart.id" v-show="bPart.id !== part.id">第{{index+1}}部分</el-dropdown-item>
<el-button type="danger" size="small" icon="el-icon-minus" circle style="margin-left:10px;" @click="deleteOrder('row',scope.row)"></el-button> </el-dropdown-menu>
</template> </el-dropdown>
</el-table-column> <el-button type="danger" size="small" icon="el-icon-minus" circle style="margin-left:10px;" @click="deleteOrder('row',scope.row)"></el-button>
</el-table> </template>
</el-table-column>
</el-table>
</div>
</el-collapse-transition>
</el-row> </el-row>
</el-scrollbar> </el-scrollbar>
</el-col> </el-col>
...@@ -177,8 +181,8 @@ ...@@ -177,8 +181,8 @@
</div> </div>
</div> </div>
</el-row> </el-row>
<el-scrollbar style="height:calc(100% - 40px)"> <el-pagination background layout="prev, pager, next" :page-size="pageParam.pageSize" :total="total" @current-change="pageChange" v-show="total > 0"></el-pagination>
<el-pagination background layout="prev, pager, next" :page-size="pageParam.pageSize" :total="total" @current-change="pageChange" v-show="total > 0"></el-pagination> <el-scrollbar style="height:calc(100% - 75px)">
<el-row v-for="(item, index) in toBePreList" :key="index" class="tobePre-row"> <el-row v-for="(item, index) in toBePreList" :key="index" class="tobePre-row">
<el-row class="preinstall-title order-title"> <el-row class="preinstall-title order-title">
<div> <div>
...@@ -189,7 +193,9 @@ ...@@ -189,7 +193,9 @@
<p>{{item.destWarehouseName}}</p> <p>{{item.destWarehouseName}}</p>
</div> </div>
<div> <div>
<p>{{item.warehouseType}}</p> <p>
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
</p>
</div> </div>
<div> <div>
<p>入仓时间：</p> <p>入仓时间：</p>
...@@ -309,7 +315,7 @@ export default { ...@@ -309,7 +315,7 @@ export default {
// 查询参数 // 查询参数
queryParams: {}, queryParams: {},
pageParam: { pageNo: 1, pageSize: 5 }, pageParam: { pageNo: 1, pageSize: 10 },
// 目的地操作员 // 目的地操作员
operatorData: {}, operatorData: {},
// 校验 // 校验
...@@ -441,7 +447,7 @@ export default { ...@@ -441,7 +447,7 @@ export default {
}, },
/* 待预装订单分页 */ /* 待预装订单分页 */
pageChange(page) { pageChange(page) {
this.queryParams.page = page; this.pageParam.pageNo = page;
this.getPreLoad(); this.getPreLoad();
}, },
/* 折叠 */ /* 折叠 */
......
src/views/ecw/box/shippingSea/nodePage/ship.vue
View file @ 97a3043f
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<script> <script>
import { shipConfigure, serviceMsg } from "@/api/ecw/boxSea"; import { shipConfigure, serviceMsg } from "@/api/ecw/boxSea";
import { formatNumberString, constantDict } from "../utils"; import { formatNumberString, formatDateStr, constantDict } from "../utils";
/** /**
* 配船 * 配船
*/ */
...@@ -47,6 +47,7 @@ export default { ...@@ -47,6 +47,7 @@ export default {
const voName = this.$attrs.currNode.voName; const voName = this.$attrs.currNode.voName;
let oldData = { ...this.shipmentObj[voName] }; let oldData = { ...this.shipmentObj[voName] };
oldData = formatNumberString(oldData, ["saExmtStatus"]); oldData = formatNumberString(oldData, ["saExmtStatus"]);
oldData = formatDateStr(oldData, ["configTime"]);
this.shipObj = oldData; this.shipObj = oldData;
}, },
methods: { methods: {
......
src/views/ecw/box/shippingSea/nodePage/unloading/index.vue
View file @ 97a3043f
...@@ -59,7 +59,8 @@ export default { ...@@ -59,7 +59,8 @@ export default {
this.$refs["unloadingForm"].validate((valid) => { this.$refs["unloadingForm"].validate((valid) => {
if (valid) { if (valid) {
if (operateType === 2) { if (operateType === 2) {
const { ulStatus } = this.$attrs.shipmentObj; const { keyName } = this.$attrs.currNode;
const ulStatus = this.$attrs.shipmentObj[keyName];
if (ulStatus !== 145) { if (ulStatus !== 145) {
this.$message.warning("请先通过卸柜审批"); this.$message.warning("请先通过卸柜审批");
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment