From 0f43183f986f0ed314647687c73da5a4493d2611 Mon Sep 17 00:00:00 2001 From: yangfeng <wanwan926_4@163.com> Date: 星期一, 16 十月 2023 20:36:15 +0800 Subject: [PATCH] bug修复(5219 5233) --- src/views/service/serviceFeeManage/AddServiceFeeManageDialog.vue | 510 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 352 insertions(+), 158 deletions(-) diff --git a/src/views/service/serviceFeeManage/AddServiceFeeManageDialog.vue b/src/views/service/serviceFeeManage/AddServiceFeeManageDialog.vue index b67ce49..3393dc8 100644 --- a/src/views/service/serviceFeeManage/AddServiceFeeManageDialog.vue +++ b/src/views/service/serviceFeeManage/AddServiceFeeManageDialog.vue @@ -22,89 +22,146 @@ <div class="basic-info-view"> <el-row> <el-col :span="12"> - <el-form-item label="瀹㈡埛鍚嶇О" prop="customName"> + <el-form-item label="瀹㈡埛鍚嶇О" prop="client_name"> <div class="custom-name"> - <el-input v-model="editConfig.infomation.customName"></el-input> - <div class="common-select-btn"><i class="el-icon-house" title="宸ュ晢鏌ヨ"></i></div> - <div class="common-select-btn"><i class="el-icon-search" title="鏌ラ噸"></i></div> + <el-autocomplete + v-model="editConfig.infomation.client_name" + :fetch-suggestions="querySearchAsync" + value-key="name" + @select="handleSelectClient" + ></el-autocomplete> + <div class="common-select-btn" @click="selClientClick"> + <i class="el-icon-circle-plus-outline" title="閫夋嫨"></i> + </div> + <div + v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0" + class="common-select-btn" + @click="clearupClient" + > + <i class="el-icon-remove-outline" title="娓呴櫎"></i> + </div> </div> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鏈嶅姟鏀惰垂浜�" prop="serviceCharger"> + <el-form-item label="鏈嶅姟鏀惰垂浜�" prop="member_id"> <el-select - v-model="editConfig.infomation.serviceCharger" + v-model="editConfig.infomation.member_id" placeholder="璇烽�夋嫨" size="mini" style="width: 63%" > <el-option - v-for="item in serviceChargerOptions" - :key="item.value" - :label="item.label" - :value="item.value" + v-for="item in memberOptions" + :key="item.id" + :label="item.username" + :value="item.id" ></el-option> </el-select> </el-form-item> </el-col> <el-col v-if="isUnflod" :span="12"> - <el-form-item label="瀹㈡埛缂栧彿" prop="customNumber"> - <el-input v-model="editConfig.infomation.customNumber"></el-input> - </el-form-item> - </el-col> - <el-col v-if="isUnflod" :span="12"> - <el-form-item label="瀹㈡埛瑙勬ā" prop="customerSize"> - <CommonSelectView - :common-value="editConfig.infomation.customerSize" - :common-options="customerSizeOptions" - /> + <el-form-item label="瀹㈡埛缂栧彿" prop="number"> + <el-input v-model="editConfig.infomation.number"></el-input> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="瀹㈡埛鐘舵��" prop="customStatus"> - <CommonSelectView - :common-value="editConfig.infomation.customStatus" - :common-options="customStatusOptions" - /> - </el-form-item> - </el-col> - <el-col v-if="isUnflod" :span="12"> - <el-form-item label="閲嶈绾у埆" prop="importantLevel"> - <CommonSelectView - :common-value="editConfig.infomation.importantLevel" - :common-options="importantLevelOptions" - /> + <el-form-item label="瀹㈡埛瑙勬ā" prop="enterprise_scale_id"> + <div class="common-select"> + <el-select + v-model="editConfig.infomation.enterprise_scale_id" + placeholder="璇烽�夋嫨" + class="common-select-sel" + size="mini" + > + <el-option + v-for="item in enterpriseScaleOptions" + :key="item.id" + :label="item.name" + :value="item.id" + > + </el-option> + </el-select> + <div class="common-select-btn"><i class="el-icon-setting"></i></div> + </div> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="瀹㈡埛鏉ユ簮" prop="customSource"> - <CommonSelectView - :common-value="editConfig.infomation.customSource" - :common-options="customSourceOptions" - /> + <el-form-item label="瀹㈡埛鐘舵��" prop="client_status_id"> + <div class="common-select"> + <el-select + v-model="editConfig.infomation.client_status_id" + placeholder="璇烽�夋嫨" + class="common-select-sel" + size="mini" + > + <el-option v-for="item in clientStatusOptions" :key="item.id" :label="item.name" :value="item.id"> + </el-option> + </el-select> + <div class="common-select-btn"><i class="el-icon-setting"></i></div> + </div> </el-form-item> </el-col> - <el-col v-if="isUnflod" :span="12"> - <el-form-item label="瀹㈡埛绫诲瀷" prop="customType"> - <CommonSelectView - :common-value="editConfig.infomation.customType" - :common-options="customTypeOptions" - /> - </el-form-item> - </el-col> - <el-col v-if="isUnflod" :span="12"> - <el-form-item label="鏈嶅姟浠h〃" prop="serviceAgent"> + <el-col :span="12"> + <el-form-item label="閲嶈绾у埆" prop="client_level_id"> <el-select - v-model="editConfig.infomation.serviceAgent" + v-model="editConfig.infomation.client_level_id" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 63%" + > + <el-option v-for="item in importantLevelOptions" :key="item.id" :label="item.name" :value="item.id"> + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="瀹㈡埛鏉ユ簮" prop="client_origin_id"> + <div class="common-select"> + <el-select + v-model="editConfig.infomation.client_origin_id" + placeholder="璇烽�夋嫨" + class="common-select-sel" + size="mini" + > + <el-option v-for="item in clientSourceOptions" :key="item.id" :label="item.name" :value="item.id"> + </el-option> + </el-select> + <div class="common-select-btn"> + <i class="el-icon-setting"></i> + </div> + </div> + </el-form-item> + </el-col> + <el-col v-if="isUnflod" :span="12"> + <el-form-item label="瀹㈡埛绫诲瀷" prop="client_type_id"> + <div class="common-select"> + <el-select + v-model="editConfig.infomation.client_type_id" + placeholder="璇烽�夋嫨" + class="common-select-sel" + size="mini" + > + <el-option v-for="item in clientTypeOptions" :key="item.id" :label="item.name" :value="item.id"> + </el-option> + </el-select> + <div class="common-select-btn"><i class="el-icon-setting"></i></div> + </div> + </el-form-item> + </el-col> + <el-col v-if="isUnflod" :span="12"> + <el-form-item label="鏈嶅姟浠h〃" prop="service_member_id"> + <el-select + v-model="editConfig.infomation.service_member_id" placeholder="璇烽�夋嫨" size="mini" style="width: 63%" > <el-option - v-for="item in serviceAgentOptions" - :key="item.value" - :label="item.label" - :value="item.value" + v-for="item in serviceMemberOptions" + :key="item.id" + :label="item.username" + :value="item.id" > </el-option> </el-select> @@ -117,8 +174,8 @@ <div class="basic-info-view"> <el-row> <el-col :span="12"> - <el-form-item label="鏈�鏅氭湇鍔″埌鏈熸棩" prop="latestServiceDate"> - <el-date-picker v-model="editConfig.infomation.latestServiceDate" type="date" placeholder="閫夋嫨鏃ユ湡"> + <el-form-item label="鏈�鏅氭湇鍔″埌鏈熸棩" prop="latest_date"> + <el-date-picker v-model="editConfig.infomation.latest_date" type="date" placeholder="閫夋嫨鏃ユ湡"> </el-date-picker> </el-form-item> </el-col> @@ -129,32 +186,32 @@ <div class="basic-info-view"> <el-row> <el-col :span="12"> - <el-form-item label="鑱旂郴浜哄鍚�" prop="contactName"> - <el-input v-model="editConfig.infomation.contactName"></el-input> + <el-form-item label="鑱旂郴浜哄鍚�" prop="contact_name"> + <el-input v-model="editConfig.infomation.contact_name"></el-input> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鑱旂郴浜鸿亴鍔�" prop="duties"> - <el-input v-model="editConfig.infomation.duties"></el-input> + <el-form-item label="鑱旂郴浜鸿亴鍔�" prop="position"> + <el-input v-model="editConfig.infomation.position"></el-input> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鑱旂郴浜烘墜鏈�" prop="phoneNumber"> - <el-input v-model="editConfig.infomation.phoneNumber"></el-input> + <el-form-item label="鑱旂郴浜烘墜鏈�" prop="contact_phone"> + <el-input v-model="editConfig.infomation.contact_phone"></el-input> </el-form-item> </el-col> - <el-col v-if="isUnflod" :span="12"> - <el-form-item label="鑱旂郴浜篍mail" prop="contactsEmail"> - <el-input v-model="editConfig.infomation.contactsEmail"></el-input> + <el-col :span="12"> + <el-form-item label="鑱旂郴浜篍mail" prop="contact_email"> + <el-input v-model="editConfig.infomation.contact_email"></el-input> </el-form-item> </el-col> </el-row> </div> <!-- 鍦板潃淇℃伅 --> <div v-if="isUnflod" class="basic-info-title">鍦板潃淇℃伅</div> - <div class="address-view"> + <div class="basic-info-view"> <el-row> - <el-col v-if="isUnflod" :span="24"> + <!-- <el-col v-if="isUnflod" :span="24"> <el-form-item label="瀹氫綅" prop="position"> <el-input v-model="editConfig.infomation.position" @@ -166,34 +223,78 @@ <el-form-item label="鍦板浘" prop="map"> <div style="height: 100px"></div> </el-form-item> - </el-col> - <el-col v-if="isUnflod" :span="12"> - <el-form-item label="鍥藉" prop="country"> - <CommonSelectView :common-value="editConfig.infomation.country" :common-options="countryOptions" /> + </el-col> --> + <el-col :span="12"> + <el-form-item label="鍥藉" prop="country_id"> + <div class="common-select"> + <el-select + v-model="editConfig.infomation.country_id" + placeholder="璇烽�夋嫨" + class="common-select-sel" + size="mini" + > + <el-option v-for="item in countryOptions" :key="item.id" :label="item.name" :value="item.id"> + </el-option> + </el-select> + <div class="common-select-btn"><i class="el-icon-setting"></i></div> + </div> </el-form-item> </el-col> - <el-col v-if="isUnflod" :span="12"> - <el-form-item label="鐪佷唤" prop="province"> - <CommonSelectView :common-value="editConfig.infomation.province" :common-options="provinceOptions" /> + <el-col :span="12"> + <el-form-item label="鐪佷唤" prop="province_id"> + <div class="common-select"> + <el-select + v-model="editConfig.infomation.province_id" + placeholder="璇烽�夋嫨" + class="common-select-sel" + size="mini" + > + <el-option v-for="item in provinceOptions" :key="item.id" :label="item.name" :value="item.id"> + </el-option> + </el-select> + <div class="common-select-btn"><i class="el-icon-setting"></i></div> + </div> </el-form-item> </el-col> - <el-col v-if="isUnflod" :span="12"> - <el-form-item label="鍩庡競" prop="city"> - <CommonSelectView :common-value="editConfig.infomation.city" :common-options="cityOptions" /> + <el-col :span="12"> + <el-form-item label="鍩庡競" prop="city_id"> + <div class="common-select"> + <el-select + v-model="editConfig.infomation.city_id" + placeholder="璇烽�夋嫨" + class="common-select-sel" + size="mini" + > + <el-option v-for="item in cityOptions" :key="item.id" :label="item.name" :value="item.id"> + </el-option> + </el-select> + <div class="common-select-btn"><i class="el-icon-setting"></i></div> + </div> </el-form-item> </el-col> - <el-col v-if="isUnflod" :span="12"> - <el-form-item label="鍖哄煙" prop="region"> - <CommonSelectView :common-value="editConfig.infomation.region" :common-options="regionOptions" /> + <el-col :span="12"> + <el-form-item label="鍖哄煙" prop="region_id"> + <div class="common-select"> + <el-select + v-model="editConfig.infomation.region_id" + placeholder="璇烽�夋嫨" + class="common-select-sel" + size="mini" + > + <el-option v-for="item in regionOptions" :key="item.id" :label="item.name" :value="item.id"> + </el-option> + </el-select> + <div class="common-select-btn"><i class="el-icon-setting"></i></div> + </div> </el-form-item> </el-col> <el-col :span="24"> - <el-form-item label="璇︾粏鍦板潃" prop="address"> + <el-form-item label="璇︾粏鍦板潃" prop="detail_address"> <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="璇疯緭鍏ュ唴瀹�" - v-model="editConfig.infomation.address" + v-model="editConfig.infomation.detail_address" ></el-input> </el-form-item> </el-col> @@ -201,24 +302,58 @@ </div> <!-- 宸ュ晢淇℃伅 --> <div v-if="isUnflod" class="basic-info-title">宸ュ晢淇℃伅</div> - <div v-if="isUnflod" class="address-view"> + <div v-if="isUnflod" class="basic-info-view"> <el-row> <el-col :span="12"> - <el-form-item label="鎵�灞炶涓�" prop="industry"> - <CommonSelectView :common-value="editConfig.infomation.industry" :common-options="industryOptions" /> + <el-form-item label="鎵�灞炶涓�" prop="industry_id"> + <div class="common-select"> + <el-select + v-model="editConfig.infomation.industry_id" + placeholder="璇烽�夋嫨" + class="common-select-sel" + size="mini" + > + <el-option v-for="item in industryOptions" :key="item.id" :label="item.name" :value="item.id"> + </el-option> + </el-select> + <div class="common-select-btn"><i class="el-icon-setting"></i></div> + </div> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鍏徃鎬ц川" prop="companyNature"> - <CommonSelectView - :common-value="editConfig.infomation.companyNature" - :common-options="companyNatureOptions" - /> + <el-form-item label="鍏徃鎬ц川" prop="enterprise_nature_id"> + <div class="common-select"> + <el-select + v-model="editConfig.infomation.enterprise_nature_id" + placeholder="璇烽�夋嫨" + class="common-select-sel" + size="mini" + > + <el-option + v-for="item in enterpriseNatureOptions" + :key="item.id" + :label="item.name" + :value="item.id" + > + </el-option> + </el-select> + <div class="common-select-btn"><i class="el-icon-setting"></i></div> + </div> </el-form-item> </el-col> - <el-col :span="12"> + <!-- <el-col :span="12"> <el-form-item label="鍏徃缃戝潃" prop="companyWeb"> <el-input v-model="editConfig.infomation.companyWeb"></el-input> + </el-form-item> + </el-col> --> + <el-col :span="24"> + <el-form-item label="缁忚惀鑼冨洿" prop="business_scope"> + <el-input + type="textarea" + :autosize="{ minRows: 2, maxRows: 4 }" + placeholder="璇疯緭鍏ュ唴瀹�" + v-model="editConfig.infomation.business_scope" + ></el-input> </el-form-item> </el-col> </el-row> @@ -228,12 +363,12 @@ <div v-if="isUnflod" class="basic-info-view"> <el-row> <el-col :span="24"> - <el-form-item label="澶囨敞" prop="notes"> + <el-form-item label="澶囨敞" prop="remark"> <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder="璇疯緭鍏ュ唴瀹�" - v-model="editConfig.infomation.notes" + v-model="editConfig.infomation.remark" ></el-input> </el-form-item> </el-col> @@ -275,17 +410,23 @@ </div> </el-form> <div slot="footer" class="dialog-footer"> - <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆瓨</el-button> + <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button> <el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button> </div> + <!-- 閫夋嫨瀹㈡埛 --> + <SelectClientDialog + v-if="editSelectClientConfig.editVisible" + :edit-common-config="editSelectClientConfig" + @selClient="selClient" + /> </el-dialog> </div> </template> <script> -import CommonSelectView from "@/components/makepager/CommonSelectView" import { getAllData } from "@/api/client/client" -import { getAddSubOrder, getUpdateSubOrder } from "@/api/sales/subOrder" +import { getAddServiceFeeManage, getUpdateServiceFeeManage } from "@/api/serviceManage/serviceFeeManage" +import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog" export default { name: "AddServiceFeeManageDialog", props: { @@ -300,61 +441,47 @@ } } }, - components: { CommonSelectView }, - computed: {}, + components: { SelectClientDialog }, + computed: { + clientList() { + return this.$store.state.getClientName.clientList + } + }, data() { return { dialogWidth: "80%", editConfig: this.editCommonConfig, rules: { - customName: [{ required: true, message: "璇疯緭鍏ュ鎴峰悕绉�", trigger: "blur" }], - serviceCharger: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }], - customStatus: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }] + name: [{ required: true, message: "璇疯緭鍏ュ鎴峰悕绉�", trigger: "blur" }], + member_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }], + client_status_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }] }, - serviceChargerOptions: [ - // 鏈嶅姟鏀惰垂浜� - { value: "1", label: "BOSS" }, - { value: "2", label: "Mia" }, - { value: "3", label: "璐㈠姟" }, - { value: "4", label: "甯傚満" }, - { value: "5", label: "绯荤粺绠$悊鍛�" }, - { value: "6", label: "閿�鍞�" }, - { value: "7", label: "閿�鍞�荤洃" } - ], - customerSizeOptions: [], // 瀹㈡埛瑙勬ā - customStatusOptions: [], // 瀹㈡埛鐘舵�� + memberOptions: [], + enterpriseScaleOptions: [], // 瀹㈡埛瑙勬ā + clientStatusOptions: [], // 瀹㈡埛鐘舵�� importantLevelOptions: [], // 閲嶈绾у埆 - customSourceOptions: [], // 瀹㈡埛鏉ユ簮 - customTypeOptions: [], // 瀹㈡埛绫诲瀷 - serviceAgentOptions: [], // 鏈嶅姟浠h〃 + clientSourceOptions: [], // 瀹㈡埛鏉ユ簮 + clientTypeOptions: [], // 瀹㈡埛绫诲瀷 + serviceMemberOptions: [], // 鏈嶅姟浠h〃 industryOptions: [], // 鎵�灞炶涓� - companyNatureOptions: [], // 鍏徃鎬ц川 + enterpriseNatureOptions: [], // 鍏徃鎬ц川 - countryOptions: [{ value: "1", label: "涓浗" }], // 鍥藉 - provinceOptions: [ - { value: "1", label: "鍖椾含甯�" }, - { value: "2", label: "涓婃捣甯�" }, - { value: "3", label: "鍚夋灄鐪�" }, - { value: "4", label: "闄曡タ鐪�" } - ], // 鐪佷唤 - cityOptions: [ - { value: "1", label: "鍖椾含甯�" }, - { value: "2", label: "涓婃捣甯�" }, - { value: "3", label: "鍚夋灄甯�" }, - { value: "4", label: "瑗垮畨甯�" } - ], // 鍩庡競 - regionOptions: [ - { value: "1", label: "鏈濋槼鍖�" }, - { value: "2", label: "娴锋穩鍖�" }, - { value: "3", label: "閫氬窞鍖�" }, - { value: "4", label: "瑗垮煄鍖�" } - ], // 鍖哄煙 + countryOptions: [], // 鍥藉 + provinceOptions: [], // 鐪佷唤 + cityOptions: [], // 鍩庡競 + regionOptions: [], // 鍖哄煙 unflodCollapseStr: "鏀惰捣", - isUnflod: true + isUnflod: true, + editSelectClientConfig: { + editVisible: false, + title: "", + infomation: {} + } } }, created() { + this.$store.dispatch("geClient") this.getCommonData() }, methods: { @@ -362,6 +489,17 @@ getAllData() .then((res) => { this.memberOptions = res.data.member + this.serviceMemberOptions = res.data.member + this.clientSourceOptions = res.data.client_origin + this.clientStatusOptions = res.data.client_status + this.importantLevelOptions = res.data.client_level + this.enterpriseScaleOptions = res.data.enterprise_scale + this.clientTypeOptions = res.data.client_type + this.enterpriseNatureOptions = res.data.enterprise_nature + this.countryOptions = res.data.country + this.provinceOptions = res.data.province + this.cityOptions = res.data.city + this.regionOptions = res.data.region }) .catch((err) => { console.log(err) @@ -374,8 +512,9 @@ console.log(this.editConfig.infomation) const params = this.saveParams() console.log(params) + console.log(params) if (this.editConfig.title === "鏂板缓") { - getAddSubOrder(params) + getAddServiceFeeManage(params) .then((res) => { console.log(res) this.editConfig.visible = false @@ -391,7 +530,7 @@ console.log(err) }) } else { - getUpdateSubOrder(params) + getUpdateServiceFeeManage(params) .then((res) => { console.log(res) this.editConfig.visible = false @@ -417,26 +556,80 @@ let data = this.editConfig.infomation let params = { id: this.editConfig.title === "鏂板缓" ? 0 : data.id, - clientId: data.clientId || 0, - masterOrderId: data.masterOrderId || 0, - memberId: data.memberId || 0, + business_scope: data.business_scope || "", + city_id: parseInt(data.city_id) || 0, + client_level_id: parseInt(data.client_level_id) || 0, + client_origin_id: parseInt(data.client_origin_id) || 0, + client_status_id: parseInt(data.client_status_id) || 0, + client_type_id: parseInt(data.client_type_id) || 0, + contact: { + birthday: "", + city_id: 0, + client_id: 0, + country_id: 0, + desc: "", + email: data.contact_email || "", + is_first: true, + member_id: 0, + name: data.contact_name || "", + number: "", + phone: data.contact_phone || "", + position: data.position || "", + province_id: 0, + region_id: 0, + wechat: "" + }, + country_id: 0, + detail_address: data.detail_address || "", + enterprise_nature_id: data.enterprise_nature_id || 0, + enterprise_scale_id: data.enterprise_scale_id || 0, + file: data.file || "", + industry_id: data.industry_id || 0, + latest_date: data.latest_date || "", + latest_service_time: data.latest_service_time || "", + member_id: parseInt(data.member_id) || 0, + name: data.name || "", + next_visit_time: data.next_visit_time || "", number: data.number || "", - product: [ - { - amount: 0, - desc: "", - id: 0, - name: "", - number: "", - price: 0, - total: 0 - } - ] + province_id: 0, + region_id: 0, + registered_capital_id: data.registered_capital_id || 0, + registration_time: data.registration_time || "", + remark: data.remark || "", + representative: data.representative || "", + service_member_id: data.service_member_id || 0 } return params }, handleClose() { this.editConfig.visible = false + }, + // 閫夋嫨瀹㈡埛鐩稿叧鏂规硶 + querySearchAsync(queryString, cb) { + var restaurants = this.clientList + var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants + cb(results) + }, + createStateFilter(queryString) { + return (state) => { + return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0 + } + }, + handleSelectClient(item) { + this.editConfig.infomation.client_id = item.id + }, + selClientClick() { + this.editSelectClientConfig.editVisible = true + }, + selClient(row) { + console.log(row) + this.editConfig.infomation.client_name = row.name + this.editConfig.infomation.client_id = row.id + }, + // 娓呴櫎宸查�夋嫨鐢ㄦ埛 + clearupClient() { + this.editConfig.infomation.client_name = "" + this.editConfig.infomation.client_id = 0 }, // 娣诲姞闄勪欢 addAnnexClick() {}, @@ -472,17 +665,18 @@ .basic-info-view { margin-top: 10px; padding-right: 40px; - .custom-name { + .custom-name, + .common-select { display: flex; + .common-select-sel { + width: 270px; + } .common-select-btn { margin-left: 5px; - font-size: 18px; + font-size: 16px; + cursor: pointer; } } - } - .address-view { - margin-top: 10px; - padding-right: 40px; } .annex-view { display: flex; -- Gitblit v1.8.0