Explorar o código

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

# Conflicts:
#	src/views/bulkManagement/bulkWarehousingOrder/list.vue
chenrui %!s(int64=4) %!d(string=hai) anos
pai
achega
5616d251a0

+ 1 - 1
src/api/supplier.js

@@ -15,7 +15,7 @@ export const supplierList = (params) => {
 export const supplierAllList = (params) => {
   return axios({
     url: '/supplier/queryList',
-    data: params,
+    data: {},
     method: 'post'
   })
 }

+ 8 - 2
src/components/global.less

@@ -527,8 +527,14 @@ body {
 
 .content {
   .table-operator {
-    margin-bottom: 18px;
-
+    padding: 15px 0;
+    border-top: 1px solid #eee;
+    button {
+      margin-right: 8px;
+    }
+  }
+  .table-operator-nobor{
+    padding: 0 0 15px 0;
     button {
       margin-right: 8px;
     }

+ 1 - 1
src/views/basicData/bulkPartsTypeManagement/list.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card size="small" :bordered="false" class="bulkPartsTypeList-wrap">
     <!-- 操作按钮 -->
-    <div class="table-operator">
+    <div class="table-operator-nobor">
       <a-button v-if="$hasPermissions('B_basicData_bulkPartsType_add')" id="bulkPartsTypeList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
     </div>
     <!-- 列表 -->

+ 1 - 1
src/views/basicData/expenseType/list.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card size="small" :bordered="false" class="expenseTypeList-wrap">
     <!-- 操作按钮 -->
-    <div class="table-operator">
+    <div class="table-operator-nobor">
       <a-button v-if="$hasPermissions('B_basicData_expenseType_add')" id="expenseTypeList-add" type="primary" class="button-error" @click="handleAdd()">新增一级类型</a-button>
     </div>
     <!-- 列表 -->

+ 1 - 1
src/views/basicData/storeTransferOutTypeManagement/list.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card size="small" :bordered="false" class="storeTransferOutTypeList-wrap">
     <!-- 操作按钮 -->
-    <div class="table-operator">
+    <div class="table-operator-nobor">
       <a-button
         v-if="$hasPermissions('B_basicData_storeTransferOutType_add')"
         id="storeTransferOutTypeList-add"

+ 16 - 16
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -35,7 +35,7 @@
                   v-model="queryParam.state"
                   ref="state"
                   id="bulkWarehousingOrderList-state"
-                  code="PAYMENT_TYPE"
+                  code="SPARE_PARTS_PURCHASE"
                   placeholder="请选择业务状态"
                   allowClear
                 ></v-select>
@@ -77,7 +77,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="bulkWarehousingOrderList-add" type="primary" @click="handleAdd">新增</a-button>
+      <a-button id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
     </div>
     <!-- alert -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
@@ -171,17 +171,17 @@ export default {
   methods: {
     // 合计
     getTotal (param) {
-    	sparePartsPurCount(param).then(res => {
-    		if (res.status == 200 && res.data) {
-    			this.productTotal = res.data
-    		} else {
-    			this.productTotal = {
-    				// 合计信息
-    				productTotalCost: '',
-    				productTotalQty: ''
-    			}
-    		}
-    	})
+      sparePartsPurCount(param).then(res => {
+        if (res.status == 200 && res.data) {
+          this.productTotal = res.data
+        } else {
+          this.productTotal = {
+            // 合计信息
+            productTotalCost: '',
+            productTotalQty: ''
+          }
+        }
+      })
     },
     //  新增
     handleAdd () {
@@ -250,9 +250,9 @@ export default {
       this.$refs.table.refresh(true)
     },
     filterOption (input, option) {
-    	return (
-    		option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-    	)
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
     },
     //  导出
     handleExport () {

+ 1 - 1
src/views/productManagement/productCategory/list.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card size="small" :bordered="false" class="productCategoryList-wrap">
     <!-- 操作按钮 -->
-    <div class="table-operator">
+    <div class="table-operator-nobor">
       <a-button v-if="$hasPermissions('B_product_dealerProductType_add')" id="productCategoryList-add" type="primary" class="button-error" @click="handleAdd()">新增一级分类</a-button>
     </div>
     <!-- 列表 -->