【新增】发货单汇总-批量打印

src/views/supply/apply/apply_list.vue

@@ -100,7 +100,7 @@
         <div class="btn-group clearfix">
           <div class="fl">
             <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">发货申请</el-button>
-            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('add', $route.meta.roles)">退货申请</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('refund', $route.meta.roles)">退货申请</el-button>
             <el-button size="mini" type="warning" icon="el-icon-finished" @click="batchExamine" :disabled="multipleSelection.length < 1" v-if="$checkBtnRole('examine', $route.meta.roles)">批量审批</el-button>
           </div>
           <div class="fr">

src/views/supply/apply/components/apply_examine.vue

@@ -89,11 +89,23 @@
           </template>
         </el-table-column>
         <el-table-column align="right" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
+        <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.headerRemark" size="small"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
           </template>
         </el-table-column>
+        <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.invoiceRemark" size="small"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
       </el-table>
     </div>
 

src/views/supply/apply/engin_list.vue

@@ -110,7 +110,7 @@
         <div class="btn-group clearfix">
           <div class="fl">
             <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">发货申请</el-button>
-            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('add', $route.meta.roles)">退货申请</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('refund', $route.meta.roles)">退货申请</el-button>
             <el-button size="mini" type="warning" icon="el-icon-finished" @click="batchExamine" :disabled="multipleSelection.length < 1" v-if="$checkBtnRole('examine', $route.meta.roles)">批量审批</el-button>
           </div>
           <div class="fr">

src/views/supply/deliver/components/sum_print.vue

@@ -0,0 +1,121 @@
+<template>
+  <div class="detail-container">
+    <!-- <div class="top-container">
+      <el-radio-group v-model="currentType" size="medium" @change="changeType()">
+        <el-radio-button v-for="(item, index) in typeList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
+      </el-radio-group>
+    </div> -->
+
+    <div id="printMe">
+      
+      <PrintCommon :detailData="detailData" :company="company" v-if="currentType === 0" />
+      <PrintFoshan :detailData="detailData" :company="company" v-if="currentType === 1" />
+      <PrintGuangzhou :detailData="detailData" :company="company" v-if="currentType === 2" />
+      <PrintShaoguan :detailData="detailData" :company="company" v-if="currentType === 3" />
+
+    </div>
+    
+    <div class="page-footer">
+      <div class="footer">
+        <el-button  type="primary" icon="el-icon-printer" v-print="printObj">打 印</el-button>
+        <el-button @click="goBack">关 闭</el-button>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import print from 'vue-print-nb'
+import { getDeliverDetail, getEnginDetail } from "@/api/supply/deliver";
+import { addPrint } from "@/api/supply/pickup";
+import { getCompanyList } from "@/api/user";
+import PrintCommon from "@/components/Common/print-common";
+import PrintFoshan from "@/components/Common/print-foshan";
+import PrintGuangzhou from "@/components/Common/print-guangzhou";
+import PrintShaoguan from "@/components/Common/print-shaoguan";
+
+export default {
+  name: 'ReturnDetail',
+  componentName: 'ReturnDetail',
+  props: ['listItem'],
+  components: {
+    PrintFoshan,
+    PrintGuangzhou,
+    PrintShaoguan,
+    PrintCommon,
+  },
+  directives: {
+    print
+  },
+  data() {
+    return {
+      currentType: 0,
+      typeList: [
+        { label: '通用', value: 0 },
+        { label: '佛山', value: 1 },
+        { label: '广州', value: 2 },
+        { label: '韶关', value: 3 },
+      ],
+      printObj: {
+        id: 'printMe',
+        closeCallback: () => {
+          this.addPrint();
+        }
+      },
+      detailData: {},
+      company: '',
+    }
+  },
+
+  created() {
+    this.getDetail();
+    this.getCompanyList();
+  },
+
+  methods: {
+    // 返回列表
+    goBack() {
+      this.$emit('backListFormDetail');
+    },
+
+    changeType() {
+
+    },
+
+    // 获取详情
+    getDetail() {
+      getDeliverDetail({id: this.listItem[0].id}).then(res => {
+        this.detailData = res.data;
+      })
+    },
+
+    getCompanyList() {
+      getCompanyList().then(res => {
+        this.company = res.data ? res.data[0].companyName : '';
+      })
+    },
+
+    // 添加次数
+    addPrint() {
+      let ids = this.listItem.map(item => {
+        return item.invoiceOrderId;
+      });
+      addPrint({ids: ids.join(',')}).then(res => {
+        // this.$successMsg('提交成功');
+        this.$parent.getList();
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+  .detail-container {
+    width: 100%;
+    height: 100%;
+  }
+  .top-container {
+    margin-bottom: 20px;
+  }
+</style>

src/views/supply/deliver/sum_list.vue

@@ -1,219 +1,235 @@
 <template>
   <div class="app-container">
-    <!-- 筛选条件 -->
-    <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
-              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="物料编码" prop="goodsCode">
-              <el-input v-model="screenForm.goodsCode" placeholder="请输入物料编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="产品编码" prop="goodsOldCode">
-              <el-input v-model="screenForm.goodsOldCode" placeholder="请输入产品编码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="规格型号" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="制单日期" prop="createDate">
-              <el-date-picker
-                v-model="screenForm.createDate"
-                type="datetimerange"
-                range-separator="至"
-                style="width: 100%;"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="发货日期" prop="deliverDate">
-              <el-date-picker
-                v-model="screenForm.deliverDate"
-                type="datetimerange"
-                range-separator="至"
-                style="width: 100%;"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商编号" prop="jxsNum">
-              <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="经销商名称" prop="jxsName">
-              <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="发货单号" prop="orderNum">
-              <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="存货类别" prop="type">
-              <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%" clearable>
-                <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.name"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="业务员" prop="salesMan">
-              <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
-                <el-option
-                  v-for="item in salesmanList"
-                  :key="item.adminUserId"
-                  :label="item.nickName"
-                  :value="item.adminUserId">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          
-          <el-col :xs="24" :sm="12" :lg="6" class="tr">
-            <el-form-item label="">
-              <el-button @click="resetScreenForm">清空</el-button>
-              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
 
-    <div class="mymain-container">
-      <div class="btn-group clearfix">
-        <div class="fr">
-          <ExportButton :exUrl="'invoice/exportInvoice'" :exParams="exParams" />
-        </div>
+    <div v-show="!isShowPrint">
+      <!-- 筛选条件 -->
+      <div class="screen-container">
+        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="产品名称" prop="goodsName">
+                <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="物料编码" prop="goodsCode">
+                <el-input v-model="screenForm.goodsCode" placeholder="请输入物料编码"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="产品编码" prop="goodsOldCode">
+                <el-input v-model="screenForm.goodsOldCode" placeholder="请输入产品编码"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="规格型号" prop="model">
+                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="制单日期" prop="createDate">
+                <el-date-picker
+                  v-model="screenForm.createDate"
+                  type="datetimerange"
+                  range-separator="至"
+                  style="width: 100%;"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="发货日期" prop="deliverDate">
+                <el-date-picker
+                  v-model="screenForm.deliverDate"
+                  type="datetimerange"
+                  range-separator="至"
+                  style="width: 100%;"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="经销商编号" prop="jxsNum">
+                <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="经销商名称" prop="jxsName">
+                <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="发货单号" prop="orderNum">
+                <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="存货类别" prop="type">
+                <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%" clearable>
+                  <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.name"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="业务员" prop="salesMan">
+                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
+                  <el-option
+                    v-for="item in salesmanList"
+                    :key="item.adminUserId"
+                    :label="item.nickName"
+                    :value="item.adminUserId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            
+            <el-col :xs="24" :sm="12" :lg="6" class="tr">
+              <el-form-item label="">
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
-      <div class="table">
-        <el-table 
-          v-loading="listLoading" 
-          :data="dataList" 
-          element-loading-text="Loading" 
-          border 
-          fit 
-          highlight-current-row 
-          stripe
-          show-summary
-          :summary-method="$getSummaries">
-          <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="发货单号" prop="id" min-width="120" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.id" />
-              <span>{{scope.row.id}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerNumber" />
-              <span>{{scope.row.customerNumber}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.customerName" />
-              <span>{{scope.row.customerName}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialCode" />
-              <span>{{scope.row.materialCode}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialOldNumber" />
-              <span>{{scope.row.materialOldNumber}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.materialName" />
-              <span>{{scope.row.materialName}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <CopyButton :copyText="scope.row.specification" />
-              <span>{{scope.row.specification}}</span>
-            </template>
-          </el-table-column>
 
-          <el-table-column align="right" label="发货金额" prop="payAmount" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{scope.row.payAmount | numToFixed}}
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="发货返利金额" prop="payRebateAmount" min-width="110" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{scope.row.payRebateAmount | numToFixed}}
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="发货折扣金额" prop="discAmount" min-width="110" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{scope.row.discAmount | numToFixed}}
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="折扣额合计" prop="totalDiscAmount" min-width="100" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{scope.row.totalDiscAmount | numToFixed}}
-            </template>
-          </el-table-column>
-          <el-table-column align="right" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="政策单号" prop="policyCode" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="政策名称" prop="policyTitle" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="区域" prop="adminArea" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="业务区域" prop="serviceArea" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="月份" prop="month" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="项目编码" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="表头备注" prop="remark" min-width="200" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="备注" prop="invoiceRemark" min-width="200" show-overflow-tooltip></el-table-column>
-        </el-table>
+      <div class="mymain-container">
+        <div class="btn-group clearfix">
+          <div class="fl">
+            <el-button type="primary" size="mini" @click="toPrint" :disabled="tableSelection.length < 1">打印发货单</el-button>
+          </div>
+          <div class="fr">
+            <ExportButton :exUrl="'invoice/exportInvoice'" :exParams="exParams" />
+          </div>
+        </div>
+        <div class="table">
+          <el-table 
+            ref="table"
+            v-loading="listLoading" 
+            :data="dataList" 
+            element-loading-text="Loading" 
+            border 
+            fit 
+            highlight-current-row 
+            stripe
+            @select="handleSelect" 
+            @select-all="handleSelectAll"
+            show-summary
+            :summary-method="$getSummaries">
+            <el-table-column align="center" type="selection" width="55"></el-table-column>
+            <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="发货单号" prop="id" min-width="130" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.id" />
+                <span>{{scope.row.id}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerNumber" />
+                <span>{{scope.row.customerNumber}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerName" />
+                <span>{{scope.row.customerName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialCode" />
+                <span>{{scope.row.materialCode}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialOldNumber" />
+                <span>{{scope.row.materialOldNumber}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialName" />
+                <span>{{scope.row.materialName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.specification" />
+                <span>{{scope.row.specification}}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column align="right" label="发货金额" prop="payAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.payAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="发货返利金额" prop="payRebateAmount" min-width="110" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.payRebateAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="发货折扣金额" prop="discAmount" min-width="110" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.discAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="折扣额合计" prop="totalDiscAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.totalDiscAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="政策单号" prop="policyCode" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="政策名称" prop="policyTitle" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="区域" prop="adminArea" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="业务区域" prop="serviceArea" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="月份" prop="month" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目编码" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表头备注" prop="remark" min-width="200" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="备注" prop="invoiceRemark" min-width="200" show-overflow-tooltip></el-table-column>
+          </el-table>
+        </div>
       </div>
-    </div>
-    <div class="pagination clearfix">
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal">
-        </el-pagination>
+      <div class="pagination clearfix">
+        <div class="fr">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="listTotal">
+          </el-pagination>
+        </div>
       </div>
     </div>
 
+    <SumPrint :listItem="queryItem" v-if="isShowPrint" @backListFormDetail="backList" />
+
   </div>
 </template>
 
 <script>
 import { getSumList } from "@/api/supply/deliver";
 import { getCategoryList, getSalesmanList } from '@/api/common'
+import SumPrint from "@/views/supply/deliver/components/sum_print";
 
 export default {
+  components: {
+    SumPrint,
+  },
   data() {
     return {
       currentPage: 1, // 当前页码
@@ -236,6 +252,10 @@ export default {
       },
       categoryList: [],
       salesmanList: [],
+
+      tableSelection: [],
+      queryItem: {},
+      isShowPrint: false,
     }
   },
 
@@ -347,6 +367,31 @@ export default {
       this.getList();
     },
 
+    handleSelect(selection, row) {
+      this.$refs.table.toggleRowSelection(row);
+      this.dataList.forEach((item) => {
+        if (item.id === row.id) {
+          this.$refs.table.toggleRowSelection(item);
+        }
+      });
+      this.tableSelection = this.$refs.table.selection;
+    },
+
+    handleSelectAll(selection) {
+      this.tableSelection = this.$refs.table.selection;
+    },
+
+    // 点击打印
+    toPrint() {
+      this.queryItem = this.tableSelection;
+      this.isShowPrint = true;
+    },
+
+    backList() {
+      this.queryItem = {};
+      this.isShowPrint = false;
+    },
+
     
   }
 }

src/views/supply/engin/commerce_list.vue

@@ -207,6 +207,7 @@
             </el-table-column>
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/engin/components/commerce_form.vue

@@ -726,6 +726,8 @@ export default {
             tax: item.taxRate,
             status1: '',
             status2: '',
+            serviceId: '',
+            serviceName: '',
             rebateWallets: item.customerWalletList.filter(item => {
               return item.type === 'REBATE';
             }),

src/views/supply/engin/components/home_form.vue

@@ -761,7 +761,8 @@ export default {
         recordNo: id,
         saleTypeId: this.mainForm.saleType,
         userId: uid,
-        enginOrderId: this.mainForm.orderNum
+        enginOrderId: this.mainForm.orderNum,
+        customerId: JSON.parse(localStorage.getItem("supply_user")).customerId
       }).then(res => {
         this.isShowDialog = false;
         let data = res.data;

src/views/supply/implement/implement_list.vue

@@ -174,6 +174,7 @@
                 {{scope.row.refundProductAmount | numToFixed}}
               </template>
             </el-table-column>
+            <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="归属业务员" prop="newServiceName" min-width="100" show-overflow-tooltip></el-table-column>
           </el-table>

src/views/supply/pickup/check.vue

@@ -338,6 +338,7 @@ export default {
         pageSize: -1,
         takerId: this.screenForm.manId,
         status: this.screenForm.status,
+        takerPhone: this.screenForm.phone,
       };
       getPickupList(params).then((res) => {
         this.dataList = res.data.records;

src/views/supply/retail/retail_list.vue

@@ -203,7 +203,8 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" prop="createName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="examineName" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/sales/sales_list.vue

@@ -80,7 +80,7 @@
       <div class="mymain-container">
         <div class="btn-group clearfix">
           <div class="fl">
-            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('add', $route.meta.roles)">退货申请</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('refund', $route.meta.roles)">退货申请</el-button>
             <el-button size="mini" type="warning" icon="el-icon-finished" @click="batchExamine" :disabled="multipleSelection.length < 1" v-if="$checkBtnRole('examine', $route.meta.roles)">批量审批</el-button>
           </div>
           <div class="fr">