yonyou
/
tk2312-web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yonyou:5c4ac2a74554c46d5f7a301f4130e1010bada825
Branches Tags
yonyou:main
yonyou:pickm1
..
compare: yonyou:521a729106625d261944cbd4145290b8ce319a75
Branches Tags
yonyou:main
yonyou:pickm1

No commits in common. "5c4ac2a74554c46d5f7a301f4130e1010bada825" and "521a729106625d261944cbd4145290b8ce319a75" have entirely different histories.
5c4ac2a745 ... 521a729106

13 changed files with 30224 additions and 1407 deletions
Show Stats Expand all files Collapse all files

8
.idea/.gitignore vendored
View File

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

6
.idea/CoolRequestCommonStatePersistent.xml
View File

@ -1,6 +0,0 @@
<?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>

6
.idea/NCHomeConfigSetting.xml
View File

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

7
.idea/misc.xml
View File

@ -1,7 +0,0 @@
<?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
View File

@ -1,8 +0,0 @@
<?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
View File

@ -1,12 +0,0 @@
<?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
View File

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

30
config.json
View File

@ -1,32 +1,10 @@
{ {
"buildEntryPath": [ "buildEntryPath": [
"./src/mmpac/mmpac/pickm/*/index.js", "./src/mmpac/mmpac/pmo/*/index.js",
"./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, "proxyJson": false,
"proxy": "http://127.0.0.1:80/", "proxy": "http://127.0.0.1:8080/",
"buildWithoutHTML": [ "buildWithoutHTML": [
"uap/refer", "uap/refer",
"uapbd/refer" "uapbd/refer"
@ -38,7 +16,7 @@
"department": "", "department": "",
"project": "", "project": "",
"branch": "" "branch": ""
}, } ,
"eslint": { "eslint": {
"path": [], "path": [],
"enable": true, "enable": true,

31455
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

35
src/mmpac/mmpac/issue/list/index.js
View File

@ -1,6 +1,6 @@
/*auVpq9xwZL1gPRSzNVP/w0hBm26YHXsnVMAUlT2iQRQ=*/ /*auVpq9xwZL1gPRSzNVP/w0hBm26YHXsnVMAUlT2iQRQ=*/
import React, { Component } from 'react'; import React, { Component } from 'react';
import { createPage, base, createPageIcon,print,output} from 'nc-lightapp-front'; import { createPage, base, createPageIcon } from 'nc-lightapp-front';
import { AREA, BUTTON, BILLTYPE, FIELD } from '../constance'; import { AREA, BUTTON, BILLTYPE, FIELD } from '../constance';
import { initPickmTemplate, initReqpickmTemplate, initTemplate,initDirectTransTemplate } from './init'; import { initPickmTemplate, initReqpickmTemplate, initTemplate,initDirectTransTemplate } from './init';
import { serachPickm_btnClick, serachReqpickm_btnClick, onList_BtnClicks, selectOrg_BtnClick ,serachDirectTrans_btnClick} from './btnClicks'; import { serachPickm_btnClick, serachReqpickm_btnClick, onList_BtnClicks, selectOrg_BtnClick ,serachDirectTrans_btnClick} from './btnClicks';
@ -19,7 +19,6 @@ import { onhandChange } from './afterEvent';
import { showWarningDialog } from '../../../../mmpub/mmpub/pub/tool/messageUtil'; import { showWarningDialog } from '../../../../mmpub/mmpub/pub/tool/messageUtil';
const { NCTabs, NCDiv } = base; const { NCTabs, NCDiv } = base;
const NCTabPane = NCTabs.NCTabPane; const NCTabPane = NCTabs.NCTabPane;
const nodekey = "insetrule_print";
let { issueAppcode, headPageArea, bodyPageArea } = AREA; let { issueAppcode, headPageArea, bodyPageArea } = AREA;
class List extends Component { class List extends Component {
constructor(props) { constructor(props) {
@ -223,38 +222,6 @@ 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() { render() {
const { search, BillHeadInfo } = this.props; const { search, BillHeadInfo } = this.props;
const { NCCreateSearch } = search; const { NCCreateSearch } = search;

3
src/mmpac/mmpac/pickm/card/viewController/btnClickControllor.js
View File

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

3
src/mmpac/mmpac/pickm/constance/index.js
View File

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

12
src/sscivm/invoiceApplication/invoiceApl/card/common/valueChange.js
View File

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