浏览代码

样式修改

lilei 3 年之前
父节点
当前提交
5717327a9d

+ 0 - 1
src/components/MultiTab/MultiTab.vue

@@ -1,6 +1,5 @@
 <script>
 import events from './events'
-
 export default {
   name: 'MultiTab',
   data () {

+ 8 - 119
src/components/index.less

@@ -19,7 +19,7 @@
 }
 
 /* 扩展ant design pro按钮组件颜色 */
-.ant-btn-primary.button-primary {
+.ant-btn-primary.button-primary,.ant-btn-primary.button-info,.ant-btn-primary.button-warning,.ant-btn-primary.button-geekblue,.ant-btn-primary.button-purple {
   background-color: #39f;
   border-color: #39f;
   margin: 0 5px;
@@ -35,25 +35,9 @@
   }
 }
  
-.ant-btn-primary.button-info {
-  background-color: #2db7f5;
-  border-color: #2db7f5;
-  margin: 0 5px;
-  font-size: 12px;
-  &:hover, &:focus {
-    background-color: #32c8f5;
-    border-color: #32c8f5;
-  }
- 
-  &:active, &.active {
-    background-color: #27a3d8;
-    border-color: #27a3d8;
-  }
-}
- 
 .ant-btn-primary.button-success {
-  background-color: #0c6;
-  border-color: #0c6;
+  background-color: #11b116;
+  border-color: #00af54;
   margin: 0 5px;
   font-size: 12px;
   &:hover, &:focus {
@@ -67,22 +51,6 @@
   }
 }
  
-.ant-btn-primary.button-warning {
-  background-color: #f90;
-  border-color: #f90;
-  margin: 0 5px;
-  font-size: 12px;
-  &:hover, &:focus {
-    background-color: #ffb60a;
-    border-color: #ffb60a;
-  }
- 
-  &:active, &.active {
-    background-color: #dd8500;
-    border-color: #dd8500;
-  }
-}
- 
 .ant-btn-primary.button-error {
   background-color: #f30;
   border-color: #f30;
@@ -98,38 +66,6 @@
     border-color: #d62a00;
   }
 }
- 
-.ant-btn-primary.button-geekblue {
-  background-color: #2F54EB;
-  border-color: #2F54EB;
-  margin: 0 5px;
-  font-size: 12px;
-  &:hover, &:focus {
-    background-color: #1d39c4;
-    border-color: #1d39c4;
-  }
- 
-  &:active, &.active {
-    background-color: #597ef7;
-    border-color: #597ef7;
-  }
-}
- 
-.ant-btn-primary.button-purple {
-  background-color: #722ED1;
-  border-color: #722ED1;
-  margin: 0 5px;
-  font-size: 12px;
-  &:hover, &:focus {
-    background-color: #9254de;
-    border-color: #9254de;
-  }
- 
-  &:active, &.active {
-    background-color: #531dab;
-    border-color: #531dab;
-  }
-}
 .ant-btn-primary.button-grey {
   background-color: #82848a;
   border-color: #82848a;
@@ -147,38 +83,15 @@
 }
 
 // btn-link
-.ant-btn-link.button-default {
-  color: #1b1b1b;
-  &:hover, &:focus {
-    color: #66696d;
-  }
- 
-  &:active, &.active {
-    color: #8e8f91;
-  }
-}
-.ant-btn-link.button-primary {
+.ant-btn-link.button-primary,.ant-btn-link.button-info,.ant-btn-link.button-warning,.ant-btn-link.button-purple,.ant-btn-link.button-geekblue {
   color: #39f;
   &:hover, &:focus {
     color: #52a6fb;
   }
- 
   &:active, &.active {
     color: #3d80bf;
   }
 }
- 
-.ant-btn-link.button-info {
-  color: #2db7f5;
-  &:hover, &:focus {
-    color: #32c8f5;
-  }
- 
-  &:active, &.active {
-    color: #27a3d8;
-  }
-}
- 
 .ant-btn-link.button-success {
   color: #0c6;
   &:hover, &:focus {
@@ -189,18 +102,6 @@
     color: #00af57;
   }
 }
- 
-.ant-btn-link.button-warning {
-  color: #aa6a02;
-  &:hover, &:focus {
-    color: #c68d07;
-  }
- 
-  &:active, &.active {
-    color: #dd8500;
-  }
-}
- 
 .ant-btn-link.button-error {
   color: #f30;
   &:hover, &:focus {
@@ -211,26 +112,14 @@
     color: #d62a00;
   }
 }
- 
-.ant-btn-link.button-geekblue {
-  color: #2F54EB;
-  &:hover, &:focus {
-    color: #1d39c4;
-  }
- 
-  &:active, &.active {
-    color: #597ef7;
-  }
-}
- 
-.ant-btn-link.button-purple {
-  color: #722ED1;
+.ant-btn-link.button-default {
+  color: #1b1b1b;
   &:hover, &:focus {
-    color: #9254de;
+    color: #66696d;
   }
  
   &:active, &.active {
-    color: #531dab;
+    color: #8e8f91;
   }
 }
 .ant-btn-link.button-grey {

+ 2 - 1
src/config/router.config.js

@@ -111,7 +111,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '销售单详情',
                   icon: 'monitor',
-                  hidden: true
+                  hidden: true,
+                  replaceTab: true,
                   // permission: 'M_salesDetail'
                 }
               },

+ 2 - 5
src/views/productManagement/newProduct/detail.vue

@@ -100,11 +100,8 @@ export default {
     }
   },
   activated () {
-    // 如果是新页签打开或者进入新的子页(例:存在列表第2条数据编辑页页签时再打开第4条数据的编辑页),则重置当前页面
-    if (this.$store.state.app.isNewTab || !this.$store.state.app.isNewSubTab) {
-      this.itemId = this.$route.params.sn
-      this.getDetail()
-    }
+    this.itemId = this.$route.params.sn
+    this.getDetail()
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {

+ 12 - 10
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -25,17 +25,19 @@
       </a-card>
       <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
         <!-- 操作按钮 -->
-        <div class="table-operator">
-          <a-button id="bulkWarehousingOrderEdit-add" type="primary" class="button-primary" @click="handleEdit()">新增产品</a-button>
-          <a-button id="bulkWarehousingOrderEdit-import" type="primary" class="button-primary" @click="openGuideModal=true">导入产品</a-button>
-        </div>
-        <!-- 总计 -->
-        <a-alert type="info" v-if="productTotal" style="margin-bottom:10px">
-          <div slot="message">
-            入库数量 <strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
-            <span v-if="$hasPermissions('B_isShowCost')">入库金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? productTotal.totalPrice : '--' }}</strong></span>
+        <div class="table-operator" style="display: flex;">
+          <div>
+            <a-button id="bulkWarehousingOrderEdit-add" type="primary" class="button-primary" @click="handleEdit()">新增产品</a-button>
+            <a-button id="bulkWarehousingOrderEdit-import" type="default" class="button-primary" @click="openGuideModal=true">导入产品</a-button>
           </div>
-        </a-alert>
+          <!-- 总计 -->
+          <a-alert type="info" v-if="productTotal">
+            <div slot="message">
+              入库数量 <strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
+              <span v-if="$hasPermissions('B_isShowCost')">入库金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? productTotal.totalPrice : '--' }}</strong></span>
+            </div>
+          </a-alert>
+        </div>
         <!-- 筛选条件 -->
         <div class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">

+ 3 - 1
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -68,7 +68,9 @@
         bordered>
         <!-- 入库单号 -->
         <template slot="sparePartsNo" slot-scope="text, record">
-          <span :class="$hasPermissions('B_sparePartsDetail')?'active':'common'" @click="handleDetail(record)">{{ record.sparePartsNo }}</span>
+          <!-- <span :class="$hasPermissions('B_sparePartsDetail')?'active':'common'" @click="handleDetail(record)">{{ record.sparePartsNo }}</span> -->
+          <a-button v-if="$hasPermissions('B_sparePartsDetail')" size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.sparePartsNo }}</a-button>
+          <span v-else>{{ record.sparePartsNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">

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

@@ -102,7 +102,7 @@
         bordered>
         <!-- 下推单号 -->
         <template slot="dispatchBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record)">{{ record.dispatchBillNo }}</span>
+          <a-button size="small" type="link" class="button-info" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record)">{{ record.dispatchBillNo }}</a-button>
           <span v-else>{{ record.dispatchBillNo }}</span>
         </template>
         <!-- 操作 -->

+ 2 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -97,7 +97,8 @@
         bordered>
         <!-- 单号 -->
         <template slot="stockOutNo" slot-scope="text, record">
-          <span v-if="record.stockOutNo" :class="detailPermissions(record)?'active':'common'" @click="handleDetail(record)">{{ record.stockOutNo }}</span>
+          <a-button v-if="record.stockOutNo && detailPermissions(record)" size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.stockOutNo }}</a-button>
+          <span v-else-if="record.stockOutNo && !detailPermissions(record)">{{ record.stockOutNo }}</span>
           <span v-else>--</span>
         </template>
         <!-- 操作 -->

+ 2 - 1
src/views/salesManagement/priceInquiry/list.vue

@@ -107,7 +107,8 @@
       </template>
       <!-- 产品编码 可点击查看详情 -->
       <template slot="detail" slot-scope="text, record">
-        <span style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.code }}</span>
+        <!-- <span style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.code }}</span> -->
+        <a-button size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.code }}</a-button>
       </template>
     </s-table>
     <!-- 查看车辆信息 -->

+ 5 - 4
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -9,21 +9,22 @@
           <a-button
             key="3"
             type="primary"
-            class="button-warning"
+            class="button-info"
             id="purchaseOrderDetail-export-btn"
             :disabled="localDataSource.length==0"
             @click="openExcelModal=true">导出Excel</a-button>
+          <a-divider type="vertical" />
           <a-button
             key="2"
             type="primary"
-            class="button-error"
+            class="button-info"
             id="salesDetail-fhdy-print-btn"
             :disabled="localDataSource.length==0"
             @click="handlePrint('DISPATCH_BILL')">发货打印</a-button>
           <a-button
             key="1"
-            type="primary"
-            class="button-warning"
+            type="default"
+            class="button-info"
             id="salesDetail-fhfl-print-btn"
             :disabled="localDataSource.length==0"
             @click="handlePrint('DISPATCH_BILL_TYPE')">发货分类打印</a-button>

+ 4 - 2
src/views/salesManagement/pushOrderManagement/list.vue

@@ -87,12 +87,14 @@
         bordered>
         <!-- 销售单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
+          <a-button v-if="$hasPermissions('B_salesDetail')" size="small" type="link" class="button-info" @click="handleDetail(record,0)">{{ record.salesBillNo }}</a-button>
+          <!-- <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span> -->
           <span v-else>{{ record.salesBillNo }}</span>
         </template>
         <!-- 备货单号 -->
         <template slot="dispatchBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
+          <a-button v-if="$hasPermissions('B_dispatchDetail')" size="small" type="link" class="button-info" @click="handleDetail(record,1)">{{ record.salesBillNo }}</a-button>
+          <!-- <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span> -->
           <span v-else>{{ record.dispatchBillNo }}</span>
         </template>
       </s-table>

+ 14 - 13
src/views/salesManagement/salesQuery/detail.vue

@@ -7,7 +7,7 @@
         </template>
         <template slot="extra">
           <a-button
-            key="4"
+            key="1"
             type="primary"
             class="button-info"
             id="salesDetail-xs-print-btn"
@@ -15,15 +15,16 @@
             :disabled="localDataSource.length==0"
             @click="handlePrint('SALES_BILL')">销售打印</a-button>
           <a-button
-            key="3"
-            type="primary"
+            key="2"
+            type="default"
             class="button-info"
             id="salesDetail-xsfl-print-btn"
             v-if="$hasPermissions('B_salesPrint')"
             :disabled="localDataSource.length==0"
             @click="handlePrint('SALES_BILL_TYPE')">销售分类打印</a-button>
+          <a-divider type="vertical" />
           <a-button
-            key="2"
+            key="3"
             type="primary"
             class="button-info"
             id="salesDetail-export-btn"
@@ -31,8 +32,8 @@
             :disabled="localDataSource.length==0"
             @click="handlePrint('export')">导出Excel</a-button>
           <a-button
-            key="1"
-            type="primary"
+            key="4"
+            type="default"
             class="button-info"
             id="salesDetail-export-btn"
             v-if="$hasPermissions('B_salesExport')"
@@ -136,11 +137,11 @@
         审核
       </a-button>
       <a-button
-        type="primary"
+        type="default"
         :disabled="spinning"
         class="button-info"
         size="large"
-        style="width: 100px;"
+        style="width: 100px;margin: 0 20px;"
         id="salesDetail-edit-btn"
         v-if="detailData&&detailData.salesBillSource != 'PURCHASE' && (detailData.billStatus == 'WAIT_SUBMIT' || detailData.billStatus == 'WAIT_AUDIT' || detailData.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesEdit')"
         @click="handleEdit()"
@@ -149,9 +150,9 @@
       </a-button>
       <a-button
         size="large"
-        style="width: 100px;"
+        style="width: 100px;margin: 0 20px;"
         :disabled="spinning"
-        type="primary"
+        type="default"
         class="button-info"
         id="salesDetail-edit-btn"
         v-if="detailData&&detailData.salesBillSource == 'PURCHASE' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesEdit')"
@@ -161,10 +162,10 @@
       </a-button>
       <a-button
         size="large"
-        style="width: 150px;font-size: 12px;margin-left: 50px;"
+        style="width: 100px;"
         :disabled="spinning"
         type="primary"
-        class="button-info"
+        class="button-success"
         id="salesDetail-batchAudit-btn"
         v-if="detailData&&detailData.billStatus == 'WAIT_AUDIT'&&$hasPermissions('B_salesAudit')"
         @click="handleAudit('batch')"
@@ -481,7 +482,7 @@ export default {
     padding-bottom: 51px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
-      overflow-y: scroll;
+      overflow-y: auto;
       height: 100%;
     }
     .salesDetail-cont{

+ 10 - 12
src/views/salesManagement/salesQuery/edit.vue

@@ -35,22 +35,17 @@
         <!-- 总计 -->
         <a-alert type="info" style="margin-bottom: 10px;">
           <div slot="message" class="total-bar">
-            <div style="position: relative;width: 100%;">
-              <div>
-                <span v-if="$hasPermissions('B_isShowPrice')">总售价:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? '¥'+detailData.totalCommonAmount : '--' }}</strong>;</span>
-                总款数:<strong>{{ detailData&&(detailData.totalCommonCategory || detailData.totalCommonCategory==0) ? detailData.totalCommonCategory : '--' }}</strong>;
-                总数量:<strong>{{ detailData&&(detailData.totalCommonQty || detailData.totalCommonQty==0) ? detailData.totalCommonQty : '--' }}</strong>;
-              </div>
-              <div style="position: absolute;right: 0;top: -3px;">
-                <a-button size="small" type="primary" class="button-info" id="salesEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
-              </div>
+            <div>
+              <span v-if="$hasPermissions('B_isShowPrice')">总售价:<strong>{{ detailData&&(detailData.totalCommonAmount || detailData.totalCommonAmount==0) ? '¥'+detailData.totalCommonAmount : '--' }}</strong>;</span>
+              总款数:<strong>{{ detailData&&(detailData.totalCommonCategory || detailData.totalCommonCategory==0) ? detailData.totalCommonCategory : '--' }}</strong>;
+              总数量:<strong>{{ detailData&&(detailData.totalCommonQty || detailData.totalCommonQty==0) ? detailData.totalCommonQty : '--' }}</strong>;
             </div>
           </div>
         </a-alert>
         <!-- 筛选条件 -->
         <a-row :gutter="15">
           <a-col :span="24">
-            <div class="table-page-search-wrapper">
+            <div class="table-page-search-wrapper" style="position: relative;width: 100%;">
               <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
                 <a-row :gutter="15">
                   <a-col :md="6" :sm="24">
@@ -64,11 +59,14 @@
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-                    <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
+                    <a-button type="primary" class="button-info" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
                     <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesEdit-reset">重置</a-button>
                   </a-col>
                 </a-row>
               </a-form>
+              <div style="position: absolute;right: 0;top: 3px;">
+                <a-button size="small" type="primary" class="button-info" id="salesEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
+              </div>
             </div>
           </a-col>
         </a-row>
@@ -253,7 +251,7 @@ export default {
         { title: '库存', dataIndex: 'stockQty', scopedSlots: { customRender: 'stockQty' }, width: '8%', align: 'center' },
         { title: '单位', dataIndex: 'productEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '售价小计', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '13%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { // 售价权限
         arr.splice(3, 0, { title: '售价', dataIndex: 'price', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })

+ 5 - 4
src/views/salesManagement/salesQuery/list.vue

@@ -132,7 +132,7 @@
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+102.5+'px' }"
+        :style="{ height: tableHeight+40+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -144,9 +144,9 @@
         <template slot="salesBillNo" slot-scope="text, record">
           <div v-if="$hasPermissions('B_salesDetail')">
             <a-badge :count="'改'+record.changeTimes" :offset="[16,-13]" v-if="record.changeTimes>0" class="badge-con-t">
-              <span style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+              <a-button size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.salesBillNo }}</a-button>
             </a-badge>
-            <span v-else style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+            <a-button v-else size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.salesBillNo }}</a-button>
           </div>
           <div v-else>{{ record.salesBillNo }}</div>
         </template>
@@ -444,7 +444,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 310
+      this.tableHeight = window.innerHeight - tableSearchH - 260
     }
   },
   watch: {
@@ -455,6 +455,7 @@ export default {
       })
     },
     '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      console.log(newValue)
       this.setTableH()
     }
   },

+ 2 - 2
src/views/salesManagement/salesQuery/printModal.vue

@@ -42,8 +42,8 @@
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
-        <a-button type="primary" id="sales-print-save" @click="handleSave()">{{ nowType=='export' ? '导出' : '打印预览' }}</a-button>
-        <a-button id="sales-print-back" @click="handleCancel" style="margin-left: 15px;">{{ nowType=='export' ? '取消' : '快捷打印' }}</a-button>
+        <a-button :type="nowType=='export'?'primary':''" id="sales-print-save" @click="handleSave()">{{ nowType=='export' ? '导出' : '打印预览' }}</a-button>
+        <a-button :type="nowType=='export'?'':'primary'" id="sales-print-back" @click="handleCancel" style="margin-left: 15px;">{{ nowType=='export' ? '取消' : '快捷打印' }}</a-button>
       </div>
     </a-spin>
   </a-modal>

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

@@ -32,7 +32,7 @@
             </a-col>
           </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
+            <a-button type="primary" class="button-info" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin: 0 5px">
               {{ advanced ? '收起' : '展开' }}

+ 3 - 2
src/views/salesManagement/salesReturn/detail.vue

@@ -12,8 +12,8 @@
         <template slot="extra">
           <a-button
             key="3"
-            type="primary"
-            class="button-error"
+            type="default"
+            class="button-info"
             id="salesReturnEdit-preview-btn"
             v-if="$hasPermissions('B_salesReturnPrint')"
             :disabled="chooseLoadData.length==0"
@@ -26,6 +26,7 @@
             v-if="$hasPermissions('B_salesReturnPrint')"
             :disabled="chooseLoadData.length==0"
             @click="handlePrint('print')">快捷打印</a-button>
+          <a-divider type="vertical" />
           <a-button
             key="1"
             type="primary"

+ 4 - 2
src/views/salesManagement/salesReturn/list.vue

@@ -98,9 +98,11 @@
         <template slot="salesReturnBillNo" slot-scope="text, record">
           <div v-if="$hasPermissions('B_salesReturnDetail')">
             <a-badge :count="'改'+record.changeTimes" :offset="[16,-13]" v-if="record.changeTimes>0" class="badge-con-t">
-              <span style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+              <a-button size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</a-button>
+              <!-- <span style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span> -->
             </a-badge>
-            <span v-else style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+            <a-button v-else size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</a-button>
+            <!-- <span v-else style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span> -->
           </div>
           <div v-else>{{ record.salesBillNo }}</div>
         </template>

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

@@ -65,7 +65,7 @@
       <template slot="action" slot-scope="text, record">
         <a-button
           size="small"
-          type="primary"
+          type="link"
           class="button-info"
           :loading="newLoading"
           :disabled="grabFlag == '1'&&record.refundableQty==0"

+ 1 - 0
src/views/salesManagement/salesReturn/salesReturnCheck.vue

@@ -189,6 +189,7 @@ export default {
     },
     // 获取单据详细
     getOrderDetail () {
+      this.rowSelectionInfo = null
       salesReturnDetail({ sn: this.orderSn }).then(res => {
         this.ordeDetail = res.data || null
       })

+ 9 - 9
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -13,20 +13,20 @@
         <queryPart ref="partQuery" :newLoading="isInster" @add="saveProduct"></queryPart>
       </a-card>
       <a-card size="small" :bordered="false" class="salesReturnEdit-cont">
-        <!-- alert -->
-        <a-alert style="margin-bottom: 10px;" type="info">
-          <div slot="message" class="total-bar">
-            <div style="position: relative;width: 100%;">
+        <div style="position: relative;width: 100%;">
+          <!-- alert -->
+          <a-alert style="margin-bottom: 10px;width: 80%;" type="info">
+            <div slot="message" class="total-bar">
               <div>
                 <span v-if="$hasPermissions('B_isShowPrice')">退货总金额:{{ ordeDetail&&(ordeDetail.totalAmount || ordeDetail.totalAmount==0) ? ordeDetail.totalAmount : '--' }}元;</span>
                 <span>退货总数量:{{ ordeDetail&&(ordeDetail.totalQty || ordeDetail.totalQty==0) ? ordeDetail.totalQty : '--' }};</span>
               </div>
-              <div style="position: absolute;right: 0;top: -3px;">
-                <a-button size="small" type="primary" class="button-info" id="salesReturnEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
-              </div>
             </div>
+          </a-alert>
+          <div style="position: absolute;right: 0;top: 3px;">
+            <a-button size="small" type="primary" class="button-info" id="salesReturnEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
           </div>
-        </a-alert>
+        </div>
         <!-- 已选配件列表 -->
         <s-table
           class="sTable"
@@ -72,7 +72,7 @@
           <template slot="action" slot-scope="text, record">
             <a-button
               size="small"
-              type="primary"
+              type="link"
               :loading="delLoading"
               class="button-error"
               @click="handleDel(record)"

+ 9 - 9
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -13,20 +13,20 @@
         <queryPart ref="queryPart" :newLoading="isInster" @add="saveProduct"></queryPart>
       </a-card>
       <a-card size="small" :bordered="false" class="salesReturnEdit-cont">
-        <!-- alert -->
-        <a-alert style="margin-bottom: 10px;" type="info">
-          <div slot="message" class="total-bar">
-            <div style="position: relative;width: 100%;">
+        <div style="position: relative;width: 100%;">
+          <!-- alert -->
+          <a-alert style="margin-bottom: 10px;width:80%;" type="info">
+            <div slot="message" class="total-bar">
               <div>
                 <span v-if="$hasPermissions('B_isShowPrice')">退货总金额:<strong>{{ ordeDetail&&(ordeDetail.totalAmount || ordeDetail.totalAmount==0) ? ordeDetail.totalAmount : '--' }}</strong>元;</span>
                 <span>退货总数量:<strong>{{ ordeDetail&&(ordeDetail.totalQty || ordeDetail.totalQty==0) ? ordeDetail.totalQty : '--' }}</strong>;</span>
               </div>
-              <div style="position: absolute;right: 0;top: -3px;">
-                <a-button size="small" type="primary" class="button-info" id="salesReturnEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
-              </div>
             </div>
+          </a-alert>
+          <div style="position: absolute;right: 0;top: 3px;">
+            <a-button size="small" type="primary" class="button-info" id="salesReturnEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
           </div>
-        </a-alert>
+        </div>
         <!-- 已选配件列表 -->
         <s-table
           class="sTable"
@@ -78,7 +78,7 @@
           <template slot="action" slot-scope="text, record">
             <a-button
               size="small"
-              type="primary"
+              type="link"
               :loading="delLoading"
               class="button-error"
               @click="handleDel(record)"

+ 2 - 3
src/views/salesManagement/waitDispatch/edit.vue

@@ -25,8 +25,7 @@
         </div>
         <div style="margin: 0 0 10px 0;">
           <a-button
-            type="primary"
-            class="button-error"
+            type="danger"
             @click="delSalerDetailAll"
             :loading="delLoading"
             id="waitDispatch-del-all">批量移除</a-button>
@@ -80,7 +79,7 @@
           <template slot="action" slot-scope="text, record">
             <a-button
               size="small"
-              type="primary"
+              type="link"
               :loading="delLoading"
               class="button-error"
               @click="handleDel(record)"

+ 5 - 5
src/views/salesManagement/waitDispatch/queryPart.vue

@@ -44,7 +44,7 @@
             </a-form-item>
           </a-col>
           <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
+            <a-button type="primary" class="button-info" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
           </a-col>
         </a-row>
@@ -52,9 +52,9 @@
     </div>
     <!-- 按钮 -->
     <div class="table-operator">
-      <a-button type="primary" :disabled="newLoading" class="button-error" @click="handlePlAdd">批量添加</a-button>
-      <a-button type="primary" :disabled="newLoading" class="button-info" @click="handlePlCancel">批量取消</a-button>
-      <a-button type="primary" :disabled="newLoading" class="button-warning" @click="handleOneDispatch">有货一键下推</a-button>
+      <a-button type="primary" :disabled="newLoading" class="button-info" @click="handlePlAdd">批量添加</a-button>
+      <a-button type="danger" :disabled="newLoading" class="button-error" @click="handlePlCancel">批量取消</a-button>
+      <a-button type="default" :disabled="newLoading" @click="handleOneDispatch">有货一键下推</a-button>
     </div>
     <!-- alert -->
     <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData">
@@ -111,7 +111,7 @@
       <template slot="action" slot-scope="text, record">
         <a-button
           size="small"
-          type="primary"
+          type="link"
           class="button-info"
           :loading="newLoading"
           @click="handleAdd(record)"