diff --git a/docs/databases/table_create.sql b/docs/databases/table_create.sql new file mode 100644 index 00000000..fb42596f --- /dev/null +++ b/docs/databases/table_create.sql @@ -0,0 +1,23 @@ +DROP TABLE IF EXISTS `purchase_requisition_checked`; +CREATE TABLE `purchase_requisition_checked` ( + `id` BIGINT(32) NOT NULL AUTO_INCREMENT COMMENT 'ID，唯一编号', + `sid` VARCHAR(64) NOT NULL COMMENT 'sid', + `lockVersion` VARCHAR(2) NULL DEFAULT NULL COMMENT '记录版本，锁', + `createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录创建时间', + `modifyTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '记录最后修改时间', + `state` INT(11) NOT NULL DEFAULT '1' COMMENT '记录状态值', + `isEnable` INT(32) NOT NULL DEFAULT '1' COMMENT '记录是否可用，1:可用，0:不可用', + `isDelete` INT(32) NOT NULL DEFAULT '0' COMMENT '记录是否被删除，0:未删除，1:已经删除', + `remarks` VARCHAR(255) NULL DEFAULT NULL COMMENT '备注信息', + `createBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '创建者', + `updateBySid` VARCHAR(64) NULL DEFAULT NULL COMMENT '更新者', + + `prSid` VARCHAR(100) NULL DEFAULT NULL COMMENT '订单SID', + `prCode` VARCHAR(100) NULL DEFAULT NULL COMMENT '订单编号', + `storeName` VARCHAR(100) NULL DEFAULT NULL COMMENT '仓库/门店名称', + `receiptTime` DATETIME NULL DEFAULT NULL COMMENT '收货时间', + `billNo` VARCHAR(100) NULL DEFAULT NULL COMMENT '单据号', + `billType` VARCHAR(100) NULL DEFAULT NULL COMMENT '单据类型', + + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB COMMENT='采购订单检查结果'; \ No newline at end of file diff --git a/docs/databases/table_modify.sql b/docs/databases/table_modify.sql index d3bcde63..50a5f8d7 100644 --- a/docs/databases/table_modify.sql +++ b/docs/databases/table_modify.sql @@ -1,8 +1,5 @@ ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE createSid createBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '创建者'; -ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE modifySid modifyBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者'; - -ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE modifyBySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者'; -ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE modifyBySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者'; +ALTER TABLE supervise_supplychain.supplier_bank_info CHANGE modifySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者'; select @@GLOBAL.sql_mode; @@ -22,14 +19,17 @@ ALTER TABLE supervise_supplychain.purchase_requisition CHANGE createSid createBy ALTER TABLE supervise_supplychain.purchase_requisition CHANGE modifySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者'; ALTER TABLE supervise_supplychain.purchase_requisition ADD remarks varchar(200) NULL COMMENT '备注说明'; - ALTER TABLE supervise_supplychain.product_information CHANGE createSid createBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '创建者'; ALTER TABLE supervise_supplychain.product_information CHANGE modifySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者'; - ALTER TABLE supervise_supplychain.restricted_brand CHANGE createSid createBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '创建者'; ALTER TABLE supervise_supplychain.restricted_brand CHANGE modifySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者'; +ALTER TABLE supervise_supplychain.purchase_requisition_pro CHANGE createSid createBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '创建者'; +ALTER TABLE supervise_supplychain.purchase_requisition_pro CHANGE modifySid updateBySid varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '更新者'; +ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD remarks varchar(200) NULL COMMENT '备注说明'; ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD taxInclusiveAmount DOUBLE(12,2) DEFAULT NULL COMMENT '含税金额'; +ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD distributionAmount DOUBLE(12,2) DEFAULT NULL COMMENT '配货金额'; ALTER TABLE supervise_supplychain.purchase_requisition_pro ADD preqCode varchar(100) DEFAULT NULL COMMENT '订单编号'; + diff --git a/docs/demofiles/采购订单(示例).xls b/docs/demofiles/采购订单(示例).xls new file mode 100644 index 00000000..bbe38cbc Binary files /dev/null and b/docs/demofiles/采购订单(示例).xls differ diff --git a/supervise-customer-ui/src/api/supervise/purchaserequisitionpro.js b/supervise-customer-ui/src/api/supervise/purchaserequisitionpro.js index 0107d253..83d7ec93 100644 --- a/supervise-customer-ui/src/api/supervise/purchaserequisitionpro.js +++ b/supervise-customer-ui/src/api/supervise/purchaserequisitionpro.js @@ -55,5 +55,19 @@ export default { method: 'post', data: params }) + }, + // 通过mainsid查询订单内的商品列表 + listByMainSid: function(sid) { + return request({ + baseURL:'/api/customer', + url: '/v1/purchaserequisitionpro/listByMainSid/' + sid + }) + }, + // 通过mainsid检查商品状态 + checkByMainSid: function(sid) { + return request({ + baseURL:'/api/customer', + url: '/v1/purchaserequisitionpro/checkByMainSid/' + sid + }) } } diff --git a/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue b/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue index 274727fb..fd2d4030 100644 --- a/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue +++ b/supervise-customer-ui/src/views/purchaserequisition/uploadxlsx/index.vue @@ -6,6 +6,23 @@
{{ viewTitle }}
+ 下载Excel示例表样 +
+ + 上传采购订单excel文件 + +
关闭
@@ -13,123 +30,88 @@ -
- -
- 采购订单excel文件上传 - 下载Excel示例表样 -
- - -
- - 选取文件 - 上传到服务器 - -
- - -
上传采购订单的Excel文件，文件名以订单号开头，类似《90002303240037石家庄朋硕家居用品有限公司.xls》。
- - - +
- +
采购订单信息
- 订单编号 - + 订单编号 + {{ formobj.code }} - 填单人 - + 填单人 + {{ formobj.buyerName }} + 填单时间 + + + {{ formobj.purchaseDate }} + + - 供货单位 - + 供货单位 + {{ formobj.supplierName }} - 仓位 - + 仓位 + {{ formobj.warehousePosition }} - - - 采购员 - + 到货日期 + - {{ formobj.buyerName }} + {{ formobj.arrivalDate }} - 入库单位 - + + + 采购员 + - {{ formobj.purchasingDeptName }} + {{ formobj.buyerName }} - - - 要货单位 - + 入库单位 + {{ formobj.purchasingDeptName }} - 入库仓位 - + 单据到效期 + - {{ formobj.warehousePosition }} + {{ formobj.expiryDate }} - 填单日期 - + 要货单位 + - {{ formobj.purchaseDate }} - - - 到货日期 - - - {{ formobj.arrivalDate }} + {{ formobj.purchasingDeptName }} - - - 单据到效期 - + 入库仓位 + - {{ formobj.expiryDate }} + {{ formobj.warehousePosition }} - 完成状态 - + 完成状态 + {{ formobj.completionStatus }} @@ -142,108 +124,17 @@ 合计金额:{{ amountInTotal }}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + @@ -274,6 +165,7 @@