初步增加请购单
This commit is contained in:
jishenghua
parent
396a2b875c
commit
e6456acdb6
@ -10,7 +10,7 @@ Target Server Type : MYSQL
|
||||
Target Server Version : 50704
|
||||
File Encoding : 65001
|
||||
|
||||
Date: 2023-12-01 19:30:01
|
||||
Date: 2024-04-19 22:48:29
|
||||
*/
|
||||
|
||||
SET FOREIGN_KEY_CHECKS=0;
|
||||
@ -177,7 +177,7 @@ CREATE TABLE `jsh_depot_head` (
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `FK2A80F214B610FC06` (`organ_id`),
|
||||
KEY `FK2A80F214AAE50527` (`account_id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=274 DEFAULT CHARSET=utf8 COMMENT='单据主表';
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=276 DEFAULT CHARSET=utf8 COMMENT='单据主表';
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of jsh_depot_head
|
||||
@ -234,7 +234,7 @@ CREATE TABLE `jsh_depot_item` (
|
||||
KEY `FK2A819F474BB6190E` (`header_id`),
|
||||
KEY `FK2A819F479485B3F5` (`depot_id`),
|
||||
KEY `FK2A819F47729F5392` (`another_depot_id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=331 DEFAULT CHARSET=utf8 COMMENT='单据子表';
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=333 DEFAULT CHARSET=utf8 COMMENT='单据子表';
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of jsh_depot_item
|
||||
@ -278,7 +278,7 @@ CREATE TABLE `jsh_function` (
|
||||
`delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `url` (`url`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=260 DEFAULT CHARSET=utf8 COMMENT='功能模块表';
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=262 DEFAULT CHARSET=utf8 COMMENT='功能模块表';
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of jsh_function
|
||||
@ -346,6 +346,7 @@ INSERT INTO `jsh_function` VALUES ('247', '010105', '多属性', '0101', '/mater
|
||||
INSERT INTO `jsh_function` VALUES ('248', '030150', '调拨明细', '0301', '/report/allocation_detail', '/report/AllocationDetail', '\0', '0646', '', '电脑版', '', 'profile', '0');
|
||||
INSERT INTO `jsh_function` VALUES ('258', '000112', '平台配置', '0001', '/system/platform_config', '/system/PlatformConfigList', '\0', '0175', '', '电脑版', '', 'profile', '0');
|
||||
INSERT INTO `jsh_function` VALUES ('259', '030105', '零售统计', '0301', '/report/retail_out_report', '/report/RetailOutReport', '\0', '0615', '', '电脑版', '', 'profile', '0');
|
||||
INSERT INTO `jsh_function` VALUES ('261', '050203', '请购单', '0502', '/bill/purchase_apply', '/bill/PurchaseApplyList', '\0', '0330', '', '电脑版', '1,2,3,7', 'profile', '0');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for jsh_in_out_item
|
||||
@ -385,7 +386,7 @@ CREATE TABLE `jsh_log` (
|
||||
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `FKF2696AA13E226853` (`user_id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=7587 DEFAULT CHARSET=utf8 COMMENT='操作日志';
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=7597 DEFAULT CHARSET=utf8 COMMENT='操作日志';
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of jsh_log
|
||||
@ -769,7 +770,7 @@ CREATE TABLE `jsh_sequence` (
|
||||
-- ----------------------------
|
||||
-- Records of jsh_sequence
|
||||
-- ----------------------------
|
||||
INSERT INTO `jsh_sequence` VALUES ('depot_number_seq', '1', '999999999999999999', '660', '1', '单据编号sequence');
|
||||
INSERT INTO `jsh_sequence` VALUES ('depot_number_seq', '1', '999999999999999999', '670', '1', '单据编号sequence');
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for jsh_serial_number
|
||||
@ -781,7 +782,7 @@ CREATE TABLE `jsh_serial_number` (
|
||||
`depot_id` bigint(20) DEFAULT NULL COMMENT '仓库id',
|
||||
`serial_number` varchar(64) DEFAULT NULL COMMENT '序列号',
|
||||
`is_sell` varchar(1) DEFAULT '0' COMMENT '是否卖出，0未卖出，1卖出',
|
||||
`in_price` decimal(24,6) NULL DEFAULT NULL COMMENT '入库单价' ,
|
||||
`in_price` decimal(24,6) DEFAULT NULL COMMENT '入库单价',
|
||||
`remark` varchar(1024) DEFAULT NULL COMMENT '备注',
|
||||
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
|
||||
`creator` bigint(20) DEFAULT NULL COMMENT '创建人',
|
||||
@ -794,6 +795,10 @@ CREATE TABLE `jsh_serial_number` (
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=110 DEFAULT CHARSET=utf8 COMMENT='序列号表';
|
||||
|
||||
-- ----------------------------
|
||||
-- Records of jsh_serial_number
|
||||
-- ----------------------------
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for jsh_supplier
|
||||
-- ----------------------------
|
||||
@ -970,7 +975,7 @@ CREATE TABLE `jsh_user_business` (
|
||||
-- ----------------------------
|
||||
-- Records of jsh_user_business
|
||||
-- ----------------------------
|
||||
INSERT INTO `jsh_user_business` VALUES ('5', 'RoleFunctions', '4', '[210][225][211][241][32][33][199][242][38][41][200][201][239][202][40][232][233][197][44][203][204][205][206][212][246][207][208][209][226][227][228][229][59][235][237][244][22][21][23][220][240][247][25][24][217][218][26][194][195][31][13][1][14][243][15][234][16][18][236][245][248][198][258][259]', '[{\"funId\":13,\"btnStr\":\"1\"},{\"funId\":14,\"btnStr\":\"1\"},{\"funId\":243,\"btnStr\":\"1\"},{\"funId\":234,\"btnStr\":\"1\"},{\"funId\":16,\"btnStr\":\"1\"},{\"funId\":18,\"btnStr\":\"1\"},{\"funId\":236,\"btnStr\":\"1\"},{\"funId\":245,\"btnStr\":\"1\"},{\"funId\":22,\"btnStr\":\"1\"},{\"funId\":23,\"btnStr\":\"1,3\"},{\"funId\":220,\"btnStr\":\"1\"},{\"funId\":247,\"btnStr\":\"1\"},{\"funId\":25,\"btnStr\":\"1,3\"},{\"funId\":217,\"btnStr\":\"1,3\"},{\"funId\":218,\"btnStr\":\"1,3\"},{\"funId\":26,\"btnStr\":\"1\"},{\"funId\":194,\"btnStr\":\"1\"},{\"funId\":195,\"btnStr\":\"1\"},{\"funId\":31,\"btnStr\":\"1\"},{\"funId\":241,\"btnStr\":\"1,2,7,3\"},{\"funId\":33,\"btnStr\":\"1,2,7,3\"},{\"funId\":199,\"btnStr\":\"1,2,7,3\"},{\"funId\":242,\"btnStr\":\"1,2,7,3\"},{\"funId\":41,\"btnStr\":\"1,2,7,3\"},{\"funId\":200,\"btnStr\":\"1,2,7,3\"},{\"funId\":210,\"btnStr\":\"1,2,7,3\"},{\"funId\":211,\"btnStr\":\"1,2,7,3\"},{\"funId\":197,\"btnStr\":\"1,7,2,3\"},{\"funId\":203,\"btnStr\":\"1,7,2,3\"},{\"funId\":204,\"btnStr\":\"1,7,2,3\"},{\"funId\":205,\"btnStr\":\"1,7,2,3\"},{\"funId\":206,\"btnStr\":\"1,2,7,3\"},{\"funId\":212,\"btnStr\":\"1,7,2,3\"},{\"funId\":201,\"btnStr\":\"1,2,7,3\"},{\"funId\":202,\"btnStr\":\"1,2,7,3\"},{\"funId\":40,\"btnStr\":\"1,2,7,3\"},{\"funId\":232,\"btnStr\":\"1,2,7,3\"},{\"funId\":233,\"btnStr\":\"1,2,7,3\"}]', null, '0');
|
||||
INSERT INTO `jsh_user_business` VALUES ('5', 'RoleFunctions', '4', '[210][225][211][241][33][199][242][38][41][200][201][239][202][40][232][233][197][44][203][204][205][206][212][246][198][207][259][208][209][226][227][248][228][229][59][235][237][244][22][21][23][220][247][25][24][217][218][26][194][195][31][13][1][14][243][15][234][16][18][236][245][258][261][32]', '[{\"funId\":13,\"btnStr\":\"1\"},{\"funId\":14,\"btnStr\":\"1\"},{\"funId\":243,\"btnStr\":\"1\"},{\"funId\":234,\"btnStr\":\"1\"},{\"funId\":16,\"btnStr\":\"1\"},{\"funId\":18,\"btnStr\":\"1\"},{\"funId\":236,\"btnStr\":\"1\"},{\"funId\":245,\"btnStr\":\"1\"},{\"funId\":22,\"btnStr\":\"1\"},{\"funId\":23,\"btnStr\":\"1,3\"},{\"funId\":220,\"btnStr\":\"1\"},{\"funId\":247,\"btnStr\":\"1\"},{\"funId\":25,\"btnStr\":\"1,3\"},{\"funId\":217,\"btnStr\":\"1,3\"},{\"funId\":218,\"btnStr\":\"1,3\"},{\"funId\":26,\"btnStr\":\"1\"},{\"funId\":194,\"btnStr\":\"1\"},{\"funId\":195,\"btnStr\":\"1\"},{\"funId\":31,\"btnStr\":\"1\"},{\"funId\":261,\"btnStr\":\"1,2,7,3\"},{\"funId\":241,\"btnStr\":\"1,2,7,3\"},{\"funId\":33,\"btnStr\":\"1,2,7,3\"},{\"funId\":199,\"btnStr\":\"1,2,7,3\"},{\"funId\":242,\"btnStr\":\"1,2,7,3\"},{\"funId\":41,\"btnStr\":\"1,2,7,3\"},{\"funId\":200,\"btnStr\":\"1,2,7,3\"},{\"funId\":210,\"btnStr\":\"1,2,7,3\"},{\"funId\":211,\"btnStr\":\"1,2,7,3\"},{\"funId\":197,\"btnStr\":\"1,7,2,3\"},{\"funId\":203,\"btnStr\":\"1,7,2,3\"},{\"funId\":204,\"btnStr\":\"1,7,2,3\"},{\"funId\":205,\"btnStr\":\"1,7,2,3\"},{\"funId\":206,\"btnStr\":\"1,2,7,3\"},{\"funId\":212,\"btnStr\":\"1,7,2,3\"},{\"funId\":201,\"btnStr\":\"1,2,7,3\"},{\"funId\":202,\"btnStr\":\"1,2,7,3\"},{\"funId\":40,\"btnStr\":\"1,2,7,3\"},{\"funId\":232,\"btnStr\":\"1,2,7,3\"},{\"funId\":233,\"btnStr\":\"1,2,7,3\"}]', null, '0');
|
||||
INSERT INTO `jsh_user_business` VALUES ('6', 'RoleFunctions', '5', '[22][23][25][26][194][195][31][33][200][201][41][199][202]', null, null, '0');
|
||||
INSERT INTO `jsh_user_business` VALUES ('7', 'RoleFunctions', '6', '[22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][210][211][241][33][199][242][41][200][201][202][40][232][233][197][203][204][205][206][212]', '[{\"funId\":\"33\",\"btnStr\":\"4\"}]', null, '0');
|
||||
INSERT INTO `jsh_user_business` VALUES ('9', 'RoleFunctions', '7', '[168][13][12][16][14][15][189][18][19][132]', null, null, '0');
|
||||
@ -994,7 +999,7 @@ INSERT INTO `jsh_user_business` VALUES ('27', 'UserCustomer', '63', '[58]', null
|
||||
INSERT INTO `jsh_user_business` VALUES ('28', 'UserDepot', '96', '[7]', null, null, '0');
|
||||
INSERT INTO `jsh_user_business` VALUES ('29', 'UserRole', '96', '[6]', null, null, '0');
|
||||
INSERT INTO `jsh_user_business` VALUES ('30', 'UserRole', '113', '[10]', null, null, '0');
|
||||
INSERT INTO `jsh_user_business` VALUES ('32', 'RoleFunctions', '10', '[210][225][211][241][32][33][199][242][38][41][200][201][239][202][40][232][233][197][44][203][204][205][206][212][246][207][208][209][226][227][228][229][59][235][237][244][22][21][23][220][240][247][25][24][217][218][26][194][195][31][13][14][243][15][234][248][198][259]', '[{\"funId\":13,\"btnStr\":\"1\"},{\"funId\":14,\"btnStr\":\"1\"},{\"funId\":243,\"btnStr\":\"1\"},{\"funId\":234,\"btnStr\":\"1\"},{\"funId\":22,\"btnStr\":\"1\"},{\"funId\":23,\"btnStr\":\"1,3\"},{\"funId\":220,\"btnStr\":\"1\"},{\"funId\":247,\"btnStr\":\"1\"},{\"funId\":25,\"btnStr\":\"1,3\"},{\"funId\":217,\"btnStr\":\"1,3\"},{\"funId\":218,\"btnStr\":\"1,3\"},{\"funId\":26,\"btnStr\":\"1\"},{\"funId\":194,\"btnStr\":\"1\"},{\"funId\":195,\"btnStr\":\"1\"},{\"funId\":31,\"btnStr\":\"1\"},{\"funId\":241,\"btnStr\":\"1,2,7,3\"},{\"funId\":33,\"btnStr\":\"1,2,7,3\"},{\"funId\":199,\"btnStr\":\"1,7,2,3\"},{\"funId\":242,\"btnStr\":\"1,2,7,3\"},{\"funId\":41,\"btnStr\":\"1,2,7,3\"},{\"funId\":200,\"btnStr\":\"1,2,7,3\"},{\"funId\":210,\"btnStr\":\"1,2,7,3\"},{\"funId\":211,\"btnStr\":\"1,2,7,3\"},{\"funId\":197,\"btnStr\":\"1,2,7,3\"},{\"funId\":203,\"btnStr\":\"1,7,2,3\"},{\"funId\":204,\"btnStr\":\"1,7,2,3\"},{\"funId\":205,\"btnStr\":\"1,2,7,3\"},{\"funId\":206,\"btnStr\":\"1,7,2,3\"},{\"funId\":212,\"btnStr\":\"1,2,7,3\"},{\"funId\":201,\"btnStr\":\"1,2,7,3\"},{\"funId\":202,\"btnStr\":\"1,2,7,3\"},{\"funId\":40,\"btnStr\":\"1,2,7,3\"},{\"funId\":232,\"btnStr\":\"1,2,7,3\"},{\"funId\":233,\"btnStr\":\"1,2,7,3\"}]', null, '0');
|
||||
INSERT INTO `jsh_user_business` VALUES ('32', 'RoleFunctions', '10', '[210][225][211][241][33][199][242][38][41][200][201][239][202][40][232][233][197][44][203][204][205][206][212][246][198][207][259][208][209][226][227][248][228][229][59][235][237][244][22][21][23][220][247][25][24][217][218][26][194][195][31][13][14][243][15][234][261][32]', '[{\"funId\":13,\"btnStr\":\"1\"},{\"funId\":14,\"btnStr\":\"1\"},{\"funId\":243,\"btnStr\":\"1\"},{\"funId\":234,\"btnStr\":\"1\"},{\"funId\":22,\"btnStr\":\"1\"},{\"funId\":23,\"btnStr\":\"1,3\"},{\"funId\":220,\"btnStr\":\"1\"},{\"funId\":247,\"btnStr\":\"1\"},{\"funId\":25,\"btnStr\":\"1,3\"},{\"funId\":217,\"btnStr\":\"1,3\"},{\"funId\":218,\"btnStr\":\"1,3\"},{\"funId\":26,\"btnStr\":\"1\"},{\"funId\":194,\"btnStr\":\"1\"},{\"funId\":195,\"btnStr\":\"1\"},{\"funId\":31,\"btnStr\":\"1\"},{\"funId\":261,\"btnStr\":\"1,2,7,3\"},{\"funId\":241,\"btnStr\":\"1,2,7,3\"},{\"funId\":33,\"btnStr\":\"1,2,7,3\"},{\"funId\":199,\"btnStr\":\"1,7,2,3\"},{\"funId\":242,\"btnStr\":\"1,2,7,3\"},{\"funId\":41,\"btnStr\":\"1,2,7,3\"},{\"funId\":200,\"btnStr\":\"1,2,7,3\"},{\"funId\":210,\"btnStr\":\"1,2,7,3\"},{\"funId\":211,\"btnStr\":\"1,2,7,3\"},{\"funId\":197,\"btnStr\":\"1,2,7,3\"},{\"funId\":203,\"btnStr\":\"1,7,2,3\"},{\"funId\":204,\"btnStr\":\"1,7,2,3\"},{\"funId\":205,\"btnStr\":\"1,2,7,3\"},{\"funId\":206,\"btnStr\":\"1,7,2,3\"},{\"funId\":212,\"btnStr\":\"1,2,7,3\"},{\"funId\":201,\"btnStr\":\"1,2,7,3\"},{\"funId\":202,\"btnStr\":\"1,2,7,3\"},{\"funId\":40,\"btnStr\":\"1,2,7,3\"},{\"funId\":232,\"btnStr\":\"1,2,7,3\"},{\"funId\":233,\"btnStr\":\"1,2,7,3\"}]', null, '0');
|
||||
INSERT INTO `jsh_user_business` VALUES ('34', 'UserRole', '115', '[10]', null, null, '0');
|
||||
INSERT INTO `jsh_user_business` VALUES ('35', 'UserRole', '117', '[10]', null, null, '0');
|
||||
INSERT INTO `jsh_user_business` VALUES ('36', 'UserDepot', '117', '[8][9]', null, null, '0');
|
||||
|
||||
@ -1553,4 +1553,14 @@ alter table jsh_system_config add in_out_manage_flag varchar(1) DEFAULT '0' COMM
|
||||
-- by jishenghua
|
||||
-- 给序列号表里面增加入库单价字段
|
||||
-- --------------------------------------------------------
|
||||
alter table jsh_serial_number add in_price decimal(24,6) DEFAULT NULL COMMENT '入库单价' after is_sell;
|
||||
alter table jsh_serial_number add in_price decimal(24,6) DEFAULT NULL COMMENT '入库单价' after is_sell;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
-- 时间 2024年4月19日
|
||||
-- by jishenghua
|
||||
-- 给功能表增加请购单的菜单
|
||||
-- 给角色勾选请购单的菜单
|
||||
-- --------------------------------------------------------
|
||||
INSERT INTO jsh_function
|
||||
(`number`, `name`, `parent_number`, `url`, `component`, `state`, `sort`, `enabled`, `type`, `push_btn`, `icon`, `delete_flag`)
|
||||
VALUES ('050203', '请购单', '0502', '/bill/purchase_apply', '/bill/PurchaseApplyList', b'0', '0330', b'1', '电脑版', '1,2,3,7', 'profile', '0');
|
||||
@ -80,8 +80,9 @@ public class BusinessConstants {
|
||||
public static final String PURCHASE_STATUS_SKIPING = "3";
|
||||
/**
|
||||
* 出入库分类
|
||||
*采购、采购退货、其它、零售、销售、调拨、盘点复盘等
|
||||
* 请购单、采购、采购退货、其它、零售、销售、调拨、盘点复盘等
|
||||
* */
|
||||
public static final String SUB_TYPE_PURCHASE_APPLY = "请购单";
|
||||
public static final String SUB_TYPE_PURCHASE_ORDER = "采购订单";
|
||||
public static final String SUB_TYPE_PURCHASE = "采购";
|
||||
public static final String SUB_TYPE_PURCHASE_RETURN = "采购退货";
|
||||
|
||||
@ -256,7 +256,9 @@ public class DepotHeadService {
|
||||
*/
|
||||
public String[] getDepotArray(String subType) throws Exception {
|
||||
String [] depotArray = null;
|
||||
if(!BusinessConstants.SUB_TYPE_PURCHASE_ORDER.equals(subType) && !BusinessConstants.SUB_TYPE_SALES_ORDER.equals(subType)) {
|
||||
if(!BusinessConstants.SUB_TYPE_PURCHASE_APPLY.equals(subType)
|
||||
&& !BusinessConstants.SUB_TYPE_PURCHASE_ORDER.equals(subType)
|
||||
&& !BusinessConstants.SUB_TYPE_SALES_ORDER.equals(subType)) {
|
||||
String depotIds = depotService.findDepotStrByCurrentUser();
|
||||
depotArray = StringUtil.isNotEmpty(depotIds) ? depotIds.split(",") : null;
|
||||
}
|
||||
|
||||
@ -612,7 +612,8 @@ public class DepotItemService {
|
||||
if (StringUtil.isExist(rowObj.get("depotId"))) {
|
||||
depotItem.setDepotId(rowObj.getLong("depotId"));
|
||||
} else {
|
||||
if(!BusinessConstants.SUB_TYPE_PURCHASE_ORDER.equals(depotHead.getSubType())
|
||||
if(!BusinessConstants.SUB_TYPE_PURCHASE_APPLY.equals(depotHead.getSubType())
|
||||
&& !BusinessConstants.SUB_TYPE_PURCHASE_ORDER.equals(depotHead.getSubType())
|
||||
&& !BusinessConstants.SUB_TYPE_SALES_ORDER.equals(depotHead.getSubType())) {
|
||||
throw new BusinessRunTimeException(ExceptionConstants.DEPOT_HEAD_DEPOT_FAILED_CODE,
|
||||
String.format(ExceptionConstants.DEPOT_HEAD_DEPOT_FAILED_MSG));
|
||||
|
||||
240
jshERP-web/src/views/bill/PurchaseApplyList.vue
Normal file
240
jshERP-web/src/views/bill/PurchaseApplyList.vue
Normal file
@ -0,0 +1,240 @@
|
||||
<template>
|
||||
<a-row :gutter="24">
|
||||
<a-col :md="24">
|
||||
<a-card :style="cardStyle" :bordered="false">
|
||||
<!-- 查询区域 -->
|
||||
<div class="table-page-search-wrapper">
|
||||
<!-- 搜索区域 -->
|
||||
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
||||
<a-row :gutter="24">
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<a-input placeholder="请输入条码、名称、规格、型号、颜色、扩展信息" v-model="queryParam.materialParam"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<a-range-picker
|
||||
style="width:100%"
|
||||
v-model="queryParam.createTimeRange"
|
||||
format="YYYY-MM-DD"
|
||||
:placeholder="['开始时间', '结束时间']"
|
||||
@change="onDateChange"
|
||||
@ok="onDateOk"
|
||||
/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-button type="primary" @click="searchQuery">查询</a-button>
|
||||
<a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
|
||||
<a @click="handleToggleSearch" style="margin-left: 8px">
|
||||
{{ toggleSearchStatus ? '收起' : '展开' }}
|
||||
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
|
||||
</a>
|
||||
</a-col>
|
||||
</span>
|
||||
<template v-if="toggleSearchStatus">
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
|
||||
<a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
|
||||
{{ item.userName }}
|
||||
</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<a-select placeholder="选择单据状态" v-model="queryParam.status">
|
||||
<a-select-option value="0">未审核</a-select-option>
|
||||
<a-select-option value="1">已审核</a-select-option>
|
||||
<a-select-option value="3">部分采购</a-select-option>
|
||||
<a-select-option value="2">完成采购</a-select-option>
|
||||
</a-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-form-item label="单据备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<a-input placeholder="请输入单据备注" v-model="queryParam.remark"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</template>
|
||||
</a-row>
|
||||
</a-form>
|
||||
</div>
|
||||
<!-- 操作按钮区域 -->
|
||||
<div class="table-operator" style="margin-top: 5px">
|
||||
<a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
|
||||
<a-button v-if="btnEnableList.indexOf(1)>-1" icon="delete" @click="batchDel">删除</a-button>
|
||||
<a-button v-if="checkFlag && btnEnableList.indexOf(2)>-1" icon="check" @click="batchSetStatus(1)">审核</a-button>
|
||||
<a-button v-if="checkFlag && btnEnableList.indexOf(7)>-1" icon="stop" @click="batchSetStatus(0)">反审核</a-button>
|
||||
<a-button v-if="isShowExcel && btnEnableList.indexOf(3)>-1" icon="download" @click="handleExport">导出</a-button>
|
||||
<a-popover trigger="click" placement="right">
|
||||
<template slot="content">
|
||||
<a-checkbox-group @change="onColChange" v-model="settingDataIndex" :defaultValue="settingDataIndex">
|
||||
<a-row style="width: 500px">
|
||||
<template v-for="(item,index) in defColumns">
|
||||
<template>
|
||||
<a-col :span="8">
|
||||
<a-checkbox :value="item.dataIndex">
|
||||
<j-ellipsis :value="item.title" :length="10"></j-ellipsis>
|
||||
</a-checkbox>
|
||||
</a-col>
|
||||
</template>
|
||||
</template>
|
||||
</a-row>
|
||||
<a-row style="padding-top: 10px;">
|
||||
<a-col>
|
||||
恢复默认列配置：<a-button @click="handleRestDefault" type="link" size="small">恢复默认</a-button>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-checkbox-group>
|
||||
</template>
|
||||
<a-button icon="setting">列设置</a-button>
|
||||
</a-popover>
|
||||
<a-tooltip placement="left" title="采购订单不涉及付款金额，采购订单可以转采购入库单，但需要先对采购订单进行审核。
|
||||
勾选单据之后可以进行批量操作（删除、审核、反审核）" slot="action">
|
||||
<a-icon v-if="btnEnableList.indexOf(1)>-1" type="question-circle" style="font-size:20px;float:right;" />
|
||||
</a-tooltip>
|
||||
</div>
|
||||
<!-- table区域-begin -->
|
||||
<div>
|
||||
<a-table
|
||||
ref="table"
|
||||
size="middle"
|
||||
bordered
|
||||
rowKey="id"
|
||||
:columns="columns"
|
||||
:dataSource="dataSource"
|
||||
:components="handleDrag(columns)"
|
||||
:pagination="ipagination"
|
||||
:scroll="scroll"
|
||||
:loading="loading"
|
||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
|
||||
@change="handleTableChange">
|
||||
<span slot="action" slot-scope="text, record">
|
||||
<a @click="myHandleDetail(record, '采购订单', prefixNo)">查看</a>
|
||||
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
|
||||
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
|
||||
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
|
||||
<a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleCopyAdd(record)">复制</a>
|
||||
<a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
|
||||
<a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => myHandleDelete(record)">
|
||||
<a>删除</a>
|
||||
</a-popconfirm>
|
||||
</span>
|
||||
<template slot="customRenderStatus" slot-scope="status">
|
||||
<a-tag v-if="status == '0'" color="red">未审核</a-tag>
|
||||
<a-tag v-if="status == '1'" color="green">已审核</a-tag>
|
||||
<a-tag v-if="status == '2'" color="cyan">完成采购</a-tag>
|
||||
<a-tag v-if="status == '3'" color="blue">部分采购</a-tag>
|
||||
<a-tag v-if="status == '9'" color="orange">审核中</a-tag>
|
||||
</template>
|
||||
</a-table>
|
||||
</div>
|
||||
<!-- table区域-end -->
|
||||
<!-- 表单区域 -->
|
||||
<purchase-apply-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></purchase-apply-modal>
|
||||
<bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
|
||||
<bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
|
||||
</a-card>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</template>
|
||||
<!-- by ji sheng hua-->
|
||||
<script>
|
||||
import PurchaseApplyModal from './modules/PurchaseApplyModal'
|
||||
import BillDetail from './dialog/BillDetail'
|
||||
import BillExcelIframe from '@/components/tools/BillExcelIframe'
|
||||
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
||||
import { BillListMixin } from './mixins/BillListMixin'
|
||||
import JEllipsis from '@/components/jeecg/JEllipsis'
|
||||
import JDate from '@/components/jeecg/JDate'
|
||||
import Vue from 'vue'
|
||||
export default {
|
||||
name: "PurchaseApplyList",
|
||||
mixins:[JeecgListMixin,BillListMixin],
|
||||
components: {
|
||||
PurchaseApplyModal,
|
||||
BillDetail,
|
||||
BillExcelIframe,
|
||||
JEllipsis,
|
||||
JDate
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
// 查询条件
|
||||
queryParam: {
|
||||
number: "",
|
||||
materialParam: "",
|
||||
type: "其它",
|
||||
subType: "请购单",
|
||||
organId: "",
|
||||
depotId: "",
|
||||
creator: "",
|
||||
status: "",
|
||||
remark: ""
|
||||
},
|
||||
prefixNo: 'QGD',
|
||||
labelCol: {
|
||||
span: 5
|
||||
},
|
||||
wrapperCol: {
|
||||
span: 18,
|
||||
offset: 1
|
||||
},
|
||||
// 默认索引
|
||||
defDataIndex:['action','organName','number','materialsList','operTimeStr','userName','materialCount','totalPrice','totalTaxLastMoney',
|
||||
'changeAmount','status'],
|
||||
// 默认列
|
||||
defColumns: [
|
||||
{
|
||||
title: '操作',
|
||||
dataIndex: 'action',
|
||||
align:"center", width: 180,
|
||||
scopedSlots: { customRender: 'action' },
|
||||
},
|
||||
{ title: '单据编号', dataIndex: 'number',width:180,
|
||||
customRender:function (text,record,index) {
|
||||
text = record.linkNumber?text+"[转]":text
|
||||
return text
|
||||
}
|
||||
},
|
||||
{ title: '关联订单', dataIndex: 'linkNumber',width:180},
|
||||
{ title: '商品信息', dataIndex: 'materialsList',width:320, ellipsis:true},
|
||||
{ title: '单据日期', dataIndex: 'operTimeStr',width:185},
|
||||
{ title: '操作员', dataIndex: 'userName',width:120, ellipsis:true},
|
||||
{ title: '数量', dataIndex: 'materialCount',width:80},
|
||||
{ title: '备注', dataIndex: 'remark',width:250},
|
||||
{ title: '状态', dataIndex: 'status', width: 100, align: "center",
|
||||
scopedSlots: { customRender: 'customRenderStatus' }
|
||||
}
|
||||
],
|
||||
url: {
|
||||
list: "/depotHead/list",
|
||||
delete: "/depotHead/delete",
|
||||
deleteBatch: "/depotHead/deleteBatch",
|
||||
batchSetStatusUrl: "/depotHead/batchSetStatus"
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.initSystemConfig()
|
||||
this.initSupplier()
|
||||
this.initUser()
|
||||
},
|
||||
computed: {
|
||||
},
|
||||
methods: {
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
@import '~@assets/less/common.less'
|
||||
</style>
|
||||
308
jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue
Normal file
308
jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue
Normal file
@ -0,0 +1,308 @@
|
||||
<template>
|
||||
<j-modal
|
||||
:title="title"
|
||||
:width="width"
|
||||
:visible="visible"
|
||||
:confirmLoading="confirmLoading"
|
||||
:keyboard="false"
|
||||
:forceRender="true"
|
||||
v-bind:prefixNo="prefixNo"
|
||||
switchHelp
|
||||
switchFullscreen
|
||||
@cancel="handleCancel"
|
||||
:id="prefixNo"
|
||||
style="top:20px;height: 95%;">
|
||||
<template slot="footer">
|
||||
<a-button @click="handleCancel">取消</a-button>
|
||||
<a-button v-if="checkFlag && isCanCheck" :loading="confirmLoading" @click="handleOkAndCheck">保存并审核</a-button>
|
||||
<a-button type="primary" :loading="confirmLoading" @click="handleOk">保存</a-button>
|
||||
<!--发起多级审核-->
|
||||
<a-button v-if="!checkFlag" @click="handleWorkflow()" type="primary">提交流程</a-button>
|
||||
</template>
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<a-form :form="form">
|
||||
<a-row class="form-row" :gutter="24">
|
||||
<a-col :lg="6" :md="12" :sm="24">
|
||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
|
||||
<j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :lg="6" :md="12" :sm="24">
|
||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号" data-step="2" data-title="单据编号"
|
||||
data-intro="单据编号自动生成、自动累加、开头是单据类型的首字母缩写，累加的规则是每次打开页面会自动占用一个新的编号">
|
||||
<a-input placeholder="请输入单据编号" v-decorator.trim="[ 'number' ]" :readOnly="true"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :lg="6" :md="12" :sm="24">
|
||||
</a-col>
|
||||
<a-col :lg="6" :md="12" :sm="24">
|
||||
</a-col>
|
||||
</a-row>
|
||||
<j-editable-table id="billModal"
|
||||
:ref="refKeys[0]"
|
||||
:loading="materialTable.loading"
|
||||
:columns="materialTable.columns"
|
||||
:dataSource="materialTable.dataSource"
|
||||
:minWidth="minWidth"
|
||||
:maxHeight="300"
|
||||
:rowNumber="false"
|
||||
:rowSelection="rowCanEdit"
|
||||
:actionButton="rowCanEdit"
|
||||
:dragSortAndNumber="rowCanEdit"
|
||||
@valueChange="onValueChange"
|
||||
@added="onAdded"
|
||||
@deleted="onDeleted">
|
||||
<template #buttonAfter>
|
||||
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;" data-step="4" data-title="扫码录入" data-intro="此功能支持扫码枪扫描商品条码进行录入">
|
||||
<a-col v-if="scanStatus" :md="6" :sm="24">
|
||||
<a-button @click="scanEnter">扫码录入</a-button>
|
||||
</a-col>
|
||||
<a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 8px 0 12px">
|
||||
<a-input placeholder="请扫描商品条码并回车" v-model="scanBarCode" @pressEnter="scanPressEnter" ref="scanBarCode"/>
|
||||
</a-col>
|
||||
<a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 12px 0 0">
|
||||
<a-button @click="stopScan">收起扫码</a-button>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row :gutter="24" style="float:left;padding-bottom: 5px;">
|
||||
<a-col :md="24" :sm="24">
|
||||
<a-button style="margin-left: 8px" @click="handleHistoryBillList"><a-icon type="history" />历史单据</a-button>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row v-if="rowCanEdit" :gutter="24" style="float:left;padding-bottom: 5px;padding-left:20px;">
|
||||
<a-button icon="import" @click="onImport(prefixNo)">导入明细</a-button>
|
||||
</a-row>
|
||||
</template>
|
||||
</j-editable-table>
|
||||
<a-row class="form-row" :gutter="24">
|
||||
<a-col :lg="24" :md="24" :sm="24">
|
||||
<a-form-item :labelCol="labelCol" :wrapperCol="{xs: { span: 24 },sm: { span: 24 }}" label="">
|
||||
<a-textarea :rows="1" placeholder="请输入备注" v-decorator="[ 'remark' ]" style="margin-top:8px;"/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row class="form-row" :gutter="24">
|
||||
<a-col :lg="6" :md="12" :sm="24">
|
||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件" data-step="10" data-title="附件" data-intro="可以上传与单据相关的图片、文档，支持多个文件">
|
||||
<j-upload v-model="fileList" bizPath="bill"></j-upload>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
</a-spin>
|
||||
<many-account-modal ref="manyAccountModalForm" @ok="manyAccountModalFormOk"></many-account-modal>
|
||||
<import-item-modal ref="importItemModalForm" @ok="importItemModalFormOk"></import-item-modal>
|
||||
<vendor-modal ref="vendorModalForm" @ok="vendorModalFormOk"></vendor-modal>
|
||||
<account-modal ref="accountModalForm" @ok="accountModalFormOk"></account-modal>
|
||||
<link-bill-list ref="linkBillList" @ok="linkBillListOk"></link-bill-list>
|
||||
<history-bill-list ref="historyBillListModalForm"></history-bill-list>
|
||||
<workflow-iframe ref="modalWorkflow"></workflow-iframe>
|
||||
</j-modal>
|
||||
</template>
|
||||
<script>
|
||||
import pick from 'lodash.pick'
|
||||
import ManyAccountModal from '../dialog/ManyAccountModal'
|
||||
import ImportItemModal from '../dialog/ImportItemModal'
|
||||
import LinkBillList from '../dialog/LinkBillList'
|
||||
import VendorModal from '../../system/modules/VendorModal'
|
||||
import AccountModal from '../../system/modules/AccountModal'
|
||||
import HistoryBillList from '../dialog/HistoryBillList'
|
||||
import WorkflowIframe from '@/components/tools/WorkflowIframe'
|
||||
import { FormTypes } from '@/utils/JEditableTableUtil'
|
||||
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
|
||||
import { BillModalMixin } from '../mixins/BillModalMixin'
|
||||
import { getCurrentSystemConfig } from '@/api/api'
|
||||
import { getMpListShort, changeListFmtMinus,handleIntroJs } from "@/utils/util"
|
||||
import JUpload from '@/components/jeecg/JUpload'
|
||||
import JDate from '@/components/jeecg/JDate'
|
||||
import Vue from 'vue'
|
||||
export default {
|
||||
name: "PurchaseApplyModal",
|
||||
mixins: [JEditableTableMixin,BillModalMixin],
|
||||
components: {
|
||||
ManyAccountModal,
|
||||
ImportItemModal,
|
||||
LinkBillList,
|
||||
VendorModal,
|
||||
AccountModal,
|
||||
HistoryBillList,
|
||||
WorkflowIframe,
|
||||
JUpload,
|
||||
JDate,
|
||||
VNodes: {
|
||||
functional: true,
|
||||
render: (h, ctx) => ctx.props.vnodes,
|
||||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
title:"操作",
|
||||
width: '1600px',
|
||||
moreStatus: false,
|
||||
// 新增时子表默认添加几行空数据
|
||||
addDefaultRowNum: 1,
|
||||
visible: false,
|
||||
supList: [],
|
||||
depotList: [],
|
||||
operTimeStr: '',
|
||||
prefixNo: 'QGD',
|
||||
fileList:[],
|
||||
rowCanEdit: true,
|
||||
//以销定购的场景开关
|
||||
purchaseBySaleFlag: false,
|
||||
model: {},
|
||||
labelCol: {
|
||||
xs: { span: 24 },
|
||||
sm: { span: 8 },
|
||||
},
|
||||
wrapperCol: {
|
||||
xs: { span: 24 },
|
||||
sm: { span: 16 },
|
||||
},
|
||||
refKeys: ['materialDataTable', ],
|
||||
tableKeys:['materialDataTable', ],
|
||||
activeKey: 'materialDataTable',
|
||||
materialTable: {
|
||||
loading: false,
|
||||
dataSource: [],
|
||||
columns: [
|
||||
{ title: '条码', key: 'barCode', width: '12%', type: FormTypes.popupJsh, kind: 'material', multi: true,
|
||||
validateRules: [{ required: true, message: '${title}不能为空' }]
|
||||
},
|
||||
{ title: '名称', key: 'name', width: '10%', type: FormTypes.normal },
|
||||
{ title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
|
||||
{ title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
|
||||
{ title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
|
||||
{ title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
|
||||
{ title: '单位', key: 'unit', width: '4%', type: FormTypes.normal },
|
||||
{ title: '多属性', key: 'sku', width: '4%', type: FormTypes.normal },
|
||||
{ title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.normal },
|
||||
{ title: '已采购', key: 'finishNumber', width: '4%', type: FormTypes.normal },
|
||||
{ title: '数量', key: 'operNumber', width: '5%', type: FormTypes.inputNumber, statistics: true,
|
||||
validateRules: [{ required: true, message: '${title}不能为空' }]
|
||||
},
|
||||
{ title: '备注', key: 'remark', width: '6%', type: FormTypes.input},
|
||||
]
|
||||
},
|
||||
confirmLoading: false,
|
||||
validatorRules:{
|
||||
operTime:{
|
||||
rules: [
|
||||
{ required: true, message: '请输入单据日期!' }
|
||||
]
|
||||
},
|
||||
organId:{
|
||||
rules: [
|
||||
{ required: true, message: '请选择供应商!' }
|
||||
]
|
||||
}
|
||||
},
|
||||
url: {
|
||||
add: '/depotHead/addDepotHeadAndDetail',
|
||||
edit: '/depotHead/updateDepotHeadAndDetail',
|
||||
detailList: '/depotItem/getDetailList',
|
||||
importExcelUrl: "/depotItem/importItemExcel",
|
||||
}
|
||||
}
|
||||
},
|
||||
created () {
|
||||
},
|
||||
methods: {
|
||||
//调用完edit()方法之后会自动调用此方法
|
||||
editAfter() {
|
||||
this.billStatus = '0'
|
||||
this.currentSelectDepotId = ''
|
||||
this.rowCanEdit = true
|
||||
this.materialTable.columns[0].type = FormTypes.popupJsh
|
||||
this.changeColumnHide()
|
||||
this.changeFormTypes(this.materialTable.columns, 'preNumber', 0)
|
||||
this.changeFormTypes(this.materialTable.columns, 'finishNumber', 0)
|
||||
if (this.action === 'add') {
|
||||
this.addInit(this.prefixNo)
|
||||
this.fileList = []
|
||||
this.$nextTick(() => {
|
||||
handleIntroJs(this.prefixNo, 1)
|
||||
})
|
||||
} else {
|
||||
if(this.model.linkNumber) {
|
||||
this.rowCanEdit = false
|
||||
this.materialTable.columns[0].type = FormTypes.normal
|
||||
}
|
||||
this.model.operTime = this.model.operTimeStr
|
||||
if(this.model.accountId == null && this.model.accountIdList) {
|
||||
this.model.accountId = 0
|
||||
this.manyAccountBtnStatus = true
|
||||
this.accountIdList = this.model.accountIdList
|
||||
this.accountMoneyList = this.model.accountMoneyList
|
||||
} else {
|
||||
this.manyAccountBtnStatus = false
|
||||
}
|
||||
this.fileList = this.model.fileName
|
||||
this.$nextTick(() => {
|
||||
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark',
|
||||
'discount','discountMoney','discountLastMoney','accountId','changeAmount'))
|
||||
});
|
||||
// 加载子表数据
|
||||
let params = {
|
||||
headerId: this.model.id,
|
||||
mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
|
||||
linkType: 'basic'
|
||||
}
|
||||
let url = this.readOnly ? this.url.detailList : this.url.detailList;
|
||||
this.requestSubTableData(url, params, this.materialTable);
|
||||
}
|
||||
//复制新增单据-初始化单号和日期
|
||||
if(this.action === 'copyAdd') {
|
||||
this.model.id = ''
|
||||
this.model.tenantId = ''
|
||||
this.copyAddInit(this.prefixNo)
|
||||
}
|
||||
this.initSystemConfig()
|
||||
this.initSupplier()
|
||||
this.initAccount()
|
||||
},
|
||||
/** 整理成formData */
|
||||
classifyIntoFormData(allValues) {
|
||||
let totalPrice = 0
|
||||
let billMain = Object.assign(this.model, allValues.formValue)
|
||||
let detailArr = allValues.tablesValue[0].values
|
||||
billMain.type = '其它'
|
||||
billMain.subType = '请购单'
|
||||
billMain.defaultNumber = billMain.number
|
||||
for(let item of detailArr){
|
||||
item.depotId = '' //订单不需要仓库
|
||||
totalPrice += item.allPrice-0
|
||||
}
|
||||
billMain.totalPrice = 0-totalPrice
|
||||
billMain.changeAmount = 0-billMain.changeAmount
|
||||
if(billMain.accountId === 0) {
|
||||
billMain.accountId = ''
|
||||
}
|
||||
this.accountMoneyList = changeListFmtMinus(this.accountMoneyList)
|
||||
billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : ""
|
||||
billMain.accountMoneyList = this.accountMoneyList.length>0 ? JSON.stringify(this.accountMoneyList) : ""
|
||||
if(this.fileList && this.fileList.length > 0) {
|
||||
billMain.fileName = this.fileList
|
||||
} else {
|
||||
billMain.fileName = ''
|
||||
}
|
||||
if(this.model.id){
|
||||
billMain.id = this.model.id
|
||||
}
|
||||
billMain.status = this.billStatus
|
||||
return {
|
||||
info: JSON.stringify(billMain),
|
||||
rows: JSON.stringify(detailArr),
|
||||
}
|
||||
},
|
||||
handleHistoryBillList() {
|
||||
let organId = this.form.getFieldValue('organId')
|
||||
this.$refs.historyBillListModalForm.show('其它', '请购单', '', organId);
|
||||
this.$refs.historyBillListModalForm.disableSubmit = false;
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
Loading…
Reference in New Issue
Block a user