Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/api/wms/customerStatementDetail/index.ts

@@ -45,7 +45,16 @@ export const getCustomerStatementDetailPage = async (params) => {
     return await request.get({ url: `/wms/customer-statement-detail/page`, params })
   }
 }
-
+// 查询客户对账单子信息明细表（WMS）列表或者查询客户对账单对账差异列表 二者共用一个
+export const getCustomerStatementReconciliationPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return await request.post({ url: '/wms/customer-statement-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/customer-statement-detail/page`, params })
+  }
+}
 // 查询客户对账单子信息表（WMS）详情
 export const getCustomerStatementDetail = async (id: number) => {
   return await request.get({ url: `/wms/customer-statement-detail/get?id=` + id })

src/api/wms/productreceiptRequestMain/index.ts

@@ -84,7 +84,7 @@ export const deleteProductreceiptRequestMain = async (id: number) => {
 
 // 导出制品收货申请主 Excel
 export const exportProductreceiptRequestMain = async (params) => {
-  params.type = 'predict'
+  params.type = 'scrap'
   if (params.isSearch) {
     const data = {...params}
     return await request.downloadPost({ url: `/wms/productreceipt-request-main/export-excel-senior`, data })

src/components/Detail/src/Detail.vue

@@ -912,6 +912,9 @@ const buttonBaseClick = (val, item) => {
     }else{
       openForm('create')
     }
+  }  else if (val == 'export') {
+    // 刷新
+    emit('buttonBaseClick',val, item,tableObject)
   } else if (val == 'refresh') {
     // 刷新
     getList()

src/components/ImportForm/src/ImportCustomerStatementForm.vue

@@ -2,34 +2,38 @@
 <template>
   <Dialog v-model="dialogVisible" :title="t('ts.导入')" width="600" :close-on-click-modal="false">
     <el-form
-  :inline="true"
+      :inline="true"
-  :model="queryParams"
+      :model="queryParams"
-  class="demo-form-inline"
+      class="demo-form-inline"
-  style="margin-bottom: 10px"
+      style="margin-bottom: 10px"
-  label-width="100px"
+      label-width="70px"
->
-  <el-form-item label="客户代码" style="margin-right: 20px;">
-    <el-select
-      v-model="queryParams.customerCode"
-      placeholder="请选择客户代码"
-      clearable
-      style="width: 100px"
     >
-      <el-option v-for="(item) in customerList" :key="item.code" :label="item.name" :value="item.code" />
+      <el-row>
-    </el-select>
+        <el-col :span="12">
-  </el-form-item>
+          <el-form-item label="客户代码">
-  
+            <el-select
-  <el-form-item label="年月" style="margin-right: 20px;">
+              v-model="queryParams.customerCode"
-    <el-date-picker
+              placeholder="请选择客户代码"
-      v-model="queryParams.yearsMonthStr"
+              clearable
-      type="month"
+            >
-      placeholder="选择年月"
+              <el-option v-for="(item) in customerList" :key="item.code" :label="item.name" :value="item.code" />
-      format="YYYY-MM"
+            </el-select>
-      value-format="YYYY-MM"
+          </el-form-item>
-      style="width: 100%">
+        </el-col>
-    </el-date-picker>
+        <el-col :span="12">
-  </el-form-item>
+          <el-form-item label="年月">
-</el-form>
+            <el-date-picker
+              v-model="queryParams.yearsMonthStr"
+              type="month"
+              placeholder="选择年月"
+              format="YYYY-MM"
+              value-format="YYYY-MM"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
     <el-upload
       ref="uploadRef"
       v-model:file-list="fileList"

src/locales/en-US.ts

@@ -1302,7 +1302,14 @@ export default {
     可开票数量范围是: 'The range of invoices is',
     重新对比: 'Re compare',
     确认对比结果: 'Confirm the comparison results',
-    确认分摊金额: 'Confirm the shared amount'
+    确认分摊金额: 'Confirm the shared amount',
+    导入模具分摊对账单: 'Import mold allocation statement',
+    是否重新比对: 'Do you want to re compare?',
+    是否确认对比结果: 'Are you sure about the comparison results?',
+    是否退回: 'Do you want to return it?',
+    是否作废: 'Do you want to invalidate it?',
+    是否确认分摊金额: 'Do you want to confirm the allocation amount?',
+    创建开票申请: 'Create an invoice request?',
   },
 
 

src/locales/zh-CN.ts

@@ -1301,8 +1301,16 @@ export default {
     发票回转成功: '发票回转成功',
     最后更新人:'最后更新人',
     可开票数量范围是: '可开票数量范围是',
+    重新对比: '重新对比',
     确认对比结果: '确认对比结果',
-    确认分摊金额: '确认分摊金额'
+    确认分摊金额: '确认分摊金额',
+    导入模具分摊对账单: '导入模具分摊对账单',
+    是否重新比对: '是否重新比对？',
+    是否确认对比结果: "是否确认对比结果？",
+    是否退回: '是否退回？',
+    是否作废: '是否作废？',
+    是否确认分摊金额: '是否确认分摊金额？',
+    创建开票申请: '创建开票申请',
   },
 
 }

src/utils/disposition/defaultButtons.ts

@@ -470,7 +470,7 @@ export function mainListCancelBtn(option: any) {
     label: t(`ts.作废`).replace('ts.', ''),
     name: 'cancel',
     hide: false,
-    type: 'primary',
+    type: 'danger',
     color: '',
     link: true, // 文本展现按钮
     hasPermi: ''

src/views/login/components/LoginForm.vue

@@ -307,16 +307,16 @@
         authUtil.removeLoginForm()
       }
       authUtil.setToken(res)
-      if(getSystermUpdateAlert()=='true'||getSystermUpdateAlert()===true){
+      // if(getSystermUpdateAlert()=='true'||getSystermUpdateAlert()===true){
-        await ElMessageBox.alert(
+      //   await ElMessageBox.alert(
-          '<strong>系统迁移，请移步至</strong>' +
+      //     '<strong>系统迁移，请移步至</strong>' +
-          `<a href=${getSystermUpdateUrl()} target="_blank">${getSystermUpdateUrl()}</a>`,
+      //     `<a href=${getSystermUpdateUrl()} target="_blank">${getSystermUpdateUrl()}</a>`,
-          '重要提示',
+      //     '重要提示',
-          {
+      //     {
-            dangerouslyUseHTMLString: true,
+      //       dangerouslyUseHTMLString: true,
-          }
+      //     }
-        )
+      //   )
-      }
+      // }
       if (!redirect.value) {
         redirect.value = '/'
       }

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

@@ -25,7 +25,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
   },
   {
-    label: '客户编号',
+    label: '客户代码',
     field: 'customerCode',
     sort: 'custom',
     isSearch: true,
@@ -53,13 +53,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM'
     },
-    table: {
+    isTable:false,
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'YYYY-MM'
-      }
-    },
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -68,6 +62,15 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '年月',
+    field: 'yearsMonthStr',
+    sort: 'custom',
+    detail: {
+      dateFormat: 'YYYY-MM'
+    },
+    isForm:false,
+  },
   {
     label: '状态',
     field: 'status',
@@ -80,145 +83,12 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'Select',
     },
   },
+ 
   {
-    label: '重新比对时间',
+    label: '创建者',
-    field: 'comparisonTime',
-    sort: 'custom',
-    isTable:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '发布时间',
-    field: 'publishTime',
-    sort: 'custom',
-    isTable:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '已分摊时间',
-    field: 'shareTime',
-    sort: 'custom',
-    isTable:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '待开票时间',
-    field: 'beInvoicedTime',
-    sort: 'custom',
-    isTable:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '开票中时间',
-    field: 'invoicedTime',
-    sort: 'custom',
-    isTable:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '已开票时间',
-    field: 'issuedInvoicedTime',
-    sort: 'custom',
-    isTable:false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '已作废时间',
-    field: 'abrogateTime',
-    sort: 'custom',
-    isTable:false,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    formatter: dateFormatter,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
-  },
-  {
-    label: '操作人',
     field: 'creator',
     sort: 'custom',
   },
-  {
-    label: '版本号',
-    field: 'versionNumber',
-    sort: 'custom',
-  },
-  // {
-  //   label: '备注',
-  //   field: 'remark',
-  //   sort: 'custom',
-  // },
-  // {
-  //   label: '是否可用默认TRUE',
-  //   field: 'available',
-  //   sort: 'custom',
-  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -238,23 +108,13 @@ export const CustomerStatementMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
-  // {
-  //   label: '地点ID',
-  //   field: 'siteId',
-  //   sort: 'custom',
-  // },
-  // {
-  //   label: '并发乐观锁',
-  //   field: 'concurrencyStamp',
-  //   sort: 'custom',
-  // },
   {
     label: '操作',
     isDetail:false,
     field: 'action',
     isForm: false,
     table: {
-      width: 300,
+      width: 360,
       fixed: 'right'
     }
   }
@@ -282,9 +142,6 @@ export const CustomerStatementDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '开票种类',
     field: 'invoiceType',
     sort: 'custom',
-    form: {
-      component: 'SelectV2'
-    },
     isForm: false,
   },
   {
@@ -396,14 +253,14 @@ export const CustomerStatementReconciliation = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '背番',
-    field: 'articleName',
+    field: 'backNumber',
     sort: 'custom',
     isSearch: true,
     isForm: false,
   },
   {
     label: '出荷日期',
-    field: 'checkTime',
+    field: 'dischargingTime',
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: true,
@@ -426,7 +283,7 @@ export const CustomerStatementReconciliation = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '验收日期',
-    field: 'uom',
+    field: 'checkTime',
     sort: 'custom',
     isForm: false,
   },
@@ -449,7 +306,7 @@ export const CustomerStatementReconciliation = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '数量差异',
-    field: 'amount',
+    field: 'quantityVariance',
     sort: 'custom',
   },
   {
@@ -465,7 +322,7 @@ export const CustomerStatementReconciliation = useCrudSchemas(reactive<CrudSchem
   {
     label: '单价差异',
     field: 'amount',
-    sort: 'custom',
+    sort: 'priceVariance',
   },
   {
     label: '金额-INTEX',
@@ -479,7 +336,7 @@ export const CustomerStatementReconciliation = useCrudSchemas(reactive<CrudSchem
   },
   {
     label: '金额差异',
-    field: 'amount',
+    field: 'amountVariance',
     sort: 'custom',
   },
   {

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

@@ -60,7 +60,7 @@
     :tableObjectExtend="tableObjectExtend"
     @buttonBaseClick="detailButtonBaseClick"
   >
-    <template #qty="{row}">
+    <template #qty="{row}" v-if="tabCurrent.prop == 'ShareReconciliation'">
       <span :style="{color:row.qty>0?'red':row.qty<0?'#409eff':'#000'}">{{ row.qty }}</span>
     </template>
     <template #amount="{row}" v-if="tabCurrent.prop == 'ShareReconciliation'">
@@ -72,6 +72,7 @@
   </Detail>
   <!-- 导入 -->
   <ImportCustomerStatementForm ref="importFormRef" url="/wms/customer-statement-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportCustomerStatementShareForm ref="importShareFormRef" url="/wms/customer-tool-apport-statement-detail/import" :importTemplateData="importShareTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">
@@ -83,6 +84,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportCustomerStatementForm from '@/components/ImportForm/src/ImportCustomerStatementForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import ImportCustomerStatementShareForm from '@/components/ImportForm/src/ImportCustomerStatementShareForm.vue'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'CustomerStatementMain' })
 
@@ -125,10 +128,8 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   //defaultButtons.defaultAddBtn({hasPermi:'wms:customerStatementMain:create'}), // 新增
-  //defaultButtons.defaultImportBtn({hasPermi:'wms:customerStatementMain:import'}), // 导入
+  defaultButtons.defaultImportBtn({hasPermi:'wms:customer-statement-main:import'}), // 导入
-  //defaultButtons.defaultExportBtn({hasPermi:'wms:customerStatementMain:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:customer-statement-main:export'}), // 导出
-  defaultButtons.defaultImportBtn(null), // 导入
-  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -168,37 +169,55 @@ const butttondata = (row, $index) => {
     // defaultButtons.mainListEditBtn({hasPermi:'wms:customerStatementMain:update'}), // 编辑
     // defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerStatementMain:delete'}), // 删除
     { 
-      label: t('重新比对'),
+      label: t('ts.重新对比'),
       name: 'rematch',
       hide: isShowMainButton(row, ['2']),
       type: 'primary',
       icon: '',
       color: '',
-      hasPermi: '',
+      hasPermi: 'wms:customer-statement-main:recontrast',
       link: true // 文本展现按钮
     },
     {
-      label: t('确认对比结果'),
+      label: t('ts.确认对比结果'),
       name: 'confirmationContrast',
       hide: isShowMainButton(row, ['2']),
       type: 'primary',
       icon: '',
       color: '',
-      hasPermi: '',
+      hasPermi: 'wms:customer-statement-main:confirmationContrast',
       link: true // 文本展现按钮
     },
-    defaultButtons.mainSendBackBtn({ hide: isShowMainButton(row, ['3','4','5']) }), // 退回
-    //defaultButtons.mainListCancelBtn({ hide: isShowMainButton(row, ['2','3','4','5']), hasPermi: 'wms:purchase-plan-main:update' }), // 作废
-    defaultButtons.mainListCancelBtn({ hide: isShowMainButton(row, ['2','3','4','5'])}), // 作废
     {
-      label: t('导入'),
+      label:  t('ts.导入模具分摊对账单'),
-      name: 'import',
+      name: 'importShareReconciliation',
       hide: isShowMainButton(row, ['3','4']),
-      type: 'warning',
+      type: 'primary',
+      color: '',
+      hasPermi: 'wms:customer-statement-main:import',
+      link: true // 文本展现按钮
+    },
+    {
+      label: t('ts.确认分摊金额'),
+      name: 'confirmShareMoney',
+      hide: isShowMainButton(row, ['4']),
+      type: 'primary',
+      color: '',
+      hasPermi: 'wms:customer-statement-main:confirmationShare',
+      link: true // 文本展现按钮
+    },
+    {
+      label: t('ts.创建开票申请'),
+      name: 'createTicketApply',
+      hide: isShowMainButton(row, ['5']),
+      type: 'primary',
       color: '',
       hasPermi: '',
       link: true // 文本展现按钮
     },
+    defaultButtons.mainSendBackBtn({hasPermi: 'wms:customer-statement-main:sendBack', hide: isShowMainButton(row, ['3','4','5']) }), // 退回
+    defaultButtons.mainListCancelBtn({ hasPermi: 'wms:customer-statement-main:publish',hide: isShowMainButton(row, ['2','3','4','5'])}), // 作废
+   
 
   ]
 }
@@ -209,12 +228,16 @@ const buttonTableClick = async (val, row) => {
     tapRematch(row.id);
   } else if (val == 'confirmationContrast') { // 确认对比结果
     tapConfirmationContrast(row.id)
+  } else if (val == 'importShareReconciliation') { // 导入模具分摊对账单、
+    handleShareImport(row.id)
+  } else if (val == 'confirmShareMoney') { // 确认分摊金额
+    handleConfirmShareMoney(row.id)
+  } else if (val == 'createTicketApply') { // 创建开票申请
+    // handleConfirmShareMoney(row.id)
   }else if (val == 'sendBack') { // 退回
     tapSendBack(row.id)
   }else if (val == 'cancel') { // 作废
     tapCancel(row.id)
-  }else if (val == 'import') { // 导入
-    handleDelete(row.id)
   }
 }
 
@@ -277,8 +300,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await CustomerStatementMainApi.exportCustomerStatementMain(tableObject.params)
-    download.excel(data, '客户对账单主信息表（WMS）.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -287,13 +311,25 @@ const handleExport = async () => {
 
 /** 导入 */
 const importFormRef = ref()
+//导入客户模具分摊对账单
+const importShareFormRef = ref()
 const handleImport = () => {
   importFormRef.value.open()
 }
+const handleShareImport = (id:number) => {
+  importShareTemplateData.customerId = id
+  importShareFormRef.value.open()
+}
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '客户对账单导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
+})
+//导入客户模具对账单参数
+const importShareTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '模具分摊对账单导入模版.xlsx',
+  customerId: 0
 })
 // 导入成功之后
 const importSuccess = () => {
@@ -318,7 +354,7 @@ onMounted(async () => {
 const tapRematch = async (id:number) => {
   try {
     // 确认
-    await message.confirm('是否重新比对')
+    await message.confirm( t('ts.是否重新比对'))
     await CustomerStatementMainApi.recontrast(id);
     // 发起导出
     //exportLoading.value = true
@@ -333,7 +369,7 @@ const tapRematch = async (id:number) => {
 //点击确认对比方法
 const tapConfirmationContrast = async (id:number) => {
   try {
-    await message.confirm('是否确认对比结果')
+    await message.confirm( t('ts.是否确认对比结果'))
     await CustomerStatementMainApi.confirmationContrast(id);
     // 发起导出
     //exportLoading.value = true
@@ -348,7 +384,7 @@ const tapConfirmationContrast = async (id:number) => {
 //点击退回方法
 const tapSendBack = async (id:number) => {
   try {
-    await message.confirm('是否退回')
+    await message.confirm(t('ts.是否退回'))
     await CustomerStatementMainApi.sendBack(id);
     // 发起导出
     //exportLoading.value = true
@@ -363,7 +399,7 @@ const tapSendBack = async (id:number) => {
 //点击作废方法
 const tapCancel = async (id:number) => {
   try {
-    await message.confirm('是否作废')
+    await message.confirm(t('ts.是否作废'))
     await CustomerStatementMainApi.nodeAbrogate(id);
     // 发起导出
     //exportLoading.value = true
@@ -374,14 +410,23 @@ const tapCancel = async (id:number) => {
     await getList()
   }
 }
-
+// 确认分摊金额
-  // 根据状态返回该按钮是否显示
+const handleConfirmShareMoney = async (id:number) => {
-  const isShowMainButton = (row, val) => {
+   try {
-    if (val.indexOf(row.status) > -1) {
+    await message.confirm(t('ts.是否确认分摊金额'))
-      return false
+    await CustomerStatementMainApi.confirmationShare(id);
-    } else {
+  } finally {
-      return true
+    // 刷新列表
-    }
+    await getList()
+  }
+}
+// 根据状态返回该按钮是否显示
+const isShowMainButton = (row, val) => {
+  if (val.indexOf(row.status) > -1) {
+    return false
+  } else {
+    return true
+  }
 }
 const tabCurrent = ref({})
 const changeTabs = async (item) => {
@@ -398,12 +443,12 @@ const changeTabs = async (item) => {
     DetailAllSchemas.value = CustomerStatementDetail.allSchemas
      otherHeadButttonData.value = [{
         label: t(`ts.导出`).replace('ts.', ''),
-        name: 'exportDetail',
+        name: 'export',
         hide: false,
         type: 'success',
         icon: 'ep:download',
         color: '',
-        hasPermi: ''
+        hasPermi: 'wms:customer-statement-main:export'
       }]
   } else  if (item.prop == 'Reconciliation') {
     // 点击对账差异按钮
@@ -414,7 +459,7 @@ const changeTabs = async (item) => {
       value: chooseRow.value.id
     }]
     DetailAllSchemas.value = CustomerStatementReconciliation.allSchemas
-    apiPage.value = CustomerStatementMainApi.getCustomerStatementMainPage
+    apiPage.value = CustomerStatementDetailApi.getCustomerStatementReconciliationPage
     otherHeadButttonData.value = [
       {
         label: t(`ts.导出`).replace('ts.', ''),
@@ -423,24 +468,24 @@ const changeTabs = async (item) => {
         type: 'success',
         icon: 'ep:download',
         color: '',
-        hasPermi: ''
+        hasPermi: 'wms:customer-statement-main:export'
       },
       {
-        label:'重新对比',
+        label: t('ts.重新对比'),
         name: 'againContrast',
-        hide: false,
+        hide: isShowMainButton( chooseRow.value, ['2']),
         type: 'primary',
         color: '',
         float:'left',
-        hasPermi: ''
+        hasPermi: 'wms:customer-statement-main:recontrast'
       },{
         label: t('ts.确认对比结果'),
         name: 'confirmResults',
-        hide: false,
+        hide: isShowMainButton( chooseRow.value, ['2']),
         type: 'primary',
         color: '',
         float:'left',
-        hasPermi: ''
+        hasPermi: 'wms:customer-statement-main:confirmationContrast'
       }]
   } else if (item.prop == 'ShareReconciliation') {
     // 点击模具分摊对账单按钮
@@ -453,23 +498,23 @@ const changeTabs = async (item) => {
     apiPage.value = CustomerStatementDetailApi.getCustomerStatementDetailPage
     DetailAllSchemas.value = CustomerStatementShareReconciliation.allSchemas
     otherHeadButttonData.value = [
-       {
+      {
         label: t(`ts.导出`).replace('ts.', ''),
         name: 'exportConfirmShareMoney',
         hide: false,
         type: 'success',
         icon: 'ep:download',
         color: '',
-        hasPermi: ''
+        hasPermi: 'wms:customer-statement-main:export'
       },
       {
         label: t('ts.确认分摊金额'),
         name: 'confirmShareMoney',
-        hide: false,
+        hide: isShowMainButton(chooseRow.value, ['4']),
         type: 'primary',
         color: '',
         float:'left',
-        hasPermi: ''
+        hasPermi: 'wms:customer-statement-main:confirmationShare'
       }]
   } else{
     tableObjectExtend.value = []
@@ -479,9 +524,17 @@ const changeTabs = async (item) => {
   }
 }
 // 点击子表按钮事件
-const detailButtonBaseClick = (val, item) => {
+const detailButtonBaseClick = (val, item,detailTableObject) => {
-  if (val == 'exportReconciliation') {
+  if (val == 'export') {
-    // 子表导出对账差异
+    // 子表导出明细
+    if (tabCurrent.value.prop == 'Detail') {
+      handleExportDetail(detailTableObject)
+    } else if (tabCurrent.value.prop == 'Reconciliation') {
+       // 子表导出对账差异
+      handleExportReconciliation(detailTableObject)
+    } {
+     
+    }
   }else if (val == 'againContrast') {
     // 重新对比
   }else if (val == 'confirmResults') {
@@ -491,6 +544,34 @@ const detailButtonBaseClick = (val, item) => {
   }else if (val == 'confirmShareMoney') {
     // 确认分摊金额
   }
+}
+ // 子表导出明细
+const handleExportDetail = async (detailTableObject) => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CustomerStatementDetailApi.exportCustomerStatementDetail(detailTableObject.params)
+    download.excel(data, `对账差异【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+ // 子表导出对账差异
+const handleExportReconciliation = async (detailTableObject) => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CustomerStatementDetailApi.exportCustomerStatementCompareDetail(detailTableObject.params)
+    download.excel(data, `对账差异【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
 }
 // 模具分摊对账单修改进屋金额
 const openDetailForm = (row) => {

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts

@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as BalanceApi  from '@/api/wms/balance'
@@ -395,6 +395,33 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm: true,
     isForm: false,
   },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:7,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
   {
     label: '批次',
     field: 'fromBatch',
@@ -403,7 +430,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      disabled: true
+      disabled: true,
     },
     form: {
       componentProps: {

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue

@@ -91,6 +91,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as LocationApi  from '@/api/wms/location'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import * as ruleApi  from '@/api/wms/rule/index'
 const { loadStart, loadDone } = usePageLoading()
 // 库存转移申请
 // 只有库存转移申请在使用的

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts

@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatter2 } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as BalanceApi  from '@/api/wms/balance'
@@ -549,6 +549,33 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isTableForm: false,
     isForm: false,
   },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:7,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm: {
+      type: 'FormDate',
+      dateFormat: 'YYYY-MM-DD',
+      valueFormat: 'x',
+    }
+  },
   {
     label: '从批次',
     field: 'fromBatch',

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue

@@ -260,7 +260,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      if(formField == 'packingNumber'){
+      if(formField == 'itemCode'){
         row['containerNumber'] = val[0]['containerNumber']
         row['itemCode'] = val[0]['itemCode']
         row['packingNumber'] = val[0]['packingNumber']
@@ -303,6 +303,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       setV[formField] = val[0][searchField]
       formRef.setValues(setV)
     }
+    const setV = {}
+    if (formField == 'shift') {
+      setV['shift'] = val[0]['code']
+      setV['shiftName'] = val[0]['name']
+    }
+    formRef.setValues(setV)
   })
 }
 // 查询页面返回——详情

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts

@@ -129,7 +129,7 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '班次',
+    label: '班次代码',
     field: 'shift',
     sort: 'custom',
     table: {
@@ -161,6 +161,19 @@ export const ProductdismantleRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: '班次名称',
+    field: 'shiftName',
+    sort: 'custom',
+    form: {
+      componentProps: {
+          disabled: true
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
   {
     label: '从仓库代码',
     field: 'fromWarehouseCode',
@@ -691,16 +704,16 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     }
   },
   {
-    label: '包装号',
+    label: '物料代码',
-    field: 'packingNumber',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装号',
+      searchListPlaceholder: '请选择物料代码',
-      searchField: 'packingNumber',
+      searchField: 'itemCode',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
       searchPage: BalanceApi.getBalanceItemPage
@@ -709,31 +722,14 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true,
-        searchListPlaceholder: '请选择包装号',
+        searchListPlaceholder: '请选择物料代码',
-        searchField: 'packingNumber',
+        searchField: 'itemCode',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
         searchPage: BalanceApi.getBalanceItemPage
       }
     }
   },
-
-  {
-    label: '物料代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps:{
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
   {
     label: '成品库位代码',
     field: 'fromLocationCode',
@@ -1140,9 +1136,9 @@ export const ProductdismantleRequestDetailaRules = reactive({
   productionLineCode: [
     { required: true, message: '请选择生产线代码', trigger: 'change' }
   ],
-  packingNumber: [
+  // packingNumber: [
-    { required: true, message: '请选择包装号', trigger: 'change' }
+  //   { required: true, message: '请选择包装号', trigger: 'change' }
-  ],
+  // ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' }
   ],

src/views/wms/productionManage/productionplan/productionMain/index.vue

@@ -599,12 +599,11 @@ const submitForm = async (formType, submitData) => {
     if (formType === 'create') {
       data.subList = tableData.value // 拼接子表数据参数
       await ProductionMainApi.createProductionMain(data).then((res) => {
-        // console.log(565,res)
         if (res.status == '6') {
           autoCreatePlanRequest(res)
         }
+       message.success(t('common.createSuccess'))
       })
-      // message.success(t('common.createSuccess'))
     } else {
       await ProductionMainApi.updateProductionMain(data)
       message.success(t('common.updateSuccess'))

src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue

@@ -170,6 +170,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }else{
         setV[formField] = val[0][searchField]
       }
+      // const setV = {}
+      if (formField == 'shift') {
+        setV['shift'] = val[0]['code']
+        setV['shiftName'] = val[0]['name']
+      }
       formRef.setValues(setV)
     }
   })

src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts

@@ -199,7 +199,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '班次',
+    label: '班次代码',
     field: 'shift',
     sort: 'custom',
     table: {
@@ -231,6 +231,19 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '班次名称',
+    field: 'shiftName',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '物料代码',
   //   field: 'detailItemCode',

src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue

@@ -162,6 +162,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }else{
         setV[formField] = val[0][searchField]
       }
+      if (formField == 'shift') {
+        setV['shift'] = val[0]['code']
+        setV['shiftName'] = val[0]['name']
+      }
       formRef.setValues(setV)
     }
   })

src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts

@@ -203,7 +203,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '班次',
+    label: '班次代码',
     field: 'shift',
     sort: 'custom',
     table: {
@@ -235,6 +235,19 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '班次名称',
+    field: 'shiftName',
+    sort: 'custom',
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
   // {
   //   label: '物料代码',
   //   field: 'detailItemCode',

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@@ -237,7 +237,7 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-  defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
+  // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
   defaultButtons.mainListPointBtn(null), // 标签打印
   defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示

src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts

@@ -564,13 +564,14 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         action: '==', // 查询拼接条件
         isSearch: true, // 使用自定义拼接条件
         isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
-      },{
-        key: 'packingNumber', // 查询列表中字段
-        value: '', // 指查询具体值
-        action: 'isNotStr', // 查询拼接条件
-        isSearch: true, // 使用自定义拼接条件
-        isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
       },
+      //   {
+      //   key: 'packingNumber', // 查询列表中字段
+      //   value: '', // 指查询具体值
+      //   action: 'isNotStr', // 查询拼接条件
+      //   isSearch: true, // 使用自定义拼接条件
+      //   isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用
+      // },
       {
         key: 'inOrOut',
         value: "out",

src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts

@@ -1114,9 +1114,9 @@ export const ProductrepairRequestDetailaRules = reactive({
   productionLineCode: [
     { required: true, message: '请选择生产线代码', trigger: 'change' }
   ],
-  packingNumber: [
+  // packingNumber: [
-    { required: true, message: '请选择包装号', trigger: 'change' }
+  //   { required: true, message: '请选择包装号', trigger: 'change' }
-  ],
+  // ],
   batch: [
     { required: true, message: '请输入批次', trigger: 'blur' }
   ],

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -1049,43 +1049,72 @@ const handleTur = async (id: number) => {
 /** 处理按钮操作 */
 const genRecords = async (id: number) => {
   let getLoading = null
-  await SupplierdeliverRequestMainApi.selfCheckReport(id)
+  // 处理的二次确认
-    .then(async (res) => {
+  await message.confirm(t('ts.是否处理所选中数据？'))
-      if (!res) {
+  getLoading = ElLoading.service({
-        message.warning(t('ts.请先上传自检报告!'))
+    lock: true,
-        return
+    text: 'loading...',
-      } else {
+    background: 'rgba(0, 0, 0, 0.7)'
-        // 处理的二次确认
+  })
-        await message.confirm(t('ts.是否处理所选中数据？'))
+  // 发起处理
-        getLoading = ElLoading.service({
+  SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
-          lock: true,
+    .then((res) => {
-          text: 'loading...',
+      message.success(t('ts.处理成功!'))
-          background: 'rgba(0, 0, 0, 0.7)'
+      console.log('resresresresres', res)
-        })
+      // 刷新列表
-        // 发起处理
+      getList()
-        SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
+      console.log('刷新列表')
-          .then((res) => {
+      getLoading?.close()
-            message.success(t('ts.处理成功!'))
+
-            console.log('resresresresres', res)
+      // 单据打印
-            // 刷新列表
+      handleDocumentPrint(res)
-            getList()
-            console.log('刷新列表')
-            getLoading?.close()
-
-            // 单据打印
-            handleDocumentPrint(res)
-          })
-          .catch((err) => {
-            console.log('发起处理', err)
-            getLoading?.close()
-          })
-      }
     })
     .catch((err) => {
-      console.log('自检报告校验异常', err)
+      console.log('发起处理', err)
       getLoading?.close()
     })
+   
 }
+// 点击发货校验质检报告的方法（保留）
+// const genRecords = async (id: number) => {
+//   let getLoading = null
+//   await SupplierdeliverRequestMainApi.selfCheckReport(id)
+//     .then(async (res) => {
+//       if (!res) {
+//         message.warning(t('ts.请先上传自检报告!'))
+//         return
+//       } else {
+//         // 处理的二次确认
+//         await message.confirm(t('ts.是否处理所选中数据？'))
+//         getLoading = ElLoading.service({
+//           lock: true,
+//           text: 'loading...',
+//           background: 'rgba(0, 0, 0, 0.7)'
+//         })
+//         // 发起处理
+//         SupplierdeliverRequestMainApi.genRecordsSupplierdeliverRequestMain(id)
+//           .then((res) => {
+//             message.success(t('ts.处理成功!'))
+//             console.log('resresresresres', res)
+//             // 刷新列表
+//             getList()
+//             console.log('刷新列表')
+//             getLoading?.close()
+
+//             // 单据打印
+//             handleDocumentPrint(res)
+//           })
+//           .catch((err) => {
+//             console.log('发起处理', err)
+//             getLoading?.close()
+//           })
+//       }
+//     })
+//     .catch((err) => {
+//       console.log('自检报告校验异常', err)
+//       getLoading?.close()
+//     })
+// }
 
 /** 导出按钮操作 */
 const handleExport = async () => {