生产退料和计划外入库创建标签

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@@ -505,7 +505,7 @@ const buttonTableClick = async (val, row) => {
     formLabelRef.value.open('create', row)
     detatableData.tableList.map((item) => {
       if (item.itemType=='可采购') {
-         detailListTableColumns.tableFormColumns = UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage')
+         detailListTableColumns.tableFormColumns = UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCode')
             // 修改 tableform 属性
             SupplieritemApi.getSupplieritemPage({
               pageSize: 10,
@@ -515,13 +515,13 @@ const buttonTableClick = async (val, row) => {
               by: 'ASC',
             }).then(response => {
                 detailListTableColumns.tableFormColumns.map(itemColumns => {
-                if(itemColumns.field == 'supplierItemCode') {
+                if(itemColumns.field == 'supplierCode') {
-                  item.supplierItemCode = response?.list[0]?.supplierCode
+                  item.supplierCode = response?.list[0]?.supplierCode
                 }
               })
             })
       }else if (item.itemType=='可制造') {
-       detailListTableColumns.tableFormColumns = UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter(item => item.field != 'supplierItemCode')
+       detailListTableColumns.tableFormColumns = UnplannedreceiptRequestDetailLabel.allSchemas.tableFormColumns.filter(item => item.field != 'supplierCode')
           ProductionlineitemApi.getProductionlineitemPage({
             pageNo: 1,
             itemCode: item.itemCode,
@@ -529,8 +529,8 @@ const buttonTableClick = async (val, row) => {
             by: 'ASC',
           }).then(response => {
             detailListTableColumns.tableFormColumns.map(itemColumns => {
-              if(itemColumns.field == 'productionLineCodePackage') {
+              if(itemColumns.field == 'productionLineCode') {
-                item.productionLineCodePackage = response?.list[0]?.productionLineCode
+                item.productionLineCode = response?.list[0]?.productionLineCode
               }
             })
           })
@@ -930,7 +930,7 @@ const tableFormSelectOnBlur = (field, val, row, index) => {
 
 // 标签打印
 const BASE_URL = getJmreportBaseUrl()
-const src = ref(BASE_URL + '/jmreport/view/936912164754612224?token=' + getAccessToken())
+const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
 const labelPrint = async (row) => {
   await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then((res) => {
     if (res.length > 0) {

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -1770,7 +1770,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
   },
   {
     label: '标签生产线代码',
-    field: 'productionLineCodePackage',
+    field: 'productionLineCode',
     sort: 'custom',
     table: {
       width: 150
@@ -1792,7 +1792,7 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
   },
   {
     label: '标签供应商代码',
-    field: 'supplierItemCode',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@@ -577,7 +577,7 @@ const buttonTableClick = async (val, row) => {
             delete detailListTableColumnsRules.value.productionLineCodePackage
               // 修改 tableform 属性
             detailListTableColumns.tableFormColumns.map(itemColumns => {
-                if(itemColumns.field == 'supplierItemCode') {
+                if(itemColumns.field == 'supplierCode') {
                   SupplieritemApi.getSupplieritemPage({
                     pageSize: 10,
                     pageNo: 1,
@@ -585,7 +585,7 @@ const buttonTableClick = async (val, row) => {
                     sort: '',
                     by: 'ASC',
                   }).then(response => {
-                      item.supplierItemCode = response.list[0].supplierCode
+                      item.supplierCode = response.list[0].supplierCode
                       formLabelRef.value.formLoading = false
                   })
                 }
@@ -594,17 +594,16 @@ const buttonTableClick = async (val, row) => {
           // 判断物料 可制造
           if (res.list[0].enableMake == "TRUE") {
             // 修改 tableform 属性
-            detailListTableColumns.tableFormColumns = ProductionreturnRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'supplierItemCode')
+            detailListTableColumns.tableFormColumns = ProductionreturnRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'supplierCode')
-            delete detailListTableColumnsRules.value.supplierItemCode
               detailListTableColumns.tableFormColumns.map(itemColumns => {
-                if(itemColumns.field == 'productionLineCodePackage') {
+                if(itemColumns.field == 'productionLineCode') {
                   ProductionlineitemApi.getProductionlineitemPage({
                     pageNo: 1,
                     itemCode: item.itemCode,
                     sort: '',
                     by: 'ASC',
                   }).then(response => {
-                    item.supplierItemCode = response.list[0].supplierCode
+                    item.productionLineCode = response.list[0].productionLineCode
                     formLabelRef.value.formLoading = false
                   })
                 }
@@ -729,7 +728,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
   if (array1.length > 0) {
     await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
       console.log(res)
-      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
       window.open(src.value + '&asn_number=' + res)
     }).catch(err => {
       console.log(err)

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -1621,7 +1621,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
   },
   {
     label: '标签生产线代码',
-    field: 'productionLineCodePackage',
+    field: 'productionLineCode',
     sort: 'custom',
     table: {
       width: 150
@@ -1643,7 +1643,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
   },
   {
     label: '标签供应商代码',
-    field: 'supplierItemCode',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150