From 1c9c4d0b6cd221e685a30b1c8aef53349d45cde0 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 18 二月 2020 00:05:40 +0800
Subject: [PATCH] 管理员加入商户小区开发完成

---
 WebService/src/main/resources/components/machinePackage/add-machine/addMachine.html |   35 +++++++++++++++++++++++++++--------
 1 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.html b/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.html
index 1aee63a..bb58a67 100644
--- a/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.html
+++ b/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.html
@@ -34,8 +34,18 @@
                                 <div class="col-sm-10">
                                     <select class="custom-select" v-model="addMachineInfo.machineTypeCd">
                                         <option selected disabled value="">蹇呭~锛岃閫夋嫨璁惧绫诲瀷</option>
-                                        <option value="9999">閿愮洰闂ㄧ</option>
-                                        <option value="9998">鍏朵粬</option>
+                                        <option value="992019111002270001">閿愮洰闂ㄧ</option>
+                                        <option value="9998">鍏朵粬闂ㄧ</option>
+                                        <option value="9996">杞﹁締閬撻椄</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">璁惧鏂瑰悜</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addMachineInfo.direction">
+                                        <option selected disabled value="">蹇呭~锛岃閫夋嫨璁惧鏂瑰悜</option>
+                                        <option value="3306">杩涘満</option>
+                                        <option value="3307">鍑哄満</option>
                                     </select></div>
                             </div>
                             <div class="form-group row">
@@ -66,23 +76,32 @@
                             <div class="col-sm-10">
                                 <vc:create name="floorSelect2"
                                            parentModal="addMachineModel"
+                                           namespace="addMachine"
                                 ></vc:create>
                             </div>
                         </div>
                         <div class="form-group row"
-                             v-if="addMachineInfo.locationTypeCd == '2000' || addMachineInfo.locationTypeCd == '3000'  ">
+                             v-show="addMachineInfo.locationTypeCd == '2000' || addMachineInfo.locationTypeCd == '3000'  ">
                             <label class="col-sm-2 col-form-label">褰掑睘鍗曞厓</label>
                             <div class="col-sm-10">
-                                <input v-model="addMachineInfo.authCode" type="text" placeholder="蹇呭~锛岃濉啓閴存潈缂栫爜"
-                                       class="form-control">
+                                <vc:create name="unitSelect2"
+                                           parentModal="addMachineModel"
+                                           callBackListener="addMachine"
+                                           callBackFunction="notify"
+                                           namespace="addMachine"
+                                ></vc:create>
                             </div>
                         </div>
                         <div class="form-group row"
-                             v-if="addMachineInfo.locationTypeCd == '3000'  ">
+                             v-show="addMachineInfo.locationTypeCd == '3000'  ">
                             <label class="col-sm-2 col-form-label">褰掑睘鎴垮眿</label>
                             <div class="col-sm-10">
-                                <input v-model="addMachineInfo.authCode" type="text" placeholder="蹇呭~锛岃濉啓閴存潈缂栫爜"
-                                       class="form-control">
+                                <vc:create name="roomSelect2"
+                                           parentModal="addMachineModel"
+                                           callBackListener="addMachine"
+                                           callBackFunction="notify"
+                                           namespace="addMachine"
+                                ></vc:create>
                             </div>
                         </div>
 

--
Gitblit v1.8.0