Browse Source

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy

lilei 4 years ago
parent
commit
81d1dc1642

+ 1 - 1
src/views/allocationManagement/chainTransferOut/list.vue

@@ -64,7 +64,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="chainTransferOutList-add" type="primary" @click="handleEdit()">新增调出单</a-button>
+      <a-button id="chainTransferOutList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
     </div>
     <!-- 列表 -->
     <s-table

+ 1 - 1
src/views/allocationManagement/storeTransferOut/list.vue

@@ -67,7 +67,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="storeTransferOutList-add" type="primary" @click="openModal=true">新增</a-button>
+      <a-button id="storeTransferOutList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
     </div>
     <!-- 列表 -->
     <s-table

+ 1 - 1
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -73,7 +73,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="warehouseAllocationList-add" type="primary" @click="openModal=true">新增</a-button>
+      <a-button id="warehouseAllocationList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
     </div>
     <!-- 列表 -->
     <s-table

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -52,7 +52,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="bulkReturnGoodsList-add" type="primary" @click="handleAdd()">新增</a-button>
+      <a-button id="bulkReturnGoodsList-add" type="primary" class="button-error" @click="handleAdd()">新增</a-button>
     </div>
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">

+ 1 - 1
src/views/financialManagement/expenseManagement/list.vue

@@ -66,7 +66,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="expenseManagementList-add" type="primary" @click="handleEdit()">新增</a-button>
+      <a-button id="expenseManagementList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
     </div>
     <!-- alert -->
     <a-alert type="info" showIcon style="margin-bottom:15px">

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -29,7 +29,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="inventoryCheckingList-add" type="primary" @click="handleEdit()">新增</a-button>
+      <a-button id="inventoryCheckingList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
     </div>
     <!-- 列表 -->
     <s-table

+ 1 - 7
src/views/power/role/roleList.vue

@@ -14,7 +14,6 @@
                 @pressEnter="$refs.table.refresh(true)" />
             </a-form-item>
           </a-col>
-
           <a-col :md="6" :sm="24">
             <a-form-item label="状态">
               <v-select code="CHECK_ENABLE_STATE" v-model="queryParam.isEnable" allowClear placeholder="请选择状态" id="roleList-isEnable"></v-select>
@@ -27,9 +26,8 @@
         </a-row>
       </a-form>
     </div>
-    <a-divider />
     <div class="table-operator">
-      <a-button v-if="$hasPermissions('B_powerMD_role_add')" type="primary" icon="plus" @click="openModal" id="roleList-openModal">新增</a-button>
+      <a-button v-if="$hasPermissions('B_powerMD_role_add')" type="primary" class="button-error" @click="openModal" id="roleList-openModal">新增</a-button>
     </div>
 
     <s-table
@@ -247,10 +245,6 @@ export default {
 }
 </script>
 <style scoped>
-	.table-page-search-wrapper .ant-form-inline .ant-form-item {
-		margin-bottom: 0;
-	}
-
 	.action-button {
 		line-height: 40px;
 		white-space: nowrap;

+ 3 - 7
src/views/power/user/userList.vue

@@ -25,9 +25,8 @@
         </a-row>
       </a-form>
     </div>
-    <a-divider/>
     <div class="table-operator">
-      <a-button v-if="$hasPermissions('B_powerMD_user_add')" type="primary" icon="plus" @click="openModal">新增</a-button>
+      <a-button v-if="$hasPermissions('B_powerMD_user_add')" type="primary" class="button-error" @click="openModal">新增</a-button>
     </div>
     <s-table
       ref="table"
@@ -239,12 +238,9 @@ export default {
 }
 </script>
 <style scoped>
-  .table-page-search-wrapper .ant-form-inline .ant-form-item{
-    margin-bottom: 0;
-  }
   .action-button{
-   line-height: 40px;
-   white-space: nowrap;
+    line-height: 40px;
+    white-space: nowrap;
     padding: 5px 10px;
     background-color: #1890ff;
     border-radius: 4px;

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -73,7 +73,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="purchaseOrderList-add" type="primary" @click="handleAdd">新增</a-button>
+      <a-button id="purchaseOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
     </div>
     <!-- alert -->
     <a-alert type="info" showIcon style="margin-bottom:15px">

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -10,7 +10,7 @@
     width="70%">
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="chooseAddressList-add" type="primary" @click="handleEdit()">新增</a-button>
+      <a-button id="chooseAddressList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
     </div>
     <!-- 列表 -->
     <s-table

+ 1 - 1
src/views/salesManagement/quotation/list.vue

@@ -55,7 +55,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="quotationList-add" type="primary" @click="handleAdd">新增</a-button>
+      <a-button id="quotationList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
     </div>
     <!-- 列表 -->
     <s-table

+ 1 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -89,7 +89,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button type="primary" @click="handleAdd">新增</a-button>
+      <a-button type="primary" class="button-error" @click="handleAdd">新增</a-button>
     </div>
     <!-- alert -->
     <a-alert type="info" showIcon style="margin-bottom:15px">

+ 1 - 1
src/views/salesManagement/salesReturn/list.vue

@@ -83,7 +83,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button type="primary" @click="handleAdd">新增</a-button>
+      <a-button type="primary" class="button-error" @click="handleAdd">新增</a-button>
     </div>
     <!-- alert -->
     <a-alert type="info" style="margin-bottom: 15px;">