|
|
@@ -11,7 +11,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="申请组织" prop="orgName">
|
|
|
+ <el-form-item label="所属组织" prop="orgName">
|
|
|
<el-input disabled v-model="basicForm.orgName"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -601,7 +601,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
- <el-input disabled v-model="basicForm.remark"></el-input>
|
|
|
+ <el-input :disabled="disable" v-model="basicForm.remark"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -613,7 +613,7 @@
|
|
|
<el-form :model="basicForm2" ref="basic2" label-width="160px">
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="药品" prop="isDrug">
|
|
|
+ <el-form-item label="药品" prop="isDrug" :rules="{required: !isControl, message: '请选择是否药品', trigger: 'change'}">
|
|
|
<el-select
|
|
|
v-model="basicForm2.isDrug"
|
|
|
placeholder="请选择"
|
|
|
@@ -664,7 +664,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="剂型" prop="dosageFrom">
|
|
|
+ <el-form-item label="剂型" prop="dosageFrom" :rules="{required: !isControl, message: '请选择剂型', trigger: 'change'}">
|
|
|
<el-select
|
|
|
ref="doses"
|
|
|
v-model="basicForm2.dosageFrom"
|
|
|
@@ -985,6 +985,7 @@ export default {
|
|
|
isOneClass: false,
|
|
|
basicForm: {
|
|
|
billCode: '',
|
|
|
+ orgName: '德荣集团',
|
|
|
orgId: '',
|
|
|
// 四级分类/物料分类
|
|
|
classifyId: '',
|
|
|
@@ -1068,13 +1069,13 @@ export default {
|
|
|
label: '否'
|
|
|
}],
|
|
|
statusOptions: [{
|
|
|
- value: 0, label: '未提交'
|
|
|
+ value: '0', label: '未提交'
|
|
|
},{
|
|
|
- value: 1, label: '审批中'
|
|
|
+ value: '1', label: '审批中'
|
|
|
},{
|
|
|
- value: 2, label: '已完成'
|
|
|
+ value: '2', label: '已完成'
|
|
|
},{
|
|
|
- value: 3, label: '已驳回'
|
|
|
+ value: '3', label: '已驳回'
|
|
|
},],
|
|
|
basicRules: {
|
|
|
classifyId: [{ required: true, message: '请选择四级分类', trigger: 'change' }],
|
|
|
@@ -1455,8 +1456,17 @@ export default {
|
|
|
sparams.sysMaterialMedcineApply = this.basicForm2
|
|
|
sparams.sysMaterialMedcineItemApply = this.sysMaterialMedcineItemApply
|
|
|
console.log('提交参数', sparams)
|
|
|
- this.$refs['basic'].validate((valid) => {
|
|
|
- if (valid) {
|
|
|
+ const form1=new Promise((resolve,reject)=>{
|
|
|
+ this.$refs['basic'].validate(valid => {
|
|
|
+ if(valid) resolve()
|
|
|
+ })
|
|
|
+ })
|
|
|
+ const form2=new Promise((resolve,reject)=>{
|
|
|
+ this.$refs['basic2'].validate(valid => {
|
|
|
+ if(valid) resolve()
|
|
|
+ })
|
|
|
+ })
|
|
|
+ Promise.all([form1, form2]).then(() => {
|
|
|
editReq(sparams).then(res => {
|
|
|
if(res.code === 200) {
|
|
|
this.$message({
|
|
|
@@ -1466,7 +1476,6 @@ export default {
|
|
|
this.back()
|
|
|
}
|
|
|
})
|
|
|
- }
|
|
|
})
|
|
|
} else {
|
|
|
// alert('保存传status：0')
|
|
|
@@ -1477,8 +1486,17 @@ export default {
|
|
|
sparams.sysMaterialMedcineApply = this.basicForm2
|
|
|
sparams.sysMaterialMedcineItemApply = this.sysMaterialMedcineItemApply
|
|
|
console.log('保存参数', sparams)
|
|
|
- this.$refs['basic'].validate((valid) => {
|
|
|
- if(valid) {
|
|
|
+ const form1=new Promise((resolve,reject)=>{
|
|
|
+ this.$refs['basic'].validate(valid => {
|
|
|
+ if(valid) resolve()
|
|
|
+ })
|
|
|
+ })
|
|
|
+ const form2=new Promise((resolve,reject)=>{
|
|
|
+ this.$refs['basic2'].validate(valid => {
|
|
|
+ if(valid) resolve()
|
|
|
+ })
|
|
|
+ })
|
|
|
+ Promise.all([form1, form2]).then(() => {
|
|
|
addReq(sparams).then(res => {
|
|
|
if(res.code === 200) {
|
|
|
this.$message({
|
|
|
@@ -1488,7 +1506,6 @@ export default {
|
|
|
this.back()
|
|
|
}
|
|
|
})
|
|
|
- }
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
@@ -1501,8 +1518,17 @@ export default {
|
|
|
sparams.sysMaterialMedcineApply = this.basicForm2
|
|
|
sparams.sysMaterialMedcineItemApply = this.sysMaterialMedcineItemApply
|
|
|
console.log('提交参数', sparams)
|
|
|
- this.$refs['basic'].validate((valid) => {
|
|
|
- if(valid) {
|
|
|
+ const form1=new Promise((resolve,reject)=>{
|
|
|
+ this.$refs['basic'].validate(valid => {
|
|
|
+ if(valid) resolve()
|
|
|
+ })
|
|
|
+ })
|
|
|
+ const form2=new Promise((resolve,reject)=>{
|
|
|
+ this.$refs['basic2'].validate(valid => {
|
|
|
+ if(valid) resolve()
|
|
|
+ })
|
|
|
+ })
|
|
|
+ Promise.all([form1, form2]).then(() => {
|
|
|
// 提交时候要维护物料类别
|
|
|
if (this.sysMaterialMedcineItemApply.length !== 0) {
|
|
|
editReq(sparams).then(res => {
|
|
|
@@ -1520,8 +1546,7 @@ export default {
|
|
|
type: 'warning'
|
|
|
});
|
|
|
}
|
|
|
- }
|
|
|
- })
|
|
|
+ })
|
|
|
},
|
|
|
back() {
|
|
|
this.$emit('jugislist', true)
|
|
|
@@ -1684,7 +1709,7 @@ export default {
|
|
|
// 业务部门显示列表
|
|
|
chooseDepart () {
|
|
|
this.$refs.departs.blur()
|
|
|
- this.$refs.depart.init('0')
|
|
|
+ this.$refs.depart.init('0', this.basicForm.purchasingOrganization)
|
|
|
},
|
|
|
// 选择医药类别
|
|
|
acceptDrug (selections) {
|
黄梓星