From 35187d1a0b453a57bd6211d867c8c6e424da9611 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Tue, 25 Apr 2023 11:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=AF=9B=E5=88=A9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SaleorderitemController.java   |   4 +
 .../entity/Salesorder_item0Entity.java        |  13 +
 .../saleorder/mapper/SaleorderitemMapper.java |   2 +
 .../saleorderitem/SaleorderitemInfoVO.java    |   5 +
 .../service/SaleorderitemService.java         |   2 +
 .../impl/SaleorderitemServiceImpl.java        |   6 +
 .../mapper/salesorderitem/SaleorderMapper.xml |  47 +
 .../scm/basicInformation/saleorder/Detail.vue | 992 ++++++++++--------
 8 files changed, 628 insertions(+), 443 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
index c34fae53..87db8202 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
@@ -864,6 +864,10 @@ public class SaleorderitemController {
         if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){
             vo.setCustomerName(customerEntity.getSupplierNm());
         }
+
+        List<Salesorder_item0Entity> poundlistsalor = saleorderitemService.GetPoundlistSaleOrderItemInfo(id);
+        vo.setPoundsalesorderList(poundlistsalor);
+
 //						Map<String,Object> contractCodeMap = new HashMap<>();
 //            vo.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",vo.getContractId(),contractCodeMap));
 //						Map<String,Object> costomerCodeMap = new HashMap<>();
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
index e6ca0270..37a6a85f 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java
@@ -162,6 +162,19 @@ public class Salesorder_item0Entity  {
     @TableField(exist = false)
     private String vehicleName;
 
+    @TableField(exist = false)
+    private String ticketno;
+
+    @TableField(exist = false)
+    private String purchasePrice;
+
+    @TableField(exist = false)
+    private String aprice;
+
+    @TableField(exist = false)
+    private String maoli;
 
+    @TableField(exist = false)
+    private String pricedifference;
 
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java
index e4f928ba..24aa1853 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java
@@ -35,4 +35,6 @@ public interface SaleorderitemMapper extends BaseMapper<SaleorderitemEntity> {
     double querySaleorderNumStatistics(String date);
 
     double querySaleorderAmountStatistics(String date);
+
+    List<Salesorder_item0Entity> queryPoundlistSaleOrderItem(String id);
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java
index 12527978..3fc891df 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java
@@ -5,6 +5,7 @@ package jnpf.saleorder.model.saleorderitem;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import jnpf.poundlist.entity.PoundlistEntity;
+import jnpf.saleorder.entity.Salesorder_item0Entity;
 import jnpf.saleorder.model.saleorderitem.Salesorder_item0Model;
 import jnpf.saleorder.model.saleorderitem.ReceiptoutsoitemModel;
 import jnpf.saleorder.model.saleorderitem.Arinvoices_item0soitemModel;
@@ -119,6 +120,10 @@ public class SaleorderitemInfoVO{
         @JsonProperty("paymentsoitemList")
         private List<PaymentsoitemModel> paymentsoitemList;
 
+
+        @TableField("Salesorder_item0Entity")
+        private List<Salesorder_item0Entity> poundsalesorderList;
+
         /** 合同id**/
         @TableField("contractId")
         private String contractId;
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java
index a0c42d20..998414de 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java
@@ -52,5 +52,7 @@ public interface SaleorderitemService extends IService<SaleorderitemEntity> {
 
     double querySaleorderAmountStatistics(String date);
 
+
+    List<Salesorder_item0Entity> GetPoundlistSaleOrderItemInfo(String id);
     //列表子表数据方法
 }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
index 43ae7cbc..9f418a35 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
@@ -587,6 +587,12 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
         return saleorderitemMapper.querySaleorderAmountStatistics(date);
     }
 
+    @Override
+    public List<Salesorder_item0Entity> GetPoundlistSaleOrderItemInfo(String id) {
+        return saleorderitemMapper.queryPoundlistSaleOrderItem(id);
+    }
+
+
     //列表子表数据方法
 
 
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml
index 0eca1966..f2c59e98 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml
@@ -117,6 +117,53 @@ FROM
 	        AND a.sales_order_id = #{id}
     </select>
 
+    <select id="queryPoundlistSaleOrderItem" resultType="jnpf.saleorder.entity.Salesorder_item0Entity">
+
+SELECT
+ticketno,
+d.item_name,
+case
+a.pound_type
+when 0 then '贸易'
+when 1 then '自加工'
+when 2 then '委外'
+when 3 then '倒运'
+else null
+end as pound_type,
+a.settlement,
+ROUND(e.price/( 1+( CASE e.rate WHEN 0 THEN 0.13 WHEN 1 THEN 0.09 WHEN 2 THEN 0.06 WHEN 3 THEN 0.05 WHEN 4 THEN 0.03 ELSE 0.00 END )),2) AS purchase_price,
+-- ROUND(e.price/( 1+( CASE e.rate WHEN 0 THEN 0.13 WHEN 1 THEN 0.09 WHEN 2 THEN 0.06 WHEN 3 THEN 0.05 WHEN 4 THEN 0.03 ELSE 0.00 END ))*a.settlement,2) AS aprice,
+e.not_amount AS aprice,
+-- ROUND(purchase_price*a.settlement,2) AS  aprice,
+ROUND(b.unit_price/( 1+( CASE b.rate WHEN 0 THEN 0.13 WHEN 1 THEN 0.09 WHEN 2 THEN 0.06 WHEN 3 THEN 0.05 WHEN 4 THEN 0.03 ELSE 0.00 END )),2) AS unit_price,
+-- b.unit_price AS  unit_price,
+-- b.price AS price,
+b.no_price AS price,
+
+-- b.no_price-ROUND(purchase_price*a.settlement,2) AS maoli1,
+b.no_price-e.not_amount AS maoli,
+-- (b.no_price-ROUND(purchase_price*a.settlement,2))/a.settlement AS pricedifference,
+ROUND((b.no_price-e.not_amount)/a.settlement,2) AS pricedifference,
+case
+a.advance
+when 0 then '否'
+when 1 then '是'
+else null
+end as advance
+
+FROM
+jg_poundlist a
+LEFT JOIN jg_salesorder_item0 b ON a.id=b.poundlist_id AND b.delete_mark='0'
+LEFT JOIN jg_vehicle c ON a.vehicle_id=c.id AND c.delete_mark='0'
+LEFT JOIN jg_material d ON a.material_id=d.id AND d.delete_mark='0'
+LEFT JOIN jg_purchaseorder_item0 e ON a.id=e.poundlist_id AND e.delete_mark='0'
+WHERE
+1=1
+AND a.delete_mark='0'
+AND
+b.sales_order_id=#{id}
+    </select>
+
     <select id="querySaleorderNumStatistics" resultType="Double">
         select IFNULL(convert(SUM(num),decimal(15,2)), 0) from jg_salesorder where DATE_FORMAT(creator_time,'%Y-%m-%d') = #{date} and (status = '2' OR status = '3')
     </select>
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Detail.vue b/SC-web/src/views/scm/basicInformation/saleorder/Detail.vue
index a34f43fc..268172e0 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/Detail.vue
@@ -18,14 +18,14 @@
           <el-col :span="8">
             <el-form-item label="合同名称"
                           prop="contractId">
-<!--              <popupSelect v-model="dataForm.contractId"
-                           placeholder="请选择" clearable field="contractCode" interfaceId="391146878474963333"
-                           :columnOptions="contractCodecolumnOptions" propsValue="id" relationField="contract_name"
-                           popupType="dialog"
-                           popupTitle="选择数据" popupWidth="800px" @change="contractSelect" disabled
-              >
+              <!--              <popupSelect v-model="dataForm.contractId"
+                                         placeholder="请选择" clearable field="contractCode" interfaceId="391146878474963333"
+                                         :columnOptions="contractCodecolumnOptions" propsValue="id" relationField="contract_name"
+                                         popupType="dialog"
+                                         popupTitle="选择数据" popupWidth="800px" @change="contractSelect" disabled
+                            >
 
-              </popupSelect>-->
+                            </popupSelect>-->
               <el-input v-model="dataForm.contractName"
                         placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
 
@@ -35,13 +35,13 @@
           <el-col :span="8">
             <el-form-item label="客户名称"
                           prop="customerId">
-<!--              <popupSelect v-model="dataForm.customerId"
-                           placeholder="请选择" clearable field="costomerCode" interfaceId="398016916830126469"
-                           :columnOptions="costomerCodecolumnOptions" propsValue="id" relationField="supplier_nm"
-                           popupType="dialog"
-                           popupTitle="选择数据" popupWidth="800px" disabled
-              >
-              </popupSelect>-->
+              <!--              <popupSelect v-model="dataForm.customerId"
+                                         placeholder="请选择" clearable field="costomerCode" interfaceId="398016916830126469"
+                                         :columnOptions="costomerCodecolumnOptions" propsValue="id" relationField="supplier_nm"
+                                         popupType="dialog"
+                                         popupTitle="选择数据" popupWidth="800px" disabled
+                            >
+                            </popupSelect>-->
               <el-input v-model="dataForm.customerName"
                         placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
 
@@ -145,15 +145,15 @@
                       <el-table-column type="index" width="50" label="序号" align="center"/>
                       <el-table-column prop="vehicleId" label="车号" align="center" width="130">
                         <template slot-scope="scope">
-<!--                          <popupSelect v-model="scope.row.vehicleId"
-                                       placeholder="请选择" clearable :field="'vehicleId'+scope.$index"
-                                       interfaceId="398732963950472005"
-                                       :bissId="dataForm.contractId"
-                                       :columnOptions="salesorder_item0vehicleIdcolumnOptions" propsValue="id"
-                                       relationField="ticketno"
-                                       popupType="dialog" :excludeFields="excludeFields"
-                                       popupWidth="800px" @change="poundInfoSelect" disabled>
-                          </popupSelect>-->
+                          <!--                          <popupSelect v-model="scope.row.vehicleId"
+                                                                 placeholder="请选择" clearable :field="'vehicleId'+scope.$index"
+                                                                 interfaceId="398732963950472005"
+                                                                 :bissId="dataForm.contractId"
+                                                                 :columnOptions="salesorder_item0vehicleIdcolumnOptions" propsValue="id"
+                                                                 relationField="ticketno"
+                                                                 popupType="dialog" :excludeFields="excludeFields"
+                                                                 popupWidth="800px" @change="poundInfoSelect" disabled>
+                                                    </popupSelect>-->
                           <el-input v-model="scope.row.vehicleName"
                                     placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
                           </el-input>
@@ -161,14 +161,14 @@
                       </el-table-column>
                       <el-table-column prop="materialId" label="物料名称" align="center" width="180">
                         <template slot-scope="scope">
-<!--                          <popupSelect v-model="scope.row.materialId"
-                                       placeholder="请选择" clearable :field="'materialId'+scope.$index"
-                                       interfaceId="398108817931470725"
-                                       :columnOptions="salesorder_item0materialIdcolumnOptions" propsValue="id"
-                                       relationField="item_name" popupType="dialog"
-                                       popupWidth="800px" disabled
-                          >
-                          </popupSelect>-->
+                          <!--                          <popupSelect v-model="scope.row.materialId"
+                                                                 placeholder="请选择" clearable :field="'materialId'+scope.$index"
+                                                                 interfaceId="398108817931470725"
+                                                                 :columnOptions="salesorder_item0materialIdcolumnOptions" propsValue="id"
+                                                                 relationField="item_name" popupType="dialog"
+                                                                 popupWidth="800px" disabled
+                                                    >
+                                                    </popupSelect>-->
                           <el-input v-model="scope.row.materialName"
                                     placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
                           </el-input>
@@ -226,7 +226,8 @@
                       <el-table-column prop="rate" label="税率 " align="center" width="130">
                         <template slot-scope="scope">
                           <el-select v-model="scope.row.rate"
-                                     placeholder="请选择" clearable :style='{"width":"100%"}' @change="computeNoPrice" disabled>
+                                     placeholder="请选择" clearable :style='{"width":"100%"}' @change="computeNoPrice"
+                                     disabled>
                             <el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName"
                                        :value="item.id" :disabled="item.disabled"></el-option>
                           </el-select>
@@ -253,414 +254,518 @@
                           </el-input>
                         </template>
                       </el-table-column>
-<!--                      <el-table-column label="操作" width="50">
+                      <!--                      <el-table-column label="操作" width="50">
+                                              <template slot-scope="scope">
+                                                <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                                                           @click="delsalesorder_item0List(scope.$index)">删除
+                                                </el-button>
+                                              </template>
+                                            </el-table-column> -->
+                    </el-table>
+                    <!--                    <div class="table-actions" @click="addsalesorder_item0List()">
+                                          <el-button type="text" icon="el-icon-plus">添加</el-button>
+                                        </div> -->
+                  </el-form-item>
+                </el-col>
+              </el-tab-pane>
+              <el-tab-pane label="发货信息">
+                <el-col :span="24">
+                  <el-form-item label-width="0">
+                    <div class="JNPF-common-title">
+                      <h2></h2>
+                    </div>
+                    <el-table :data="dataForm.receiptoutsoitemList" size='mini'>
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
+                      <el-table-column prop="documentNo" label="出库单号" align="center" width="220">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.documentNo"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="issueDate" label="出库日期 " align="center" width="130">
+                        <template slot-scope="scope">
+                          <el-date-picker v-model="scope.row.issueDate"
+                                          placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
+                                          format="yyyy-MM-dd" value-format="timestamp" disabled>
+                          </el-date-picker>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="vehicleName" label="车牌号" align="center" width="130">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.vehicleName"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="materialName" label="物料名称" align="center" width="180">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.materialName"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="areaName" label="库区名称" align="center" width="130">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.areaName"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="name" label="仓库名称" align="center" width="130">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.name"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="deliveryNum" label="出库重量" align="center" width="130">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.deliveryNum"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="unit" label="计量单位" align="center" width="130">
+                        <template slot-scope="scope">
+                          <el-select v-model="scope.row.unit"
+                                     placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
+                            <el-option v-for="(item, index) in jnpf_jg_collection_jnpf_collectionCountOptions"
+                                       :key="index" :label="item.fullName" :value="item.id"
+                                       :disabled="item.disabled"></el-option>
+                          </el-select>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="price" label="单价" align="center" width="130">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.price"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="rate" label="税率" align="center" width="130">
+                        <template slot-scope="scope">
+                          <el-select v-model="scope.row.rate"
+                                     placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
+                            <el-option v-for="(item, index) in deleteUserNameOptions" :key="index"
+                                       :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
+                          </el-select>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="amount" label="金额" align="center" width="130">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.amount"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="rateAmount" label="税额" align="center" width="130">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.rateAmount"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="batchNo" label="批次号" align="center" width="130">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.batchNo"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="poundType" label="磅单类型" align="center" width="130">
+                        <template slot-scope="scope">
+                          <el-select v-model="scope.row.poundType"
+                                     placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
+                            <el-option v-for="(item, index) in customerNameOptions" :key="index" :label="item.fullName"
+                                       :value="item.id" :disabled="item.disabled"></el-option>
+                          </el-select>
+                        </template>
+                      </el-table-column>
+                      <!--                 <el-table-column label="操作" width="50" >
+                                           <template slot-scope="scope">
+                                               <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delreceiptoutsoitemList(scope.$index)">删除</el-button>
+                                           </template>
+                                       </el-table-column> -->
+                    </el-table>
+                    <!--                 <div class="table-actions" @click="addreceiptoutsoitemList()">
+                                         <el-button type="text" icon="el-icon-plus">添加</el-button>
+                                     </div> -->
+                  </el-form-item>
+                </el-col>
+              </el-tab-pane>
+              <el-tab-pane label="发票信息">
+                <el-col :span="24">
+                  <el-form-item label-width="0">
+                    <div class="JNPF-common-title">
+                      <h2></h2>
+                    </div>
+                    <el-table :data="dataForm.arinvoices_item0soitemList" size='mini'>
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
+                      <el-table-column prop="invoiceCode" label="发票代码">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.invoiceCode"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="invoiceNo" label="发票号码">
                         <template slot-scope="scope">
-                          <el-button size="mini" type="text" class="JNPF-table-delBtn"
-                                     @click="delsalesorder_item0List(scope.$index)">删除
-                          </el-button>
+                          <el-input v-model="scope.row.invoiceNo"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
                         </template>
-                      </el-table-column> -->
+                      </el-table-column>
+                      <el-table-column prop="invoiceQuantity" label="发票数量" align="center" width="130">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.invoiceQuantity"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="involceAmount" label="发票金额">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.involceAmount"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="taxRate" label="税率 ">
+                        <template slot-scope="scope">
+                          <el-select v-model="scope.row.taxRate"
+                                     placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
+                            <el-option v-for="(item, index) in taxRateOptions" :key="index" :label="item.fullName"
+                                       :value="item.id" :disabled="item.disabled"></el-option>
+                          </el-select>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="amountNotTax" label="不含税金额">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.amountNotTax"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="taxAmount" label="税额">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.taxAmount"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="invoiceStatus" label="发票状态 ">
+                        <template slot-scope="scope">
+                          <el-select v-model="scope.row.invoiceStatus"
+                                     placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
+                            <el-option v-for="(item, index) in invoiceStatusOptions" :key="index" :label="item.fullName"
+                                       :value="item.id" :disabled="item.disabled"></el-option>
+                          </el-select>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="invoiceDate" label="开票日期">
+                        <template slot-scope="scope">
+                          <el-date-picker v-model="scope.row.invoiceDate"
+                                          placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
+                                          format="yyyy-MM-dd" value-format="timestamp" disabled>
+                          </el-date-picker>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="creatorUserName" label="开票人">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.creatorUserName"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="attachMent" label="发票文件">
+                        <template slot-scope="scope">
+                          <JNPF-UploadFz v-model="scope.row.attachMent"
+                                         :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled>
+                          </JNPF-UploadFz>
+                        </template>
+                      </el-table-column>
+                      <!--                 <el-table-column label="操作" width="50" >
+                                           <template slot-scope="scope">
+                                               <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delarinvoices_item0soitemList(scope.$index)">删除</el-button>
+                                           </template>
+                                       </el-table-column> -->
+                    </el-table>
+                    <!--                 <div class="table-actions" @click="addarinvoices_item0soitemList()">
+                                         <el-button type="text" icon="el-icon-plus">添加</el-button>
+                                     </div> -->
+                  </el-form-item>
+                </el-col>
+              </el-tab-pane>
+
+              <el-tab-pane label="毛利信息">
+                <el-col :span="24">
+                  <el-form-item label-width="0">
+                    <div class="JNPF-common-title">
+                      <h2></h2>
+                    </div>
+                    <el-table :data="dataForm.poundsalesorderList" size='mini'>
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
+                      <el-table-column prop="ticketno" label="车号">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.ticketno"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="materialName" label="物料名称">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.materialName"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="poundType" label="类型">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.poundType"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="settlement" label="结算重量">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.settlement"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="purchasePrice" label="不含税采购单价">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.purchasePrice"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="aprice" label="不含税采购金额">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.aprice"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="unitPrice" label="不含税销售单价">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.unitPrice"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="price" label="不含税销售金额">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.price"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="maoli" label="不含税毛利">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.maoli"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="pricedifference" label="不含税吨差价">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.pricedifference"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="advance" label="是否垫资">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.advance"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                  </el-form-item>
+                </el-col>
+              </el-tab-pane>
+
+              <el-tab-pane label="收款信息">
+                <el-col :span="24">
+                  <el-form-item label-width="0">
+                    <div class="JNPF-common-title">
+                      <h2></h2>
+                    </div>
+                    <el-table :data="dataForm.collectionsoitemList" size='mini'>
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
+                      <el-table-column prop="documentNo" label="收款单号">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.documentNo"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="businessDate" label="收款时间">
+                        <template slot-scope="scope">
+                          <el-date-picker v-model="scope.row.businessDate"
+                                          placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
+                                          format="yyyy-MM-dd" value-format="timestamp" disabled>
+                          </el-date-picker>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="amountCollected" label="收款金额">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.amountCollected"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="paymentType" label="收款方式">
+                        <template slot-scope="scope">
+                          <el-select v-model="scope.row.paymentType"
+                                     placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
+                            <el-option v-for="(item, index) in settlementTypeOptions" :key="index"
+                                       :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
+                          </el-select>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="remark" label="备注">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.remark"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="creatorUserName" label="创建人">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.creatorUserName"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <!--                 <el-table-column label="操作" width="50" >
+                                           <template slot-scope="scope">
+                                               <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcollectionsoitemList(scope.$index)">删除</el-button>
+                                           </template>
+                                       </el-table-column> -->
+                    </el-table>
+                    <!--                <div class="table-actions" @click="addcollectionsoitemList()">
+                                        <el-button type="text" icon="el-icon-plus">添加</el-button>
+                                    </div> -->
+                  </el-form-item>
+                </el-col>
+              </el-tab-pane>
+              <el-tab-pane label="退货信息">
+                <el-col :span="24">
+                  <el-form-item label-width="0">
+                    <div class="JNPF-common-title">
+                      <h2></h2>
+                    </div>
+                    <el-table :data="dataForm.salesbacksoitemList" size='mini'>
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
+                      <el-table-column prop="documentNo" label="退货单号">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.documentNo"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="creatorTime" label="退货日期">
+                        <template slot-scope="scope">
+                          <el-date-picker v-model="scope.row.creatorTime"
+                                          placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
+                                          format="yyyy-MM-dd" value-format="timestamp" disabled>
+                          </el-date-picker>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="refundNum" label="退货数量">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.refundNum"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="refundAmount" label="退款金额">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.refundAmount"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="creatorUserName" label="退货人">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.creatorUserName"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <!--                 <el-table-column label="操作" width="50" >
+                                           <template slot-scope="scope">
+                                               <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delsalesbacksoitemList(scope.$index)">删除</el-button>
+                                           </template>
+                                       </el-table-column> -->
+                    </el-table>
+                    <!--                 <div class="table-actions" @click="addsalesbacksoitemList()">
+                                         <el-button type="text" icon="el-icon-plus">添加</el-button>
+                                     </div> -->
+                  </el-form-item>
+                </el-col>
+              </el-tab-pane>
+              <el-tab-pane label="退款信息">
+                <el-col :span="24">
+                  <el-form-item label-width="0">
+                    <div class="JNPF-common-title">
+                      <h2></h2>
+                    </div>
+                    <el-table :data="dataForm.paymentsoitemList" size='mini'>
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
+                      <el-table-column prop="documentno" label="付款单号">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.documentno"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="duedate" label="付款日期">
+                        <template slot-scope="scope">
+                          <el-date-picker v-model="scope.row.duedate"
+                                          placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
+                                          format="yyyy-MM-dd" value-format="timestamp" disabled>
+                          </el-date-picker>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="paymentamount" label="付款金额">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.paymentamount"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="settlementtype" label="付款方式">
+                        <template slot-scope="scope">
+                          <el-select v-model="scope.row.settlementtype"
+                                     placeholder="请选择" clearable :style='{"width":"100%"}' disabled>
+                            <el-option v-for="(item, index) in settlementtypeOptions" :key="index"
+                                       :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
+                          </el-select>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="remark" label="备注">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.remark"
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <!--                 <el-table-column label="操作" width="50" >
+                                           <template slot-scope="scope">
+                                               <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delpaymentsoitemList(scope.$index)">删除</el-button>
+                                           </template>
+                                       </el-table-column> -->
                     </el-table>
-<!--                    <div class="table-actions" @click="addsalesorder_item0List()">
-                      <el-button type="text" icon="el-icon-plus">添加</el-button>
-                    </div> -->
+                    <!--                 <div class="table-actions" @click="addpaymentsoitemList()">
+                                         <el-button type="text" icon="el-icon-plus">添加</el-button>
+                                     </div> -->
                   </el-form-item>
                 </el-col>
               </el-tab-pane>
-                          <el-tab-pane  label="发货信息">
-                 <el-col :span="24"  >
-                 <el-form-item label-width="0">
-                         <div class="JNPF-common-title">
-                             <h2></h2>
-                         </div>
-                 <el-table :data="dataForm.receiptoutsoitemList" size='mini'   >
-                     <el-table-column type="index" width="50" label="序号" align="center" />
-                         <el-table-column prop="documentNo" label="出库单号" align="center" width="220">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.documentNo"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="issueDate" label="出库日期 " align="center" width="130">
-                             <template slot-scope="scope">
-                                 <el-date-picker   v-model="scope.row.issueDate"
-               placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp"  disabled>
-                             </el-date-picker>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="vehicleName" label="车牌号" align="center" width="130">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.vehicleName"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="materialName" label="物料名称" align="center" width="180">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.materialName"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="areaName" label="库区名称" align="center" width="130">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.areaName"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="name" label="仓库名称" align="center" width="130">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.name"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="deliveryNum" label="出库重量" align="center" width="130">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.deliveryNum"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="unit" label="计量单位" align="center" width="130">
-                             <template slot-scope="scope">
-                                 <el-select   v-model="scope.row.unit"
-              placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
-                                         <el-option v-for="(item, index) in jnpf_jg_collection_jnpf_collectionCountOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-                             </el-select>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="price" label="单价" align="center" width="130">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.price"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="rate" label="税率" align="center" width="130">
-                             <template slot-scope="scope">
-                                 <el-select   v-model="scope.row.rate"
-              placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
-                                         <el-option v-for="(item, index) in deleteUserNameOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-                             </el-select>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="amount" label="金额" align="center" width="130">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.amount"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="rateAmount" label="税额" align="center" width="130">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.rateAmount"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="batchNo" label="批次号" align="center" width="130">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.batchNo"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="poundType" label="磅单类型" align="center" width="130">
-                             <template slot-scope="scope">
-                                 <el-select   v-model="scope.row.poundType"
-              placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
-                                         <el-option v-for="(item, index) in customerNameOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-                             </el-select>
-                         </template>
-                     </el-table-column>
-<!--                 <el-table-column label="操作" width="50" >
-                     <template slot-scope="scope">
-                         <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delreceiptoutsoitemList(scope.$index)">删除</el-button>
-                     </template>
-                 </el-table-column> -->
-                 </el-table>
-<!--                 <div class="table-actions" @click="addreceiptoutsoitemList()">
-                     <el-button type="text" icon="el-icon-plus">添加</el-button>
-                 </div> -->
-                 </el-form-item>
-                 </el-col>
-                         </el-tab-pane >
-                             <el-tab-pane  label="发票信息">
-                 <el-col :span="24"  >
-                 <el-form-item label-width="0">
-                         <div class="JNPF-common-title">
-                             <h2></h2>
-                         </div>
-                 <el-table :data="dataForm.arinvoices_item0soitemList" size='mini'   >
-                     <el-table-column type="index" width="50" label="序号" align="center" />
-                     <el-table-column prop="invoiceCode" label="发票代码">
-                                    <template slot-scope="scope">
-                                        <el-input   v-model="scope.row.invoiceCode"
-                     placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                                    </el-input>
-                                </template>
-                            </el-table-column>
-                         <el-table-column prop="invoiceNo" label="发票号码">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.invoiceNo"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                     <el-table-column prop="invoiceQuantity" label="发票数量" align="center" width="130">
-                                    <template slot-scope="scope">
-                                        <el-input   v-model="scope.row.invoiceQuantity"
-                     placeholder="请输入"  clearable  :style='{"width":"100%"}'  disabled>
-                                    </el-input>
-                                </template>
-                            </el-table-column>
-                         <el-table-column prop="involceAmount" label="发票金额">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.involceAmount"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="taxRate" label="税率 ">
-                             <template slot-scope="scope">
-                                 <el-select   v-model="scope.row.taxRate"
-              placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
-                                         <el-option v-for="(item, index) in taxRateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-                             </el-select>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="amountNotTax" label="不含税金额">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.amountNotTax"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="taxAmount" label="税额">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.taxAmount"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="invoiceStatus" label="发票状态 ">
-                             <template slot-scope="scope">
-                                 <el-select   v-model="scope.row.invoiceStatus"
-              placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
-                                         <el-option v-for="(item, index) in invoiceStatusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-                             </el-select>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="invoiceDate" label="开票日期">
-                             <template slot-scope="scope">
-                                 <el-date-picker   v-model="scope.row.invoiceDate"
-              placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" disabled >
-                             </el-date-picker>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="creatorUserName" label="开票人">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.creatorUserName"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="attachMent" label="发票文件">
-                             <template slot-scope="scope">
-                                 <JNPF-UploadFz   v-model="scope.row.attachMent"
-              :fileSize="5"    sizeUnit="MB"  :limit="9"  buttonText="点击上传" disabled>
-                             </JNPF-UploadFz>
-                         </template>
-                     </el-table-column>
-<!--                 <el-table-column label="操作" width="50" >
-                     <template slot-scope="scope">
-                         <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delarinvoices_item0soitemList(scope.$index)">删除</el-button>
-                     </template>
-                 </el-table-column> -->
-                 </el-table>
-<!--                 <div class="table-actions" @click="addarinvoices_item0soitemList()">
-                     <el-button type="text" icon="el-icon-plus">添加</el-button>
-                 </div> -->
-                 </el-form-item>
-                 </el-col>
-                         </el-tab-pane >
-                             <el-tab-pane  label="收款信息">
-                 <el-col :span="24"  >
-                 <el-form-item label-width="0">
-                         <div class="JNPF-common-title">
-                             <h2></h2>
-                         </div>
-                 <el-table :data="dataForm.collectionsoitemList" size='mini'   >
-                     <el-table-column type="index" width="50" label="序号" align="center" />
-                         <el-table-column prop="documentNo" label="收款单号">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.documentNo"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="businessDate" label="收款时间">
-                             <template slot-scope="scope">
-                                 <el-date-picker   v-model="scope.row.businessDate"
-              placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" disabled>
-                             </el-date-picker>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="amountCollected" label="收款金额">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.amountCollected"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="paymentType" label="收款方式">
-                             <template slot-scope="scope">
-                                 <el-select   v-model="scope.row.paymentType"
-              placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
-                                         <el-option v-for="(item, index) in settlementTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-                             </el-select>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="remark" label="备注">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.remark"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="creatorUserName" label="创建人">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.creatorUserName"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-<!--                 <el-table-column label="操作" width="50" >
-                     <template slot-scope="scope">
-                         <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcollectionsoitemList(scope.$index)">删除</el-button>
-                     </template>
-                 </el-table-column> -->
-                 </el-table>
- <!--                <div class="table-actions" @click="addcollectionsoitemList()">
-                     <el-button type="text" icon="el-icon-plus">添加</el-button>
-                 </div> -->
-                 </el-form-item>
-                 </el-col>
-                         </el-tab-pane >
-                             <el-tab-pane  label="退货信息">
-                 <el-col :span="24"  >
-                 <el-form-item label-width="0">
-                         <div class="JNPF-common-title">
-                             <h2></h2>
-                         </div>
-                 <el-table :data="dataForm.salesbacksoitemList" size='mini'   >
-                     <el-table-column type="index" width="50" label="序号" align="center" />
-                         <el-table-column prop="documentNo" label="退货单号">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.documentNo"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="creatorTime" label="退货日期">
-                             <template slot-scope="scope">
-                                 <el-date-picker   v-model="scope.row.creatorTime"
-              placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" disabled>
-                             </el-date-picker>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="refundNum" label="退货数量">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.refundNum"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="refundAmount" label="退款金额">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.refundAmount"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="creatorUserName" label="退货人">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.creatorUserName"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-<!--                 <el-table-column label="操作" width="50" >
-                     <template slot-scope="scope">
-                         <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delsalesbacksoitemList(scope.$index)">删除</el-button>
-                     </template>
-                 </el-table-column> -->
-                 </el-table>
-<!--                 <div class="table-actions" @click="addsalesbacksoitemList()">
-                     <el-button type="text" icon="el-icon-plus">添加</el-button>
-                 </div> -->
-                 </el-form-item>
-                 </el-col>
-                         </el-tab-pane >
-                             <el-tab-pane  label="退款信息">
-                 <el-col :span="24"  >
-                 <el-form-item label-width="0">
-                         <div class="JNPF-common-title">
-                             <h2></h2>
-                         </div>
-                 <el-table :data="dataForm.paymentsoitemList" size='mini'   >
-                     <el-table-column type="index" width="50" label="序号" align="center" />
-                         <el-table-column prop="documentno" label="付款单号">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.documentno"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="duedate" label="付款日期">
-                             <template slot-scope="scope">
-                                 <el-date-picker   v-model="scope.row.duedate"
-              placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" disabled>
-                             </el-date-picker>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="paymentamount" label="付款金额">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.paymentamount"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="settlementtype" label="付款方式">
-                             <template slot-scope="scope">
-                                 <el-select   v-model="scope.row.settlementtype"
-              placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
-                                         <el-option v-for="(item, index) in settlementtypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-                             </el-select>
-                         </template>
-                     </el-table-column>
-                         <el-table-column prop="remark" label="备注">
-                             <template slot-scope="scope">
-                                 <el-input   v-model="scope.row.remark"
-              placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
-                             </el-input>
-                         </template>
-                     </el-table-column>
-<!--                 <el-table-column label="操作" width="50" >
-                     <template slot-scope="scope">
-                         <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delpaymentsoitemList(scope.$index)">删除</el-button>
-                     </template>
-                 </el-table-column> -->
-                 </el-table>
-<!--                 <div class="table-actions" @click="addpaymentsoitemList()">
-                     <el-button type="text" icon="el-icon-plus">添加</el-button>
-                 </div> -->
-                 </el-form-item>
-                 </el-col>
-                         </el-tab-pane >
             </el-tabs>
           </el-col>
         </template>
@@ -668,7 +773,7 @@
     </el-row>
     <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false"> 取 消</el-button>
-        <!-- <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button> -->
+      <!-- <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button> -->
     </span>
   </el-dialog>
 </template>
@@ -716,6 +821,7 @@
           collectionsoitemList: [],
           salesbacksoitemList: [],
           paymentsoitemList: [],
+          poundsalesorderList:[],
         },
         activemtmitd: '0',
         rules:
@@ -820,11 +926,11 @@
               })
               return
             }
-            item.price = this.jnpf.floatMul(item.unitPrice,item.settlement);//子表金额
+            item.price = this.jnpf.floatMul(item.unitPrice, item.settlement);//子表金额
             debugger
             this.taxRateOptions.forEach((item2) => {
               if (item2.id == row.rate) {
-                item.noPrice = this.jnpf.floatDiv(this.jnpf.floatMul(item.price,(this.jnpf.floatSub(100,item2.fullName))), 100);//子表不含税金额
+                item.noPrice = this.jnpf.floatDiv(this.jnpf.floatMul(item.price, (this.jnpf.floatSub(100, item2.fullName))), 100);//子表不含税金额
               }
             });
             // let params = {}
@@ -843,23 +949,23 @@
             // })
           }
           if (item.advance == '1') {//垫资
-            advanceAmount = this.jnpf.floatAdd(advanceAmount,item.price);//垫资金额
+            advanceAmount = this.jnpf.floatAdd(advanceAmount, item.price);//垫资金额
           }
-          price = this.jnpf.floatAdd(price,item.price);//主表金额
-          notPrice = this.jnpf.floatAdd(notPrice,item.noPrice);//主表不含税金额
+          price = this.jnpf.floatAdd(price, item.price);//主表金额
+          notPrice = this.jnpf.floatAdd(notPrice, item.noPrice);//主表不含税金额
         });
         this.dataForm.advanceAmount = advanceAmount;
         this.dataForm.price = price;
         this.dataForm.notPrice = notPrice;
-        this.dataForm.rate = this.jnpf.floatSub(price,notPrice);
+        this.dataForm.rate = this.jnpf.floatSub(price, notPrice);
       },
       computeNoPrice() {
         let notPrice = 0;
         for (let i = 0; i < this.dataForm.salesorder_item0List.length; i++) {
           this.rateOptions.find((item) => {
             if (this.dataForm.salesorder_item0List[i].rate == item.id) {
-              this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.salesorder_item0List[i].price,(this.jnpf.floatSub(100, item.fullName))),100)
-              notPrice =this.jnpf.floatAdd(notPrice, this.dataForm.salesorder_item0List[i].noPrice)
+              this.dataForm.salesorder_item0List[i].noPrice = this.jnpf.floatDiv(this.jnpf.floatMul(this.dataForm.salesorder_item0List[i].price, (this.jnpf.floatSub(100, item.fullName))), 100)
+              notPrice = this.jnpf.floatAdd(notPrice, this.dataForm.salesorder_item0List[i].noPrice)
             }
           })
           this.dataForm.notPrice = notPrice;