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

src/views/wms/countManage/count/countJobMain/countJobMain.data.ts

@@ -28,21 +28,21 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '申请单号',
+    label: '计划单号',
-    field: 'requestNumber',
+    field: 'planNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
-    isSearch: true
   },
   {
-    label: '计划单号',
+    label: '申请单号',
-    field: 'planNumber',
+    field: 'requestNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
+    isSearch: true
   },
   {
     label: '阶段',
@@ -123,6 +123,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -139,13 +140,14 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -156,7 +158,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -169,6 +171,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
     }
@@ -177,6 +180,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '优先级增量',
     field: 'priorityIncrement',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -191,6 +195,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '部门',
@@ -199,13 +204,14 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '自动完成',
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -224,7 +230,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -243,7 +249,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -262,7 +268,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -281,7 +287,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -300,7 +306,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -319,7 +325,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -338,7 +344,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -357,7 +363,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -376,7 +382,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -397,6 +403,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '承接时间',
@@ -409,6 +416,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -425,6 +433,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '完成时间',
@@ -437,6 +446,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -453,6 +463,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '创建时间',
@@ -465,6 +476,7 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -481,25 +493,18 @@ export const CountJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
-  // {
+  {
-  //   label: '状态',
+    label: '操作',
-  //   field: 'jobStageStatus',
+    field: 'action',
-  //   sort: 'custom',
+    isDetail: false,
-  //   table: {
+    isForm: false,
-  //     width: 150
+    table: {
-  //   },
+      width: 120,
-  // },
+      fixed: 'right'
-  // {
+    },
-  //   label: '操作',
+  }
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 120,
-  //     fixed: 'right'
-  //   },
-  // }
 ]))
 
 //表单校验
@@ -565,6 +570,7 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
   },
   {
     label: '盘点明细号',
@@ -587,7 +593,7 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemName',
     sort: 'custom',
     table: {
-      width: 150
+      width: 200
     },
   },
   {
@@ -629,6 +635,7 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '数量',
@@ -670,6 +677,7 @@ export const CountJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '货主代码',

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

@@ -254,17 +254,43 @@ const formsSuccess = async (formType,data) => {
   getList()
 }
 // 标签打印
+// const handlePoint = async (row) => {
+//   console.log(row,66666666666);
+//
+//   // 判断是采购还是制造
+//   if (row.asnNumber !== null && row.asnNumber !== '') {
+//     const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+//     window.open(src.value+'&asn_number='+row.id)
+//   } else {
+//     const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+//     window.open(src.value+'&asn_number='+row.id)
+//   }
+// }
+const labelType = ref('') // 标签类别 采购还是制造等
 const handlePoint = async (row) => {
-  console.log(row,66666666666);
+  console.log(row.packingNumber,445555555555555);
-  
+  PackageApi.getBalanceToPackage(row.number).then(res => {
-  // 判断是采购还是制造
+    console.log(777,res);
-  if (row.asnNumber !== null && row.asnNumber !== '') {
+    if (res.productionLineCode != null) {
-    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      labelType.value = 'zz'
-    window.open(src.value+'&asn_number='+row.id)
+    } else {
-  } else {
+      labelType.value = 'cg'
-    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+    }
-    window.open(src.value+'&asn_number='+row.id)
+    PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
-  }
+      console.log(159,resLable )
+      // 判断是采购还是制造
+      if (labelType.value == 'cg') {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        console.log(159,resLable )
+        window.open(src.value+'&asn_number='+resLable)
+      } else {
+        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+resLable)
+      }
+    })
+  }).catch(err => {
+    console.log(err)
+  })
 }
 
 /** 导入 */

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue

@@ -88,32 +88,37 @@ const buttonTableClick = async (val, row) => {
     handlePoint(row)
   }
 }
+
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const labelType = ref('') // 标签类别 采购还是制造等
 // 标签打印
 const handlePoint = async (row) => {
   // 查询是否已创建过标签
-  let labelType = ''
   await PackageApi.getPackagePage({
     requestNumber: row.number
   }).then((res) => {
     if(res.list.length > 0) {
       if (res.list[0].productionLineCode != null) {
-        labelType = 'zz'
+        labelType.value = 'zz'
       } else {
-        labelType = 'cg'
+        labelType.value = 'cg'
       }
+      PackageApi.batchPrintingLable(res.list.map(item1=>item1.number).join(',')).then((resLable) =>{
+        console.log(159,resLable )
+
+        // 判断是采购还是制造
+        if (labelType.value == 'cg') {
+          const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+          window.open(src.value+'&asn_number='+resLable)
+        } else {
+          const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+          window.open(src.value+'&asn_number='+resLable)
+        }
+      })
     }
   }).catch(err => {
     console.log(err)
   })
-  const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
-  // 判断是采购还是制造
-  if (labelType == 'cg') {
-    const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-    window.open(src.value+'&asn_number='+row.number)
-  } else {
-    const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-    window.open(src.value+'&asn_number='+row.number)
-  }
 }
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {