|
|
@@ -1015,12 +1015,16 @@
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="分佣方式" prop="brokerageType" >
|
|
|
- <el-radio v-model="form.brokerageType" label="1">每盒</el-radio>
|
|
|
- <el-radio v-model="form.brokerageType" label="2">总价</el-radio>
|
|
|
+ <el-form-item label="分佣方式" prop="brokerageType">
|
|
|
+ <el-radio-group v-model="form.brokerageType" disabled>
|
|
|
+ <el-radio label="1" >每盒</el-radio>
|
|
|
+ <el-radio label="2" >总价</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+
|
|
|
</el-row>
|
|
|
<el-form-item label="配送方式" prop="shippingType">
|
|
|
<el-checkbox-group v-model="form.shippingType" size="medium">
|
|
|
@@ -1664,34 +1668,23 @@ export default {
|
|
|
const storeId = row.storeId || this.ids
|
|
|
getStore(storeId).then(response => {
|
|
|
this.form = response.data;
|
|
|
+
|
|
|
+ // 确保 brokerageType 是字符串类型
|
|
|
+ if (this.form.brokerageType) {
|
|
|
+ this.form.brokerageType = this.form.brokerageType.toString();
|
|
|
+ }
|
|
|
// 如果后端返回的数据中没有这个字段，则设置默认值
|
|
|
if (this.form.drugScopeHasFrozen === undefined) {
|
|
|
this.form.drugScopeHasFrozen = null;
|
|
|
}
|
|
|
- if(this.form.isBusinessLicensePermanent == 1){
|
|
|
- this.switchValue = true;
|
|
|
- }
|
|
|
- if(this.form.isMedicalDevice1ExpiryPermanent == 1){
|
|
|
- this.switchMedicalValue = true;
|
|
|
- }
|
|
|
- if(this.form.isMedicalDevice2ExpiryPermanent == 1){
|
|
|
- this.medicalDevice2ExpiryValue = true;
|
|
|
- }
|
|
|
- if(this.form.isMedicalLicenseExpiryPermanent == 1){
|
|
|
- this.medicalLicenseExpiryValue = true;
|
|
|
- }
|
|
|
- if(this.form.isEffectivePermanent1 == 1){
|
|
|
- this.medicalLicenseExpiryValue1 = true;
|
|
|
- }
|
|
|
- if(this.form.isFoodLicenseExpiryPermanent == 1){
|
|
|
- this.foodLicenseExpiryValue = true;
|
|
|
- }
|
|
|
- if(this.form.isEffectivePermanent2 == 1){
|
|
|
- this.medicalLicenseExpiryValue2 = true;
|
|
|
- }
|
|
|
- if(this.form.isEffectivePermanent3 == 1){
|
|
|
- this.medicalLicenseExpiryValue3 = true;
|
|
|
- }
|
|
|
+ this.switchValue = this.form.isBusinessLicensePermanent == 1;
|
|
|
+ this.switchMedicalValue = this.form.isMedicalDevice1ExpiryPermanent == 1
|
|
|
+ this.medicalDevice2ExpiryValue = this.form.isMedicalDevice2ExpiryPermanent == 1
|
|
|
+ this.medicalLicenseExpiryValue = this.form.isMedicalLicenseExpiryPermanent == 1
|
|
|
+ this.medicalLicenseExpiryValue1 = this.form.isEffectivePermanent1 == 1;
|
|
|
+ this.foodLicenseExpiryValue = this.form.isFoodLicenseExpiryPermanent == 1;
|
|
|
+ this.medicalLicenseExpiryValue2 = this.form.isEffectivePermanent2 == 1;
|
|
|
+ this.medicalLicenseExpiryValue3 = this.form.isEffectivePermanent3 == 1
|
|
|
this.open = true;
|
|
|
this.title = this.isViewMode ? "店铺详情" : "修改店铺";
|
|
|
|
|
|
@@ -1761,10 +1754,12 @@ export default {
|
|
|
validateLicenses() {
|
|
|
const currentDate = new Date();
|
|
|
//营业执照证
|
|
|
- const businessLicenseExpireEndDate = new Date(this.form.businessLicenseExpire[1]);
|
|
|
- if (businessLicenseExpireEndDate < currentDate) {
|
|
|
- this.$message.warning('营业执照证已过期，无法提交');
|
|
|
- return false;
|
|
|
+ if(!this.switchValue){
|
|
|
+ const businessLicenseExpireEndDate = new Date(this.form.businessLicenseExpire[1]);
|
|
|
+ if (businessLicenseExpireEndDate < currentDate) {
|
|
|
+ this.$message.warning('营业执照证已过期，无法提交');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
}
|
|
|
//药品经营许
|
|
|
const drugLicenseExpiryEndDate = new Date(this.form.drugLicenseExpiry[1]);
|
