소스 검색

Merge remote-tracking branch 'origin/develop' into develop

FengChaoYu 3 년 전
부모
커밋
ba30fa0d17

+ 4 - 4
src/views/basic_data/material/components/modify_list-apply.vue

@@ -166,7 +166,7 @@
             </el-table-column>
             <el-table-column
               align="center"
-              label="存货编码"
+              label="物料编码"
               prop="materialNumber"
               min-width="160"
               show-overflow-tooltip
@@ -182,7 +182,7 @@
             </el-table-column>
             <el-table-column
               align="center"
-              label="存货名称"
+              label="产品名称"
               prop="materialName"
               min-width="160"
               show-overflow-tooltip
@@ -466,7 +466,7 @@
             </el-table-column>
             <el-table-column
               align="center"
-              label="存货编码"
+              label="物料编码"
               prop="materialNumber"
               min-width="160"
               show-overflow-tooltip
@@ -479,7 +479,7 @@
             </el-table-column>
             <el-table-column
               align="center"
-              label="存货名称"
+              label="产品名称"
               prop="materialName"
               min-width="160"
               show-overflow-tooltip

+ 4 - 4
src/views/basic_data/material/components/modify_list-approval.vue

@@ -70,14 +70,14 @@
               </el-table-column>
               <el-table-column
                 align="center"
-                label="存货编码"
+                label="物料编码"
                 prop="materialId"
                 min-width="160"
                 show-overflow-tooltip
               ></el-table-column>
               <el-table-column
                 align="center"
-                label="存货名称"
+                label="产品名称"
                 prop="materialName"
                 min-width="160"
                 show-overflow-tooltip
@@ -252,8 +252,8 @@
 </template>
 
 <script>
-import { getProductRriceConfirm, getTypeList,getUserList } from "@/api/basic_data/material";
-import Mixin from "@/mixin/index";
+import { getProductRriceConfirm, getTypeList, getUserList } from '@/api/basic_data/material'
+
 export default {
   // mixins: [Mixin],
   props: {

+ 3 - 7
src/views/basic_data/material/components/modify_list-detail.vue

@@ -65,14 +65,14 @@
               ></el-table-column>
               <el-table-column
                 align="center"
-                label="存货编码"
+                label="物料编码"
                 prop="materialId"
                 min-width="160"
                 show-overflow-tooltip
               ></el-table-column>
               <el-table-column
                 align="center"
-                label="存货名称"
+                label="产品名称"
                 prop="materialName"
                 min-width="160"
                 show-overflow-tooltip
@@ -232,11 +232,7 @@
 </template>
 
 <script>
-import {
-  getProductRriceConfirm,
-  getTypeList,
-  getUserList,
-} from "@/api/basic_data/material";
+import { getTypeList, getUserList } from '@/api/basic_data/material'
 
 export default {
   props: {

+ 20 - 20
src/views/engin_deposit/components/deposit_list-detail.vue

@@ -50,18 +50,18 @@
               <div class="value">{{ details.refTel }}</div>
             </el-col>
 
-<!--            <el-col :xs="24" :sm="24" :lg="16" class="item">-->
-<!--              <div class="label">厂工程编码</div>-->
-<!--              <div class="value">-->
-<!--                <el-form-item prop="refFactoryNo">-->
-<!--                  <el-input-->
-<!--                    v-model="details.refFactoryNo"-->
-<!--                    placeholder="厂工程编码"-->
-<!--                    size="small"-->
-<!--                  />-->
-<!--                </el-form-item>-->
-<!--              </div>-->
-<!--            </el-col>-->
+            <!--            <el-col :xs="24" :sm="24" :lg="16" class="item">-->
+            <!--              <div class="label">厂工程编码</div>-->
+            <!--              <div class="value">-->
+            <!--                <el-form-item prop="refFactoryNo">-->
+            <!--                  <el-input-->
+            <!--                    v-model="details.refFactoryNo"-->
+            <!--                    placeholder="厂工程编码"-->
+            <!--                    size="small"-->
+            <!--                  />-->
+            <!--                </el-form-item>-->
+            <!--              </div>-->
+            <!--            </el-col>-->
 
             <el-col :xs="24" :sm="24" :lg="8" class="item">
               <div class="label">移动电话</div>
@@ -496,7 +496,7 @@
         <div class="table">
           <el-table
             v-loading="listLoading"
-            :data="goodsList"
+            :data="projectList"
             element-loading-text="Loading"
             border
             fit
@@ -555,7 +555,7 @@
               <template slot-scope="scope">
                 {{
                   (scope.row.refundableQty || 0) *
-                    (scope.row.singleDepositAmount || 0)
+                  (scope.row.singleDepositAmount || 0)
                 }}
               </template>
             </el-table-column>
@@ -566,7 +566,7 @@
     <div v-show="engineering == '直调发货'" class="zd">
       <div class="table" style="margin-top: 20px">
         <el-table
-          :data="projectList"
+          :data="goodsList"
           element-loading-text="Loading"
           border
           fit
@@ -576,14 +576,14 @@
           <el-table-column
             align="center"
             label="发货单"
-            prop="deliverNo"
+            prop="id"
             min-width="160"
             show-overflow-tooltip
           />
           <el-table-column
             align="center"
             label="发货申请日期"
-            prop="deliverDate"
+            prop="orderTime"
             min-width="160"
             show-overflow-tooltip
           />
@@ -611,7 +611,7 @@
           <el-table-column
             align="center"
             label="数量"
-            prop="qty"
+            prop="refundableQty"
             min-width="160"
             show-overflow-tooltip
           />
@@ -625,7 +625,7 @@
             <template slot-scope="scope">
               {{
                 (scope.row.qty || 0) *
-                  (scope.row.singleDepositAmount || 0)
+                (scope.row.singleDepositAmount || 0)
               }}
             </template>
           </el-table-column>
@@ -704,7 +704,7 @@ export default {
         }).then((res) => {
           this.dataList = res.data
         })
-      } else if (this.engineering == '工程发货信息') {
+      } else if (this.engineering == '直调发货') {
         getList({
           pageSize: -1,
           pageNum: 1,

+ 29 - 168
src/views/finance/components/receivable_list-add.vue

@@ -8,14 +8,7 @@
     <el-divider></el-divider>
     <!-- 表头 -->
     <div>
-      <el-form
-        ref="searchForm"
-        :rules="rulesForm"
-        :model="searchForm"
-        label-width="100px"
-        size="small"
-        label-position="left"
-      >
+      <el-form ref="searchForm" :rules="rulesForm" :model="searchForm" label-width="100px" size="small" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据类型" prop="">
@@ -25,11 +18,7 @@
 
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据来源" prop="source">
-              <el-select
-                class="selectStyle"
-                v-model="searchForm.source"
-                placeholder="请选择"
-              >
+              <el-select class="selectStyle" v-model="searchForm.source" placeholder="请选择">
                 <el-option value="工程押金"> </el-option>
                 <el-option value="保证金"> </el-option>
                 <el-option value="工程价差"> </el-option>
@@ -39,27 +28,13 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="业务日期" prop="">
-              <el-date-picker
-                disabled
-                class="selectStyle"
-                type="datetime"
-                placeholder="系统自动生成"
-                default-time="23:59:59"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
+              <el-date-picker disabled class="selectStyle" type="datetime" placeholder="系统自动生成" default-time="23:59:59" 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="23:59:59"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
+              <el-date-picker class="selectStyle" v-model="searchForm.endTime" type="datetime" placeholder="选择日期时间" default-time="23:59:59" value-format="yyyy-MM-dd HH:mm:ss">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -75,21 +50,14 @@
 
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据状态" prop="examineStatus">
-              <el-select
-                class="selectStyle"
-                v-model="searchForm.examineStatus"
-                placeholder="请选择"
-              >
+              <el-select class="selectStyle" v-model="searchForm.examineStatus" placeholder="请选择">
                 <el-option value="SAVE" label="暂存"> </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="备注" prop="">
-              <el-input
-                v-model="searchForm.remark"
-                placeholder="请输入"
-              ></el-input>
+              <el-input v-model="searchForm.remark" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -100,127 +68,52 @@
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table
-          v-loading="listLoading"
-          :data="dataList"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-          stripe
-          :row-class-name="rouClassNameFn"
-          @row-click="onRowClick"
-        >
+        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe :row-class-name="rouClassNameFn" @row-click="onRowClick">
           <el-table-column align="center" label="序号">
             <template slot-scope="scope">
               {{ scope.$index + 1 }}
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="*经销商名称"
-            prop="customerName"
-            min-width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column align="center" label="*经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-select
-                @change="changeCustomerFn($event, scope.$index)"
-                v-model="scope.row.customerId"
-                placeholder="请选择"
-                filterable
-              >
-                <el-option
-                  v-for="(item, i) in customerList"
-                  :key="i"
-                  :label="item.name"
-                  :value="item.id"
-                >
+              <el-select @change="changeCustomerFn($event, scope.$index)" v-model="scope.row.customerId" placeholder="请选择" filterable>
+                <el-option v-for="(item, i) in customerList" :key="i" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="费用项目编码"
-            prop="projectCode"
-            min-width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column align="center" label="费用项目编码" prop="projectCode" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-input v-model="scope.row.projectCode"></el-input>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="*项目费用名称"
-            prop="projectName"
-            min-width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column align="center" label="*项目费用名称" prop="projectName" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-input v-model="scope.row.projectName"></el-input>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="*费用承担部门"
-            prop="departmentId"
-            min-width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column align="center" label="*费用承担部门" prop="departmentId" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-input v-model="scope.row.departmentId"></el-input>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="*收入部门"
-            prop="incomeDept"
-            min-width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column align="center" label="*收入部门" prop="incomeDept" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-input v-model="scope.row.incomeDept"></el-input>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="现金钱包"
-            prop="walletId"
-            min-width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column align="center" label="现金钱包" prop="walletId" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-select
-                filterable
-                v-model="scope.row.customerWalletId"
-                placeholder="请选择"
-              >
-                <el-option
-                  v-for="item in scope.row.walletList"
-                  :key="item.customerWalletId"
-                  :label="item.customerWalletName"
-                  :value="item.customerWalletId"
-                >
+              <el-select filterable v-model="scope.row.customerWalletId" placeholder="请选择">
+                <el-option v-for="item in scope.row.walletList" :key="item.customerWalletId" :label="item.customerWalletName" :value="item.customerWalletId">
                 </el-option>
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="*发票类型"
-            prop="invoiceType"
-            min-width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column align="center" label="*发票类型" prop="invoiceType" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <!-- <el-input v-model="scope.row.invoiceType"></el-input> -->
-              <el-select
-                filterable
-                v-model="scope.row.invoiceType"
-                placeholder="请选择"
-              >
+              <el-select filterable v-model="scope.row.invoiceType" placeholder="请选择">
                 <el-option label="普通发票" value=""> </el-option>
                 <el-option label="增值税发票" value="1"> </el-option>
                 <el-option label="机票" value="P"> </el-option>
@@ -255,43 +148,17 @@
               <el-input type="number" v-model="scope.row.tax"></el-input>
             </template>
           </el-table-column> -->
-          <el-table-column
-            align="center"
-            label="*总金额"
-            prop="tax"
-            min-width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column align="center" label="*总金额" prop="tax" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input
-                type="number"
-                v-model="scope.row.totalAmount"
-              ></el-input>
+              <el-input type="number" v-model="scope.row.totalAmount"></el-input>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="税率%"
-            prop=""
-            min-width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column align="center" label="税率%" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input
-                type="number"
-                :min="0"
-                oninput="if(value>100)value=100;if(value<0)value=0"
-                v-model="scope.row.taxRate"
-              ></el-input>
+              <el-input type="number" :min="0" oninput="if(value>100)value=100;if(value<0)value=0" v-model="scope.row.taxRate"></el-input>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="备注"
-            prop="remark"
-            min-width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
             </template>
@@ -302,18 +169,12 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fl">
-        <el-button type="primary" size="small" @click="addFn"
-          >提交审核</el-button
-        >
+        <el-button type="primary" size="small" @click="addFn">提交审核</el-button>
         <el-button type="primary" size="small" @click="resetFn">重置</el-button>
       </div>
       <div class="fr">
-        <el-button type="primary" size="small" @click="addRowFn"
-          >添加行</el-button
-        >
-        <el-button type="primary" size="small" @click="delRowFn"
-          >删除行</el-button
-        >
+        <el-button type="primary" size="small" @click="addRowFn">添加行</el-button>
+        <el-button type="primary" size="small" @click="delRowFn">删除行</el-button>
       </div>
     </div>
 
@@ -511,8 +372,8 @@ export default {
     addRowFn() {
       this.dataList.push({
         customerId: "",
-        projectCode: "CI004",
-        projectName: "收差价",
+        projectCode: "FYXM01_SYS",
+        projectName: "材料成本",
         departmentId: "",
         customerWalletId: "",
         invoiceType: "",

+ 8 - 8
src/views/sales_policy/codealer_list.vue

@@ -109,24 +109,24 @@
     <!-- 分页 -->
     <div class="fr">
       <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
         :current-page="currentPage"
-        :page-sizes="[10, 20, 30, 50]"
+        :page-sizes="[10, 20, 30, 50,500]"
         :page-size="10"
         layout="total, sizes, prev, pager, next, jumper"
         :total="listTotal"
-      >
-      </el-pagination>
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
     </div>
   </el-container>
   <Distributor v-else :cid="id" />
 </template>
 
 <script>
-import { getCustomerlist, getPolicyDetail } from "@/api/policy_list";
-import Minxin from "@/mixin";
-import Distributor from "./components/Distributor";
+import { getCustomerlist } from '@/api/policy_list'
+import Minxin from '@/mixin'
+import Distributor from './components/Distributor'
+
 export default {
   mixins: [Minxin],
   data() {

+ 7 - 5
src/views/sales_policy/components/Distributor.vue

@@ -216,10 +216,10 @@
 </template>
 
 <script>
-import Pagination from "./Pagination";
-import Transfer from "./Transfer";
-import { getPolicyDetail, getCustomerList, eidtBatch } from "@/api/policy_list";
-import Minxin from "@/mixin";
+import Pagination from './Pagination'
+import Transfer from './Transfer'
+import { eidtBatch, getCustomerList, getPolicyDetail } from '@/api/policy_list'
+import Minxin from '@/mixin'
 
 export default {
   mixins: [Minxin],
@@ -276,13 +276,15 @@ export default {
         };
         getCustomerList(params).then((res) => {
           this.dataList = res.data.records;
+          this.listTotal = res.data.total
           this.listLoading = false;
         });
         getPolicyDetail({ policyId: this.cid }).then((res) => {
           this.details = res.data;
+          this.listLoading = false;
         });
 
-        this.listLoading = false;
+
       }
     },
     handleEdit() {

+ 1 - 1
src/views/supply/apply/components/engin_detail.vue

@@ -127,7 +127,7 @@
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <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="center" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
       </el-table>

+ 4 - 4
src/views/supply/apply/components/engin_examine.vue

@@ -127,7 +127,7 @@
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <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="center" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.approvalNumber" size="small" type="number"></el-input>
@@ -206,7 +206,7 @@ export default {
       imageURL: this.$imageUrl,
       detailData: {},
       userName: JSON.parse(localStorage.getItem("supply_user")).nickName,
-
+      goodsList: [],
       examineForm: {
         remark: '',
       },
@@ -245,7 +245,7 @@ export default {
         this.detailData = res.data;
 
         res.data.orders.forEach(item => {
-          item.approvalNumber = item.invoiceNum;
+          item.approvalNumber = item.refundableQty;
         });
         this.goodsList = res.data.orders;
       })
@@ -285,7 +285,7 @@ export default {
           this.$errorMsg('请填写审批数量');
           return;
         }
-        // if(this.goodsList[i].approvalNumber > this.goodsList[i].invoiceNum) {
+        // if(this.goodsList[i].approvalNumber > this.goodsList[i].refundableQty) {
         //   this.$errorMsg('审批数量不可大于申请数量');
         //   return;
         // }

+ 2 - 2
src/views/supply/apply/components/engin_form.vue

@@ -66,7 +66,7 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="使用单位" prop="company">
-            <el-input v-model="mainForm.company" placeholder="请输入使用单位"></el-input>
+            <el-input v-model="mainForm.company" placeholder="请输入使用单位" disabled></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -88,7 +88,7 @@
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item label="安装地址" prop="address">
-            <el-input v-model="mainForm.address" placeholder="请输入安装地址"></el-input>
+            <el-input v-model="mainForm.address" placeholder="请输入安装地址" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">

+ 2 - 2
src/views/supply/apply/components/engin_return_form.vue

@@ -66,7 +66,7 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="使用单位" prop="company">
-            <el-input v-model="mainForm.company" placeholder="请输入使用单位"></el-input>
+            <el-input v-model="mainForm.company" placeholder="请输入使用单位" disabled></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -88,7 +88,7 @@
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item label="安装地址" prop="address">
-            <el-input v-model="mainForm.address" placeholder="请输入安装地址"></el-input>
+            <el-input v-model="mainForm.address" placeholder="请输入安装地址" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">

+ 2 - 2
src/views/supply/engin/components/home_examine.vue

@@ -75,8 +75,8 @@
         <el-col :span="8" class="item">
           <div class="label">不扣押金</div>
           <div class="value">
-            {{detailData.takeDeposit ? '是':'否'}}
-            <!-- <el-checkbox v-model="detailData.takeDeposit">{{detailData.takeDeposit ? '是':'否'}}</el-checkbox> -->
+            <!-- {{detailData.takeDeposit ? '是':'否'}} -->
+            <el-checkbox v-model="detailData.takeDeposit">{{detailData.takeDeposit ? '是':'否'}}</el-checkbox>
           </div>
         </el-col>
         <el-col :span="8" class="item">

+ 2 - 3
src/views/supply/policy/policy_list.vue

@@ -306,16 +306,15 @@
               align="center"
               label="返利金额"
               sortable
-              prop="payRebateAmount"
+              prop="rebateAmount"
               min-width="100"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <div>{{ scope.row.rebateAmount | numToFixed }}</div>
-<!--                <div>(实际:{{ scope.row.payRebateAmount | numToFixed }})</div>-->
               </template>
             </el-table-column>
-       
+
             <el-table-column
               align="center"
               label="格力折扣"

+ 1 - 0
src/views/supply/retail/retail_list.vue

@@ -177,6 +177,7 @@
                 {{ scope.row.totalDiscAmount | numToFixed }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="业务员" prop="k3ServiceName" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制表人" prop="createName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="审核人" prop="examineName" min-width="100" show-overflow-tooltip></el-table-column>