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

src/components/Common/print-foshan.vue

@@ -216,8 +216,8 @@ export default {
 
   .print-table-1 {
     font-size: 14px;
-    margin-top: 20px;
-    margin-bottom: 40px;
+    margin-top: 10px;
+    margin-bottom: 10px;
     .el-row {
       margin-left: 0 !important;
       margin-right: 0 !important;
@@ -254,8 +254,8 @@ export default {
     }
     .foot {
       color: #333333;
-      margin-top: 20px;
-      border-right: 1px solid #EBEEF5;
+      margin-top: 10px;
+      // border-right: 1px solid #EBEEF5;
       .el-col {
         padding: 0;
         display: flex;

src/views/engin_deposit/components/refund_list-detail.vue

@@ -33,10 +33,10 @@
             {{ detailList.refTradeCategory }}
           </div>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="8" class="item">
+        <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">跨区厂编号</div>
           <div class="value">{{ detailList.refFactoryNo }}</div>
-        </el-col>
+        </el-col> -->
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">使用单位</div>
           <div class="value">{{ detailList.refUseUnit }}</div>
@@ -116,10 +116,6 @@
           <div class="label">押金总额</div>
           <div class="value">{{ detailList.depositAmount }}</div>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="16" class="item">
-          <div class="label">安装地址</div>
-          <div class="value">{{ detailList.refInstallAddress }}</div>
-        </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">安装时间</div>
           <div class="value">
@@ -127,6 +123,11 @@
             </el-date-picker>
           </div>
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="16" class="item">
+          <div class="label">安装地址</div>
+          <div class="value">{{ detailList.refInstallAddress }}</div>
+        </el-col>
+
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">工程订单号</div>
           <div class="value">{{ detailList.customerName }}</div>
@@ -185,6 +186,7 @@
     <div class="mymain-container">
       <div class="table">
         <el-table v-loading="listLoading" :data="detailList.items" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
+          <el-table-column align="center" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="物料编码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>

src/views/finance/standbook_list.vue

@@ -22,81 +22,38 @@
     <h1></h1>
     <!-- 筛选条件 -->
     <div>
-      <el-form
-        ref="searchForm"
-        :model="searchForm"
-        label-width="100px"
-        size="small"
-        label-position="left"
-      >
+      <el-form ref="searchForm" :model="searchForm" label-width="100px" size="small" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="经销商名称" prop="customerId">
-              <el-select
-                :disabled="isDisabled"
-                class="selectStyle"
-                v-model="searchForm.customerId"
-                placeholder="请选择"
-                filterable
-                @change="changeFn"
-              >
-                <el-option
-                  v-for="(v, i) in customerList"
-                  :key="i"
-                  :label="v.name"
-                  :value="v.id"
-                >
+              <el-select :disabled="isDisabled" class="selectStyle" v-model="searchForm.customerId" placeholder="请选择" filterable @change="changeFn">
+                <el-option v-for="(v, i) in customerList" :key="i" :label="v.name" :value="v.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="钱包" prop="customerWalletId">
-              <el-select
-                class="selectStyle"
-                v-model="searchForm.customerWalletId"
-                placeholder="请选择"
-                filterable
-              >
-                <el-option
-                  v-for="(v, i) in walletList"
-                  :key="i"
-                  :label="v.customerWalletName"
-                  :value="v.customerWalletId"
-                >
+              <el-select class="selectStyle" v-model="searchForm.customerWalletId" placeholder="请选择" filterable>
+                <el-option v-for="(v, i) in walletList" :key="i" :label="v.customerWalletName" :value="v.customerWalletId">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据号" prop="billNo">
-              <el-input
-                v-model="searchForm.billNo"
-                placeholder="请输入"
-              ></el-input>
+              <el-input v-model="searchForm.billNo" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="开始时间" prop="startTime">
-              <el-date-picker
-                class="selectStyle"
-                v-model="searchForm.startTime"
-                type="date"
-                placeholder="选择日期时间"
-                value-format="yyyy-MM-dd"
-              >
+              <el-date-picker class="selectStyle" v-model="searchForm.startTime" type="date" placeholder="选择日期时间" value-format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="结束时间" prop="endTime">
-              <el-date-picker
-                class="selectStyle"
-                v-model="searchForm.endTime"
-                type="date"
-                placeholder="选择日期时间"
-                value-format="yyyy-MM-dd"
-              >
+              <el-date-picker class="selectStyle" v-model="searchForm.endTime" type="date" placeholder="选择日期时间" value-format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -104,9 +61,7 @@
           <el-col :xs="24" :sm="12" :lg="18">
             <el-form-item label="" class="fr">
               <el-button size="small" @click="resetFn">清空</el-button>
-              <el-button size="small" type="primary" @click="searchFn"
-                >搜索</el-button
-              >
+              <el-button size="small" type="primary" @click="searchFn">搜索</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -115,10 +70,7 @@
     <!-- 按钮 -->
     <div class="btn-group clearfix">
       <div class="fr">
-        <ExportButton
-          :exUrl="'/finance/standing/book/export'"
-          :exParams="exParams"
-        />
+        <ExportButton :exUrl="'/finance/standing/book/export'" :exParams="exParams" />
       </div>
     </div>
     <div v-show="bill == 'COMMONLY'">
@@ -145,73 +97,15 @@
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
-          <el-table
-            v-loading="listLoading"
-            :data="dataList"
-            element-loading-text="Loading"
-            border
-            fit
-            highlight-current-row
-            stripe
-            show-summary
-            :summary-method="getSummaries"
-          >
-            <el-table-column
-              label="序号"
-              align="center"
-              width="100"
-              type="index"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单据日期"
-              prop="theTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单据类型"
-              prop="billType"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单据号"
-              prop="billNo"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="钱包"
-              prop="walletName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="操作时间"
-              prop="createTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="摘要"
-              prop="remark"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="right"
-              label="预付货款"
-              prop="flag"
-              min-width="160"
-              show-overflow-tooltip
-            >
+          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="getSummaries">
+            <el-table-column label="序号" align="center" width="100" type="index" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="单据日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="单据类型" prop="billType" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="单据号" prop="billNo" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="钱包" prop="walletName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="操作时间" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="摘要" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="预付货款" prop="flag" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 1
@@ -224,13 +118,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="订单占款"
-              prop="flag"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="订单占款" prop="flag" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 2
@@ -243,13 +131,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="支付货款"
-              prop="flag"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="支付货款" prop="flag" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 3
@@ -262,13 +144,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="押金"
-              prop="flag"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="押金" prop="flag" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 4
@@ -281,13 +157,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="工程保证金"
-              prop="flag"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="工程保证金" prop="flag" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 5
@@ -300,13 +170,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="其他暂扣款"
-              prop="flag"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="其他暂扣款" prop="flag" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.flag == 6
@@ -319,13 +183,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="账户余额"
-              prop="balanceAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="账户余额" prop="balanceAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.balanceAmount | numToFixed }}
               </template>
@@ -359,98 +217,22 @@
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
-          <el-table
-            v-loading="listLoading"
-            :data="dataList"
-            element-loading-text="Loading"
-            border
-            fit
-            highlight-current-row
-            stripe
-            show-summary
-            :summary-method="getSummaries2"
-          >
-            <el-table-column
-              label="序号"
-              align="center"
-              width="100"
-              type="index"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="客户编码"
-              prop="customerCode"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="客户名称"
-              prop="customerName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单据日期"
-              prop="theTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="审核日期"
-              prop="examineTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="单据类型"
-              prop="billType"
-              min-width="160"
-              show-overflow-tooltip
-            >
+          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="getSummaries2">
+            <el-table-column label="序号" align="center" width="100" type="index" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="客户编码" prop="customerCode" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="客户名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="单据日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="审核日期" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="单据类型" prop="billType" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.billType == 3 ? "付款单" : scope.row.billType }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="center"
-              label="单据号"
-              prop="billNo"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="返利类型"
-              prop="walletName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="操作时间"
-              prop="createTime"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="摘要"
-              prop="remark"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="right"
-              label="收入"
-              prop="amountType"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="center" label="单据号" prop="billNo" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="返利类型" prop="walletName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="操作时间" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="center" label="摘要" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="收入" prop="amountType" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.amountType == "IN"
@@ -459,13 +241,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="支出"
-              prop="amountType"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="支出" prop="amountType" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{
                   scope.row.amountType == "OUT"
@@ -474,35 +250,17 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="折让金额"
-              prop="allowanceAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="折让金额" prop="allowanceAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.allowanceAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="暂扣返利"
-              prop="withholdAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="暂扣返利" prop="withholdAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.withholdAmount | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="结存"
-              prop="balanceAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="结存" prop="balanceAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.balanceAmount | numToFixed }}
               </template>
@@ -526,15 +284,7 @@
     </div>
     <!-- 分页 -->
     <div class="fr">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-sizes="[10, 20, 30, 50, 500]"
-        :page-size="pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="listTotal"
-      >
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50, 500]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
       </el-pagination>
     </div>
   </div>
@@ -762,7 +512,7 @@ export default {
         if (index === 0) {
           sums[index] = "合计";
         }
-        if (index === 9) {
+        if (index === 10) {
           let map1 = data.map((v) => {
             if (v.amountType == "IN") {
               return v.amount;
@@ -779,7 +529,7 @@ export default {
             }, 0)
             .toFixed(2);
         }
-        if (index === 10) {
+        if (index === 11) {
           let map1 = data.map((v) => {
             if (v.amountType == "OUT") {
               return v.amount;
@@ -796,7 +546,7 @@ export default {
             }, 0)
             .toFixed(2);
         }
-        if (index === 11) {
+        if (index === 12) {
           let map1 = data.map((v) => {
             return v.allowanceAmount;
           });
@@ -811,7 +561,7 @@ export default {
             }, 0)
             .toFixed(2);
         }
-        if (index === 12) {
+        if (index === 13) {
           let map1 = data.map((v) => {
             return v.withholdAmount;
           });
@@ -826,7 +576,7 @@ export default {
             }, 0)
             .toFixed(2);
         }
-        if (index === 13) {
+        if (index === 14) {
           let map1 = data.map((v) => {
             return v.balanceAmount;
           });
@@ -852,25 +602,25 @@ export default {
         if (index === 0) {
           sums[index] = "合计";
         }
-        if (index === 6) {
+        if (index === 7) {
           sums[index] = this.computedFn(data, 1);
         }
-        if (index === 7) {
+        if (index === 8) {
           sums[index] = this.computedFn(data, 2);
         }
-        if (index === 8) {
+        if (index === 9) {
           sums[index] = this.computedFn(data, 3);
         }
-        if (index === 9) {
+        if (index === 10) {
           sums[index] = this.computedFn(data, 4);
         }
-        if (index === 10) {
+        if (index === 11) {
           sums[index] = this.computedFn(data, 5);
         }
-        if (index === 11) {
+        if (index === 12) {
           sums[index] = this.computedFn(data, 6);
         }
-        if (index === 12) {
+        if (index === 13) {
           let map2 = data.map((v) => {
             return v.balanceAmount;
           });

src/views/supply/pickup/check.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    
+
     <div v-show="!isShowPrint">
       <div class="main-title">
         <div class="title">仓库提货确认</div>
@@ -87,7 +87,7 @@
             </el-table-column>
             <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.orderType == 'HOME' ? scope.row.mainOrderId : scope.row.enginOrderNo }}
+                {{ scope.row.orderType == 'HOME' ? scope.row.enginOrderNo: scope.row.mainOrderId }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="发货申请单号" prop="invoiceId" min-width="180" show-overflow-tooltip></el-table-column>
@@ -154,13 +154,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="12" style="height: 51px;">
             <el-form-item label="操作日期" prop="createDate">
-              <el-date-picker
-                v-model="dialogForm.createDate"
-                readonly
-                type="date"
-                value-format="yyyy-MM-dd"
-                style="width: 100%;"
-                placeholder="选择日期">
+              <el-date-picker v-model="dialogForm.createDate" readonly type="date" value-format="yyyy-MM-dd" style="width: 100%;" placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -178,12 +172,17 @@
 </template>
 
 <script>
-import { getPickupList, getCode, getPickupManInfo, checkPassword } from "@/api/supply/pickup";
+import {
+  getPickupList,
+  getCode,
+  getPickupManInfo,
+  checkPassword,
+} from "@/api/supply/pickup";
 import PickupPrint from "@/views/supply/pickup/components/pickup_print";
 
 export default {
   components: {
-    PickupPrint
+    PickupPrint,
   },
   data() {
     return {
@@ -192,22 +191,23 @@ export default {
       listTotal: 0, // 列表总数
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
-      screenForm: { // 筛选表单数据
-        phone: '',
-        code: '',
-        name: '',
-        idCard: '',
-        manId: '',
+      screenForm: {
+        // 筛选表单数据
+        phone: "",
+        code: "",
+        name: "",
+        idCard: "",
+        manId: "",
         status: 0,
       },
       statusList: [
-        { label: '未打单', value: 0 },
-        { label: '已打单', value: 1 },
+        { label: "未打单", value: 0 },
+        { label: "已打单", value: 1 },
       ],
 
-      getCodeText: '获取验证码',
+      getCodeText: "获取验证码",
       countDown: 60,
-			timer: null,
+      timer: null,
 
       tableSelection: [],
 
@@ -216,16 +216,14 @@ export default {
 
       isShowDialog: false,
       dialogForm: {
-        password: '',
-        createMan: '',
-        createDate: '',
+        password: "",
+        createMan: "",
+        createDate: "",
       },
       dialogFormRules: {
-        password: [
-          { required: true, message: '请输入密码', trigger: 'blur' }
-        ],
+        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
       },
-    }
+    };
   },
 
   computed: {
@@ -233,13 +231,11 @@ export default {
       return {
         takerId: this.screenForm.manId,
         status: this.screenForm.status,
-      }
+      };
     },
   },
 
-  created() {
-    
-  },
+  created() {},
 
   methods: {
     getDate() {
@@ -249,10 +245,10 @@ export default {
       var month = date.getMonth() + 1;
       var strDate = date.getDate();
       if (month >= 1 && month <= 9) {
-          month = "0" + month;
+        month = "0" + month;
       }
       if (strDate >= 0 && strDate <= 9) {
-          strDate = "0" + strDate;
+        strDate = "0" + strDate;
       }
       var currentdate = year + seperator1 + month + seperator1 + strDate;
       return currentdate;
@@ -260,18 +256,18 @@ export default {
 
     // 获取短信验证码
     getCode() {
-      getCode({mobile: this.screenForm.phone}).then(res => {
-        this.$successMsg('短信已发送');
+      getCode({ mobile: this.screenForm.phone }).then((res) => {
+        this.$successMsg("短信已发送");
         this.countDown--;
         this.timer = setInterval(() => {
           this.countDown--;
           if (this.countDown == 0) {
             this.countDown = 60;
-            this.getCodeText = '重新获取';
-            clearInterval(this.timer)
+            this.getCodeText = "重新获取";
+            clearInterval(this.timer);
           }
-        }, 1000)
-      })
+        }, 1000);
+      });
     },
 
     // 获取提货人信息
@@ -279,18 +275,18 @@ export default {
       getPickupManInfo({
         mobile: this.screenForm.phone,
         code: this.screenForm.code,
-      }).then(res => {
-        this.$successMsg('验证成功');
+      }).then((res) => {
+        this.$successMsg("验证成功");
         this.screenForm.name = res.data.takerName;
         this.screenForm.idCard = res.data.identity;
         this.screenForm.manId = res.data.id;
-      })
+      });
     },
 
     // 查询列表
     getList() {
-      if(!this.screenForm.manId) {
-        return this.$errorMsg('请先查询提货人信息');
+      if (!this.screenForm.manId) {
+        return this.$errorMsg("请先查询提货人信息");
       }
 
       this.listLoading = true;
@@ -305,7 +301,7 @@ export default {
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;
-      })
+      });
     },
 
     // 更改每页数量
@@ -328,11 +324,11 @@ export default {
 
     handleSelect(selection, row) {
       this.$refs.table.toggleRowSelection(row);
-      this.dataList.forEach(item => {
+      this.dataList.forEach((item) => {
         if (item.informationKey === row.informationKey) {
           this.$refs.table.toggleRowSelection(item);
         }
-      })
+      });
       this.tableSelection = this.$refs.table.selection;
     },
 
@@ -343,7 +339,7 @@ export default {
     // 检查是否一致
     isAllEqual(array) {
       if (array.length > 0) {
-        return !array.some(function(item, index) {
+        return !array.some(function (item, index) {
           return item.informationKey !== array[0].informationKey;
         });
       } else {
@@ -353,16 +349,18 @@ export default {
 
     // 点击打印
     toPrint() {
-      if(!this.isAllEqual(this.tableSelection)) {
-        return this.$errorMsg('只能选择同一个提货订单');
+      if (!this.isAllEqual(this.tableSelection)) {
+        return this.$errorMsg("只能选择同一个提货订单");
       }
 
-      if(!this.tableSelection[0].printNum) {
+      if (!this.tableSelection[0].printNum) {
         this.queryItem = this.tableSelection;
         this.isShowPrint = true;
-      }else {
+      } else {
         this.queryItem = this.tableSelection;
-        this.dialogForm.createMan = JSON.parse(localStorage.getItem("supply_user")).nickName;
+        this.dialogForm.createMan = JSON.parse(
+          localStorage.getItem("supply_user")
+        ).nickName;
         this.dialogForm.createDate = this.getDate();
         this.isShowDialog = true;
       }
@@ -382,7 +380,7 @@ export default {
     // },
 
     // 关闭弹窗
-    cancelDialogForm(){
+    cancelDialogForm() {
       this.isShowDialog = false;
       this.$refs.dialogForm.resetFields();
     },
@@ -393,31 +391,31 @@ export default {
         if (valid) {
           let params = {
             shipId: this.queryItem[0].invoiceId,
-            password: this.dialogForm.password
-          }
-          checkPassword(params).then(res => {
+            password: this.dialogForm.password,
+          };
+          checkPassword(params).then((res) => {
             this.cancelDialogForm();
             this.isShowPrint = true;
-          })
+          });
         }
-      })
+      });
     },
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .main-title {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    height: 60px;
-    border-bottom: 1px solid #DCDFE6;
-    margin-bottom: 20px;
-    .title {
-      font-size: 16px;
-      font-weight: 600;
-      padding-left: 10px;
-    }
+.main-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 60px;
+  border-bottom: 1px solid #dcdfe6;
+  margin-bottom: 20px;
+  .title {
+    font-size: 16px;
+    font-weight: 600;
+    padding-left: 10px;
   }
+}
 </style>

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

@@ -68,7 +68,7 @@
     <div class="table" style="margin-top: 20px">
       <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-        <el-table-column align="center" label="引用单号" prop="orderId" min-width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="销售出库单" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
@@ -146,7 +146,7 @@
       <div class="table">
         <el-table :data="tableGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400" @selection-change="tableSelectionChange">
           <el-table-column align="center" type="selection" width="55" :selectable='checkboxSelect'></el-table-column>
-          <el-table-column align="center" label="销售出库单" prop="orderNo" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="销售出库单" prop="id" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="经销商" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="仓库" prop="correspondName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>