diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 38d090e6..d5394d74 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -71,6 +71,7 @@ const user = { actions: { // 登录 Login({commit}, userInfo) { + debugger const username = userInfo.username.trim() const password = sha256(userInfo.password) const code = userInfo.code diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue index ebf3a7cc..465b7799 100644 --- a/src/views/basic/busType/bussinessType.vue +++ b/src/views/basic/busType/bussinessType.vue @@ -267,6 +267,7 @@ export default { checkCertExpire: false,//校验证书过期 editType: 2, groupBuySplit: null, + vailHcType:null, checkReview: null, secCheckReview: null, thrCheckReview: null, diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 97b1b769..05951c49 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -207,15 +207,28 @@ </el-row> - <el-row type="flex"> + <el-row> <el-col :span="11"> - <el-form-item label="集采是拆单" prop="groupBuySplit"> + <el-form-item label="集采是否拆单" prop="groupBuySplit"> <el-select v-model="inputQuery.groupBuySplit" style="width: 90%" placeholder="集采是拆单"> <el-option label="拆单" :value="1"></el-option> <el-option label="不拆单" :value="2"></el-option> </el-select> </el-form-item> </el-col> + + <el-col :span="11"> + <el-form-item label="耗材校验方式" prop="vailHcType"> + <el-select v-model="inputQuery.vailHcType" style="width: 90%" placeholder="耗材校验方式"> + <el-option label="不校验耗材类别" :value="0"></el-option> + <el-option label="只采集高值耗材" :value="1"></el-option> + <el-option label="只采集普通耗材" :value="2"></el-option> + </el-select> + </el-form-item> + </el-col> + </el-row> + + <el-row> <el-col :span="11"> <el-form-item prop="remark" label="备注"> <el-input v-model="inputQuery.remark" size="small" style="width: 90%" type="textarea" autosize diff --git a/src/views/basic/corpMaintain/corpImport.vue b/src/views/basic/corpMaintain/corpImport.vue index df257ed0..00273adb 100644 --- a/src/views/basic/corpMaintain/corpImport.vue +++ b/src/views/basic/corpMaintain/corpImport.vue @@ -92,7 +92,7 @@ import {getBasicThirdSys} from "@/api/basic/basicThirdSys"; import corpImportDetail from "./corpImportDetail"; export default { - data() { + data() { return { BASE_URL: process.env.VUE_APP_BASE_API, showSearch: true,