Compare commits

...

4 Commits

Author SHA1 Message Date
jiashuai 5c4ac2a745 生产领料打印 2025-09-17 18:32:23 +08:00
jiashuai 6d60e76942 解决冲突 2025-09-17 17:13:34 +08:00
jiashuai ac6d5375a6 暂存 2025-09-17 10:20:15 +08:00
jiashuai 346e1142fe 暂存 2025-09-17 10:17:53 +08:00
13 changed files with 1408 additions and 30225 deletions

8
.idea/.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CoolRequestCommonStatePersistent">
<option name="searchCache" value="src/purp/pp/supplierprice/list/events/batchEvents.js" />
</component>
</project>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="NCHomeConfig">
<option name="loginToken" value="" />
</component>
</project>

7
.idea/misc.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ASMSmaliIdeaPluginConfiguration">
<asm skipDebug="true" skipFrames="true" skipCode="false" expandFrames="false" />
<groovy codeStyle="LEGACY" />
</component>
</project>

8
.idea/modules.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/tk2312-web.iml" filepath="$PROJECT_DIR$/.idea/tk2312-web.iml" />
</modules>
</component>
</project>

12
.idea/tk2312-web.iml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

View File

@ -1,25 +1,47 @@
{
"buildEntryPath": [
"./src/mmpac/mmpac/pmo/*/index.js",
"./src/mmpac/mmpac/pickm/*/index.js"
],
"proxyJson": false,
"proxy": "http://127.0.0.1:8080/",
"buildWithoutHTML": [
"uap/refer",
"uapbd/refer"
],
"devPort": 3001,
"patch": {
"path": [],
"provider": "",
"department": "",
"project": "",
"branch": ""
} ,
"eslint": {
"path": [],
"enable": true,
"autoFix": false
}
"buildEntryPath": [
"./src/mmpac/mmpac/pickm/*/index.js",
"./src/mmpac/mmpac/pickm/*/*/index.js"
],
"buildEntryPath1": [
"./src/uapbd/refer/pub/*/index.js",
"./src/ic/ic/sapplybill/*/index.js",
"./src/uapbd/refer/pub/*/index.js",
"./src/arap/paybill/paybill/*/index.js",
"./src/sscrp/public/common/components/job-style/*/index.js",
"./src/ssctp/sscuser/sscapprove/*/index.js",
"./src/cmp/informer/SettlementCenter/*/index.js",
"./src/fbm/fbm/gather/*/index.js",
"./src/sscivm/invoiceSale/*/*/index.js",
"./src/sscivm/invoiceSale/*/*/invoiceSaleList.js",
"./src/sscivm/invoiceSale/*/*/invoiceSaleCard.js",
"./src/sscivm/invoiceApplication/invoiceApl/*/index.js",
"./src/mmpac/mmpac/pickm/*/index.js",
"./src/mmpac/mmpac/pickm/*/*/index.js",
"./src/purp/pp/supplierprice/*/index.js",
"./src/uapbd/mmbase/bom0202/*/index.js",
"./src/uapbd/material/material_grp/*/index.js",
"./src/pu/pu/buyingreq/*/index.js",
"./src/uapbd/mmbase/bom0202/*/index.js",
"./src/uapbd/material/material_grp/*/index.js"
],
"proxyJson": false,
"proxy": "http://127.0.0.1:80/",
"buildWithoutHTML": [
"uap/refer",
"uapbd/refer"
],
"devPort": 3001,
"patch": {
"path": [],
"provider": "",
"department": "",
"project": "",
"branch": ""
},
"eslint": {
"path": [],
"enable": true,
"autoFix": false
}
}

31457
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
/*auVpq9xwZL1gPRSzNVP/w0hBm26YHXsnVMAUlT2iQRQ=*/
import React, { Component } from 'react';
import { createPage, base, createPageIcon } from 'nc-lightapp-front';
import { createPage, base, createPageIcon,print,output} from 'nc-lightapp-front';
import { AREA, BUTTON, BILLTYPE, FIELD } from '../constance';
import { initPickmTemplate, initReqpickmTemplate, initTemplate,initDirectTransTemplate } from './init';
import { serachPickm_btnClick, serachReqpickm_btnClick, onList_BtnClicks, selectOrg_BtnClick ,serachDirectTrans_btnClick} from './btnClicks';
@ -19,6 +19,7 @@ import { onhandChange } from './afterEvent';
import { showWarningDialog } from '../../../../mmpub/mmpub/pub/tool/messageUtil';
const { NCTabs, NCDiv } = base;
const NCTabPane = NCTabs.NCTabPane;
const nodekey = "insetrule_print";
let { issueAppcode, headPageArea, bodyPageArea } = AREA;
class List extends Component {
constructor(props) {
@ -222,6 +223,38 @@ class List extends Component {
}
}
//打印方法
onClickPrint = (pkarray,callback = EMPTY_FN)=>{
print(
'pdf',
urls['print'],
{
//打印请求的ur1
funcode: this.config.moduleId,
nodekey:nodekey,
oids:pkarray
}
)
}
// 输出功能
onOutPut=(oids)=>{
let printdata={
funcode: this.config.moduleId,
appcode: this.config.moduleId,
nodekey: nodekey,
oids: oids,
outputType: "output",
};
//小应用编码//小应用编码
//默认模板分配的key//需要输出的单据主键//输出类型 --默认output
output({ url: urls['print'], data: printdata });
}
render() {
const { search, BillHeadInfo } = this.props;
const { NCCreateSearch } = search;

View File

@ -841,7 +841,8 @@ export default async function clickBtn(props, id, text, record, index) {
billstatus = props.form.getFormItemsValue(AREA.formArea, 'fbillstatus');
//审批态
if (billstatus && billstatus.value && billstatus.value == 1) {
detailqueryBtnClick.call(this, this.props, record);
// detailqueryBtnClick.call(this, this.props, record);
borrowBtnClick.call(this, this.props, record);
} else {
toast({color: 'warning', title: "只有审批后单据才能生产其他入库单"});
}

View File

@ -11,8 +11,7 @@ const AREA = {
cardBodyBtnArea: 'card_body', //卡片表体按钮区域
cardBodyInnerBtnArea: 'card_body_inner', //卡片表体操作按钮区域
borrowMaterialDialog: 'NCTable_83c3abf9', //借料弹窗
borrowList: 'borrow_list', //借料弹窗页面编码
BORROW_DLG: 'BorrowDlg' //借料入库
borrowList: 'borrow_list' //借料弹窗
};
const MANUFACTURE = 'fa';//製造場景

View File

@ -39,7 +39,7 @@ const headKeys = ['pk_org', 'pk_customer', 'gmf_zh', 'pk_customer_v', 'gmf_dz',
* def1:合同销售订单编号
*/
const bodyKeys = ['xmdj', 'sl', 'xmje', 'se', 'xmsl', 'xmjshj', 'pk_materiel',
'zkje', 'fphxz', 'taxcode', 'spbm', 'sl', 'xmjshj', 'def1'];
'zkje', 'fphxz', 'taxcode', 'spbm', 'sl', 'def1'];
export default function (moduleId, key, value, changedrows, index, record) {
// console.log('valueChange', moduleId, key, value, changedrows, index);
@ -48,9 +48,9 @@ export default function (moduleId, key, value, changedrows, index, record) {
(moduleId == presetVar.bodyAreaId && bodyKeys.indexOf(key) > -1)) {
hasChange = true;
}
// if (bodyKeys.includes(key)) {
// debugger;
// }
/*if (bodyKeys.includes(key)) {
debugger;
}*/
if (hasChange) {
// 取得表头数据
let headBodyData;
@ -72,7 +72,9 @@ export default function (moduleId, key, value, changedrows, index, record) {
checkrule: 'true',
templateid: this.props.meta.getMeta().pageid
}
// console.log('sendData = ', sendData);
if (key == 'xmjshj') {
console.log('sendData = ', sendData);
}
requestApi.valueChange({
data: sendData,
success: (data) => {