From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue |  182 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 180 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
index 26c50f1..4f080d7 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -18,6 +18,9 @@
 import companyInfo from "@/stores/sd/companyInfo";
 import {multiply} from "@/utils/decimal";
 import MaterialAddition from "@/views/mm/ingredientStock/MaterialAddition.vue";
+import {copyTableCellValue} from "@/hook/copyTableCellValue";
+import SelectOrderList from "@/views/sd/delivery/SelectOrderList.vue";
+import { ElDialog } from "element-plus";
 
 //璇█鑾峰彇
 const { t } = useI18n()
@@ -34,6 +37,19 @@
 let otherMoneyVisible = ref(false)
 let otherMoney = ref(null)
 
+const dialogSelectOrderVisible = ref(false); // 鎺у埗寮圭獥鏄剧ず
+const currentOrderIds = ref([]); // 宸叉湁鐨勮鍗旾D锛岀敤浜庢帓闄�
+
+
+// 鍒濆鍖栧凡閫夎鍗旾D锛堝湪onMounted涓皟鐢級
+const initCurrentOrderIds = () => {
+  if (produceList && produceList.length > 0) {
+    const orderIds = produceList.map(item => item.orderId);
+    currentOrderIds.value = [...new Set(orderIds)];
+  }else {
+    currentOrderIds.value = [];
+  }
+};
 
 const hasDecimal=(value)=>{
   const regex=/\./ // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
@@ -208,6 +224,7 @@
         //绂佺敤鎸夐挳
         gridOptions.toolbarConfig.buttons[2].disabled  = true
         gridOptions.toolbarConfig.buttons[3].disabled = true
+        //gridOptions.toolbarConfig.buttons[4].disabled = false
         //鏄剧ず澶嶉�夋
         xGrid.value.showColumn("select")
         gridOptions.loading=false
@@ -228,7 +245,7 @@
         pageTotal.value=res.data.total
         titleUploadData.value=deepClone(res.data.delivery)
         titleUploadData.value.deliveryId=str
-        
+
         if(userStore.user.permissions.indexOf('createDelivery.add') > -1&&userStore.user.permissions.indexOf('createDelivery.review') > -1){
           gridOptions.toolbarConfig.buttons[0].visible  = false
         }else{
@@ -244,6 +261,7 @@
         if(titleUploadData.value.deliveryState!==0){
           gridOptions.toolbarConfig.buttons[2].disabled = true
           gridOptions.toolbarConfig.buttons[1].disabled = true
+          //gridOptions.toolbarConfig.buttons[4].disabled = true
         }
         if(titleUploadData.value.deliveryState===0){
           gridOptions.toolbarConfig.buttons[3].disabled = true
@@ -315,6 +333,9 @@
     resizable: true,
     useKey: true
   },
+  sortConfig: {
+    multiple: true,
+  },
   filterConfig: {   //绛涢�夐厤缃」
     //remote: true
   },
@@ -369,6 +390,7 @@
       {'code': 'addToExamine', 'name': t('reportingWorks.saveAndReview'),status: 'primary',icon: 'vxe-icon-save'},
       {'code': 'toExamine', 'name': t('basicData.review'),status: 'primary'},
       {'code': 'CounterExamination', 'name': t('basicData.cancelReview'),status: 'primary'},
+      //{'code': 'addOtherOrders','name': t('delivery.orderAdd'),'status': 'primary'}
       //{'code': 'glassShelf', 'name': t('finishedGlassShelf.finishedGlassShelfEmit'),status: 'primary'}
     ],
     /*import: false,
@@ -434,6 +456,10 @@
             titleUploadData.value.freightQuantity=0
           }
 
+          if($grid.getCheckedFilters().length!==0){
+            ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
+            return
+          }
 
           let flowData = ref({
             delivery: selectRecords,
@@ -442,7 +468,7 @@
             otherMoney:otherMoney.value,
             deliveryIdType:company.deliveryIdType,
             deliveryOutbound:company.deliveryOutbound,
-            type:2
+            type:1
 
           })
           gridOptions.toolbarConfig.buttons[0].disabled = true
@@ -566,6 +592,11 @@
             titleUploadData.value.freightQuantity=0
           }
 
+          if($grid.getCheckedFilters().length!==0){
+            ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
+            return
+          }
+
 
           let flowData = ref({
             delivery: selectRecords,
@@ -605,6 +636,13 @@
             gridOptions.toolbarConfig.buttons[1].disabled = false
           })
           break
+        }
+        case 'addOtherOrders': {
+          // 鏄剧ず寮圭獥鍓嶆洿鏂板凡閫夎鍗旾D
+          initCurrentOrderIds();
+          // 鏄剧ず寮圭獥
+          dialogSelectOrderVisible.value = true;
+          break;
         }
       }
     }
@@ -677,8 +715,55 @@
 
       }
     }
+  },
+  cellDblclick ({row,column}) {
+    copyTableCellValue(row,column)
   }
 }
+
+//澶嶉�夋瑙﹀彂浜嬩欢
+const handleCheckboxChange = ({ records, checked, row }) => {
+  const $grid = xGrid.value;
+  if (!$grid) return;
+
+  // 鑾峰彇褰撳墠鎵�鏈夐�変腑鐨勮锛堣繑鍥炴暟缁勶級
+  const allCheckedRows = $grid.getCheckboxRecords();
+  // 鑾峰彇琛ㄦ牸鎵�鏈夋暟鎹紙visibleData 鏄綋鍓嶅彲瑙佹暟鎹紝fullData 鏄叏閮ㄦ暟鎹紝鏍规嵁闇�姹傞�夋嫨锛�
+  const tableData = $grid.getTableData().visibleData;
+  // 鎸夌鍙峰垎缁�
+  const boxNoGroup = groupByBoxNo(tableData);
+  // 褰撳墠琛岀殑绠卞彿
+  const currentBoxNo = row.finishedGoodsInventory?.boxNo || '';
+
+  // 閫変腑閫昏緫锛氬鏋滄槸鈥滈�変腑鈥濇搷浣滐紝鍚岀鍙风殑琛屽叏閮ㄩ�変腑
+  if (checked && currentBoxNo!="" && currentBoxNo!=null) {
+    const sameBoxRows = boxNoGroup[currentBoxNo] || [];
+    // 鎵归噺璁剧疆鍚岀鍙风殑琛屼负閫変腑鐘舵�侊紙璺宠繃宸查�変腑鐨勮锛岄伩鍏嶉噸澶嶈Е鍙戯級
+    sameBoxRows.forEach(item => {
+      const isAlreadyChecked = allCheckedRows.some(checkedRow => {
+        return checkedRow._X_ROW_KEY === item._X_ROW_KEY;
+      });
+      // 鏈�変腑鍒欒缃负閫変腑
+      if (!isAlreadyChecked) {
+        $grid.setCheckboxRow(item, true);
+      }
+    });
+  }
+};
+
+
+const groupByBoxNo = (tableData) => {
+  return tableData.reduce((group, row) => {
+    // 鑾峰彇褰撳墠琛岀殑绠卞彿锛堟敞鎰忓鐞� undefined 鎯呭喌锛�
+    const boxNo = row.finishedGoodsInventory?.boxNo || '';
+    if (!group[boxNo]) {
+      group[boxNo] = [];
+    }
+    group[boxNo].push(row);
+    return group;
+  }, {});
+};
+
 
 //璁＄畻閲戦挶
 const countMoney = (list) => {
@@ -769,7 +854,83 @@
 };
 
 
+// 澶勭悊浠嶴electOrderList閫変腑鐨勮鍗�
+const handleSelectedOrders = async (selectedOrders) => {
+  if (!selectedOrders || selectedOrders.length === 0) return;
 
+  // 鍏抽棴寮圭獥
+  dialogSelectOrderVisible.value = false;
+
+  // 楠岃瘉閫変腑鐨勮鍗曟槸鍚︾鍚堟潯浠�
+  const { customerId, project } = titleUploadData.value;
+  const invalidOrders = selectedOrders.filter(order =>
+      order.customerId !== parseInt(customerId) || order.project !== project
+  );
+
+  if (invalidOrders.length > 0) {
+    ElMessage.warning(t('delivery.onlySameCustomerProject'));
+    return;
+  }
+
+  try {
+    // 鏄剧ず鍔犺浇鐘舵��
+    gridOptions.loading = true;
+
+    // 鎵归噺鏌ヨ璁㈠崟鏄庣粏锛堟寜璁㈠崟ID锛�
+    const orderIds = selectedOrders.map(order => order.orderId).join('|');
+    filterData.value.orderId=orderIds
+    request.post("/delivery/getSelectShippingOrderDetails/1/100",filterData.value).then((res) => {
+      if (res.code == 200) {
+        // 澶勭悊杩斿洖鐨勬槑缁嗘暟鎹�
+        const orderDetails = res.data.data || [];
+        //鍚堝苟鏁版嵁
+        mergeData(orderDetails);
+      } else {
+        ElMessage.warning(res.msg || t('basicData.msg.data鑾峰彇澶辫触'));
+      }
+    })
+  } catch (error) {
+    ElMessage.error(t('basicData.msg.ServerConnectionError'));
+    console.error('鏌ヨ璁㈠崟鏄庣粏澶辫触:', error);
+  } finally {
+    // 鍏抽棴鍔犺浇鐘舵��
+    gridOptions.loading = false;
+  }
+};
+
+// 鍚堝苟鏁版嵁锛氬垽鏂璷rderId銆乷rderNumber銆乥oxNo鏄惁鐩稿悓锛岀浉鍚屽垯绱姞鏁伴噺锛屼笉鍚屽垯鏂板
+const mergeData = (newDataList) => {
+  // 澶嶅埗鐜版湁鏁版嵁锛堥伩鍏嶇洿鎺ヤ慨鏀瑰搷搴斿紡婧愭暟鎹級
+  const currentList = [...produceList];
+
+  newDataList.forEach(newItem => {
+    // 鎻愬彇鏂版暟鎹殑鍏抽敭姣斿瀛楁
+    const newOrderId = newItem.orderId;
+    const newOrderNumber = newItem.orderNumber;
+    const newBoxNo = newItem.finishedGoodsInventory?.boxNo || ''; // 澶勭悊鍙兘鐨剈ndefined
+
+    // 鍦ㄧ幇鏈夋暟鎹腑鏌ユ壘鍖归厤椤癸紙涓変釜瀛楁瀹屽叏鐩稿悓锛�
+    const matchedItem = currentList.find(item =>
+        item.orderId === newOrderId &&
+        item.orderNumber === newOrderNumber &&
+        (item.finishedGoodsInventory?.boxNo || '') === newBoxNo
+    );
+
+    if (matchedItem) {
+      // 鎵惧埌鍖归厤椤癸細绱姞鏁伴噺锛堢‘淇濇槸鏁板�肩被鍨嬶級
+      matchedItem.deliveryDetail.quantity = (Number(matchedItem.deliveryDetail.quantity) || 0) +
+          (Number(newItem.deliveryDetail.quantity) || 0);
+    } else {
+      // 鏈壘鍒板尮閰嶉」锛氭柊澧炰竴鏉℃暟鎹�
+      currentList.push(newItem);
+    }
+  });
+
+  // 鏇存柊鍝嶅簲寮忔暟鎹�
+  produceList = currentList;
+  // 鍒锋柊琛ㄦ牸
+  xGrid.value.reloadData(produceList);
+};
 
 </script>
 
@@ -864,6 +1025,7 @@
           v-on="gridEvents"
           :edit-rules="validRules"
           @edit-closed="editClosedEvent"
+          @checkbox-change="handleCheckboxChange"
 
       >
         <template #num1_filter="{ column, $panel }">
@@ -939,6 +1101,22 @@
           @handle-result="handleChildResult2"
       />
     </el-dialog>
+
+    <el-dialog
+        v-model="dialogSelectOrderVisible"
+        :title="t('delivery.orderAdd')"
+        style="width: 70%;height:75% "
+        destroy-on-close
+        :close-on-click-modal="false"
+        :close-on-press-escape="false">
+      <SelectOrderList
+          style="width: 100%;height: 600px"
+          :customer-id="titleUploadData.customerId"
+          :project="titleUploadData.project"
+          :exclude-order-ids="currentOrderIds"
+          @select-orders="handleSelectedOrders"
+      />
+    </el-dialog>
   </div>
 
 </template>

--
Gitblit v1.8.0