lilei 1 éve
szülő
commit
6a92ee06d9

+ 2 - 2
src/views/salesManagement/salesQueryNew/chooseCustomModal.vue

@@ -34,8 +34,8 @@
           <a-button type="link" :disabled="!form.buyerSn" id="chooseCustom-chooseAddr" @click="handleChoose">{{ addressVal }} >></a-button>
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-          <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-button @click="cancel" id="chooseCustom-btn-back">取消</a-button>
+          <a-button type="primary" style="margin-left: 15px" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">保存</a-button>
         </a-form-model-item>
       </a-form-model>
     </a-spin>

+ 23 - 7
src/views/salesManagement/salesQueryNew/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="salesDetail-wrap">
+  <div class="salesDetail-wrap" :style="{paddingBottom:hideFooter?'0px':'60px'}">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont">
         <template slot="subTitle" v-if="!bizSn">
@@ -126,7 +126,7 @@
         </div>
       </a-card>
     </a-spin>
-    <div class="affix-cont">
+    <div class="affix-cont" :style="{padding:hideFooter?0:'7px 0 4px'}">
       <a-button
         size="large"
         style="width: 100px;"
@@ -140,13 +140,13 @@
         审核
       </a-button>
       <a-button
-        type="default"
+        type="primary"
         :disabled="spinning"
         class="button-info"
         size="large"
         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')"
+        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')"
         @click="handleEdit()"
       >
         编辑
@@ -155,7 +155,7 @@
         size="large"
         style="width: 100px;margin: 0 20px;"
         :disabled="spinning"
-        type="default"
+        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')"
@@ -168,13 +168,21 @@
         style="width: 100px;"
         :disabled="spinning"
         type="primary"
-        class="button-success"
+        class="button-info"
         id="salesDetail-batchAudit-btn"
         v-if="detailData&&detailData.billStatus == 'WAIT_AUDIT'&&$hasPermissions('B_salesAudit')"
         @click="handleAudit('batch')"
       >
         一键审核
       </a-button>
+      <a-button
+        size="large"
+        style="width: 100px;"
+        type="primary"
+        class="button-warning"
+        v-if="detailData&&detailData.billStatus == 'WAIT_PUSH'&&$hasPermissions('B_salesDispatch')"
+        @click="handleDispatch(detailData)"
+      >下推</a-button>
     </div>
     <!-- 打印导出 -->
     <print-modal :openModal="openModal" :itemData="detailData" :nowType="nowType" @ok="handleOk" @close="closePrint" />
@@ -259,8 +267,12 @@ export default {
         return shippingAddrProvinceName + shippingAddrCityName + shippingAddrCountyName + shippingAddr
       }
     },
+    hideFooter (){
+      const detailData = this.detailData
+      return detailData&&(detailData.billStatus == 'HQ_CHANGE'|| (detailData.salesBillSource != 'SALES'&&detailData.billStatus == 'AUDIT_REJECT') ||detailData.billStatus == 'FINISH'||detailData.billStatus == 'OUTING_WAREHOUSE')
+    },
     pageHeight () {
-      return window.innerHeight - 330
+      return window.innerHeight - 333 + (this.hideFooter ? 50 : 0)
     }
   },
   methods: {
@@ -306,6 +318,10 @@ export default {
         })
       }
     },
+    // 下推
+    handleDispatch (row) {
+      this.$router.push({ name: 'waitDispatchNew', params: { salesBillSn: row.salesBillSn } })
+    },
     // 打开审核/一键审核弹框
     handleAudit (isBatch) {
       if (isBatch) { // 一键审核

+ 4 - 10
src/views/salesManagement/salesQueryNew/list.vue

@@ -98,7 +98,7 @@
             </template>
             <a-col :md="24" :sm="24" style="text-align: center;">
               <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
+              <a-button style="margin-left: 10px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
               <a-button
                 style="margin-left: 10px"
                 type="primary"
@@ -121,7 +121,7 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator" style="display: flex;justify-content: space-between;align-items: center;">
-          <div style="padding-right: 15px;"><a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesAdd')" @click="handleAdd">新增</a-button></div>
+          <div style="padding-right: 15px;"><a-button type="primary" v-if="$hasPermissions('B_salesAdd')" @click="handleAdd">新增</a-button></div>
           <div style="flex-grow: 1;display: flex;justify-content: space-between;align-items: center;">
             <div>
               <div>
@@ -151,7 +151,7 @@
         <s-table
           class="sTable fixPagination"
           ref="table"
-          :style="{ height: tableHeight+75+'px' }"
+          :style="{ height: tableHeight+82+'px' }"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
@@ -661,7 +661,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 265
+      this.tableHeight = window.innerHeight - tableSearchH - 270
     }
   },
   watch: {
@@ -715,12 +715,6 @@ export default {
         white-space: nowrap;
         text-overflow: ellipsis;
       }
-      // .warehouse_box>span::after{
-      //   content:',';
-      // }
-      // .warehouse_box>span:last-child::after{
-      //   content:'';
-      // }
     }
   }
 </style>