|
|
@@ -36,7 +36,7 @@ export default {
|
|
|
expressExecutor: [{required: true, message: '请选择配送方式'}],
|
|
|
consignee: [{validator: locationValidator('请输入收件电话')}],
|
|
|
contactNumber: [{validator: locationValidator('请输入收件电话')}],
|
|
|
- location: [{validator: locationValidator('请选择所属地域')}],
|
|
|
+ // location: [{validator: locationValidator('请选择所属地域')}],
|
|
|
address: [{required: true, message: '请输入详细地址'}],
|
|
|
},
|
|
|
|
|
|
@@ -151,6 +151,10 @@ export default {
|
|
|
const {medicines, ...model} = await getPrescriptionCore2(this.$props.id);
|
|
|
this.medicines = medicines.map(medicine => Object.assign(medicine, {subtotalMoney: this.calculationMedicinePrice(medicine)}));
|
|
|
this.model = transformNestedObjectToFlat(model);
|
|
|
+ if (!this.isCheck) {
|
|
|
+ this.model.id = null;
|
|
|
+ this.model.tackleTime = '';
|
|
|
+ }
|
|
|
} catch (e) {
|
|
|
this.cancel();
|
|
|
}
|
|
|
@@ -545,7 +549,7 @@ export default {
|
|
|
<el-col v-if="showPharmacy" :span="8">
|
|
|
<el-form-item label="药房" prop="yfId">
|
|
|
<el-select v-model="model.yfId" placeholder="请选择药房" clearable>
|
|
|
- <el-option v-for="item in pharmacyList" :key="dict.id" :label="dict.name" :value="dict.id"
|
|
|
+ <el-option v-for="item in pharmacyList" :key="item.id" :label="item.name" :value="item.id"
|
|
|
:disabled="item.disabled"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -934,9 +938,12 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-.el-input-number--medium:not(.full) {
|
|
|
- width: min-content;
|
|
|
- min-width: 100px;
|
|
|
+.el-input-number--medium {
|
|
|
+ width: auto;
|
|
|
+ &:not(.full) {
|
|
|
+ width: min-content;
|
|
|
+ min-width: 100px;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.el-form, .el-input, .el-select, .el-cascader {
|