Merge remote-tracking branch 'origin/develop' into hotfix/Hotfix-zh-171

# Conflicts:
#	src/views/supply/deliver/sum_list.vue

src/views/supply/deliver/components/design/preview.vue

@@ -1,16 +1,15 @@
 <template>
-  <el-dialog :visible="visible" :maskClosable="false"
-           @cancel="hideModal" :width="350+'mm'">
+  <el-dialog :visible="visible" :maskClosable="false" @cancel="hideModal" :width="350 + 'mm'">
     <div :spinning="spinning" style="min-height: 100px">
       <div id="preview_content" ref="printDom">
-       
+
       </div>
     </div>
     <template slot="title">
       <div>
         <!-- <div style="margin-right: 20px">打印预览</div> -->
         <el-button :loading="waitShowPrinter" type="primary" icon="printer" @click.stop="print">打印</el-button>
-        <el-button type="primary" icon="printer" @click.stop="toPdf">pdf</el-button>
+        <!-- <el-button type="primary" icon="printer" @click.stop="toPdf">pdf</el-button> -->
       </div>
     </template>
     <template slot="footer">
@@ -22,8 +21,8 @@
 </template>
 
 <script>
-  import {downloadPDF} from '@/utils/pdf'
-  import {addPrint} from './print-data'
+import { downloadPDF } from '@/utils/pdf'
+import { addPrint } from './print-data'
 export default {
   name: "printPreview",
   props: {},
@@ -50,9 +49,10 @@ export default {
     handleExport() {
       downloadPDF(this.$refs.printDom);
 
-   },
+    },
     hideModal() {
       this.visible = false
+      this.waitShowPrinter = false
     },
     show(hiprintTemplate, printData, width = '210') {
       this.visible = true
@@ -68,7 +68,7 @@ export default {
     },
     print() {
       this.waitShowPrinter = true
-      
+
       this.hiprintTemplate.print(this.printData, {}, {
         // styleHandler: () => {
         //   // 这里拼接成放html->head标签内的css/style
@@ -85,118 +85,129 @@ export default {
         }
       })
     },
-    toPdf() {
-      downloadPDF(this.$refs.printDom);
-      this.hiprintTemplate.toPdf({}, '打印预览');
-    },
+    // toPdf() {
+    //   downloadPDF(this.$refs.printDom);
+    //   this.hiprintTemplate.toPdf({}, '打印预览');
+    // },
   }
 }
 
 </script>
 <style scoped>
-
-::v-deep .el-dialog__body{
+::v-deep .el-dialog__body {
   padding: 0;
 }
-::v-deep table{
+
+::v-deep table {
   /* height: 240px !important; */
 }
-::v-deep tr{
+
+::v-deep tr {
   height: 40px !important;
 }
-::v-deep .hiprint-printPaper{
-  margin:  0 auto;
+
+::v-deep .hiprint-printPaper {
+  margin: 0 auto;
 }
-::v-deep tr td{
-  border:0 !important;
+
+::v-deep tr td {
+  border: 0 !important;
   /* width: 911px !important;
     height: 529px !important; */
 }
-::v-deep .hiprint-paperNumber{
+
+::v-deep .hiprint-paperNumber {
   display: none;
 }
+
 .ant-modal-body {
   padding: 0px;
 }
 
 .ant-modal-content {
   margin-bottom: 24px;
- 
+
 }
 
 @media print {
 
   td {
-    border:none !important;
+    border: none !important;
   }
-.drag_item_box {
-  height: 100%;
-  padding: 6px;
-}
 
-.drag_item_box > div {
-  height: 100%;
-  width: 100%;
-  background-color: #fff;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
+  .drag_item_box {
+    height: 100%;
+    padding: 6px;
+  }
 
-.drag_item_box > div > a {
-  text-align: center;
-  text-decoration-line: none;
-}
+  .drag_item_box>div {
+    height: 100%;
+    width: 100%;
+    background-color: #fff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 
-.drag_item_box > div > a > span {
-  font-size: 28px;
-}
+  .drag_item_box>div>a {
+    text-align: center;
+    text-decoration-line: none;
+  }
 
-.drag_item_box > div > a > p {
-  margin: 0;
-}
+  .drag_item_box>div>a>span {
+    font-size: 28px;
+  }
 
-.drag_item_title {
-  font-size: 16px;
-  padding: 12px 6px 0 6px;
-  font-weight: bold;
-}
+  .drag_item_box>div>a>p {
+    margin: 0;
+  }
 
+  .drag_item_title {
+    font-size: 16px;
+    padding: 12px 6px 0 6px;
+    font-weight: bold;
+  }
 
-.card-design {
-  overflow: hidden;
-  overflow-x: auto;
-  overflow-y: auto;
-}
 
-  ::v-deep .el-dialog__body{
-  padding: 0;
-}
-::v-deep table{
-  height: 240px !important;
-}
-::v-deep tr{
-  height: 40px !important;
-}
-::v-deep .hiprint-printPaper{
-  margin:  0 auto;
-}
-::v-deep tr td{
-  border:0 !important;
-  /* width: 911px !important;
+  .card-design {
+    overflow: hidden;
+    overflow-x: auto;
+    overflow-y: auto;
+  }
+
+  ::v-deep .el-dialog__body {
+    padding: 0;
+  }
+
+  ::v-deep table {
+    height: 240px !important;
+  }
+
+  ::v-deep tr {
+    height: 40px !important;
+  }
+
+  ::v-deep .hiprint-printPaper {
+    margin: 0 auto;
+  }
+
+  ::v-deep tr td {
+    border: 0 !important;
+    /* width: 911px !important;
     height: 529px !important; */
-}
-::v-deep .hiprint-paperNumber{
-  display: none;
-}
-.ant-modal-body {
-  padding: 0px;
-}
+  }
 
-.ant-modal-content {
-  margin-bottom: 24px;
- 
-}
-}
+  ::v-deep .hiprint-paperNumber {
+    display: none;
+  }
+
+  .ant-modal-body {
+    padding: 0px;
+  }
 
+  .ant-modal-content {
+    margin-bottom: 24px;
+
+  }
+}
 </style>

src/views/supply/deliver/components/design/print-data.js

@@ -5,7 +5,7 @@ import { getCompanyList } from '@/api/user'
     const detailArr = []
     let detailData = []
     let company = ''
-  // 获取详情]]]
+  // 获取详情
   getCompanyLists() 
  function  getDetail(ids) {
     let newIds =[]
@@ -78,7 +78,7 @@ import { getCompanyList } from '@/api/user'
  
  // 添加次数
  function  addPrint() {
- 
+  console.log('add',999,detailData);
   const ids = detailData.map(item => {
     if (item.invoicePickBeans && item.invoicePickBeans.length) {
       for (let index = 0; index < item.invoicePickBeans.length; index++) {
@@ -90,7 +90,7 @@ import { getCompanyList } from '@/api/user'
     }
 
   })
-
+      console.log(ids);
   // console.log(document.execCommand('print'),'4545');
   addPrints({ ids: ids.join(',') }).then(res => {
     console.log('chenggong ');

src/views/supply/deliver/sum_list.vue

@@ -120,10 +120,12 @@
             highlight-current-row stripe @select="handleSelect" @select-all="handleSelectAll" show-summary
             :summary-method="$getSummaries">
             <el-table-column align="center" type="selection" width="55"></el-table-column>
+            <el-table-column align="right" label="打印次数" prop="printNum" min-width="80" show-overflow-tooltip>
+            </el-table-column>
 
             <el-table-column align="left" label="订单类型" prop="orderType" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.orderType | orderTypeFilter }}
+                {{  scope.row.orderType | orderTypeFilter  }}
               </template>
             </el-table-column>
             <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip>
@@ -133,7 +135,7 @@
             <el-table-column align="left" label="发货单号" prop="id" min-width="130" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
-                <span>{{ scope.row.id }}</span>
+                <span>{{  scope.row.id  }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="订单号" prop="orderId" min-width="130" show-overflow-tooltip>
@@ -141,23 +143,24 @@
 
                 <CopyButton
                   :copyText="scope.row.enginOrderType == 'HOME' || scope.row.enginOrderType == 'TRADE' ? scope.row.enginOrderNo : scope.row.mainOrderId" />
-                <span>{{ scope.row.enginOrderType == 'HOME' || scope.row.enginOrderType == 'TRADE' ?
-                    scope.row.enginOrderNo
-                    : scope.row.mainOrderId
-                }}</span>
+                <span>{{  scope.row.enginOrderType == 'HOME' || scope.row.enginOrderType == 'TRADE' ?
+                scope.row.enginOrderNo
+                : scope.row.mainOrderId
+
+                  }}</span>
 
               </template>
             </el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
-                <span>{{ scope.row.customerNumber }}</span>
+                <span>{{  scope.row.customerNumber  }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
-                <span>{{ scope.row.customerName }}</span>
+                <span>{{  scope.row.customerName  }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip>
@@ -165,25 +168,25 @@
             <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
-                <span>{{ scope.row.materialCode }}</span>
+                <span>{{  scope.row.materialCode  }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{ scope.row.materialOldNumber }}</span>
+                <span>{{  scope.row.materialOldNumber  }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
-                <span>{{ scope.row.materialName }}</span>
+                <span>{{  scope.row.materialName  }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
-                <span>{{ scope.row.specification }}</span>
+                <span>{{  scope.row.specification  }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip>
@@ -191,22 +194,22 @@
 
             <el-table-column align="right" label="发货金额" prop="payAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.payAmount | numToFixed }}
+                {{  scope.row.payAmount | numToFixed  }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="发货返利金额" prop="payRebateAmount" min-width="110" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.payRebateAmount | numToFixed }}
+                {{  scope.row.payRebateAmount | numToFixed  }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="发货折扣金额" prop="discAmount" min-width="110" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.totalDiscAmount | numToFixed }}
+                {{  scope.row.totalDiscAmount | numToFixed  }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="折扣额合计" prop="totalDiscAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ (scope.row.totalDiscAmount + scope.row.payRebateAmount) | numToFixed }}
+                {{  (scope.row.totalDiscAmount + scope.row.payRebateAmount) | numToFixed  }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip>
@@ -214,17 +217,17 @@
 
             <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.singlePayPrice | numToFixed }}
+                {{  scope.row.singlePayPrice | numToFixed  }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="含税总额" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.payAmount | numToFixed }}
+                {{  scope.row.payAmount | numToFixed  }}
               </template>
             </el-table-column>
             <el-table-column align="right" label="未出库数量" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ comRefundableQty(scope.row.type, scope.row.salesExamineStatus, scope.row) }}
+                {{  comRefundableQty(scope.row.type, scope.row.salesExamineStatus, scope.row)  }}
               </template>
             </el-table-column>
             <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip>
@@ -277,32 +280,60 @@
       </div>
     </div>
     <!-- <pdf  ref="myPdfComponent" src="http://zfiresupply.oss-cn-hangzhou.aliyuncs.com/uploadfile/1661914838175.pdf?Expires=1661918438&OSSAccessKeyId=LTAI4GK1q4mnpCFbonMd1pji&Signature=Y0eM%2FuG8Q88rPr0pp%2BDkM5QC%2FDc%3D">
-
     </pdf> -->
-       <print-preview ref="preView"/>
+    <print-preview ref="preView" />
+    <!-- <PrintTest v-if="isShowPrint" /> -->
+    <!--    <SumPrint :listItem="queryItem" v-if="isShowPrint" @backListFormDetail="backList" />-->
+
+    <el-dialog title="密码确认" :visible.sync="isShowDialog" :show-close="false" width="40%" :close-on-click-modal="false">
+      <el-form ref="dialogForm" :model="dialogForm" :rules="dialogFormRules" label-position="right" label-width="70px">
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="24" :lg="24">
+            <el-form-item label="密码" prop="password">
+              <el-input v-model="dialogForm.password" autocomplete="off" placeholder="请输入密码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12">
+            <el-form-item label="操作人" prop="createMan">
+              <el-input v-model="dialogForm.createMan" readonly></el-input>
+            </el-form-item>
+          </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>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelDialogForm">取 消</el-button>
+        <el-button type="primary" @click="submitDialogForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
     <!-- <PrintTest v-if="isShowPrint" /> -->
-<!--    <SumPrint :listItem="queryItem" v-if="isShowPrint" @backListFormDetail="backList" />-->
+    <!-- <printPreview  ref='preView'/> -->
+    <!-- <SumPrint :listItem="queryItem" v-if="isShowPrint" @backListFormDetail="backList" /> -->
 
   </div>
 </template>
 
 <script>
-  import pdf from 'vue-pdf'
 import { getSumList } from '@/api/supply/deliver'
+import { checkPassword } from "@/api/supply/pickup";
 import { getCategoryList, getSalesmanList } from '@/api/common'
 import SumPrint from '@/views/supply/deliver/components/sum_print'
-import {disAutoConnect, hiprint, defaultElementTypeProvider} from 'vue-plugin-hiprint'
+import { disAutoConnect, hiprint, defaultElementTypeProvider } from 'vue-plugin-hiprint'
 disAutoConnect();
-
 let hiprintTemplate;
 import panel from './components/design/panel'
-import { getDetail ,getCompanyLists,
-    myData} from './components/design/print-data'
+import { getDetail, getCompanyLists, myData } from './components/design/print-data'
 import printPreview from './components/design/preview.vue'
 export default {
   components: {
     SumPrint,
-    pdf,
     printPreview
   },
   data() {
@@ -334,7 +365,7 @@ export default {
       queryItem: {},
       isShowPrint: false,
       curPaper: {
-        type: 'A5' ,
+        type: 'A5',
         width: 500,
         height: 147.6
       },
@@ -366,7 +397,17 @@ export default {
       },
       scaleValue: 1,
       scaleMax: 5,
-      scaleMin: 0.5
+      scaleMin: 0.5,
+      isShowDialog: false,
+      dialogForm: {
+        password: "",
+        createMan: "",
+        createDate: "",
+      },
+      dialogFormRules: {
+        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
+      },
+
     }
   },
 
@@ -399,7 +440,6 @@ export default {
           } else {
             return row.refundableQty
           }
-
         }
 
       }
@@ -409,7 +449,7 @@ export default {
       let types = this.paperTypes
       for (const key in types) {
         let item = types[key]
-        let {width, height} = this.curPaper
+        let { width, height } = this.curPaper
         if (item.width === width && item.height === height) {
           type = key
         }
@@ -560,28 +600,78 @@ export default {
       this.queryItem = this.tableSelection;
       console.log(this.tableSelection);
       getDetail(this.tableSelection)
-      console.log(333);
       // this.isShowPrint = true;
       // this.$refs.myPdfComponent.print()
       this.$refs.preView.show(hiprintTemplate, myData)
+
+      if (!this.tableSelection[0].printNum) {
+        this.queryItem = this.tableSelection;
+        // this.isShowPrint = true;
+      } else {
+        this.queryItem = this.tableSelection;
+        this.dialogForm.createMan = JSON.parse(
+          localStorage.getItem("supply_user")
+        ).nickName;
+        this.dialogForm.createDate = this.getDate();
+        this.isShowDialog = true;
+      }
+    },
+
+    // 关闭弹窗
+    cancelDialogForm() {
+      this.isShowDialog = false;
+      this.$refs.dialogForm.resetFields();
+    },
+
+    // 提交 弹窗
+    submitDialogForm() {
+      this.$refs.dialogForm.validate((valid) => {
+        if (valid) {
+          let params = {
+            shipId: this.queryItem[0].invoiceId,
+            password: this.dialogForm.password,
+          };
+          checkPassword(params).then((res) => {
+            this.cancelDialogForm();
+            this.isShowPrint = true;
+          });
+        }
+      });
+    },
+
+    getDate() {
+      var date = new Date();
+      var seperator1 = "-";
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      var strDate = date.getDate();
+      if (month >= 1 && month <= 9) {
+        month = "0" + month;
+      }
+      if (strDate >= 0 && strDate <= 9) {
+        strDate = "0" + strDate;
+      }
+      var currentdate = year + seperator1 + month + seperator1 + strDate;
+      return currentdate;
+
     },
 
     backList() {
       this.queryItem = {};
       this.isShowPrint = false;
     },
-   /**
-     * 设置纸张大小
-     * @param type [A3, A4, A5, B3, B4, B5, other]
-     * @param value {width,height} mm
-     */
-     setPaper(type, value) {
+    /**
+      * 设置纸张大小
+      * @param type [A3, A4, A5, B3, B4, B5, other]
+      * @param value {width,height} mm
+      */
+    setPaper(type, value) {
       try {
         if (Object.keys(this.paperTypes).includes(type)) {
-          this.curPaper = {type: type, width: value.width, height: value.height}
+          this.curPaper = { type: type, width: value.width, height: value.height }
           hiprintTemplate.setPaper(value.width, value.height)
         } else {
-          this.curPaper = {type: 'other', width: value.width, height: value.height}
+          this.curPaper = { type: 'other', width: value.width, height: value.height }
           hiprintTemplate.setPaper(value.width, value.height)
         }
       } catch (error) {

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

@@ -54,6 +54,10 @@
               <div class="value">{{detailData.refUseUnit}}</div>
             </el-col>
             <el-col :span="8" class="item">
+              <div class="label">区域</div>
+              <div class="value">{{detailData.refRegionWork}}</div>
+            </el-col>
+            <el-col :span="8" class="item">
               <div class="label">销售类型</div>
               <div class="value">{{detailData.saleTypeName}}</div>
             </el-col>

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

@@ -57,6 +57,10 @@
           </div>
         </el-col>
         <el-col :span="8" class="item">
+          <div class="label">区域</div>
+          <div class="value">{{detailData.refRegionWork}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
           <div class="label">销售类型</div>
           <div class="value">
             <el-select v-model="detailData.saleTypeId" placeholder="选择销售类型" size="small" style="width: 100%" clearable>

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

@@ -49,6 +49,10 @@
           <div class="value">{{detailData.refUseUnit}}</div>
         </el-col>
         <el-col :span="8" class="item">
+          <div class="label">区域</div>
+          <div class="value">{{detailData.refRegionWork}}</div>
+        </el-col>
+        <el-col :span="8" class="item">
           <div class="label">销售类型</div>
           <div class="value">{{detailData.saleTypeName}}</div>
         </el-col>

src/views/supply/engin/home_list.vue

@@ -100,17 +100,17 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="备注" prop="refRegionWork">
+              <el-form-item label="备注" prop="remark">
                 <el-input v-model="screenForm.remark" placeholder="备注"></el-input>
               </el-form-item>
             </el-col>
             <el-col v-if="!isCustomer" :xs="24" :sm="12" :lg="6">
-              <el-form-item label="格力内部备注" prop="refRegionWork">
+              <el-form-item label="格力内部备注" prop="geLiInerNote">
                 <el-input v-model="screenForm.geLiInerNote" placeholder="格力内部备注"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="跨区厂编号" prop="refRegionWork">
+              <el-form-item label="跨区厂编号" prop="refFactoryNo">
                 <el-input v-model="screenForm.refFactoryNo" placeholder="跨区厂编号"></el-input>
               </el-form-item>
             </el-col>
@@ -183,6 +183,7 @@
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column v-if="!isCustomer" align="left" label="格力内部备注" prop="geLiInerNote" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="跨区厂编号" prop="refFactoryNo" 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="saleTypeName" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">

src/views/supply/pickup/check.vue

@@ -270,7 +270,7 @@ export default {
 
       queryItem: {},
       isShowPrint: false,
-dealerList:[],
+      dealerList:[],
       isShowDialog: false,
       dialogForm: {
         password: "",
@@ -313,10 +313,12 @@ dealerList:[],
       var currentdate = year + seperator1 + month + seperator1 + strDate;
       return currentdate;
     },
-  async getDealerList() {
+
+    async getDealerList() {
       const res = await getDealerList({ pageNum: 1, pageSize: -1 });
       this.dealerList = res.data.records;
     },
+    
     // 获取短信验证码
     getCode() {
       getCode({ mobile: this.screenForm.phone }).then((res) => {
@@ -348,6 +350,7 @@ dealerList:[],
         this.getListCustomer()
       });
     },
+
     onChage(e){
        const  userInfo =   this.userList.filter(k=>{
           return e === k.id
@@ -357,25 +360,25 @@ dealerList:[],
         this.screenForm.manId = userInfo[0].id;
         this.screenForm.customerName = userInfo[0].customerName
     },
+
     getListCustomer(){
-    getListCustomer({
-          keyword:'',
-          phone: this.screenForm.phone,
-          pageNum:1,
-          pageSize:-1
-        }).then(res=>{
-          this.dealerList = res.data.records
-          // this.screenForm.customerNumber = this.dataList[0].number
-        })
+      getListCustomer({
+        keyword:'',
+        phone: this.screenForm.phone,
+        pageNum:1,
+        pageSize:-1
+      }).then(res=>{
+        this.dealerList = res.data.records
+        // this.screenForm.customerNumber = this.dataList[0].number
+      })
+    },
 
-},
     // 查询列表
     getList() {
       if (!this.screenForm.manId) {
         return this.$errorMsg("请先查询提货人信息");
       }
 
-
       this.listLoading = true;
 
       let params = {