标签打印arriveDate+produceDate

fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue

@@ -116,6 +116,8 @@ export default {
         labelQty:"",
         supplierCode:"",
         poNumber:"",
+        arriveDate:undefined,
+        produceDate:undefined,
         // remark:"",
       },
       // 筛选数据
@@ -143,6 +145,8 @@ export default {
         { type: "input",  label: "批次", prop: "lot", colSpan: 12 },
         { type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 },
         // { type: "input", label: "备注", prop: "remark",  colSpan: 12 },
+        { type: "dateTime", label: "生产时间", prop: "produceDate", colSpan: 12 },
+        { type: "dateTime", label: "到货时间", prop: "arriveDate", colSpan: 12 },
         { 
           hide:false,type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
           beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
@@ -294,8 +298,8 @@ export default {
               itemDesc2: this.selectItemInfo.desc2 || null,
               lot: this.selectData.lot || "",
               // supplierBatch: undefined,//获取不到
-              // arriveDate: undefined,//获取不到
-              // produceDate: undefined,//获取不到
+              arriveDate: this.selectData.arriveDate + '.0000000',
+              produceDate: this.selectData.produceDate + '.0000000',
               // expireDate: undefined,//获取不到
               stdPackQty: Number(this.selectItemInfo.stdPackQty) || 0,
               uom: this.selectItemInfo.basicUom || "",
@@ -319,7 +323,7 @@ export default {
               supplierItemCode: this.selectSupplierItemInfo.supplierItemCode,
               supplierItemName: this.selectSupplierItemInfo.itemName,
               labelType: this.selectData.labelType,
-              planArriveDate: this.selectPoNumberInfo.planArriveDate,
+              planArriveDate: this.selectPoNumberInfo.planArriveDate + '.0000000',
               // remark:this.selectData.remark,//接口缺少
             }
             // 生成标签（接口）

fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue

@@ -116,6 +116,8 @@ export default {
         supplierCode:"",
         poNumber:"",
         remark:"",
+        arriveDate:undefined,
+        produceDate:undefined,
       },
       // 筛选数据
       selectData:{},
@@ -140,6 +142,8 @@ export default {
         { type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12 },
         { type: "input",  label: "批次", prop: "lot", colSpan: 12 },
         { type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 },
+        { type: "dateTime", label: "生产时间", prop: "produceDate", colSpan: 12 },
+        { type: "dateTime", label: "到货时间", prop: "arriveDate", colSpan: 12 },
         { type: "input", label: "备注", prop: "remark",  colSpan: 12 },
         { 
           hide:false,type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
@@ -291,8 +295,8 @@ export default {
               itemDesc2: this.selectItemInfo.desc2 || null,
               lot: this.selectData.lot || "",
               // supplierBatch: undefined,//获取不到
-              // arriveDate: undefined,//获取不到
-              // produceDate: undefined,//获取不到
+              arriveDate: this.selectData.arriveDate + '.0000000',
+              produceDate: this.selectData.produceDate + '.0000000',
               // expireDate: undefined,//获取不到
               stdPackQty: Number(this.selectItemInfo.stdPackQty) || 0,
               uom: this.selectItemInfo.basicUom || "",
@@ -316,7 +320,7 @@ export default {
               supplierItemCode: this.selectSupplierItemInfo.supplierItemCode,
               supplierItemName: this.selectSupplierItemInfo.itemName,
               labelType: this.selectData.labelType,
-              planArriveDate: this.selectPoNumberInfo.planArriveDate,
+              planArriveDate: this.selectPoNumberInfo.planArriveDate + '.0000000',
               remark:this.selectData.remark,//接口缺少
             }
             // 生成标签（接口）

fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue

@@ -107,6 +107,8 @@ export default {
         supplierCode:"",
         supplierName:"",
         poNumber:"",
+        arriveDate:undefined,
+        produceDate:undefined,
       },
       // 筛选条件
       selectForm:[
@@ -140,6 +142,8 @@ export default {
         { type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12 },
         { type: "input",  label: "批次", prop: "lot", colSpan: 12 },
         { type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 },
+        { type: "dateTime", label: "生产时间", prop: "produceDate", colSpan: 12 },
+        { type: "dateTime", label: "到货时间", prop: "arriveDate", colSpan: 12 },
       ],
       // 筛选Rules
       selectRules:{
@@ -245,8 +249,8 @@ export default {
               itemDesc2: this.selectItemInfo.desc2 || null,
               lot: this.selectData.lot || "",
               // supplierBatch: undefined,//获取不到
-              // arriveDate: undefined,//获取不到
-              // produceDate: undefined,//获取不到
+              arriveDate: this.selectData.arriveDate + '.0000000',
+              produceDate: this.selectData.produceDate + '.0000000',
               // expireDate: undefined,//获取不到
               stdPackQty: Number(this.selectItemInfo.stdPackQty) || 0,
               uom: this.selectItemInfo.basicUom || "",
@@ -270,7 +274,7 @@ export default {
               supplierItemCode: this.selectSupplierInfo.supplierItemCode,
               supplierItemName: this.selectSupplierInfo.itemName,
               labelType: 1,
-              planArriveDate: this.poNumberInfo.planArriveDate,
+              planArriveDate: this.poNumberInfo.planArriveDate + '.0000000',
               remark:this.selectData.remark,//接口缺少
             }
             // 生成标签（接口）