Merge remote-tracking branch 'origin/master_hella' into master_hella

src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts

@@ -82,6 +82,19 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  { 
+    label: '包装名称', 
+    field: 'packName',
+    sort: 'custom',
+    isSearch: true,
+    table: {
+      width: 120
+    },
+    isTable:true,
+    isTableForm:false,
+    isForm:false,
+    isDetail:false
+  },
   { 
     label: '包装数量', 
     field: 'packQty',

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -928,6 +928,11 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         key: 'businessType',
         value: 'CustomerReject',
         isMainValue: false
+      },
+      {
+        key: 'isIn',
+        value: 'in',
+        isMainValue: false
       }]
     },
   },
@@ -1097,7 +1102,9 @@ export const CustomerreturnRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  
+  packQty:  [
+    { required: true, message: '请选择包装数量', trigger: 'blur' }
+  ],
 })
 
 export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@@ -188,6 +188,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['fromLocationCode'] = val[0]['locationCode']
         row['itemCode'] = val[0]['itemCode']
         row['uom'] = val[0]['uom']
+      }else if(formField == 'packQty'){
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
       }else if(formField == 'toLocationCode') {
         //到库位代码
         row['toLocationCode'] = val[0]['code']
@@ -422,7 +425,7 @@ const buttonTableClick = async (val, row) => {
     formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
   } else if (val == 'point') {
     // 标签打印
-    labelPrint(row)
+    handlePoint(row)
   } 
 }
 // 生成标签
@@ -452,29 +455,78 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const labelType = ref('') // 标签类别 采购还是制造等
 // 标签打印
 const showLabelRef = ref()
-const labelPrint = async (row) => {
+const handlePoint = async (row) => {
-  console.log(row.packingNumber,445555555555555);
+// 查询是否已创建过标签
-  PackageApi.getBalanceToPackage(row.packingNumber).then(res => {
+await PackageApi.getPackagePage({
-    console.log(777,res);
+    requestNumber: row.number
-      if (res.productionLineCode != null) {
+  }).then((res) => {
+    if(res.list.length > 0) {
+      isCreateLabel.value = true
+      if (res.list[0].productionLineCode != null) {
         labelType.value = 'zz'
       } else {
         labelType.value = 'cg'
       }
-      PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
+    } else {
-        console.log(159,resLable )
+      isCreateLabel.value = false
- // 判断是采购还是制造
+    }
- if (labelType.value == 'cg') {
+  }).catch(err => {
-    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+    isCreateLabel.value = false
-    console.log(159,resLable )
+    console.log(err)
-    window.open(src.value+'&asn_number='+resLable)
+  })
+  // 判断是采购还是制造
+  if (isCreateLabel.value) {
+    labelPrint(row)
   } else {
-    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+    message.warning('请先创建标签')
-    window.open(src.value+'&asn_number='+resLable)
   }
-    })
+}
+
+
+//
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  const defaultParams = {'moduleName':'customerreturn_request','recordNumber':row.number}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  getListPrint()
+  tableObject.loading = false
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  showLabelRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+
+// 批量打印---客户退货申请
+const showLabelSuccess = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+  // let rows:any = []
+  // val.forEach(item=>{
+  //   rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
+  // })
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
+  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      if (labelType.value == 'cg') {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      } else {
+        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      }
   }).catch(err => {
     console.log(err)
+    message.error('创建标签失败')
   })
 }
 
@@ -705,23 +757,6 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
-// 批量打印---采购收货申请
-const showLabelSuccess = async (formField, searchField, val, formRef, type, row) => {
-  console.log('批量打印',val)
-  
-  if(val.length == 0){
-    message.warning("请先选择要打印的数据!")
-    return
-  }
-  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
-      console.log(res)
-      window.open(src.value + '&asn_number=' + res)
-  }).catch(err => {
-    console.log(err)
-    message.error('创建标签失败')
-  })
-}
-
 /** 初始化 **/
 onMounted(async () => {
   getList()

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@@ -237,8 +237,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'invoiceTime',
     isTable: true,
     formatter: dateFormatter,
-    deatil: {
+    detail: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {
@@ -293,8 +293,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isTableForm:false,
     formatter: dateFormatter,
-    deatil: {
+    detail: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {
@@ -306,9 +306,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'activeDate',
     isTable:false,
     isTableForm:false,
-    formatter: dateFormatter2,
+    formatter: dateFormatter,
-    deatil: {
+    detail: {
-      dateFormatter: 'YYYY-MM-DD'
+      dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
     table: {
@@ -321,8 +321,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isTableForm:false,
     formatter: dateFormatter,
-    deatil: {
+    detail: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {
@@ -335,8 +335,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isTable:false,
     isTableForm:false,
     formatter: dateFormatter,
-    deatil: {
+    detail: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -511,6 +511,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
   },
+  
   {
     label: '采购价格审批人',
     field: 'procurementCreator',
@@ -519,7 +520,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     isForm: true,
-    isTable: false,
+    isTable:true,
     form: {
       component: 'Select',
       api: () => procurementCreators.list,
@@ -547,16 +548,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       // }
     }
   },
-  {
+  
-    label: '采购价格审批人',
-    field: 'procurementCreatorName',
-    sortTableDefault:1003,
-    table: {
-      width: 150
-    },
-    isTable:true,
-    isForm: false,
-  },
   {
     label: '采购审批时间',
     field: 'procurementCreateTime',