lilei 1 éve
szülő
commit
af327f4d40
24 módosított fájl, 90 hozzáadás és 84 törlés
  1. 1 1
      src/views/expenseManagement/expenseReimbursement/baseDataModal.vue
  2. 2 2
      src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue
  3. 1 1
      src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue
  4. 1 1
      src/views/expenseManagement/expenseReimbursement/list.vue
  5. 1 1
      src/views/expenseManagement/expenseReimbursement/productInfoModal.vue
  6. 28 20
      src/views/purchasingManagement/purchaseReturn/detailModal.vue
  7. 2 2
      src/views/salesManagement/outboundOrder/selectGlOrderModal.vue
  8. 3 2
      src/views/salesManagement/outboundOrder/sendGoodModal.vue
  9. 8 7
      src/views/salesManagement/pushOrderManagement/detail.vue
  10. 2 2
      src/views/salesManagement/pushOrderManagement/detailForOut.vue
  11. 1 1
      src/views/salesManagement/receiptPrint/list.vue
  12. 2 1
      src/views/salesManagement/salesQueryNew/comps/productNormalList.vue
  13. 6 13
      src/views/salesManagement/salesQueryNew/detail.vue
  14. 4 4
      src/views/salesManagement/salesQueryNew/edit.vue
  15. 5 5
      src/views/salesManagement/salesQueryNew/receivingAddress/chooseAddressModal.vue
  16. 1 1
      src/views/salesManagement/salesQueryNew/receivingAddress/editAddressModal.vue
  17. 2 3
      src/views/salesManagement/salesQueryNew/stockOutDetailModal.vue
  18. 4 1
      src/views/salesManagement/sendOutOrder/detailModal.vue
  19. 1 1
      src/views/salesManagement/waitDispatchNew/detailProductList.vue
  20. 2 2
      src/views/salesManagement/waitDispatchNew/edit.vue
  21. 3 3
      src/views/salesManagement/waitDispatchNew/queryPart.vue
  22. 7 7
      src/views/salesReturnManagement/billOfLading/add.vue
  23. 1 1
      src/views/salesReturnManagement/salesReturn/chooseCustomModal.vue
  24. 2 2
      src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/baseDataModal.vue

@@ -90,8 +90,8 @@
           </a-col>
         </a-row>
         <div style="text-align: center;margin-top: 20px;">
+          <a-button @click="cancel" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
           <a-button type="primary" :loading="spinning" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="cancel" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
         </div>
       </a-form-model>
     </a-spin>

+ 2 - 2
src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue

@@ -45,9 +45,9 @@
           </a-form-model>
         </div>
         <div class="btn-cont">
+          <a-button id="departUser-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
+          <a-button :loading="uploading" style="margin-right: 15px;" @click="updateUser">刷新人员</a-button>
           <a-button type="primary" id="departUser-save" @click="handleSave">确定</a-button>
-          <a-button :loading="uploading" style="margin-left: 15px;" @click="updateUser">刷新人员</a-button>
-          <a-button id="departUser-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
         </div>
       </div>
     </a-spin>

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -103,8 +103,8 @@
           <epenseCdfModal ref="epenseCdf" :list="form.detailSplitList" @fyTotal="getFyTotal"></epenseCdfModal>
         </div>
         <div class="btn-cont">
+          <a-button id="epenseDetailModal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="epenseDetailModal-save" @click="handleSave">确定</a-button>
-          <a-button id="epenseDetailModal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
         </div>
       </div>
     </a-spin>

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

@@ -84,7 +84,7 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button type="primary" class="button-error" v-if="$hasPermissions('B_eRNew')" @click="handleEdit()">新增</a-button>
+        <a-button type="primary" v-if="$hasPermissions('B_eRNew')" @click="handleEdit()">新增</a-button>
         <a-button type="primary" :loading="spinning" @click="handlePlPrint()" ghost>批量打印</a-button>
         <span style="margin-left: 8px">
           <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/productInfoModal.vue

@@ -83,8 +83,8 @@
           </a-table>
         </div>
         <div class="btn-cont">
+          <a-button id="productInfoModal-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
           <a-button type="primary" id="productInfoModal-save" @click="handleSave">确定</a-button>
-          <a-button id="productInfoModal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
         </div>
       </div>
     </a-spin>

+ 28 - 20
src/views/purchasingManagement/purchaseReturn/detailModal.vue

@@ -9,25 +9,33 @@
     @cancel="isShow=false"
     width="80%">
     <div>
-      <a-descriptions size="small" :column="3" style="margin-bottom: 10px;">
-        <a-descriptions-item label="采购退货单号">{{ detailsData&&detailsData.sparePartsReturnNo || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="供应商名称">{{ detailsData&&detailsData.supplier&&detailsData.supplier.supplierName || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="退货原因">{{ detailsData&&detailsData.returnReasonDictValue || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="退货仓库">{{ detailsData&&detailsData.warehouseName || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="创建时间">{{ detailsData&&detailsData.createDate || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="出库时间" v-if="detailsData&&detailsData.state!='AUDIT_REJECT'">{{ detailsData&&detailsData.auditDate || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="出库时间" v-else>--</a-descriptions-item>
-        <a-descriptions-item label="业务状态">{{ detailsData&&detailsData.stateDictValue || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="补充说明" :span="3">{{ detailsData&&detailsData.explainInfo || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="附件" :span="3">
-          <span v-if="detailsData&&detailsData.attachmentList&&detailsData.attachmentList.length>0">
-            <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailsData.attachmentList" :key="item.id">
-              {{ item.fileName }}
-            </a>
-          </span>
-          <span v-else>--</span>
-        </a-descriptions-item>
-      </a-descriptions>
+      <!-- 基础信息 -->
+      <a-collapse :activeKey="['1']" style="margin-bottom:10px">
+        <a-collapse-panel key="1">
+          <template slot="header">
+            基础信息
+          </template>
+           <a-descriptions size="small" :column="3" style="margin-bottom: 10px;">
+             <a-descriptions-item label="采购退货单号">{{ detailsData&&detailsData.sparePartsReturnNo || '--' }}</a-descriptions-item>
+             <a-descriptions-item label="供应商名称">{{ detailsData&&detailsData.supplier&&detailsData.supplier.supplierName || '--' }}</a-descriptions-item>
+             <a-descriptions-item label="退货原因">{{ detailsData&&detailsData.returnReasonDictValue || '--' }}</a-descriptions-item>
+             <a-descriptions-item label="退货仓库">{{ detailsData&&detailsData.warehouseName || '--' }}</a-descriptions-item>
+             <a-descriptions-item label="创建时间">{{ detailsData&&detailsData.createDate || '--' }}</a-descriptions-item>
+             <a-descriptions-item label="出库时间" v-if="detailsData&&detailsData.state!='AUDIT_REJECT'">{{ detailsData&&detailsData.auditDate || '--' }}</a-descriptions-item>
+             <a-descriptions-item label="出库时间" v-else>--</a-descriptions-item>
+             <a-descriptions-item label="业务状态">{{ detailsData&&detailsData.stateDictValue || '--' }}</a-descriptions-item>
+             <a-descriptions-item label="补充说明" :span="3">{{ detailsData&&detailsData.explainInfo || '--' }}</a-descriptions-item>
+             <a-descriptions-item label="附件" :span="3">
+               <span v-if="detailsData&&detailsData.attachmentList&&detailsData.attachmentList.length>0">
+                 <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailsData.attachmentList" :key="item.id">
+                   {{ item.fileName }}
+                 </a>
+               </span>
+               <span v-else>--</span>
+             </a-descriptions-item>
+           </a-descriptions>
+        </a-collapse-panel>
+      </a-collapse>
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           <span>产品款数:<strong>{{ statisticsObj&&statisticsObj.totalCategory|| '--' }}</strong>;</span>
@@ -169,7 +177,7 @@ export default {
 <style lang="less">
   .confirmationDetail-modal{
     .ant-modal-body {
-      padding: 40px 40px 24px;
+      padding: 20px 40px 24px;
     }
     .btn-cont {
       text-align: center;

+ 2 - 2
src/views/salesManagement/outboundOrder/selectGlOrderModal.vue

@@ -154,8 +154,8 @@ export default {
         { title: '业务单号', dataIndex: 'outBizSubNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'demanderName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'demanderName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品款数', dataIndex: 'productTotalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单据审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },

+ 3 - 2
src/views/salesManagement/outboundOrder/sendGoodModal.vue

@@ -206,8 +206,8 @@
         </div>
       </div>
       <div class="btn-box">
-        <a-button size="large" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
-        <a-button size="large" type="primary" @click="handleCommonOk">{{ okText }}</a-button>
+        <a-button @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
+        <a-button type="primary" @click="handleCommonOk">{{ okText }}</a-button>
       </div>
     </a-spin>
     <!-- 关联单据 -->
@@ -326,6 +326,7 @@ export default {
       this.sendBillStockOutList = data
       this.customeName = data[0].demanderName
       this.isEdit = false
+      this.addItem()
       this.getProductTotal()
       if (customeInfo) {
         this.form.customerCacateName = customeInfo.consigneeName

+ 8 - 7
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="salesDetail-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont" :style="{marginBottom:!outBizSubSn&&!bizSn?'10px':'0px'}">
+      <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont" :style="{marginBottom:!outBizSubSn&&!bizSn?'6px':'0px'}">
         <template slot="subTitle" v-if="!outBizSubSn&&!bizSn">
           <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
           <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.dispatchBillNo }}</span>
@@ -46,7 +46,7 @@
         </template>
       </a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="salesDetail-cont" v-if="showDetail">
+      <a-card size="small" :bordered="false" class="salesDetail-cont" v-show="showDetail">
         <div>
           <a-descriptions size="small" :column="3">
             <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
@@ -69,7 +69,7 @@
         </div>
       </a-card>
       <!-- 弹框基础信息 -->
-      <div style="padding: 10px 12px 0 12px" v-if="outBizSubSn||bizSn">
+      <div style="padding: 10px 12px 0 12px" v-show="outBizSubSn||bizSn">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
              <a-descriptions size="small" :column="3">
@@ -109,8 +109,9 @@
         </a-alert>
         <!-- 列表 -->
         <s-table
-          class="sTable fixPagination"
-          :style="{ height: !outBizSubSn&&!bizSn ? 'auto' : tableHeight+65+'px' }"
+          class="sTable"
+          :class="outBizSubSn||bizSn?'':'fixPagination'"
+          :style="{ height: outBizSubSn||bizSn ? 'auto' : tableHeight+65+'px' }"
           ref="table"
           size="small"
           :rowKey="(record) => record.no"
@@ -257,7 +258,7 @@ export default {
       this.$router.push({ name: 'pushOrderManagementList' })
     },
     getTableHeight(){
-      this.tableHeight = this.outBizSubSn || this.bizSn ? 300 : (window.innerHeight - (this.showDetail ? 407 : 265))
+      this.tableHeight = this.outBizSubSn || this.bizSn ? 300 : (window.innerHeight - (this.showDetail ? 403 : 265))
     },
     //  详情
     getDetail () {
@@ -373,7 +374,7 @@ export default {
 <style lang="less">
   .salesDetail-wrap{
     .salesDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .footer-cont{
       margin-top: 5px;

+ 2 - 2
src/views/salesManagement/pushOrderManagement/detailForOut.vue

@@ -16,7 +16,7 @@
             @click="handlePrint('DISPATCH_BILL')">发货打印</a-button>
           <a-button
             key="3"
-            type="default"
+            type="primary"
             class="button-info"
             id="salesDetail-fhfl-print-btn"
             :disabled="localDataSource.length==0"
@@ -24,7 +24,7 @@
           <a-divider type="vertical" />
           <a-button
             key="2"
-            type="primary"
+            type="default"
             class="button-info"
             id="purchaseOrderDetail-export-btn"
             :disabled="localDataSource.length==0"

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

@@ -74,7 +74,7 @@
         </div>
         <!-- 操作按钮 -->
         <div class="table-operator" v-if="$hasPermissions('B_SkPrint')">
-          <a-button type="primary" ghost :loading="spinning" @click="handlePlPrint()">批量打印</a-button>
+          <a-button type="primary" :loading="spinning" @click="handlePlPrint()">批量打印</a-button>
           <span style="margin:0 10px">
             <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
           </span>

+ 2 - 1
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -172,7 +172,7 @@
     <!-- 导入产品 -->
     <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: salesBillSn}" @close="closeGuideModel" @ok="hanldeOk" />
     <!-- 仓库设置 -->
-    <setWarehouse :show="openWarehouseModal" :title="warehouseTit" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false;warehouseTit = ''"></setWarehouse>
+    <setWarehouse :show="openWarehouseModal" :title="warehouseTit" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false"></setWarehouse>
   </div>
 </template>
 
@@ -430,6 +430,7 @@ export default {
           _this.$message.warning('请先选择要设置的产品!')
         } else {
           _this.openWarehouseModal = true
+          _this.warehouseTit = '部分仓库设置'
         }
       } else if (e.key == 1) { // 删除已选项
         this.handleBatchDel()

+ 6 - 13
src/views/salesManagement/salesQueryNew/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="salesDetail-wrap" :style="{paddingBottom:hideFooter?'0px':'60px'}">
+  <div class="salesDetail-wrap" :style="{paddingBottom:hideFooter?'0px':'45px'}">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont">
         <template slot="subTitle" v-if="!bizSn">
@@ -48,7 +48,7 @@
         </template>
       </a-page-header>
       <!-- 基础信息 -->
-      <a-card size="small" :bordered="false" class="pages-wrap" style="margin-bottom: 8px;" v-show="showDetail">
+      <a-card size="small" :bordered="false" class="pages-wrap" style="margin-bottom: 6px;" v-show="showDetail">
         <div style="padding: 0;">
           <a-descriptions size="small" :column="3">
             <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
@@ -129,7 +129,6 @@
     </a-spin>
     <div class="affix-cont" :style="{padding:hideFooter?0:'7px 0 4px'}">
       <a-button
-        size="large"
         style="width: 100px;"
         :disabled="spinning"
         type="primary"
@@ -143,8 +142,6 @@
       <a-button
         type="primary"
         :disabled="spinning"
-        class="button-info"
-        size="large"
         style="width: 100px;margin: 0 20px;"
         id="salesDetail-edit-btn"
         v-if="detailData&&detailData.salesBillSource == 'SALES' && (detailData.billStatus == 'WAIT_SUBMIT' || detailData.billStatus == 'WAIT_AUDIT' || detailData.billStatus == 'AUDIT_REJECT' || detailData.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesEdit')"
@@ -153,11 +150,9 @@
         编辑
       </a-button>
       <a-button
-        size="large"
         style="width: 100px;margin: 0 20px;"
         :disabled="spinning"
         type="primary"
-        class="button-info"
         id="salesDetail-edit-btn"
         v-if="detailData&&detailData.salesBillSource == 'PURCHASE' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesEdit')"
         @click="handleEdit()"
@@ -165,11 +160,10 @@
         改单
       </a-button>
       <a-button
-        size="large"
         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')"
@@ -177,7 +171,6 @@
         一键审核
       </a-button>
       <a-button
-        size="large"
         style="width: 100px;"
         type="primary"
         class="button-warning"
@@ -273,7 +266,7 @@ export default {
       return detailData&&(detailData.billStatus == 'HQ_CHANGE'|| (detailData.salesBillSource != 'SALES'&&detailData.billStatus == 'AUDIT_REJECT') ||detailData.billStatus == 'FINISH'||detailData.billStatus == 'OUTING_WAREHOUSE')
     },
     pageHeight () {
-      return window.innerHeight - 333 + (this.hideFooter ? 50 : 0)
+      return window.innerHeight - 305 + (this.hideFooter ? 45 : 0)
     }
   },
   methods: {
@@ -457,14 +450,14 @@ export default {
   .salesDetail-wrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
+    padding-bottom: 45px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
       overflow-y: auto;
       height: 100%;
     }
     .salesDetail-cont{
-      margin-bottom: 10px;
+      margin-bottom: 6px;
     }
     .active-title{
       display: flex;

+ 4 - 4
src/views/salesManagement/salesQueryNew/edit.vue

@@ -127,7 +127,7 @@
       <div>
         <a-button
           size="large"
-          style="padding: 0 60px;"
+          style="padding: 0 40px;"
           :disabled="spinning"
           type="primary"
           class="button-primary"
@@ -637,14 +637,14 @@ export default {
   .salesNewEdit-wrap{
     position: relative;
     height: 100%;
-    padding-bottom: 75px;
+    padding-bottom: 65px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
       overflow-y: auto;
       height: 100%;
     }
     .salesEdit-cont{
-      margin: 10px 0;
+      margin: 6px 0;
     }
     .redStyle{
       font-weight: bold;
@@ -668,7 +668,7 @@ export default {
         padding: 0!important;
     }
     .affix-cont{
-      padding: 10px 15px;
+      padding: 6px 12px;
       text-align: right;
       display: flex;
       justify-content: space-between;

+ 5 - 5
src/views/salesManagement/salesQueryNew/receivingAddress/chooseAddressModal.vue

@@ -11,7 +11,7 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="chooseAddressList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button id="chooseAddressList-add" type="primary" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -41,21 +41,21 @@
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
-            type="primary"
+            type="link"
             class="button-success"
             v-if="record.defaultFlag!=1"
             @click="handleDefault(record)"
             id="chooseAddressList-default-btn">设为默认</a-button>
           <a-button
             size="small"
-            type="primary"
+            type="link"
             class="button-info"
             @click="handleEdit(record)"
             id="chooseAddressList-edit-btn"
           >编辑</a-button>
           <a-button
             size="small"
-            type="primary"
+            type="link"
             class="button-error"
             @click="handleDel(record)"
             id="chooseAddressList-del-btn"
@@ -65,7 +65,7 @@
         <template slot="choose" slot-scope="text, record">
           <a-button
             size="small"
-            type="primary"
+            type="link"
             class="button-primary"
             @click="handleChoose(record)"
             id="chooseAddressList-choose-btn">选择</a-button>

+ 1 - 1
src/views/salesManagement/salesQueryNew/receivingAddress/editAddressModal.vue

@@ -68,8 +68,8 @@
             allowClear />
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
+          <a-button @click="isShow=false" style="margin-right: 15px" id="editAddress-btn-back">取消</a-button>
           <a-button type="primary" @click="handleSubmit" id="editAddress-btn-submit">保存</a-button>
-          <a-button @click="isShow=false" style="margin-left: 15px" id="editAddress-btn-back">返回</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>

+ 2 - 3
src/views/salesManagement/salesQueryNew/stockOutDetailModal.vue

@@ -39,9 +39,7 @@
         </template>
       </s-table>
       <div class="btn-cont" style="padding:20px 20px 0;text-align: center;">
-        <a-button @click="isShow=false">取消</a-button>
         <a-button
-          style="margin-left: 10px"
           class="button-warning"
           type="primary"
           @click="handleExport"
@@ -49,13 +47,14 @@
           :loading="exportLoading"
           id="allocateBillList-export">导出Excel</a-button>
         <a-button
-          style="margin-left: 5px"
+          style="margin-left: 10px"
           class="button-warning"
           type="primary"
           @click="handleClassifyExport"
           :disabled="disabled"
           :loading="exportClassifyLoading"
           id="allocateBillList-export">分类导出Excel</a-button>
+          <a-button style="margin-left: 10px" @click="isShow=false">关闭</a-button>
        </div>
     </a-spin>
   </a-modal>

+ 4 - 1
src/views/salesManagement/sendOutOrder/detailModal.vue

@@ -14,7 +14,6 @@
           <a-alert type="info" v-if="sendBillStockOutList.length">
             <div slot="message">{{ customeName||'' }},共 {{ sendBillStockOutList && sendBillStockOutList.length }} 个出库单,产品款数合计 <span>{{ productTotal&&productTotal.totalCategory }}</span> ,产品数量合计 <span>{{ productTotal&&productTotal.totalQty }}</span>。</div>
           </a-alert>
-          <a-button size="small" v-if="type==1" @click="showTipModal = true" type="primary">发货单打印</a-button>
         </div>
         <div>
           <a-table class="sTable" :columns="outColumns" :pagination="false" :data-source="sendBillStockOutList" bordered></a-table>
@@ -87,6 +86,10 @@
         <a-button @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
         <a-button type="primary" @click="handleCommonOk">{{ okText }}</a-button>
       </div>
+      <div class="btn-box" v-if="type==1">
+        <a-button @click="handleCommonCancel">{{ cancelText }}</a-button>
+        <a-button @click="showTipModal = true" type="primary">发货单打印</a-button>
+      </div>
       <!-- 发货打印 -->
       <commonModal
         modalTit="发货打印预览"

+ 1 - 1
src/views/salesManagement/waitDispatchNew/detailProductList.vue

@@ -3,7 +3,7 @@
       <!-- alert -->
       <div style="margin-bottom: 10px;display: flex;align-items: center;" v-if="!showEmpty">
         <div style="display: flex;align-items: center;">
-          <a-button type="danger" :disabled="newLoading" class="button-info" @click="delSalerDetailAll">批量删除</a-button>
+          <a-button type="danger" :disabled="newLoading" @click="delSalerDetailAll">批量删除</a-button>
           <span style="margin-left: 10px;" v-if="selectedRowKeys.length">已选 {{ selectedRowKeys.length }} 项</span>
         </div>
         <div style="padding-left: 20px;">

+ 2 - 2
src/views/salesManagement/waitDispatchNew/edit.vue

@@ -35,10 +35,10 @@
     </a-spin>
     <div class="affix-cont">
       <a-button
-        size="large"
-        style="padding: 0 60px;"
+        style="padding: 0 50px;"
         :disabled="spinning"
         type="primary"
+        size="large"
         class="button-primary"
         @click="handleDispatch()"
         :loading="loading"

+ 3 - 3
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -49,7 +49,7 @@
             </a-form-item>
           </a-col>
           <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
-            <a-button type="primary" class="button-info" @click="searchTable" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
+            <a-button type="primary" @click="searchTable" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
           </a-col>
         </a-row>
@@ -60,8 +60,8 @@
     <div style="margin-bottom: 10px;display: flex;align-items: center;" v-if="detailData">
       <div style="display: flex;align-items: center;">
         <a-button type="primary" :disabled="newLoading" class="button-info" @click="handlePlAdd">批量添加</a-button>
-        <a-button type="danger" v-if="hasPrompActive" :disabled="newLoading" class="button-error" @click="handleAllCancel">整单取消</a-button>
-        <a-button type="danger" v-else :disabled="newLoading" class="button-error" @click="handlePlCancel">批量取消</a-button>
+        <a-button type="danger" v-if="hasPrompActive" :disabled="newLoading" @click="handleAllCancel">整单取消</a-button>
+        <a-button type="danger" v-else :disabled="newLoading" @click="handlePlCancel">批量取消</a-button>
         <a-tooltip placement="top" v-if="hasPrompActive" style="margin-left:6px;">
           <template slot="title">
             <span>参加促销活动的销售单,不能单个取消产品,只能整单取消。</span>

+ 7 - 7
src/views/salesReturnManagement/billOfLading/add.vue

@@ -171,20 +171,20 @@
     <div class="affix-cont">
       <a-button
         type="primary"
-        class="button-primary"
+        size="large"
+        class="button-success"
         :disabled="spinning"
         id="billOfLadingEdit-save-btn"
-        size="large"
         @click="handleSave('save')"
-        style="padding: 0 60px;">保存</a-button>
+        style="padding: 5px 50px;">保存</a-button>
       <a-button
         type="primary"
-        class="button-error"
+        class="button-primary"
+        size="large"
         :disabled="spinning"
         id="billOfLadingEdit-submit-btn"
-        size="large"
         @click="handleSave('submit')"
-        style="padding: 0 60px;">提交</a-button>
+        style="padding: 5px 50px;">提交</a-button>
     </div>
     <!-- 关联销退单 -->
     <selectXtModal
@@ -477,7 +477,7 @@ export default {
   .billOfLadingEdit-wrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
+    padding-bottom: 52px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
       overflow-y: scroll;

+ 1 - 1
src/views/salesReturnManagement/salesReturn/chooseCustomModal.vue

@@ -76,8 +76,8 @@
           </a-col>
         </a-row>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
+          <a-button @click="cancel" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
           <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
-          <a-button @click="cancel" style="margin-left: 15px" id="chooseCustom-btn-back">取消</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>

+ 2 - 2
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -70,7 +70,7 @@
                     <a-input v-model.trim="productForm.productName" allowClear placeholder="请输入产品名称"/>
                   </a-form-item>
                 </a-col>
-                <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+                <a-col :md="6" :sm="24">
                   <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled">查询</a-button>
                   <a-button style="margin-left: 5px" @click="resetSearchForm(true)" :disabled="disabled">重置</a-button>
                 </a-col>
@@ -591,7 +591,7 @@ export default {
       height: 100%;
     }
     .salesReturnEdit-cont{
-      margin-top: 10px;
+      margin-top: 6px;
       .total-bar{
         display: flex;
         align-items: center;