Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/views/saleManage/saleOrder/entrustedReceive/components/inventoryTable.vue

@@ -450,6 +450,7 @@
             width: 150,
             prop: 'singlePrice',
             label: '单价',
+            headerSlot: 'headerTotalCount',
             slot: 'singlePrice',
             align: 'center'
           },

src/views/saleManage/saleOrder/invoice/components/product-listNew.vue

@@ -10,6 +10,59 @@
     :resizable="true"
   >
     <el-card shadow="never">
+      <el-form
+        size="small"
+        label-width="80px"
+        class="ele-form-search"
+        @keyup.enter.native="search"
+        @submit.native.prevent
+      >
+        <el-row :gutter="10">
+          <el-col :span="6">
+            <el-form-item label="编码">
+              <el-input
+                clearable
+                size="small"
+                v-model.trim="where.productCode"
+                placeholder="请输入"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="名称">
+              <el-input
+                clearable
+                size="small"
+                v-model.trim="where.productName"
+                placeholder="请输入"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" style="display: flex; justify-content: flex-end">
+            <el-form-item>
+              <el-button
+                size="mini"
+                type="primary"
+                icon="el-icon-search"
+                class="ele-btn-icon"
+                @click="search"
+              >
+                查询
+              </el-button>
+
+              <el-button
+                @click="search('reset')"
+                icon="el-icon-refresh"
+                class="ele-btn-icon"
+                size="mini"
+                >重置</el-button
+              >
+
+              <slot></slot>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       <ele-pro-table
         ref="table"
         :columns="columns"
@@ -36,6 +89,10 @@
       return {
         visible: false,
         datasource: [],
+        where: {
+          productCode: '',
+          productName: ''
+        },
         columns: [
           {
             width: 45,
@@ -201,33 +258,50 @@
             }
           }
         ],
-        selection: []
+        selection: [],
+        oldDatasource: []
       };
     },
 
     watch: {},
     methods: {
       open(datasource) {
+        this.oldDatasource = datasource;
         this.datasource = datasource || [];
         this.visible = true;
       },
-
+      search(type) {
+        if (type == 'reset') {
+          this.where = {
+            productName: '',
+            productCode: ''
+          };
+        }
+        if (this.where.productName == '' && this.where.productCode == '') {
+          this.datasource = this.oldDatasource;
+          return
+        }
+        this.datasource = this.oldDatasource.filter((item) => {
+          if (
+            this.where.productName &&
+            item.productName.includes(this.where.productName)
+          ) {
+            return item;
+          }
+          if (
+            this.where.productCode &&
+            item.productCode.includes(this.where.productCode)
+          ) {
+            return item;
+          }
+        });
+      },
       selected() {
         if (!this.selection.length) {
           return this.$message.warning('请至少选择一条数据');
         }
-        // let idKey =
-        //   this.type == 'receive' ? 'receiveProductId' : 'sendProductId';
-        // console.log(this.current);
-        // console.log(this.currentData);
-
-        // let index = this.currentData.findIndex(
-        //   (r) => r[idKey] == this.current.id
-        // );
-        // if (index != -1 && ['receive', 'send'].includes(this.type)) {
-        //   return this.$message.error('选择的产品已经存在列表了');
-        // }
         this.$emit('changeParent', this.selection);
+
         this.visible = false;
       }
     }

src/views/saleManage/saleOrder/invoice/index.vue

@@ -79,6 +79,11 @@
                 > -->
               </el-dropdown-menu>
             </el-dropdown>
+            <exportButton
+              fileName="销售发货单"
+              apiUrl="/eom/saleordersendrecord/export"
+              :params="params"
+            ></exportButton>
           </template>
 
           <!-- 查看详情列 -->
@@ -256,6 +261,7 @@
   import { enterprisePage } from '@/api/contractManage/contractBook';
   import { getSendSaleOrderrecordDetailSplit } from '@/api/saleManage/saleordersendrecord';
   import { getWarehouseListByIds } from '@/api/purchasingManage/returnGoods';
+  import exportButton from '@/components/upload/exportButton.vue';
 
   export default {
     mixins: [dictMixins, tabMixins],
@@ -273,7 +279,7 @@
       printTemplateJsYp,
       printTemplateWl,
       printTemplateBs,
-      printTemplateJr
+      printTemplateJr,exportButton
     },
 
     //客户管理数据
@@ -293,6 +299,7 @@
     },
     data() {
       return {
+        params: {},
         activeComp: 'saleorder',
         tabOptions: [
           { key: 'saleorder', name: '销售订单' },
@@ -458,6 +465,11 @@
         if (this.contactData.id) {
           where['contactId'] = this.contactData.id;
         }
+        this.params = {
+          pageNum: page,
+          size: limit,
+          ...where
+        };
         return getSendTableList({
           pageNum: page,
           size: limit,