From 4d8803abf4c6258ec029cc5aa97d1087a7e5b2a4 Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Mon, 1 Apr 2024 11:21:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/scm/businessLineConfig/index.vue    |  62 +-
 .../scm/purchaseCenter/deliveryOrder/form.vue | 543 ++++++++++-------
 .../scm/purchaseCenter/receiptOrder/form.vue  |  73 +--
 .../purchaseCenter/receiptVoucher/index.vue   |  72 ++-
 .../purchaseCenter/returnCargoOrder/form.vue  | 561 +++++++++++-------
 .../views/scm/saleCenter/saleOrder/index.vue  | 114 ++--
 6 files changed, 856 insertions(+), 569 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/businessLineConfig/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/businessLineConfig/index.vue
index e1dbc01d..2f089977 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/businessLineConfig/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/businessLineConfig/index.vue
@@ -16,7 +16,8 @@
       </div>
       <el-tree :data="treeData" class="JNPF-common-el-tree" highlight-current ref="treeBox"
         :expand-on-click-node="false" @node-click="handleNodeClick" node-key="id" :props="treeProps"
-        :default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false" v-if="refreshTree">
+        :default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false"
+        v-if="refreshTree">
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <i :class="data.icon"></i>
           <span class="text">{{ node.label }}</span>
@@ -34,8 +35,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="最后登录">
-              <JnpfDateRangePicker v-model="query.jnpf_base_user_jnpf_lastLogTime" format="yyyy-MM-dd"
-                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              <JnpfDateRangePicker v-model="query.jnpf_base_user_jnpf_lastLogTime"
+                format="yyyy-MM-dd" startPlaceholder="开始日期" endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
@@ -56,7 +57,8 @@
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
               @click="BusinessLineUserRelation()">关联员工
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
+              v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
@@ -68,30 +70,40 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                @click="initData()" />
             </el-tooltip>
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column border>
-          <el-table-column prop="jnpf_base_user_jnpf_realName" label="姓名" sortable align="center" fixed="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column
+          border>
+          <el-table-column prop="jnpf_base_user_jnpf_realName" label="姓名" sortable align="center"
+            fixed="left">
           </el-table-column>
-          <el-table-column prop="jnpf_base_user_jnpf_positionName" label="职务" sortable align="center" fixed="left">
+          <el-table-column prop="jnpf_base_user_jnpf_positionName" label="职务" sortable
+            align="center" fixed="left">
           </el-table-column>
-          <el-table-column prop="jnpf_base_user_jnpf_businessLineName" label="业务线" sortable align="center">
+          <el-table-column prop="jnpf_base_user_jnpf_businessLineName" label="业务线" sortable
+            align="center">
           </el-table-column>
-          <el-table-column label="帐号状态" prop="jnpf_base_user_jnpf_enabledMark" sortable align="center">
+          <el-table-column label="帐号状态" prop="jnpf_base_user_jnpf_enabledMark" sortable
+            align="center">
             <template slot-scope="scope">
               {{ scope.row.jnpf_base_user_jnpf_enabledMark }}
             </template>
           </el-table-column>
-          <el-table-column prop="jnpf_base_user_jnpf_mobilePhone" label="手机" sortable align="center">
+          <el-table-column prop="jnpf_base_user_jnpf_mobilePhone" label="手机" sortable
+            align="center">
           </el-table-column>
-          <el-table-column prop="jnpf_base_user_jnpf_lastLogTime" label="最后登录" sortable align="center">
+          <el-table-column prop="jnpf_base_user_jnpf_lastLogTime" label="最后登录" sortable
+            align="center">
           </el-table-column>
-          <el-table-column prop="jnpf_base_user_jnpf_creatorTime" label="创建时间" sortable align="center">
+          <el-table-column prop="jnpf_base_user_jnpf_creatorTime" label="创建时间" sortable
+            align="center">
           </el-table-column>
-          <el-table-column prop="jnpf_base_user_jnpf_lastModifyTime" label="更新时间" sortable align="center">
+          <el-table-column prop="jnpf_base_user_jnpf_lastModifyTime" label="更新时间" sortable
+            align="center">
           </el-table-column>
           <!-- <el-table-column prop="flowState" label="状态" width="100">
             <template slot-scope="scope" v-if="!scope.row.top">
@@ -117,27 +129,32 @@
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize" @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
-      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
+      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+      lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
+        <div class="template-item" v-for="item in flowList" :key="item.id"
+          @click="selectFlow(item)">{{ item.fullName }}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
-    <UserMultipleSelect v-if="userMultipleSelect" :multiple="true" ref="userMultipleSelect" @change="getUserIds" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
+      @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+      @superQuery="superQuery" />
+    <UserMultipleSelect v-if="userMultipleSelect" :multiple="true" ref="userMultipleSelect"
+      @change="getUserIds" />
   </div>
 </template>
 
@@ -409,7 +426,6 @@ export default {
         url: `/api/scm/BusinessLine/Tree`,
         method: 'get'
       }).then(res => {
-        debugger
         this.treeData = res.data
         this.initSearchDataAndListData()
       })
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/form.vue
index 4669e31e..6f975687 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/form.vue
@@ -1,8 +1,8 @@
 <template>
   <div :style="{ margin: '0 auto', width: '100%' }">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
-        :disabled="setting.readonly">
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+        label-position="right" :disabled="setting.readonly">
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
@@ -14,8 +14,8 @@
           <el-col :span="24" v-if="judgeShow('deliveryType')">
             <jnpf-form-tip-item label-width="0" prop="deliveryType">
               <JnpfRadio v-model="dataForm.deliveryType" @change="changeData('deliveryType', -1)"
-                :disabled="judgeWrite('deliveryType')" optionType="button" direction="horizontal" size="small"
-                :options="deliveryTypeOptions" :props="deliveryTypeProps">
+                :disabled="judgeWrite('deliveryType')" optionType="button" direction="horizontal"
+                size="small" :options="deliveryTypeOptions" :props="deliveryTypeProps">
               </JnpfRadio>
             </jnpf-form-tip-item>
           </el-col>
@@ -27,15 +27,17 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('deliveryCode')">
             <jnpf-form-tip-item label="订单编号" v-if="judgeShow('deliveryCode')" prop="deliveryCode">
-              <JnpfInput v-model="dataForm.deliveryCode" @change="changeData('deliveryCode', -1)" placeholder="系统自动生成"
-                :disabled="true" readonly :style='{ "width": "100%" }'>
+              <JnpfInput v-model="dataForm.deliveryCode" @change="changeData('deliveryCode', -1)"
+                placeholder="系统自动生成" :disabled="true" readonly :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('preparationTime')">
-            <jnpf-form-tip-item label="制单时间" v-if="judgeShow('preparationTime')" prop="preparationTime">
-              <JnpfOpenData v-model="dataForm.preparationTime" @change="changeData('preparationTime', -1)"
-                placeholder="系统自动生成" :disabled="judgeWrite('preparationTime')" readonly :style='{ "width": "100%" }'
+            <jnpf-form-tip-item label="制单时间" v-if="judgeShow('preparationTime')"
+              prop="preparationTime">
+              <JnpfOpenData v-model="dataForm.preparationTime"
+                @change="changeData('preparationTime', -1)" placeholder="系统自动生成"
+                :disabled="judgeWrite('preparationTime')" readonly :style='{ "width": "100%" }'
                 type="currTime">
               </JnpfOpenData>
             </jnpf-form-tip-item>
@@ -48,21 +50,26 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('businessId')">
             <jnpf-form-tip-item label="退货单" v-if="judgeShow('businessId')" prop="businessId">
-              <JnpfPopupSelect v-model="dataForm.businessId" @change="getPurchaseReturnCargoOrder" :rowIndex="null"
-                :formData="dataForm" :templateJson="interfaceRes.businessId" placeholder="请选择"
-                :disabled="judgeWrite('businessId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='returnCargoCode' field='businessId' interfaceId="531493393713334021"
-                :pageSize="20" :columnOptions="businessIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+              <JnpfPopupSelect v-model="dataForm.businessId" @change="getPurchaseReturnCargoOrder"
+                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessId"
+                placeholder="请选择" :disabled="judgeWrite('businessId')" propsValue="id"
+                popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='returnCargoCode' field='businessId' interfaceId="531493393713334021"
+                :pageSize="20" :columnOptions="businessIdcolumnOptions" clearable
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('reservedFields1')">
-            <jnpf-form-tip-item label="业务线" v-if="judgeShow('reservedFields1')" prop="reservedFields1">
-              <JnpfPopupSelect v-model="dataForm.reservedFields1" @change="changeData('reservedFields1', -1)"
-                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.reservedFields1" placeholder="请选择"
-                :disabled="true" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='name' field='reservedFields1' interfaceId="517979330417001669"
-                :pageSize="20" :columnOptions="reservedFields1columnOptions" clearable :style='{ "width": "100%" }'>
+            <jnpf-form-tip-item label="业务线" v-if="judgeShow('reservedFields1')"
+              prop="reservedFields1">
+              <JnpfPopupSelect v-model="dataForm.reservedFields1"
+                @change="changeData('reservedFields1', -1)" :rowIndex="null" :formData="dataForm"
+                :templateJson="interfaceRes.reservedFields1" placeholder="请选择" :disabled="true"
+                propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                relationField='name' field='reservedFields1' interfaceId="517979330417001669"
+                :pageSize="20" :columnOptions="reservedFields1columnOptions" clearable
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -73,30 +80,32 @@
               </div>
               <el-table :data="dataForm.purchaseReturnCargoOrderInfo" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="采购退货订单" v-if="judgeShow('warehousingproduct-productName')" prop="code">
+                <el-table-column label="采购退货订单" v-if="judgeShow('warehousingproduct-productName')"
+                  prop="code">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-productName')">*</span>采购退货订单
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.returnCargoCode"
-                      @change="changeData('warehousingproduct-productName', scope.$index)" placeholder="请输入"
+                      @change="changeData('warehousingproduct-productName', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('warehousingproductList') || judgeWrite('warehousingproductList-productName')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="订单类型" v-if="judgeShow('warehousingproductList-inventoryUnitId')"
-                  prop="inventoryUnitId">
+                <el-table-column label="订单类型"
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>订单类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.orderType"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)" placeholder="请选择"
-                      :disabled="true" clearable :style='{ "width": "100%" }' :options="orderTypeOptions"
-                      :props="orderTypeProps">
+                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                      :options="orderTypeOptions" :props="orderTypeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
@@ -115,110 +124,112 @@
                     </JnpfInput>
                   </template>
                 </el-table-column> -->
-                <el-table-column label="关联供应商(二级)" v-if="judgeShow('warehousingproduct-purchaseUnitId')"
-                  prop="purchaseUnitId">
+                <el-table-column label="关联供应商(二级)"
+                  v-if="judgeShow('warehousingproduct-purchaseUnitId')" prop="purchaseUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-purchaseUnitId')">*</span>关联供应商(二级)
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.secondSupplyName"
-                      @change="changeData('warehousingproduct-purchaseUnitId', scope.$index)" placeholder="请输入"
-                      :disabled="true" clearable :style='{ "width": "100%" }'>
+                      @change="changeData('warehousingproduct-purchaseUnitId', scope.$index)"
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="关联供应商(三级)" v-if="judgeShow('warehousingproduct-purchaseUnitId')"
-                  prop="purchaseUnitId">
+                <el-table-column label="关联供应商(三级)"
+                  v-if="judgeShow('warehousingproduct-purchaseUnitId')" prop="purchaseUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-purchaseUnitId')">*</span>关联供应商(三级)
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.thirdSupplyName"
-                      @change="changeData('warehousingproduct-purchaseUnitId', scope.$index)" placeholder="请输入"
-                      :disabled="true" clearable :style='{ "width": "100%" }'>
+                      @change="changeData('warehousingproduct-purchaseUnitId', scope.$index)"
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="关联业务线" v-if="judgeShow('warehousingproduct-purchaseNum')" prop="purchaseNum">
+                <el-table-column label="关联业务线" v-if="judgeShow('warehousingproduct-purchaseNum')"
+                  prop="purchaseNum">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('warehousingproductList-purchaseNum')">*</span>关联业务线
+                    <span class="required-sign"
+                      v-if="judgeRequired('warehousingproductList-purchaseNum')">*</span>关联业务线
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.businessLineName"
-                      @change="changeData('warehousingproduct-purchaseNum', scope.$index)" placeholder="请输入"
-                      :disabled="true" clearable :style='{ "width": "100%" }'>
+                      @change="changeData('warehousingproduct-purchaseNum', scope.$index)"
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="业务类型" v-if="judgeShow('warehousingproductList-inventoryUnitId')"
-                  prop="inventoryUnitId">
+                <el-table-column label="业务类型"
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>业务类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.businessOrderType"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)" placeholder="请选择"
-                      :disabled="true" clearable :style='{ "width": "100%" }' :options="businessOrderTypeOptions"
-                      :props="businessOrderTypeProps">
+                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                      :options="businessOrderTypeOptions" :props="businessOrderTypeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="币种" v-if="judgeShow('warehousingproductList-inventoryUnitId')"
-                  prop="inventoryUnitId">
+                <el-table-column label="币种"
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>币种
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.currency"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)" placeholder="请选择"
-                      :disabled="true" clearable :style='{ "width": "100%" }' :options="currencyOptions"
-                      :props="currencyProps">
+                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                      :options="currencyOptions" :props="currencyProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="采购模式" v-if="judgeShow('warehousingproductList-inventoryUnitId')"
-                  prop="inventoryUnitId">
+                <el-table-column label="采购模式"
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>采购模式
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.saleMode"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)" placeholder="请选择"
-                      :disabled="true" clearable :style='{ "width": "100%" }' :options="saleModeOptions"
-                      :props="saleModeProps">
+                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                      :options="saleModeOptions" :props="saleModeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="交货方式" v-if="judgeShow('warehousingproductList-inventoryUnitId')"
-                  prop="inventoryUnitId">
+                <el-table-column label="交货方式"
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>交货方式
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.transactionMode"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)" placeholder="请选择"
-                      :disabled="true" clearable :style='{ "width": "100%" }' :options="transactionModeOptions"
-                      :props="transactionModeProps">
+                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                      :options="transactionModeOptions" :props="transactionModeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="运输方式" v-if="judgeShow('warehousingproductList-inventoryUnitId')"
-                  prop="inventoryUnitId">
+                <el-table-column label="运输方式"
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>运输方式
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.transportMode"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)" placeholder="请选择"
-                      :disabled="true" clearable :style='{ "width": "100%" }' :options="transportModeOptions"
-                      :props="transportModeProps">
+                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                      :options="transportModeOptions" :props="transportModeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
@@ -233,18 +244,21 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('subjectId')">
             <jnpf-form-tip-item label="供应商名称" v-if="judgeShow('subjectId')" prop="subjectId">
-              <JnpfPopupSelect v-model="dataForm.subjectId" @change="changeData('subjectId', -1)" :rowIndex="null"
-                :formData="dataForm" :templateJson="interfaceRes.subjectId" placeholder="请选择"
-                :disabled="judgeWrite('subjectId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='name' field='subjectId' interfaceId="530001731111617029"
-                :pageSize="20" :columnOptions="subjectIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+              <JnpfPopupSelect v-model="dataForm.subjectId" @change="changeData('subjectId', -1)"
+                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectId"
+                placeholder="请选择" :disabled="judgeWrite('subjectId')" propsValue="id"
+                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
+                field='subjectId' interfaceId="530001731111617029" :pageSize="20"
+                :columnOptions="subjectIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('deliveryAddress')">
-            <jnpf-form-tip-item label="收货地址" v-if="judgeShow('deliveryAddress')" prop="deliveryAddress">
-              <JnpfInput v-model="dataForm.deliveryAddress" @change="changeData('deliveryAddress', -1)"
-                placeholder="请输入" :disabled="judgeWrite('deliveryAddress')" clearable :style='{ "width": "100%" }'>
+            <jnpf-form-tip-item label="收货地址" v-if="judgeShow('deliveryAddress')"
+              prop="deliveryAddress">
+              <JnpfInput v-model="dataForm.deliveryAddress"
+                @change="changeData('deliveryAddress', -1)" placeholder="请输入"
+                :disabled="judgeWrite('deliveryAddress')" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -256,31 +270,38 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('enterpriseId')">
             <jnpf-form-tip-item label="机构名称" v-if="judgeShow('enterpriseId')" prop="enterpriseId">
-              <JnpfPopupSelect v-model="dataForm.enterpriseId" @change="changeData('enterpriseId', -1)" :rowIndex="null"
-                :formData="dataForm" :templateJson="interfaceRes.enterpriseId" placeholder="请选择"
-                :disabled="judgeWrite('enterpriseId')" propsValue="f_id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='f_full_name' field='enterpriseId' interfaceId="522729853024209157"
-                :pageSize="20" :columnOptions="enterpriseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+              <JnpfPopupSelect v-model="dataForm.enterpriseId"
+                @change="changeData('enterpriseId', -1)" :rowIndex="null" :formData="dataForm"
+                :templateJson="interfaceRes.enterpriseId" placeholder="请选择"
+                :disabled="judgeWrite('enterpriseId')" propsValue="f_id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='f_full_name'
+                field='enterpriseId' interfaceId="522729853024209157" :pageSize="20"
+                :columnOptions="enterpriseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('warehouseId')">
             <jnpf-form-tip-item label="发货仓库" v-if="judgeShow('warehouseId')" prop="warehouseId">
-              <JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId', -1)" :rowIndex="null"
-                :formData="dataForm" :templateJson="interfaceRes.warehouseId" placeholder="请选择"
-                :disabled="judgeWrite('warehouseId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='name' field='warehouseId' interfaceId="522701377537837317"
-                :pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+              <JnpfPopupSelect v-model="dataForm.warehouseId"
+                @change="changeData('warehouseId', -1)" :rowIndex="null" :formData="dataForm"
+                :templateJson="interfaceRes.warehouseId" placeholder="请选择"
+                :disabled="judgeWrite('warehouseId')" propsValue="id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='name' field='warehouseId'
+                interfaceId="522701377537837317" :pageSize="20"
+                :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('shippingAddress')">
-            <jnpf-form-tip-item label="发货地址" v-if="judgeShow('shippingAddress')" prop="shippingAddress">
-              <JnpfPopupSelect v-model="dataForm.shippingAddress" @change="changeData('shippingAddress', -1)"
-                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.shippingAddress" placeholder="请选择"
-                :disabled="judgeWrite('shippingAddress')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='addressDetail' field='shippingAddress'
-                interfaceId="522724961224231173" :pageSize="20" :columnOptions="shippingAddresscolumnOptions" clearable
+            <jnpf-form-tip-item label="发货地址" v-if="judgeShow('shippingAddress')"
+              prop="shippingAddress">
+              <JnpfPopupSelect v-model="dataForm.shippingAddress"
+                @change="changeData('shippingAddress', -1)" :rowIndex="null" :formData="dataForm"
+                :templateJson="interfaceRes.shippingAddress" placeholder="请选择"
+                :disabled="judgeWrite('shippingAddress')" propsValue="id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='addressDetail'
+                field='shippingAddress' interfaceId="522724961224231173" :pageSize="20"
+                :columnOptions="shippingAddresscolumnOptions" clearable
                 :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -293,9 +314,9 @@
           </el-col>
           <el-col :span="24" v-if="judgeShow('remark')">
             <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
-              <JnpfTextarea v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
-                :disabled="judgeWrite('remark')" :style='{ "width": "100%" }' true type="textarea"
-                :autosize='{ "minRows": 4, "maxRows": 4 }'>
+              <JnpfTextarea v-model="dataForm.remark" @change="changeData('remark', -1)"
+                placeholder="请输入" :disabled="judgeWrite('remark')" :style='{ "width": "100%" }' true
+                type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }'>
               </JnpfTextarea>
             </jnpf-form-tip-item>
           </el-col>
@@ -312,69 +333,79 @@
               </div>
               <el-table :data="dataForm.deliveryVoucherRelationList" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="凭证编号" v-if="judgeShow('deliveryvoucherrelation-voucherId')" prop="voucherId">
+                <el-table-column label="凭证编号" v-if="judgeShow('deliveryvoucherrelation-voucherId')"
+                  prop="voucherId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-voucherId')">*</span>凭证编号
                   </template>
                   <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.voucherId" @change="getPurchaseDeliveryVoucher"
-                      :rowIndex="scope.$index" :formData="dataForm"
-                      :templateJson="interfaceRes.deliveryvoucherrelationvoucherId" placeholder="请选择"
+                    <JnpfPopupSelect v-model="scope.row.voucherId"
+                      @change="getPurchaseDeliveryVoucher" :rowIndex="scope.$index"
+                      :formData="dataForm"
+                      :templateJson="interfaceRes.deliveryvoucherrelationvoucherId"
+                      placeholder="请选择"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-voucherId')"
                       propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='voucherCode' :field="'voucherId' + scope.$index" interfaceId="531823039369709893"
-                      :pageSize="20" :columnOptions="deliveryvoucherrelationvoucherIdcolumnOptions" clearable
+                      relationField='voucherCode' :field="'voucherId' + scope.$index"
+                      interfaceId="531823039369709893" :pageSize="20"
+                      :columnOptions="deliveryvoucherrelationvoucherIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="单据类型" v-if="judgeShow('deliveryvoucherrelation-documentType')"
-                  prop="documentType">
+                <el-table-column label="单据类型"
+                  v-if="judgeShow('deliveryvoucherrelation-documentType')" prop="documentType">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-documentType')">*</span>单据类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.documentType"
-                      @change="changeData('deliveryvoucherrelation-documentType', scope.$index)" placeholder="请选择"
+                      @change="changeData('deliveryvoucherrelation-documentType', scope.$index)"
+                      placeholder="请选择"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-documentType')"
-                      clearable :style='{ "width": "100%" }' :options="deliveryvoucherrelationdocumentTypeOptions"
+                      clearable :style='{ "width": "100%" }'
+                      :options="deliveryvoucherrelationdocumentTypeOptions"
                       :props="deliveryvoucherrelationdocumentTypeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="凭证类型" v-if="judgeShow('deliveryvoucherrelation-voucherType')"
-                  prop="voucherType">
+                <el-table-column label="凭证类型"
+                  v-if="judgeShow('deliveryvoucherrelation-voucherType')" prop="voucherType">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-voucherType')">*</span>凭证类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.voucherType"
-                      @change="changeData('deliveryvoucherrelation-voucherType', scope.$index)" placeholder="请选择"
+                      @change="changeData('deliveryvoucherrelation-voucherType', scope.$index)"
+                      placeholder="请选择"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-voucherType')"
-                      clearable :style='{ "width": "100%" }' :options="deliveryvoucherrelationvoucherTypeOptions"
+                      clearable :style='{ "width": "100%" }'
+                      :options="deliveryvoucherrelationvoucherTypeOptions"
                       :props="deliveryvoucherrelationvoucherTypeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="磅单编号" v-if="judgeShow('deliveryvoucherrelation-poundCode')" prop="poundCode">
+                <el-table-column label="磅单编号" v-if="judgeShow('deliveryvoucherrelation-poundCode')"
+                  prop="poundCode">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-poundCode')">*</span>磅单编号
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.poundCode"
-                      @change="changeData('deliveryvoucherrelation-poundCode', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-poundCode', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-poundCode')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="磅单时间" v-if="judgeShow('deliveryvoucherrelation-poundlistTime')"
-                  prop="poundlistTime">
+                <el-table-column label="磅单时间"
+                  v-if="judgeShow('deliveryvoucherrelation-poundlistTime')" prop="poundlistTime">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-poundlistTime')">*</span>磅单时间
@@ -382,14 +413,15 @@
                   <template slot-scope="scope">
                     <JnpfDatePicker v-model="scope.row.poundlistTime"
                       @change="changeData('deliveryvoucherrelation-poundlistTime', scope.$index)"
-                      :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
-                      placeholder="请选择"
+                      :startTime="dateTime(false, 1, 1, '', '')"
+                      :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-poundlistTime')"
                       clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
                     </JnpfDatePicker>
                   </template>
                 </el-table-column>
-                <el-table-column label="车牌号" v-if="judgeShow('deliveryvoucherrelation-vehicleId')" prop="vehicleId">
+                <el-table-column label="车牌号" v-if="judgeShow('deliveryvoucherrelation-vehicleId')"
+                  prop="vehicleId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-vehicleId')">*</span>车牌号
@@ -401,78 +433,93 @@
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput> -->
                     <JnpfPopupSelect v-model="scope.row.vehicleId"
-                      @change="changeData('vouchervehicle-vehicleId', scope.$index)" :rowIndex="scope.$index"
-                      :formData="dataForm" :templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
-                      :disabled="true" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='vehicle_number' :field="'vehicleId' + scope.$index"
-                      interfaceId="529920852288864453" :pageSize="20"
-                      :columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                      @change="changeData('vouchervehicle-vehicleId', scope.$index)"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
+                      :disabled="true" propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                      popupType="dialog" relationField='vehicle_number'
+                      :field="'vehicleId' + scope.$index" interfaceId="529920852288864453"
+                      :pageSize="20" :columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="商品名称" v-if="judgeShow('deliveryvoucherrelation-productId')" prop="productId">
+                <el-table-column label="商品名称" v-if="judgeShow('deliveryvoucherrelation-productId')"
+                  prop="productId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-productId')">*</span>商品名称
                   </template>
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.productId"
-                      @change="changeData('deliveryvoucherrelation-productId', scope.$index)" :rowIndex="scope.$index"
-                      :formData="dataForm" :templateJson="interfaceRes.deliveryvoucherrelationproductId"
+                      @change="changeData('deliveryvoucherrelation-productId', scope.$index)"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.deliveryvoucherrelationproductId"
                       placeholder="请选择"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-productId')"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                      :field="'productId' + scope.$index" interfaceId="529919666429100229" :pageSize="20"
+                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='name' :field="'productId' + scope.$index"
+                      interfaceId="529919666429100229" :pageSize="20"
                       :columnOptions="deliveryvoucherrelationproductIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="规格" v-if="judgeShow('deliveryvoucherrelation-spec')" prop="spec">
+                <el-table-column label="规格" v-if="judgeShow('deliveryvoucherrelation-spec')"
+                  prop="spec">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryvoucherrelationList-spec')">*</span>规格
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryvoucherrelationList-spec')">*</span>规格
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.spec"
-                      @change="changeData('deliveryvoucherrelation-spec', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-spec', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-spec')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="单位" v-if="judgeShow('deliveryvoucherrelation-unit')" prop="unit">
+                <el-table-column label="单位" v-if="judgeShow('deliveryvoucherrelation-unit')"
+                  prop="unit">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryvoucherrelationList-unit')">*</span>单位
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryvoucherrelationList-unit')">*</span>单位
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.unit"
-                      @change="changeData('deliveryvoucherrelation-unit', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-unit', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-unit')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="毛重" v-if="judgeShow('deliveryvoucherrelation-grossWeight')" prop="grossWeight">
+                <el-table-column label="毛重" v-if="judgeShow('deliveryvoucherrelation-grossWeight')"
+                  prop="grossWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-grossWeight')">*</span>毛重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.grossWeight"
-                      @change="changeData('deliveryvoucherrelation-grossWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-grossWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-grossWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="皮重" v-if="judgeShow('deliveryvoucherrelation-tareWeight')" prop="tareWeight">
+                <el-table-column label="皮重" v-if="judgeShow('deliveryvoucherrelation-tareWeight')"
+                  prop="tareWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-tareWeight')">*</span>皮重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.tareWeight"
-                      @change="changeData('deliveryvoucherrelation-tareWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-tareWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-tareWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
@@ -486,44 +533,53 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.buckleWeight"
-                      @change="changeData('deliveryvoucherrelation-buckleWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-buckleWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-buckleWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="净重" v-if="judgeShow('deliveryvoucherrelation-netWeight')" prop="netWeight">
+                <el-table-column label="净重" v-if="judgeShow('deliveryvoucherrelation-netWeight')"
+                  prop="netWeight">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryvoucherrelationList-netWeight')">*</span>净重
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryvoucherrelationList-netWeight')">*</span>净重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.netWeight"
-                      @change="changeData('deliveryvoucherrelation-netWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-netWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-netWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" v-if="judgeShow('deliveryvoucherrelation-remark')" prop="remark">
+                <el-table-column label="备注" v-if="judgeShow('deliveryvoucherrelation-remark')"
+                  prop="remark">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryvoucherrelationList-remark')">*</span>备注
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryvoucherrelationList-remark')">*</span>备注
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.remark"
-                      @change="changeData('deliveryvoucherrelation-remark', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-remark', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-remark')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('deliveryvoucherrelationList')">
+                <el-table-column label="操作" width="50"
+                  v-if="!judgeWrite('deliveryvoucherrelationList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                      @click="deldeliveryvoucherrelationList(scope.$index)">删除</el-button>
+                      @click="deldeliveryvoucherrelationList(scope)">删除</el-button>
                   </template>
                 </el-table-column>
               </el-table>
-              <div class="table-actions" @click="choiceVoucher()" v-if="!judgeWrite('deliveryvoucherrelationList')">
+              <div class="table-actions" @click="choiceVoucher()"
+                v-if="!judgeWrite('deliveryvoucherrelationList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div>
             </jnpf-form-tip-item>
@@ -535,37 +591,44 @@
               </div>
               <el-table :data="dataForm.deliveryProductRelationList" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="商品名称" v-if="judgeShow('deliveryproductrelation-productId')" prop="productId">
+                <el-table-column label="商品名称" v-if="judgeShow('deliveryproductrelation-productId')"
+                  prop="productId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-productId')">*</span>商品名称
                   </template>
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.productId"
-                      @change="changeData('deliveryproductrelation-productId', scope.$index)" :rowIndex="scope.$index"
-                      :formData="dataForm" :templateJson="interfaceRes.deliveryproductrelationproductId"
+                      @change="changeData('deliveryproductrelation-productId', scope.$index)"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.deliveryproductrelationproductId"
                       placeholder="请选择"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-productId')"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                      :field="'productId' + scope.$index" interfaceId="529919666429100229" :pageSize="20"
+                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='name' :field="'productId' + scope.$index"
+                      interfaceId="529919666429100229" :pageSize="20"
                       :columnOptions="deliveryproductrelationproductIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="规格" v-if="judgeShow('deliveryproductrelation-spec')" prop="spec">
+                <el-table-column label="规格" v-if="judgeShow('deliveryproductrelation-spec')"
+                  prop="spec">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-spec')">*</span>规格
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-spec')">*</span>规格
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.spec"
-                      @change="changeData('deliveryproductrelation-spec', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-spec', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-spec')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="库存单位" v-if="judgeShow('deliveryproductrelation-inventoryUnitId')"
+                <el-table-column label="库存单位"
+                  v-if="judgeShow('deliveryproductrelation-inventoryUnitId')"
                   prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
@@ -573,13 +636,15 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.inventoryUnitId"
-                      @change="changeData('deliveryproductrelation-inventoryUnitId', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-inventoryUnitId', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-inventoryUnitId')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="销售单位" v-if="judgeShow('deliveryproductrelation-salesMainUnitId')"
+                <el-table-column label="销售单位"
+                  v-if="judgeShow('deliveryproductrelation-salesMainUnitId')"
                   prop="salesMainUnitId">
                   <template slot="header">
                     <span class="required-sign"
@@ -587,60 +652,70 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.salesMainUnitId"
-                      @change="changeData('deliveryproductrelation-salesMainUnitId', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-salesMainUnitId', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-salesMainUnitId')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="销售数量" v-if="judgeShow('deliveryproductrelation-saleNum')" prop="saleNum">
+                <el-table-column label="销售数量" v-if="judgeShow('deliveryproductrelation-saleNum')"
+                  prop="saleNum">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-saleNum')">*</span>销售数量
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-saleNum')">*</span>销售数量
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.saleNum"
-                      @change="changeData('deliveryproductrelation-saleNum', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-saleNum', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-saleNum')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="发货单位" v-if="judgeShow('deliveryproductrelation-deliveryUnit')"
-                  prop="deliveryUnit">
+                <el-table-column label="发货单位"
+                  v-if="judgeShow('deliveryproductrelation-deliveryUnit')" prop="deliveryUnit">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-deliveryUnit')">*</span>发货单位
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.deliveryUnit"
-                      @change="changeData('deliveryproductrelation-deliveryUnit', scope.$index)" placeholder="请选择"
+                      @change="changeData('deliveryproductrelation-deliveryUnit', scope.$index)"
+                      placeholder="请选择"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-deliveryUnit')"
-                      clearable :style='{ "width": "100%" }' :options="deliveryproductrelationdeliveryUnitOptions"
+                      clearable :style='{ "width": "100%" }'
+                      :options="deliveryproductrelationdeliveryUnitOptions"
                       :props="deliveryproductrelationdeliveryUnitProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="毛重" v-if="judgeShow('deliveryproductrelation-grossWeight')" prop="grossWeight">
+                <el-table-column label="毛重" v-if="judgeShow('deliveryproductrelation-grossWeight')"
+                  prop="grossWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-grossWeight')">*</span>毛重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.grossWeight"
-                      @change="changeData('deliveryproductrelation-grossWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-grossWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-grossWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="皮重" v-if="judgeShow('deliveryproductrelation-tareWeight')" prop="tareWeight">
+                <el-table-column label="皮重" v-if="judgeShow('deliveryproductrelation-tareWeight')"
+                  prop="tareWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-tareWeight')">*</span>皮重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.tareWeight"
-                      @change="changeData('deliveryproductrelation-tareWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-tareWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-tareWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
@@ -654,69 +729,81 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.buckleWeight"
-                      @change="changeData('deliveryproductrelation-buckleWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-buckleWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-buckleWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="净重" v-if="judgeShow('deliveryproductrelation-netWeight')" prop="netWeight">
+                <el-table-column label="净重" v-if="judgeShow('deliveryproductrelation-netWeight')"
+                  prop="netWeight">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-netWeight')">*</span>净重
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-netWeight')">*</span>净重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.netWeight"
-                      @change="changeData('deliveryproductrelation-netWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-netWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-netWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="货区名称" v-if="judgeShow('deliveryproductrelation-cargoId')" prop="cargoId">
+                <el-table-column label="货区名称" v-if="judgeShow('deliveryproductrelation-cargoId')"
+                  prop="cargoId">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-cargoId')">*</span>货区名称
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-cargoId')">*</span>货区名称
                   </template>
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.cargoId"
-                      @change="changeData('deliveryproductrelation-cargoId', scope.$index)" :rowIndex="scope.$index"
-                      :formData="dataForm" :templateJson="interfaceRes.deliveryproductrelationcargoId" placeholder="请选择"
+                      @change="changeData('deliveryproductrelation-cargoId', scope.$index)"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.deliveryproductrelationcargoId" placeholder="请选择"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-cargoId')"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='cargo_name'
-                      :field="'cargoId' + scope.$index" interfaceId="530700536261903749" :pageSize="20"
+                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='cargo_name' :field="'cargoId' + scope.$index"
+                      interfaceId="530700536261903749" :pageSize="20"
                       :columnOptions="deliveryproductrelationcargoIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="发货数量" v-if="judgeShow('deliveryproductrelation-deliveryNum')"
-                  prop="deliveryNum">
+                <el-table-column label="发货数量"
+                  v-if="judgeShow('deliveryproductrelation-deliveryNum')" prop="deliveryNum">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-deliveryNum')">*</span>发货数量
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.deliveryNum"
-                      @change="changeData('deliveryproductrelation-deliveryNum', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-deliveryNum', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-deliveryNum')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="批次号" v-if="judgeShow('deliveryproductrelation-batchNo')" prop="batchNo">
+                <el-table-column label="批次号" v-if="judgeShow('deliveryproductrelation-batchNo')"
+                  prop="batchNo">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-batchNo')">*</span>批次号
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-batchNo')">*</span>批次号
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.batchNo"
-                      @change="changeData('deliveryproductrelation-batchNo', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-batchNo', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-batchNo')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="生产日期" v-if="judgeShow('deliveryproductrelation-produceTime')"
-                  prop="produceTime">
+                <el-table-column label="生产日期"
+                  v-if="judgeShow('deliveryproductrelation-produceTime')" prop="produceTime">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-produceTime')">*</span>生产日期
@@ -724,107 +811,121 @@
                   <template slot-scope="scope">
                     <JnpfDatePicker v-model="scope.row.produceTime"
                       @change="changeData('deliveryproductrelation-produceTime', scope.$index)"
-                      :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
-                      placeholder="请选择"
+                      :startTime="dateTime(false, 1, 1, '', '')"
+                      :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-produceTime')"
                       clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
                     </JnpfDatePicker>
                   </template>
                 </el-table-column>
-                <el-table-column label="退货单价" v-if="judgeShow('deliveryproductrelation-returnUnit')" prop="returnUnit">
+                <el-table-column label="退货单价" v-if="judgeShow('deliveryproductrelation-returnUnit')"
+                  prop="returnUnit">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-returnUnit')">*</span>退货单价
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.returnUnit"
-                      @change="changeData('deliveryproductrelation-returnUnit', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-returnUnit', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-returnUnit')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="税率" v-if="judgeShow('deliveryproductrelation-tax')" prop="tax">
+                <el-table-column label="税率" v-if="judgeShow('deliveryproductrelation-tax')"
+                  prop="tax">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-tax')">*</span>税率
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-tax')">*</span>税率
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.tax" @change="changeData('deliveryproductrelation-tax', scope.$index)"
+                    <JnpfInput v-model="scope.row.tax"
+                      @change="changeData('deliveryproductrelation-tax', scope.$index)"
                       placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-tax')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="含税小计" v-if="judgeShow('deliveryproductrelation-taxCount')" prop="taxCount">
+                <el-table-column label="含税小计" v-if="judgeShow('deliveryproductrelation-taxCount')"
+                  prop="taxCount">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-taxCount')">*</span>含税小计
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.taxCount"
-                      @change="changeData('deliveryproductrelation-taxCount', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-taxCount', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-taxCount')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="不含税单价" v-if="judgeShow('deliveryproductrelation-notTaxPrice')"
-                  prop="notTaxPrice">
+                <el-table-column label="不含税单价"
+                  v-if="judgeShow('deliveryproductrelation-notTaxPrice')" prop="notTaxPrice">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-notTaxPrice')">*</span>不含税单价
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.notTaxPrice"
-                      @change="changeData('deliveryproductrelation-notTaxPrice', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-notTaxPrice', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-notTaxPrice')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="不含税小计" v-if="judgeShow('deliveryproductrelation-notTaxCount')"
-                  prop="notTaxCount">
+                <el-table-column label="不含税小计"
+                  v-if="judgeShow('deliveryproductrelation-notTaxCount')" prop="notTaxCount">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-notTaxCount')">*</span>不含税小计
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.notTaxCount"
-                      @change="changeData('deliveryproductrelation-notTaxCount', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-notTaxCount', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-notTaxCount')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" v-if="judgeShow('deliveryproductrelation-remark')" prop="remark">
+                <el-table-column label="备注" v-if="judgeShow('deliveryproductrelation-remark')"
+                  prop="remark">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-remark')">*</span>备注
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-remark')">*</span>备注
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.remark"
-                      @change="changeData('deliveryproductrelation-remark', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-remark', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-remark')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('deliveryproductrelationList')">
+                <!-- <el-table-column label="操作" width="50"
+                  v-if="!judgeWrite('deliveryproductrelationList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="deldeliveryproductrelationList(scope.$index)">删除</el-button>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
               </el-table>
-              <div class="table-actions" @click="choiceProduct()" v-if="!judgeWrite('deliveryproductrelationList')">
+              <!-- <div class="table-actions" @click="choiceProduct()"
+                v-if="!judgeWrite('deliveryproductrelationList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
-              </div>
+              </div> -->
             </jnpf-form-tip-item>
           </el-col>
           <!-- 表单结束 -->
         </template>
-        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
-          @select="addForSelect" @close="selectDialogVisible = false" />
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible = false" />
       </el-form>
     </el-row>
     <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
@@ -1150,6 +1251,14 @@ export default {
     },
     //选择凭证弹窗
     choiceVoucher() {
+      if (!this.dataForm.businessId) {
+        this.$message({
+          type: "error",
+          message: "请先选择退货订单",
+          duration: 1500
+        });
+        return;
+      }
       this.voucherBoxVisible = true
       let excludeIdList = [];
       for (let i = 0; i < this.dataForm.deliveryVoucherRelationList.length; i++) {
@@ -1158,7 +1267,7 @@ export default {
       let businessType = '1';
       let documentType = '2';
       this.$nextTick(() => {
-        this.$refs.VoucherBox.init(excludeIdList, businessType, documentType,this.productIdList)
+        this.$refs.VoucherBox.init(excludeIdList, businessType, documentType, this.productIdList)
       })
     },
     initVoucherList(list) {
@@ -1178,7 +1287,8 @@ export default {
           tareWeight: e.tareWeight,
           buckleWeight: e.buckleWeight,
           netWeight: e.netWeight,
-          businessType: '3'
+          businessType: '3',
+          list: e.productWarehouseEntityList,
         }
         this.dataForm.deliveryVoucherRelationList.push(item)
         let productEntity = {}
@@ -1369,11 +1479,20 @@ export default {
       }
       this.getdeliveryvoucherrelationList(item)
     },
-    deldeliveryvoucherrelationList(index) {
+    deldeliveryvoucherrelationList(scope) {
       this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
         type: 'warning'
       }).then(() => {
-        this.dataForm.deliveryVoucherRelationList.splice(index, 1);
+        var productId = scope.row.list[0].id
+        var productNetWeight = scope.row.list[0].netWeight
+        this.dataForm.deliveryProductRelationList.find((e, index) => {
+          if (e.id == productId && e.netWeight == productNetWeight) {
+            this.dataForm.deliveryProductRelationList.splice(index, 1)
+          } else if (e.id == productId && e.netWeight != productNetWeight) {
+            e.netWeight = this.jnpf.floatSub(e.netWeight, productNetWeight)
+          }
+        })
+        this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1);
       }).catch(() => {
       });
     },
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue
index fc7b378e..b6cc52d0 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue
@@ -728,7 +728,7 @@
                   v-if="!judgeWrite('deliveryvoucherrelationList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                      @click="deldeliveryvoucherrelationList(scope.row)">删除</el-button>
+                      @click="deldeliveryvoucherrelationList(scope)">删除</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -1633,11 +1633,7 @@ export default {
     choiceProduct() {
       this.BomgoodsBoxVisible = true;
       let excludeIdList = [];
-      for (
-        let i = 0;
-        i < this.dataForm.deliveryProductRelationList.length;
-        i++
-      ) {
+      for (let i = 0; i < this.dataForm.deliveryProductRelationList.length; i++) {
         excludeIdList.push(
           this.dataForm.deliveryProductRelationList[i].productId
         );
@@ -1679,11 +1675,7 @@ export default {
       }
       this.voucherBoxVisible = true;
       let excludeIdList = [];
-      for (
-        let i = 0;
-        i < this.dataForm.deliveryVoucherRelationList.length;
-        i++
-      ) {
+      for (let i = 0; i < this.dataForm.deliveryVoucherRelationList.length; i++) {
         excludeIdList.push(
           this.dataForm.deliveryVoucherRelationList[i].voucherId
         );
@@ -1700,6 +1692,7 @@ export default {
       });
     },
     initVoucherList(list) {
+
       for (let i = 0; i < list.length; i++) {
         const e = list[i];
         let item = {
@@ -1721,34 +1714,35 @@ export default {
         };
         this.dataForm.deliveryVoucherRelationList.push(item);
         let productEntity = {};
-        e.productWarehouseEntityList.forEach(item => {
-          if (item.orderMainUnitIds) {
-            var unitName = JSON.parse(item.orderMainUnitIds);
+        e.productWarehouseEntityList.forEach(unit => {
+          if (unit.orderMainUnitIds) {
+            var unitName = JSON.parse(unit.orderMainUnitIds);
             var optArray = [];
             for (let i = 0; i < unitName.length; i++) {
-              item.deliveryUnit = unitName[0];
+              unit.deliveryUnit = unitName[0];
               var opt = {};
               opt.fullName = unitName[i];
               opt.id = unitName[i];
               optArray.push(opt);
             }
-            item.deliveryproductrelationdeliveryUnitOptions = optArray;
+            unit.deliveryproductrelationdeliveryUnitOptions = optArray;
           }
           const obj =
-            this.productByOrderList.find(e => e.productId == item.id) || {};
-          item.salesMainUnitId = obj.salesMainUnitId;
-          item.saleNum = obj.businessNum;
-          item.productId = item.id;
-          item.inventoryUnitId = item.inventoryUnitIds;
-          item.businessType = "1";
-          productEntity = item;
+            this.productByOrderList.find(e => e.productId == unit.id) || {};
+          unit.salesMainUnitId = obj.salesMainUnitId;
+          unit.saleNum = obj.businessNum;
+          unit.productId = unit.id;
+          unit.inventoryUnitId = unit.inventoryUnitIds;
+          unit.businessType = "1";
+          productEntity = unit;
         });
         if (this.dataForm.deliveryProductRelationList.length == 0) {
           this.dataForm.deliveryProductRelationList.push(productEntity);
         } else {
-          this.dataForm.deliveryProductRelationList.filter(item => {
-            if (item.id == productEntity.id) {
-              item.netWeight = this.jnpf.floatAdd(item.netWeight, productEntity.netWeight)
+          this.dataForm.deliveryProductRelationList.forEach(net => {
+            if (net.id == productEntity.id) {
+              net.netWeight = this.jnpf.floatAdd(net.netWeight, productEntity.netWeight)
+              // console.log(this.jnpf.floatAdd(net.netWeight, productEntity.netWeight));
             } else {
               this.dataForm.deliveryProductRelationList.push(productEntity);
             }
@@ -1756,7 +1750,6 @@ export default {
           );
         }
       }
-
     },
     getPurchaseReceiptVoucher(val, val2) {
       val2.voucherId = val2.id;
@@ -1946,21 +1939,19 @@ export default {
     deldeliveryvoucherrelationList(scope) {
       this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
         type: "warning"
-      })
-        .then(() => {
-          console.log(scope.list[0].id);
-          var productId = scope.list[0].id
-          var productNetWeight = scope.list[0].netWeight
-          this.dataForm.deliveryProductRelationList.find((e, index) => {
-            if (e.id == productId && e.netWeight == productNetWeight) {
-              this.dataForm.deliveryProductRelationList.splice(index, 1)
-            } else if (e.id == productId && e.netWeight != productNetWeight) {
-              e.netWeight = this.jnpf.floatSub(e.netWeight, productNetWeight)
-            }
-          })
-          this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1);
+      }).then(() => {
+        debugger
+        var productId = scope.row.list[0].id
+        var productNetWeight = scope.row.list[0].netWeight
+        this.dataForm.deliveryProductRelationList.find((e, index) => {
+          if (e.id == productId && e.netWeight == productNetWeight) {
+            this.dataForm.deliveryProductRelationList.splice(index, 1)
+          } else if (e.id == productId && e.netWeight != productNetWeight) {
+            e.netWeight = this.jnpf.floatSub(e.netWeight, productNetWeight)
+          }
         })
-        .catch(() => { });
+        this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1);
+      }).catch(() => { });
     },
     getdeliveryvoucherrelationList(value) {
       let item = { ...this.tableRows.deliveryVoucherRelationList, ...value };
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
index ce2d086e..e19fdbd2 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
@@ -10,15 +10,15 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="凭证类型">
-              <JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable :options="voucherTypeOptions"
-                :props="voucherTypeProps" multiple>
+              <JnpfSelect v-model="query.voucherType" placeholder="请选择" clearable
+                :options="voucherTypeOptions" :props="voucherTypeProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
-                endPlaceholder="结束日期">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
@@ -33,7 +33,8 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
+                v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
@@ -46,9 +47,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+              @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
+              v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
@@ -69,20 +72,25 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                @click="initData()" />
             </el-tooltip>
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column border>
-          <el-table-column prop="voucherCode" label="凭证编号" sortable align="center" width="160" fixed="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column
+          border>
+          <el-table-column prop="voucherCode" label="凭证编号" sortable align="center" width="160"
+            fixed="left">
           </el-table-column>
-          <el-table-column label="单据类型" prop="documentType" sortable align="center" width="100" fixed="left">
+          <el-table-column label="单据类型" prop="documentType" sortable align="center" width="100"
+            fixed="left">
             <template slot-scope="scope">
               {{ scope.row.documentType1 }}
             </template>
           </el-table-column>
-          <el-table-column label="凭证类型" prop="voucherType" sortable align="center" width="100" fixed="left">
+          <el-table-column label="凭证类型" prop="voucherType" sortable align="center" width="100"
+            fixed="left">
             <template slot-scope="scope">
               {{ scope.row.voucherType1 }}
             </template>
@@ -104,7 +112,8 @@
           </el-table-column>
           <el-table-column prop="poundCode" label="磅单编号" sortable align="center" width="160">
           </el-table-column>
-          <el-table-column prop="associatedDocumentNo" label="关联单据号" sortable align="center" width="160">
+          <el-table-column prop="associatedDocumentNo" label="关联单据号" sortable align="center"
+            width="160">
           </el-table-column>
           <el-table-column prop="vehicleNumber" label="车牌号" sortable align="center" width="100">
           </el-table-column>
@@ -113,7 +122,8 @@
               {{ scope.row.modeTransport1 }}
             </template>
           </el-table-column>
-          <el-table-column label="承运方式" prop="transportationMethod" sortable align="center" width="100">
+          <el-table-column label="承运方式" prop="transportationMethod" sortable align="center"
+            width="100">
             <template slot-scope="scope">
               {{ scope.row.transportationMethod1 }}
             </template>
@@ -126,7 +136,8 @@
           </el-table-column>
           <el-table-column prop="destination" label="到达地" sortable align="center" width="200">
           </el-table-column>
-          <el-table-column prop="associateThirdSuppliers" label="三级供应商" sortable align="center" width="200">
+          <el-table-column prop="associateThirdSuppliers" label="三级供应商" sortable align="center"
+            width="200">
             <template slot-scope="scope">
               {{ scope.row.thirdSupplyName }}
             </template>
@@ -179,26 +190,30 @@
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize" @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
-      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
+      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+      lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
+        <div class="template-item" v-for="item in flowList" :key="item.id"
+          @click="selectFlow(item)">{{ item.fullName }}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
+      @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+      @superQuery="superQuery" />
   </div>
 </template>
 
@@ -360,18 +375,17 @@ export default {
       let customerIdFlag = true;
       let purchaseFlag = true;
       selectData.forEach(function (item) {
-        if(item.flowState != 2){
+        if (item.flowState != 2) {
           stateFlag = false;
         }
-        if(item.customerId != customId){
-          debugger
+        if (item.customerId != customId) {
           customerIdFlag = false;
         }
-        if(item.isTransfer != '1'){
+        if (item.isTransfer != '1') {
           purchaseFlag = false;
         }
       });
-      if(!stateFlag){
+      if (!stateFlag) {
         this.$message({
           type: 'error',
           message: '请选择审核通过的数据',
@@ -416,11 +430,11 @@ export default {
       const selectData = this.multipleSelectionItem
       let stateFlag = true;
       selectData.forEach(function (item) {
-        if(item.flowState != 2){
+        if (item.flowState != 2) {
           stateFlag = false;
         }
       });
-      if(!stateFlag){
+      if (!stateFlag) {
         this.$message({
           type: 'error',
           message: '请选择审核通过的数据',
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue
index 03431434..cdf83b69 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue
@@ -1,8 +1,8 @@
 <template>
   <div :style="{ margin: '0 auto', width: '100%' }">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right"
-        :disabled="setting.readonly">
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+        label-position="right" :disabled="setting.readonly">
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
@@ -14,8 +14,8 @@
           <el-col :span="24" v-if="judgeShow('documentType')">
             <jnpf-form-tip-item label-width="0" prop="documentType">
               <JnpfRadio v-model="dataForm.documentType" @change="changeData('documentType', -1)"
-                :disabled="judgeWrite('documentType')" optionType="button" direction="horizontal" size="small"
-                :options="documentTypeOptions" :props="documentTypeProps">
+                :disabled="judgeWrite('documentType')" optionType="button" direction="horizontal"
+                size="small" :options="documentTypeOptions" :props="documentTypeProps">
               </JnpfRadio>
             </jnpf-form-tip-item>
           </el-col>
@@ -26,16 +26,20 @@
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('returnCargoCode')">
-            <jnpf-form-tip-item label="订单编号" v-if="judgeShow('returnCargoCode')" prop="returnCargoCode">
-              <JnpfInput v-model="dataForm.returnCargoCode" @change="changeData('returnCargoCode', -1)"
-                placeholder="系统自动生成" :disabled="true" readonly :style='{ "width": "100%" }'>
+            <jnpf-form-tip-item label="订单编号" v-if="judgeShow('returnCargoCode')"
+              prop="returnCargoCode">
+              <JnpfInput v-model="dataForm.returnCargoCode"
+                @change="changeData('returnCargoCode', -1)" placeholder="系统自动生成" :disabled="true"
+                readonly :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('preparationTime')">
-            <jnpf-form-tip-item label="制单时间" v-if="judgeShow('preparationTime')" prop="preparationTime">
-              <JnpfOpenData v-model="dataForm.preparationTime" @change="changeData('preparationTime', -1)"
-                placeholder="系统自动生成" :disabled="judgeWrite('preparationTime')" readonly :style='{ "width": "100%" }'
+            <jnpf-form-tip-item label="制单时间" v-if="judgeShow('preparationTime')"
+              prop="preparationTime">
+              <JnpfOpenData v-model="dataForm.preparationTime"
+                @change="changeData('preparationTime', -1)" placeholder="系统自动生成"
+                :disabled="judgeWrite('preparationTime')" readonly :style='{ "width": "100%" }'
                 type="currTime">
               </JnpfOpenData>
             </jnpf-form-tip-item>
@@ -48,21 +52,26 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('businessId')">
             <jnpf-form-tip-item label="采购订单" v-if="judgeShow('businessId')" prop="businessId">
-              <JnpfPopupSelect v-model="dataForm.businessId" @change="getPurchaseOrder" :rowIndex="null"
-                :formData="dataForm" :templateJson="interfaceRes.businessId" placeholder="请选择"
-                :disabled="judgeWrite('businessId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='code' field='businessId' interfaceId="530042614796255877"
-                :pageSize="20" :columnOptions="businessIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+              <JnpfPopupSelect v-model="dataForm.businessId" @change="getPurchaseOrder"
+                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessId"
+                placeholder="请选择" :disabled="judgeWrite('businessId')" propsValue="id"
+                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='code'
+                field='businessId' interfaceId="530042614796255877" :pageSize="20"
+                :columnOptions="businessIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('reservedFields1')">
-            <jnpf-form-tip-item label="业务线" v-if="judgeShow('reservedFields1')" prop="reservedFields1">
-              <JnpfPopupSelect v-model="dataForm.reservedFields1" @change="changeData('reservedFields1', -1)"
-                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.reservedFields1" placeholder="请选择"
-                :disabled="judgeWrite('reservedFields1')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='name' field='reservedFields1' interfaceId="517979330417001669"
-                :pageSize="20" :columnOptions="reservedFields1columnOptions" clearable :style='{ "width": "100%" }'>
+            <jnpf-form-tip-item label="业务线" v-if="judgeShow('reservedFields1')"
+              prop="reservedFields1">
+              <JnpfPopupSelect v-model="dataForm.reservedFields1"
+                @change="changeData('reservedFields1', -1)" :rowIndex="null" :formData="dataForm"
+                :templateJson="interfaceRes.reservedFields1" placeholder="请选择"
+                :disabled="judgeWrite('reservedFields1')" propsValue="id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='name' field='reservedFields1'
+                interfaceId="517979330417001669" :pageSize="20"
+                :columnOptions="reservedFields1columnOptions" clearable
+                :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
@@ -73,29 +82,32 @@
               </div>
               <el-table :data="dataForm.purchaseOrderInfo" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="采购订单" v-if="judgeShow('warehousingproduct-productName')" prop="code">
+                <el-table-column label="采购订单" v-if="judgeShow('warehousingproduct-productName')"
+                  prop="code">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('warehousingproductList-productName')">*</span>采购订单
+                    <span class="required-sign"
+                      v-if="judgeRequired('warehousingproductList-productName')">*</span>采购订单
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.code"
-                      @change="changeData('warehousingproduct-productName', scope.$index)" placeholder="请输入"
+                      @change="changeData('warehousingproduct-productName', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('warehousingproductList') || judgeWrite('warehousingproductList-productName')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="订单类型" v-if="judgeShow('warehousingproductList-inventoryUnitId')"
-                  prop="inventoryUnitId">
+                <el-table-column label="订单类型"
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>订单类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.orderType"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)" placeholder="请选择"
-                      :disabled="true" clearable :style='{ "width": "100%" }' :options="orderTypeOptions"
-                      :props="orderTypeProps">
+                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                      :options="orderTypeOptions" :props="orderTypeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
@@ -114,110 +126,112 @@
                     </JnpfInput>
                   </template>
                 </el-table-column> -->
-                <el-table-column label="关联供应商(二级)" v-if="judgeShow('warehousingproduct-purchaseUnitId')"
-                  prop="purchaseUnitId">
+                <el-table-column label="关联供应商(二级)"
+                  v-if="judgeShow('warehousingproduct-purchaseUnitId')" prop="purchaseUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-purchaseUnitId')">*</span>关联供应商(二级)
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.secondSupplyName"
-                      @change="changeData('warehousingproduct-purchaseUnitId', scope.$index)" placeholder="请输入"
-                      :disabled="true" clearable :style='{ "width": "100%" }'>
+                      @change="changeData('warehousingproduct-purchaseUnitId', scope.$index)"
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="关联供应商(三级)" v-if="judgeShow('warehousingproduct-purchaseUnitId')"
-                  prop="purchaseUnitId">
+                <el-table-column label="关联供应商(三级)"
+                  v-if="judgeShow('warehousingproduct-purchaseUnitId')" prop="purchaseUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-purchaseUnitId')">*</span>关联供应商(三级)
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.thirdSupplyName"
-                      @change="changeData('warehousingproduct-purchaseUnitId', scope.$index)" placeholder="请输入"
-                      :disabled="true" clearable :style='{ "width": "100%" }'>
+                      @change="changeData('warehousingproduct-purchaseUnitId', scope.$index)"
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="关联业务线" v-if="judgeShow('warehousingproduct-purchaseNum')" prop="purchaseNum">
+                <el-table-column label="关联业务线" v-if="judgeShow('warehousingproduct-purchaseNum')"
+                  prop="purchaseNum">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('warehousingproductList-purchaseNum')">*</span>关联业务线
+                    <span class="required-sign"
+                      v-if="judgeRequired('warehousingproductList-purchaseNum')">*</span>关联业务线
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.businessLineName"
-                      @change="changeData('warehousingproduct-purchaseNum', scope.$index)" placeholder="请输入"
-                      :disabled="true" clearable :style='{ "width": "100%" }'>
+                      @change="changeData('warehousingproduct-purchaseNum', scope.$index)"
+                      placeholder="请输入" :disabled="true" clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="业务类型" v-if="judgeShow('warehousingproductList-inventoryUnitId')"
-                  prop="inventoryUnitId">
+                <el-table-column label="业务类型"
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>业务类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.businessOrderType"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)" placeholder="请选择"
-                      :disabled="true" clearable :style='{ "width": "100%" }' :options="businessOrderTypeOptions"
-                      :props="businessOrderTypeProps">
+                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                      :options="businessOrderTypeOptions" :props="businessOrderTypeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="币种" v-if="judgeShow('warehousingproductList-inventoryUnitId')"
-                  prop="inventoryUnitId">
+                <el-table-column label="币种"
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>币种
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.currency"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)" placeholder="请选择"
-                      :disabled="true" clearable :style='{ "width": "100%" }' :options="currencyOptions"
-                      :props="currencyProps">
+                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                      :options="currencyOptions" :props="currencyProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="采购模式" v-if="judgeShow('warehousingproductList-inventoryUnitId')"
-                  prop="inventoryUnitId">
+                <el-table-column label="采购模式"
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>采购模式
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.saleMode"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)" placeholder="请选择"
-                      :disabled="true" clearable :style='{ "width": "100%" }' :options="saleModeOptions"
-                      :props="saleModeProps">
+                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                      :options="saleModeOptions" :props="saleModeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="交货方式" v-if="judgeShow('warehousingproductList-inventoryUnitId')"
-                  prop="inventoryUnitId">
+                <el-table-column label="交货方式"
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>交货方式
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.transactionMode"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)" placeholder="请选择"
-                      :disabled="true" clearable :style='{ "width": "100%" }' :options="transactionModeOptions"
-                      :props="transactionModeProps">
+                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                      :options="transactionModeOptions" :props="transactionModeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="运输方式" v-if="judgeShow('warehousingproductList-inventoryUnitId')"
-                  prop="inventoryUnitId">
+                <el-table-column label="运输方式"
+                  v-if="judgeShow('warehousingproductList-inventoryUnitId')" prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('warehousingproductList-inventoryUnitId')">*</span>运输方式
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.transportMode"
-                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)" placeholder="请选择"
-                      :disabled="true" clearable :style='{ "width": "100%" }' :options="transportModeOptions"
-                      :props="transportModeProps">
+                      @change="changeData('warehousingproductList-inventoryUnitId', scope.$index)"
+                      placeholder="请选择" :disabled="true" clearable :style='{ "width": "100%" }'
+                      :options="transportModeOptions" :props="transportModeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
@@ -232,18 +246,21 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('subjectId')">
             <jnpf-form-tip-item label="供应商名称" v-if="judgeShow('subjectId')" prop="subjectId">
-              <JnpfPopupSelect v-model="dataForm.subjectId" @change="changeData('subjectId', -1)" :rowIndex="null"
-                :formData="dataForm" :templateJson="interfaceRes.subjectId" placeholder="请选择"
-                :disabled="judgeWrite('subjectId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='name' field='subjectId' interfaceId="530001731111617029"
-                :pageSize="20" :columnOptions="subjectIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+              <JnpfPopupSelect v-model="dataForm.subjectId" @change="changeData('subjectId', -1)"
+                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.subjectId"
+                placeholder="请选择" :disabled="judgeWrite('subjectId')" propsValue="id"
+                popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
+                field='subjectId' interfaceId="530001731111617029" :pageSize="20"
+                :columnOptions="subjectIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('shippingAddress')">
-            <jnpf-form-tip-item label="收货地址" v-if="judgeShow('shippingAddress')" prop="shippingAddress">
-              <JnpfInput v-model="dataForm.deliveryAddress" @change="changeData('shippingAddress', -1)"
-                placeholder="请输入" :disabled="judgeWrite('shippingAddress')" clearable :style='{ "width": "100%" }'>
+            <jnpf-form-tip-item label="收货地址" v-if="judgeShow('shippingAddress')"
+              prop="shippingAddress">
+              <JnpfInput v-model="dataForm.deliveryAddress"
+                @change="changeData('shippingAddress', -1)" placeholder="请输入"
+                :disabled="judgeWrite('shippingAddress')" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
@@ -255,31 +272,38 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('enterpriseId')">
             <jnpf-form-tip-item label="机构名称" v-if="judgeShow('enterpriseId')" prop="enterpriseId">
-              <JnpfPopupSelect v-model="dataForm.enterpriseId" @change="changeData('enterpriseId', -1)" :rowIndex="null"
-                :formData="dataForm" :templateJson="interfaceRes.enterpriseId" placeholder="请选择"
-                :disabled="judgeWrite('enterpriseId')" propsValue="f_id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='f_full_name' field='enterpriseId' interfaceId="522729853024209157"
-                :pageSize="20" :columnOptions="enterpriseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+              <JnpfPopupSelect v-model="dataForm.enterpriseId"
+                @change="changeData('enterpriseId', -1)" :rowIndex="null" :formData="dataForm"
+                :templateJson="interfaceRes.enterpriseId" placeholder="请选择"
+                :disabled="judgeWrite('enterpriseId')" propsValue="f_id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='f_full_name'
+                field='enterpriseId' interfaceId="522729853024209157" :pageSize="20"
+                :columnOptions="enterpriseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('warehouseId')">
             <jnpf-form-tip-item label="发货仓库" v-if="judgeShow('warehouseId')" prop="warehouseId">
-              <JnpfPopupSelect v-model="dataForm.warehouseId" @change="changeData('warehouseId', -1)" :rowIndex="null"
-                :formData="dataForm" :templateJson="interfaceRes.warehouseId" placeholder="请选择"
-                :disabled="judgeWrite('warehouseId')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='name' field='warehouseId' interfaceId="522701377537837317"
-                :pageSize="20" :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+              <JnpfPopupSelect v-model="dataForm.warehouseId"
+                @change="changeData('warehouseId', -1)" :rowIndex="null" :formData="dataForm"
+                :templateJson="interfaceRes.warehouseId" placeholder="请选择"
+                :disabled="judgeWrite('warehouseId')" propsValue="id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='name' field='warehouseId'
+                interfaceId="522701377537837317" :pageSize="20"
+                :columnOptions="warehouseIdcolumnOptions" clearable :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('deliveryAddress')">
-            <jnpf-form-tip-item label="发货地址" v-if="judgeShow('deliveryAddress')" prop="deliveryAddress">
-              <JnpfPopupSelect v-model="dataForm.deliveryAddress" @change="changeData('deliveryAddress', -1)"
-                :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deliveryAddress" placeholder="请选择"
-                :disabled="judgeWrite('deliveryAddress')" propsValue="id" popupWidth="800px" popupTitle="选择数据"
-                popupType="dialog" relationField='addressDetail' field='deliveryAddress'
-                interfaceId="522724961224231173" :pageSize="20" :columnOptions="deliveryAddresscolumnOptions" clearable
+            <jnpf-form-tip-item label="发货地址" v-if="judgeShow('deliveryAddress')"
+              prop="deliveryAddress">
+              <JnpfPopupSelect v-model="dataForm.deliveryAddress"
+                @change="changeData('deliveryAddress', -1)" :rowIndex="null" :formData="dataForm"
+                :templateJson="interfaceRes.deliveryAddress" placeholder="请选择"
+                :disabled="judgeWrite('deliveryAddress')" propsValue="id" popupWidth="800px"
+                popupTitle="选择数据" popupType="dialog" relationField='addressDetail'
+                field='deliveryAddress' interfaceId="522724961224231173" :pageSize="20"
+                :columnOptions="deliveryAddresscolumnOptions" clearable
                 :style='{ "width": "100%" }'>
               </JnpfPopupSelect>
             </jnpf-form-tip-item>
@@ -292,9 +316,9 @@
           </el-col>
           <el-col :span="24" v-if="judgeShow('remark')">
             <jnpf-form-tip-item label="备注" v-if="judgeShow('remark')" prop="remark">
-              <JnpfTextarea v-model="dataForm.remark" @change="changeData('remark', -1)" placeholder="请输入"
-                :disabled="judgeWrite('remark')" :style='{ "width": "100%" }' true type="textarea"
-                :autosize='{ "minRows": 4, "maxRows": 4 }'>
+              <JnpfTextarea v-model="dataForm.remark" @change="changeData('remark', -1)"
+                placeholder="请输入" :disabled="judgeWrite('remark')" :style='{ "width": "100%" }' true
+                type="textarea" :autosize='{ "minRows": 4, "maxRows": 4 }'>
               </JnpfTextarea>
             </jnpf-form-tip-item>
           </el-col>
@@ -311,69 +335,79 @@
               </div>
               <el-table :data="dataForm.deliveryVoucherRelationList" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="凭证编号" v-if="judgeShow('deliveryvoucherrelation-voucherId')" prop="voucherId">
+                <el-table-column label="凭证编号" v-if="judgeShow('deliveryvoucherrelation-voucherId')"
+                  prop="voucherId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-voucherId')">*</span>凭证编号
                   </template>
                   <template slot-scope="scope">
-                    <JnpfPopupSelect v-model="scope.row.voucherId" @change="getPurchaseReceiptVoucher"
-                      :rowIndex="scope.$index" :formData="dataForm"
-                      :templateJson="interfaceRes.deliveryvoucherrelationvoucherId" placeholder="请选择"
+                    <JnpfPopupSelect v-model="scope.row.voucherId"
+                      @change="getPurchaseReceiptVoucher" :rowIndex="scope.$index"
+                      :formData="dataForm"
+                      :templateJson="interfaceRes.deliveryvoucherrelationvoucherId"
+                      placeholder="请选择"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-voucherId')"
                       propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='voucherCode' :field="'voucherId' + scope.$index" interfaceId="531790337677461573"
-                      :pageSize="20" :columnOptions="deliveryvoucherrelationvoucherIdcolumnOptions" clearable
+                      relationField='voucherCode' :field="'voucherId' + scope.$index"
+                      interfaceId="531790337677461573" :pageSize="20"
+                      :columnOptions="deliveryvoucherrelationvoucherIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="单据类型" v-if="judgeShow('deliveryvoucherrelation-documentType')"
-                  prop="documentType">
+                <el-table-column label="单据类型"
+                  v-if="judgeShow('deliveryvoucherrelation-documentType')" prop="documentType">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-documentType')">*</span>单据类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.documentType"
-                      @change="changeData('deliveryvoucherrelation-documentType', scope.$index)" placeholder="请选择"
+                      @change="changeData('deliveryvoucherrelation-documentType', scope.$index)"
+                      placeholder="请选择"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-documentType')"
-                      clearable :style='{ "width": "100%" }' :options="deliveryvoucherrelationdocumentTypeOptions"
+                      clearable :style='{ "width": "100%" }'
+                      :options="deliveryvoucherrelationdocumentTypeOptions"
                       :props="deliveryvoucherrelationdocumentTypeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="凭证类型" v-if="judgeShow('deliveryvoucherrelation-voucherType')"
-                  prop="voucherType">
+                <el-table-column label="凭证类型"
+                  v-if="judgeShow('deliveryvoucherrelation-voucherType')" prop="voucherType">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-voucherType')">*</span>凭证类型
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.voucherType"
-                      @change="changeData('deliveryvoucherrelation-voucherType', scope.$index)" placeholder="请选择"
+                      @change="changeData('deliveryvoucherrelation-voucherType', scope.$index)"
+                      placeholder="请选择"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-voucherType')"
-                      clearable :style='{ "width": "100%" }' :options="deliveryvoucherrelationvoucherTypeOptions"
+                      clearable :style='{ "width": "100%" }'
+                      :options="deliveryvoucherrelationvoucherTypeOptions"
                       :props="deliveryvoucherrelationvoucherTypeProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="磅单编号" v-if="judgeShow('deliveryvoucherrelation-poundCode')" prop="poundCode">
+                <el-table-column label="磅单编号" v-if="judgeShow('deliveryvoucherrelation-poundCode')"
+                  prop="poundCode">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-poundCode')">*</span>磅单编号
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.poundCode"
-                      @change="changeData('deliveryvoucherrelation-poundCode', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-poundCode', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-poundCode')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="磅单时间" v-if="judgeShow('deliveryvoucherrelation-poundlistTime')"
-                  prop="poundlistTime">
+                <el-table-column label="磅单时间"
+                  v-if="judgeShow('deliveryvoucherrelation-poundlistTime')" prop="poundlistTime">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-poundlistTime')">*</span>磅单时间
@@ -381,14 +415,15 @@
                   <template slot-scope="scope">
                     <JnpfDatePicker v-model="scope.row.poundlistTime"
                       @change="changeData('deliveryvoucherrelation-poundlistTime', scope.$index)"
-                      :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
-                      placeholder="请选择"
+                      :startTime="dateTime(false, 1, 1, '', '')"
+                      :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-poundlistTime')"
                       clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
                     </JnpfDatePicker>
                   </template>
                 </el-table-column>
-                <el-table-column label="车牌号" v-if="judgeShow('deliveryvoucherrelation-vehicleId')" prop="vehicleId">
+                <el-table-column label="车牌号" v-if="judgeShow('deliveryvoucherrelation-vehicleId')"
+                  prop="vehicleId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-vehicleId')">*</span>车牌号
@@ -400,78 +435,93 @@
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput> -->
                     <JnpfPopupSelect v-model="scope.row.vehicleId"
-                      @change="changeData('vouchervehicle-vehicleId', scope.$index)" :rowIndex="scope.$index"
-                      :formData="dataForm" :templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
-                      :disabled="true" propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='vehicle_number' :field="'vehicleId' + scope.$index"
-                      interfaceId="529920852288864453" :pageSize="20"
-                      :columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                      @change="changeData('vouchervehicle-vehicleId', scope.$index)"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.vouchervehiclevehicleId" placeholder="请选择"
+                      :disabled="true" propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                      popupType="dialog" relationField='vehicle_number'
+                      :field="'vehicleId' + scope.$index" interfaceId="529920852288864453"
+                      :pageSize="20" :columnOptions="vouchervehiclevehicleIdcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="商品名称" v-if="judgeShow('deliveryvoucherrelation-productId')" prop="productId">
+                <el-table-column label="商品名称" v-if="judgeShow('deliveryvoucherrelation-productId')"
+                  prop="productId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-productId')">*</span>商品名称
                   </template>
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.productId"
-                      @change="changeData('deliveryvoucherrelation-productId', scope.$index)" :rowIndex="scope.$index"
-                      :formData="dataForm" :templateJson="interfaceRes.deliveryvoucherrelationproductId"
+                      @change="changeData('deliveryvoucherrelation-productId', scope.$index)"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.deliveryvoucherrelationproductId"
                       placeholder="请选择"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-productId')"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                      :field="'productId' + scope.$index" interfaceId="529919666429100229" :pageSize="20"
+                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='name' :field="'productId' + scope.$index"
+                      interfaceId="529919666429100229" :pageSize="20"
                       :columnOptions="deliveryvoucherrelationproductIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="规格" v-if="judgeShow('deliveryvoucherrelation-spec')" prop="spec">
+                <el-table-column label="规格" v-if="judgeShow('deliveryvoucherrelation-spec')"
+                  prop="spec">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryvoucherrelationList-spec')">*</span>规格
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryvoucherrelationList-spec')">*</span>规格
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.spec"
-                      @change="changeData('deliveryvoucherrelation-spec', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-spec', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-spec')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="单位" v-if="judgeShow('deliveryvoucherrelation-unit')" prop="unit">
+                <el-table-column label="单位" v-if="judgeShow('deliveryvoucherrelation-unit')"
+                  prop="unit">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryvoucherrelationList-unit')">*</span>单位
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryvoucherrelationList-unit')">*</span>单位
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.unit"
-                      @change="changeData('deliveryvoucherrelation-unit', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-unit', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-unit')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="毛重" v-if="judgeShow('deliveryvoucherrelation-grossWeight')" prop="grossWeight">
+                <el-table-column label="毛重" v-if="judgeShow('deliveryvoucherrelation-grossWeight')"
+                  prop="grossWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-grossWeight')">*</span>毛重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.grossWeight"
-                      @change="changeData('deliveryvoucherrelation-grossWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-grossWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-grossWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="皮重" v-if="judgeShow('deliveryvoucherrelation-tareWeight')" prop="tareWeight">
+                <el-table-column label="皮重" v-if="judgeShow('deliveryvoucherrelation-tareWeight')"
+                  prop="tareWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryvoucherrelationList-tareWeight')">*</span>皮重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.tareWeight"
-                      @change="changeData('deliveryvoucherrelation-tareWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-tareWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-tareWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
@@ -485,44 +535,53 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.buckleWeight"
-                      @change="changeData('deliveryvoucherrelation-buckleWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-buckleWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-buckleWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="净重" v-if="judgeShow('deliveryvoucherrelation-netWeight')" prop="netWeight">
+                <el-table-column label="净重" v-if="judgeShow('deliveryvoucherrelation-netWeight')"
+                  prop="netWeight">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryvoucherrelationList-netWeight')">*</span>净重
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryvoucherrelationList-netWeight')">*</span>净重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.netWeight"
-                      @change="changeData('deliveryvoucherrelation-netWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-netWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-netWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" v-if="judgeShow('deliveryvoucherrelation-remark')" prop="remark">
+                <el-table-column label="备注" v-if="judgeShow('deliveryvoucherrelation-remark')"
+                  prop="remark">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryvoucherrelationList-remark')">*</span>备注
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryvoucherrelationList-remark')">*</span>备注
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.remark"
-                      @change="changeData('deliveryvoucherrelation-remark', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryvoucherrelation-remark', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryvoucherrelationList') || judgeWrite('deliveryvoucherrelationList-remark')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('deliveryvoucherrelationList')">
+                <el-table-column label="操作" width="50"
+                  v-if="!judgeWrite('deliveryvoucherrelationList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                      @click="deldeliveryvoucherrelationList(scope.$index)">删除</el-button>
+                      @click="deldeliveryvoucherrelationList(scope)">删除</el-button>
                   </template>
                 </el-table-column>
               </el-table>
-              <div class="table-actions" @click="choiceVoucher()" v-if="!judgeWrite('deliveryvoucherrelationList')">
+              <div class="table-actions" @click="choiceVoucher()"
+                v-if="!judgeWrite('deliveryvoucherrelationList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
               </div>
             </jnpf-form-tip-item>
@@ -534,37 +593,44 @@
               </div>
               <el-table :data="dataForm.deliveryProductRelationList" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="商品名称" v-if="judgeShow('deliveryproductrelation-productId')" prop="productId">
+                <el-table-column label="商品名称" v-if="judgeShow('deliveryproductrelation-productId')"
+                  prop="productId">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-productId')">*</span>商品名称
                   </template>
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.productId"
-                      @change="changeData('deliveryproductrelation-productId', scope.$index)" :rowIndex="scope.$index"
-                      :formData="dataForm" :templateJson="interfaceRes.deliveryproductrelationproductId"
+                      @change="changeData('deliveryproductrelation-productId', scope.$index)"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.deliveryproductrelationproductId"
                       placeholder="请选择"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-productId')"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
-                      :field="'productId' + scope.$index" interfaceId="529919666429100229" :pageSize="20"
+                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='name' :field="'productId' + scope.$index"
+                      interfaceId="529919666429100229" :pageSize="20"
                       :columnOptions="deliveryproductrelationproductIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="规格" v-if="judgeShow('deliveryproductrelation-spec')" prop="spec">
+                <el-table-column label="规格" v-if="judgeShow('deliveryproductrelation-spec')"
+                  prop="spec">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-spec')">*</span>规格
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-spec')">*</span>规格
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.spec"
-                      @change="changeData('deliveryproductrelation-spec', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-spec', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-spec')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="库存单位" v-if="judgeShow('deliveryproductrelation-inventoryUnitId')"
+                <el-table-column label="库存单位"
+                  v-if="judgeShow('deliveryproductrelation-inventoryUnitId')"
                   prop="inventoryUnitId">
                   <template slot="header">
                     <span class="required-sign"
@@ -572,13 +638,15 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.inventoryUnitId"
-                      @change="changeData('deliveryproductrelation-inventoryUnitId', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-inventoryUnitId', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-inventoryUnitId')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="销售单位" v-if="judgeShow('deliveryproductrelation-salesMainUnitId')"
+                <el-table-column label="销售单位"
+                  v-if="judgeShow('deliveryproductrelation-salesMainUnitId')"
                   prop="salesMainUnitId">
                   <template slot="header">
                     <span class="required-sign"
@@ -586,60 +654,70 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.salesMainUnitId"
-                      @change="changeData('deliveryproductrelation-salesMainUnitId', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-salesMainUnitId', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-salesMainUnitId')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="销售数量" v-if="judgeShow('deliveryproductrelation-saleNum')" prop="saleNum">
+                <el-table-column label="销售数量" v-if="judgeShow('deliveryproductrelation-saleNum')"
+                  prop="saleNum">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-saleNum')">*</span>销售数量
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-saleNum')">*</span>销售数量
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.saleNum"
-                      @change="changeData('deliveryproductrelation-saleNum', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-saleNum', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-saleNum')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="退货单位" v-if="judgeShow('deliveryproductrelation-deliveryUnit')"
-                  prop="deliveryUnit">
+                <el-table-column label="退货单位"
+                  v-if="judgeShow('deliveryproductrelation-deliveryUnit')" prop="deliveryUnit">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-deliveryUnit')">*</span>退货单位
                   </template>
                   <template slot-scope="scope">
                     <JnpfSelect v-model="scope.row.deliveryUnit"
-                      @change="changeData('deliveryproductrelation-deliveryUnit', scope.$index)" placeholder="请选择"
+                      @change="changeData('deliveryproductrelation-deliveryUnit', scope.$index)"
+                      placeholder="请选择"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-deliveryUnit')"
-                      clearable :style='{ "width": "100%" }' :options="deliveryproductrelationdeliveryUnitOptions"
+                      clearable :style='{ "width": "100%" }'
+                      :options="deliveryproductrelationdeliveryUnitOptions"
                       :props="deliveryproductrelationdeliveryUnitProps">
                     </JnpfSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="毛重" v-if="judgeShow('deliveryproductrelation-grossWeight')" prop="grossWeight">
+                <el-table-column label="毛重" v-if="judgeShow('deliveryproductrelation-grossWeight')"
+                  prop="grossWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-grossWeight')">*</span>毛重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.grossWeight"
-                      @change="changeData('deliveryproductrelation-grossWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-grossWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-grossWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="皮重" v-if="judgeShow('deliveryproductrelation-tareWeight')" prop="tareWeight">
+                <el-table-column label="皮重" v-if="judgeShow('deliveryproductrelation-tareWeight')"
+                  prop="tareWeight">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-tareWeight')">*</span>皮重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.tareWeight"
-                      @change="changeData('deliveryproductrelation-tareWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-tareWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-tareWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
@@ -653,69 +731,81 @@
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.buckleWeight"
-                      @change="changeData('deliveryproductrelation-buckleWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-buckleWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-buckleWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="净重" v-if="judgeShow('deliveryproductrelation-netWeight')" prop="netWeight">
+                <el-table-column label="净重" v-if="judgeShow('deliveryproductrelation-netWeight')"
+                  prop="netWeight">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-netWeight')">*</span>净重
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-netWeight')">*</span>净重
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.netWeight"
-                      @change="changeData('deliveryproductrelation-netWeight', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-netWeight', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-netWeight')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="货区名称" v-if="judgeShow('deliveryproductrelation-cargoId')" prop="cargoId">
+                <el-table-column label="货区名称" v-if="judgeShow('deliveryproductrelation-cargoId')"
+                  prop="cargoId">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-cargoId')">*</span>货区名称
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-cargoId')">*</span>货区名称
                   </template>
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.cargoId"
-                      @change="changeData('deliveryproductrelation-cargoId', scope.$index)" :rowIndex="scope.$index"
-                      :formData="dataForm" :templateJson="interfaceRes.deliveryproductrelationcargoId" placeholder="请选择"
+                      @change="changeData('deliveryproductrelation-cargoId', scope.$index)"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.deliveryproductrelationcargoId" placeholder="请选择"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-cargoId')"
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='cargo_name'
-                      :field="'cargoId' + scope.$index" interfaceId="530700536261903749" :pageSize="20"
+                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
+                      relationField='cargo_name' :field="'cargoId' + scope.$index"
+                      interfaceId="530700536261903749" :pageSize="20"
                       :columnOptions="deliveryproductrelationcargoIdcolumnOptions" clearable
                       :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
-                <el-table-column label="退货数量" v-if="judgeShow('deliveryproductrelation-deliveryNum')"
-                  prop="deliveryNum">
+                <el-table-column label="退货数量"
+                  v-if="judgeShow('deliveryproductrelation-deliveryNum')" prop="deliveryNum">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-deliveryNum')">*</span>退货数量
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.deliveryNum"
-                      @change="changeData('deliveryproductrelation-deliveryNum', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-deliveryNum', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-deliveryNum')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="批次号" v-if="judgeShow('deliveryproductrelation-batchNo')" prop="batchNo">
+                <el-table-column label="批次号" v-if="judgeShow('deliveryproductrelation-batchNo')"
+                  prop="batchNo">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-batchNo')">*</span>批次号
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-batchNo')">*</span>批次号
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.batchNo"
-                      @change="changeData('deliveryproductrelation-batchNo', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-batchNo', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-batchNo')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
 
-                <el-table-column label="生产日期" v-if="judgeShow('deliveryproductrelation-produceTime')"
-                  prop="produceTime">
+                <el-table-column label="生产日期"
+                  v-if="judgeShow('deliveryproductrelation-produceTime')" prop="produceTime">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-produceTime')">*</span>生产日期
@@ -723,107 +813,119 @@
                   <template slot-scope="scope">
                     <JnpfDatePicker v-model="scope.row.produceTime"
                       @change="changeData('deliveryproductrelation-produceTime', scope.$index)"
-                      :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
-                      placeholder="请选择"
+                      :startTime="dateTime(false, 1, 1, '', '')"
+                      :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-produceTime')"
                       clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
                     </JnpfDatePicker>
                   </template>
                 </el-table-column>
-                <el-table-column label="退货单价" v-if="judgeShow('deliveryproductrelation-returnUnit')" prop="returnUnit">
+                <el-table-column label="退货单价" v-if="judgeShow('deliveryproductrelation-returnUnit')"
+                  prop="returnUnit">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-returnUnit')">*</span>退货单价
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.returnUnit"
-                      @change="changeData('deliveryproductrelation-returnUnit', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-returnUnit', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-returnUnit')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="税率" v-if="judgeShow('deliveryproductrelation-tax')" prop="tax">
+                <el-table-column label="税率" v-if="judgeShow('deliveryproductrelation-tax')"
+                  prop="tax">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-tax')">*</span>税率
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-tax')">*</span>税率
                   </template>
                   <template slot-scope="scope">
-                    <JnpfInput v-model="scope.row.tax" @change="changeData('deliveryproductrelation-tax', scope.$index)"
+                    <JnpfInput v-model="scope.row.tax"
+                      @change="changeData('deliveryproductrelation-tax', scope.$index)"
                       placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-tax')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="含税小计" v-if="judgeShow('deliveryproductrelation-taxCount')" prop="taxCount">
+                <el-table-column label="含税小计" v-if="judgeShow('deliveryproductrelation-taxCount')"
+                  prop="taxCount">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-taxCount')">*</span>含税小计
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.taxCount"
-                      @change="changeData('deliveryproductrelation-taxCount', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-taxCount', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-taxCount')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="不含税单价" v-if="judgeShow('deliveryproductrelation-notTaxPrice')"
-                  prop="notTaxPrice">
+                <el-table-column label="不含税单价"
+                  v-if="judgeShow('deliveryproductrelation-notTaxPrice')" prop="notTaxPrice">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-notTaxPrice')">*</span>不含税单价
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.notTaxPrice"
-                      @change="changeData('deliveryproductrelation-notTaxPrice', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-notTaxPrice', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-notTaxPrice')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="不含税小计" v-if="judgeShow('deliveryproductrelation-notTaxCount')"
-                  prop="notTaxCount">
+                <el-table-column label="不含税小计"
+                  v-if="judgeShow('deliveryproductrelation-notTaxCount')" prop="notTaxCount">
                   <template slot="header">
                     <span class="required-sign"
                       v-if="judgeRequired('deliveryproductrelationList-notTaxCount')">*</span>不含税小计
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.notTaxCount"
-                      @change="changeData('deliveryproductrelation-notTaxCount', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-notTaxCount', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-notTaxCount')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="备注" v-if="judgeShow('deliveryproductrelation-remark')" prop="remark">
+                <el-table-column label="备注" v-if="judgeShow('deliveryproductrelation-remark')"
+                  prop="remark">
                   <template slot="header">
-                    <span class="required-sign" v-if="judgeRequired('deliveryproductrelationList-remark')">*</span>备注
+                    <span class="required-sign"
+                      v-if="judgeRequired('deliveryproductrelationList-remark')">*</span>备注
                   </template>
                   <template slot-scope="scope">
                     <JnpfInput v-model="scope.row.remark"
-                      @change="changeData('deliveryproductrelation-remark', scope.$index)" placeholder="请输入"
+                      @change="changeData('deliveryproductrelation-remark', scope.$index)"
+                      placeholder="请输入"
                       :disabled="judgeWrite('deliveryproductrelationList') || judgeWrite('deliveryproductrelationList-remark')"
                       clearable :style='{ "width": "100%" }'>
                     </JnpfInput>
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="50" v-if="!judgeWrite('deliveryproductrelationList')">
+                <!-- <el-table-column label="操作" width="50" v-if="!judgeWrite('deliveryproductrelationList')">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="JNPF-table-delBtn"
                       @click="deldeliveryproductrelationList(scope.$index)">删除</el-button>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
               </el-table>
-              <div class="table-actions" @click="choiceProduct()" v-if="!judgeWrite('deliveryproductrelationList')">
+              <!-- <div class="table-actions" @click="choiceProduct()" v-if="!judgeWrite('deliveryproductrelationList')">
                 <el-button type="text" icon="el-icon-plus">添加</el-button>
-              </div>
+              </div> -->
             </jnpf-form-tip-item>
           </el-col>
           <!-- 表单结束 -->
         </template>
-        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
-          @select="addForSelect" @close="selectDialogVisible = false" />
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible = false" />
       </el-form>
     </el-row>
     <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
@@ -1149,6 +1251,14 @@ export default {
     },
     //选择凭证弹窗
     choiceVoucher() {
+      if (!this.dataForm.businessId) {
+        this.$message({
+          type: "error",
+          message: "请先选择采购订单",
+          duration: 1500
+        });
+        return;
+      }
       this.voucherBoxVisible = true
       let excludeIdList = [];
       for (let i = 0; i < this.dataForm.deliveryVoucherRelationList.length; i++) {
@@ -1157,7 +1267,7 @@ export default {
       let businessType = '1';
       let documentType = '1';
       this.$nextTick(() => {
-        this.$refs.VoucherBox.init(excludeIdList, businessType, documentType,this.productIdList)
+        this.$refs.VoucherBox.init(excludeIdList, businessType, documentType, this.productIdList)
       })
     },
     initVoucherList(list) {
@@ -1177,7 +1287,8 @@ export default {
           tareWeight: e.tareWeight,
           buckleWeight: e.buckleWeight,
           netWeight: e.netWeight,
-          businessType: '2'
+          businessType: '2',
+          list: e.productWarehouseEntityList,
         }
         this.dataForm.deliveryVoucherRelationList.push(item)
         let productEntity = {}
@@ -1190,7 +1301,18 @@ export default {
           item.businessType = "2"
           productEntity = item
         })
-        this.dataForm.deliveryProductRelationList.push(productEntity)
+        if (this.dataForm.deliveryProductRelationList.length == 0) {
+          this.dataForm.deliveryProductRelationList.push(productEntity);
+        } else {
+          this.dataForm.deliveryProductRelationList.filter(item => {
+            if (item.id == productEntity.id) {
+              item.netWeight = this.jnpf.floatAdd(item.netWeight, productEntity.netWeight)
+            } else {
+              this.dataForm.deliveryProductRelationList.push(productEntity);
+            }
+          }
+          );
+        }
       }
     },
     getPurchaseReceiptVoucher(val, val2) {
@@ -1373,11 +1495,20 @@ export default {
       }
       this.getdeliveryvoucherrelationList(item)
     },
-    deldeliveryvoucherrelationList(index) {
+    deldeliveryvoucherrelationList(scope) {
       this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
         type: 'warning'
       }).then(() => {
-        this.dataForm.deliveryVoucherRelationList.splice(index, 1);
+        var productId = scope.row.list[0].id
+        var productNetWeight = scope.row.list[0].netWeight
+        this.dataForm.deliveryProductRelationList.find((e, index) => {
+          if (e.id == productId && e.netWeight == productNetWeight) {
+            this.dataForm.deliveryProductRelationList.splice(index, 1)
+          } else if (e.id == productId && e.netWeight != productNetWeight) {
+            e.netWeight = this.jnpf.floatSub(e.netWeight, productNetWeight)
+          }
+        })
+        this.dataForm.deliveryVoucherRelationList.splice(scope.$index, 1);
       }).catch(() => {
       });
     },
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
index bea73d93..58ec6fb9 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
@@ -5,8 +5,8 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="单据类型">
-              <JnpfSelect v-model="query.orderType" placeholder="请选择" clearable :options="orderTypeOptions"
-                :props="orderTypeProps">
+              <JnpfSelect v-model="query.orderType" placeholder="请选择" clearable
+                :options="orderTypeOptions" :props="orderTypeProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
@@ -17,29 +17,29 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="配送方式">
-              <JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable :options="deliveryTypeOptions"
-                :props="deliveryTypeProps">
+              <JnpfSelect v-model="query.deliveryType" placeholder="请选择" clearable
+                :options="deliveryTypeOptions" :props="deliveryTypeProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="制单时间">
-                <JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd" startPlaceholder="开始日期"
-                  endPlaceholder="结束日期" />
+                <JnpfDateRangePicker v-model="query.createOrderDate" format="yyyy-MM-dd"
+                  startPlaceholder="开始日期" endPlaceholder="结束日期" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="是否紧急">
-                <JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable :options="urgentOrderOptions"
-                  :props="urgentOrderProps">
+                <JnpfSelect v-model="query.urgentOrder" placeholder="请选择" clearable
+                  :options="urgentOrderOptions" :props="urgentOrderProps">
                 </JnpfSelect>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="状态">
-                <JnpfSelect v-model="query.status" placeholder="请选择" clearable :options="statusOptions"
-                  :props="statusProps" multiple>
+                <JnpfSelect v-model="query.status" placeholder="请选择" clearable
+                  :options="statusOptions" :props="statusProps" multiple>
                 </JnpfSelect>
               </el-form-item>
             </el-col>
@@ -48,7 +48,8 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
+                v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
@@ -61,17 +62,21 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+              @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
+              v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
             </el-button>
             <template v-if="this.deliveryType == '2'">
-              <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="boundCheck()">库存检查
+              <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+                @click="boundCheck()">库存检查
               </el-button>
-              <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="boundLock()">库存锁定
+              <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+                @click="boundLock()">库存锁定
               </el-button>
             </template>
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@@ -84,27 +89,33 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                @click="initData()" />
             </el-tooltip>
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' hasC
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
-          <el-table-column prop="code" label="单据编号" sortable align="center" fixed="left" width="160">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border
+          custom-column>
+          <el-table-column prop="code" label="单据编号" sortable align="center" fixed="left"
+            width="160">
           </el-table-column>
-          <el-table-column prop="subjectName" label="客户名称" sortable align="center" fixed="left" width="200">
+          <el-table-column prop="subjectName" label="客户名称" sortable align="center" fixed="left"
+            width="200">
           </el-table-column>
-          <el-table-column label="单据类型" prop="orderType1" sortable align="center" fixed="left" width="100">
+          <el-table-column label="单据类型" prop="orderType1" sortable align="center" fixed="left"
+            width="100">
           </el-table-column>
-          <el-table-column label="单据状态" prop="saleStatus" sortable align="center" fixed="left" width="100">
+          <el-table-column label="单据状态" prop="saleStatus" sortable align="center" fixed="left"
+            width="100">
           </el-table-column>
           <!-- <template v-if="this.deliveryType != '1'"> -->
-            <el-table-column prop="deliveryType1" label="配送方式" sortable align="center" width="100">
-            </el-table-column>  
+          <el-table-column prop="deliveryType1" label="配送方式" sortable align="center" width="100">
+          </el-table-column>
           <!-- </template> -->
           <!-- <template v-if="this.deliveryType != '1'"> -->
-            <el-table-column prop="saleMode1" label="销售模式" sortable align="center" width="100">
-            </el-table-column>
+          <el-table-column prop="saleMode1" label="销售模式" sortable align="center" width="100">
+          </el-table-column>
           <!-- </template> -->
           <el-table-column prop="purchaseCode" label="关联单据号" sortable align="center" width="160">
           </el-table-column>
@@ -124,38 +135,39 @@
           <el-table-column prop="wareHouseName" label="发货仓库" sortable align="center" width="100">
           </el-table-column>
           <!-- <template v-if="this.deliveryType != '1'"> -->
-            <el-table-column prop="wareHouseName" label="计划销售数量" sortable align="center" width="140">
-            </el-table-column>
+          <el-table-column prop="wareHouseName" label="计划销售数量" sortable align="center" width="140">
+          </el-table-column>
           <!-- </template> -->
           <!-- <template v-if="this.deliveryType != '1'"> -->
-            <el-table-column prop="wareHouseName" label="已发货数量" sortable align="center" width="120">
-            </el-table-column>
+          <el-table-column prop="wareHouseName" label="已发货数量" sortable align="center" width="120">
+          </el-table-column>
           <!-- </template> -->
           <!-- <template v-if="this.deliveryType != '1'"> -->
-            <el-table-column prop="wareHouseName" label="发货次数" sortable align="center" width="100">
-            </el-table-column>
+          <el-table-column prop="wareHouseName" label="发货次数" sortable align="center" width="100">
+          </el-table-column>
           <!-- </template> -->
           <!-- <template v-if="this.deliveryType != '1'"> -->
-            <el-table-column prop="wareHouseName" label="结算方式" sortable align="center" width="100">
-            </el-table-column>
+          <el-table-column prop="wareHouseName" label="结算方式" sortable align="center" width="100">
+          </el-table-column>
           <!-- </template> -->
           <!-- <template v-if="this.deliveryType != '1'"> -->
-            <el-table-column prop="wareHouseName" label="运输方式" sortable align="center" width="100">
-            </el-table-column>
+          <el-table-column prop="wareHouseName" label="运输方式" sortable align="center" width="100">
+          </el-table-column>
           <!-- </template> -->
           <!-- <template v-if="this.deliveryType != '1'"> -->
-            <el-table-column prop="wareHouseName" label="承运类型" sortable align="center" width="100">
-            </el-table-column>
+          <el-table-column prop="wareHouseName" label="承运类型" sortable align="center" width="100">
+          </el-table-column>
           <!-- </template> -->
           <!-- <template v-if="this.deliveryType != '1'"> -->
-            <el-table-column prop="wareHouseName" label="承运商" sortable align="center" width="100">
-            </el-table-column>
+          <el-table-column prop="wareHouseName" label="承运商" sortable align="center" width="100">
+          </el-table-column>
           <!-- </template> -->
           <!-- <template v-if="this.deliveryType != '1'"> -->
-            <el-table-column prop="wareHouseName" label="是否补送" sortable align="center" width="100">
-            </el-table-column>
+          <el-table-column prop="wareHouseName" label="是否补送" sortable align="center" width="100">
+          </el-table-column>
           <!-- </template> -->
-          <el-table-column prop="expectArriveDateStart" label="期望送达" sortable align="center" width="100">
+          <el-table-column prop="expectArriveDateStart" label="期望送达" sortable align="center"
+            width="100">
             <template slot-scope="scope">
               {{ scope.row.expectArriveDateStart | toDate("yyyy-MM-dd") }}
             </template>
@@ -207,26 +219,30 @@
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize" @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
-      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
+      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+      lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{ item.fullName }}
+        <div class="template-item" v-for="item in flowList" :key="item.id"
+          @click="selectFlow(item)">{{ item.fullName }}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
+      @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+      @superQuery="superQuery" />
     <BoundCheck v-if="boundCheckVisible" ref="BoundCheck" @refresh="initData" />
     <BoundLock v-if="boundLockVisible" ref="BoundLock" @refresh="initData" />
   </div>