Merge branch 'feature/Feature-copy' into develop

src/views/supply/apply/apply_list.vue

@@ -9,28 +9,28 @@
               <el-form-item prop="status" label-width="0">
                 <el-radio-group v-model="screenForm.status" @change="getList()">
                   <el-radio-button label="">全部</el-radio-button>
-                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
+                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{ item.label }}</el-radio-button>
                 </el-radio-group>
               </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-input v-model="screenForm.orderNum" placeholder="请输入发货申请单" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="仓库名称" prop="warehouse">
-                <el-input v-model="screenForm.warehouse" placeholder="请输入仓库名称"></el-input>
+                <el-input v-model="screenForm.warehouse" placeholder="请输入仓库名称" />
               </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-input v-model="screenForm.jxsNum" placeholder="请输入经销商编码" />
               </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-input v-model="screenForm.jxsName" placeholder="请输入经销商名称" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -42,29 +42,29 @@
                   style="width: 100%;"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期">
-                </el-date-picker>
+                  end-placeholder="结束日期"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="产品名称" prop="chName">
-                <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
+                <el-input v-model="screenForm.chName" placeholder="请输入产品名称" />
               </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-input v-model="screenForm.model" placeholder="请输入规格型号" />
               </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="k3ServiceId">
                 <el-select v-model="screenForm.k3ServiceId" placeholder="选择表头业务员" size="small" clearable filterable style="width: 100%">
                   <el-option
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
                     :label="item.nickName"
-                    :value="item.adminUserId">
-                  </el-option>
+                    :value="item.adminUserId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -75,8 +75,8 @@
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
                     :label="item.nickName"
-                    :value="item.adminUserId">
-                  </el-option>
+                    :value="item.adminUserId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -87,18 +87,18 @@
                     v-for="item in orderTypeList"
                     :key="item.value"
                     :label="item.label"
-                    :value="item.value">
-                  </el-option>
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="订单号" prop="mainOrderId">
-                <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
+                <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品类别" >
+              <el-form-item label="产品类别">
                 <el-select v-model="screenForm.categoryId" style="width: 100%" placeholder="选择产品类别" filterable clearable>
                   <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.id" />
                 </el-select>
@@ -106,10 +106,14 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="审核人" prop="approvalName">
-                <el-input v-model="screenForm.approvalName" placeholder="请输入审核人"></el-input>
+                <el-input v-model="screenForm.approvalName" placeholder="请输入审核人" />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="制单人" prop="createBy">
+                <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
               </el-form-item>
             </el-col>
-
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -123,12 +127,12 @@
       <div class="mymain-container">
         <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('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>
+            <el-button v-if="$checkBtnRole('add', $route.meta.roles)" size="mini" type="primary" icon="el-icon-plus" @click="toForm()">发货申请</el-button>
+            <el-button v-if="$checkBtnRole('refund', $route.meta.roles)" size="mini" type="primary" icon="el-icon-plus" @click="toReturnForm()">退货申请</el-button>
+            <el-button v-if="$checkBtnRole('examine', $route.meta.roles)" size="mini" type="warning" icon="el-icon-finished" :disabled="multipleSelection.length < 1" @click="batchExamine">批量审批</el-button>
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'invoice/listExport'" :exParams="exParams" />
+            <ExportButton :ex-url="'invoice/listExport'" :ex-params="exParams" />
           </div>
         </div>
         <div class="table">
@@ -139,169 +143,174 @@
             border
             fit
             :row-style="rowClass"
-            @selection-change="handleSelectionChange"
             show-summary
-            :summary-method="$getSummaries">
-            <el-table-column align="center" type="selection" width="55" fixed="left"></el-table-column>
+            :summary-method="$getSummaries"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column align="center" type="selection" width="55" fixed="left" />
             <el-table-column align="left" label="订单类型" prop="type" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.type | orderTypeFilter}}
+                {{ scope.row.type | orderTypeFilter }}
               </template>
             </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>
+                <CopyButton :copy-text="scope.row.id" />
+                <span>{{ scope.row.id }}</span>
               </template>
             </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="createTime" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.type === 3 ? scope.row.stockName : scope.row.correspondName}}
+                {{ scope.row.type === 3 ? scope.row.stockName : scope.row.correspondName }}
               </template>
             </el-table-column>
             <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.mainOrderId" />
-                <span>{{scope.row.mainOrderId}}</span>
+                <CopyButton :copy-text="scope.row.mainOrderId" />
+                <span>{{ 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>
+                <CopyButton :copy-text="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>
+                <CopyButton :copy-text="scope.row.customerName" />
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </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>
+                <CopyButton :copy-text="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>
+                <CopyButton :copy-text="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>
+                <CopyButton :copy-text="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>
+                <CopyButton :copy-text="scope.row.specification" />
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="产品类别" prop="categoryName" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span>{{scope.row.categoryName}}</span>
+                <span>{{ scope.row.categoryName }}</span>
               </template>
             </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="itemFileNo" min-width="100" show-overflow-tooltip>
-
-            </el-table-column>
-            <el-table-column align="left" 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="retiredQty" 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 align="left" label="文件编号" prop="itemFileNo" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
+            <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip />
+            <el-table-column align="right" label="已退数量" prop="retiredQty" 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.singlePayPrice | numToFixed}}
+                {{ scope.row.singlePayPrice | numToFixed }}
               </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}}
+                {{ scope.row.payAmount | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="返利金额" prop="payRebateAmount" min-width="100" 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="totalDiscAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.totalDiscAmount | numToFixed}}
+                {{ scope.row.totalDiscAmount | numToFixed }}
               </template>
             </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>
-            <el-table-column align="left" label="审批说明" prop="approvalRemark" 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="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="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="审批说明" prop="approvalRemark" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.examineStatus | statusFilter}}
+                {{ scope.row.examineStatus | statusFilter }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="操作" width="180" fixed="right">
               <template slot-scope="scope">
                 <el-popconfirm
+                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'"
                   style="margin-right: 10px;"
                   title="确定申请吗？"
                   @onConfirm="handleSubmit(scope.row.id, 'WAIT')"
-                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
+                >
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
                 <el-popconfirm
+                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
                   style="margin-right: 10px;"
                   title="确定撤回吗？"
                   @onConfirm="handleSubmit(scope.row.id, 'SAVE')"
-                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'" >
+                >
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
                 <el-popconfirm
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'"
                   style="margin-right: 10px;"
                   title="确定弃审吗？"
                   @onConfirm="handleAbandon(scope.row.id)"
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
+                >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
                 <el-button
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 1"
                   type="text"
                   @click="toForm(scope.row)"
-                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 1">
+                >
                   编辑
                 </el-button>
                 <el-button
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 2"
                   type="text"
                   @click="toReturnForm(scope.row)"
-                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 2">
+                >
                   编辑
                 </el-button>
                 <el-button
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
                   type="text"
                   @click="toExamine(scope.row)"
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">
+                >
                   审单
                 </el-button>
                 <el-button
                   type="text"
-                  @click="toDetail(scope.row)">
+                  @click="toDetail(scope.row)"
+                >
                   详情
                 </el-button>
                 <el-popconfirm
+                  v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'"
                   style="margin-left: 10px;"
                   title="确定删除吗？"
                   @onConfirm="handleDelete(scope.row.id)"
-                  v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'">
+                >
                   <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
               </template>
@@ -312,36 +321,36 @@
       <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>
+            :total="listTotal"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
         </div>
       </div>
     </div>
 
-    <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" />
+    <ExamineDialog :is-show.sync="isShowExamineDialog" :examine-form.sync="examineForm" />
 
-    <ApplyDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" ref="refDetail"/>
-    <ApplyExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
-    <ApplyForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
-    <ApplyReturnForm :listItem="queryItem" v-if="isShowReturnForm" @backListFormDetail="backList" :isShow="isShow"/>
+    <ApplyDetail v-if="isShowDetail" ref="refDetail" :list-item="queryItem" @backListFormDetail="backList" />
+    <ApplyExamine v-if="isShowExamine" :list-item="queryItem" @backListFormDetail="backList" />
+    <ApplyForm v-if="isShowForm" :list-item="queryItem" @backListFormDetail="backList" />
+    <ApplyReturnForm v-if="isShowReturnForm" :list-item="queryItem" :is-show="isShow" @backListFormDetail="backList" />
 
   </div>
 </template>
 
 <script>
-import { getApplyList, submitApply, deleteApply, abandonApply, examineBatchApply } from "@/api/supply/apply";
-import {getCategoryList, getSalesmanList} from '@/api/common'
-import ApplyDetail from "@/views/supply/apply/components/apply_detail";
-import ApplyExamine from "@/views/supply/apply/components/apply_examine";
-import ApplyForm from "@/views/supply/apply/components/apply_form";
-import ApplyReturnForm from "@/views/supply/apply/components/apply_return_form";
-import ExamineDialog from "@/components/Common/examine-dialog";
+import { getApplyList, submitApply, deleteApply, abandonApply, examineBatchApply } from '@/api/supply/apply'
+import { getCategoryList, getSalesmanList } from '@/api/common'
+import ApplyDetail from '@/views/supply/apply/components/apply_detail'
+import ApplyExamine from '@/views/supply/apply/components/apply_examine'
+import ApplyForm from '@/views/supply/apply/components/apply_form'
+import ApplyReturnForm from '@/views/supply/apply/components/apply_return_form'
+import ExamineDialog from '@/components/Common/examine-dialog'
 
 let that
 export default {
@@ -350,17 +359,17 @@ export default {
     ApplyExamine,
     ApplyForm,
     ApplyReturnForm,
-    ExamineDialog,
+    ExamineDialog
   },
   filters: {
     statusFilter(val) {
-      let obj = that.statusList.find(o => o.value == val);
+      const obj = that.statusList.find(o => o.value == val)
       return obj ? obj.label : ''
     },
     orderTypeFilter(val) {
-      let obj = that.orderTypeList.find(o => o.value == val);
+      const obj = that.orderTypeList.find(o => o.value == val)
       return obj ? obj.label : ''
-    },
+    }
   },
   data() {
     return {
@@ -381,22 +390,23 @@ export default {
         salesMan: '',
         orderType: '',
         mainOrderId: '',
-        k3ServiceId:'',
-        serviceId:'',
+        k3ServiceId: '',
+        serviceId: '',
         categoryId: '',
-        approvalName:''
+        approvalName: '',
+        createBy: ''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
         //  // { label: '审核驳回', value: 'FAIL' },,
-        { label: '已关闭', value: 'CLOSE' },
+        { label: '已关闭', value: 'CLOSE' }
       ],
       orderTypeList: [
         { label: '发货申请单', value: 1 },
         { label: '退货申请单', value: 2 },
-        { label: '直调发货单', value: 3 },
+        { label: '直调发货单', value: 3 }
       ],
       salesmanList: [],
 
@@ -411,7 +421,7 @@ export default {
       isShowExamineDialog: false,
       examineForm: {
         status: '',
-        remark: '',
+        remark: ''
       },
       categoryList: []
     }
@@ -429,14 +439,15 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         examineStatus: this.screenForm.status,
-        k3ServiceId:this.screenForm.k3ServiceId,
-        serviceId:this.screenForm.serviceId,
+        k3ServiceId: this.screenForm.k3ServiceId,
+        serviceId: this.screenForm.serviceId,
+        createBy: this.screenForm.createBy,
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
         categoryId: this.screenForm.categoryId,
-        approvalName:this.screenForm.approvalName
+        approvalName: this.screenForm.approvalName
       }
-    },
+    }
   },
 
   watch: {
@@ -451,29 +462,29 @@ export default {
   },
 
   beforeCreate() {
-    that = this;
+    that = this
   },
 
   created() {
-    this.getSalesmanList();
-    this.getList();
-    this.getCategoryList();
+    this.getSalesmanList()
+    this.getList()
+    this.getCategoryList()
     this.isShow = false
-  if (this.$route.query && this.$route.query.isShow) {
-    this.isShow = this.$route.query.isShow
+    if (this.$route.query && this.$route.query.isShow) {
+      this.isShow = this.$route.query.isShow
 
       this.toReturnForm()
-  }
+    }
   },
-//   activated() {
-//       this.isShow = false
-//   if (this.$route.query && this.$route.query.isShow) {
-//     this.isShow = this.$route.query.isShow
+  //   activated() {
+  //       this.isShow = false
+  //   if (this.$route.query && this.$route.query.isShow) {
+  //     this.isShow = this.$route.query.isShow
 
-//       this.toReturnForm()
-//   }
+  //       this.toReturnForm()
+  //   }
 
-// },
+  // },
   methods: {
     // 获取业务员列表
     getSalesmanList() {
@@ -481,22 +492,24 @@ export default {
         pageNum: 1,
         pageSize: -1,
         isCustomer: 0,
-        status: true,
+        status: true
       }).then(res => {
-        this.salesmanList = res.data.records;
+        this.salesmanList = res.data.records
       })
     },
 
     // 查询列表
     getList() {
-      this.listLoading = true;
+      this.listLoading = true
 
-      let params = {
+      const params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         id: this.screenForm.orderNum,
         correspondName: this.screenForm.warehouse,
         customerNumber: this.screenForm.jxsNum,
+        createBy: this.screenForm.createBy,
+
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,
         specification: this.screenForm.model,
@@ -505,72 +518,72 @@ export default {
         examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
         type: this.screenForm.orderType,
-        k3ServiceId:this.screenForm.k3ServiceId,
+        k3ServiceId: this.screenForm.k3ServiceId,
         mainOrderId: this.screenForm.mainOrderId,
         categoryId: this.screenForm.categoryId,
-        approvalName:this.screenForm.approvalName
+        approvalName: this.screenForm.approvalName
 
-      };
+      }
       getApplyList(params).then((res) => {
         res.data.records.forEach(item => {
-          item.sums1 = ['refundableQty', 'retiredQty'];
-          item.sums2 = ['singlePayPrice', 'payAmount', 'payRebateAmount', 'totalDiscAmount'];
+          item.sums1 = ['refundableQty', 'retiredQty']
+          item.sums2 = ['singlePayPrice', 'payAmount', 'payRebateAmount', 'totalDiscAmount']
         })
-        this.dataList = res.data.records;
-        this.listTotal = res.data.total;
-        this.listLoading = false;
+        this.dataList = res.data.records
+        this.listTotal = res.data.total
+        this.listLoading = false
       })
     },
 
     // 提交筛选表单
     submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
+      this.currentPage = 1
+      this.getList()
     },
 
     // 重置筛选表单
     resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
+      this.$refs.screenForm.resetFields()
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改每页数量
     handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
+      this.pageSize = val
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改当前页
     handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
+      this.currentPage = val
+      this.getList()
     },
 
     // 进入表单
     toForm(item) {
-      this.queryItem = item;
-      this.isShowForm = true;
+      this.queryItem = item
+      this.isShowForm = true
     },
 
     // 进入表单
     toReturnForm(item) {
-      this.queryItem = item;
-      this.isShowReturnForm = true;
+      this.queryItem = item
+      this.isShowReturnForm = true
     },
 
     // 进入审批
     toExamine(item) {
-      this.queryItem = item;
-      this.isShowExamine = true;
+      this.queryItem = item
+      this.isShowExamine = true
     },
 
     // 进入详情
     toDetail(item) {
-      this.queryItem = item;
-      this.isShowDetail = true;
-      this.$nextTick(()=>{
+      this.queryItem = item
+      this.isShowDetail = true
+      this.$nextTick(() => {
         this.$refs.refDetail.initPrint()
       })
 
@@ -578,42 +591,42 @@ export default {
     },
 
     backList() {
-      this.queryItem = {};
-      this.isShowDetail = false;
-      this.isShowExamine = false;
-      this.isShowForm = false;
-      this.isShowReturnForm = false;
+      this.queryItem = {}
+      this.isShowDetail = false
+      this.isShowExamine = false
+      this.isShowForm = false
+      this.isShowReturnForm = false
     },
 
     handleDelete(id) {
-      deleteApply({id}).then(res => {
-        this.$successMsg();
-        this.getList();
+      deleteApply({ id }).then(res => {
+        this.$successMsg()
+        this.getList()
       })
     },
 
     // 申请/撤回
     handleSubmit(id, examineStatus) {
-      submitApply({id, examineStatus}).then(res => {
-        this.$successMsg();
-        this.getList();
+      submitApply({ id, examineStatus }).then(res => {
+        this.$successMsg()
+        this.getList()
       })
     },
 
     // 弃审
     handleAbandon(id) {
-      abandonApply({id}).then(res => {
-        this.$successMsg();
-        this.getList();
+      abandonApply({ id }).then(res => {
+        this.$successMsg()
+        this.getList()
       })
     },
 
     handleSelectionChange(val) {
-      this.multipleSelection = val;
-      if(val) {
-        this.selections = val;
-      }else {
-        this.selections = [];
+      this.multipleSelection = val
+      if (val) {
+        this.selections = val
+      } else {
+        this.selections = []
       }
     },
 
@@ -625,23 +638,23 @@ export default {
 
     // 打开 批量审批
     batchExamine() {
-      this.isShowExamineDialog = true;
+      this.isShowExamineDialog = true
     },
 
     // 提交 批量审批
     submitExamineForm() {
       let ids = this.multipleSelection.map(item => {
-        return item.id;
-      });
-      ids = Array.from(new Set(ids));
+        return item.id
+      })
+      ids = Array.from(new Set(ids))
       examineBatchApply({
         ids: ids.join(','),
         examineStatus: this.examineForm.status,
-        approvalRemark: this.examineForm.remark,
+        approvalRemark: this.examineForm.remark
       }).then(res => {
-        this.isShowExamineDialog = false;
-        this.getList();
-        this.$successMsg('审批成功');
+        this.isShowExamineDialog = false
+        this.getList()
+        this.$successMsg('审批成功')
       })
     },
     // 获取存货类别列表
@@ -652,7 +665,7 @@ export default {
       }).then(res => {
         this.categoryList = res.data.records
       })
-    },
+    }
   }
 }
 </script>

src/views/supply/apply/engin_list.vue

@@ -9,28 +9,28 @@
               <el-form-item prop="status" label-width="0">
                 <el-radio-group v-model="screenForm.status" @change="getList()">
                   <el-radio-button label="">全部</el-radio-button>
-                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
+                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{ item.label }}</el-radio-button>
                 </el-radio-group>
               </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-input v-model="screenForm.orderNum" placeholder="请输入发货申请单" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="仓库名称" prop="warehouse">
-                <el-input v-model="screenForm.warehouse" placeholder="请输入仓库名称"></el-input>
+                <el-input v-model="screenForm.warehouse" placeholder="请输入仓库名称" />
               </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-input v-model="screenForm.jxsNum" placeholder="请输入经销商编码" />
               </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-input v-model="screenForm.jxsName" placeholder="请输入经销商名称" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -42,18 +42,18 @@
                   style="width: 100%;"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期">
-                </el-date-picker>
+                  end-placeholder="结束日期"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="产品名称" prop="chName">
-                <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
+                <el-input v-model="screenForm.chName" placeholder="请输入产品名称" />
               </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-input v-model="screenForm.model" placeholder="请输入规格型号" />
               </el-form-item>
             </el-col>
 
@@ -64,24 +64,24 @@
                     v-for="item in orderTypeList"
                     :key="item.value"
                     :label="item.label"
-                    :value="item.value">
-                  </el-option>
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="订单号" prop="mainOrderId">
-                <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
+                <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程登录编号" prop="refEnginRecordNo">
-                <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入工程登录编号"></el-input>
+                <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入工程登录编号" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="使用单位" prop="refUseUnit">
-                <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位"></el-input>
+                <el-input v-model="screenForm.refUseUnit" placeholder="请输入使用单位" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -91,8 +91,8 @@
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
                     :label="item.nickName"
-                    :value="item.adminUserId">
-                  </el-option>
+                    :value="item.adminUserId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -103,13 +103,13 @@
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
                     :label="item.nickName"
-                    :value="item.adminUserId">
-                  </el-option>
+                    :value="item.adminUserId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品类别" >
+              <el-form-item label="产品类别">
                 <el-select v-model="screenForm.categoryId" style="width: 100%" placeholder="选择产品类别" filterable clearable>
                   <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.id" />
                 </el-select>
@@ -117,12 +117,17 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="审核人" prop="approvalName">
-                <el-input v-model="screenForm.approvalName" placeholder="请输入审核人"></el-input>
+                <el-input v-model="screenForm.approvalName" placeholder="请输入审核人" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="区域" prop="refRegionWork">
-                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域"></el-input>
+                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="制单人" prop="createBy">
+                <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
@@ -138,12 +143,12 @@
       <div class="mymain-container">
         <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('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>
+            <el-button v-if="$checkBtnRole('add', $route.meta.roles)" size="mini" type="primary" icon="el-icon-plus" @click="toForm()">发货申请</el-button>
+            <el-button v-if="$checkBtnRole('refund', $route.meta.roles)" size="mini" type="primary" icon="el-icon-plus" @click="toReturnForm()">退货申请</el-button>
+            <el-button v-if="$checkBtnRole('examine', $route.meta.roles)" size="mini" type="warning" icon="el-icon-finished" :disabled="multipleSelection.length < 1" @click="batchExamine">批量审批</el-button>
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'invoice/listProjectExport'" :exParams="exParams" />
+            <ExportButton :ex-url="'invoice/listProjectExport'" :ex-params="exParams" />
           </div>
         </div>
         <div class="table">
@@ -154,175 +159,184 @@
             border
             fit
             :row-style="rowClass"
-            @selection-change="handleSelectionChange"
             show-summary
-            :summary-method="$getSummaries">
-            <el-table-column align="center" type="selection" width="55" fixed="left"></el-table-column>
+            :summary-method="$getSummaries"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column align="center" type="selection" width="55" fixed="left" />
             <el-table-column align="left" label="订单类型" prop="type" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.type | orderTypeFilter}}
+                {{ scope.row.type | orderTypeFilter }}
               </template>
             </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>
+                <CopyButton :copy-text="scope.row.id" />
+                <span>{{ scope.row.id }}</span>
               </template>
             </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="createTime" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.type === 3 ? scope.row.stockName : scope.row.correspondName}}
+                {{ scope.row.type === 3 ? scope.row.stockName : scope.row.correspondName }}
               </template>
             </el-table-column>
             <el-table-column align="left" label="订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.enginOrderNo" />
-                <span>{{scope.row.enginOrderNo}}</span>
+                <CopyButton :copy-text="scope.row.enginOrderNo" />
+                <span>{{ scope.row.enginOrderNo }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="工程登录编号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.refEnginRecordNo" />
-                <span>{{scope.row.refEnginRecordNo}}</span>
+                <CopyButton :copy-text="scope.row.refEnginRecordNo" />
+                <span>{{ scope.row.refEnginRecordNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refProjectCategory" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="120" show-overflow-tooltip />
+            <el-table-column align="left" label="项目类别" prop="refProjectCategory" min-width="120" show-overflow-tooltip />
 
-            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="120" show-overflow-tooltip />
             <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>
+                <CopyButton :copy-text="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>
+                <CopyButton :copy-text="scope.row.customerName" />
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </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>
+                <CopyButton :copy-text="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>
+                <CopyButton :copy-text="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>
+                <CopyButton :copy-text="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>
+                <CopyButton :copy-text="scope.row.specification" />
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="产品类别" prop="categoryName" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                <span>{{scope.row.categoryName}}</span>
+                <span>{{ scope.row.categoryName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="文件编号" prop="itemFileNo" 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="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="100" show-overflow-tooltip />
+            <el-table-column align="right" label="数量" prop="refundableQty" 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.singlePayPrice | numToFixed}}
+                {{ scope.row.singlePayPrice | numToFixed }}
               </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}}
+                {{ scope.row.payAmount | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="返利金额" prop="payRebateAmount" min-width="100" 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="totalDiscAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.totalDiscAmount | numToFixed}}
+                {{ scope.row.totalDiscAmount | numToFixed }}
               </template>
             </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>
-            <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="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="refRegionWork" min-width="160" show-overflow-tooltip></el-table-column>
-
-            <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
-
-            <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip />
+
+            <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip />
+
+            <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.examineStatus | statusFilter}}
+                {{ scope.row.examineStatus | statusFilter }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="操作" width="180" fixed="right">
               <template slot-scope="scope">
                 <el-popconfirm
+                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'"
                   style="margin-right: 10px;"
                   title="确定申请吗？"
                   @onConfirm="handleSubmit(scope.row.id, 'WAIT')"
-                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
+                >
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
                 <el-popconfirm
+                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
                   style="margin-right: 10px;"
                   title="确定撤回吗？"
                   @onConfirm="handleSubmit(scope.row.id, 'SAVE')"
-                  v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'" >
+                >
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
                 <el-popconfirm
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'"
                   style="margin-right: 10px;"
                   title="确定弃审吗？"
                   @onConfirm="handleAbandon(scope.row.id)"
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
+                >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
                 <el-button
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 1"
                   type="text"
                   @click="toForm(scope.row)"
-                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 1">
+                >
                   编辑
                 </el-button>
                 <el-button
+                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 2"
                   type="text"
                   @click="toReturnForm(scope.row)"
-                  v-if="$checkBtnRole('edit', $route.meta.roles) && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type === 2">
+                >
                   编辑
                 </el-button>
                 <el-button
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'"
                   type="text"
                   @click="toExamine(scope.row)"
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">
+                >
                   审单
                 </el-button>
                 <el-button
                   type="text"
-                  @click="toDetail(scope.row)">
+                  @click="toDetail(scope.row)"
+                >
                   详情
                 </el-button>
                 <el-popconfirm
+                  v-if="scope.row.examineStatus !== 'OK'"
                   style="margin-left: 10px;"
                   title="确定删除吗？"
                   @onConfirm="handleDelete(scope.row.id)"
-                  v-if="scope.row.examineStatus !== 'OK'">
+                >
                   <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
               </template>
@@ -333,36 +347,36 @@
       <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>
+            :total="listTotal"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
         </div>
       </div>
     </div>
 
-    <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" />
+    <ExamineDialog :is-show.sync="isShowExamineDialog" :examine-form.sync="examineForm" />
 
-    <EnginDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList"  ref="refDetail"/>
-    <EnginExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
-    <EnginForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
-    <EnginReturnForm :listItem="queryItem" v-if="isShowReturnForm" @backListFormDetail="backList" />
+    <EnginDetail v-if="isShowDetail" ref="refDetail" :list-item="queryItem" @backListFormDetail="backList" />
+    <EnginExamine v-if="isShowExamine" :list-item="queryItem" @backListFormDetail="backList" />
+    <EnginForm v-if="isShowForm" :list-item="queryItem" @backListFormDetail="backList" />
+    <EnginReturnForm v-if="isShowReturnForm" :list-item="queryItem" @backListFormDetail="backList" />
 
   </div>
 </template>
 
 <script>
-import { getEnginList, submitEngin, deleteEngin, abandonEngin, examineBatchEngin } from "@/api/supply/apply";
-import {getCategoryList, getSalesmanList} from '@/api/common'
-import EnginDetail from "@/views/supply/apply/components/engin_detail";
-import EnginExamine from "@/views/supply/apply/components/engin_examine";
-import EnginForm from "@/views/supply/apply/components/engin_form";
-import EnginReturnForm from "@/views/supply/apply/components/engin_return_form";
-import ExamineDialog from "@/components/Common/examine-dialog";
+import { getEnginList, submitEngin, deleteEngin, abandonEngin, examineBatchEngin } from '@/api/supply/apply'
+import { getCategoryList, getSalesmanList } from '@/api/common'
+import EnginDetail from '@/views/supply/apply/components/engin_detail'
+import EnginExamine from '@/views/supply/apply/components/engin_examine'
+import EnginForm from '@/views/supply/apply/components/engin_form'
+import EnginReturnForm from '@/views/supply/apply/components/engin_return_form'
+import ExamineDialog from '@/components/Common/examine-dialog'
 
 let that
 export default {
@@ -371,17 +385,17 @@ export default {
     EnginExamine,
     EnginForm,
     EnginReturnForm,
-    ExamineDialog,
+    ExamineDialog
   },
   filters: {
     statusFilter(val) {
-      let obj = that.statusList.find(o => o.value == val);
+      const obj = that.statusList.find(o => o.value == val)
       return obj ? obj.label : ''
     },
     orderTypeFilter(val) {
-      let obj = that.orderTypeList.find(o => o.value == val);
+      const obj = that.orderTypeList.find(o => o.value == val)
       return obj ? obj.label : ''
-    },
+    }
   },
   data() {
     return {
@@ -404,22 +418,23 @@ export default {
         mainOrderId: '',
         refEnginRecordNo: '',
         refUseUnit: '',
-        k3ServiceId:'',
+        k3ServiceId: '',
         categoryId: '',
-        approvalName:'',
-        refRegionWork:''
+        approvalName: '',
+        refRegionWork: '',
+        createBy: ''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
         //  // { label: '审核驳回', value: 'FAIL' },,
-        { label: '已关闭', value: 'CLOSE' },
+        { label: '已关闭', value: 'CLOSE' }
       ],
       orderTypeList: [
         { label: '发货申请单', value: 1 },
         { label: '退货申请单', value: 2 },
-        { label: '直调发货单', value: 3 },
+        { label: '直调发货单', value: 3 }
       ],
       salesmanList: [],
 
@@ -434,9 +449,9 @@ export default {
       isShowExamineDialog: false,
       examineForm: {
         status: '',
-        remark: '',
+        remark: ''
       },
-      isShow:false,
+      isShow: false,
       categoryList: []
     }
   },
@@ -454,16 +469,17 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
-        k3ServiceId:this.screenForm.k3ServiceId,
+        k3ServiceId: this.screenForm.k3ServiceId,
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
+        createBy: this.screenForm.createBy,
         refEnginRecordNo: this.screenForm.refEnginRecordNo,
         refUseUnit: this.screenForm.refUseUnit,
         categoryId: this.screenForm.categoryId,
-        approvalName:this.screenForm.approvalName,
-        refRegionWork:this.screenForm.refRegionWork
+        approvalName: this.screenForm.approvalName,
+        refRegionWork: this.screenForm.refRegionWork
       }
-    },
+    }
   },
 
   watch: {
@@ -478,17 +494,17 @@ export default {
   },
 
   beforeCreate() {
-    that = this;
+    that = this
   },
 
   created() {
-    this.getSalesmanList();
-    this.getList();
-    this.getCategoryList();
+    this.getSalesmanList()
+    this.getList()
+    this.getCategoryList()
     this.isShow = false
-    if(this.$route.query && this.$route.query.isShow){
+    if (this.$route.query && this.$route.query.isShow) {
       this.isShow = this.$route.query.isShow
-        this.toReturnForm()
+      this.toReturnForm()
     }
   },
   // activated() {
@@ -506,17 +522,17 @@ export default {
         pageNum: 1,
         pageSize: -1,
         isCustomer: 0,
-        status: true,
+        status: true
       }).then(res => {
-        this.salesmanList = res.data.records;
+        this.salesmanList = res.data.records
       })
     },
 
     // 查询列表
     getList() {
-      this.listLoading = true;
+      this.listLoading = true
 
-      let params = {
+      const params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         id: this.screenForm.orderNum,
@@ -528,6 +544,8 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         examineStatus: this.screenForm.status,
+        createBy: this.screenForm.createBy,
+
         serviceId: this.screenForm.salesMan,
         k3ServiceId: this.screenForm.k3ServiceId,
         type: this.screenForm.orderType,
@@ -535,112 +553,111 @@ export default {
         refEnginRecordNo: this.screenForm.refEnginRecordNo,
         refUseUnit: this.screenForm.refUseUnit,
         categoryId: this.screenForm.categoryId,
-        approvalName:this.screenForm.approvalName,
-        refRegionWork:this.screenForm.refRegionWork
+        approvalName: this.screenForm.approvalName,
+        refRegionWork: this.screenForm.refRegionWork
 
-
-      };
+      }
       getEnginList(params).then((res) => {
         res.data.records.forEach(item => {
-          item.sums1 = ['refundableQty'];
-          item.sums2 = ['singlePayPrice', 'payAmount', 'payRebateAmount', 'totalDiscAmount'];
+          item.sums1 = ['refundableQty']
+          item.sums2 = ['singlePayPrice', 'payAmount', 'payRebateAmount', 'totalDiscAmount']
         })
-        this.dataList = res.data.records;
-        this.listTotal = res.data.total;
-        this.listLoading = false;
+        this.dataList = res.data.records
+        this.listTotal = res.data.total
+        this.listLoading = false
       })
     },
 
     // 提交筛选表单
     submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
+      this.currentPage = 1
+      this.getList()
     },
 
     // 重置筛选表单
     resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
+      this.$refs.screenForm.resetFields()
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改每页数量
     handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
+      this.pageSize = val
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改当前页
     handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
+      this.currentPage = val
+      this.getList()
     },
 
     // 进入表单
     toForm(item) {
-      this.queryItem = item;
-      this.isShowForm = true;
+      this.queryItem = item
+      this.isShowForm = true
     },
 
     // 进入表单
     toReturnForm(item) {
-      this.queryItem = item;
-      this.isShowReturnForm = true;
+      this.queryItem = item
+      this.isShowReturnForm = true
     },
 
     // 进入审批
     toExamine(item) {
-      this.queryItem = item;
-      this.isShowExamine = true;
+      this.queryItem = item
+      this.isShowExamine = true
     },
 
     // 进入详情
     toDetail(item) {
-      this.queryItem = item;
-      this.isShowDetail = true;
-      this.$nextTick(()=>{
+      this.queryItem = item
+      this.isShowDetail = true
+      this.$nextTick(() => {
         this.$refs.refDetail.initPrint()
       })
     },
 
     backList() {
-      this.queryItem = {};
-      this.isShowDetail = false;
-      this.isShowExamine = false;
-      this.isShowForm = false;
-      this.isShowReturnForm = false;
+      this.queryItem = {}
+      this.isShowDetail = false
+      this.isShowExamine = false
+      this.isShowForm = false
+      this.isShowReturnForm = false
     },
 
     handleDelete(id) {
-      deleteEngin({id}).then(res => {
-        this.$successMsg();
-        this.getList();
+      deleteEngin({ id }).then(res => {
+        this.$successMsg()
+        this.getList()
       })
     },
 
     // 申请/撤回
     handleSubmit(id, examineStatus) {
-      submitEngin({id, examineStatus}).then(res => {
-        this.$successMsg();
-        this.getList();
+      submitEngin({ id, examineStatus }).then(res => {
+        this.$successMsg()
+        this.getList()
       })
     },
 
     // 弃审
     handleAbandon(id) {
-      abandonEngin({id}).then(res => {
-        this.$successMsg();
-        this.getList();
+      abandonEngin({ id }).then(res => {
+        this.$successMsg()
+        this.getList()
       })
     },
 
     handleSelectionChange(val) {
-      this.multipleSelection = val;
-      if(val) {
-        this.selections = val;
-      }else {
-        this.selections = [];
+      this.multipleSelection = val
+      if (val) {
+        this.selections = val
+      } else {
+        this.selections = []
       }
     },
 
@@ -652,23 +669,23 @@ export default {
 
     // 打开 批量审批
     batchExamine() {
-      this.isShowExamineDialog = true;
+      this.isShowExamineDialog = true
     },
 
     // 提交 批量审批
     submitExamineForm() {
       let ids = this.multipleSelection.map(item => {
-        return item.id;
-      });
-      ids = Array.from(new Set(ids));
+        return item.id
+      })
+      ids = Array.from(new Set(ids))
       examineBatchEngin({
         ids: ids.join(','),
         examineStatus: this.examineForm.status,
-        approvalRemark: this.examineForm.remark,
+        approvalRemark: this.examineForm.remark
       }).then(res => {
-        this.isShowExamineDialog = false;
-        this.getList();
-        this.$successMsg('审批成功');
+        this.isShowExamineDialog = false
+        this.getList()
+        this.$successMsg('审批成功')
       })
     },
     // 获取存货类别列表
@@ -679,7 +696,7 @@ export default {
       }).then(res => {
         this.categoryList = res.data.records
       })
-    },
+    }
   }
 }
 </script>

src/views/supply/deliver/commerce_list.vue

@@ -16,17 +16,17 @@
             </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-input v-model="screenForm.orderNum" placeholder="请输入发货单号" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="订单号" prop="orderNo">
-                <el-input v-model="screenForm.orderNo" placeholder="请输入订单号"></el-input>
+                <el-input v-model="screenForm.orderNo" placeholder="请输入订单号" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="合同号" prop="contractNo">
-                <el-input v-model="screenForm.contractNo" placeholder="请输入合同号"></el-input>
+                <el-input v-model="screenForm.contractNo" placeholder="请输入合同号" />
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -36,12 +36,12 @@
             </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-input v-model="screenForm.jxsNum" placeholder="请输入经销商编号" />
               </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-input v-model="screenForm.jxsName" placeholder="请输入经销商名称" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -52,24 +52,24 @@
                   range-separator="至"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   start-placeholder="开始日期"
-                  end-placeholder="结束日期">
-                </el-date-picker>
+                  end-placeholder="结束日期"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="产品名称" prop="chName">
-                <el-input v-model="screenForm.chName" placeholder="请输入产品名称"></el-input>
+                <el-input v-model="screenForm.chName" placeholder="请输入产品名称" />
               </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-input v-model="screenForm.model" placeholder="请输入规格型号" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item prop="type" label="存货类别">
                 <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-select>
               </el-form-item>
             </el-col>
@@ -80,17 +80,33 @@
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
                     :label="item.nickName"
-                    :value="item.adminUserId">
-                  </el-option>
+                    :value="item.adminUserId"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="区域" prop="refRegionWork">
-                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域"></el-input>
+                <!--                <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />-->
+                <el-select v-model="screenForm.refRegionWork" placeholder="选择区域" clearable filterable style="width: 100%">
+                  <el-option
+                    label="广州"
+                    value="GZ"
+                  />
+
+                  <el-option
+                    label="佛山"
+                    value="FS"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="6" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="制单人" prop="createBy">
+                <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -106,7 +122,7 @@
             <!-- <el-button size="mini" type="warning" icon="el-icon-close">退货</el-button> -->
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'ship/pExport'" :exParams="exParams" />
+            <ExportButton :ex-url="'ship/pExport'" :ex-params="exParams" />
           </div>
         </div>
         <div class="table">
@@ -119,117 +135,118 @@
             highlight-current-row
             stripe
             show-summary
-            :summary-method="$getSummaries">
-          <el-table-column align="left" label="订单类型" prop="type" min-width="100" show-overflow-tooltip>
+            :summary-method="$getSummaries"
+          >
+            <el-table-column align="left" label="订单类型" prop="type" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.type =="1"?"申请发货单":scope.row.type =="2"?"退货单":"直调发货单" }}
+                {{ scope.row.type =="1"?"申请发货单":scope.row.type =="2"?"退货单":"直调发货单" }}
               </template>
             </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>
+                <CopyButton :copy-text="scope.row.id" />
+                <span>{{ scope.row.id }}</span>
               </template>
             </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="createTime" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.type === 3 ? scope.row.stockName : scope.row.correspondName}}
+                {{ scope.row.type === 3 ? scope.row.stockName : scope.row.correspondName }}
               </template>
             </el-table-column>
             <el-table-column align="left" label="订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.enginOrderNo" />
-                <span>{{scope.row.enginOrderNo}}</span>
+                <CopyButton :copy-text="scope.row.enginOrderNo" />
+                <span>{{ scope.row.enginOrderNo }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="工程登录编号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.refEnginRecordNo" />
-                <span>{{scope.row.refEnginRecordNo}}</span>
+                <CopyButton :copy-text="scope.row.refEnginRecordNo" />
+                <span>{{ scope.row.refEnginRecordNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="120" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目类别" prop="refProjectName" min-width="120" show-overflow-tooltip />
+            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="120" show-overflow-tooltip />
             <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>
+                <CopyButton :copy-text="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>
+                <CopyButton :copy-text="scope.row.customerName" />
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </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>
+                <CopyButton :copy-text="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>
+                <CopyButton :copy-text="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>
+                <CopyButton :copy-text="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>
+                <CopyButton :copy-text="scope.row.specification" />
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" 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="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
+            <el-table-column align="right" label="数量" prop="refundableQty" 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.singlePayPrice | numToFixed}}
+                {{ scope.row.singlePayPrice | numToFixed }}
               </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}}
+                {{ scope.row.payAmount | numToFixed }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="返利金额" prop="payRebateAmount" min-width="100" 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="totalDiscAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.totalDiscAmount | numToFixed}}
+                {{ scope.row.totalDiscAmount | numToFixed }}
               </template>
             </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>
-            <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="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="refRegionWork" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip />
+            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip />
 
-            <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip />
+            <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip />
             <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.examineStatus | statusFilter}}
+                {{ scope.row.examineStatus | statusFilter }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="操作" width="200" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
-                <el-button type="text" v-if="!isDealer" @click="getPassword(scope.row.id)">获取密码</el-button>
-                <el-button type="text" v-if="!isDealer" @click="openShareDetail(scope.row.id)">密码记录</el-button>
+                <el-button v-if="!isDealer" type="text" @click="getPassword(scope.row.id)">获取密码</el-button>
+                <el-button v-if="!isDealer" type="text" @click="openShareDetail(scope.row.id)">密码记录</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -238,14 +255,14 @@
       <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>
+            :total="listTotal"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
         </div>
       </div>
     </div>
@@ -259,22 +276,23 @@
           element-loading-text="Loading"
           tooltip-effect="dark"
           style="width: 100%"
-          max-height="270">
-          <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-          <el-table-column align="center" prop="printPassword" label="密码"></el-table-column>
-          <el-table-column align="center" prop="createTime" label="打印时间"></el-table-column>
+          max-height="270"
+        >
+          <el-table-column align="center" label="序号" type="index" width="50" />
+          <el-table-column align="center" prop="printPassword" label="密码" />
+          <el-table-column align="center" prop="createTime" label="打印时间" />
         </el-table>
       </div>
       <div class="pagination clearfix">
         <div class="fr">
           <el-pagination
-            @current-change="dialogTableCurrentChange"
             :current-page="dialogTable_currentPage"
             :page-size="dialogTable_pageSize"
             background
             layout="prev, pager, next"
-            :total="dialogTable_listTotal">
-          </el-pagination>
+            :total="dialogTable_listTotal"
+            @current-change="dialogTableCurrentChange"
+          />
         </div>
       </div>
 
@@ -283,20 +301,20 @@
       </div>
     </el-dialog>
 
-    <CommerceDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" ref="refDetail"/>
+    <CommerceDetail v-if="isShowDetail" ref="refDetail" :list-item="queryItem" @backListFormDetail="backList" />
 
   </div>
 </template>
 
 <script>
-import { getEnginList, getPassword, getPasswordRecord } from "@/api/supply/deliver";
+import { getEnginList, getPassword, getPasswordRecord } from '@/api/supply/deliver'
 import { getCategoryList, getSalesmanList } from '@/api/common'
-import CommerceDetail from "@/views/supply/deliver/components/commerce_detail";
+import CommerceDetail from '@/views/supply/deliver/components/commerce_detail'
 
 let that
 export default {
   components: {
-    CommerceDetail,
+    CommerceDetail
   },
   data() {
     return {
@@ -317,7 +335,8 @@ export default {
         jxsNum: '',
         status: '',
         salesMan: '',
-        refRegionWork:''
+        refRegionWork: '',
+        createBy: ''
       },
       categoryList: [],
       salesmanList: [],
@@ -329,7 +348,7 @@ export default {
       dialogTable_pageSize: 10, // 密码记录 - 每页数量
       dialogTable_listTotal: 0, // 密码记录 - 列表总数
 
-      queryItem: {},
+      queryItem: {}
     }
   },
 
@@ -346,27 +365,28 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
-        refRegionWork:this.screenForm.refRegionWork,
+        refRegionWork: this.screenForm.refRegionWork,
         serviceId: this.screenForm.salesMan,
-        orderType: 3, // 2家用工程 3商用工程
+        createBy: this.screenForm.createBy,
+        orderType: 3 // 2家用工程 3商用工程
       }
     },
     isShowDetail() {
-      return this.queryItem.hasOwnProperty('id');
+      return this.queryItem.hasOwnProperty('id')
     },
     isDealer() {
-      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
-    },
+      return JSON.parse(localStorage.getItem('supply_user')).isCustomer
+    }
   },
 
   beforeCreate() {
-    that = this;
+    that = this
   },
 
   created() {
-    this.getSalesmanList();
-    this.getCategoryList();
-    this.getList();
+    this.getSalesmanList()
+    this.getCategoryList()
+    this.getList()
   },
 
   methods: {
@@ -376,9 +396,9 @@ export default {
         pageNum: 1,
         pageSize: -1,
         isCustomer: 0,
-        status: true,
+        status: true
       }).then(res => {
-        this.salesmanList = res.data.records;
+        this.salesmanList = res.data.records
       })
     },
 
@@ -386,17 +406,17 @@ export default {
     getCategoryList() {
       getCategoryList({
         pageNum: 1,
-        pageSize: -1,
+        pageSize: -1
       }).then(res => {
-        this.categoryList = res.data.records;
+        this.categoryList = res.data.records
       })
     },
 
     // 查询列表
     getList() {
-      this.listLoading = true;
+      this.listLoading = true
 
-      let params = {
+      const params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         id: this.screenForm.orderNum,
@@ -406,70 +426,72 @@ export default {
         customerName: this.screenForm.jxsName,
         materialName: this.screenForm.chName,
         specification: this.screenForm.model,
-        refRegionWork:this.screenForm.refRegionWork,
+        refRegionWork: this.screenForm.refRegionWork,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         categoryName: this.screenForm.type,
         serviceId: this.screenForm.salesMan,
-        orderType: 3, // 2家用工程 3商用工程
-      };
+        createBy: this.screenForm.createBy,
+
+        orderType: 3 // 2家用工程 3商用工程
+      }
       getEnginList(params).then((res) => {
         res.data.records.forEach(item => {
-          item.notOutNumber = item.salesStatus ? 0 : item.refundableQty;
-          item.sums1 = ['refundableQty', 'notOutNumber'];
-          item.sums2 = [];
+          item.notOutNumber = item.salesStatus ? 0 : item.refundableQty
+          item.sums1 = ['refundableQty', 'notOutNumber']
+          item.sums2 = []
         })
-        this.dataList = res.data.records;
-        this.listTotal = res.data.total;
-        this.listLoading = false;
+        this.dataList = res.data.records
+        this.listTotal = res.data.total
+        this.listLoading = false
       })
     },
 
     // 提交筛选表单
     submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
+      this.currentPage = 1
+      this.getList()
     },
 
     // 重置筛选表单
     resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
+      this.$refs.screenForm.resetFields()
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改每页数量
     handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
+      this.pageSize = val
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改当前页
     handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
+      this.currentPage = val
+      this.getList()
     },
 
     // 进入详情
     toDetail(item) {
-      this.queryItem = item;
-      this.$nextTick(()=>{
+      this.queryItem = item
+      this.$nextTick(() => {
         this.$refs.refDetail.initPrint()
       })
     },
 
     backList() {
-      this.queryItem = {};
+      this.queryItem = {}
     },
 
     // 获取密码
     getPassword(id) {
-      getPassword({id}).then(res => {
+      getPassword({ id }).then(res => {
         this.$alert(res.data, '新密码', {
           confirmButtonText: '确定',
           callback: action => {}
-        });
+        })
       })
     },
 
@@ -480,24 +502,24 @@ export default {
         pageSize: this.dialogTable_pageSize,
         id
       }).then(res => {
-        this.dialogTable_dataList = res.data.records;
-        this.dialogTable_listTotal = res.data.total;
-        this.dialogTable_listLoading = false;
+        this.dialogTable_dataList = res.data.records
+        this.dialogTable_listTotal = res.data.total
+        this.dialogTable_listLoading = false
       })
     },
 
     // 密码记录 - 打开弹窗
     openShareDetail(id) {
-      this.isShowDialog = true;
-      this.dialogTable_currentPage = 1;
-      this.getPasswordRecord(id);
+      this.isShowDialog = true
+      this.dialogTable_currentPage = 1
+      this.getPasswordRecord(id)
     },
 
     // 密码记录 - 更改列表当前页
     dialogTableCurrentChange(val) {
-      this.dialogTable_currentPage = val;
-      this.getPasswordRecord();
-    },
+      this.dialogTable_currentPage = val
+      this.getPasswordRecord()
+    }
   }
 }
 </script>

src/views/supply/pickup/pickup_list.vue

@@ -4,92 +4,91 @@
       <!-- 筛选条件 -->
       <div class="screen-container">
         <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
-        <el-row :gutter="20">
-          <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="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="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="warehouse">
-              <el-input v-model="screenForm.warehouse" placeholder="请输入仓库"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="状态" prop="status">
-              <el-select v-model="screenForm.status" placeholder="请选择">
-                <el-option label="未打单" :value="0">
-                </el-option>
-                <el-option label="已打单" :value="1">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="手机号" prop="takerPhone">
-              <el-input type="number" @mousewheel.native.prevent v-model.number="screenForm.takerPhone" placeholder="请输入手机号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="提货人" prop="takerId">
-              <el-select v-model="screenForm.takerId" placeholder="请选择">
-                <el-option v-for="item in pickupManList" :key="item.id" :label="item.takerName" :value="item.id">
-                </el-option>
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="申请发货单号" prop="orderNum">
+                <el-input v-model="screenForm.orderNum" placeholder="请输入申请发货单号" />
+              </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-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-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="仓库" prop="warehouse">
+                <el-input v-model="screenForm.warehouse" placeholder="请输入仓库" />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="状态" prop="status">
+                <el-select v-model="screenForm.status" placeholder="请选择">
+                  <el-option label="未打单" :value="0" />
+                  <el-option label="已打单" :value="1" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="手机号" prop="takerPhone">
+                <el-input v-model.number="screenForm.takerPhone" type="number" placeholder="请输入手机号" @mousewheel.native.prevent />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="提货人" prop="takerId">
+                <el-select v-model="screenForm.takerId" placeholder="请选择">
+                  <el-option v-for="item in pickupManList" :key="item.id" :label="item.takerName" :value="item.id" />
 
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="申请日期" prop="date">
-              <el-date-picker v-model="screenForm.date" 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="printTime">
-              <el-date-picker v-model="screenForm.printTime" 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="salesOrderId">
-              <el-input type="number" @mousewheel.native.prevent v-model.number="screenForm.salesOrderId" placeholder="请输入出库单号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="12" 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>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="申请日期" prop="date">
+                <el-date-picker v-model="screenForm.date" type="datetimerange" range-separator="至" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="打印时间" prop="printTime">
+                <el-date-picker v-model="screenForm.printTime" type="datetimerange" range-separator="至" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="出库单号" prop="salesOrderId">
+                <el-input v-model.number="screenForm.salesOrderId" type="number" placeholder="请输入出库单号" @mousewheel.native.prevent />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="制单人" prop="createBy">
+                <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="24" 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="fl">
             <el-button
+              v-if="$checkBtnRole('add', $route.meta.roles)"
               size="mini"
               type="primary"
               icon="el-icon-plus"
               @click="toForm()"
-              v-if="$checkBtnRole('add', $route.meta.roles)"
-              >新增</el-button
-            >
+            >新增</el-button>
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'pick/export'" :exParams="exParams" />
+            <ExportButton :ex-url="'pick/export'" :ex-params="exParams" />
           </div>
         </div>
         <div class="table">
@@ -118,7 +117,7 @@
               prop="printTime"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="left"
               label="信息密钥"
@@ -127,7 +126,7 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.informationKey" />
+                <CopyButton :copy-text="scope.row.informationKey" />
                 <span>{{ scope.row.informationKey }}</span>
               </template>
             </el-table-column>
@@ -139,7 +138,7 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialCode" />
+                <CopyButton :copy-text="scope.row.materialCode" />
                 <span>{{ scope.row.materialCode }}</span>
               </template>
             </el-table-column>
@@ -151,7 +150,7 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialOldNumber" />
+                <CopyButton :copy-text="scope.row.materialOldNumber" />
                 <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
@@ -163,7 +162,7 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialName" />
+                <CopyButton :copy-text="scope.row.materialName" />
                 <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
@@ -175,7 +174,7 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.specification" />
+                <CopyButton :copy-text="scope.row.specification" />
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
@@ -185,7 +184,7 @@
               prop="refundableQty"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="left"
               label="发货申请单号"
@@ -194,7 +193,7 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.invoiceId" />
+                <CopyButton :copy-text="scope.row.invoiceId" />
                 <span>{{ scope.row.invoiceId }}</span>
               </template>
             </el-table-column>
@@ -206,15 +205,17 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText='(scope.row.orderType === "TRADE" ||
-                scope.row.orderType === "HOME" || scope.row.orderType
-                ==="REQUISITION_TRADE" || scope.row.orderType
-                ==="REQUISITION_HOME")? scope.row.enginOrderNo:scope.row.mainOrderId' />
+                <CopyButton
+                  :copy-text="(scope.row.orderType === &quot;TRADE&quot; ||
+                    scope.row.orderType === &quot;HOME&quot; || scope.row.orderType
+                      ===&quot;REQUISITION_TRADE&quot; || scope.row.orderType
+                      ===&quot;REQUISITION_HOME&quot;)? scope.row.enginOrderNo:scope.row.mainOrderId"
+                />
                 <span>{{
                   (scope.row.orderType === "TRADE" ||
-                  scope.row.orderType === "HOME" ||
-                  scope.row.orderType === "REQUISITION_TRADE" ||
-                  scope.row.orderType === "REQUISITION_HOME")
+                    scope.row.orderType === "HOME" ||
+                    scope.row.orderType === "REQUISITION_TRADE" ||
+                    scope.row.orderType === "REQUISITION_HOME")
                     ? scope.row.enginOrderNo
                     : scope.row.mainOrderId
                 }}</span>
@@ -226,7 +227,7 @@
               prop="saleTypeName"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
 
             <el-table-column
               align="left"
@@ -236,7 +237,7 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.enginOrderNo" />
+                <CopyButton :copy-text="scope.row.enginOrderNo" />
                 <span>{{ scope.row.enginOrderNo }}</span>
               </template>
             </el-table-column>
@@ -268,7 +269,7 @@
               prop="correspondName"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="left"
               label="提货方式"
@@ -298,28 +299,28 @@
               prop="remark"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="left"
               label="提货人姓名"
               prop="takerName"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="left"
               label="提货人电话"
               prop="takerPhone"
               min-width="150"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="left"
               label="提货物流"
               prop="pickLogistics"
               min-width="200"
               show-overflow-tooltip
-            ></el-table-column>
+            />
 
             <el-table-column
               align="center"
@@ -331,27 +332,25 @@
                 <el-button
                   type="text"
                   @click="toForm(scope.row,true)"
-                  >详情</el-button
-                >
+                >详情</el-button>
                 <el-button
-                  type="text"
-                  @click="toForm(scope.row)"
                   v-if="
                     $checkBtnRole('edit', $route.meta.roles) &&
-                    !scope.row.printNum
+                      !scope.row.printNum
                   "
-                  >编辑</el-button
-                >
+                  type="text"
+                  @click="toForm(scope.row)"
+                >编辑</el-button>
                 <el-popconfirm
+                  v-if="
+                    $checkBtnRole('cancel', $route.meta.roles) &&
+                      ((isDealer && !scope.row.printNum) || !isDealer)
+                  "
                   style="margin-left: 10px"
                   :title="
                     '确定' + (scope.row.printNum ? '作废' : '取消') + '吗？'
                   "
                   @onConfirm="handleCancel(scope.row.id)"
-                  v-if="
-                    $checkBtnRole('cancel', $route.meta.roles) &&
-                    ((isDealer && !scope.row.printNum) || !isDealer)
-                  "
                 >
                   <el-button slot="reference" type="text">{{
                     scope.row.printNum ? "作废" : "取消"
@@ -365,36 +364,35 @@
       <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"
+          />
         </div>
       </div>
     </div>
 
     <PickupForm
-      :listItem="queryItem"
-      :flag="flag"
       v-if="isShowForm"
+      :list-item="queryItem"
+      :flag="flag"
       @backListFormDetail="backList"
     />
   </div>
 </template>
 
 <script>
-import { getPickupList, cancelData,getPickupManList } from "@/api/supply/pickup";
+import { getPickupList, cancelData, getPickupManList } from '@/api/supply/pickup'
 
-import PickupForm from "@/views/supply/pickup/components/pickup_form";
+import PickupForm from '@/views/supply/pickup/components/pickup_form'
 
 export default {
   components: {
-    PickupForm,
+    PickupForm
   },
   data() {
     return {
@@ -405,27 +403,28 @@ export default {
       listLoading: false, // 列表加载loading
       screenForm: {
         // 筛选表单数据
-        orderNum: "",
-        jxsName: "",
-        jxsNum: "",
-        warehouse: "",
-        date: "",
-        status: "",
-        takerPhone: "",
-        takerId: "",
-        printTime: "",
-        salesOrderId: "",
+        orderNum: '',
+        jxsName: '',
+        jxsNum: '',
+        warehouse: '',
+        date: '',
+        status: '',
+        takerPhone: '',
+        takerId: '',
+        printTime: '',
+        salesOrderId: '',
+        createBy: ''
       },
-      pickupManList: "",
-      flag:false,
+      pickupManList: '',
+      flag: false,
       queryItem: {},
-      isShowForm: false,
-    };
+      isShowForm: false
+    }
   },
 
   computed: {
     isDealer() {
-      return JSON.parse(localStorage.getItem("supply_user")).isCustomer;
+      return JSON.parse(localStorage.getItem('supply_user')).isCustomer
     },
     exParams() {
       return {
@@ -433,21 +432,22 @@ export default {
         customerName: this.screenForm.jxsName,
         customerNumber: this.screenForm.jxsNum,
         stockName: this.screenForm.warehouse,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
-        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
+        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         status: this.screenForm.status,
         takerPhone: this.screenForm.takerPhone,
+        createBy: this.screenForm.createBy,
         takerId: this.screenForm.takerId,
         printStartTime: this.screenForm.printTime[0],
         printEndTime: this.screenForm.printTime[1],
-        salesOrderId: this.screenForm.salesOrderId,
+        salesOrderId: this.screenForm.salesOrderId
 
-      };
-    },
+      }
+    }
   },
 
   created() {
-    this.getList();
+    this.getList()
     this.getPickupManList()
   },
 
@@ -458,87 +458,89 @@ export default {
       // if(!btnRole) {return true}
       // let index = btnRole.indexOf(value);
       // return index >= 0;
-      return true;
+      return true
     },
     getPickupManList() {
       getPickupManList({ pageNum: 1, pageSize: -1 }).then((res) => {
-        this.pickupManList = res.data.records;
-      });
+        this.pickupManList = res.data.records
+      })
     },
     // 查询列表
     getList() {
-      this.listLoading = true;
+      this.listLoading = true
 
-      let params = {
+      const params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         invoiceId: this.screenForm.orderNum,
         customerName: this.screenForm.jxsName,
         customerNumber: this.screenForm.jxsNum,
         stockName: this.screenForm.warehouse,
-        startTime: this.screenForm.date ? this.screenForm.date[0] : "",
-        endTime: this.screenForm.date ? this.screenForm.date[1] : "",
+        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
+        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         status: this.screenForm.status,
         takerPhone: this.screenForm.takerPhone,
         takerId: this.screenForm.takerId,
+        createBy: this.screenForm.createBy,
+
         printStartTime: this.screenForm.printTime[0],
         printEndTime: this.screenForm.printTime[1],
-        salesOrderId: this.screenForm.salesOrderId,
-      };
+        salesOrderId: this.screenForm.salesOrderId
+      }
       getPickupList(params).then((res) => {
-        this.dataList = res.data.records;
-        this.listTotal = res.data.total;
-        this.listLoading = false;
-      });
+        this.dataList = res.data.records
+        this.listTotal = res.data.total
+        this.listLoading = false
+      })
     },
 
     // 提交筛选表单
     submitScreenForm() {
-      this.currentPage = 1;
-      this.getList();
+      this.currentPage = 1
+      this.getList()
     },
 
     // 重置筛选表单
     resetScreenForm() {
-      this.$refs.screenForm.resetFields();
-      this.currentPage = 1;
-      this.getList();
+      this.$refs.screenForm.resetFields()
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改每页数量
     handleSizeChange(val) {
-      this.pageSize = val;
-      this.currentPage = 1;
-      this.getList();
+      this.pageSize = val
+      this.currentPage = 1
+      this.getList()
     },
 
     // 更改当前页
     handleCurrentChange(val) {
-      this.currentPage = val;
-      this.getList();
+      this.currentPage = val
+      this.getList()
     },
 
     // 进入表单
-    toForm(item,flag =false) {
-      this.flag = flag  // 详情 flag 为 details
-      this.queryItem = item;
-      this.isShowForm = true;
+    toForm(item, flag = false) {
+      this.flag = flag // 详情 flag 为 details
+      this.queryItem = item
+      this.isShowForm = true
     },
 
     backList() {
-      this.queryItem = {};
-      this.isShowForm = false;
+      this.queryItem = {}
+      this.isShowForm = false
     },
 
     // 取消/作废
     handleCancel(id) {
       cancelData({ id }).then((res) => {
-        this.$successMsg();
-        this.getList();
-      });
-    },
-  },
-};
+        this.$successMsg()
+        this.getList()
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped></style>