From df8da3a71321087fe8ea4c2b9358ec5c4b8b2fa0 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 10 Sep 2024 17:02:55 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5787=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrap/scrapJobMain/scrapJobMain.data.ts                  | 5 ++++-
 .../scrap/scrapRecordMain/scrapRecordMain.data.ts            | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
index e61b147f5..19b121e50 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts
@@ -419,7 +419,10 @@ export const ScrapJobMain = useCrudSchemas(
       sort: 'custom',
       table: {
         width: 150
-      }
+      },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
     },
     {
       label: '自动完成',
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 7d06a9c15..6dd8ad0be 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -411,7 +411,10 @@ export const ScrapRecordMain = useCrudSchemas(
       sort: 'custom',
       table: {
         width: 150
-      }
+      },
+      isTable:false,
+      isForm:false,
+      isTableForm:false,
     },
     {
       label: '是否已撤销',

From 9943176fcf3d8f95f4c53f05609af7d1e01f4993 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Tue, 10 Sep 2024 17:32:00 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E7=BC=BA=E9=99=B7=EF=BC=9AHL-5009?=
 =?UTF-8?q?=EF=BC=8CSCP=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=88=97=E8=A1=A8=E3=80=81=E5=AF=BC=E5=87=BA=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=9B=B4=E6=96=B0=E4=BA=BA=E6=9B=B4=E6=96=B0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=8C=E4=B8=9A=E5=8A=A1=E9=83=A8=E5=88=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=88=97=E8=A1=A8=E3=80=81=E5=AF=BC=E5=87=BA=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 src/locales/en-US.ts                          |  3 +-
 src/locales/zh-CN.ts                          |  3 +-
 .../supplieDeliveryStrategy/index.vue         | 30 +++++-
 .../supplierCycle/supplierCycle.data.ts       | 41 ++++++++
 .../supplierUser/supplierUser.data.ts         |  6 ++
 .../purchasereceiptJobMain.data.ts            | 25 ++---
 .../purchasereturnRecordMain.data.ts          | 22 ++---
 .../purchaseMain/purchaseMain.data.ts         | 96 +++++++++----------
 .../supplierdeliverRecordMain.data.ts         | 28 ++++++
 .../supplierdeliverRequestMain.data.ts        | 76 +++++++--------
 .../invoicingcalendar.data.ts                 | 39 ++++----
 .../supplierApbalanceDetail.data.ts           |  1 -
 .../supplierApbalanceMain.data.ts             | 12 ++-
 14 files changed, 249 insertions(+), 134 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e6e2f3ae..1f4042215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ auto-*.d.ts
 .history
 /sfms3.0
 /sfms3.0-ui
+.vscode/
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 2ffdbba5d..fc6ef45c2 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1286,7 +1286,8 @@ export default {
     生产日期不能小于:'The date of production cannot be less than',
     生产日期不能大于当前系统日期:'The production date cannot be greater than the current system date',
     发票回转:'Return of invoice',
-    发票回转成功:'The invoice has been successfully forwarded'
+    发票回转成功: 'The invoice has been successfully forwarded',
+    最后更新人: 'Last Updated By'
   },
 
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 9d42231a1..c414dad7f 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1282,7 +1282,8 @@ export default {
     生产日期不能小于:'生产日期不能小于',
     生产日期不能大于当前系统日期:'生产日期不能大于当前系统日期',
     发票回转:'发票回转',
-    发票回转成功:'发票回转成功'
+    发票回转成功: '发票回转成功',
+    最后更新人:'最后更新人'
   },
 
 }
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
index 0d8c6776a..58a70adb5 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
@@ -26,15 +26,28 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-clientTable v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
-      <el-table-column align="center" :label="t('ts.策略代码')" prop="strategyCode" />
-      <el-table-column align="center" :label="t('ts.策略名称')" prop="name" show-overflow-tooltip />
-      <el-table-column align="center" :label="t('ts.策略描述')" prop="description" />
-      <el-table-column align="center" :label="t('ts.优先级')" prop="priority" sortable/>
+      <el-table-column align="center" :label="t('ts.策略代码')" prop="strategyCode"  show-overflow-tooltip width="150px" />
+      <el-table-column align="center" :label="t('ts.策略名称')" prop="name" show-overflow-tooltip width="150px" />
+      <el-table-column align="center" :label="t('ts.策略描述')" prop="description"  show-overflow-tooltip width="150px" />
+      <el-table-column align="center" :label="t('ts.优先级')" prop="priority" sortable width="120"/>
       <el-table-column align="center" :label="t('ts.状态')" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
+      vue
+      <el-table-column align="center" :label="t('ts.创建时间')" prop="createTime" width="200px" >
+        <template #default="scope">
+          {{ formatDate(scope.row.createTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="t('ts.创建人')" prop="creator" width="150px" />
+      <el-table-column align="center" :label="t('ts.最后更新时间')" prop="updateTime" width="200px" >
+        <template #default="scope">
+          {{ formatDate(scope.row.updateTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="t('ts.最后更新人')" prop="updater" width="150px" />
       <el-table-column align="center" :label="t('ts.操作')" fixed="right" width="240">
         <template #default="scope">
           <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
@@ -54,6 +67,7 @@ import { DICT_TYPE } from '@/utils/dict'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as RuleApi from '@/api/wms/rule'
 import AddForm from './AddForm.vue'
+import dayjs from 'dayjs'
 
 defineOptions({ name: 'SupplieDeliveryStrategy' })
 const queryFormRef = ref() // 搜索的表单
@@ -165,6 +179,14 @@ const buttonTableClick = (val, row) => {
   }
 }
 
+//时间格式化
+const formatDate = (date) => {
+  if (!date) return ''; // 处理空值
+  return dayjs(date).format('YYYY-MM-DD HH:mm:ss'); // 根据需求格式化
+}
+
+
+
 /** 初始化 **/
 onMounted(() => {
   getList()
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
index 36a8f3d43..a650b8ced 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts
@@ -17,6 +17,9 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
     label: '供应商代码',
     field: 'supplierCode',
     sort: 'custom',
+    table: {
+      width: 150,
+    },
     isSearch: true,
     form: {
       componentProps: {
@@ -151,6 +154,44 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
       },
     }
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    table: {
+      width: 200,
+    },
+    formatter: dateFormatter,
+    isForm:false,
+  },
+  {
+    label: '创建人',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isForm:false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    table: {
+      width: 200,
+    },
+    formatter: dateFormatter,
+    isForm:false,
+  },
+  {
+    label: '最后更新人',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isForm:false,
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
index 841fa0727..e3d030079 100644
--- a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
+++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts
@@ -226,6 +226,12 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '创建人',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 86762ce33..940d6f7fd 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -666,7 +666,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      isTable:false,
     },
     {
       label: '创建者',
@@ -1081,16 +1082,6 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       sortTableDefault: 1012,
       hiddenInMain: true
     },
-    {
-      label: '创建者',
-      field: 'creator',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      hiddenInMain: true,
-      sortTableDefault: 1012
-    },
     {
       label: '创建时间',
       field: 'createTime',
@@ -1110,7 +1101,17 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
           valueFormat: 'x'
         }
       },
-      hiddenInMain: true,
+      hiddenInMain: false,
+      sortTableDefault: 1012
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: false,
       sortTableDefault: 1012
     },
     {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
index d9ccb8704..f50117219 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts
@@ -911,16 +911,6 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault: 1007,
     hiddenInMain: true
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault: 1014,
-    hiddenInMain: true,
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -932,7 +922,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    hiddenInMain: true,
+    hiddenInMain: false,
     sortTableDefault: 1014,
     form: {
       component: 'DatePicker',
@@ -943,6 +933,16 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 1014,
+    hiddenInMain: false,
+  },
 
 ]))
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index f29ccf027..00647dec5 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -276,7 +276,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
-    isTable:true,
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -806,16 +806,6 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       min: 0
     }
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    isTableForm: false,
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isForm: false,
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -828,7 +818,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    hiddenInMain:true,
+    hiddenInMain:false,
     isForm: false,
     form: {
       component: 'DatePicker',
@@ -841,48 +831,58 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '最后更新者',
-    field: 'updater',
-    isTableForm: false,
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isForm: false,
-    // form: {
-    //   component: 'DatePicker',
-    //   componentProps: {
-    //     style: {width:'100%'},
-    //     type: 'datetime',
-    //     dateFormat: 'YYYY-MM-DD HH:mm:ss',
-    //     valueFormat: 'x',
-    //   }
-    // }
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
+    label: '创建者',
+    field: 'creator',
     isTableForm: false,
-    isTable: true,
-    hiddenInMain:true,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     table: {
       width: 150
     },
+    hiddenInMain:false,
     isForm: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    }
   },
+  // {
+  //   label: '最后更新时间',
+  //   field: 'updateTime',
+  //   isTableForm: false,
+  //   isTable: true,
+  //   hiddenInMain:false,
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '最后更新者',
+  //   field: 'updater',
+  //   isTableForm: false,
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:false,
+  //   isForm: false,
+  //   // form: {
+  //   //   component: 'DatePicker',
+  //   //   componentProps: {
+  //   //     style: {width:'100%'},
+  //   //     type: 'datetime',
+  //   //     dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //   //     valueFormat: 'x',
+  //   //   }
+  //   // }
+  // },
   {
     label: '备注',
     hiddenInMain:true,
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
index d9b4fa50e..91c16dbe6 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
@@ -737,6 +737,34 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  // {
+  //   label: '最后操作时间',
+  //   field: 'updateTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '最后操作人',
+  //   field: 'updater',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '操作',
     hiddenInMain:true,
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 321782718..a5e91400f 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -345,7 +345,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
-    isTable:true,
+    isTable:false,
     table: {
       width: 180
     },
@@ -1169,7 +1169,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-    hiddenInMain:true,
+    hiddenInMain:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -1193,45 +1193,45 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-    hiddenInMain:true,
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
+    hiddenInMain:false,
     isTableForm: false,
     isForm: false,
   },
+  // {
+  //   label: '最后更新时间',
+  //   field: 'updateTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       style: { width: '100%' },
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  //   hiddenInMain:false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  // },
+  // {
+  //   label: '最后更新者',
+  //   field: 'updater',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:false,
+  //   isTableForm: false,
+  //   isForm: false,
+  // },
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/supplierManage/invoicingcalendar/invoicingcalendar.data.ts b/src/views/wms/supplierManage/invoicingcalendar/invoicingcalendar.data.ts
index 64274deec..6884ce35f 100644
--- a/src/views/wms/supplierManage/invoicingcalendar/invoicingcalendar.data.ts
+++ b/src/views/wms/supplierManage/invoicingcalendar/invoicingcalendar.data.ts
@@ -57,22 +57,6 @@ export const Invoicingcalendar = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    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')]
-      }
-    },
-    isForm: false,
-    isTable: false,
-  },
   {
     label: '扩展属性',
     field: 'extraProperties',
@@ -98,6 +82,29 @@ export const Invoicingcalendar = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm:false,
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    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')]
+      }
+    },
+    isForm: false,
+    isTable: true,
+  },
+  {
+    label: '创建人',
+    field: 'creator',
+    sort: 'custom',
+    isTable: true,
+    isForm:false,
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts
index 5f870287d..4c1af65b8 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts
@@ -211,7 +211,6 @@ export const SupplierApbalanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false,
   },
   {
     label: '备注',
diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
index 146393b1e..8a4420f45 100644
--- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
+++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts
@@ -159,7 +159,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
-    isTable: false,
+    isTable: true,
     isForm:false,
     isDetail:false,
     search: {
@@ -170,7 +170,15 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false,
+  },
+  {
+    label: '创建人',
+    field: 'creator',
+    sort: 'custom',
+    isSearch: false,
+    isTable: true,
+    isForm:false,
+    isDetail:false,
   },
   {
     label: '部门id',

From 542dc85c483bc8474c9e55a673786c340949c4ec Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Tue, 10 Sep 2024 17:42:17 +0800
Subject: [PATCH 03/12] =?UTF-8?q?1=E3=80=81=E5=AF=86=E7=A0=81=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=E6=8F=90=E7=A4=BA=E4=BF=9D=E7=95=99=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/LoginForm.vue | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index 578cd990c..7efa0705c 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -258,18 +258,15 @@
       }
 
       console.log('登陆res',res)
-      try{
-        await PassWordApi.validateResetTime(res.userId)
-      }catch (e) {
-        if (e.code === 1002000010) {
-          await ElMessageBox.alert(
-            '<strong>密码长时间未修改，存在安全隐患,请及时修改</strong>',
-            '重要提示',
-            {
-              dangerouslyUseHTMLString: true,
-            }
-          )
-        }
+      const msg = await PassWordApi.validateResetTime(res.userId)
+      if(msg){
+        await ElMessageBox.alert(
+          '<strong>'+msg+'</strong>',
+          '重要提示',
+          {
+            dangerouslyUseHTMLString: true,
+          }
+        )
       }
       if (!res) {
         console.log('登录-195')

From c5d174b22d8410c15c7cb91d87d4bf526cb68ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 10 Sep 2024 18:34:25 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E6=B6=88=E8=80=97QAD=E5=9B=9E=E4=BC=A0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backflushDetailbQad/backflushDetailbQad.data.ts         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
index 01ee0aa4e..3d3ed2f4a 100644
--- a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
+++ b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
@@ -96,6 +96,12 @@ export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
     },
 
   },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
   {
     label: '操作',
     field: 'action',

From b0bc5e660dda46b86f2226ce8e82eaa7bc28ee72 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 11 Sep 2024 07:16:19 +0800
Subject: [PATCH 05/12] =?UTF-8?q?HL-5853=20=E5=88=97=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E4=BC=A0=E5=B1=A5=E5=8E=86=E8=A1=A8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                          |  1 +
 src/locales/zh-CN.ts                          |  1 +
 .../supplierdeliverInspectionDetail.data.ts   | 29 ++++++++++++
 .../supplierdeliverRequestMain/index.vue      | 47 ++++++++++++++++++-
 4 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index fc6ef45c2..e28458942 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -760,6 +760,7 @@ export default {
     变更记录:'Change Record',
     添加明细:'Add Detail',
     上传质量报告:'Upload quality report',
+    上传履历表:'Upload your resume',
     上传质检报告:'Upload the quality inspection report',
     个:'piece',
     张:'sheet',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index c414dad7f..d49e9eef2 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -760,6 +760,7 @@ export default {
     变更记录:'变更记录',
     添加明细:'添加明细',
     上传质量报告:'上传质量报告',
+    上传履历表:'上传履历表',
     上传质检报告:'上传质检报告',
     个:'个',
     张:'张',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index de8ce0f18..ab2006ea6 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -159,3 +159,32 @@ export const SupplierdeliverInspectionDetailRules = reactive({
     { required: true, message: '请输入发货数量', trigger: 'blur' }
   ],
 })
+
+
+export const CurriculumVitae = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '上传履历表',
+    field: 'uploadFile',
+    sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    form: {
+      component: 'UploadFile',
+      componentProps: {
+        upData:{
+          tableId: '',
+          tableName: 'SupplierdeliverInspectionDetail',
+        },
+        fileType:['pdf'],
+        fileSize:100,
+        limit:20000
+      }
+    },
+  }
+]))
+//表单校验
+export const CurriculumVitaeRules = reactive({
+  uploadFile: [
+    { required: true, message: '请上传文件', trigger: 'blur' }
+  ]
+})
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 0abaf2495..a6a42a6e1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -152,6 +152,14 @@
     @footButtonClick="footButtonClick"
     @formSelectChange="formSelectChangeLabel"
   />
+  <!-- 上传履历表 -->
+  <BasicForm
+    ref="curriculumVitaeRef"
+    :formAllSchemas="CurriculumVitae.allSchemas"
+    @success="submitCurriculumVitae"
+    :tableFormRules="CurriculumVitaeRules"
+    :isBusiness="false"
+  />
   <!-- 上传质量报告 -->
   <BasicForm
     ref="ploadQualityReportRef"
@@ -199,7 +207,9 @@ import {
 } from './supplierdeliverRequestMain.data'
 import {
   SupplierdeliverInspectionDetail,
-  SupplierdeliverInspectionDetailRules
+  SupplierdeliverInspectionDetailRules,
+  CurriculumVitae,
+  CurriculumVitaeRules
 } from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
 import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
@@ -534,6 +544,16 @@ const butttondata = (row, $index) => {
       hide: isShowMainButton(row, ['1', '2', '3']),
       hasPermi: 'wms:supplierdeliver-request-main:uploadCheck'
     }), // 上传质量报告
+    {
+      label: t('ts.上传履历表'),
+      name: 'mainPlanCurriculumVitae',
+      hide: row.status!=5,
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: '',
+      link: true // 文本展现按钮
+    }, // 上传履历表
     defaultButtons.mainListPlanSubBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:supplierdeliver-request-main:sub'
@@ -606,6 +626,9 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainPlanUploadQualityReport') {
     // 上传质量报告
     handleUploadQualityReport(row)
+  }else if (val == 'mainPlanCurriculumVitae') {
+    // 上传履历表
+    handleUploadCurriculumVitae(row)
   } else if (val == 'mainPlanSub') {
     // 提交审批
     handleSub(row.masterId)
@@ -948,6 +971,28 @@ const handleUploadQualityReport = async (row) => {
   //uploadQualityReportTableData.value = [tableFormKeys]
 }
 
+const curriculumVitaeRef = ref()
+const submitCurriculumVitae = async (formType, data) => {
+  console.log('上传履历表',data)
+
+}
+/** 上传质量报告 */
+const handleUploadCurriculumVitae = async (row) => {
+  const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(
+    (item) => item.field == 'uploadFile'
+  )
+  if (uploadFile) {
+    uploadFile['componentProps']['upData']['tableId'] = row.masterId
+  }
+  curriculumVitaeRef.value.open(
+    'create',
+    null,
+    { masterId: row.masterId },
+    t('ts.上传履历表'),
+    t('ts.上传履历表')
+  ) 
+}
+
 const submitFormUploadQualityReport = async (formType, data) => {
   delete data.number
   data.subList = uploadQualityReportTableData.value // 拼接子表数据参数

From 5ec05ab6d013aaf1f73d26147b4cb4bbff865e5b Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 11 Sep 2024 07:24:24 +0800
Subject: [PATCH 06/12] =?UTF-8?q?HL-5787@=E7=8E=8B=E5=AE=87=E9=A3=9E=20?=
 =?UTF-8?q?=E8=BF=99=E4=B8=AA=E9=A1=B5=E9=9D=A2=E4=BF=9D=E7=95=99=E4=B8=A4?=
 =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0=EF=BC=8C=E6=95=B0=E9=87=8F=EF=BC=8C?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrap/scrapRequestMain/scrapRequestMain.data.ts           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
index af258d4f2..72cc661b5 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts
@@ -1101,14 +1101,14 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         disabled:true,
         min: 0,
-        precision: 6,
+        precision: 2,
       }
     },
     tableForm: {
       type: 'InputNumber',
       disabled:true,
       min: 0,
-      precision: 6,
+      precision: 2,
     },
   },
   {

From 45c077dfb9fe8d0b02d3694726bb23a9c97251c4 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 11 Sep 2024 07:24:57 +0800
Subject: [PATCH 07/12] =?UTF-8?q?HL-5886=20=E7=8A=B6=E6=80=81=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/supplieDeliveryStrategy/AddForm.vue                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
index bdaa21638..bc92c9ffe 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
@@ -41,7 +41,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="t('ts.状态').replace('ts.','')" prop="status">
-                <el-switch key="status" v-model="formData.status" />
+                <el-switch key="status" v-model="formData.status" :disabled="formData.name=='默认规则'&&formType=='update'"/>
               </el-form-item>
             </el-col>
           </el-row>

From bbdeacee7dcfc23ab7d36f3adf1f68ce3ff32ee8 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 11 Sep 2024 07:32:11 +0800
Subject: [PATCH 08/12] =?UTF-8?q?HL-5833=E8=B0=83=E6=95=B4=E7=BA=BF?=
 =?UTF-8?q?=E8=BE=B9=E5=8E=9F=E6=96=99=E6=B6=88=E8=80=97=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E5=B7=A5=E6=94=B6=E8=B4=A7=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E5=8E=9F=E6=96=99?=
 =?UTF-8?q?=E6=B6=88=E8=80=97=E5=8D=95=E6=8D=AE=E5=92=8C=E6=B6=88=E8=80=97?=
 =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E5=8E=9F=E6=96=99=E5=BA=93=E5=AD=98=EF=BC=88?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=BC=80=E5=85=B3=E6=8E=A7=E5=88=B6=EF=BC=89?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=80=9A=E8=BF=87=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BB=8EQAD=E6=8E=A5=E6=94=B6=E7=BA=BF=E8=BE=B9?=
 =?UTF-8?q?=E5=8E=9F=E6=96=99=E6=B6=88=E8=80=97=E6=95=B0=E9=87=8F=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E7=85=A7FIFO=E5=8E=9F=E5=88=99=E6=89=A3?=
 =?UTF-8?q?=E5=87=8F=E7=BA=BF=E8=BE=B9=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backflushDetailbQad/backflushDetailbQad.data.ts   | 11 ++++++-----
 src/views/wms/agvManage/backflushDetailbQad/index.vue | 11 +++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
index 3d3ed2f4a..976b4c7b4 100644
--- a/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
+++ b/src/views/wms/agvManage/backflushDetailbQad/backflushDetailbQad.data.ts
@@ -11,11 +11,7 @@ export const BackflushDetailbQadRules = reactive({
 })
 
 export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-  },
+  
   {
     label: '制品收货记录单据号',
     field: 'productreceiptNumber',
@@ -102,6 +98,11 @@ export const BackflushDetailbQad = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
   },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+  },
   {
     label: '操作',
     field: 'action',
diff --git a/src/views/wms/agvManage/backflushDetailbQad/index.vue b/src/views/wms/agvManage/backflushDetailbQad/index.vue
index e1bda5667..e11d81aee 100644
--- a/src/views/wms/agvManage/backflushDetailbQad/index.vue
+++ b/src/views/wms/agvManage/backflushDetailbQad/index.vue
@@ -27,6 +27,10 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
+    
+      <template #qty="{row}">
+        <span :class="{'red-text':row.qty<0}">{{ row.qty}}</span>
+      </template>
       <template #status="{row}">
         <span>{{ row.status==0?'未执行':row.status==1?'成功':'失败'}}</span>
       </template>
@@ -258,3 +262,10 @@ onMounted(async () => {
 })
 
 </script>
+
+<style lang="scss" scoped>
+  .red-text{
+    color:var(--el-color-danger);
+    font-weight:700;
+  }
+</style>

From 1f7d06149beb6eae6949f46f4402faaafb85c395 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 11 Sep 2024 07:43:15 +0800
Subject: [PATCH 09/12] =?UTF-8?q?HL-5953SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=EF=BC=8C=E6=9C=AA=E7=A8=8E=E5=B0=BE=E5=B7=AE=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=AF=B9=E6=8A=98=E6=89=A3=E9=87=91=E9=A2=9D=E7=9A=84?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoice/supplierinvoiceRequestMain/index.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 3bf2ed2dd..eefb3f5c8 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -104,7 +104,7 @@
           formRef.value.setValues({
             afterTaxAmount: amount + taxAmount, // 3、系统价税合计：系统未税金额+系统税额
             adTaxAmount: beforeTaxAmount + totalTaxAmount, //6、价税合计金额：未税金额+税额
-            beforeTaxDiffAmount: beforeTaxAmount - amount - discountAmount1, //未税差额：未税金额-系统未税金额-折扣金额
+            beforeTaxDiffAmount: beforeTaxAmount - amount, //未税差额：未税金额-系统未税金额
             taxAmountDiff: totalTaxAmount - taxAmount, // 税额差异：税额-系统税额
             totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // 价税合计差额=未税差额+税额差异
             rebateTax:Number(Number(discountAmount1*taxRate*0.01).toFixed(2)),
@@ -132,7 +132,7 @@
             taxAmount: taxAmount_,
             afterTaxAmount: amount + taxAmount, // 3、系统价税合计：系统未税金额+系统税额
             adTaxAmount: beforeTaxAmount + totalTaxAmount, //6、价税合计金额：未税金额+税额
-            beforeTaxDiffAmount: beforeTaxAmount - amount - discountAmount1, //未税差额：未税金额-系统未税金额-折扣金额
+            beforeTaxDiffAmount: beforeTaxAmount - amount, //未税差额：未税金额-系统未税金额
             taxAmountDiff: totalTaxAmount - taxAmount, // 税额差异：税额-系统税额
             totalTaxDiffAmount: beforeTaxDiffAmount + taxAmountDiff, // 价税合计差额=未税差额+税额差异
             rebateTax:Number(Number(discountAmount1*taxRate*0.01).toFixed(2)),

From 53d08c5736fb0633a79f798ce7707b1be0ed6bf2 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 11 Sep 2024 07:44:04 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=96=87=E6=A1=A3=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eadbc6402..99e590948 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ dictType: DICT_TYPE.INVENTORY_STATUS,
 dictClass: 'string',
 dictAllOption:true,// true 字典中--下拉框中展示全选按钮
 dictAllValue:'全选', // 全选按钮的value值
-hiddenSearchHigh?: boolean // 是否隐藏高级筛选
+hiddenSearchHigh: boolean // 是否隐藏高级筛选
 
 **form表单查询弹窗配置**
 form: {

From c97d2e7ae2636bf0be77f147e5a901da52b35de2 Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 11 Sep 2024 07:46:46 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=B1=A5=E5=8E=86?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8B=E6=AC=A1=E5=86=8D=E5=B8=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index a6a42a6e1..13f171714 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -544,16 +544,16 @@ const butttondata = (row, $index) => {
       hide: isShowMainButton(row, ['1', '2', '3']),
       hasPermi: 'wms:supplierdeliver-request-main:uploadCheck'
     }), // 上传质量报告
-    {
-      label: t('ts.上传履历表'),
-      name: 'mainPlanCurriculumVitae',
-      hide: row.status!=5,
-      type: 'primary',
-      icon: '',
-      color: '',
-      hasPermi: '',
-      link: true // 文本展现按钮
-    }, // 上传履历表
+    // {
+    //   label: t('ts.上传履历表'),
+    //   name: 'mainPlanCurriculumVitae',
+    //   hide: row.status!=5,
+    //   type: 'primary',
+    //   icon: '',
+    //   color: '',
+    //   hasPermi: '',
+    //   link: true // 文本展现按钮
+    // }, // 上传履历表
     defaultButtons.mainListPlanSubBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:supplierdeliver-request-main:sub'

From 55a7b1b64bbc59af18665102e3388a1c7a1148cc Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Wed, 11 Sep 2024 07:52:11 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scrapRecordMain/scrapRecordMain.data.ts   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
index 6dd8ad0be..23c449522 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts
@@ -383,17 +383,17 @@ export const ScrapRecordMain = useCrudSchemas(
         width: 150
       }
     },
-    {
-      label: '接口类型',
-      field: 'interfaceType',
-      dictType: DICT_TYPE.INTERFACE_TYPE,
-      dictClass: 'string',
-      isTable: true,
-      sort: 'custom',
-      table: {
-        width: 150
-      }
-    },
+    // {
+    //   label: '接口类型',
+    //   field: 'interfaceType',
+    //   dictType: DICT_TYPE.INTERFACE_TYPE,
+    //   dictClass: 'string',
+    //   isTable: true,
+    //   sort: 'custom',
+    //   table: {
+    //     width: 150
+    //   }
+    // },
     {
       label: '通知单描述',
       field: 'noticeRemark',