YT-275：新增模具分摊功能

src/api/wms/customer/index.ts

@@ -35,6 +35,11 @@ export const getCustomerPage = async (params) => {
 export const getCustomerList = async (params) => {
   return await request.get({ url: `/wms/customer/list`, params })
 }
+
+// 查询客户列表
+export const getCustomerListPc = async (params) => {
+  return await request.get({ url: `/wms/customer/listPc`, params })
+}
 // 查询客户详情
 export const getCustomer = async (id: number) => {
   return await request.get({ url: `/wms/customer/get?id=` + id })

src/components/ImportForm/src/ImportCustomerStatementForm.vue

@@ -318,7 +318,6 @@ const verifyData = async () => {
     // buttonBaseClick('refresh',null)
   } catch {
     //取消走的
-    alert(123);
   }
   }else if(data.status==3){
     await message.alertWarning('已存在相同客户编号及年月的对账单，且已提交，无法导入。')
@@ -438,7 +437,7 @@ const queryParams = reactive({
 
 const getCustomerList = async () => {//获取客户列表
   var param ={}
-  const list = await CustomerApi.getCustomerList(param);
+  const list = await CustomerApi.getCustomerListPc(param);
   customerList.value = list;
 } 
 

src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts

@@ -62,15 +62,15 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '年月',
-    field: 'yearsMonthStr',
-    sort: 'custom',
-    detail: {
-      dateFormat: 'YYYY-MM'
-    },
-    isForm:false,
-  },
+  // {
+  //   label: '年月',
+  //   field: 'yearsMonthStr',
+  //   sort: 'custom',
+  //   detail: {
+  //     dateFormat: 'YYYY-MM'
+  //   },
+  //   isForm:false,
+  // },
   {
     label: '状态',
     field: 'status',
@@ -92,12 +92,26 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
-    sort: 'custom',
+    isTable:true,
     formatter: dateFormatter,
-    isSearch: false,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
+    isSearch: true,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -106,7 +120,6 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false,
   },
   {
     label: '操作',
@@ -283,9 +296,10 @@ export const CustomerStatementReconciliation = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '验收日期',
-    field: 'acceptCheckTime',
+    field: 'checkTime',
     sort: 'custom',
     isForm: false,
+    formatter: dateFormatter,
   },
   {
     label: '订单号',
@@ -295,7 +309,7 @@ export const CustomerStatementReconciliation = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '数量-INTEX',
-    field: 'tftmQuantity',
+    field: 'intexQuantity',
     sort: 'custom',
     isForm: false,
   },
@@ -398,7 +412,7 @@ export const CustomerStatementShareReconciliation = useCrudSchemas(reactive<Crud
   },
   {
     label: '模具分摊金额',
-    field: 'allocationPrice',
+    field: 'amount',
     sort: 'custom',
     isForm: false,
   },

src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue

@@ -293,7 +293,7 @@ const butttondata = (row, $index) => {
       hide: isShowMainButton(row, ['3', '4', '5'])
     }), // 退回
     defaultButtons.mainListCancelBtn({
-      hasPermi: 'wms:customer-statement-main:publish',
+      hasPermi: 'wms:customer-statement-main:nodeAbrogate',
       hide: isShowMainButton(row, ['2', '3', '4', '5'])
     }) // 作废
   ]
@@ -432,7 +432,10 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
+  //客户对账单
   importTemplateData.templateUrl = await CustomerStatementMainApi.importTemplate()
+  //模具分摊对账单
+  importShareTemplateData.templateUrl = await CustomerStatementMainApi.importShareTemplate()
 })
 //点击重新比对方法
 const tapRematch = async (id: number) => {

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -882,7 +882,7 @@ const openForm = async (type: string, row?: any) => {
       if (
         item.field == 'taxRate' ||
         item.field == 'procurementCreator' ||
-        item.field == 'beforeTaxAmount' ||
+        // item.field == 'beforeTaxAmount' ||
         item.field == 'totalTaxAmount' ||
         item.field == 'goldenTaxInvoiceNumber' ||
         item.field == 'invoiceTime' ||