diff --git a/dist/dev/mp-weixin/INDEX/binding/index.js b/dist/dev/mp-weixin/INDEX/binding/index.js index d38407c..bec3719 100644 --- a/dist/dev/mp-weixin/INDEX/binding/index.js +++ b/dist/dev/mp-weixin/INDEX/binding/index.js @@ -3,6 +3,11 @@ const common_vendor = require("../../common/vendor.js"); const gen_Enums = require("../../gen/Enums.js"); const INDEX_binding_method = require("./method.js"); const INDEX_binding_model = require("./model.js"); +require("../../common/libraries/apiLoading.js"); +require("../../gen/Apis.js"); +require("../../common/libraries/request.js"); +require("../../common/store/useWeAppAuthStore.js"); +require("../../common/libraries/naviHelper.js"); if (!Array) { const _easycom_hs_popup_project2 = common_vendor.resolveComponent("hs-popup-project"); const _easycom_hs_radio_cell_picker2 = common_vendor.resolveComponent("hs-radio-cell-picker"); @@ -29,78 +34,103 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ __name: "index", setup(__props) { return (_ctx, _cache) => { - var _a; - return { + var _a, _b; + return common_vendor.e({ a: common_vendor.o((_a = common_vendor.unref(INDEX_binding_method.method)) == null ? void 0 : _a.handleSelectProject), b: common_vendor.p({ title: "选择小区" }), c: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.type = $event), d: common_vendor.p({ - Enums: common_vendor.unref(gen_Enums.HouseOccupantsHouseRelationEnum), + Enums: common_vendor.unref(gen_Enums.HouseRegistersIdentityTypeEnum), title: "请选择您的身份", required: true, borderTop: true, valueModel: common_vendor.unref(INDEX_binding_model.model).formData.value.type }), - e: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.name = $event), - f: common_vendor.p({ - textAlign: "right", - modelValue: common_vendor.unref(INDEX_binding_model.model).formData.value.name - }), + e: common_vendor.unref(INDEX_binding_model.model).formData.value.type + }, common_vendor.unref(INDEX_binding_model.model).formData.value.type ? { + f: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.name = $event), g: common_vendor.p({ + textAlign: "right", + valueModel: common_vendor.unref(INDEX_binding_model.model).formData.value.name + }), + h: common_vendor.p({ title: "真实姓名", required: true, borderTop: true }), - h: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.phone = $event), - i: common_vendor.p({ - textAlign: "right", - modelValue: common_vendor.unref(INDEX_binding_model.model).formData.value.phone - }), + i: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.phone = $event), j: common_vendor.p({ + maxLength: "11", + textAlign: "right", + valueModel: common_vendor.unref(INDEX_binding_model.model).formData.value.phone + }), + k: common_vendor.p({ title: "手机号", required: true, borderTop: true - }), - k: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.name = $event), - l: common_vendor.p({ + }) + } : {}, { + l: common_vendor.unref(INDEX_binding_model.model).formData.value.type + }, common_vendor.unref(INDEX_binding_model.model).formData.value.type ? common_vendor.e({ + m: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.id_card = $event), + n: common_vendor.p({ textAlign: "right", - modelValue: common_vendor.unref(INDEX_binding_model.model).formData.value.name + valueModel: common_vendor.unref(INDEX_binding_model.model).formData.value.id_card }), - m: common_vendor.p({ + o: common_vendor.p({ title: "身份证号", required: true }), - n: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.card_front_image = $event), - o: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.card_back_image = $event), - p: common_vendor.p({ + p: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.card_front_image = $event), + q: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.card_back_image = $event), + r: common_vendor.p({ required: true, borderTop: true, valueFrontModel: common_vendor.unref(INDEX_binding_model.model).formData.value.card_front_image, valueBackModel: common_vendor.unref(INDEX_binding_model.model).formData.value.card_back_image }), - q: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.ownership_info = $event), - r: common_vendor.p({ + s: common_vendor.unref(INDEX_binding_model.model).formData.value.type === "Owner" + }, common_vendor.unref(INDEX_binding_model.model).formData.value.type === "Owner" ? { + t: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.ownership_info = $event), + v: common_vendor.p({ title: "上传房产证", count: 10, size: 4, required: true, valueModel: common_vendor.unref(INDEX_binding_model.model).formData.value.ownership_info - }), - s: common_vendor.p({ + }) + } : {}) : {}, { + w: common_vendor.unref(INDEX_binding_model.model).formData.value.type + }, common_vendor.unref(INDEX_binding_model.model).formData.value.type ? common_vendor.e({ + x: common_vendor.unref(INDEX_binding_model.model).formData.value.is_live_in, + y: common_vendor.o( + //@ts-ignore + (...args) => { + var _a2, _b2; + return ((_a2 = common_vendor.unref(INDEX_binding_method.method)) == null ? void 0 : _a2.handleIsLiveIn) && ((_b2 = common_vendor.unref(INDEX_binding_method.method)) == null ? void 0 : _b2.handleIsLiveIn(...args)); + } + ), + z: common_vendor.p({ title: "是否入住该房屋", required: true }), - t: common_vendor.p({ + A: common_vendor.unref(INDEX_binding_model.model).formData.value.is_live_in + }, common_vendor.unref(INDEX_binding_model.model).formData.value.is_live_in ? { + B: common_vendor.o(($event) => common_vendor.unref(INDEX_binding_model.model).formData.value.move_in_date = $event), + C: common_vendor.p({ title: "入住时间", borderTop: true, - isLink: true - }), - v: common_vendor.p({ + isLink: true, + valueModel: common_vendor.unref(INDEX_binding_model.model).formData.value.move_in_date + }) + } : {}) : {}, { + D: common_vendor.o((_b = common_vendor.unref(INDEX_binding_method.method)) == null ? void 0 : _b.handleSubmit), + E: common_vendor.p({ btnParimaryName: "绑定房屋" }) - }; + }); }; } }); diff --git a/dist/dev/mp-weixin/INDEX/binding/index.wxml b/dist/dev/mp-weixin/INDEX/binding/index.wxml index 97d5f2a..ca36467 100644 --- a/dist/dev/mp-weixin/INDEX/binding/index.wxml +++ b/dist/dev/mp-weixin/INDEX/binding/index.wxml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/dist/dev/mp-weixin/INDEX/binding/method.js b/dist/dev/mp-weixin/INDEX/binding/method.js index 7b2f9ec..e43a5e0 100644 --- a/dist/dev/mp-weixin/INDEX/binding/method.js +++ b/dist/dev/mp-weixin/INDEX/binding/method.js @@ -1,12 +1,29 @@ "use strict"; require("../../common/vendor.js"); const INDEX_binding_model = require("./model.js"); +const common_libraries_apiLoading = require("../../common/libraries/apiLoading.js"); +const gen_Apis = require("../../gen/Apis.js"); +const common_libraries_naviHelper = require("../../common/libraries/naviHelper.js"); const method = { handleSelectProject: (e) => { - INDEX_binding_model.model.formData.value.asset_project_id = e == null ? void 0 : e.id; + var _a; + if (e[3]) { + INDEX_binding_model.model.formData.value.asset_houses_id = (_a = e[3]) == null ? void 0 : _a.id; + } + console.log(e, "e"); }, - handleSelectHouse: (e) => { - INDEX_binding_model.model.formData.value.asset_houses_id = e == null ? void 0 : e.id; + handleIsLiveIn(e) { + var _a; + INDEX_binding_model.model.formData.value.is_live_in = (_a = e == null ? void 0 : e.detail) == null ? void 0 : _a.value; + console.log(e, "e"); + }, + handleSubmit: (e) => { + var _a; + console.log((_a = INDEX_binding_model.model) == null ? void 0 : _a.formData.value, "formData"); + common_libraries_apiLoading.getApiLoading(gen_Apis.Apis.Archive.HouseRegisters.Store, { ...INDEX_binding_model.model.formData.value, customer_info: [INDEX_binding_model.model.formData.value] }).then((res) => { + common_libraries_naviHelper.showToastBack("提交成功!", 1, true); + console.log(res); + }); } }; exports.method = method; diff --git a/dist/dev/mp-weixin/INDEX/binding/model.js b/dist/dev/mp-weixin/INDEX/binding/model.js index f358d05..d43637b 100644 --- a/dist/dev/mp-weixin/INDEX/binding/model.js +++ b/dist/dev/mp-weixin/INDEX/binding/model.js @@ -14,7 +14,10 @@ const model = { customer_type: "", house_status: "", usage_plan: "", - ownership_info: [] + ownership_info: [], + id_card: "", + move_in_date: "", + is_live_in: true }) }; exports.model = model; diff --git a/dist/dev/mp-weixin/common/libraries/naviHelper.js b/dist/dev/mp-weixin/common/libraries/naviHelper.js index 1f91dd2..abde4d7 100644 --- a/dist/dev/mp-weixin/common/libraries/naviHelper.js +++ b/dist/dev/mp-weixin/common/libraries/naviHelper.js @@ -3,4 +3,19 @@ const common_vendor = require("../vendor.js"); function goto(url) { common_vendor.index.navigateTo({ url, fail: () => common_vendor.index.switchTab({ url }) }); } +function showToastBack(label, delta = 1, back = true) { + common_vendor.index.showToast({ + title: label || "提交成功!", + duration: 1e3, + icon: "none", + success() { + if (back) { + setTimeout(() => { + common_vendor.index.navigateBack({ delta }); + }, 1e3); + } + } + }); +} exports.goto = goto; +exports.showToastBack = showToastBack; diff --git a/dist/dev/mp-weixin/components/hs-popup-project/hs-popup-project.js b/dist/dev/mp-weixin/components/hs-popup-project/hs-popup-project.js index 936b9d4..6478821 100644 --- a/dist/dev/mp-weixin/components/hs-popup-project/hs-popup-project.js +++ b/dist/dev/mp-weixin/components/hs-popup-project/hs-popup-project.js @@ -35,7 +35,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ const pickerListProject = common_vendor.ref([]); const pickerListBuilding = common_vendor.ref([]); const pickerListUnit = common_vendor.ref([]); - common_vendor.ref([]); + const pickerListHouse = common_vendor.ref([]); + const showProjectName = common_vendor.ref(""); const popupShow = common_vendor.ref(false); const currentValue = common_vendor.ref(0); const itemsList = common_vendor.ref([{ name: "小区" }]); @@ -63,6 +64,23 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ currentValue.value = e == null ? void 0 : e.index; console.log(e, "eee"); }; + common_vendor.watch(() => currentValue.value, (e) => { + handleTransfer(e); + }); + const handleTransfer = (idx) => { + if (idx === 0) { + getPickerList(); + } + if (idx === 1) { + handleGetBuilding(selectValueEd.value[0]); + } + if (idx === 2) { + handleGetUnit(selectValueEd.value[1]); + } + if (idx === 3) { + handleGetHouse(selectValueEd.value[2]); + } + }; const getPickerList = () => { common_libraries_apiLoading.getApiLoading(gen_Apis.Apis.Asset.AssetHouses.SelectProject, { name: searchValue.value, ...formData.value }).then((res) => { pickerListProject.value = res == null ? void 0 : res.data; @@ -74,7 +92,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ currentValue.value = 1; itemsList.value = [{ name: "小区" }, { name: "楼栋" }]; selectValueEd.value[0] = i; - handleGetBuilding(i); }; const handleGetBuilding = (data) => { common_libraries_apiLoading.getApiLoading(gen_Apis.Apis.Asset.AssetHouses.SelectBuilding, { asset_projects_id: data == null ? void 0 : data.id, name: searchValue.value, ...formData.value }).then((res) => { @@ -87,7 +104,6 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ currentValue.value = 2; itemsList.value = [{ name: "小区" }, { name: "楼栋" }, { name: "单元" }]; selectValueEd.value[1] = i; - handleGetUnit(i); }; const handleGetUnit = (data) => { var _a; @@ -102,8 +118,22 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ itemsList.value = [{ name: "小区" }, { name: "楼栋" }, { name: "单元" }, { name: "房屋" }]; selectValueEd.value[2] = i; }; + const handleGetHouse = (data) => { + var _a, _b; + common_libraries_apiLoading.getApiLoading(gen_Apis.Apis.Asset.AssetHouses.SelectHouse, { asset_projects_id: (_a = selectValueEd.value[0]) == null ? void 0 : _a.id, asset_buildings_id: (_b = selectValueEd.value[1]) == null ? void 0 : _b.id, asset_units_id: data == null ? void 0 : data.id, name: searchValue.value, ...formData.value }).then((res) => { + pickerListHouse.value = res == null ? void 0 : res.data; + pickerList.value = res == null ? void 0 : res.data; + console.log(res); + }); + }; + const onSelectHouse = (i) => { + selectValueEd.value[3] = i; + showProjectName.value = selectValueEd == null ? void 0 : selectValueEd.value.map((res) => res == null ? void 0 : res.name).join(""); + emit("change", selectValueEd.value); + onPopupShow(); + }; return (_ctx, _cache) => { - var _a, _b, _c; + var _a, _b; return common_vendor.e({ a: common_vendor.o(onPopupShow), b: common_vendor.p({ @@ -112,7 +142,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ isPlaceholder: true, required: true, borderTop: true, - value: (_a = selectEd.value) == null ? void 0 : _a.name + value: showProjectName.value }), c: common_vendor.o([ ($event) => searchValue.value = $event.detail.value, @@ -132,8 +162,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ current: currentValue.value || 0 }) } : {}, { - i: !((_b = pickerList.value) == null ? void 0 : _b.length) - }, !((_c = pickerList.value) == null ? void 0 : _c.length) ? {} : {}, { + i: !((_a = pickerList.value) == null ? void 0 : _a.length) + }, !((_b = pickerList.value) == null ? void 0 : _b.length) ? {} : {}, { j: currentValue.value === 0 }, currentValue.value === 0 ? { k: common_vendor.f(pickerListProject.value, (i, index, i0) => { @@ -194,8 +224,28 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({ }); }) } : {}, { - p: common_vendor.o(onPopupShow), - q: common_vendor.p({ + p: currentValue.value === 3 + }, currentValue.value === 3 ? { + q: common_vendor.f(pickerListHouse.value, (i, index, i0) => { + var _a2, _b2; + return common_vendor.e({ + a: common_vendor.t(i == null ? void 0 : i.name), + b: ((_a2 = selectEd.value) == null ? void 0 : _a2.id) === (i == null ? void 0 : i.id) + }, ((_b2 = selectEd.value) == null ? void 0 : _b2.id) === (i == null ? void 0 : i.id) ? { + c: "7ecd4980-7-" + i0 + ",7ecd4980-1", + d: common_vendor.p({ + type: "checkmarkempty", + size: "20", + color: "#FBA60D" + }) + } : {}, { + e: `key_${index}`, + f: common_vendor.o(($event) => onSelectHouse(i), `key_${index}`) + }); + }) + } : {}, { + r: common_vendor.o(onPopupShow), + s: common_vendor.p({ show: popupShow.value, mode: "bottom", closeable: true, diff --git a/dist/dev/mp-weixin/components/hs-popup-project/hs-popup-project.wxml b/dist/dev/mp-weixin/components/hs-popup-project/hs-popup-project.wxml index 928b8b2..cc33fbb 100644 --- a/dist/dev/mp-weixin/components/hs-popup-project/hs-popup-project.wxml +++ b/dist/dev/mp-weixin/components/hs-popup-project/hs-popup-project.wxml @@ -1 +1 @@ - 选择小区 {{i.a}}{{i.a}}{{i.a}} \ No newline at end of file + 选择小区 {{i.a}}{{i.a}}{{i.a}}{{i.a}} \ No newline at end of file diff --git a/dist/dev/mp-weixin/components/hs-radio-cell-picker/hs-radio-cell-picker.wxss b/dist/dev/mp-weixin/components/hs-radio-cell-picker/hs-radio-cell-picker.wxss index 39d68d4..80c8446 100644 --- a/dist/dev/mp-weixin/components/hs-radio-cell-picker/hs-radio-cell-picker.wxss +++ b/dist/dev/mp-weixin/components/hs-radio-cell-picker/hs-radio-cell-picker.wxss @@ -1,5 +1,5 @@ .cell_content.data-v-565e829c { - padding: 10rpx 0; + padding: 16rpx 0; display: flex; align-items: center; justify-content: space-between; diff --git a/dist/dev/mp-weixin/gen/Apis.js b/dist/dev/mp-weixin/gen/Apis.js index 0b2713d..9a6ab88 100644 --- a/dist/dev/mp-weixin/gen/Apis.js +++ b/dist/dev/mp-weixin/gen/Apis.js @@ -71,6 +71,16 @@ const Apis = { } } }, + Grid: { + Grids: { + GetHousekeeper(data) { + return common_libraries_request.request("customer/grid/grids/get_housekeeper", { data }); + }, + Show(data) { + return common_libraries_request.request("customer/grid/grids/show", { data }); + } + } + }, HouseOrder: { HouseOrders: { List(data) { diff --git a/dist/dev/mp-weixin/gen/Enums.js b/dist/dev/mp-weixin/gen/Enums.js index 3db2183..d6c4293 100644 --- a/dist/dev/mp-weixin/gen/Enums.js +++ b/dist/dev/mp-weixin/gen/Enums.js @@ -1,7 +1,7 @@ "use strict"; -const HouseOccupantsHouseRelationEnum = { +const HouseRegistersIdentityTypeEnum = { "Owner": { "text": "产权人", "color": "#2db7f5", "value": "Owner" }, - "Resident": { "text": "住户", "color": "#87d068", "value": "Resident" }, - "Tenant": { "text": "租客", "color": "#fa8c16", "value": "Tenant" } + "Tenant": { "text": "租客", "color": "#87d068", "value": "Tenant" }, + "CoResident": { "text": "同住人(亲属)", "color": "#108ee9", "value": "CoResident" } }; -exports.HouseOccupantsHouseRelationEnum = HouseOccupantsHouseRelationEnum; +exports.HouseRegistersIdentityTypeEnum = HouseRegistersIdentityTypeEnum; diff --git a/src/INDEX/binding/index.vue b/src/INDEX/binding/index.vue index 7000728..361266a 100644 --- a/src/INDEX/binding/index.vue +++ b/src/INDEX/binding/index.vue @@ -3,34 +3,37 @@ - - - - - - - + + + - + - + - + - + - + - + - + diff --git a/src/INDEX/binding/method.ts b/src/INDEX/binding/method.ts index e4eef4b..6a7c9d0 100644 --- a/src/INDEX/binding/method.ts +++ b/src/INDEX/binding/method.ts @@ -1,10 +1,24 @@ import { ref } from "vue"; import model from "./model"; +import { getApiLoading } from "@/common/libraries/apiLoading"; +import { Apis } from "@/gen/Apis"; +import { showToastBack } from "@/common/libraries/naviHelper"; export default { handleSelectProject: (e:any) => { - model.formData.value.asset_project_id = e?.id + if(e[3]){ + model.formData.value.asset_houses_id = e[3]?.id + } + console.log(e,'e') }, - handleSelectHouse: (e:any) => { - model.formData.value.asset_houses_id = e?.id + handleIsLiveIn(e){ + model.formData.value.is_live_in = e?.detail?.value + console.log(e,'e') + }, + handleSubmit: (e:any) => { + console.log(model?.formData.value,'formData') + getApiLoading(Apis.Archive.HouseRegisters.Store, {...model.formData.value,customer_info:[model.formData.value]}).then(res => { + showToastBack('提交成功!',1,true) + console.log(res) + }) } } \ No newline at end of file diff --git a/src/INDEX/binding/model.ts b/src/INDEX/binding/model.ts index ecc80a4..42fe26d 100644 --- a/src/INDEX/binding/model.ts +++ b/src/INDEX/binding/model.ts @@ -13,6 +13,9 @@ export default { customer_type:"", house_status:"", usage_plan:"", - ownership_info:[] + ownership_info:[], + id_card:'', + move_in_date:'', + is_live_in:true }), } diff --git a/src/components/hs-popup-project/hs-popup-project.vue b/src/components/hs-popup-project/hs-popup-project.vue index 90e83c7..f207d28 100644 --- a/src/components/hs-popup-project/hs-popup-project.vue +++ b/src/components/hs-popup-project/hs-popup-project.vue @@ -1,6 +1,6 @@ - + @@ -70,7 +85,7 @@