chenrui 2 rokov pred
rodič
commit
39f120a1e3

+ 11 - 0
src/views/salesManagement/pushOrderManagement/list.vue

@@ -64,6 +64,17 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="对单状态">
+                  <v-select
+                    v-model="queryParam.printStatus"
+                    ref="printStatus"
+                    id="pushOrder-printStatus"
+                    code="CHECK_STATUS"
+                    placeholder="请选择对单状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="pushOrder-subarea" v-model="queryParam.subareaSn"></subarea>

+ 21 - 2
src/views/salesManagement/salesQuery/edit.vue

@@ -66,13 +66,29 @@
               </a-form>
               <div style="position: absolute;right: 0;top: 3px;">
                 <span>已选{{ selectTotal }}项</span>
-                <a-button
+                <!-- <a-button
                   style="margin:0 15px;"
                   size="small"
                   type="danger"
                   class="button-info"
                   id="salesEdit-plDel-btn"
-                  @click="handleBatchDel">批量删除</a-button>
+                  @click="handleBatchDel">批量删除</a-button> -->
+                <a-dropdown>
+                  <a-menu slot="overlay" @click="handleMenuClick">
+                    <a-menu-item key="1">
+                      删除已选项
+                    </a-menu-item>
+                    <a-menu-item key="2">
+                      全部删除
+                    </a-menu-item>
+                  </a-menu>
+                  <a-button
+                    size="small"
+                    style="margin:0 15px;"
+                    type="danger"
+                    class="button-info"
+                    id="salesEdit-plDel-btn"> 批量删除 <a-icon type="down" /> </a-button>
+                </a-dropdown>
                 <a-button
                   size="small"
                   type="primary"
@@ -282,6 +298,9 @@ export default {
     }
   },
   methods: {
+    handleMenuClick (e) {
+
+    },
     // 表格选中项
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null

+ 43 - 2
src/views/salesManagement/salesQuery/stockOutDetailModal.vue

@@ -28,8 +28,21 @@
         bordered>
       </s-table>
       <div class="btn-cont" style="padding:20px 20px 0;text-align: center;">
-        <a-button @click="isShow=false">关闭</a-button>
-      </div>
+        <!-- <a-button @click="isShow=false">关闭</a-button> -->
+        <a-button
+          class="button-warning"
+          type="primary"
+          @click="handleExport"
+          :disabled="disabled"
+          :loading="exportLoading"
+          id="allocateBillList-export">导出Excel</a-button>
+        <a-button
+          style="margin-left: 5px"
+          @click="handleClassifyExport"
+          :disabled="disabled"
+          :loading="exportClassifyLoading"
+          id="allocateBillList-export">分类导出Excel</a-button>
+        </a-button></div>
     </a-spin>
   </a-modal>
 </template>
@@ -37,6 +50,7 @@
 <script>
 import { STable } from '@/components'
 import { salesStockoutDetail } from '@/api/salesDetail'
+import { hdExportExcel } from '@/libs/exportExcel'
 export default {
   name: 'StockOutDetail',
   components: { STable },
@@ -60,6 +74,9 @@ export default {
     return {
       spinning: false,
       isShow: this.openModal,
+      disabled: false,
+      exportLoading: false,
+      exportClassifyLoading: false,
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -75,6 +92,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.spinning = true
+        this.disabled = true
         delete parameter.tableId
         delete parameter.index
         return salesStockoutDetail({ isOos: 1, salesBillSn: this.salesBillSn }).then(res => {
@@ -93,6 +111,29 @@ export default {
       }
     }
   },
+  methods: {
+    handleExport () {
+      const _this = this
+      _this.exportLoading = true
+      _this.disabled = true
+      _this.spinning = true
+      hdExportExcel('api', '', '销售单缺货产品导出', function () {
+        _this.exportLoading = false
+        _this.spinning = false
+        _this.disabled = false
+      })
+    },
+    handleClassifyExport () {
+      this.exportClassifyLoading = true
+      this.disabled = true
+      this.spinning = true
+      hdExportExcel('api', '', '销售单缺货产品分类导出', function () {
+        this.exportClassifyLoading = false
+        this.spinning = false
+        this.disabled = false
+      })
+    }
+  },
   watch: {
     openModal (nVal, oVal) {
       this.isShow = nVal