diff --git a/src/components/WaybillPrintTemplate/WaybillPrintTemplate.vue b/src/components/WaybillPrintTemplate/WaybillPrintTemplate.vue
index a9e1f4e4..d93ba1d2 100644
--- a/src/components/WaybillPrintTemplate/WaybillPrintTemplate.vue
+++ b/src/components/WaybillPrintTemplate/WaybillPrintTemplate.vue
@@ -159,8 +159,8 @@ const printTemplate = (type: 'haveTem' | 'notHaveTem') => {
cloneNodeList.push(printNode[i].cloneNode(true));
}
- for (let i = 0; i < printNode.length; i++) {
- const element = printNode[i];
+ for (let i = 0; i < cloneNodeList.length; i++) {
+ const element = cloneNodeList[i];
for (let j = 0; j < element.childNodes.length; j++) {
const child = element.childNodes[j];
@@ -170,6 +170,8 @@ const printTemplate = (type: 'haveTem' | 'notHaveTem') => {
break;
}
}
+
+ print(cloneNodeList);
};
diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js
index 2ebd8f03..64c2a17f 100644
--- a/src/option/distribution/TripartiteTransfer.js
+++ b/src/option/distribution/TripartiteTransfer.js
@@ -248,7 +248,7 @@ export const detailsColumnList = [
{
prop: 'waybillNo',
label: '运单号',
- type: 1,
+ type: 2,
values: '',
width: '150',
checkarr: [],
@@ -259,7 +259,7 @@ export const detailsColumnList = [
{
prop: 'loadCode',
label: '配载批次',
- type: 1,
+ type: 2,
values: '',
width: '150',
checkarr: [],
@@ -270,7 +270,7 @@ export const detailsColumnList = [
{
prop: 'orderCode',
label: '合同号',
- type: 1,
+ type: 2,
values: '',
width: '150',
checkarr: [],
@@ -281,7 +281,7 @@ export const detailsColumnList = [
{
prop: 'scanCode',
label: '包条码/产品名称',
- type: 1,
+ type: 2,
values: '',
width: '200',
checkarr: [],
@@ -291,7 +291,7 @@ export const detailsColumnList = [
{
prop: 'loadingUserName',
label: '装车人',
- type: 1,
+ type: 2,
values: '',
width: '130',
checkarr: [],
@@ -301,7 +301,7 @@ export const detailsColumnList = [
{
prop: 'warehouseName',
label: '装车仓库',
- type: 1,
+ type: 2,
values: '',
width: '130',
checkarr: [],
@@ -311,7 +311,7 @@ export const detailsColumnList = [
{
prop: 'finalNodeName',
label: '计划目的仓库',
- type: 1,
+ type: 2,
values: '',
width: '130',
checkarr: [],
@@ -331,7 +331,7 @@ export const detailsColumnList = [
// {
// prop: 'lineNameTitle',
// label: '订单来源',
- // type: 1,
+ // type: 2,
// values: '',
// width: '130',
// checkarr: [],
@@ -341,7 +341,7 @@ export const detailsColumnList = [
{
prop: 'trayName',
label: '托盘名称',
- type: 1,
+ type: 2,
values: '',
width: '130',
checkarr: [],
@@ -351,7 +351,7 @@ export const detailsColumnList = [
{
prop: 'trayCode',
label: '托盘码',
- type: 1,
+ type: 2,
values: '',
width: '130',
checkarr: [],
@@ -361,7 +361,7 @@ export const detailsColumnList = [
// {
// prop: 'nodeNub',
// label: '装车仓库',
- // type: 1,
+ // type: 2,
// values: '',
// width: '130',
// checkarr: [],
@@ -371,7 +371,7 @@ export const detailsColumnList = [
// {
// prop: 'startTime',
// label: '扫码时间',
- // type: 1,
+ // type: 2,
// values: '',
// width: '130',
// checkarr: [],
@@ -381,7 +381,7 @@ export const detailsColumnList = [
{
prop: 'unloadNodeName',
label: '卸车仓库',
- type: 1,
+ type: 2,
values: '',
width: '130',
checkarr: [],
@@ -391,7 +391,7 @@ export const detailsColumnList = [
{
prop: 'unloadUserName',
label: '卸车人',
- type: 1,
+ type: 2,
values: '',
width: '130',
checkarr: [],
@@ -401,7 +401,7 @@ export const detailsColumnList = [
// {
// prop: 'planVolume',
// label: '卸车时间',
- // type: 1,
+ // type: 2,
// values: '',
// width: '130',
// checkarr: [],
@@ -411,7 +411,7 @@ export const detailsColumnList = [
// {
// prop: 'billladingStatus',
// label: '装车类型',
- // type: 1,
+ // type: 2,
// values: '',
// width: '130',
// checkarr: [],
@@ -558,6 +558,26 @@ export const detailsColumnList = [
// fixed: false,
// sortable: true,
// },
+ {
+ prop: '装车时间',
+ label: '同步状态',
+ type: 1,
+ values: '',
+ width: '130',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
+ {
+ prop: 'totalWeight',
+ label: '卸车时间',
+ type: 1,
+ values: '',
+ width: '130',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ },
{
prop: '',
label: '操作',
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index c83c0465..946d6ada 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -439,6 +439,7 @@
干 线
+
是
否
@@ -519,6 +521,7 @@
v-model="item.chargeType"
@change="handleComputed(item)"
style="display: flex"
+ :disabled="isDisabled"
>
件
方
@@ -1348,40 +1351,14 @@ const details = reactive({
totalObj: {
/** 总件数 */
totalCount: computed(() => {
- let _deliveryFee = 0;
- let _warehouseManagementFee = 0;
- let _storageFee = 0;
-
- for (let index = 0; index < details.goodsList.length; index++) {
- const element = details.goodsList[index];
-
- _deliveryFee = computeNumber(
- _deliveryFee,
- '+',
- computeNumber(element.deliveryFee || 0, '*', element.num || 0).result
- ).result;
-
- _warehouseManagementFee = computeNumber(
- _warehouseManagementFee,
- '+',
- computeNumber(element.warehouseManagementFee || 0, '*', element.num || 0).result
- ).result;
-
- _storageFee = computeNumber(
- _storageFee,
- '+',
- computeNumber(element.storageFee || 0, '*', element.num || 0).result
- ).result;
- }
+ let _totalNum = 0;
- details.query.deliveryFee = _deliveryFee;
- details.query.warehouseManagementFee = _warehouseManagementFee;
- details.query.storageFee = _storageFee;
+ for (let i = 0; i < details.goodsList.length; i++) {
+ const value = details.goodsList[i];
+ if (value.num) _totalNum += value.num;
+ }
- return details.goodsList.reduce((curr, item) => {
- if (item.num) return curr + item.num;
- return curr;
- }, 0);
+ return _totalNum;
}),
/** 总重量 */
totalWeghit: computed(() => {
@@ -1830,6 +1807,25 @@ const details = reactive({
changeData: [],
});
+/** 是否禁用 */
+const isDisabled = computed(() => {
+ if (getObjType(details.priceTemplate) !== 'object') return false;
+
+ const { template } = details.priceTemplate;
+
+ if (getObjType(template) !== 'object') return false;
+
+ // 是否干线特殊配置
+ const { trunklineIsPeculiarSetup } = template;
+
+ const blackArr = ['金牌'];
+
+ const _flag = blackArr.includes(details.query.brand);
+
+ if (_flag && trunklineIsPeculiarSetup) return true;
+ else return false;
+});
+
const info = ref({});
const { query, data, drawerShow, page, loadingObj } = toRefs(details);
@@ -2976,15 +2972,106 @@ const handleTranslation = (province, city, region) => {
return name;
};
-/** 价格赋值
- * isOnload 是否为初始化价格赋值, 初始化不赋值干线单价以及计算价格
- */
-const handleAssignmentItemPrice = (value, isOnload = false) => {
- // 处理品类费用
- const { pickup, template, trunkLine } = details.priceTemplate;
+/** 干线价格赋值 */
+const handleAssignmentItemPriceTrunkline = (value, trunkLine, template) => {
+ const { pieceCategory, cubeCategory, weightCategory } = trunkLine;
+
+ // 是否区分品类
+ if (template.trunklineIsByCategory) {
+ // 品类是否存在id
+ if (!value.goodsId) value.price = 0;
+ else {
+ let _item: any = {};
+ // 件
+ if (getObjType(pieceCategory) === 'array') {
+ for (let j = 0; j < pieceCategory.length; j++) {
+ const item = pieceCategory[j];
+
+ if (item.categoryId !== value.goodsId) continue;
+ _item = item;
+
+ _item.chargeType = 1;
+ break;
+ }
+ }
+
+ // 方
+ if (getObjType(cubeCategory) === 'array' && !_item.chargeType) {
+ for (let j = 0; j < cubeCategory.length; j++) {
+ const item = cubeCategory[j];
+
+ if (item.categoryId !== value.goodsId) continue;
+ _item = item;
+
+ _item.chargeType = 2;
+ break;
+ }
+ }
+
+ // 重量
+ if (getObjType(weightCategory) === 'array' && !_item.chargeType) {
+ for (let j = 0; j < weightCategory.length; j++) {
+ const item = weightCategory[j];
+
+ if (item.categoryId !== value.goodsId) continue;
+ _item = item;
+
+ _item.chargeType = 3;
+ break;
+ }
+ }
+
+ if (!_item.chargeType) value.price = 0;
+ else {
+ value.chargeType = _item.chargeType;
+ value.price = _item.price;
+ }
+ }
+ } else {
+ // 不区分品类
+ switch (value.chargeType) {
+ // 件
+ case 1:
+ value.price =
+ getObjType(pieceCategory) === 'array' && pieceCategory.length > 0
+ ? pieceCategory[0].price || 0
+ : 0;
+ break;
+
+ // 方
+ case 2:
+ value.price =
+ getObjType(cubeCategory) === 'array' && cubeCategory.length > 0
+ ? cubeCategory[0].price || 0
+ : 0;
+ break;
+
+ // 公斤
+ case 3:
+ value.price =
+ getObjType(weightCategory) === 'array' && weightCategory.length > 0
+ ? weightCategory[0].price || 0
+ : 0;
+ break;
+
+ default:
+ break;
+ }
+ }
+};
+
+/** 金牌 -- 干线特殊处理 */
+const handleSpecialBrandPrice = (value, trunkLine, template) => {
+ // 总件数小于15件 && 总方数小于0.8 && 总方数 / 总件数小于0.11 则按件计费, 否则以按方计费
+ const { totalCount, totalVolume } = details.totalCost;
+
+ if (totalCount < 15 && totalVolume < 0.8) {
+ value.chargeType = 1;
+
+ value.price = 5;
+ } else {
+ value.chargeType = 2;
- // 干线
- if (trunkLine && template && !isOnload) {
const { pieceCategory, cubeCategory, weightCategory } = trunkLine;
// 是否区分品类
@@ -2993,18 +3080,6 @@ const handleAssignmentItemPrice = (value, isOnload = false) => {
if (!value.goodsId) value.price = 0;
else {
let _item: any = {};
- // 件
- if (getObjType(pieceCategory) === 'array') {
- for (let j = 0; j < pieceCategory.length; j++) {
- const item = pieceCategory[j];
-
- if (item.categoryId !== value.goodsId) continue;
- _item = item;
-
- _item.chargeType = 1;
- break;
- }
- }
// 方
if (getObjType(cubeCategory) === 'array' && !_item.chargeType) {
@@ -3013,62 +3088,34 @@ const handleAssignmentItemPrice = (value, isOnload = false) => {
if (item.categoryId !== value.goodsId) continue;
_item = item;
-
- _item.chargeType = 2;
break;
}
}
- // 重量
- if (getObjType(weightCategory) === 'array' && !_item.chargeType) {
- for (let j = 0; j < weightCategory.length; j++) {
- const item = weightCategory[j];
-
- if (item.categoryId !== value.goodsId) continue;
- _item = item;
-
- _item.chargeType = 3;
- break;
- }
- }
-
- if (!_item.chargeType) value.price = 0;
- else {
- value.chargeType = _item.chargeType;
- value.price = _item.price;
- }
+ value.price = _item.price || 0;
}
} else {
// 不区分品类
- switch (value.chargeType) {
- // 件
- case 1:
- value.price =
- getObjType(pieceCategory) === 'array' && pieceCategory.length > 0
- ? pieceCategory[0].price || 0
- : 0;
- break;
-
- // 方
- case 2:
- value.price =
- getObjType(cubeCategory) === 'array' && cubeCategory.length > 0
- ? cubeCategory[0].price || 0
- : 0;
- break;
+ value.price =
+ getObjType(cubeCategory) === 'array' && cubeCategory.length > 0
+ ? cubeCategory[0].price || 0
+ : 0;
+ }
+ }
+};
- // 公斤
- case 3:
- value.price =
- getObjType(weightCategory) === 'array' && weightCategory.length > 0
- ? weightCategory[0].price || 0
- : 0;
- break;
+/** 价格赋值
+ * isOnload 是否为初始化价格赋值, 初始化不赋值干线单价以及计算价格
+ */
+const handleAssignmentItemPrice = (value, isOnload = false) => {
+ // 处理品类费用
+ const { pickup, template, trunkLine } = details.priceTemplate;
- default:
- break;
- }
- }
+ // 干线
+ if (trunkLine && template && !isOnload) {
+ // 如果品牌为金牌, 切模板选择为特殊计费则特殊处理
+ if (details.query.brand === '金牌') handleSpecialBrandPrice(value, trunkLine, template);
+ else handleAssignmentItemPriceTrunkline(value, trunkLine, template);
// 是否为区分品类
} else value.price = 0;
@@ -3235,7 +3282,7 @@ const handleSubmitCause = () => {