Merge branch 'intex_online20250725' into intex

3 days ago · c1eff3325b
8 changed files with 285 additions and 197 deletions
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@ -12,6 +12,7 @@
          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ t(`ts.${titleNameRef}`).replace('ts.','') }}</span>
        </div>
      </template>
+      <div v-loading="detailLoading">
        <Tabs ref="tabRef" :tabsList="tabsList" :current="current" @change="change"/>
        <ContentWrap v-if="!isBasic" v-show="tabsList[current].label=='主数据'">
          <Descriptions
@ -185,6 +186,7 @@
            </ElScrollbar> 
          </ContentWrap>
        </div>
+      </div>
    </el-drawer>
    <!-- 表格弹窗 -->
    <SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess1" />
@ -1045,7 +1047,7 @@ const buttonBaseClick = (val, item) => {
    }
  }  else if (val.includes('export')) {
    // 刷新
-    emit('buttonBaseClick',val, item,tableObject)
+    emit('buttonBaseClick',val, item,tableObjectRef.value)
  } else if (val == 'refresh') {
    // 刷新
    getList()
@ -1388,7 +1390,7 @@ watch(
      deep: true
    }
  )
-defineExpose({ openDetail, formRef ,updateList,submitUpdateList,changeTabCurrent,openForm,tableObjectRef}) // 提供 open 方法，用于打开弹窗
+defineExpose({ openDetail, formRef ,updateList,submitUpdateList,changeTabCurrent,openForm,tableObjectRef,detailLoading}) // 提供 open 方法，用于打开弹窗

 </script>
 <style lang="scss">
--- a/src/views/wms/basicDataManage/cutItem/cutItem.data.ts
+++ b/src/views/wms/basicDataManage/cutItem/cutItem.data.ts
@ -105,31 +105,52 @@ export const CutItem = useCrudSchemas(
      isSearch: false
    },

+    // {
+    //   label: '开始日期',
+    //   field: 'beginDate',
+    //   sort: 'custom',
+    //   formatter: dateFormatter,
+    //   table: {
+    //     width: 180
+    //   },
+    //   search: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+    //       type: 'daterange',
+    //       defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+    //     }
+    //   },
+    //   form: {
+    //     component: 'DatePicker',
+    //     componentProps: {
+    //       type: 'datetime',
+    //       valueFormat: 'x'
+    //     }
+    //   },
+    //   detail: {
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    //   }
+    // },
+
    {
          label: '开始日期',
          field: 'beginDate',
          sort: 'custom',
-      formatter: dateFormatter,
-      table: {
-        width: 180
-      },
-      search: {
-        component: 'DatePicker',
-        componentProps: {
-          valueFormat: 'YYYY-MM-DD HH:mm:ss',
-          type: 'daterange',
-          defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        }
-      },
+          formatter: dateFormatter2,
          form: {
            component: 'DatePicker',
            componentProps: {
-          type: 'datetime',
-          valueFormat: 'x'
+              format: 'YYYY-MM-DD',
+              valueFormat: 'x',
+              
            }
          },
+          table: {
+            width: 150
+          },
          detail: {
-        dateFormat: 'YYYY-MM-DD HH:mm:ss'
+            dateFormat:'YYYY-MM-DD'
          }
        },
    {
--- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
+++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue
@ -822,14 +822,14 @@ const handleExportDetail = async (detailTableObject) => {
    // 导出的二次确认
    await message.exportConfirm()
    // 发起导出
-    exportLoading.value = true
+    detailRef.value.detailLoading = true
    const data = await CustomerStatementDetailApi.exportCustomerStatementDetail(
      detailTableObject.params
    )
    download.excel(data, `客户对账单明细子【${formatDate(new Date())}】.xlsx`)
  } catch {
  } finally {
-    exportLoading.value = false
+    detailRef.value.detailLoading = false
  }
 }

@ -839,14 +839,14 @@ const handleExportShareReconciliation = async (detailTableObject) => {
    // 导出的二次确认
    await message.exportConfirm()
    // 发起导出
-    exportLoading.value = true
+    detailRef.value.detailLoading = true
    const data = await CustomerStatementDetailApi.exportCustomerStatementShareReconciliatioDetail(
      detailTableObject.params
    )
    download.excel(data, `模具分摊对账单子${formatDate(new Date())}】.xlsx`)
  } catch {
  } finally {
-    exportLoading.value = false
+    detailRef.value.detailLoading = false
  }
 }
 // 子表导出对账差异
@ -855,14 +855,14 @@ const handleExportReconciliation = async (detailTableObject) => {
    // 导出的二次确认
    await message.exportConfirm()
    // 发起导出
-    exportLoading.value = true
+    detailRef.value.detailLoading = true
    const data = await CustomerStatementDetailApi.exportCustomerStatementCompareDetail(
      detailTableObject.params
    )
    download.excel(data, `对账差异【${formatDate(new Date())}】.xlsx`)
  } catch {
  } finally {
-    exportLoading.value = false
+    detailRef.value.detailLoading = false
  }
 }
 // 模具分摊对账单修改进屋金额
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@ -299,7 +299,7 @@ const butttondata = (row) => {
  //   float: 'right',
  //   hasPermi: ''
  // },
-  defaultButtons.mainListCreatePointBtn({hide: isShowPointBtn(row)}  ) // 标签打印
+  defaultButtons.mainListCreatePointBtn(null ) // 标签打印
  // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除
   ]
--- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts
@ -39,6 +39,18 @@ export const InventorymoveJobMain = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
    sortTableDefault:3,
+  },
+   {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isTableForm:false,
+    isForm: false,
+    sortTableDefault:3,
  },
  // {
  //   label: '发货单号',
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts
@ -145,6 +145,18 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
  //   },
  //   isForm: false,
  // },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isTableForm:false,
+    isForm: false,
+    sortTableDefault:3,
+  },
  {
    label: '从仓库代码',
    field: 'fromWarehouseCode',
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@ -746,12 +746,29 @@ const submitForm = async (formType, submitData) => {
  }
  data.subList = tableData.value // 拼接子表数据参数
  const cmdExists = data.subList.some(filter => 
-    parseFloat(filter.inventoryQty) < parseFloat(filter.qty)
-  );
-  if(cmdExists){
-    message.warning("数量不能大于库存数量")
+  parseFloat(filter.inventoryQty) > 0 && parseFloat(filter.inventoryQty) < parseFloat(filter.qty)
+);
+if(cmdExists){
+  message.warning("库存数量为正式，则数量不能大于库存数量")
  return
-  }
+}
+// 1. 筛选出 inventoryQty <= 0 的记录，并提取它们的 itemCode
+const zeroInventoryItems = data.subList.filter(item => parseFloat(item.inventoryQty) <= 0 && (item.itemType == 'SUB' || item.itemType == 'FG'))
+  .map(item => item.itemCode);
+var isRemark = "";
+  // 2. 如果有库存不足的商品，拼接提示信息
+if (zeroInventoryItems.length > 0) {
+  const str = zeroInventoryItems.join(", "); // 用逗号分隔 itemCode
+  // 删除的二次确认
+    isRemark = str+"是半成品/产成品，请先做生产申请后再进行隔离。"
+    await message.delConfirm(str+"是半成品/产成品，请先做生产申请后再进行隔离。")
+}
+// // 检查库存数量是否小于等于0
+// const zeroInventory = data.subList.some(filter => parseFloat(filter.inventoryQty) <= 0 && (filter.itemType == 'SUB' || filter.itemType == 'FG') );
+// if(zeroInventory){
+//    // 删除的二次确认
+//     await message.delConfirm("[品番]是半成品/产成品，请先做生产申请后再进行隔离。")
+// }
  // let isExist = false
  // tableData.value.forEach(item => {
  //   item['toLocationCode'] = toLocationCode
@ -765,6 +782,7 @@ const submitForm = async (formType, submitData) => {
  //   return message.warning('物料号重复')
  // }
  flag.value = false
+  data.remark = isRemark
  data.subList.forEach(item => {
    console.log(556565,item);
    if(fromInventoryStatus.value){
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts
@ -117,6 +117,17 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
  //   },
  //   sortTableDefault:3,
  // },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTable:true,
+    isTableForm:false,
+    isForm: false,
+  },
  {
    label: '到仓库代码',
    field: 'toWarehouseCode',
@ -1218,6 +1229,18 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
    isForm: false,
    sortTableDefault:7,
  },
+    // {
+    //   label: '备注',
+    //   field: 'remark',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   },
+    //   hiddenSearchHigh: true,// 高级筛选中隐藏
+    //   isSearch: false,
+    //   isForm: false,
+    //   sortTableDefault:7,
+    // },
  {
    label: '从批次',
    field: 'fromBatch',