新增金牌特殊计费带出

src/views/distribution/inventory/CreateOrder.vue

@@ -2417,6 +2417,11 @@ const destinationWarehouseNameChange = val => {
 
 /** 计算行合计 */
 const handleComputed = (row: any) => {
+  const { template, trunkLine } = details.priceTemplate;
+
+  if (Boolean(isDisabled.value && template && trunkLine))
+    handleSpecialBrandPrice(row, trunkLine, template);
+
   if (row.chargeType === 1) row.subtotalFreight = computeNumber(row.num, '*', row.price).result;
   else if (row.chargeType === 2)
     row.subtotalFreight = computeNumber(row.volume, '*', row.price).result;
@@ -2427,7 +2432,6 @@ const handleComputed = (row: any) => {
 
   console.log('row :>> ', row);
 
-  // handleTrunkLinePrice(details.priceTemplate.trunkLine, details.priceTemplate.template);
   handlePrice();
 };
 
@@ -3062,17 +3066,19 @@ const handleAssignmentItemPriceTrunkline = (value, trunkLine, template) => {
 
 /** 金牌 -- 干线特殊处理 */
 const handleSpecialBrandPrice = (value, trunkLine, template) => {
+  if (!isDisabled.value) return;
+
   // 总件数小于15件 && 总方数小于0.8 && 总方数 / 总件数小于0.11 则按件计费, 否则以按方计费
   const { totalCount, totalVolume } = details.totalCost;
 
-  if (totalCount < 15 && totalVolume < 0.8) {
+  if (totalCount < 15 && totalVolume < 0.8 && totalVolume / (totalCount || 1) < 0.11) {
     value.chargeType = 1;
 
     value.price = 5;
   } else {
     value.chargeType = 2;
 
-    const { pieceCategory, cubeCategory, weightCategory } = trunkLine;
+    const { cubeCategory } = trunkLine;
 
     // 是否区分品类
     if (template.trunklineIsByCategory) {
@@ -3114,7 +3120,7 @@ const handleAssignmentItemPrice = (value, isOnload = false) => {
   // 干线
   if (trunkLine && template && !isOnload) {
     // 如果品牌为金牌, 切模板选择为特殊计费则特殊处理
-    if (details.query.brand === '金牌') handleSpecialBrandPrice(value, trunkLine, template);
+    if (isDisabled.value) handleSpecialBrandPrice(value, trunkLine, template);
     else handleAssignmentItemPriceTrunkline(value, trunkLine, template);
     // 是否为区分品类
   } else value.price = 0;

src/views/waybill/CreateZeroOrder.vue

@@ -1955,6 +1955,11 @@ const handleFindGoods = async (goodsName, item, isClearId = 0) => {
 
 /** 计算行合计 */
 const handleComputed = (row: any) => {
+  const { template, trunkLine } = details.priceTemplate;
+
+  if (Boolean(isDisabled.value && template && trunkLine))
+    handleSpecialBrandPrice(row, trunkLine, template);
+
   details.query.goodsCode = '-' + details.totalObj.totalCount;
   if (row.chargeType === 1) row.subtotalFreight = computeNumber(row.num, '*', row.price).result;
   else if (row.chargeType === 2)
@@ -1966,7 +1971,6 @@ const handleComputed = (row: any) => {
 
   console.log('row :>> ', row);
 
-  // handleTrunkLinePrice(details.priceTemplate.trunkLine, details.priceTemplate.template);
   handlePrice();
 };
 
@@ -2579,17 +2583,19 @@ const handleAssignmentItemPriceTrunkline = (value, trunkLine, template) => {
 
 /** 金牌 -- 干线特殊处理 */
 const handleSpecialBrandPrice = (value, trunkLine, template) => {
+  if (!isDisabled.value) return;
+
   // 总件数小于15件 && 总方数小于0.8 && 总方数 / 总件数小于0.11 则按件计费, 否则以按方计费
   const { totalCount, totalVolume } = details.totalObj;
 
-  if (totalCount < 15 && totalVolume < 0.8) {
+  if (totalCount < 15 && totalVolume < 0.8 && totalVolume / (totalCount || 1) < 0.11) {
     value.chargeType = 1;
 
     value.price = 5;
   } else {
     value.chargeType = 2;
 
-    const { pieceCategory, cubeCategory, weightCategory } = trunkLine;
+    const { cubeCategory } = trunkLine;
 
     // 是否区分品类
     if (template.trunklineIsByCategory) {
@@ -2633,7 +2639,7 @@ const handleAssignmentItemPrice = (value, isOnload = false) => {
   // 干线
   if (trunkLine && template && !isOnload) {
     // 如果品牌为金牌, 切模板选择为特殊计费则特殊处理
-    if (details.query.brand === '金牌') handleSpecialBrandPrice(value, trunkLine, template);
+    if (isDisabled.value) handleSpecialBrandPrice(value, trunkLine, template);
     else handleAssignmentItemPriceTrunkline(value, trunkLine, template);
 
     // 是否为区分品类