优化生产制单
This commit is contained in:
parent
fd67533544
commit
476860c434
|
|
@ -0,0 +1,21 @@
|
|||
package cn.hangtag.module.oms.enums;
|
||||
|
||||
public interface CodeRuleIDConstants {
|
||||
/**
|
||||
* 客户
|
||||
*/
|
||||
Long KH = 5L;
|
||||
/**
|
||||
* 销售订单
|
||||
*/
|
||||
Long XSDD = 6L;
|
||||
/**
|
||||
* 销售合约
|
||||
*/
|
||||
Long XSHY = 7L;
|
||||
/**
|
||||
* 生产制单
|
||||
*/
|
||||
Long SCZD = 8L;
|
||||
|
||||
}
|
||||
|
|
@ -11,13 +11,14 @@ import lombok.Getter;
|
|||
@AllArgsConstructor
|
||||
public enum BillStatusEnum {
|
||||
//订单状态:已下单、生产中、已完成
|
||||
//单据状态:暂存、已提交、已审核
|
||||
//单据状态:暂存、已提交、已审核、已排产
|
||||
|
||||
REJECT("AA", "驳回"),
|
||||
SAVE("A", "暂存"),
|
||||
SUBMIT("B", "已提交"),
|
||||
AUDIT("C", "已审核"),
|
||||
INVALID("D", "作废");
|
||||
INVALID("D", "作废"),
|
||||
YPLAN("E", "已排产");
|
||||
|
||||
/**
|
||||
* 状态
|
||||
|
|
|
|||
|
|
@ -28,6 +28,9 @@ public class ProduceOrderRespVO {
|
|||
@ExcelProperty("客户编号")
|
||||
private String customerCode;
|
||||
|
||||
@Schema(description = "产品ID", example = "11111")
|
||||
private Long productId;
|
||||
|
||||
@Schema(description = "产品编号", example = "11111")
|
||||
@ExcelProperty("产品编号")
|
||||
private String productCode;
|
||||
|
|
@ -92,4 +95,16 @@ public class ProduceOrderRespVO {
|
|||
@ExcelProperty("交货数量")
|
||||
private Long deliveryQty;
|
||||
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@ExcelProperty("创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
@Schema(description = "更新时间")
|
||||
@ExcelProperty("更新时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
@Schema(description = "详情")
|
||||
private String details;
|
||||
|
||||
}
|
||||
|
|
@ -20,6 +20,9 @@ public class ProduceOrderSaveReqVO {
|
|||
@Schema(description = "订单号")
|
||||
private String orderNo;
|
||||
|
||||
@Schema(description = "客户ID")
|
||||
private Long customerId;
|
||||
|
||||
@Schema(description = "客户编号")
|
||||
private String customerCode;
|
||||
|
||||
|
|
@ -47,7 +50,7 @@ public class ProduceOrderSaveReqVO {
|
|||
@Schema(description = "交货地点")
|
||||
private String deliveryPlace;
|
||||
|
||||
@Schema(description = "职员")
|
||||
@Schema(description = "职员")
|
||||
private String clerk;
|
||||
|
||||
@Schema(description = "报告日期")
|
||||
|
|
@ -74,4 +77,7 @@ public class ProduceOrderSaveReqVO {
|
|||
@Schema(description = "交货数量")
|
||||
private Long deliveryQty;
|
||||
|
||||
@Schema(description = "详情")
|
||||
private String details;
|
||||
|
||||
}
|
||||
|
|
@ -116,5 +116,9 @@ public class ProduceOrderDO extends BaseDO {
|
|||
* 交货数量
|
||||
*/
|
||||
private Long deliveryQty;
|
||||
/**
|
||||
* 详情
|
||||
*/
|
||||
private String details;
|
||||
|
||||
}
|
||||
|
|
@ -94,17 +94,14 @@ public class SaleOrderDO extends BaseDO {
|
|||
* 发票名称
|
||||
*/
|
||||
private String invoiceName;
|
||||
|
||||
/**
|
||||
* 发票地址
|
||||
*/
|
||||
private String invoiceAddress;
|
||||
|
||||
/**
|
||||
* 发票备注
|
||||
*/
|
||||
private String invoiceRemarks;
|
||||
|
||||
/**
|
||||
* 地址
|
||||
*/
|
||||
|
|
@ -113,7 +110,6 @@ public class SaleOrderDO extends BaseDO {
|
|||
* 货币
|
||||
*/
|
||||
private String currency;
|
||||
|
||||
/**
|
||||
* 驳回原因
|
||||
*/
|
||||
|
|
@ -126,7 +122,6 @@ public class SaleOrderDO extends BaseDO {
|
|||
* 审核时间
|
||||
*/
|
||||
private LocalDateTime auditorTime;
|
||||
|
||||
/**
|
||||
* 订单号
|
||||
*/
|
||||
|
|
@ -147,24 +142,18 @@ public class SaleOrderDO extends BaseDO {
|
|||
* 零售商单号
|
||||
*/
|
||||
private String retailerCode;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 品牌id
|
||||
*/
|
||||
private Integer brandId;
|
||||
|
||||
/**
|
||||
* 是否分批交货 分批交货以明细表中的交货日期为准
|
||||
*/
|
||||
private Boolean isBatch;
|
||||
|
||||
/**
|
||||
* 交货地址
|
||||
*/
|
||||
private String deliveryAddress;
|
||||
|
||||
/**
|
||||
* 交货备注
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -39,4 +39,11 @@ public interface SaleOrderSkuMapper extends BaseMapperX<SaleOrderSkuDO> {
|
|||
.orderByDesc(SaleOrderSkuDO::getId));
|
||||
}
|
||||
|
||||
default List<SaleOrderSkuDO> selectListByEntryId(Long entryId) {
|
||||
return selectList(SaleOrderSkuDO::getEntryId, entryId);
|
||||
}
|
||||
|
||||
default int deleteByEntryId(Long entryId) {
|
||||
return delete(SaleOrderSkuDO::getEntryId, entryId);
|
||||
}
|
||||
}
|
||||
|
|
@ -6,6 +6,7 @@ import cn.hangtag.framework.common.util.FuncUtil;
|
|||
import cn.hangtag.framework.common.util.validation.ValidationUtils;
|
||||
import cn.hangtag.framework.mybatis.core.dataobject.BaseDO;
|
||||
import cn.hangtag.module.oms.dal.dataobject.saleorder.SaleOrderDO;
|
||||
import cn.hangtag.module.oms.enums.CodeRuleIDConstants;
|
||||
import cn.hangtag.module.oms.serialnumber.CodingRulesUtils;
|
||||
import cn.hangtag.module.system.controller.admin.user.vo.user.UserImportRespVO;
|
||||
import cn.hangtag.module.system.controller.admin.user.vo.user.UserSaveReqVO;
|
||||
|
|
@ -140,7 +141,7 @@ public class ProduceOrderServiceImpl implements ProduceOrderService {
|
|||
while (true){
|
||||
count --;
|
||||
try {
|
||||
s = CodingRulesUtils.generateCode(5L, false);
|
||||
s = CodingRulesUtils.generateCode(CodeRuleIDConstants.SCZD, false);
|
||||
checkCode(null,s);
|
||||
return s;
|
||||
}catch (ServiceException e){
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import cn.hangtag.module.oms.controller.admin.trade.vo.TradeOrderTrendRespVO;
|
|||
import cn.hangtag.module.oms.dal.dataobject.saleorder.SaleOrderDO;
|
||||
import cn.hangtag.module.oms.dal.dataobject.saleorderentry.SaleOrderEntryDO;
|
||||
import cn.hangtag.framework.common.pojo.PageResult;
|
||||
import cn.hangtag.module.oms.dal.dataobject.saleordersku.SaleOrderSkuDO;
|
||||
|
||||
/**
|
||||
* 销售订单 Service 接口
|
||||
|
|
@ -109,4 +110,6 @@ public interface SaleOrderService {
|
|||
|
||||
public String getNewOrderCode();
|
||||
public String getNewOrderCode2();
|
||||
|
||||
List<SaleOrderSkuDO> getSaleOrderSkuEntryListByEntryId(Long entryId);
|
||||
}
|
||||
|
|
@ -308,7 +308,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
|
|||
}
|
||||
|
||||
saleOrder.setBillStatus(BillStatusEnum.AUDIT.getValue());
|
||||
saleOrder.setOrderStatus(SaleOrderStatusEnum.YWC.getValue());
|
||||
saleOrder.setOrderStatus(SaleOrderStatusEnum.SCZ.getValue());
|
||||
Long userId = SecurityFrameworkUtils.getLoginUserId();
|
||||
saleOrder.setAuditor(userId.toString());
|
||||
saleOrder.setAuditorTime(LocalDateTime.now());
|
||||
|
|
@ -363,27 +363,56 @@ public class SaleOrderServiceImpl implements SaleOrderService {
|
|||
|
||||
}
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void generateProduceOrder(List<Long> ids) {
|
||||
List<SaleOrderDO> saleOrders = saleOrderMapper.selectList(SaleOrderDO::getId, ids);
|
||||
for (SaleOrderDO saleOrder : saleOrders) {
|
||||
ProduceOrderSaveReqVO saveReqVO = new ProduceOrderSaveReqVO();
|
||||
saveReqVO.setOrderNo(saleOrder.getBillno());
|
||||
saveReqVO.setCustomerCode("客户编号");
|
||||
saveReqVO.setProductId(0L);
|
||||
saveReqVO.setProduceLine("测试线");
|
||||
saveReqVO.setDeliveryMethod("交货方式");
|
||||
saveReqVO.setDeliveryQty(1111111L);
|
||||
saveReqVO.setDays(5L);
|
||||
saveReqVO.setClerk("职员");
|
||||
saveReqVO.setContractDate(LocalDateTime.now() );
|
||||
Long produceOrderId = produceOrderService.createProduceOrder(saveReqVO);
|
||||
CustomerDO customer = customerService.getCustomer(saleOrder.getCustomerId());
|
||||
List<SaleOrderEntryDO> entrys = getSaleOrderEntryListByParentId(saleOrder.getId());
|
||||
|
||||
for (SaleOrderEntryDO entry : entrys) {
|
||||
List<SaleOrderSkuDO> saleOrderSkuDO = getSaleOrderSkuEntryListByEntryId(entry.getId());
|
||||
ProductInfoDO productInfo = productInfoService.getProductInfo(entry.getMaterialId());
|
||||
ProduceOrderSaveReqVO saveReqVO = new ProduceOrderSaveReqVO();
|
||||
saveReqVO.setOrderNo(saleOrder.getBillno());
|
||||
saveReqVO.setSaleContractNo(saleOrder.getBillno());
|
||||
saveReqVO.setCustomerId(customer.getId());
|
||||
saveReqVO.setCustomerCode(customer.getNumber());
|
||||
saveReqVO.setProductId(entry.getMaterialId());
|
||||
saveReqVO.setProductCode(productInfo.getCode());
|
||||
saveReqVO.setProductName(productInfo.getName());
|
||||
saveReqVO.setProduceLine("");
|
||||
saveReqVO.setDeliveryMethod("全部");
|
||||
saveReqVO.setDeliveryQty(Long.valueOf(entry.getQty()));
|
||||
saveReqVO.setContractQty(Long.valueOf(entry.getQty()));
|
||||
saveReqVO.setProduceQty(Long.valueOf(entry.getQty()));
|
||||
saveReqVO.setDays(1L);
|
||||
saveReqVO.setClerk(customer.getSaleperson());
|
||||
saveReqVO.setContractDate(LocalDateTime.now());
|
||||
saveReqVO.setReportDate(LocalDateTime.now());
|
||||
saveReqVO.setProduceDate(LocalDateTime.now());
|
||||
saveReqVO.setInspectionDate(LocalDateTime.now());
|
||||
saveReqVO.setDeliverydate(LocalDateTime.now());
|
||||
|
||||
Double specSizeWidth = productInfo.getSpecSizeWidth();
|
||||
Double specSizeHeight = productInfo.getSpecSizeHeight();
|
||||
Double specSizeThk = productInfo.getSpecSizeThk();
|
||||
String specMaterial = productInfo.getSpecMaterial();
|
||||
StringBuffer str = new StringBuffer();
|
||||
str.append(String.format("货名:%s\r\n",productInfo.getName()));
|
||||
str.append(String.format("规格:%s × %s \r\n",specSizeWidth,specSizeHeight));
|
||||
str.append(String.format("纸质:%s × %s \r\n",specMaterial));
|
||||
saveReqVO.setDetails(str.toString());
|
||||
Long produceOrderId = produceOrderService.createProduceOrder(saveReqVO);
|
||||
}
|
||||
|
||||
//更新销售订单已完成
|
||||
/*if(produceOrderId!=null){
|
||||
SaleOrderSaveReqVO saleOrderSaveReqVO = new SaleOrderSaveReqVO();
|
||||
saleOrderSaveReqVO.setId(saleOrder.getId());
|
||||
saleOrderSaveReqVO.setOrderStatus(SaleOrderStatusEnum.YWC.getValue());
|
||||
updateSaleOrder(saleOrderSaveReqVO);
|
||||
}*/
|
||||
//if(produceOrderId!=null){
|
||||
SaleOrderDO saleOrderDO = new SaleOrderDO();
|
||||
saleOrderDO.setId(saleOrder.getId());
|
||||
saleOrderDO.setOrderStatus(SaleOrderStatusEnum.YWC.getValue());
|
||||
saleOrderMapper.updateById(saleOrderDO);
|
||||
//}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -418,7 +447,7 @@ public class SaleOrderServiceImpl implements SaleOrderService {
|
|||
Double specSizeHeight = productInfo.getSpecSizeHeight();
|
||||
Double specSizeWidth = productInfo.getSpecSizeWidth();
|
||||
Double specSizeThk = productInfo.getSpecSizeThk();
|
||||
String spec = specSizeHeight.doubleValue() + " * " + specSizeWidth + " " + specSizeThk;
|
||||
String spec = specSizeWidth.doubleValue()+ " * " + specSizeHeight.doubleValue() + " " + specSizeThk.doubleValue();
|
||||
int j = i+1;
|
||||
context.setVariable("item"+j, j+"");
|
||||
context.setVariable("explain"+j, code);
|
||||
|
|
@ -723,10 +752,10 @@ public class SaleOrderServiceImpl implements SaleOrderService {
|
|||
}
|
||||
saleOrderEntryMapper.insertBatch(list);
|
||||
//更新总金额
|
||||
/*SaleOrderDO saleOrderDO = new SaleOrderDO();
|
||||
SaleOrderDO saleOrderDO = new SaleOrderDO();
|
||||
saleOrderDO.setId(parentId);
|
||||
saleOrderDO.setOrderAmount(amount);
|
||||
saleOrderMapper.updateById(saleOrderDO);*/
|
||||
saleOrderMapper.updateById(saleOrderDO);
|
||||
}
|
||||
|
||||
private void updateSaleOrderEntryList(Long parentId, List<SaleOrderEntryDO> list) {
|
||||
|
|
@ -795,4 +824,10 @@ public class SaleOrderServiceImpl implements SaleOrderService {
|
|||
saveReqVO.setSaleContractEntrys(list);
|
||||
return saleContractService.createSaleContract(saveReqVO);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<SaleOrderSkuDO> getSaleOrderSkuEntryListByEntryId(Long entryId) {
|
||||
return skuOrderSkuMapper.selectListByEntryId(entryId);
|
||||
}
|
||||
}
|
||||
|
|
@ -108,7 +108,7 @@ const dialogTitle = ref('产品列表') // 弹窗的标题
|
|||
|
||||
const props = defineProps({
|
||||
modelValue: {
|
||||
type: String,
|
||||
type: [String,Number],
|
||||
required: true
|
||||
},
|
||||
dataKey: {
|
||||
|
|
@ -153,7 +153,12 @@ const that = reactive({
|
|||
showValue: '',
|
||||
visible: false,
|
||||
})
|
||||
|
||||
const toStr = (data: any, def = '') => {
|
||||
if (data !== null && data !== undefined) {
|
||||
return `${data}`
|
||||
}
|
||||
return def
|
||||
}
|
||||
const openDialog = () => {
|
||||
updateVisible(true);
|
||||
}
|
||||
|
|
@ -164,24 +169,6 @@ const viewDetails = () => {
|
|||
openDialog();
|
||||
}
|
||||
}
|
||||
// 用监听属性变化无其他意义
|
||||
const tmp = computed(()=>{
|
||||
setTimeout(()=>{
|
||||
that.inputVal = toStr(props.modelValue,that.inputVal)
|
||||
if (that.inputVal) {
|
||||
initInput();
|
||||
}
|
||||
},100)
|
||||
return ''
|
||||
},{
|
||||
deep: true
|
||||
})
|
||||
const toStr = (data: any) => {
|
||||
if (data !== null && data !== undefined) {
|
||||
return `${data}`
|
||||
}
|
||||
return data
|
||||
}
|
||||
let map = new Map();
|
||||
const initInput = async () => {
|
||||
const dataKey = that.inputVal + ',' + props.dataKey + ',' + props.showKey + ',' + props.multiple;
|
||||
|
|
@ -199,7 +186,7 @@ const initInput = async () => {
|
|||
let tmpInput = [];
|
||||
let tmpShow = [];
|
||||
for (let i = 0; i < ids.length; i++) {
|
||||
const data = await BrandApi.getBrand(ids[i])
|
||||
const data = await ProductInfoApi.getProductInfo(ids[i])
|
||||
tmpInput.push(data[props.dataKey]);
|
||||
tmpShow.push(data[props.showKey]);
|
||||
}
|
||||
|
|
@ -212,7 +199,29 @@ const initInput = async () => {
|
|||
}
|
||||
watch(() => props.visible, (newVal) => {
|
||||
that.visible = newVal;
|
||||
|
||||
})
|
||||
|
||||
watch(() => props.modelValue, (newVal)=>{
|
||||
that.inputVal = toStr(newVal,'')
|
||||
if (that.inputVal) {
|
||||
initInput();
|
||||
}
|
||||
},{
|
||||
immediate: true
|
||||
})
|
||||
// 用监听属性变化无其他意义
|
||||
const tmp = computed(()=>{
|
||||
setTimeout(()=>{
|
||||
that.inputVal = toStr(props.modelValue,that.inputVal)
|
||||
if (that.inputVal) {
|
||||
initInput();
|
||||
}
|
||||
},100)
|
||||
return ''
|
||||
},{deep: true})
|
||||
|
||||
|
||||
const clearData = () => {
|
||||
that.inputVal = '';
|
||||
that.showValue = '';
|
||||
|
|
|
|||
|
|
@ -7,27 +7,43 @@
|
|||
label-width="100px"
|
||||
v-loading="formLoading"
|
||||
>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="单据编号" prop="billno">
|
||||
<el-input v-model="formData.billno" placeholder="请输入单据编号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="订单号" prop="orderNo">
|
||||
<el-input v-model="formData.orderNo" placeholder="请输入订单号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="客户编号" prop="customerCode">
|
||||
<el-input v-model="formData.customerCode" placeholder="请输入客户编号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="产品" prop="productId" >
|
||||
<ProductInfoListDialog v-model="formData.productId" placeholder="请选择产品" style="width: 11100px;"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<!-- <el-form-item label="产品编号" prop="productCode">
|
||||
<el-input v-model="formData.productCode" placeholder="请输入产品编号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="产品名称" prop="productName">
|
||||
<el-input v-model="formData.productName" placeholder="请输入产品名称" />
|
||||
</el-form-item>-->
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="合约号" prop="saleContractNo">
|
||||
<el-input v-model="formData.saleContractNo" placeholder="请输入合约号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="合约日期" prop="contractDate">
|
||||
<el-date-picker
|
||||
v-model="formData.contractDate"
|
||||
|
|
@ -36,18 +52,40 @@
|
|||
placeholder="选择合约日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="合约数量" prop="contractQty">
|
||||
<el-input-number v-model="formData.contractQty" placeholder="请输入合约数量" />
|
||||
</el-form-item>
|
||||
<el-form-item label="生产数量" prop="produceQty">
|
||||
<el-input-number v-model="formData.produceQty" placeholder="请输入生产数量" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="职员" prop="clerk">
|
||||
<el-input v-model="formData.clerk" placeholder="请输入职员" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12">
|
||||
|
||||
<el-form-item label="合约数量" prop="contractQty">
|
||||
<el-input-number v-model="formData.contractQty" placeholder="请输入合约数量" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="交货地点" prop="deliveryPlace">
|
||||
<el-input v-model="formData.deliveryPlace" placeholder="请输入交货地点" />
|
||||
</el-form-item>
|
||||
<el-form-item label="职员" prop="clerk">
|
||||
<el-input v-model="formData.clerk" placeholder="请输入职员" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="生产数量" prop="produceQty">
|
||||
<el-input-number v-model="formData.produceQty" placeholder="请输入生产数量" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="报告日期" prop="reportDate">
|
||||
<el-date-picker
|
||||
v-model="formData.reportDate"
|
||||
|
|
@ -56,23 +94,41 @@
|
|||
placeholder="选择报告日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="生产日期" prop="produceDate">
|
||||
<el-date-picker
|
||||
v-model="formData.produceDate"
|
||||
type="date"
|
||||
value-format="x"
|
||||
placeholder="选择生产日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="天数" prop="days">
|
||||
<el-input-number v-model="formData.days" placeholder="请输入天数" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
|
||||
<el-form-item label="天数" prop="days">
|
||||
<el-input-number v-model="formData.days" placeholder="请输入天数" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="生产日期" prop="produceDate">
|
||||
<el-date-picker
|
||||
v-model="formData.produceDate"
|
||||
type="date"
|
||||
value-format="x"
|
||||
placeholder="选择生产日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="生产线" prop="produceLine">
|
||||
<el-input v-model="formData.produceLine" placeholder="请输入生产线" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="交货方式" prop="deliveryMethod">
|
||||
<el-input v-model="formData.deliveryMethod" placeholder="请输入交货方式" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="验货日期" prop="inspectionDate">
|
||||
<el-date-picker
|
||||
v-model="formData.inspectionDate"
|
||||
|
|
@ -81,6 +137,10 @@
|
|||
placeholder="选择验货日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="交货日期" prop="deliverydate">
|
||||
<el-date-picker
|
||||
v-model="formData.deliverydate"
|
||||
|
|
@ -89,9 +149,13 @@
|
|||
placeholder="选择交货日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="交货数量" prop="deliveryQty">
|
||||
<el-input-number v-model="formData.deliveryQty" placeholder="请输入交货数量" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="downpdf" type="primary" v-if="formData.id" :disabled="formLoading">下 载</el-button>
|
||||
|
|
@ -149,6 +213,7 @@ const formData = ref({
|
|||
inspectionDateStr: undefined,
|
||||
deliverydateStr: undefined,
|
||||
deliveryQty: undefined,
|
||||
details: undefined,
|
||||
})
|
||||
const formRules = reactive({
|
||||
})
|
||||
|
|
@ -262,7 +327,7 @@ const downpdf = async () => {
|
|||
const preview = async () => {
|
||||
const id = formData.value.id;
|
||||
if (id) {
|
||||
formData.value = await ProduceOrderApi.getProduceOrder(id)
|
||||
//formData.value = await ProduceOrderApi.getProduceOrder(id)
|
||||
}
|
||||
//日期转换
|
||||
formData.value.contractDateStr = formatDate(formData.value.contractDate,'YYYY-MM-DD')
|
||||
|
|
|
|||
|
|
@ -160,15 +160,15 @@
|
|||
<!-- <el-table-column label="ID" align="center" prop="id" />-->
|
||||
<el-table-column label="序号" align="center" type="index" width="80"/>
|
||||
<el-table-column label="单据编号" align="center" prop="billno" width="240" />
|
||||
<el-table-column label="订单号" align="center" prop="orderNo" width="140"/>
|
||||
<el-table-column label="订单号" align="center" prop="orderNo" width="240"/>
|
||||
<el-table-column label="客户编号" align="center" prop="customerCode" width="140"/>
|
||||
<el-table-column label="产品名称" align="center" prop="productName" />
|
||||
<el-table-column label="合约号" align="center" prop="saleContractNo" />
|
||||
<el-table-column label="产品名称" align="center" prop="productName" width="140"/>
|
||||
<el-table-column label="合约号" align="center" prop="saleContractNo" width="240"/>
|
||||
<el-table-column
|
||||
label="合约日期"
|
||||
align="center"
|
||||
prop="contractDate"
|
||||
:formatter="dateFormatter"
|
||||
:formatter="dateFormatter2"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column label="合约数量" align="center" prop="contractQty" />
|
||||
|
|
@ -179,14 +179,14 @@
|
|||
label="报告日期"
|
||||
align="center"
|
||||
prop="reportDate"
|
||||
:formatter="dateFormatter"
|
||||
:formatter="dateFormatter2"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column
|
||||
label="生产日期"
|
||||
align="center"
|
||||
prop="produceDate"
|
||||
:formatter="dateFormatter"
|
||||
:formatter="dateFormatter2"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column label="天数" align="center" prop="days" />
|
||||
|
|
@ -196,17 +196,24 @@
|
|||
label="验货日期"
|
||||
align="center"
|
||||
prop="inspectionDate"
|
||||
:formatter="dateFormatter2"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column label="交货数量" align="center" prop="deliveryQty" />
|
||||
<el-table-column
|
||||
label="创建时间"
|
||||
align="center"
|
||||
prop="createTime"
|
||||
:formatter="dateFormatter"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column
|
||||
label="交货日期"
|
||||
label="更新时间"
|
||||
align="center"
|
||||
prop="deliverydate"
|
||||
prop="updatetime"
|
||||
:formatter="dateFormatter"
|
||||
width="180px"
|
||||
/>
|
||||
<el-table-column label="交货数量" align="center" prop="deliveryQty" />
|
||||
<el-table-column label="操作" align="center" fixed="right" width="150">
|
||||
<template #default="scope">
|
||||
<el-button
|
||||
|
|
@ -247,7 +254,7 @@
|
|||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { dateFormatter } from '@/utils/formatTime'
|
||||
import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
|
||||
import download from '@/utils/download'
|
||||
import { ProduceOrderApi, ProduceOrderVO } from '@/api/oms/produceorder'
|
||||
import ProduceOrderForm from './ProduceOrderForm.vue'
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ export default {
|
|||
"left": 258,
|
||||
"top": 54,
|
||||
"height": 9.75,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"title": "生产单编号",
|
||||
"right": 414.74388885498047,
|
||||
"bottom": 49.49592590332031,
|
||||
|
|
@ -48,7 +48,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -71,7 +72,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -83,7 +85,7 @@ export default {
|
|||
"left": 13.5,
|
||||
"top": 54,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"field": "billno",
|
||||
"testData": "VVVVVVVVVVVVVV",
|
||||
"fontSize": 7.75,
|
||||
|
|
@ -98,7 +100,8 @@ export default {
|
|||
"right": 133.49185180664062,
|
||||
"bottom": 60.24388885498047,
|
||||
"vCenter": 73.49185180664062,
|
||||
"hCenter": 52.24388885498047
|
||||
"hCenter": 52.24388885498047,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -110,7 +113,7 @@ export default {
|
|||
"left": 258,
|
||||
"top": 76.83333333333333,
|
||||
"height": 9.75,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"title": "产品名称",
|
||||
"right": 296.99388885498047,
|
||||
"bottom": 74.99388885498047,
|
||||
|
|
@ -121,7 +124,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -133,7 +137,7 @@ export default {
|
|||
"left": 13.5,
|
||||
"top": 76.83333333333333,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"field": "productCode",
|
||||
"testData": "XS888888888",
|
||||
"fontSize": 7.75,
|
||||
|
|
@ -144,7 +148,8 @@ export default {
|
|||
"qid": "orderId_1",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -156,7 +161,7 @@ export default {
|
|||
"left": 258,
|
||||
"top": 99.66666666666666,
|
||||
"height": 9.75,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"title": "生产日期",
|
||||
"right": 318.74796295166016,
|
||||
"bottom": 115.49387741088867,
|
||||
|
|
@ -167,7 +172,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -177,9 +183,9 @@ export default {
|
|||
{
|
||||
"options": {
|
||||
"left": 13.5,
|
||||
"top": 99.66666666666666,
|
||||
"top": 99,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"field": "customerCode",
|
||||
"testData": "XS888888888",
|
||||
"fontSize": 7.75,
|
||||
|
|
@ -190,7 +196,8 @@ export default {
|
|||
"qid": "orderId_2",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -213,7 +220,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -225,7 +233,7 @@ export default {
|
|||
"left": 258,
|
||||
"top": 121.5,
|
||||
"height": 9.75,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"title": "生产线",
|
||||
"right": 318.7418746948242,
|
||||
"bottom": 150,
|
||||
|
|
@ -236,7 +244,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -248,7 +257,7 @@ export default {
|
|||
"left": 13.5,
|
||||
"top": 121.5,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"field": "saleContractNo",
|
||||
"testData": "XS888888888",
|
||||
"fontSize": 7.75,
|
||||
|
|
@ -263,7 +272,8 @@ export default {
|
|||
"hCenter": 108.5,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -275,7 +285,7 @@ export default {
|
|||
"left": 258,
|
||||
"top": 145.33333333333331,
|
||||
"height": 9.75,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"title": "验货日期",
|
||||
"right": 338.49609375,
|
||||
"bottom": 130.74609375,
|
||||
|
|
@ -286,7 +296,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -298,7 +309,7 @@ export default {
|
|||
"left": 13.5,
|
||||
"top": 145.33333333333331,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"field": "contractDateStr",
|
||||
"testData": "2024-02-21",
|
||||
"fontSize": 7.75,
|
||||
|
|
@ -314,7 +325,8 @@ export default {
|
|||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"qrCodeLevel": 0,
|
||||
"dataType": "datetime"
|
||||
"dataType": "datetime",
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -326,7 +338,7 @@ export default {
|
|||
"left": 258,
|
||||
"top": 165,
|
||||
"height": 9.75,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"title": "交货方式",
|
||||
"right": 350.25,
|
||||
"bottom": 153.75,
|
||||
|
|
@ -337,7 +349,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -349,7 +362,7 @@ export default {
|
|||
"left": 13.5,
|
||||
"top": 165,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"field": "contractQty",
|
||||
"testData": "XS888888888",
|
||||
"fontSize": 7.75,
|
||||
|
|
@ -364,7 +377,8 @@ export default {
|
|||
"hCenter": 179.74796295166016,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -387,7 +401,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -399,7 +414,7 @@ export default {
|
|||
"left": 258,
|
||||
"top": 187.5,
|
||||
"height": 9.75,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"title": "交货日期",
|
||||
"right": 478.49796295166016,
|
||||
"bottom": 208.49390029907227,
|
||||
|
|
@ -423,7 +438,7 @@ export default {
|
|||
"left": 13.5,
|
||||
"top": 187.5,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"field": "produceQty",
|
||||
"testData": "XS888888888",
|
||||
"fontSize": 7.75,
|
||||
|
|
@ -438,7 +453,8 @@ export default {
|
|||
"hCenter": 197.74185180664062,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -450,7 +466,7 @@ export default {
|
|||
"left": 13.5,
|
||||
"top": 213.83333333333334,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"field": "deliveryPlace",
|
||||
"testData": "XS888888888",
|
||||
"fontSize": 7.75,
|
||||
|
|
@ -465,7 +481,8 @@ export default {
|
|||
"hCenter": 212.74388885498047,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -477,7 +494,7 @@ export default {
|
|||
"left": 13.5,
|
||||
"top": 236.66666666666669,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"field": "clerk",
|
||||
"testData": "XS888888888",
|
||||
"fontSize": 7.75,
|
||||
|
|
@ -492,7 +509,8 @@ export default {
|
|||
"hCenter": 256.24796295166016,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -504,7 +522,7 @@ export default {
|
|||
"left": 258,
|
||||
"top": 259.5,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"field": "reportTimeStr",
|
||||
"testData": "12312",
|
||||
"fontSize": 7.75,
|
||||
|
|
@ -519,7 +537,8 @@ export default {
|
|||
"hCenter": 256.9918575286865,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -531,7 +550,7 @@ export default {
|
|||
"left": 13.5,
|
||||
"top": 259.5,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"width": 200,
|
||||
"field": "reportDateStr",
|
||||
"testData": "XS888888888",
|
||||
"fontSize": 7.75,
|
||||
|
|
@ -546,7 +565,8 @@ export default {
|
|||
"hCenter": 269.74796295166016,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -558,7 +578,7 @@ export default {
|
|||
"left": 13.5,
|
||||
"top": 297,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"width": 46.5,
|
||||
"fontSize": 9,
|
||||
"fontWeight": "700",
|
||||
"textAlign": "left",
|
||||
|
|
@ -572,7 +592,8 @@ export default {
|
|||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"qrCodeLevel": 0,
|
||||
"field": "productionDetails"
|
||||
"field": "productionDetails",
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -582,8 +603,8 @@ export default {
|
|||
{
|
||||
"options": {
|
||||
"left": 15,
|
||||
"top": 483,
|
||||
"height": 37.5,
|
||||
"top": 490,
|
||||
"height": 43.5,
|
||||
"width": 565.5,
|
||||
"title": "备注",
|
||||
"right": 582,
|
||||
|
|
@ -621,7 +642,8 @@ export default {
|
|||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"hideTitle": true,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -647,7 +669,8 @@ export default {
|
|||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"hideTitle": true,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -670,7 +693,8 @@ export default {
|
|||
"qrCodeLevel": 0,
|
||||
"field": "asd",
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700"
|
||||
"fontWeight": "700",
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -693,7 +717,8 @@ export default {
|
|||
"qrCodeLevel": 0,
|
||||
"field": "xxx",
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700"
|
||||
"fontWeight": "700",
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -717,7 +742,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -740,7 +766,8 @@ export default {
|
|||
"qrCodeLevel": 0,
|
||||
"field": "12",
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700"
|
||||
"fontWeight": "700",
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -766,7 +793,8 @@ export default {
|
|||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"hideTitle": true,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -789,7 +817,8 @@ export default {
|
|||
"qrCodeLevel": 0,
|
||||
"field": "fed",
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700"
|
||||
"fontWeight": "700",
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -812,7 +841,8 @@ export default {
|
|||
"qrCodeLevel": 0,
|
||||
"field": "xxxc",
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700"
|
||||
"fontWeight": "700",
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -835,7 +865,8 @@ export default {
|
|||
"qrCodeLevel": 0,
|
||||
"field": "asdas",
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700"
|
||||
"fontWeight": "700",
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -858,7 +889,8 @@ export default {
|
|||
"qrCodeLevel": 0,
|
||||
"field": "33",
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700"
|
||||
"fontWeight": "700",
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -884,7 +916,8 @@ export default {
|
|||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"hideTitle": true,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -907,7 +940,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -930,7 +964,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -953,7 +988,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -976,7 +1012,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -1002,7 +1039,8 @@ export default {
|
|||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"hideTitle": true,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "订单编号",
|
||||
|
|
@ -1025,7 +1063,8 @@ export default {
|
|||
"qrCodeLevel": 0,
|
||||
"field": "hhh",
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700"
|
||||
"fontWeight": "700",
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -1048,7 +1087,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -1071,7 +1111,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -1094,7 +1135,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "文本",
|
||||
|
|
@ -1114,7 +1156,8 @@ export default {
|
|||
"widthHeightSync": false,
|
||||
"fontSize": 7.5,
|
||||
"fontWeight": "700",
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "这是更新后的元素",
|
||||
|
|
@ -1127,11 +1170,14 @@ export default {
|
|||
"top": 741,
|
||||
"height": 9,
|
||||
"width": 513,
|
||||
"borderWidth": 0.75,
|
||||
"borderWidth": "0.75",
|
||||
"right": 158.24796295166016,
|
||||
"bottom": 751.4918746948242,
|
||||
"vCenter": 113.24796295166016,
|
||||
"hCenter": 746.9918746948242
|
||||
"hCenter": 746.9918746948242,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1141,14 +1187,17 @@ export default {
|
|||
{
|
||||
"options": {
|
||||
"left": 237,
|
||||
"top": 789,
|
||||
"top": 804,
|
||||
"height": 9,
|
||||
"width": 121.5,
|
||||
"borderWidth": 0.75,
|
||||
"borderWidth": "0.75",
|
||||
"right": 359.2418746948242,
|
||||
"bottom": 797.2479629516602,
|
||||
"vCenter": 299.9918746948242,
|
||||
"hCenter": 792.7479629516602
|
||||
"hCenter": 792.7479629516602,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1158,14 +1207,17 @@ export default {
|
|||
{
|
||||
"options": {
|
||||
"left": 451.5,
|
||||
"top": 789,
|
||||
"top": 804,
|
||||
"height": 9,
|
||||
"width": 130.5,
|
||||
"borderWidth": 0.75,
|
||||
"borderWidth": "0.75",
|
||||
"right": 569.2418746948242,
|
||||
"bottom": 798.7459487915039,
|
||||
"vCenter": 509.9918746948242,
|
||||
"hCenter": 794.2459487915039
|
||||
"hCenter": 794.2459487915039,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1175,10 +1227,13 @@ export default {
|
|||
{
|
||||
"options": {
|
||||
"left": 28.5,
|
||||
"top": 789,
|
||||
"top": 804,
|
||||
"height": 9,
|
||||
"width": 126,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1188,7 +1243,7 @@ export default {
|
|||
{
|
||||
"options": {
|
||||
"left": 237.5,
|
||||
"top": 790,
|
||||
"top": 805,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"field": "creater",
|
||||
|
|
@ -1205,7 +1260,8 @@ export default {
|
|||
"hCenter": 797.75,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "制单人",
|
||||
|
|
@ -1215,7 +1271,7 @@ export default {
|
|||
{
|
||||
"options": {
|
||||
"left": 451.5,
|
||||
"top": 790,
|
||||
"top": 805,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"field": "creater",
|
||||
|
|
@ -1243,7 +1299,7 @@ export default {
|
|||
{
|
||||
"options": {
|
||||
"left": 30,
|
||||
"top": 790.5,
|
||||
"top": 805,
|
||||
"height": 16,
|
||||
"width": 120,
|
||||
"field": "creater",
|
||||
|
|
@ -1260,7 +1316,8 @@ export default {
|
|||
"hCenter": 788,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"qrCodeLevel": 0
|
||||
"qrCodeLevel": 0,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "制单人",
|
||||
|
|
@ -1273,7 +1330,10 @@ export default {
|
|||
"top": 585,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1286,7 +1346,10 @@ export default {
|
|||
"top": 585,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1299,7 +1362,10 @@ export default {
|
|||
"top": 585,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1312,7 +1378,10 @@ export default {
|
|||
"top": 585,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1325,7 +1394,10 @@ export default {
|
|||
"top": 628.5,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1338,7 +1410,10 @@ export default {
|
|||
"top": 628.5,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1351,11 +1426,14 @@ export default {
|
|||
"top": 627,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75,
|
||||
"borderWidth": "0.75",
|
||||
"right": 446.2459487915039,
|
||||
"bottom": 637.4959487915039,
|
||||
"vCenter": 401.2459487915039,
|
||||
"hCenter": 632.9959487915039
|
||||
"hCenter": 632.9959487915039,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1368,11 +1446,14 @@ export default {
|
|||
"top": 627,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75,
|
||||
"borderWidth": "0.75",
|
||||
"right": 599.2480087280273,
|
||||
"bottom": 636.7500228881836,
|
||||
"vCenter": 554.2480087280273,
|
||||
"hCenter": 632.2500228881836
|
||||
"hCenter": 632.2500228881836,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1385,7 +1466,10 @@ export default {
|
|||
"top": 669,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1398,7 +1482,10 @@ export default {
|
|||
"top": 669,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1411,11 +1498,14 @@ export default {
|
|||
"top": 670.5,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75,
|
||||
"borderWidth": "0.75",
|
||||
"right": 444.0000228881836,
|
||||
"bottom": 677.9979858398438,
|
||||
"vCenter": 399.0000228881836,
|
||||
"hCenter": 673.4979858398438
|
||||
"hCenter": 673.4979858398438,
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1428,7 +1518,10 @@ export default {
|
|||
"top": 669,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1441,7 +1534,10 @@ export default {
|
|||
"top": 712.5,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1454,7 +1550,10 @@ export default {
|
|||
"top": 712.5,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1467,7 +1566,10 @@ export default {
|
|||
"top": 712.5,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
|
|
@ -1480,12 +1582,35 @@ export default {
|
|||
"top": 712.5,
|
||||
"height": 9,
|
||||
"width": 90,
|
||||
"borderWidth": 0.75
|
||||
"borderWidth": "0.75",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "横线",
|
||||
"type": "hline"
|
||||
}
|
||||
},
|
||||
{
|
||||
"options": {
|
||||
"left": 58,
|
||||
"top": 300,
|
||||
"height": 190.5,
|
||||
"width": 532,
|
||||
"right": 586.75,
|
||||
"bottom": 480.74796867370605,
|
||||
"vCenter": 320.75,
|
||||
"hCenter": 390.74796867370605,
|
||||
"field": "details",
|
||||
"coordinateSync": false,
|
||||
"widthHeightSync": false,
|
||||
"fixed": true
|
||||
},
|
||||
"printElementType": {
|
||||
"title": "",
|
||||
"type": "longText"
|
||||
}
|
||||
}
|
||||
],
|
||||
"paperNumberLeft": 565,
|
||||
|
|
@ -1497,3 +1622,8 @@ export default {
|
|||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue