From d9c6d0f474b7be000793510b0d007ce6e59c4694 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Tue, 18 Jul 2023 19:22:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=AD=A3=E5=90=8E?=
 =?UTF-8?q?=E8=B4=A7=E7=89=A9=E5=90=8D=E7=A7=B0=E6=97=A0=E6=B3=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/warehouse/warehouseWaybill.vue | 763 ++++++++++++-----------
 1 file changed, 398 insertions(+), 365 deletions(-)

diff --git a/src/views/warehouse/warehouseWaybill.vue b/src/views/warehouse/warehouseWaybill.vue
index b4965b21..62c4b480 100644
--- a/src/views/warehouse/warehouseWaybill.vue
+++ b/src/views/warehouse/warehouseWaybill.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row :hidden="!search" style="padding:6px 18px">
+      <el-row :hidden="!search" style="padding: 6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="运单号:">
@@ -44,178 +44,192 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
-            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>
-              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-button>
-              <el-button type="primary" text icon="el-icon-edit" @click="showcd(slotProps.scope)">拆单</el-button>
-              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope)">删除</el-button>
+            <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)"
+              >查看</el-button
+            >
+            <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)"
+              >编辑</el-button
+            >
+            <el-button type="primary" text icon="el-icon-edit" @click="showcd(slotProps.scope)"
+              >拆单</el-button
+            >
+            <el-button type="primary" text icon="el-icon-delete" @click="rowDel(slotProps.scope)"
+              >删除</el-button
+            >
           </template>
         </tablecmt>
-        
       </el-row>
       <el-row>
-        <div class="avue-crud__pagination" style="width:100%">
+        <div class="avue-crud__pagination" style="width: 100%">
           <!-- 分页模块 -->
-          <el-pagination align="right"
-                         background
-                         @size-change="sizeChange"
-                         @current-change="currentChange"
-                         :current-page="page.currentPage"
-                         :page-sizes="[10, 20, 30, 40, 50, 100]"
-                         :page-size="page.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper"
-                         :total="page.total">
+          <el-pagination
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="page.currentPage"
+            :page-sizes="[10, 20, 30, 40, 50, 100]"
+            :page-size="page.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="page.total"
+          >
           </el-pagination>
         </div>
       </el-row>
       <!-- 表单模块 -->
-      <el-dialog :title="title"
-                 v-model="box"
-                 width="50%"
-                 :before-close="beforeClose"
-                 append-to-body>
+      <el-dialog
+        :title="title"
+        v-model="box"
+        width="50%"
+        :before-close="beforeClose"
+        append-to-body
+      >
         <el-form :disabled="view" ref="form" :model="form" label-width="80px">
           <!-- 表单字段 -->
           <el-form-item label="运单号" prop="waybillNo">
-            <el-input v-model="form.waybillNo" placeholder="请输入运单号"/>
+            <el-input v-model="form.waybillNo" placeholder="请输入运单号" />
           </el-form-item>
           <el-form-item label="目的仓" prop="destinationWarehouse">
-            <el-input v-model="form.destinationWarehouse" placeholder="请输入目的仓"/>
+            <el-input v-model="form.destinationWarehouse" placeholder="请输入目的仓" />
           </el-form-item>
           <el-form-item label="发站仓" prop="departureWarehouse">
-            <el-input v-model="form.departureWarehouse" placeholder="请输入发站仓"/>
+            <el-input v-model="form.departureWarehouse" placeholder="请输入发站仓" />
           </el-form-item>
           <el-form-item label="客户车次" prop="customerTrain">
-            <el-input v-model="form.customerTrain" placeholder="请输入客户车次"/>
+            <el-input v-model="form.customerTrain" placeholder="请输入客户车次" />
           </el-form-item>
           <el-form-item label="品牌" prop="brand">
-            <el-input v-model="form.brand" placeholder="请输入品牌"/>
+            <el-input v-model="form.brand" placeholder="请输入品牌" />
           </el-form-item>
           <el-form-item label="发货单位" prop="shipper">
-            <el-input v-model="form.shipper" placeholder="请输入发货单位"/>
+            <el-input v-model="form.shipper" placeholder="请输入发货单位" />
           </el-form-item>
           <el-form-item label="发货人" prop="shipperName">
-            <el-input v-model="form.shipperName" placeholder="请输入发货人"/>
+            <el-input v-model="form.shipperName" placeholder="请输入发货人" />
           </el-form-item>
           <el-form-item label="发货方手机号" prop="shipperMobile">
-            <el-input v-model="form.shipperMobile" placeholder="请输入发货方手机号"/>
+            <el-input v-model="form.shipperMobile" placeholder="请输入发货方手机号" />
           </el-form-item>
           <el-form-item label="发货方地址" prop="shipperAddress">
-            <el-input v-model="form.shipperAddress" placeholder="请输入发货方地址"/>
+            <el-input v-model="form.shipperAddress" placeholder="请输入发货方地址" />
           </el-form-item>
           <el-form-item label="收货单位" prop="consignee">
-            <el-input v-model="form.consignee" placeholder="请输入收货单位"/>
+            <el-input v-model="form.consignee" placeholder="请输入收货单位" />
           </el-form-item>
           <el-form-item label="收货人" prop="consigneeName">
-            <el-input v-model="form.consigneeName" placeholder="请输入收货人"/>
+            <el-input v-model="form.consigneeName" placeholder="请输入收货人" />
           </el-form-item>
           <el-form-item label="收货方手机号" prop="consigneeMobile">
-            <el-input v-model="form.consigneeMobile" placeholder="请输入收货方手机号"/>
+            <el-input v-model="form.consigneeMobile" placeholder="请输入收货方手机号" />
           </el-form-item>
           <el-form-item label="收货方地址" prop="consigneeAddress">
-            <el-input v-model="form.consigneeAddress" placeholder="请输入收货方地址"/>
+            <el-input v-model="form.consigneeAddress" placeholder="请输入收货方地址" />
           </el-form-item>
           <el-form-item label="到站" prop="destination">
-            <el-input v-model="form.destination" placeholder="请输入到站"/>
+            <el-input v-model="form.destination" placeholder="请输入到站" />
           </el-form-item>
           <el-form-item label="货物名称" prop="goodsName">
-            <el-input v-model="form.goodsName" placeholder="请输入货物名称"/>
+            <el-input v-model="form.goodsName" placeholder="请输入货物名称" />
           </el-form-item>
           <el-form-item label="总数" prop="totalCount">
-            <el-input v-model="form.totalCount" placeholder="请输入总数"/>
+            <el-input v-model="form.totalCount" placeholder="请输入总数" />
           </el-form-item>
           <el-form-item label="在库数" prop="stockCount">
-            <el-input v-model="form.stockCount" placeholder="请输入在库数"/>
+            <el-input v-model="form.stockCount" placeholder="请输入在库数" />
           </el-form-item>
           <el-form-item label="总重量" prop="totalWeight">
-            <el-input v-model="form.totalWeight" placeholder="请输入总重量"/>
+            <el-input v-model="form.totalWeight" placeholder="请输入总重量" />
           </el-form-item>
           <el-form-item label="总体积" prop="totalVolume">
-            <el-input v-model="form.totalVolume" placeholder="请输入总体积"/>
+            <el-input v-model="form.totalVolume" placeholder="请输入总体积" />
           </el-form-item>
           <el-form-item label="送货方式" prop="deliveryMethod">
-            <el-input v-model="form.deliveryMethod" placeholder="请输入送货方式"/>
+            <el-input v-model="form.deliveryMethod" placeholder="请输入送货方式" />
           </el-form-item>
           <el-form-item label="紧急度" prop="urgency">
-            <el-input v-model="form.urgency" placeholder="请输入紧急度"/>
+            <el-input v-model="form.urgency" placeholder="请输入紧急度" />
           </el-form-item>
           <el-form-item label="回单数" prop="receiptCount">
-            <el-input v-model="form.receiptCount" placeholder="请输入回单数"/>
+            <el-input v-model="form.receiptCount" placeholder="请输入回单数" />
           </el-form-item>
           <el-form-item label="回单要求" prop="receiptRequirement">
-            <el-input v-model="form.receiptRequirement" placeholder="请输入回单要求"/>
+            <el-input v-model="form.receiptRequirement" placeholder="请输入回单要求" />
           </el-form-item>
           <el-form-item label="经办人" prop="agent">
-            <el-input v-model="form.agent" placeholder="请输入经办人"/>
+            <el-input v-model="form.agent" placeholder="请输入经办人" />
           </el-form-item>
           <el-form-item label="经办人id" prop="agentId">
-            <el-input v-model="form.agentId" placeholder="请输入经办人id"/>
+            <el-input v-model="form.agentId" placeholder="请输入经办人id" />
           </el-form-item>
           <el-form-item label="收货单位id" prop="consigneeId">
-            <el-input v-model="form.consigneeId" placeholder="请输入收货单位id"/>
+            <el-input v-model="form.consigneeId" placeholder="请输入收货单位id" />
           </el-form-item>
           <el-form-item label="发货单位id" prop="shipperId">
-            <el-input v-model="form.shipperId" placeholder="请输入发货单位id"/>
+            <el-input v-model="form.shipperId" placeholder="请输入发货单位id" />
           </el-form-item>
           <el-form-item label="制单时间" prop="documentMakingTime">
-            <el-input v-model="form.documentMakingTime" placeholder="请输入制单时间"/>
+            <el-input v-model="form.documentMakingTime" placeholder="请输入制单时间" />
           </el-form-item>
           <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入备注"/>
+            <el-input v-model="form.remark" placeholder="请输入备注" />
           </el-form-item>
           <el-form-item label="批次号" prop="batchNo">
-            <el-input v-model="form.batchNo" placeholder="请输入批次号"/>
+            <el-input v-model="form.batchNo" placeholder="请输入批次号" />
           </el-form-item>
           <el-form-item label="服务类型" prop="serviceType">
-            <el-input v-model="form.serviceType" placeholder="请输入服务类型"/>
+            <el-input v-model="form.serviceType" placeholder="请输入服务类型" />
           </el-form-item>
           <el-form-item label="服务号" prop="serviceNo">
-            <el-input v-model="form.serviceNo" placeholder="请输入服务号"/>
+            <el-input v-model="form.serviceNo" placeholder="请输入服务号" />
           </el-form-item>
           <el-form-item label="冻结状态" prop="freezeStatus">
-            <el-input v-model="form.freezeStatus" placeholder="请输入冻结状态"/>
+            <el-input v-model="form.freezeStatus" placeholder="请输入冻结状态" />
           </el-form-item>
           <el-form-item label="预留1" prop="reserve1">
-            <el-input v-model="form.reserve1" placeholder="请输入预留1"/>
+            <el-input v-model="form.reserve1" placeholder="请输入预留1" />
           </el-form-item>
           <el-form-item label="预留2" prop="reserve2">
-            <el-input v-model="form.reserve2" placeholder="请输入预留2"/>
+            <el-input v-model="form.reserve2" placeholder="请输入预留2" />
           </el-form-item>
           <el-form-item label="预留3" prop="reserve3">
-            <el-input v-model="form.reserve3" placeholder="请输入预留3"/>
+            <el-input v-model="form.reserve3" placeholder="请输入预留3" />
           </el-form-item>
           <el-form-item label="预留4" prop="reserve4">
-            <el-input v-model="form.reserve4" placeholder="请输入预留4"/>
+            <el-input v-model="form.reserve4" placeholder="请输入预留4" />
           </el-form-item>
           <el-form-item label="预留5" prop="reserve5">
-            <el-input v-model="form.reserve5" placeholder="请输入预留5"/>
+            <el-input v-model="form.reserve5" placeholder="请输入预留5" />
           </el-form-item>
         </el-form>
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+              >提 交</el-button
+            >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
         </template>
       </el-dialog>
     </div>
   </basic-container>
-  <el-dialog v-model="dialogTableVisible" 
-  width="65%"
-  title="运单信息" 
-  :show-close='false'
-  :lock-scroll="false"
-  :align-center="true"
+  <el-dialog
+    v-model="dialogTableVisible"
+    width="65%"
+    title="运单信息"
+    :show-close="false"
+    :lock-scroll="false"
+    :align-center="true"
   >
     <div class="topbox">
       <div class="titlxbx">
         <div>
           <div>运单号</div>
-          <div>{{rowobj.waybillNo}}</div>
+          <div>{{ rowobj.waybillNo }}</div>
         </div>
         <div>
           <div>品牌</div>
-          <div>{{rowobj.brand}}</div>
+          <div>{{ rowobj.brand }}</div>
         </div>
         <div>
           <div></div>
@@ -225,21 +239,21 @@
       <div class="titlxbx">
         <div>
           <div>发货单位</div>
-          <div>{{rowobj.shipper}}</div>
+          <div>{{ rowobj.shipper }}</div>
         </div>
         <div>
           <div>发货人</div>
-          <div>{{rowobj.shipperName}}</div>
+          <div>{{ rowobj.shipperName }}</div>
         </div>
         <div>
           <div>发货方电话</div>
-          <div>{{rowobj.shipperMobile}}</div>
+          <div>{{ rowobj.shipperMobile }}</div>
         </div>
       </div>
       <div class="titlxbx">
         <div>
           <div>发货方地址</div>
-          <div>{{rowobj.shipperAddress}}</div>
+          <div>{{ rowobj.shipperAddress }}</div>
         </div>
         <div>
           <div></div>
@@ -253,21 +267,21 @@
       <div class="titlxbx">
         <div>
           <div>收货单位</div>
-          <div>{{rowobj.consignee}}</div>
+          <div>{{ rowobj.consignee }}</div>
         </div>
         <div>
           <div>收货人</div>
-          <div>{{rowobj.consigneeName}}</div>
+          <div>{{ rowobj.consigneeName }}</div>
         </div>
         <div>
           <div>收货电话</div>
-          <div>{{rowobj.consigneeMobile}}</div>
+          <div>{{ rowobj.consigneeMobile }}</div>
         </div>
       </div>
       <div class="titlxbx">
         <div>
           <div>收货地址</div>
-          <div>{{rowobj.consigneeAddress}}</div>
+          <div>{{ rowobj.consigneeAddress }}</div>
         </div>
         <div>
           <div></div>
@@ -281,25 +295,27 @@
       <div class="titlxbx">
         <div>
           <div>货物类型</div>
-          <div>{{rowobj.goodsName}}</div>
+          <div>{{ rowobj.goodsName }}</div>
         </div>
         <div>
           <div>件数</div>
-          <div>{{rowobj.totalCount}}</div>
+          <div>{{ rowobj.totalCount }}</div>
         </div>
         <div>
           <div>剩余件数</div>
-          <div>{{rowobj.stockCount}}</div>
+          <div>{{ rowobj.stockCount }}</div>
         </div>
       </div>
     </div>
     <div class="maxitembxlist">
-      <div class="items" v-for="(item,index) in orderlist" :key="item">
+      <div class="items" v-for="(item, index) in orderlist" :key="item">
         <div class="titltophead">
-          <div>订单{{ index+1 }}</div>
+          <div>订单{{ index + 1 }}</div>
           <div>
             <el-icon class="icons" @click="addorder"><CirclePlusFilled /></el-icon>
-            <el-icon v-if="orderlist.length>1" class="icons" @click="rmvorder(index)"><RemoveFilled /></el-icon>
+            <el-icon v-if="orderlist.length > 1" class="icons" @click="rmvorder(index)"
+              ><RemoveFilled
+            /></el-icon>
           </div>
         </div>
         <div class="contbx">
@@ -309,10 +325,10 @@
           </div>
           <div class="contentitem" v-for="itemlimit in item.goods" :key="itemlimit">
             <div>
-              {{itemlimit.productName}}
+              {{ itemlimit.productName }}
             </div>
             <div>
-              <el-input v-model="itemlimit.splitNum" placeholder="请输入数量" />  
+              <el-input v-model="itemlimit.splitNum" placeholder="请输入数量" />
             </div>
           </div>
         </div>
@@ -362,12 +378,19 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove, splitOrder } from "@/api/warehouse/warehouseWaybill";
-import option from "@/option/warehouse/warehouseWaybill";
-import { mapGetters } from "vuex";
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  splitOrder,
+} from '@/api/warehouse/warehouseWaybill';
+import option from '@/option/warehouse/warehouseWaybill';
+import { mapGetters } from 'vuex';
 
 export default {
-  data () {
+  data() {
     return {
       columnList: [
         {
@@ -588,7 +611,7 @@ export default {
           sortable: true,
           head: false,
         },
-         {
+        {
           prop: 'deliveryMethodStr',
           label: '送货方式',
           type: 2,
@@ -599,7 +622,7 @@ export default {
           sortable: true,
           head: false,
         },
-         {
+        {
           prop: 'urgencyStr',
           label: '紧急度',
           type: 2,
@@ -610,7 +633,7 @@ export default {
           sortable: true,
           head: false,
         },
-         {
+        {
           prop: 'receiptCount',
           label: '回单数',
           type: 2,
@@ -621,7 +644,7 @@ export default {
           sortable: true,
           head: false,
         },
-         {
+        {
           prop: 'receiptRequirement',
           label: '回单要求',
           type: 2,
@@ -632,7 +655,7 @@ export default {
           sortable: true,
           head: false,
         },
-         {
+        {
           prop: 'agent',
           label: '经办人',
           type: 2,
@@ -654,7 +677,7 @@ export default {
           sortable: true,
           head: false,
         },
-         {
+        {
           prop: 'remark',
           label: '备注',
           type: 2,
@@ -665,7 +688,7 @@ export default {
           sortable: true,
           head: false,
         },
-         {
+        {
           prop: 'batchNo',
           label: '批次号',
           type: 2,
@@ -676,7 +699,7 @@ export default {
           sortable: true,
           head: false,
         },
-         {
+        {
           prop: 'serviceTypeStr',
           label: '服务类型',
           type: 2,
@@ -687,7 +710,7 @@ export default {
           sortable: true,
           head: false,
         },
-         {
+        {
           prop: 'serviceNo',
           label: '服务号',
           type: 2,
@@ -698,7 +721,7 @@ export default {
           sortable: true,
           head: false,
         },
-         {
+        {
           prop: 'freezeStatusStr',
           label: '冻结状态',
           type: 2,
@@ -740,7 +763,7 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 10,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
@@ -750,48 +773,47 @@ export default {
       option: option,
       // 表单列表
       data: [],
-      dialogTableVisible:false,
-      orderlist:[{
-        name:'',
-        phone:'',
-        addres:'',
-        rak:'',
-        goods: [
-          {
-            productName: '',
-            splitNum: 0
-          }
-        ]
-      }],
-      orderobj:{
-        name:'',
-        phone:'',
-        addres:'',
-        rak:'',
+      dialogTableVisible: false,
+      orderlist: [
+        {
+          name: '',
+          phone: '',
+          addres: '',
+          rak: '',
+          goods: [
+            {
+              productName: '',
+              splitNum: 0,
+            },
+          ],
+        },
+      ],
+      orderobj: {
+        name: '',
+        phone: '',
+        addres: '',
+        rak: '',
         goods: [
           {
             productName: '',
-            splitNum: 0
-          }
-        ]
+            splitNum: 0,
+          },
+        ],
       },
-      rowobj:{
-        
-      },
-      goodsAll: [
-        ]
-    }
+      rowobj: {},
+      goodsAll: [],
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
     this.onLoad(this.page);
     /**
      * 初始化获取本地缓存的编辑隐藏的列表
      *  固定搭配，不能更改
      */
-     let checkListnewarr = this.$functions.getStorage(window.location.pathname+'checkList');
-    let flexListnewarr = this.$functions.getStorage(window.location.pathname+'flexList');
-    let sortlistnewarr = this.$functions.getStorage(window.location.pathname+'sortlist');
+    let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
+    let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
+    let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
     if (checkListnewarr) {
       this.columnList.map(item => {
         item.head = false;
@@ -803,14 +825,14 @@ export default {
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.head){
-          arr.push(item.label)
+        if (item.head) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'checkList',arr)
+      this.$functions.setStorage(window.location.pathname + 'checkList', arr);
     }
     if (flexListnewarr) {
       this.columnList.map(item => {
@@ -819,22 +841,22 @@ export default {
       flexListnewarr.map(ite => {
         this.columnList.map(item => {
           if (ite == item.label) {
-            if(item.type==6){
+            if (item.type == 6) {
               item.fixed = 'right';
-            }else{
+            } else {
               item.fixed = true;
             }
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.fixed){
-          arr.push(item.label)
+        if (item.fixed) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'flexList',arr)
+      this.$functions.setStorage(window.location.pathname + 'flexList', arr);
     }
     if (sortlistnewarr) {
       this.columnList.map(item => {
@@ -847,47 +869,46 @@ export default {
           }
         });
       });
-    }else{
-      let arr=[]
+    } else {
+      let arr = [];
       this.columnList.map(item => {
-        if(item.sortable){
-          arr.push(item.label)
+        if (item.sortable) {
+          arr.push(item.label);
         }
       });
-      this.$functions.setStorage(window.location.pathname+'sortlist',arr)
+      this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
     }
   },
   computed: {
-    ...mapGetters(["permission"]),
-    ids () {
+    ...mapGetters(['permission']),
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
-    showdrawer(value){
-      this.drawerShow=value
+    showdrawer(value) {
+      this.drawerShow = value;
     },
     /**
      * 弹窗的勾选回调，用于更改头部数组
      * 固定搭配，只需要更换   columnList
      */
-    setnewcolum(newarr, headarr,type) {
+    setnewcolum(newarr, headarr, type) {
       // console.log(newarr,'+++++++++++')
-      if(type==1){
+      if (type == 1) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
-      }else if(type==2){
+        this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
+      } else if (type == 2) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
-      }else if(type==3){
+        this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
+      } else if (type == 3) {
         this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+        this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
       }
-
     },
     selectionsc(value) {
       console.log(value);
@@ -898,64 +919,64 @@ export default {
     },
     editsolt(scope) {
       const { row } = scope;
-      console.log("row>>>>>>>>>>>>>>>>>>>",row);
+      console.log('row>>>>>>>>>>>>>>>>>>>', row);
       this.$router.push({
         path: '/distribution/signfor/distributionSignforedt',
         query: {
           id: row.id,
-          name: '签收查看'
-        }
+          name: '签收查看',
+        },
       });
     },
     btnsc(index, row) {
       console.log(index, row);
     },
     selectsc(index, row) {
-      this.query[row.prop] =index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
     timesc(index, row) {
-      if (!!index){
+      if (!!index) {
         index = dayjs(index).format('YYYY-MM-DD');
       }
-      this.query[row.prop] =  index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
     inputsc(index, row) {
-      this.query[row.prop] =index
-      if (!index){
-        delete this.query[row.prop]
+      this.query[row.prop] = index;
+      if (!index) {
+        delete this.query[row.prop];
       }
       this.onLoad(this.page);
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
     },
-    searchHide () {
+    searchHide() {
       this.search = !this.search;
     },
-    searchChange () {
+    searchChange() {
       this.onLoad(this.page);
     },
-    searchReset () {
+    searchReset() {
       this.query = {};
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    handleSubmit () {
+    handleSubmit() {
       if (!this.form.id) {
         add(this.form).then(() => {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
       } else {
@@ -963,41 +984,41 @@ export default {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
-        })
+        });
       }
     },
-    handleAdd () {
-      this.title = '新增'
-      this.form = {}
-      this.box = true
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
+      this.box = true;
     },
-    handleEdit (row) {
-      this.title = '编辑'
-      this.box = true
+    handleEdit(row) {
+      this.title = '编辑';
+      this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleView (row) {
-      this.title = '查看'
+    handleView(row) {
+      this.title = '查看';
       this.view = true;
       this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleDelete () {
+    handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -1006,16 +1027,16 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -1023,32 +1044,32 @@ export default {
         .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    beforeClose (done) {
-      done()
+    beforeClose(done) {
+      done();
       this.form = {};
       this.view = false;
     },
-    selectionChange (list) {
+    selectionChange(list) {
       this.selectionList = list;
     },
-    selectionClear () {
+    selectionClear() {
       this.selectionList = [];
       // this.$refs.table.clearSelection();
     },
-    currentChange (currentPage) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
@@ -1058,37 +1079,45 @@ export default {
         this.selectionClear();
       });
     },
-    showcd(row){
-      this.dialogTableVisible=true
-      this.rowobj=row.row
-      var t = this.rowobj.goodsName.split(",")
-      var arr = []
-      for(let i = 0;i<t.length;i++){
-        var proN = t[i]
-        var o = {}
-        o.productName = proN
-        o.splitNum = 0
-        arr[i] = o
-      }
-      this.orderlist[0].goods = arr
+    showcd(row) {
+      this.dialogTableVisible = true;
+      this.rowobj = row.row;
 
-      console.log(this.orderlist[0].goods)
+      this.orderlist[0].goods = this.splitName(this.rowobj.goodsName);
     },
-    hidedial(){
-      let row =[];
-      for (let index = 0; index <  this.orderlist.length; index++) {
-        const element =  this.orderlist[index];
-        let obj ={
-          waybillNo:this.rowobj.waybillNo,
-          customerPerson:element.name,
-          customerMobile:element.phone,
-          customerAddress:element.addres,
-          products:element.goods
-        }
-        row.push(obj)
+
+    /**
+     *
+     * @param {拆分名称} goodName
+     */
+    splitName(goodName) {
+      var t = goodName.split(',');
+      var arr = [];
+      for (let i = 0; i < t.length; i++) {
+        var proN = t[i];
+        var o = {};
+        o.productName = proN;
+        o.splitNum = 0;
+        arr[i] = o;
       }
+      return arr;
+    },
 
-      splitOrder(row).then(res=> {
+    hidedial() {
+      let row = [];
+      for (let index = 0; index < this.orderlist.length; index++) {
+        const element = this.orderlist[index];
+        let obj = {
+          waybillNo: this.rowobj.waybillNo,
+          customerPerson: element.name,
+          customerMobile: element.phone,
+          customerAddress: element.addres,
+          products: element.goods,
+        };
+        row.push(obj);
+      }
+
+      splitOrder(row).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
@@ -1096,156 +1125,160 @@ export default {
         this.selectionClear();
       });
 
-      this.dialogTableVisible=false
+      this.dialogTableVisible = false;
     },
-    addorder(){
-      this.orderlist.push(JSON.parse(JSON.stringify(this.orderobj)))
+    addorder() {
+      // 实现对对象内包含的元素进行copy
+
+      let obsj = JSON.parse(JSON.stringify(this.orderobj));
+      obsj.goods = this.splitName(this.rowobj.goodsName);
+
+      this.orderlist.push(obsj);
     },
-    rmvorder(index){
-      if(this.orderlist.length<=1){
-        this.$message.error('最少一条数据')
-        return
+    rmvorder(index) {
+      if (this.orderlist.length <= 1) {
+        this.$message.error('最少一条数据');
+        return;
       }
-      this.orderlist.splice(index,1)
+      this.orderlist.splice(index, 1);
     },
-  }
+  },
 };
 </script>
 
 <style lang="scss">
-    .btsbx{
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-top: 20px;
-      >button{
-        width: 120px;
-        height: 40px;
-      }
+.btsbx {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 20px;
+  > button {
+    width: 120px;
+    height: 40px;
+  }
+}
+.maxitembxlist {
+  display: flex;
+  flex-direction: column;
+  // padding: 10px;
+  box-sizing: border-box;
+  margin-top: 20px;
+  > .items {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    background-color: #fcfcfc;
+    padding: 10px;
+    box-sizing: border-box;
+    border: 1px solid #e2e0e0;
+    border-radius: 2px;
+    margin-bottom: 20px;
+    &:nth-last-child(1) {
+      margin-bottom: 0;
     }
-    .maxitembxlist{
+    > .contbx {
       display: flex;
       flex-direction: column;
-      // padding: 10px;
-      box-sizing: border-box;
-      margin-top: 20px;
-      >.items{
+      width: 100%;
+      margin-top: 10px;
+      > .tabitem {
         display: flex;
-        flex-direction: column;
-        width: 100%;
-        background-color: #fcfcfc;
-        padding: 10px;
-        box-sizing: border-box;
-        border: 1px solid #e2e0e0;
-        border-radius: 2px;
-        margin-bottom: 20px;
-        &:nth-last-child(1){
-          margin-bottom: 0;
-        }
-        >.contbx{
+        align-items: center;
+        > div {
+          flex: 1;
+          height: 45px;
           display: flex;
-          flex-direction: column;
-          width: 100%;
-          margin-top: 10px;
-          >.tabitem{
-            display: flex;
-            align-items: center;
-            >div{
-              flex: 1;
-              height: 45px;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              background-color: #f3f3f3;
-              border: 1px solid #e2e0e0;
-              margin-bottom: -2px;
-              margin-right: -2px;
-            }
-          }
-          >.contentitem{
-            display: flex;
-            align-items: center;
-            >div{
-              flex: 1;
-              height: 45px;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              background-color: #ffffff;
-              border: 1px solid #e2e0e0;
-              margin-bottom: -2px;
-              margin-right: -2px;
-            }
-          }
+          align-items: center;
+          justify-content: center;
+          background-color: #f3f3f3;
+          border: 1px solid #e2e0e0;
+          margin-bottom: -2px;
+          margin-right: -2px;
         }
-        >.titltophead{
-          width: 100%;
+      }
+      > .contentitem {
+        display: flex;
+        align-items: center;
+        > div {
+          flex: 1;
+          height: 45px;
           display: flex;
           align-items: center;
-          justify-content: space-between;
-          .icons{
-            font-size: 27px;
-            &:nth-of-type(1){
-              margin-right: 8px;
-            }
-          }
+          justify-content: center;
+          background-color: #ffffff;
+          border: 1px solid #e2e0e0;
+          margin-bottom: -2px;
+          margin-right: -2px;
         }
-        >.editinput{
-          display: flex;
-          flex-direction: column;
-          padding: 20px 0;
-          >.inputitem{
-            display: flex;
-            align-items: flex-start;
-            justify-content: space-between;
-            margin-bottom: 10px;
-            &:nth-last-child(1){
-              margin-bottom: 0;
-            }
-            .inpts{
-              display: flex;
-              align-items: flex-start;
-              
-              flex: 1;
-              padding-right: 10px;
-              >span{
-                width: 90px;
-              }
-              >div:nth-of-type(1){
-                flex: 1;
-              }
-            }
-          }
+      }
+    }
+    > .titltophead {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      .icons {
+        font-size: 27px;
+        &:nth-of-type(1) {
+          margin-right: 8px;
         }
       }
     }
-    .topbox{
+    > .editinput {
       display: flex;
       flex-direction: column;
-      >.titlxbx{
-        font-size: 16px;
+      padding: 20px 0;
+      > .inputitem {
         display: flex;
-        align-items: center;
-        >div{
-          flex: 1;
+        align-items: flex-start;
+        justify-content: space-between;
+        margin-bottom: 10px;
+        &:nth-last-child(1) {
+          margin-bottom: 0;
+        }
+        .inpts {
           display: flex;
-          align-items: center;
-          >div{
+          align-items: flex-start;
+
+          flex: 1;
+          padding-right: 10px;
+          > span {
+            width: 90px;
+          }
+          > div:nth-of-type(1) {
             flex: 1;
-            height: 40px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border: 1px solid #e2e0e0;
-            margin-bottom: -1px;
-            margin-right: -1px;
-            word-break: break-all;
-            &:nth-of-type(1){
-              background-color: #f3f3f3;
-            }
           }
-
         }
       }
     }
+  }
+}
+.topbox {
+  display: flex;
+  flex-direction: column;
+  > .titlxbx {
+    font-size: 16px;
+    display: flex;
+    align-items: center;
+    > div {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      > div {
+        flex: 1;
+        height: 40px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: 1px solid #e2e0e0;
+        margin-bottom: -1px;
+        margin-right: -1px;
+        word-break: break-all;
+        &:nth-of-type(1) {
+          background-color: #f3f3f3;
+        }
+      }
+    }
+  }
+}
 </style>
\ No newline at end of file