update

common/service/http.js

@@ -4,7 +4,7 @@ let apiHosp = 'http://120.78.154.31/'
 
 // let apiHosp = 'http://192.168.2.247/'
 
-//let apiHosp = 'http://172.16.40.184/'
+// let apiHosp = 'http://172.16.40.184/'
 // let apiHosp = 'http://172.16.40.182/'
 
 export default {

common/util/upload.js

@@ -14,22 +14,27 @@ function uploaditem(item) {
 			url: http.apiHosp + '/ibps/platform/v3/file/upload', //仅为示例，非真实的接口地址
 			filePath: path,
 			name: 'file',
-			formData: {
-				'ext': '.jpg'
-			},
+			// formData: {
+			// 	'ext': '.jpg'
+			// },
 			header: {
 				'X-Authorization-access_token': token,
 				'X-Authorization-systemid': ''
 			},
 			success: (uploadFileRes) => {
 				let data = JSON.parse(uploadFileRes.data)
-				let obj = {
-					id: data.data.id,
-					name: data.data.fileName + '.' + data.data.ext,
-					ext: data.data.ext,
-					uuid: data.data.id
+				if (data.state == 200) {
+					let obj = {
+						id: data.data.id,
+						name: data.data.fileName + '.' + data.data.ext,
+						ext: data.data.ext,
+						uuid: data.data.id
+					}
+					resolve(obj)
+				} else {
+					reject()
 				}
-				resolve(obj)
+
 			},
 			fail: () => {
 				reject()

components/autograph/autograph.vue

@@ -1,8 +1,7 @@
 <template>
 	<view>
 		<slot name="top"></slot>
-		<VueSignaturePad width="100%" height="600rpx" ref="signaturePad" :options="options" disable-scroll="true"
-			class="my-canvas-cls" />
+		<VueSignaturePad width="100%" height="600rpx" ref="signaturePad" :options="options" disable-scroll="true" class="my-canvas-cls" />
 		<slot name="footer"></slot>
 		<view class="footer" v-if="footerShow">
 			<u-button type="success" @click.stop="finish" size="mini">保存</u-button>
@@ -107,4 +106,4 @@
 	.but-class {
 		margin-right: 40rpx;
 	}
-</style>
+</style>

pages/jiance/list/js/specimenBox.js

@@ -72,22 +72,41 @@ export default {
 			this.getPrompt('至少填写一组样品类型信息')
 			return false
 		}
+
+		if (!show1) {
+			this.getFormNull(spe.showBooleanList1, form)
+		}
 		if (show1 && !this.getEstimate(spe.showBooleanList1, form)) {
 			return false
 		}
+
+		if (!show2) {
+			this.getFormNull(spe.showBooleanList2, form)
+		}
 		if (show2 && !this.getEstimate(spe.showBooleanList2, form)) {
 			return false
 		}
 
+		if (!show3) {
+			this.getFormNull(spe.showBooleanList3, form)
+		}
 		if (show3 && !this.getEstimate(spe.showBooleanList3, form)) {
 			return false
 		}
 
+		if (!show4) {
+			this.getFormNull(spe.showBooleanList4, form)
+		}
 		if (show4 && !this.getEstimate(spe.showBooleanList4, form)) {
 			return false
 		}
 		return true
 	},
+	getFormNull(list, form) {
+		for (let item of list) {
+			form[item.value] = ''
+		}
+	},
 	//数据判断是否必填
 	getEstimate(list, form) {
 		for (let item of list) {

pages/jiance/list/specimen.vue

@@ -420,7 +420,7 @@
 						this.form.yang_pin_gui_ge_ = result.yang_pin_gui_ge_
 						this.form.yang_pin_lei_er_ = result.yang_pin_lei_er_
 						this.form.yang_pin_yun_shu_ = result.yang_pin_yun_shu_
-						this.form.yang_pin_gui_ge_e = result.yang_pin_gui_ge_
+						this.form.yang_pin_gui_ge_e = result.yang_pin_gui_ge_e
 						this.form.shu_liang_er_ = parseInt(result.shu_liang_er_ || 0)
 						this.form.yang_pin_gui_ge_s = result.yang_pin_gui_ge_s
 						this.form.shu_liang_san_ = parseInt(result.shu_liang_san_ || 0)

pages/login/login.vue

@@ -2,8 +2,7 @@
 	<view class="zai-box">
 		<scroll-view scroll-y class="page">
 			<view class="flex-center-center" :style="[{animation: 'show ' + 0.4+ 's 1'}]">
-				<image src="../login/luohuLogo.png" mode='aspectFit' class="zai-logo "
-					style="position: relative;top: 16rpx;margin-right: 5rpx;"></image>
+				<image src="../../static/luohuLogo.png" mode='aspectFit' class="zai-logo " style="position: relative;top: 16rpx;margin-right: 5rpx;"></image>
 				<view class="zai-title text-shadow logonTitle" style="font-size: 45rpx">深圳市罗湖医院集团</view>
 			</view>
 			<view class="flex-center-center" :style="[{animation: 'show ' + 0.4+ 's 1'}]">
@@ -19,16 +18,13 @@
 						<view class="title"><text class="cuIcon-lock margin-right-xs"></text>密码:</view>
 						<input class="uni-input" placeholder="请输入密码" :password="!showPassword" v-model="password" />
 						<view class="action text-lg">
-							<text :class="[showPassword ? 'cuIcon-attention' : 'cuIcon-attentionforbid']"
-								@click="changePassword"></text>
+							<text :class="[showPassword ? 'cuIcon-attention' : 'cuIcon-attentionforbid']" @click="changePassword"></text>
 						</view>
 					</view>
 
-					<view class="cu-form-group margin-top shadow-warp yanzhenma" v-if="iscaptcha"
-						:class="[shape=='round'?'round':'']" style="padding: 0;">
+					<view class="cu-form-group margin-top shadow-warp yanzhenma" v-if="iscaptcha" :class="[shape=='round'?'round':'']" style="padding: 0;">
 						<view class="code-second">
-							<input class="code-yanzheng" style="width: 220rpx;padding-left: 20rpx;" placeholder="请输入验证码"
-								v-model="captcha" />
+							<input class="code-yanzheng" style="width: 220rpx;padding-left: 20rpx;" placeholder="请输入验证码" v-model="captcha" />
 						</view>
 						<view class="image-code" @click="refrsh">
 							<image :src="image" style="width: 100%;height: 100%;"></image>
@@ -57,9 +53,7 @@
 					<view @tap="zhuce()"> <text style="color: #E04B28;float: right; margin-right: 20rpx; ">
 							还未注册?请注册</text> </view>
 					<view class="padding text-center margin-top">
-						<button class="cu-btn bg-blue lg margin-right shadow" :loading="loading"
-							:class="[shape=='round'?'round':'']" @tap="onSMSLogin"><text
-								space="emsp">{{loading ? "登录中...":" 登录 "}}</text>
+						<button class="cu-btn bg-blue lg margin-right shadow" :loading="loading" :class="[shape=='round'?'round':'']" @tap="onSMSLogin"><text space="emsp">{{loading ? "登录中...":" 登录 "}}</text>
 						</button>
 						<!--    		<button class="cu-btn line-blue lg margin-left shadow" :loading="loading" :class="[shape=='round'?'round':'']"
                 			@tap="loginWay=1">账户登录
@@ -78,9 +72,6 @@
 		</scroll-view>
 		<!-- 登录加载弹窗 -->
 		<view class="cu-load load-modal" v-if="loading">
-			<!-- <view class="cuIcon-emojifill text-orange"></view> -->
-			<!-- <image src="https://static.jeecg.com/upload/test/login4_1595818039175.png" mode="aspectFit" class="round"></image>
-			 -->
 			<view class="gray-text">登录中...</view>
 		</view>
 	</view>