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

.env.development

@@ -4,10 +4,10 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:12080'
+# VITE_BASE_URL='http://localhost:12080'
 # VITE_BASE_URL='http://192.168.1.49:12080'
 # VITE_BASE_URL='http://192.168.1.254:12080'
-# VITE_BASE_URL='http://dev.ccwin-in.com:28050/api'
+VITE_BASE_URL='http://dev.ccwin-in.com:28050/api'
 # VITE_BASE_URL='http://dev.ccwin-in.com:28040/api'
 # VITE_BASE_URL='http://192.168.1.254:12080'
 
@@ -39,7 +39,7 @@ VITE_OUT_DIR=dist
 VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html'
 
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://192.168.1.196:12080'
+VITE_JMREPORT_BASE_URL='http://localhost:12080'
 
 # 租户配置
 VITE_TENANT='["英泰"]'

src/views/wms/inventoryManage/balance/balance.data.ts

@@ -936,7 +936,7 @@ export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '标签生产线代码',
-    field: 'productionLineCodePackage',
+    field: 'productionLine',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/inventoryManage/balance/index.vue

@@ -413,8 +413,8 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
     
   })
   if (enableBuy.value == "TRUE" && enableMake.value == "FALSE") {
-    detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage')
+    detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLine')
-    delete detailListTableColumnsRules.value.productionLineCodePackage
+    delete detailListTableColumnsRules.value.productionLine
     // 修改 tableform 属性
     await SupplieritemApi.getSupplieritemPage({
       pageSize: 10,
@@ -441,8 +441,8 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
       by: 'ASC',
     }).then(response => {
       detailListTableColumns.tableFormColumns.map(itemColumns => {
-        if(itemColumns.field == 'productionLineCodePackage') {
+        if(itemColumns.field == 'productionLine') {
-          row.productionLineCodePackage = response?.list[0]?.productionLineCode
+          row.productionLine = response?.list[0]?.productionLineCode
         }
       })
     })
@@ -607,7 +607,7 @@ const pointLabel = async () => {
     packUnit:detatableData1.value[0].packUnit,
     packQty:detatableData1.value[0].packQty,
     uom:detatableData1.value[0].uom,
-    productionLineCodePackage:detatableData1.value[0].productionLineCodePackage,
+    productionLine:detatableData1.value[0].productionLine,
     supplierCode:detatableData1.value[0].supplierItemCode,
   }
   // const isHave = detatableData1.value.find(item => parseFloat(item.printQty) <= 0)