Merge remote-tracking branch 'origin/master'

src/api/supply/reserve.js

@@ -79,4 +79,15 @@ export function getWarehouseList(params) {
     method: 'get',
     params
   })
-}
+}
+
+
+// 获取仓库列表
+export function getListStock(params) {
+  return request({
+    url: '/reserve/listStock',
+    method: 'get',
+    params
+  })
+}
+

src/components/Common/print-common.vue

@@ -22,6 +22,7 @@
             <div class="label">仓库：</div>
             <div class="value">{{ item.correspondName }}</div>
           </el-col>
+
         </el-row>
       </div>
 
@@ -36,6 +37,7 @@
             <el-col :span="3">存货名称</el-col>
             <el-col :span="6">规格型号</el-col>
             <el-col :span="2">数量</el-col>
+            <el-col :span="2">订单备注</el-col>
             <el-col :span="2">备注说明</el-col>
           </el-row>
         </div>
@@ -50,6 +52,7 @@
               <el-col :span="3">{{ it.materialName }}</el-col>
               <el-col :span="6">{{ it.specification }}</el-col>
               <el-col :span="2">{{ it.refundableQty }}</el-col>
+              <el-col :span="2">{{ it.headerRemark }}</el-col>
                <el-col :span="2">{{ it.pjxh1Text }}</el-col>
             </el-row>
           </div>

src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -87,7 +87,7 @@
               <div class="value">{{ details.refUseUnit }}</div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="12" class="item">
-              <div class="label">厂编号</div>
+              <div class="label">跨区厂编号</div>
               <div class="value">{{ details.refFactoryNo }}</div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="item">
@@ -146,7 +146,10 @@
             :summary-method="$getSummaries"
           >
 
-            <el-table-column
+
+              <template v-if="!isCustomer">
+
+                     <el-table-column
               align="left"
               label="厂编号"
               prop="factoryNo"
@@ -170,6 +173,8 @@
                 <span>{{scope.row.materialNumber}}</span>
               </template>
             </el-table-column>
+              </template>
+
             <el-table-column
               align="left"
               label="产品编码"

src/views/finance/components/receipt_list-detail.vue

@@ -217,7 +217,7 @@ export default {
       this.searchForm = res.data;
     },
     goBack() {
-      this.$parent.showDetail = true;
+      this.$parent.showDetail = 1;
     },
   },
 };

src/views/finance/components/receipt_print.vue

@@ -0,0 +1,171 @@
+<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">
+        <template v-for="(item, i) in detailArr">
+          <PrintCommon v-if="currentType === 0" :key="i" :detail-data="item" :company="company" />
+          <PrintFoshan v-if="currentType === 1" :key="i" :detail-data="item" :company="company" />
+          <PrintGuangzhou v-if="currentType === 2" :key="i" :detail-data="item" :company="company" />
+          <PrintShaoguan v-if="currentType === 3" :key="i" :detail-data="item" :company="company" />
+        </template>
+      </div>
+  
+      <div class="page-footer">
+        <div class="footer">
+          <el-button v-print="printObj" type="primary" icon="el-icon-printer">打 印</el-button>
+          <el-button @click="goBack">关 闭</el-button>
+        </div>
+      </div>
+  
+    </div>
+  </template>
+  
+  <script>
+  import print from 'vue-print-nb'
+  import { getDeliverDetail } from '@/api/supply/deliver'
+  import { addPrints } 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',
+    components: {
+      PrintFoshan,
+      PrintGuangzhou,
+      PrintShaoguan,
+      PrintCommon
+    },
+    directives: {
+      print
+    },
+    props: ['listItem'],
+    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: '',
+        detailArr: []
+      }
+    },
+  
+    created() {
+      console.log(this.listItem, '454')
+    //   this.listItem.map(k => {
+    //     this.getDetail(k.id)
+    //   })
+  
+    //   this.getCompanyList()
+    },
+  
+    methods: {
+      // 返回列表
+      goBack() {
+        // this.$emit('backListFormDetail')
+      },
+      changeType() {
+  
+      },
+  
+      // 获取详情
+      getDetail(id) {
+        getDeliverDetail({ id: id }).then(res => {
+          this.detailArr.push(res.data)
+  
+        })
+      },
+  
+      getCompanyList() {
+        getCompanyList().then(res => {
+          this.company = res.data ? res.data[0].companyName : ''
+        })
+      },
+  
+      // 添加次数
+      addPrint() {
+        const ids = this.detailArr.map(item => {
+          if (item.invoicePickBeans && item.invoicePickBeans.length) {
+            for (let index = 0; index < item.invoicePickBeans.length; index++) {
+              const element = item.invoicePickBeans[index];
+              return item.invoiceOrderId || element.invoiceOrderId || element.id
+            }
+          } else {
+            return item.invoiceOrderId || item.id
+          }
+  
+        })
+  
+        // console.log(document.execCommand('print'),'4545');
+        addPrints({ ids: ids.join(',') }).then(res => {
+          // this.$successMsg('提交成功');
+          this.$parent.getList()
+        })
+      }
+    }
+  }
+  </script>
+  
+  <style>
+  body {
+    height: auto !important;
+  }
+  </style>
+  
+  <style scoped lang="scss">
+  @media print {
+  
+    // 1 毫米 [mm] = 3,779 527 559 055 1 像素 [px]
+    //  241mm = ~911px
+    //  140mm = ~529px
+    .detail-container {
+      width: 911px !important;
+      height: 529px !important;
+      margin: auto;
+      // position: fixed;
+      // top: 0;
+      // left: 0;
+      // right: 0;
+      // bottom: 0;
+      font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif !important;
+      // font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif !important;
+      color: #000 !important;
+    }
+  
+    .top-container {
+      margin: 20px;
+    }
+  
+  }
+  
+  .detail-container {
+    width: 100%;
+    height: auto !important;
+    margin-bottom: 50px;
+    color: #000 !important;
+  }
+  
+  .top-container {
+    margin-bottom: 20px;
+  }
+  </style>
+  

src/views/finance/receipt_list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div v-if="showDetail">
+    <div v-if="showDetail == 1">
       <!-- 筛选条件 -->
       <div>
         <el-form ref="searchForm" :model="searchForm" label-width="100px" size="mini" label-position="left">
@@ -51,13 +51,15 @@
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始时间" prop="startTime">
-                <el-date-picker class="selectStyle" v-model="searchForm.startTime" type="datetime" placeholder="选择日期时间" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
+                <el-date-picker class="selectStyle" v-model="searchForm.startTime" type="datetime" placeholder="选择日期时间"
+                  default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束时间" prop="endTime">
-                <el-date-picker class="selectStyle" v-model="searchForm.endTime" type="datetime" placeholder="选择日期时间" default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
+                <el-date-picker class="selectStyle" v-model="searchForm.endTime" type="datetime" placeholder="选择日期时间"
+                  default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -73,32 +75,41 @@
       </div>
       <!-- 按钮 -->
       <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="'/k3/receipt/export'" :exParams="exParams" class="exportClass" />
         </div>
       </div>
       <!-- 列表 -->
       <div class="mymain-container">
         <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 ref="table" v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit
+            highlight-current-row stripe show-summary :summary-method="getSummaries" @select="handleSelect" @select-all="handleSelectAll">
+            <el-table-column align="center" type="selection" width="55"></el-table-column>
+
             <el-table-column align="left" label="单据类型" prop="billType" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
-                  scope.row.billType == 1
-                    ? "收款单"
-                    : scope.row.billType == 2
-                    ? "退款单"
-                    : scope.row.billType == 3?'付款单':''
+                    scope.row.billType == 1
+                      ? "收款单"
+                      : scope.row.billType == 2
+                        ? "退款单"
+                        : scope.row.billType == 3 ? '付款单' : ''
                 }}
               </template>
             </el-table-column>
             <el-table-column align="left" label="单据编码" prop="billNo" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.billNo" />
-                <span>{{scope.row.billNo}}</span>
+                <span>{{ scope.row.billNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="业务日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="业务日期" prop="theTime" min-width="160" show-overflow-tooltip>
+            </el-table-column>
             <!-- <el-table-column
               align="left"
               label="币别"
@@ -114,17 +125,21 @@
                 <el-tag size="mini" v-show="scope.row.status == 'D'" type="warning">重新审核</el-tag>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="钱包" prop="walletName" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="表头·应收金额" prop="" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="钱包" prop="walletName" min-width="160" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column align="right" label="表头·应收金额" prop="" min-width="160" show-overflow-tooltip>
+            </el-table-column>
             <el-table-column align="left" label="往来单位" prop="wlCompanyName" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.wlCompanyName" />
-                <span>{{scope.row.wlCompanyName}}</span>
+                <span>{{ scope.row.wlCompanyName }}</span>
               </template>
             </el-table-column>
             <el-table-column align="right" label="表头·实收金额" prop="amount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ (scope.row.billType == 3 || scope.row.billType == 2)? -scope.row.amount:scope.row.amount | numToFixed }}
+                {{ (scope.row.billType == 3 || scope.row.billType == 2) ? -scope.row.amount : scope.row.amount |
+                    numToFixed
+                }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="收款金额" prop="" min-width="160" show-overflow-tooltip></el-table-column>
@@ -145,35 +160,43 @@
             <el-table-column align="left" label="付款单位" prop="customerName" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
             <el-table-column align="right" label="表体·实收金额" prop="amount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ (scope.row.billType == 3 || scope.row.billType == 2)? -scope.row.amount:scope.row.amount | numToFixed }}
+                {{ (scope.row.billType == 3 || scope.row.billType == 2) ? -scope.row.amount : scope.row.amount |
+                    numToFixed
+                }}
               </template>
             </el-table-column>
             <el-table-column align="left" label="勾对" prop="" min-width="160" show-overflow-tooltip></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="remark" min-width="160" show-overflow-tooltip>
+            </el-table-column>
             <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" class="textColor" v-if="
-                    $checkBtnRole('examine', $route.meta.roles) &&
-                    scope.row.status == 'C'
-                  " @click="NoExamineFn(scope.row.id)">弃审</el-button>
+                  $checkBtnRole('examine', $route.meta.roles) &&
+                  scope.row.status == 'C'
+                " @click="NoExamineFn(scope.row.id)">弃审</el-button>
                 <el-button type="text" class="textColor" @click="seeFn(scope.row.id)">查看</el-button>
+                <el-button type="text" class="textColor" @click="toPrint(scope.row)">打印</el-button>
+
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- 分页 -->
         <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 @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>
+    <ReceiptPrint :listItem="queryItem" v-else-if="showDetail == 2" @backListFormDetail="backList" />
     <ReceiptListDetail :detailId="detailId" v-else />
   </div>
 </template>
@@ -185,9 +208,12 @@ import {
   getK3ReceiptAbandon,
 } from "@/api/finance/receipt_list";
 import ReceiptListDetail from "./components/receipt_list-detail";
+import ReceiptPrint from '@/views/finance/components/receipt_print.vue'
+
 import { numToFixed } from "@/filters";
 export default {
   components: {
+    ReceiptPrint,
     ReceiptListDetail,
   },
   data() {
@@ -207,8 +233,10 @@ export default {
         endTime: "",
       }, //搜索表单
       listLoading: false, // 列表加载loading
-      showDetail: true,
+      showDetail: 1,
       detailId: null,
+      queryItem:{},
+      tableSelection:[]
     };
   },
   computed: {
@@ -306,7 +334,30 @@ export default {
     },
     seeFn(id) {
       this.detailId = id;
-      this.showDetail = false;
+      this.showDetail = 3;
+    },
+    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;
+    },
+    backList() {
+      this.queryItem = {};
+      this.isShowPrint = false;
+    },
+
+    // 点击打印
+    toPrint(row) {
+      this.queryItem = row;
+      this.showDetail = 2;
     },
   },
 };

src/views/sales_rebate/rebate_list.vue

@@ -31,8 +31,8 @@
             </el-form-item>
           </el-col>
 
-          <el-col :xs="24" :ms="18" :lg="18">
-            <el-form-item>
+          <el-col :xs="24" :ms="18" :lg="18" >
+
               <el-button type="primary" size="mini" icon="el-icon-plus" v-if="$checkBtnRole('add', $route.meta.roles)" @click="(dialogVisible = true), (type = 1), getDictList()">新增</el-button>
 
               <!-- <el-button type="primary" size="mini" @click="delfn"
@@ -42,8 +42,10 @@
                 <el-button :disabled="ids.length < 1" slot="reference" type="danger" icon="el-icon-minus" size="mini">批量删除</el-button>
               </el-popconfirm>
               <el-button icon="el-icon-search" type="primary" size="mini" @click="submitScreenForm">查询</el-button>
-              <el-button type="primary" size="mini" @click="resetScreenForm">重置</el-button>
-            </el-form-item>
+              <el-button type="primary" size="mini" @click="resetScreenForm" >重置</el-button>
+
+               <ExportButton style="display: inline-block;margin-left: 10px;" :exUrl="'/wallet/rebate_saletype/export'"  :exParams="exParams" />
+
           </el-col>
         </el-row>
       </el-form>
@@ -242,6 +244,18 @@ export default {
       },
     };
   },
+  computed:{
+     exParams() {
+      return {
+       pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        // mainName: this.screenForm.mainName,
+        saleTypeCode: this.screenForm.saleTypeCode,
+        saleTypeName: this.screenForm.saleTypeName,
+        status: this.screenForm.status,
+      }
+    },
+  },
   methods: {
     //
     selectionhangeFn(value) {
@@ -449,4 +463,5 @@ export default {
 .delClass {
   margin: 0 10px;
 }
+
 </style>

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

@@ -35,6 +35,10 @@
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">项目类别</div>
+            <div class="value">{{detailData.refProjectCategory}}</div>
+          </el-col>
+           <el-col :span="8" class="item">
+            <div class="label">项目名称</div>
             <div class="value">{{detailData.refProjectName}}</div>
           </el-col>
         <el-col :span="8" class="item" v-if="!isCustomer">

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

@@ -157,7 +157,7 @@
             <el-input v-model="scope.row.invoiceNum" size="small"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column align="center" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column> -->
         <!-- <el-table-column align="center" label="仓库" prop="correspondId" min-width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select v-model="scope.row.correspondId" placeholder="请选择仓库" size="small" filterable clearable style="width: 100%">

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

@@ -7,7 +7,7 @@
     </div> -->
 
     <div id="printMe">
-      <template v-for="(item,i) in detailArr">
+      <template v-for="(item, i) in detailArr">
         <PrintCommon v-if="currentType === 0" :key="i" :detail-data="item" :company="company" />
         <PrintFoshan v-if="currentType === 1" :key="i" :detail-data="item" :company="company" />
         <PrintGuangzhou v-if="currentType === 2" :key="i" :detail-data="item" :company="company" />
@@ -70,7 +70,7 @@ export default {
   },
 
   created() {
-    console.log(this.listItem,'454')
+    console.log(this.listItem, '454')
     this.listItem.map(k => {
       this.getDetail(k.id)
     })
@@ -104,21 +104,21 @@ export default {
     // 添加次数
     addPrint() {
       const ids = this.detailArr.map(item => {
-            if (item.invoicePickBeans && item.invoicePickBeans.length) {
-              for (let index = 0; index < item.invoicePickBeans.length; index++) {
-                  const element = item.invoicePickBeans[index];
-                return  item.invoiceOrderId || element.invoiceOrderId || element.id
-              }
-            }else{
-                return item.invoiceOrderId || item.id
-            }
+        if (item.invoicePickBeans && item.invoicePickBeans.length) {
+          for (let index = 0; index < item.invoicePickBeans.length; index++) {
+            const element = item.invoicePickBeans[index];
+            return item.invoiceOrderId || element.invoiceOrderId || element.id
+          }
+        } else {
+          return item.invoiceOrderId || item.id
+        }
 
       })
 
       // console.log(document.execCommand('print'),'4545');
       addPrints({ ids: ids.join(',') }).then(res => {
         // this.$successMsg('提交成功');
-         this.$parent.getList()
+        this.$parent.getList()
       })
     }
   }
@@ -126,45 +126,45 @@ export default {
 </script>
 
 <style>
- body{
-    height: auto !important;
-  }
+body {
+  height: auto !important;
+}
 </style>
 
 <style scoped lang="scss">
-
 @media print {
 
-    // 1 毫米 [mm] = 3,779 527 559 055 1 像素 [px]
-    //  241mm = ~911px
-    //  140mm = ~529px
-    .detail-container {
+  // 1 毫米 [mm] = 3,779 527 559 055 1 像素 [px]
+  //  241mm = ~911px
+  //  140mm = ~529px
+  .detail-container {
     width: 911px !important;
     height: 529px !important;
-    margin:auto;
+    margin: auto;
     // position: fixed;
     // top: 0;
     // left: 0;
     // right: 0;
     // bottom: 0;
-    // font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
-    font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif !important;
+    font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif !important;
+    // font-family: 'Trebuchet MS', 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif !important;
     color: #000 !important;
   }
+
   .top-container {
     margin: 20px;
   }
 
-  }
+}
 
-  .detail-container {
-    width: 100%;
-    height: auto !important;
-    margin-bottom: 50px;
-    color: #000 !important;
-  }
-  .top-container {
-    margin-bottom: 20px;
-  }
+.detail-container {
+  width: 100%;
+  height: auto !important;
+  margin-bottom: 50px;
+  color: #000 !important;
+}
 
+.top-container {
+  margin-bottom: 20px;
+}
 </style>

src/views/supply/deliver/sum_list.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-
     <div v-show="!isShowPrint">
       <!-- 筛选条件 -->
       <div class="screen-container">
@@ -28,26 +27,16 @@
             </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="开始日期"
+                <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="开始日期"
+                <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>
@@ -75,29 +64,25 @@
             <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-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="k3ServiceId">
-                <el-select v-model="screenForm.k3ServiceId" placeholder="选择表头业务员" clearable filterable style="width: 100%">
-                  <el-option
-                    v-for="item in salesmanList"
-                    :key="item.adminUserId"
-                    :label="item.nickName"
+                <el-select v-model="screenForm.k3ServiceId" 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">
+            <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"
+                  <el-option v-for="item in salesmanList" :key="item.adminUserId" :label="item.nickName"
                     :value="item.adminUserId">
                   </el-option>
                 </el-select>
@@ -116,154 +101,172 @@
       <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>
+            <el-button type="primary" size="mini" @click="toPrint" :disabled="tableSelection.length < 1">打印发货单
+            </el-button>
           </div>
           <!--  -->
           <div class="fr" style="display: flex;">
-            <el-button size="mini" type="primary" v-if="$checkBtnRole('refund', $route.meta.roles)"  style="margin-right: 10px;" icon="el-icon-plus" @click="$router.push('/supply/deliver/apply_list?isShow=true')">零售退货申请</el-button>
-            <el-button size="mini" type="primary" v-if="$checkBtnRole('refund', $route.meta.roles)"  style="margin-right: 10px;" icon="el-icon-plus" @click="$router.push('/supply/deliver/engin_list?isShow=true')">工程退货申请</el-button>
-           <ExportButton :exUrl="'invoice/exportInvoice'" :exParams="exParams" />
+            <el-button size="mini" type="primary" v-if="$checkBtnRole('refund', $route.meta.roles)"
+              style="margin-right: 10px;" icon="el-icon-plus"
+              @click="$router.push('/supply/deliver/apply_list?isShow=true')">零售退货申请</el-button>
+            <el-button size="mini" type="primary" v-if="$checkBtnRole('refund', $route.meta.roles)"
+              style="margin-right: 10px;" icon="el-icon-plus"
+              @click="$router.push('/supply/deliver/engin_list?isShow=true')">工程退货申请</el-button>
+            <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
+          <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="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>
+                <span>{{ scope.row.id }}</span>
               </template>
             </el-table-column>
-               <el-table-column align="left" label="订单号" prop="orderId" min-width="130" show-overflow-tooltip>
+            <el-table-column align="left" label="订单号" prop="orderId" min-width="130" show-overflow-tooltip>
               <template slot-scope="scope">
 
-                <CopyButton :copyText="scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId " />
-                <span>{{scope.row.enginOrderType =='HOME' || scope.row.enginOrderType =='TRADE'? scope.row.enginOrderNo :scope.row.mainOrderId }}</span>
+                <CopyButton
+                  :copyText="scope.row.enginOrderType == 'HOME' || scope.row.enginOrderType == 'TRADE' ? scope.row.enginOrderNo : scope.row.mainOrderId" />
+                <span>{{ scope.row.enginOrderType == 'HOME' || scope.row.enginOrderType == 'TRADE' ?
+                    scope.row.enginOrderNo
+                    : scope.row.mainOrderId
+                }}</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>
+                <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>
+                <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="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>
+                <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>
+                <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>
+                <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>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-               <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip>
+            </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}}
+                {{ 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}}
+                {{ 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.totalDiscAmount | numToFixed}}
+                {{ scope.row.totalDiscAmount | 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 + scope.row.payRebateAmount) | numToFixed}}
+                {{ (scope.row.totalDiscAmount + scope.row.payRebateAmount) | numToFixed }}
               </template>
             </el-table-column>
-               <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
+            <el-table-column align="right" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip>
+            </el-table-column>
+
+            <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.singlePayPrice | numToFixed}}
+                {{ scope.row.singlePayPrice | numToFixed }}
               </template>
             </el-table-column>
-              <el-table-column align="right" label="含税总额" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
+            <el-table-column align="right" label="含税总额" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.payAmount | numToFixed}}
+                {{ scope.row.payAmount | numToFixed }}
               </template>
             </el-table-column>
-             <el-table-column align="right" label="未出库数量" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
+            <el-table-column align="right" label="未出库数量" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{comRefundableQty(scope.row.type ,scope.row.salesExamineStatus , scope.row)}}
+                {{ comRefundableQty(scope.row.type, scope.row.salesExamineStatus, scope.row) }}
               </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="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="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="headerRemark" 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-column align="left" label="打印次数" prop="printNum" min-width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="经销商现金钱包" prop="customerWalletName" min-width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="经销商返利钱包" prop="customerWalletName2" min-width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="200" show-overflow-tooltip></el-table-column>
-
-
-        </el-table>
+            <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="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="categoryName" 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="headerRemark" 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-column align="left" label="打印次数" prop="printNum" min-width="200" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column align="left" label="经销商现金钱包" prop="customerWalletName" min-width="200"
+              show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="经销商返利钱包" prop="customerWalletName2" min-width="200"
+              show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="200" show-overflow-tooltip>
+            </el-table-column>
+
+
+          </el-table>
         </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 @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>
@@ -302,8 +305,8 @@ export default {
         orderNum: '',
         type: '',
         salesMan: '',
-        k3ServiceId:'',
-        mainOrderId:''
+        k3ServiceId: '',
+        mainOrderId: ''
       },
       categoryList: [],
       salesmanList: [],
@@ -330,19 +333,19 @@ export default {
         id: this.screenForm.orderNum,
         categoryName: this.screenForm.type,
         serviceId: this.screenForm.salesMan,
-        k3ServiceId:this.screenForm.k3ServiceId
+        k3ServiceId: this.screenForm.k3ServiceId
       }
     },
-    comRefundableQty(){
-      return (type,status,row)=>{
+    comRefundableQty() {
+      return (type, status, row) => {
         if (type == 2) {
-            return ''
-        }else{
-            if (status == 'OK') {
-                return 0
-            }else{
-              return row.refundableQty
-            }
+          return ''
+        } else {
+          if (status == 'OK') {
+            return 0
+          } else {
+            return row.refundableQty
+          }
 
         }
 
@@ -399,8 +402,8 @@ export default {
         id: this.screenForm.orderNum,
         categoryName: this.screenForm.type,
         serviceId: this.screenForm.salesMan,
-        k3ServiceId:this.screenForm.k3ServiceId,
-        mainOrderId:this.screenForm.mainOrderId
+        k3ServiceId: this.screenForm.k3ServiceId,
+        mainOrderId: this.screenForm.mainOrderId
       };
       getSumList(params).then((res) => {
         res.data.records.forEach(item => {
@@ -471,5 +474,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 </style>

src/views/supply/engin/commerce_list.vue

@@ -68,8 +68,8 @@
               </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-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"
@@ -208,8 +208,9 @@
               </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="itemServiceName" 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="itemServiceName" 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/home_form.vue

@@ -356,7 +356,7 @@
           </el-table-column>
           <el-table-column align="center" prop="checkTime" label="工程登录日期" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" prop="recordNo" label="工程登录编号" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" prop="projectName" label="工程项目" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" prop="projectName" label="项目类别" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" prop="useUnit" label="使用单位" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" prop="organizationName" label="经销商" show-overflow-tooltip></el-table-column>
         </el-table>

src/views/supply/engin/engin_list.vue

@@ -144,7 +144,7 @@
                 <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="项目名称" prop="projectName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目类别" prop="projectName" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="使用单位" prop="useUnit" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="安装地址" prop="installAddress" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
@@ -185,7 +185,7 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="已订数量" prop="hasOrderQty" min-width="100" show-overflow-tooltip></el-table-column>
-             <!-- <el-table-column align="left" label="表体业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column> -->
+             <el-table-column align="left" label="表体业务员" prop="itemServiceName" 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="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/engin/home_list.vue

@@ -63,8 +63,8 @@
               </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-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"
@@ -222,8 +222,9 @@
               </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="itemServiceName" 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="itemServiceName" 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/policy/components/retail_form.vue

@@ -1033,9 +1033,9 @@ export default {
         const service = row.wallets.filter((k) => {
           return e == k.customerWalletId
         })[0]
-        if (index==0) {
+        if (index==0 && !this.mainForm.k3ServiceId) {
                this.$set(this.mainForm, 'k3ServiceId', service.serviceId)
-        this.$set(this.mainForm, 'k3ServiceName', service.serviceName)
+                this.$set(this.mainForm, 'k3ServiceName', service.serviceName)
         }
 
         this.$set(row, 'serviceId', service.serviceId)

src/views/supply/policy/policy_list.vue

@@ -419,7 +419,7 @@
             <el-table-column align="left" label="表头备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column
               align="left"
-              label="业务员"
+              label="表头业务员"
               prop="k3ServiceName"
               min-width="100"
               show-overflow-tooltip

src/views/supply/reserve/components/reserve_form.vue

@@ -318,7 +318,7 @@
 </template>
 
 <script>
-import { getDetail, getGoodsList, addData, editData, checkDealerList, checkMaterialList, getWarehouseList } from "@/api/supply/reserve";
+import { getDetail, getGoodsList, addData, editData, checkDealerList, checkMaterialList, getWarehouseList ,getListStock} from "@/api/supply/reserve";
 import { getDictList } from '@/api/common'
 
 let that
@@ -392,6 +392,7 @@ export default {
 
   async created() {
     await this.getWarehouseList();
+    // await this.getListStock()
     if(this.listItem) {
       this.getDetail();
     }else {
@@ -401,6 +402,11 @@ export default {
   },
 
   methods: {
+    getListStock(){
+      getListStock({customerId:JSON.parse(localStorage.getItem("supply_user")).customerId}).then(res=>{
+        console.log(res,'123');
+      })
+    },
     getDate() {
       var date = new Date();
       var seperator1 = "-";

src/views/supply/retail/components/retail_form.vue

@@ -427,7 +427,7 @@ export default {
           if(this.isFirst) {
             this.isFirst = false;
           }else {
-            this.mainForm.salesMan = this.goodsList[0].serviceId;
+            // this.mainForm.salesMan = this.goodsList[0].serviceId;
           }
         }else {
           this.mainForm.salesMan = '';
@@ -771,7 +771,6 @@ export default {
             delete item.rebateWallets;
             delete item.wallets;
           })
-
           let saleManItem = this.mainForm.salesMan ? this.salesmanList.find(o => o.adminUserId == this.mainForm.salesMan) : '';
           let params = {
             // theTime: this.mainForm.date + ' 00:00:00',

src/views/supply/retail/retail_list.vue

@@ -235,8 +235,8 @@
             </el-table-column>
             <el-table-column align="left" label="备注" prop="itemRemark" min-width="160" show-overflow-tooltip></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="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="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/components/sales_detail.vue

@@ -81,7 +81,7 @@
             </template>
 
           </el-table-column>
-          <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+          <!-- <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.price | numToFixed }}
             </template>
@@ -90,7 +90,7 @@
             <template slot-scope="scope">
               {{ scope.row.payAmount | numToFixed }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip></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="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>

src/views/supply/sales/components/sales_examine.vue

@@ -59,7 +59,7 @@
         <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+        <!-- <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.price | numToFixed }}
           </template>
@@ -68,7 +68,7 @@
           <template slot-scope="scope">
             {{ scope.row.payAmount | numToFixed }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
     </div>