Merge remote-tracking branch 'origin/master'

zkqy-ui/src/views/orderMange/components/dialogForm/OutStock.vue

@@ -1,5 +1,26 @@
 <template>
   <div class="table-container">
+    <el-row :gutter="20" class="mb10">
+      <el-col :span="8">
+        <div class="title_item">
+          <span class="label">合同号：</span>
+          <span class="label">{{ row.saleNo }}</span>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="title_item">
+          <span class="label">日期：</span>
+          <span class="label">{{ row.saleDate }}</span>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="title_item">
+          <span class="label">客户名称：</span>
+          <span class="label">{{ row.customName }}</span>
+        </div>
+      </el-col>
+    </el-row>
+
     <el-table
       :data="tableData"
       border
@@ -19,6 +40,13 @@
       <el-table-column prop="qrCode" label="码单号"> </el-table-column>
       <el-table-column prop="boxNum" label="箱号"> </el-table-column>
     </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getOutStockDetail(row)"
+    />
   </div>
 </template>
 
@@ -32,6 +60,14 @@ export default {
   data() {
     return {
       tableData: [],
+      row: {},
+
+      // 分页相关
+      total: 0,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
     };
   },
   computed: {},
@@ -84,14 +120,17 @@ export default {
     async getOutStockDetail(row) {
       console.log(row);
       let { saleNo } = row;
+      this.row = row;
       try {
         let payLoad = {
+          ...this.queryParams,
           saleOrderNo: saleNo,
         };
         let res = await outboundDetails(payLoad);
         if (res.code == 200) {
           console.log(res);
-          this.tableData = res.data;
+          this.tableData = res.rows;
+          this.total = res.total;
         } else {
           this.$message.error(res.msg);
         }

zkqy-ui/src/views/tablelist/commonTable/BtnMenuList.vue

@@ -157,8 +157,8 @@ export default {
         if (length == 0) {
           if (
             item.btnType == "DELETE" ||
-            item.btnType == "UPDATE" ||
-            item.btnType == "EXPORT"
+            item.btnType == "UPDATE"
+            // ||item.btnType == "EXPORT"
           ) {
             disabled = true;
           }

zkqy-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -1301,10 +1301,11 @@ export default {
             })
           );
         });
-      } else {
-        this.$message.warning("请至少勾选一条导出数据");
-        return;
       }
+      // else {
+      //   this.$message.warning("请至少勾选一条导出数据");
+      //   return;
+      // }
       this.queryParams.execlMap = JSON.stringify(this.queryParams.execlMap);
       this.download(
         process.env.VUE_APP_BASE_API1 + "common/export",