Skip to content

T
topsun-bpm
Commit b33f1ed6 authored by 刘学辉's avatar 刘学辉
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 27b157fe a64ba496
Show whitespace changes
Inline Side-by-side
Showing with 122 additions and 49 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseDetail.js
View file @ b33f1ed6
......@@ -41,7 +41,7 @@ function initItemGrid() {
dataAction: 'server',
url: web_app.name + '/sapPurchaseItem/querySapPurchaseItems.ajax',
parms:{sapPurchaseId:getId()},
height: '99.6%',
height: '95%',
heightDiff: -4,
sortName: 'id',
sortOrder: 'asc',
......@@ -51,8 +51,24 @@ function initItemGrid() {
enabledEdit: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
//autoApplyNextEditor:false,
autoApplyNextEditor:false,
toolbar: toolbarOptions,
onBeforeEdit: function (editParm) {
var c = editParm.column, data = editParm.record;
//仅适用于KNTTP=K时
if (data.knttp !== "K" && c.name === 'kostl') {
return false;
}
//仅适用于KNTTP=F时
if (data.knttp !== "F" && c.name === 'aufnr') {
return false;
}
//仅适用于KNTTP=A时
// 仅适用于KNTTP=A时
if (data.knttp !== 'A' && (c.name === 'anln1' || c.name === 'anln2')){
return false;
}
},
}
);
UICtrl.setSearchAreaToggle(itemGridManager);
......@@ -78,6 +94,7 @@ function getGridColumns() {
knttp: "knttp"
}
},
onChange() {}
}
},
{display: "工厂", name: "werks", width: "100", align: "left", type: "string",
......@@ -112,7 +129,7 @@ function getGridColumns() {
},
back: {
MATNR: "matnr",
MAKTX: "maktx",
MAKTX: "txz01",
MATKL: "matkl",
WGBEZ: "matklName",
EKGRP: "ekgrp",
......@@ -120,7 +137,7 @@ function getGridColumns() {
PEINH: "peinh",
MEINS: "meins",
MSEHL: "meinsName",
LGORT: "lgort",
LGFSB: "lgort",
LGOBE: "lgobe"
}
},
......@@ -277,63 +294,91 @@ function getGridColumns() {
editor: {type: 'text'},
render:function (item){
//申购项次为消耗性采购时，从1开始步长为1自动编号，最大99
if (item.knttp != ''){
ZEBKN_NUM = ZEBKN_NUM + 1;
}
return item.zebkn = ZEBKN_NUM;
// if (item.knttp != ''){
// ZEBKN_NUM = ZEBKN_NUM + 1;
// }
return item.zebkn = item.menge;
}
},
{display: "多重科目分配", name: "vrtkz", width: "100", align: "left", type: "string",
//editor: {type: 'text'},
render : function (item) {
var bsart =$("#bsart").val();
//资产消耗性申购，若申请数量大于1，此处不能为空，必须选择1
if (bsart == "A" && item.menge > 1){
if (item.knttp == "A" && item.menge > 1){
return item.vrtkz = 1;
}
}
},
{display: "部分发票", name: "twrkz", width: "100", align: "left", type: "string",
editor: {type: 'text'},
/*render : function (item) {
var bsart =$("#bsart").val();
render : function (item) {
//资产消耗性申购，若申请数量大于1，此处不能为空，必须选择1
if (bsart == "ZNE1" && item.menge > 1){
if (item.knttp == "A" && item.menge > 1){
return item.twrkz = 1;
}
}*/
}
},
{display: "PR分解数量", name: "ekbnMenge", width: "100", align: "left", type: "string",
editor: {type: 'text'}
},
{
display: "总账科目", name: "sakto", width: "100", align: "left", type: "string",
editor: {type: 'text'}
editor: {type: 'text',required: true}
},
{
display: "成本中心", name: "kostl", width: "100", align: "left", type: "string",
/*editor: {
display: "成本中心", name: "kostl", width: "200", align: "left", type: "string",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {paramValue: "KOSTL"}
return {fieldName: "KOSTL"}
},
back: {
KOSTL: "kostl"
}
},
}*/
editor: {required: false, type: "text"}
}
},
{
display: "订单号", name: "aufnr", width: "100", align: "left", type: "string",
editor: {type: 'text'}
display: "订单号", name: "aufnr", width: "200", align: "left", type: "string",
//editor: {type: 'text'}
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "getCompanyOrders",
getParam: function (item) {
return {
BUKRS: '1000'
}
},
back: {
AUFNR: "aufnr",
KTEXT: "ktext"
}
},
}
},
{
display: "主资产号", name: "anln1", width: "100", align: "left", type: "string",
editor: {type: 'text'}
display: "主资产号", name: "anln1", width: "200", align: "left", type: "string",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {
fieldName: "ANLN1",
filterValue: '1000'
}
},
back: {
ANLN1: "anln1"
}
},
}
},
{
display: "子资产号", name: "anln2", width: "100", align: "left", type: "string",
......
topsun-xt/src/main/webapp/biz/topsun/sap/qualityInfoRecord/qualityInfoRecordDetail.js
View file @ b33f1ed6
......@@ -31,7 +31,7 @@ function initItemGrid() {
dataAction: 'server',
url: web_app.name + '/sapQualityInfoRecordItem/querySapQualityInfoRecordItems.ajax',
parms:{sapQualityInfoRecordId:Public.isNotBlank(getId())?getId():$("#tempId").val()},
height: '98%',
height: '95%',
heightDiff: -4,
sortName: 'id',
sortOrder: 'asc',
......@@ -44,10 +44,18 @@ function initItemGrid() {
//autoApplyNextEditor:false,
toolbar: toolbarOptions,
onBeforeEdit: function (editParma) {
if (Public.isBlank(editParma.record.grsrq) && (editParma.column.name=='grscertnr' || editParma.column.name=='grscertdatai')){
//输入物料号敲回车后，品名描述和无老祖自动带出，而且这两个字段将成为灰色，不允许修改
if (Public.isNotBlank(editParma.record.matnr) && editParma.column.name=='matklName'){
return false;
}
if (Public.isBlank(editParma.record.fscrq) && (editParma.column.name=='fsccertnr' || editParma.column.name=='fsccertdatai')){
//不输入物料号而只输入物料组。这种情况下，物料编码和品名描述字段就是灰色，而物料组可以写操作
if (Public.isNotBlank(editParma.record.matklName) && Public.isBlank(editParma.record.matnr) && editParma.column.name=='matnr'){
return false;
}
if ("0" === editParma.record.grsrq && (editParma.column.name=='grscertnr' || editParma.column.name=='grscertdatai')){
return false;
}
if ("0" === editParma.record.fscrq && (editParma.column.name=='fsccertnr' || editParma.column.name=='fsccertdatai')){
return false;
}
......@@ -101,7 +109,7 @@ function getGridColumns() {
},
{display: "物料编码", name: "matnr", width: "200", align: "left", type: "string",
editor: {
required: true, type: "select",
required: false, type: "select",
data: {
type: 'system',
name: "sapMaterialSelect",
......@@ -120,11 +128,11 @@ function getGridColumns() {
}
},
{display: "物料描述", name: "maktx", width: "300", align: "left", type: "string",
editor: {required: true, type: "text"}
//editor: {required: true, type: "text"}
},
{display: "物料组", name: "matklName", width: "200", align: "left", type: "string",
editor: {
required: true, type: "select",
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
......@@ -168,7 +176,7 @@ function getGridColumns() {
{display: "打样单号码", name: "zspaufnr", width: "200", align: "left", type: "string",
editor: {type: "text", required: false,}
},
{display: "GRSRQ", name: "grsrq", width: "100", align: "left", type: "string",
{display: "GRSRQ", name: "grsrqTextView", width: "100", align: "left", type: "string",
editor: {
type: 'dictionary',
data: {name: 'grsrq'},
......@@ -186,10 +194,10 @@ function getGridColumns() {
{display: "GRS证书到期日", name: "grscertdatai", width: "150", align: "left", type: "date",
editor: {type: 'date'}
},
{display: "FSC认证要求", name: "fscrq", width: "200", align: "left", type: "string",
{display: "FSC认证要求", name: "fscrqTextView", width: "200", align: "left", type: "string",
editor: {
type: 'dictionary',
data: {name: 'grsrq'},
data: {name: 'fscrq'},
textField: 'fscrqTextView',
valueField: 'fscrq',
required: true,
......@@ -239,35 +247,55 @@ function getExtendedData(processAction) {
if (!datas) {
return false;
}
if (Public.isNotBlank($("#tempId").val())){
var checked1 = false;
var checked2 = false;
var checked3 = false;
var checked4 = false;
//if (Public.isNotBlank($("#tempId").val())){
datas.forEach(data=>{
data.id = "";
data.sapQualityInfoRecordId=""
data.zqinfno=""
data.type=""
data.message=""
if (Public.isNotBlank(data.grsrq)){
// data.id = "";
// data.sapQualityInfoRecordId=""
// data.zqinfno=""
// data.type=""
// data.message=""
if ("X" === data.grsrq){
if (Public.isBlank(data.grscertnr)){
checked1 = true;
}
if (Public.isBlank(data.grscertdatai)){
checked2 = true;
}
}
if ("X" === data.fscrq){
if (Public.isBlank(data.fsccertnr)){
checked3 = true;
}
if (Public.isBlank(data.fsccertdatai)){
checked4 = true;
}
}
})
if (checked1){
Public.tip("GRS证书号不能为空")
return false
}
if (Public.isBlank(data.grscertdatai)){
if (checked2){
Public.tip("GRS证书到期日不能为空")
return false
}
}
if (Public.isNotBlank(data.fscrq)){
if (Public.isBlank(data.fsccertnr)){
if (checked3){
Public.tip("FSC证书号不能为空")
return false
}
if (Public.isBlank(data.fsccertdatai)){
if (checked4){
Public.tip("FSC证书到期日不能为空")
return false
}
}
})
}
//}
extendedData.items = Public.encodeJSONURI(datas);
}
return extendedData;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment