Ver Fonte

处方审核页面,电子签名

yanqiliang há 1 mês atrás
pai
commit
018fbae223
2 ficheiros alterados com 238 adições e 324 exclusões
  1. 28 28
      src/pages/pharmacy/outpha/common/PreviewOfPrescription.jsx
  2. 210 296
      yarn.lock

+ 28 - 28
src/pages/pharmacy/outpha/common/PreviewOfPrescription.jsx

@@ -20,6 +20,19 @@ export default class PreviewOfPrescription extends React.Component {
 		return String(phoneAddress || '').replace(/^(\d{3})\d{4}(\d{4})/, '$1****$2');
 	}
 	// 西药时需要处理关联医嘱
+	// 有电子签名时展示签名图片,否则展示人员姓名。
+	renderSignature = (stamp, name) => {
+		return stamp ? (
+			<img
+				style={{ position: "absolute", width: "100px", height: "36px", top: 0, objectFit: "contain" }}
+				src={stamp}
+				alt=""
+			/>
+		) : (
+			<span>{name}</span>
+		);
+	}
+
 	processAssociatedData = (data) => {
 		let tempArr = [];
 		let afterData = [];
@@ -153,7 +166,7 @@ export default class PreviewOfPrescription extends React.Component {
 						<div
 							style={{
 								borderBottom: '1px solid #ccc', padding: '0 24px',
-								height: store.getState().tableHeight.y - 91 - basicHeight + 'px', overflow: 'auto'
+								height: store.getState().tableHeight.y - 143 - basicHeight + 'px', overflow: 'auto'
 							}}
 							className="pr-style prescription-bar"
 						>
@@ -240,23 +253,13 @@ export default class PreviewOfPrescription extends React.Component {
 								<div className="diagonal"></div>
 							</div>}
 						</div>
-						<div style={{ padding: '12px' }}>
-							<Row style={{ marginBottom: '4px' }}>
+						<div style={{ padding: '16px 12px' }}>
+							<Row style={{ marginBottom: '12px', minHeight: '40px' }}>
 								<Col span={8}>
 									<Row>
 										<Col {...colTop} className="alignRight">{this.props.setMessage("PrescriptionReviewdoctorSignName", "descripts", "医生签名")}</Col>
 										<Col {...colBottom} style={{ position: "relative" }}>
-											{mainInfoObj && mainInfoObj.docStamp ? (
-												// <span style={{
-												// 	display: "inline-block", position: "absolute",
-												// 	width: "100px", height: "36px", top: "-10px",
-												// 	background: "url(" + mainInfoObj.docStamp + ") no-repeat",
-												// 	backgroundSize: "contain"
-												// }}></span>
-												<img style={{ position: "absolute", width: "100px", height: "36px", top: "-10px" }} src={mainInfoObj.docStamp} alt="" />
-											) : (
-												<span>{mainInfoObj.ordDocDesc}</span>
-											)}
+											{this.renderSignature(mainInfoObj.docStamp, mainInfoObj.ordDocDesc)}
 										</Col>
 									</Row>
 								</Col>
@@ -264,16 +267,7 @@ export default class PreviewOfPrescription extends React.Component {
 									<Row>
 										<Col {...colTop} className="alignRight">{this.props.setMessage("PrescriptionReviewcheck", "descripts", "审核")}</Col>
 										<Col {...colBottom} style={{ position: "relative" }}>
-											{mainInfoObj && mainInfoObj.dispUserStamp ? (
-												// <span style={{ 
-												// 	display: "inline-block", position: "absolute", 
-												// 	width: "100px", height: "36px", top: "-10px", 
-												// 	background: "url(" + mainInfoObj.dispUserStamp + ") no-repeat", 
-												// 	backgroundSize: "contain" }}></span>
-												<img style={{ position: "absolute", width: "100px", height: "36px", top: "-10px" }} src={mainInfoObj.dispUserStamp} alt="" />
-											) : (
-												<span>{mainInfoObj.auditUserName}</span>
-											)}
+											{this.renderSignature(mainInfoObj.auditUserStamp, mainInfoObj.auditUserName)}
 										</Col>
 									</Row>
 								</Col>
@@ -284,23 +278,29 @@ export default class PreviewOfPrescription extends React.Component {
 									</Row>
 								</Col>
 							</Row>
-							<Row>
+							<Row style={{ minHeight: '40px' }}>
 								<Col span={8}>
 									<Row>
 										<Col {...colTop} className="alignRight">{this.props.setMessage("PrescriptionReviewprovisioning", "descripts", "调配")}</Col>
-										<Col {...colBottom}>{mainInfoObj.prepUserName ? mainInfoObj.prepUserName : ""}</Col>
+										<Col {...colBottom} style={{ position: "relative" }}>
+											{this.renderSignature(mainInfoObj.prepUserStamp, mainInfoObj.prepUserName)}
+										</Col>
 									</Row>
 								</Col>
 								<Col span={8}>
 									<Row>
 										<Col {...colTop} className="alignRight">{this.props.setMessage("PrescriptionReviewverify", "descripts", "核对")}</Col>
-										<Col {...colBottom}>{mainInfoObj.auditUserName}</Col>
+										<Col {...colBottom} style={{ position: "relative" }}>
+											{this.renderSignature(mainInfoObj.dispUserdStamp, mainInfoObj.dispUserName)}
+										</Col>
 									</Row>
 								</Col>
 								<Col span={8}>
 									<Row>
 										<Col {...colTop} className="alignRight">{this.props.setMessage("PrescriptionReviewdrugDistribution", "descripts", "发药")}</Col>
-										<Col {...colBottom}>{mainInfoObj.dispUserName}</Col>
+										<Col {...colBottom} style={{ position: "relative" }}>
+											{this.renderSignature(mainInfoObj.dispUserStamp, mainInfoObj.dispUserName)}
+										</Col>
 									</Row>
 								</Col>
 							</Row>

Diff do ficheiro suprimidas por serem muito extensas
+ 210 - 296
yarn.lock


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff