Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

8 天以前 23bca603bee6a1ec044949a89c0daa3002fbbe55

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/GlassInventory.vue

@@ -64,9 +64,9 @@
    body: {
      options: [
        [
          {code: 'selectTrimming', name: '设置统一修边',},
          {code: 'selectTrimming', name: '设置统一修边',prefixIcon: 'vxe-icon-edit'},
          {code: 'Exports', name: '数据导出', prefixIcon: 'vxe-icon-download', visible: true, disabled: false},
          {code: 'addRow', name: t('basicData.add'), prefixIcon: 'vxe-icon-square-plus', visible: true, disabled: true },
          {code: 'addRow', name: '添加原片', prefixIcon: 'vxe-icon-square-plus', visible: true, disabled: true },
        ],
      ]
    },
@@ -85,7 +85,14 @@
    gridRef: xGrid,
    requiresRow: false,
    openTrimming: async () => {
     emit ( 'select-trimming', true)
      // 获取当前选中的记录
      const selectedRecords = xGrid.value.getCheckboxRecords();
      // 发送事件给父组件，包含选中的数据
      emit('select-trimming', {
        action: 'open-trimming-dialog',
        selectedData: selectedRecords && selectedRecords.length > 0 ? selectedRecords : null,
        timestamp: Date.now()
      });
    }
  },
  {
@@ -95,11 +102,63 @@
    requiresRow: false,
  },
  {
    code: 'addRow', // 导出文件操作的配置
    code: 'addRow',
    successMsg: '添加成功！',
    gridRef: xGrid,
    requiresRow: false,
  },
    handler: async () => {
      const $grid = xGrid.value;
      if ($grid) {
        // 生成6位随机编码
        const generateCode = () => {
          // 使用当前时间戳生成唯一编码
          const timestamp = Date.now().toString();
          // 取时间戳的后6位，确保是6位数
          const code = timestamp.substring(timestamp.length - 6).padStart(6, '0');
          return code;
        };

        // 创建新行数据
        const newRow = {
          id: generateCode(), // 自动生成6位编码
          width: '', // 宽度待用户填写
          height: '', // 高度待用户填写
          thickness: thickness.value, // 自动填充厚度
          model: model.value,// 自动填充类型
          available_quantity: 999,
          leftTrim: defaultTrims.leftTrim,   // 使用默认左修边
          downTrim: defaultTrims.downTrim,   // 使用默认下修边
          rightTrim: defaultTrims.rightTrim, // 使用默认右修边
          upTrim: defaultTrims.upTrim
        };

        // 插入新行
        let result = toolbarButtonClickEvent();
        let lengths = 0;
        if (result != null) {
          lengths = result.start;
        }

        if ($grid.getTableData().tableData.length >= 100) {
          ElMessage.error(t('order.msg.tableLengthMax'));
          return;
        }

        if ($grid.getCheckedFilters().length !== 0) {
          ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'));
          return;
        }

        if ($grid.getTableData().fullData.length > lengths + 1) {
          $grid.insertAt(newRow, lengths + 1);
        } else {
          $grid.insertAt(newRow, -1);
        }

        ElMessage.success('添加成功！');
      }
    }
  }
]

// 右键菜单点击逻辑
@@ -115,25 +174,15 @@
          return;
        }
        if (config.code === 'addRow') {
          if ($grid.getTableData().tableData.length >=100){
            ElMessage.error(t('order.msg.tableLengthMax'))
            return
          if (config.handler) {
            config.handler();
          }
          if ($grid.getCheckedFilters().length!==0){
            ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
            return
          }
          console.log($grid.getTableData().visibleData)
          let result = toolbarButtonClickEvent()
          let lengths = 0
          if (result!=null){
            lengths=result.start
          }
          if($grid.getTableData().fullData.length>lengths+1){
            $grid.insertAt({}, lengths+1)
          }else{
            $grid.insertAt({}, -1)
          }
          return;
        }


        if (config.code === 'selectTrimming') {
          config.openTrimming();
          return;
        }
        // 添加确认提示弹窗，询问用户是否进行当前操作
@@ -142,10 +191,10 @@
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
          if (config.code === 'selectTrimming') {
            config.openTrimming();
            ElMessage.success(config.successMsg);
          }
          // if (config.code === 'selectTrimming') {
          //   config.openTrimming();
          //   ElMessage.success(config.successMsg);
          // }
        }).catch(() => {
          // 用户点击取消后执行的逻辑
          ElMessage.info('已取消操作');
@@ -182,6 +231,12 @@
              formattedItem[key] = item[key];
            }
          }
          if (!formattedItem.thickness) {
            formattedItem.thickness = thickness.value;
          }
          if (!formattedItem.model) {
            formattedItem.model = model.value;
          }
          return formattedItem;
        });
        if(edgeTrimming!=null){
@@ -197,13 +252,27 @@
            }
            return edgeTrimmingItem;
          });
          console.log(edgeTrimmingData)
          formattedData.forEach(item => {
            item.leftTrim = edgeTrimmingData[0].leftTrim;
            item.downTrim = edgeTrimmingData[0].downTrim;
            item.rightTrim = edgeTrimmingData[0].rightTrim;
            item.upTrim = edgeTrimmingData[0].upTrim;
          });
          if (edgeTrimmingData && edgeTrimmingData.length > 0) {
            defaultTrims.leftTrim = edgeTrimmingData[0].leftTrim || 0;
            defaultTrims.downTrim = edgeTrimmingData[0].downTrim || 0;
            defaultTrims.rightTrim = edgeTrimmingData[0].rightTrim || 0;
            defaultTrims.upTrim = edgeTrimmingData[0].upTrim || 0;

            formattedData.forEach(item => {
              item.leftTrim = edgeTrimmingData[0].leftTrim || 0;
              item.downTrim = edgeTrimmingData[0].downTrim || 0;
              item.rightTrim = edgeTrimmingData[0].rightTrim || 0;
              item.upTrim = edgeTrimmingData[0].upTrim || 0;
            });
          } else {
            // 如果没有修边数据，使用默认值0
            formattedData.forEach(item => {
              item.leftTrim = 0;
              item.downTrim = 0;
              item.rightTrim = 0;
              item.upTrim = 0;
            });
          }
        }
        if(state<10){
          gridOptions.columns[3].editRender.attrs.disabled=false
@@ -227,6 +296,10 @@
        }
        xGrid.value.loadData(formattedData);
        gridOptions.data = formattedData;

        // 将 formattedData 保存到 localStorage
        localStorage.setItem('glassInventoryData', JSON.stringify(formattedData));
        console.log('已将库存数据保存到 localStorage');
      } else {
      }
    } else {
@@ -235,6 +308,13 @@
    }
  });
};

const defaultTrims = reactive({
  leftTrim: 0,
  downTrim: 0,
  rightTrim: 0,
  upTrim: 0
});

onMounted(() => {
  addListener(xGrid.value,gridOptions)
@@ -294,19 +374,38 @@
    const data = gridOptions.data;
    if (data) {
      try {
        const updatedData = [];
        for (let i = 0; i < data.length; i++) {
          const item = data[i];
          const updatedItem = {
        // 检查是否只对选中的项目应用修边
        const shouldApplyToSelectedOnly = receivedData.selectedItemsOnly;
        let targetData = data;

        if (shouldApplyToSelectedOnly) {
          // 只对选中的数据应用修边
          targetData = receivedData.selectedGlassData || [];
          if (!targetData || targetData.length === 0) {
            ElMessage.warning('未选择任何项目，修边未应用');
            return;
          }
        }

        const updatedData = data.map(item => {
          // 如果只对选中项应用，检查当前项是否在选中列表中
          if (shouldApplyToSelectedOnly) {
            const isSelected = targetData.some(selectedItem => selectedItem.id === item.id);
            if (!isSelected) {
              return item; // 不在选中列表中，不修改
            }
          }

          // 应用修边值
          return {
            ...item,
            // 从 receivedData 中获取对应的值来更新表格数据项
            leftTrim: Number(receivedData.quicksetLeft),
            downTrim: Number(receivedData.quicksetBottom),
            rightTrim: Number(receivedData.quicksetRight),
            upTrim: Number(receivedData.quicksetTop),
          };
          updatedData.push(updatedItem);
        }
        });

        gridOptions.data = updatedData;
        xGrid.value.loadData(updatedData);
      } catch (error) {