From ecdac8a738f254db2b2ea28cbe3248f7a6a7eb2b Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期五, 06 三月 2020 16:18:27 +0800
Subject: [PATCH] 优化采购申请组件
---
WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html b/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html
index d1a0118..c940461 100644
--- a/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html
+++ b/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.html
@@ -1,4 +1,4 @@
-<div id="editMachineModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+<div id="editMachineModel" class="modal fade" role="dialog" aria-labelledby="exampleModalLabel"
aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
@@ -33,8 +33,18 @@
<div class="col-sm-10">
<select class="custom-select" v-model="editMachineInfo.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="editMachineInfo.direction">
+ <option selected disabled value="">蹇呭～锛岃閫夋嫨璁惧鏂瑰悜</option>
+ <option value="3306">杩涘満</option>
+ <option value="3307">鍑哄満</option>
</select></div>
</div>
<div class="form-group row">
@@ -63,10 +73,10 @@
v-show="editMachineInfo.locationTypeCd == '2000' || editMachineInfo.locationTypeCd == '3000' ">
<label class="col-sm-2 col-form-label">褰掑睘妤兼爧</label>
<div class="col-sm-10">
- <!--<vc:create name="floorSelect2"
+ <vc:create name="floorSelect2"
parentModal="editMachineModel"
-
- ></vc:create>-->
+ namespace="editMachine"
+ ></vc:create>
</div>
</div>
<div class="form-group row"
@@ -77,6 +87,7 @@
parentModal="editMachineModel"
callBackListener="editMachine"
callBackFunction="notify"
+ namespace="editMachine"
></vc:create>
</div>
</div>
@@ -88,6 +99,7 @@
parentModal="editMachineModel"
callBackListener="editMachine"
callBackFunction="notify"
+ namespace="editMachine"
></vc:create>
</div>
</div>
@@ -105,6 +117,13 @@
class="form-control">
</div>
</div>
+ <div class="form-group row">
+ <label class="col-sm-2 col-form-label">璁惧璁块棶url</label>
+ <div class="col-sm-10">
+ <input v-model="editMachineInfo.machineUrl" readonly type="text" placeholder="閫夊～锛岃濉啓璁惧MAC"
+ class="form-control">
+ </div>
+ </div>
<div class="ibox-content">
<button class="btn btn-primary float-right" type="button" v-on:click="editMachine()"><i
--
Gitblit v1.8.0