From 51d9251a487dae4bc5320039c6d9f927ec25cb8a Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Thu, 16 May 2024 13:44:10 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=B6?=
 =?UTF-8?q?=E9=80=A0=E5=95=86=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eam/equipmentManufacturer/index.ts | 7 ++++++-
 src/api/eam/equipmentSupplier/index.ts     | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/api/eam/equipmentManufacturer/index.ts b/src/api/eam/equipmentManufacturer/index.ts
index d735e38e4..6efa2cbb2 100644
--- a/src/api/eam/equipmentManufacturer/index.ts
+++ b/src/api/eam/equipmentManufacturer/index.ts
@@ -54,7 +54,12 @@ export const deleteEquipmentManufacturer = async (id: number) => {
 
 // 导出设备制造商 Excel
 export const exportEquipmentManufacturer = async (params) => {
-  return await request.download({ url: `/eam/basic/equipment-manufacturer/export-excel`, params })
+  if (params.isSearch) {
+    const data = { ...params }
+    return await request.downloadPost({ url: `/eam/basic/equipment-manufacturer/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/eam/basic/equipment-manufacturer/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/eam/equipmentSupplier/index.ts b/src/api/eam/equipmentSupplier/index.ts
index 3026e600c..b6a38dc40 100644
--- a/src/api/eam/equipmentSupplier/index.ts
+++ b/src/api/eam/equipmentSupplier/index.ts
@@ -54,7 +54,12 @@ export const deleteEquipmentSupplier = async (id: number) => {
 
 // 导出供应商 Excel
 export const exportEquipmentSupplier = async (params) => {
-  return await request.download({ url: `/eam/basic/equipment-supplier/export-excel`, params })
+  if (params.isSearch) {
+    const data = { ...params }
+    return await request.downloadPost({ url: `/eam/basic/equipment-supplier/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/eam/basic/equipment-supplier/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

From 47b9c5b3d2059b92e99eb6848f5a7044d2f1abea Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Thu, 16 May 2024 13:48:07 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=20?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/orderDay/components/schedule.vue      | 35 ++++++-----
 src/views/mes/orderDay/index.vue              | 60 ++++++++++---------
 src/views/mes/orderDay/orderDay.data.ts       |  3 +-
 3 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue
index 9ac9b269e..eccbefcd7 100644
--- a/src/views/mes/orderDay/components/schedule.vue
+++ b/src/views/mes/orderDay/components/schedule.vue
@@ -201,7 +201,7 @@
       </el-dialog>
     </ContentWrap>
     <template #footer>
-      <el-button @click="handleClose" >关闭</el-button>
+      <el-button @click="handleClose('dddddd')" >关闭</el-button>
       <el-button  type="primary" @click="publishPlan" >发布计划</el-button>
     </template>
     <SearchTable ref="searchTableRef" @search-table-success="searchTableSuccess" />
@@ -471,20 +471,23 @@ const opensearchTable = (
   )
 
 }
-const handleClose=()=>{
-  dialogVisible.value = false,
-  emit('close')
+const handleClose=(val)=>{
+  dialogVisible.value = false
+  emit('close',val)
 }
 const publishPlan=()=>{
-     message.confirm("确认发布当前计划？","question").then(async () => {
+     message.confirm("确认发布当前计划？","提示").then( () => {
       //isPublish.value=true
       //loading.value = true,
-      try{formLoading.value=true
-      doPublishPlan() }finally{
+      try{
+        formLoading.value=true
+        let promise = doPublishPlan();
+        handleClose(promise)
+      }finally{
         formLoading.value=false;
-        handleClose()
+
       }
-     
+
      }).catch(() => {
       message.info("已取消发布")
      })
@@ -517,12 +520,14 @@ const doPublishPlan=  ()=>{
 
   let res = OrderDayApi.publishPlan(data)
 
-  res.then(()=>{
-    message.success("计划发布成功")
-  }).catch(()=>{
-    //console.log("---doPublishPlan-- 458--",res.msg)
-    message.error("计划发布失败！")
-  })
+  return res
+
+  // res.then(()=>{
+  //   message.success("计划发布成功")
+  // }).catch(()=>{
+  //   //console.log("---doPublishPlan-- 458--",res.msg)
+  //   message.error("计划发布失败！")
+  // })
 
 
 }
diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue
index edcb14390..98a405c6f 100644
--- a/src/views/mes/orderDay/index.vue
+++ b/src/views/mes/orderDay/index.vue
@@ -57,7 +57,7 @@
     :isBusiness="false"
     :isSearchFilterButtonHide="true"
     @onChange="valueChange"
-   
+
   />
 
   <!-- 详情 -->
@@ -142,7 +142,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     if(formField=='workroomCode'){
       getProductlines(val[0][searchField])
     }
-    
+
 })
 
 }
@@ -156,9 +156,9 @@ const valueChange=(filed,cur)=>{
         //item.componentProps.required = cur==='ENABLE'?false:true
       }
     })
-    
+
   }
- 
+
 }
 
 // 字段设置 更新主列表字段
@@ -199,10 +199,12 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
-const publishClosed=()=>{
-    //console.log('orderday-publishClosed-200')
-      getList()
-   
+const publishClosed=(val)=>{
+    console.log('orderday-publishClosed-200',val)
+  nextTick?.(()=>{
+    getList()
+  })
+
 }
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row,val) => {
@@ -227,7 +229,7 @@ const butttondata = (row) => {
       type: 'warning',
       icon: '',
       color: '',
-      hasPermi: 'mes:orderDay:update'}), // 
+      hasPermi: 'mes:orderDay:update'}), //
     // defaultButtons.mainListHandleBtn({label: '发布',
     //   name: 'publish',
     //   hide: isShowMainButton(row,['2']),
@@ -268,25 +270,24 @@ const openForm = (type: string, row?: any) => {
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
-  
+
   if (formType === 'create') {
-    let ret= OrderDayApi.createOrderDay(data)
-    if(ret===undefined || ret===null){
-      message.error(t('common.networkError'))
-    }else{
-      message.success(t('common.createSuccess'))
-    }
-   
+    await OrderDayApi.createOrderDay(data)
+    // if(ret===undefined || ret===null){
+    //   message.error(t('common.networkError'))
+    // }else{
+    //   message.success(t('common.createSuccess'))
+    // }
+
   } else {
-    let ret= OrderDayApi.updateOrderDay(data)
-    if(ret.code==0){
-      message.success(t('common.updateSuccess'))
-    }else{
-      message.error(t('common.networkError'))
-    }
-    
+    await OrderDayApi.updateOrderDay(data)
+    // if(ret.code==0){
+    //   message.success(t('common.updateSuccess'))
+    // }else{
+    //   message.error(t('common.networkError'))
+    // }
+
   }
-  
   basicFormRef.value.dialogVisible = false
   await getList()
 }
@@ -301,7 +302,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
     //console.log('orderDay-openDetail-303',row)
     sDetailRef.value.open(row, titleName)
   }
-  
+
 }
 /** 发布操作 */
 const scheduleDetailRef = ref()
@@ -336,9 +337,10 @@ const handleExport = async () => {
     exportLoading.value = false
   }
 }
-const stopPlan =  (id) => {
-    OrderDayApi.stopPlan(id)
-  
+const stopPlan = async (id) => {
+    await  OrderDayApi.stopPlan(id)
+    getList()
+
 }
 /** 导入 */
 const importFormRef = ref()
diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts
index 43bed9d1e..d2d6a1109 100644
--- a/src/views/mes/orderDay/orderDay.data.ts
+++ b/src/views/mes/orderDay/orderDay.data.ts
@@ -49,6 +49,7 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'id',
     sort: 'custom',
     isForm: false,
+    isTable: false,
     width: '60px',
   },
   {
@@ -365,7 +366,7 @@ export const OrderDay = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
     isSearch: false,
-    isTable:false,
+    // isTable:false,
   },
   {
     label: '操作',

From 3949f78e79c380d67b75b96ded713043d1cf11ff Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 16 May 2024 13:56:01 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverRequestMain.data.ts                  |  1 -
 .../deliver/deliverRequestMain/index.vue        |  3 ---
 .../saleShipmentMainRecord/index.vue            | 17 ++++++++---------
 .../saleShipmentMainRecord.data.ts              |  3 +++
 .../saleShipmentMainRequest/index.vue           |  2 +-
 .../saleShipmentMain.data.ts                    |  6 ++----
 .../containerMainRequest.data.ts                |  5 +----
 7 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index caf69fc42..54715ea57 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -786,7 +786,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'uom',
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index 3a6f4ac74..8e0e37a1e 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -567,9 +567,6 @@ const resetShow = async () => {
       item.tableForm.isInpuFocusShow = true
       item.tableForm.disabled = false
     }
-    if(item.field == 'uom') {
-      item.tableForm.disabled = false
-    }
     if(item.field == 'available') {
       item.tableForm.disabled = false
     }
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
index df789bd3d..e00bd5819 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -62,7 +62,6 @@ import { SaleShipmentMainRecord,SaleShipmentMainRecordRules } from './saleShipme
 import * as SaleShipmentMainRecordApi from '@/api/wms/saleShipmentMainRecord'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 
 defineOptions({ name: 'SaleShipmentMainRecord' })
@@ -98,8 +97,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:saleShipmentMainRecord:create'}), // 新增
-  defaultButtons.defaultExportBtn({hasPermi:'wms:saleShipmentMainRecord:export'}), // 导出
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:sale-shipment-main-record:create'}), // 新增
+  defaultButtons.defaultExportBtn({hasPermi:'wms:sale-shipment-main-record:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -129,8 +128,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:saleShipmentMainRecord:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:saleShipmentMainRecord:delete'}), // 删除
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-record:update'}), // 编辑
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-record:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -189,7 +188,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await SaleShipmentMainRecordApi.exportSaleShipmentMainRecord(tableObject.params)
-    download.excel(data, '销售发运记录主.xlsx')
+    download.excel(data, '销售发运记录.xlsx')
   } catch {
   } finally {
     exportLoading.value = false
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
index ba4ba4a2b..f950af5b6 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts
@@ -73,6 +73,7 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     sort: 'custom',
     isSearch: true,
+    isTable:false
   },
   {
     label: '部门',
@@ -102,12 +103,14 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isForm: false,
+    isTable:false
   },
   {
     label: '地点ID',
     field: 'siteId',
     sort: 'custom',
     isSearch: true,
+    isTable:false
   },
   {
     label: '操作',
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index c2bce7085..0302e1661 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
@@ -214,7 +214,7 @@ const butttondata = (row,$index) => {
   }
     return [
   defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:update'}), // 编辑
-  defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:sale-shipment-main-request:close'}), // 关闭
+  defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:sale-shipment-main-request:close'}), // 关闭
   defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:sale-shipment-main-request:reAdd'}), //重新添加
   defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:submit'}), // 提交审批
   defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // 驳回
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
index 94c56b794..b996f56fe 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
+++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts
@@ -499,9 +499,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isDetail: false,
     isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
+    hiddenInMain:true,
+    isTableForm:false,
   }
 ]))
\ No newline at end of file
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
index 122339949..c2cf324bd 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
+++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts
@@ -493,10 +493,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     hiddenInMain:true,
     isTableForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
+    isTable: false
   }
 ]))
 

From 86ae09084a8d611f48a09400ab230fa5cb977853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Thu, 16 May 2024 13:57:27 +0800
Subject: [PATCH 4/6] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inspectionJob/inspectionJobMain/index.ts  |  6 ++--
 src/views/qms/inspectionJob/addForm.vue       | 33 ++++++++-----------
 src/views/qms/inspectionJob/index.vue         | 24 ++++++++++++++
 3 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/api/qms/inspectionJob/inspectionJobMain/index.ts b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
index aca7fd268..3346beae4 100644
--- a/src/api/qms/inspectionJob/inspectionJobMain/index.ts
+++ b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
@@ -51,12 +51,14 @@ export const abandonInspectionJobMain = async (id) => {
 export const closeInspectionJobMain = async (id) => {
   return await request.put({ url: `/qms/inspection-job-main/close?id=` + id })
 }
-
+// 发布检验任务
+export const releaseInspectionJobMain = async (id) => {
+  return await request.put({ url: `/qms/inspection-job-main/release?id=` + id })
+}
 // 导出检验申请 Excel
 export const exportInspectionJobMain = async (params) => {
   return await request.download({ url: `/qms/inspection-job-main/export-excel`, params })
 }
-
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/qms/inspection-job-main/get-import-template' })
diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index 1a9f11a80..aaa8f4bb8 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -369,7 +369,7 @@
         // 总数量值是 样品份数 乘 每份样品量
         allSamplePieceSize.value += parseFloat((parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) * parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)).toFixed(2))
         // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-        if(!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList){
+        if (!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList) {
           // 单个录入时
           if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 0) {
             // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
@@ -397,7 +397,7 @@
             )
           }
         }
-       
+
         // 编辑判断上限下限目标值是否必填
         if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) {
           rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
@@ -425,17 +425,17 @@
         设置采样数量，默认第一个包装采样数量<总数量，显示数量字段，第二个包装和剩下的总数量对比，以此类推，
         第一个包装采样数量>总数量 则显示总数量
       */
-     
+
       for (let i = 0; i < data.value.packageList.length; i++) {
-        if(data.value.packageList[i].sampleAmount==null){
-         if (allSamplePieceSize.value > data.value.packageList[i].amount) {
-           data.value.packageList[i].sampleAmount = data.value.packageList[i].amount
-           allSamplePieceSize.value = parseFloat((allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(2))
-         } else {
-           data.value.packageList[i].sampleAmount = allSamplePieceSize.value
-           allSamplePieceSize.value = 0
-           // return;
-         } 
+        if (data.value.packageList[i].sampleAmount == null) {
+          if (allSamplePieceSize.value > data.value.packageList[i].amount) {
+            data.value.packageList[i].sampleAmount = data.value.packageList[i].amount
+            allSamplePieceSize.value = parseFloat((allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(2))
+          } else {
+            data.value.packageList[i].sampleAmount = allSamplePieceSize.value
+            allSamplePieceSize.value = 0
+            // return;
+          }
         }
       }
       // data.value.packageList.forEach(item=>{
@@ -604,14 +604,11 @@
       let numberList = []//判断合格数量和不合格数量之和是否等于主表数量
       let parseFloatList = []//判断合格数量和不合格数量是否是整数
       data.value.subList.forEach((item, index) => {
-        
-        console.log("woxianlai")
-        console.log(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList)
         if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 1) {
           arrBol.push(
             item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
               (cur, key) => {
-                return cur.qualifiedQuantity==='' || cur.unqualifiedQuantity===''
+                return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
               }
             )
           )
@@ -657,8 +654,6 @@
           )
         }
       })
-      console.log("wolaile")
-      console.log(arrBol)
       let isEmpty1 = arrBol.some(item => item == true)
       let isEmptyNumberList = numberList.some(item => item == true)
       let isParseFloat = parseFloatList.some(item => item == true)
@@ -732,7 +727,7 @@
           arrBol.push(
             item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.some(
               (cur, key) => {
-                return !cur.qualifiedQuantity || !cur.unqualifiedQuantity
+                return cur.qualifiedQuantity === '' || cur.unqualifiedQuantity === ''
               }
             )
           )
diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
index dcc7d81b3..3566e702d 100644
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -159,6 +159,15 @@
       return true
     }
   }
+  
+  // 根据状态返回该按钮是否显示
+  const isShowMainButton2 = (row, val) => {
+    if (val.indexOf(row.isStaging) > -1) {
+      return false
+    } else {
+      return true
+    }
+  }
 
   // 列表-操作按钮
   const butttondata = (row) => {
@@ -167,6 +176,7 @@
       defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:close'}), // 关闭
       defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:abandon'}), // 放弃
       defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:execute'}), // 执行
+      defaultButtons.mainListOrderPubBtn({hide:isShowMainButton2(row,['TRUE']),hasPermi:'qms:inspection-job-main:execute'}), // 发布
       defaultButtons.mainListPackageBtn(null), // 包装
     ]
   }
@@ -185,6 +195,8 @@ const list = ref([])
     handleAbandon(row.id)
   } else if (val == 'mainJobClo') { // 关闭
     handleClose(row.id)
+  }  else if (val == 'mainOrderPub') { // 发布
+    handleRelease(row.id)
   } else if (val == 'mainJobAcc') { // 承接
     handleAccept(row.id)
   }
@@ -220,6 +232,18 @@ const list = ref([])
       await getList()
     } catch { }
   }
+  /** 发布按钮操作 */
+  const handleRelease = async (id : number) => {
+    try {
+      // 发布的二次确认
+      await message.confirm('确认发布吗？')
+      // 发起发布
+      await InspectionJobMainApi.releaseInspectionJobMain(id)
+      message.success('发布成功！')
+      // 刷新列表
+      await getList()
+    } catch { }
+  }
   // 承接
   const handleAccept = async (id : number) => {
     try {

From d2d14953b725592b4d90e5c39d3449dab918bc53 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Thu, 16 May 2024 14:15:09 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/qualifiedCheck.vue             | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/views/mes/workScheduling/components/qualifiedCheck.vue b/src/views/mes/workScheduling/components/qualifiedCheck.vue
index bf2d7733e..0ce7768bf 100644
--- a/src/views/mes/workScheduling/components/qualifiedCheck.vue
+++ b/src/views/mes/workScheduling/components/qualifiedCheck.vue
@@ -11,28 +11,28 @@
       <el-form-item label="工序">
          <el-input v-model="form.processCode" disabled />
       </el-form-item>
-      <el-form-item label="生产人员">
-        <el-select v-model="form.personSelected" multiple>
+      <el-form-item label="生产人员" required="true">
+        <el-select v-model="form.personSelected"  multiple>
           <el-option v-for="item in personOption" :key="item.workerCode" :label="item.workerName" :value="item.workerCode" />
         </el-select>
       </el-form-item>
-      <el-form-item label="质检人员">
-        <el-input v-model="form.checkPerson"  />
+      <el-form-item label="质检人员" required="true"  >
+        <el-input v-model="form.checkPerson"/>
       </el-form-item>
-      <el-form-item label="合格数量" @change="handleCount" :key="qcount">
+      <el-form-item label="合格数量" @change="handleCount" :key="qcount" required="true">
         <el-input-number
           v-model="form.qualified"
           @change="handleCount"
         ></el-input-number>
       </el-form-item>
-      <el-form-item label="不合格数量">
+      <el-form-item label="不合格数量" >
         <el-input-number  v-model="form.unqualified" @change="handleCount" :key="qcount"></el-input-number>
       </el-form-item>
       <el-form-item label="不合格原因">
         <el-input v-model="form.remark"></el-input>
       </el-form-item>
     </el-form>
-  
+
     <template #footer>
       <el-button @click="dialogVisible = false">关闭</el-button>
       <el-button type="primary"  :disabled="saveFlag" @click="saveReport">保存</el-button>
@@ -75,7 +75,7 @@ const openDetail = async (row: any, titleName: any,code:string) => {
   form.id=row.id
   planDayCode.value=code
   getCurrentWorkerList(row.nodeCode)
-  
+
 }
 
 //获取工序人员
@@ -86,7 +86,7 @@ const getCurrentWorkerList = async (val) => {
     processCode: val
   }
   personOption.value = await workschedulingApi.getCurrentWorkerList(params)
-  
+
 }
 const qcount=ref(0)
 //数量处理
@@ -97,8 +97,8 @@ const handleCount = () => {
     form.qualified =rowData.value.planCount - form.unqualified
 
     return
-  } 
-  
+  }
+
   if (form.unqualified> rowData.value.planCount -form.qualified ) {
     message.alert('不合格数量超限！')
     form.unqualified =rowData.value.planCount-form.qualified
@@ -107,7 +107,18 @@ const handleCount = () => {
 }
 //提交质检
 const saveReport = async() => {
- 
+  if(form.personSelected.length<1){
+    message.alert('生产人员不能为空')
+    return
+  }
+  if(form.checkPerson==''||form.checkPerson.trim()==''){
+    message.alert('质检人员不能为空')
+    return
+  }
+  if(form.qualified<1){
+    message.alert('合格数量不能小于1！')
+    return
+  }
   saveFlag.value = true
   try {
     await workschedulingApi.processQualified(form)
@@ -118,7 +129,7 @@ const saveReport = async() => {
   }
   //console.log("report-saveReport-82",data)
   //await workschedulingApi.reportWorkByProcess(data)
- 
+
 }
 // 传递给父类
 const emit = defineEmits(['success', 'close'])

From f22b2279aee41afb8f36f583a470cfcbc8287882 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 16 May 2024 14:22:47 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Annex/src/Annex.vue            |  2 +-
 .../Descriptions/src/Descriptions.vue         |  7 +++---
 src/components/Detail/src/Detail.vue          |  4 ++--
 src/components/DictTag/src/DictTag.vue        |  5 ++--
 src/components/Remarks/src/Remarks.vue        |  5 ++--
 src/components/Tabs/src/Tabs.vue              |  3 ++-
 src/components/UploadFile/src/UploadFile.vue  | 15 ++++++------
 src/locales/en-US.ts                          | 24 +++++++++++++++++++
 src/locales/zh-CN.ts                          | 24 +++++++++++++++++++
 src/views/home/components/supplierIndex.vue   |  3 ++-
 10 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index 7d5f0e142..5f5f144d6 100644
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@@ -3,7 +3,7 @@
   <div class="annex">
     <div class="title flex items-center">
       <!-- <div class="title-txt">附件</div> -->
-      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" title="添加附件" :upData="upData" :limit="10"
+      <UploadFile :isShowFile="false" :isShowTip="false" :fileType="fileType" :title="t('ts.添加附件')" :upData="upData" :limit="10"
         @update:modelValue="handleAnnexSuccess" v-if="annexData.annexList.length<5"/>
     </div>
     <div class="list">
diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index 6f00f10c2..f81f8f35a 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -5,6 +5,7 @@ import { useDesign } from '@/hooks/web/useDesign'
 import { propTypes } from '@/utils/propTypes'
 import { useAppStore } from '@/store/modules/app'
 import { DescriptionsSchema } from '@/types/descriptions'
+const { t } = useI18n() // 国际化
 
 defineOptions({ name: 'Descriptions' })
 
@@ -99,7 +100,7 @@ const showAll = () =>{
     >
       <div :class="[`${prefixCls}-header__title`, 'relative font-18px font-bold ml-10px']">
         <div class="flex items-center">
-          {{ title }}
+          {{ t(`ts.${title}`).replace('ts.', '') }}
           <ElTooltip v-if="message" :content="message" placement="right">
             <Icon class="ml-5px" icon="ep:warning" />
           </ElTooltip>
@@ -119,7 +120,7 @@ const showAll = () =>{
           <template v-if="slots['extra']" #extra>
             <slot name="extra"></slot>
           </template>
-          <ElDescriptionsItem
+          <ElDescriptionsItem 
             v-for="item in schema"
             :key="item.field"
             v-bind="getBindItemValue(item)"
@@ -133,7 +134,7 @@ const showAll = () =>{
                 :row="{
                   label: item.label
                 }"
-                >{{ item.label }}
+                >{{ t(`ts.${item.label}`).replace('ts.', '') }}
               </slot>
             </template>
 
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 3ebe261c5..af528c603 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -2,14 +2,14 @@
   <div>
     <el-drawer
       v-model="isShowDrawer"
-      title="详情"
+      :title="t(`ts.详情`).replace('ts.','')"
       direction="rtl"
       size="80%"
       v-loading="detailLoading"
     >
       <template #header>
         <div class="font-size-18px">
-          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ titleNameRef }}</span>
+          {{ titleValueRef }} <span class="ml-20px font-size-16px">{{ t(`ts.${titleNameRef}`).replace('ts.','') }}</span>
         </div>
       </template>
       <Tabs ref="tabRef" :tabsList="tabsList" :current="current" @change="change" />
diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue
index b72b2b9ec..35920d91e 100644
--- a/src/components/DictTag/src/DictTag.vue
+++ b/src/components/DictTag/src/DictTag.vue
@@ -3,6 +3,7 @@ import { defineComponent, PropType, ref } from 'vue'
 import { isHexColor } from '@/utils/color'
 import { ElTag } from 'element-plus'
 import { DictDataType, getDictOptions } from '@/utils/dict'
+const { t } = useI18n() // 国际化
 
 export default defineComponent({
   name: 'DictTag',
@@ -55,7 +56,7 @@ export default defineComponent({
               }
               disableTransitions={true}
             >
-              {dictData.value?.label}
+              {t(`ts.${dictData.value?.label}`).replace('ts.', '')}
           </ElTag>
         )
       } else {
@@ -71,7 +72,7 @@ export default defineComponent({
                     }
                     disableTransitions={true}
                   >
-                    {item?.label}
+                    {t(`ts.${item?.label}`).replace('ts.', '')}
                   </ElTag>
           })
         )
diff --git a/src/components/Remarks/src/Remarks.vue b/src/components/Remarks/src/Remarks.vue
index 35423c454..857d91027 100644
--- a/src/components/Remarks/src/Remarks.vue
+++ b/src/components/Remarks/src/Remarks.vue
@@ -20,9 +20,9 @@
       </div>
     </div>
     <div class="add-remarks flex items-center mt-20px">
-       <el-input v-model="data.remark" placeholder="请输入备注" />
+       <el-input v-model="data.remark" :placeholder="t('ts.请输入备注')" />
        <el-button class="ml-16px" type="primary" @click="handleSubmitrRemarks" >
-          确定
+          {{t('ts.确定')}}
         </el-button>
     </div>
   </div>
@@ -32,6 +32,7 @@
 const message = useMessage() // 消息弹窗
 import * as RemarkApi from '@/api/wms/remark'
 import { formatDate } from '@/utils/formatTime'
+const { t } = useI18n() // 国际化
 
 defineComponent({
   name: 'Annex'
diff --git a/src/components/Tabs/src/Tabs.vue b/src/components/Tabs/src/Tabs.vue
index 8c66168a9..8c22163f6 100644
--- a/src/components/Tabs/src/Tabs.vue
+++ b/src/components/Tabs/src/Tabs.vue
@@ -1,7 +1,7 @@
 <!-- tabs组件 -->
 <template>
    <div class="tabs flex items-center">
-      <div :class="current == index ? 'active' : ''" v-for="(item, index) in tabsList" :key="index" @click="change(item, index)">{{ item.label }}</div>
+      <div :class="current == index ? 'active' : ''" v-for="(item, index) in tabsList" :key="index" @click="change(item, index)">{{ t(`ts.${item.label}`).replace('ts.','') }}</div>
     </div>
 </template>
 
@@ -9,6 +9,7 @@
 // const message = useMessage() // 消息弹窗
 
 import { emit } from "process";
+const { t } = useI18n() // 国际化
 
 // const { t } = useI18n() // 国际化
 defineComponent({
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 05ce5f239..bf3cc4895 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -42,6 +42,7 @@ import { PropType } from 'vue'
 import { propTypes } from '@/utils/propTypes'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import type { UploadInstance, UploadUserFile, UploadProps, UploadRawFile } from 'element-plus'
+const { t } = useI18n() // 国际化
 
 defineOptions({ name: 'UploadFile' })
 
@@ -78,7 +79,7 @@ const uploadHeaders = ref({
 // 文件上传之前判断
 const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
   if (fileList.value.length >= props.limit) {
-    message.error(`上传文件数量不能超过${props.limit}个!`)
+    message.error(`${t('ts.上传文件数量不能超过')}${props.limit}!`)
     return false
   }
   let fileExtension = ''
@@ -91,14 +92,14 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
   })
   const isLimit = file.size < props.fileSize * 1024 * 1024
   if (!isImg) {
-    message.error(`文件格式不正确, 请上传${props.fileType.join('/')}格式!`)
+    message.error(`${t(`ts.${'文件格式不正确, 请上传'}`)}${props.fileType.join('/')}${t('ts.格式')}!`)
     return false
   }
   if (!isLimit) {
-    message.error(`上传文件大小不能超过${props.fileSize}MB!`)
+    message.error(`${t('ts.上传文件大小不能超过')}${props.fileSize}MB!`)
     return false
   }
-  message.success('正在上传文件，请稍候...')
+  message.success(t(`ts.${'正在上传文件，请稍候'}`))
   uploadNumber.value++
 }
 // 处理上传的文件发生变化
@@ -107,7 +108,7 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => {
 // }
 // 文件上传成功
 const handleFileSuccess: UploadProps['onSuccess'] = (res: any,uploadFile: any): void => {
-  message.success('上传成功')
+  message.success(t('ts.上传成功'))
   const fileListNew = fileList.value
   fileListNew.pop()
   fileList.value = fileListNew
@@ -121,11 +122,11 @@ const handleFileSuccess: UploadProps['onSuccess'] = (res: any,uploadFile: any):
 }
 // 文件数超出提示
 const handleExceed: UploadProps['onExceed'] = (): void => {
-  message.error(`上传文件数量不能超过${props.limit}个!`)
+  message.error(`${t('ts.上传文件数量不能过')}${props.limit}!`)
 }
 // 上传错误提示
 const excelUploadError: UploadProps['onError'] = (): void => {
-  message.error('导入数据失败，请您重新上传！')
+  message.error(t(`ts.导入数据失败，请您重新上传`))
 }
 // 删除上传文件
 const handleRemove = (file) => {
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index d426530a5..c8a4ee393 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1063,6 +1063,30 @@ export default {
     采购价格审批人:'Purchasing price approver',
     供应商发货单号:'Supplier\'s invoice number',
     加载中:'loading',
+    请输入备注:'Please enter remarks',
+    '正在上传文件，请稍候':'Please wait while uploading files',
+    上传成功:'upload successful',
+    上传文件数量不能超过:'The number of uploaded files cannot exceed',
+    '导入数据失败，请您重新上传':'Failed to import data, please upload again!',
+    上传文件大小不能超过:'The size of the uploaded file cannot exceed',
+    '文件格式不正确, 请上传':'The file format is incorrect. Please upload it in',
+    格式:'format',
+    收货人:'consignee',
+    联系电话:'phone',
+    送达日期:'delivery date',
+    月台代码:'Platform code',
+    截止日期:'Deadline',
+    仓库代码:'Warehouse code',
+    'ERP单据号(无用)':'ERP document number (useless)',
+    供应商审批人:'Supplier approver',
+    供应商审批时间:'Supplier approval time',
+    快递单号:'courier number',
+    开票日历管理:'Invoicing calendar management',
+    描述:'description'
+
+
+
+
 
   },
   
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 73699f76a..65f4ded05 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1063,6 +1063,30 @@ export default {
     采购价格审批人:'采购价格审批人',
     供应商发货单号:'供应商发货单号',
     加载中:'加载中',
+    请输入备注:'请输入备注',
+    '正在上传文件，请稍候':'正在上传文件，请稍候...',
+    上传成功:'上传成功',
+    上传文件数量不能超过:'上传文件数量不能超过',
+    '导入数据失败，请您重新上传':'导入数据失败，请您重新上传！',
+    上传文件大小不能超过:'上传文件大小不能超过',
+    '文件格式不正确, 请上传':'文件格式不正确, 请上传',
+    格式:'格式',
+    收货人:'收货人',
+    联系电话:'联系电话',
+    送达日期:'送达日期',
+    月台代码:'月台代码',
+    截止日期:'截止日期',
+    仓库代码:'仓库代码',
+    'ERP单据号(无用)':'ERP单据号(无用)',
+    供应商审批人:'供应商审批人',
+    供应商审批时间:'供应商审批时间',
+    快递单号:'快递单号',
+    开票日历管理:'开票日历管理',
+    描述:'描述'
+
+
+
+
 
   },
 
diff --git a/src/views/home/components/supplierIndex.vue b/src/views/home/components/supplierIndex.vue
index 5e8a679c1..af6faa6f0 100644
--- a/src/views/home/components/supplierIndex.vue
+++ b/src/views/home/components/supplierIndex.vue
@@ -231,7 +231,8 @@
 import { set } from 'lodash-es'
 import { EChartsOption } from 'echarts'
 import { lineOptions, pieOptions } from '../echarts-data'
-import { formatDate } from '@/utils/formatTime'
+import { formatDate,dateFormatter } from '@/utils/formatTime'
+
 import * as NotifyMessageApi from '@/api/system/notify/message'
 import * as IndexApi from '@/api/home'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'