Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

app/sign/css/sign_handle.css

@@ -43,6 +43,8 @@ ul {list-style: none;}
.bgc-f5f5fa {background-color: #f5f5fa;}
.setInput .el-input--suffix .el-input__inner{
	border: 0;
	font-size: 13px;
	padding-left: 20px;
}
.setInput .el-select .el-input .el-select__caret{
	background: url(../../../images/tiaozhuan_shang_icon.png) no-repeat no-repeat calc(100% - 10px) center;

app/sign/js/sign_handle.js

@@ -722,7 +722,7 @@ methods: {
		});
	},
	sign: function() {// type:1签约 2拒签
		if(this.signInfo.type == 1 && (!this.signInfo.expenses || (this.doctorType == 2 && !this.signInfo.healthDoctor) ||(this.doctorType == 2 && !this.signInfo.specialist) || (this.doctorType == 3 && !this.signInfo.doctor) || !this.signInfo.sevId || (!this.signInfo.disease && !this.signInfo.healthLabel && !this.signInfo.customLabel))) {
		if(this.signInfo.type == 1 && (!this.signInfo.expenses || (this.doctorType == 2 && !this.signInfo.healthDoctor) ||(this.zkdoctorShow==true &&this.doctorType == 2 && !this.signInfo.specialist) || (this.doctorType == 3 && !this.signInfo.doctor) || !this.signInfo.sevId || (!this.signInfo.disease && !this.signInfo.healthLabel && !this.signInfo.customLabel))) {
			showWarningMessage("请将填写完整签约信息！");
			return false;
		}