Index: ssts-web/src/main/webapp/buttjoint/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r37547 -r40306 --- ssts-web/src/main/webapp/buttjoint/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 37547) +++ ssts-web/src/main/webapp/buttjoint/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 40306) @@ -221,6 +221,9 @@ var urgentLevelName = '加急级别'; var videoAndPictureRecordingHidden = true; var videoAndPictureRecordingName = '影像记录'; + var videoAndPictureRecordingHidden = true; + var thirdPartyIdCardName = '第三方标识牌'; + var thirdPartyIdCardHidden = true; if (expandColoumnsConfigOfTousseInfoList && expandColoumnsConfigOfTousseInfoList.length > 0) { for (var i = 0; i < expandColoumnsConfigOfTousseInfoList.length; i++) { if (expandColoumnsConfigOfTousseInfoList[i].fieldName == 'urgentLevel') { @@ -231,6 +234,10 @@ videoAndPictureRecordingHidden = false; videoAndPictureRecordingName = expandColoumnsConfigOfTousseInfoList[i].coloumnName; } + if (expandColoumnsConfigOfTousseInfoList[i].fieldName == 'thirdPartyIdCard') { + thirdPartyIdCardHidden = false; + thirdPartyIdCardName = expandColoumnsConfigOfTousseInfoList[i].coloumnName; + } } } columns.push( @@ -239,6 +246,7 @@ { header: "条码", width: 70, dataIndex: 'barcode' }, { header: "器械包集合码", width: 90, dataIndex: 'setCode', hidden: !sstsConfig.enableTousseNumberCollectionCodeFunction }, { header: "标识牌条码", width: 70, dataIndex: 'idCardInstanceBarcode' }, + { header: thirdPartyIdCardName, width: 90, dataIndex: 'thirdPartyIdCard', hidden: thirdPartyIdCardHidden }, { header: "禁用标识牌", width: 70, dataIndex: 'tousseDefinition.isDisableIDCard', hidden: disableIdCard }, { header: "状态", width: 80, dataIndex: 'status', renderer: statusFun }, { header: "灭菌交接状态", width: 85, hidden: !sstsConfig.enableSterilizationTransition, dataIndex: 'sterilizationTransition', renderer: sterilizationTransitionFun }, @@ -320,6 +328,7 @@ { name: 'setCode' }, { name: 'depart' }, { name: 'idCardInstanceBarcode' }, + { name: 'thirdPartyIdCard' }, { name: 'tousseDefinition.isDisableIDCard' }, { name: 'idCardUseAmount' }, { name: 'taskGroup' },