Merge branch 'master' of https://github.com/java110/MicroCommunity

WebService/src/main/resources/components/itemOutPackage/itemOut-manage/itemOutManage.html

@@ -46,49 +46,76 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>物品信息</h5>
-<!--                    <div class="ibox-tools" style="top:10px;">-->
-<!--                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddResourceStoreModal()">-->
-<!--                            <i class="glyphicon glyphicon-plus"></i>-->
-<!--                            添加-->
-<!--                        </button>-->
-<!--                    </div>-->
+                    <!--                    <div class="ibox-tools" style="top:10px;">-->
+                    <!--                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddResourceStoreModal()">-->
+                    <!--                            <i class="glyphicon glyphicon-plus"></i>-->
+                    <!--                            添加-->
+                    <!--                        </button>-->
+                    <!--                    </div>-->
                 </div>
                 <div class="ibox-content">
 
-                    <table class="footable table table-stripped toggle-arrow-tiny"
+                    <table class="table shoping-cart-table"
                            data-page-size="15"
                     >
-                        <thead>
-                        <tr>
-                            <th class="text-center">物品ID</th>
-                            <th class="text-center">物品名称</th>
-                            <th class="text-center">物品编码</th>
-                            <th class="text-center">物品价格</th>
-                            <th class="text-center">物品库存</th>
-                            <th class="text-center">操作</th>
+                        <!--                        <thead>-->
+                        <!--                        <tr>-->
+                        <!--                            <th class="text-center">物品ID</th>-->
+                        <!--                            <th class="text-center">物品名称</th>-->
+                        <!--                            <th class="text-center">物品编码</th>-->
+                        <!--                            <th class="text-center">物品价格</th>-->
+                        <!--                            <th class="text-center">物品库存</th>-->
+                        <!--                            <th class="text-center">操作</th>-->
 
 
-                        </tr>
-                        </thead>
+                        <!--                        </tr>-->
+                        <!--                        </thead>-->
                         <tbody>
                         <tr v-for="resourceStore in resourceStoreManageInfo.resourceStores">
-                            <td class="text-center">{{resourceStore.resId}}</td>
-                            <td class="text-center">{{resourceStore.resName}}</td>
-                            <td class="text-center">{{resourceStore.resCode}}</td>
-                            <td class="text-center">{{resourceStore.price}}</td>
-                            <td class="text-center">{{resourceStore.stock}}</td>
-                            <td class="text-center">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
-                                            v-on:click="_openEditResourceStoreModel(resourceStore)">修改
-                                    </button>
+                            <td class="desc">
+                                <h3>
+                                    <a class="text-navy">
+                                        {{resourceStore.resName}}
+                                    </a>
+                                </h3>
+                                <p class="small">
+                                    {{resourceStore.description}}
+                                </p>
+                            </td>
+                            <td>{{resourceStore.price}}</td>
+                            <td width="65">
+                                <div class="input-group">
+                                     <span class="input-group-btn">
+                                       <button class="btn btn-default" type="button">-</button>
+                                     </span>
+                                    <input type="text" class="form-control" :placeholder="resourceStore.stock">
+                                    <span class="input-group-btn">
+                                       <button class="btn btn-default" type="button">+</button>
+                                     </span>
                                 </div>
-<!--                                <div class="btn-group">-->
-<!--                                    <button class="btn-white btn btn-xs"-->
-<!--                                            v-on:click="_openDeleteResourceStoreModel(resourceStore)">删除-->
-<!--                                    </button>-->
-<!--                                </div>-->
                             </td>
+                            <td>
+                                <h4>
+                                    {{resourceStore.price}}
+                                </h4>
+                            </td>
+                            <!--                            <td class="text-center">{{resourceStore.resId}}</td>-->
+                            <!--                            <td class="text-center">{{resourceStore.resName}}</td>-->
+                            <!--                            <td class="text-center">{{resourceStore.resCode}}</td>-->
+                            <!--                            <td class="text-center">{{resourceStore.price}}</td>-->
+                            <!--                            <td class="text-center">{{resourceStore.stock}}</td>-->
+                            <!--                            <td class="text-center">-->
+                            <!--                                <div class="btn-group">-->
+                            <!--                                    <button class="btn-white btn btn-xs"-->
+                            <!--                                            v-on:click="_openEditResourceStoreModel(resourceStore)">修改-->
+                            <!--                                    </button>-->
+                            <!--                                </div>-->
+                            <!--                                <div class="btn-group">-->
+                            <!--                                    <button class="btn-white btn btn-xs"-->
+                            <!--                                            v-on:click="_openDeleteResourceStoreModel(resourceStore)">删除-->
+                            <!--                                    </button>-->
+                            <!--                                </div>-->
+                            <!--                            </td>-->
 
                         </tr>
                         </tbody>
@@ -108,11 +135,11 @@
     </div>
 
 
-<!--    <vc:create name="addResourceStore"-->
-<!--               callBackListener=""-->
-<!--               callBackFunction=""-->
-<!--    ></vc:create>-->
+    <!--    <vc:create name="addResourceStore"-->
+    <!--               callBackListener=""-->
+    <!--               callBackFunction=""-->
+    <!--    ></vc:create>-->
     <vc:create name="editItemNumberStore"></vc:create>
-<!--    <vc:create name="deleteResourceStore"></vc:create>-->
+    <!--    <vc:create name="deleteResourceStore"></vc:create>-->
 
 </div>

WebService/src/main/resources/components/itemOutPackage/itemOut-manage/itemOutManage.js

@@ -16,6 +16,7 @@
                     resId: '',
                     resName: '',
                     resCode: '',
+                    description:'',
                     stock:''
 
                 }