diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPagination.java
index cbe17624..6e52fefb 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPagination.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistPagination.java
@@ -43,6 +43,9 @@ public class PoundlistPagination extends Pagination {
     private List<String> poundlistIds;
     private String businessId;
 
+    private String purchaseStatus;
+    private String salesStatus;
+
     /**
      * 添加权限
      */
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java
index 4e51f694..db3b8751 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java
@@ -81,7 +81,7 @@ public class SalebackEntity  {
     private String remark;
 
     @TableField("ACTUAL_AMOUNT")
-    private String actualAmount;
+    private BigDecimal actualAmount;
 
     @TableField("STATUS")
     private String status;
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 56d13915..28815cbf 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
@@ -545,11 +545,14 @@ public class SaleorderitemController {
                 salesorder_item0Service.save(entitys);
             }
             if (StringUtils.isNotEmpty(saleorderitemCrForm.getIsTransfer()) && saleorderitemCrForm.getIsTransfer().equals("1")){
-                if (StringUtils.isNotEmpty(saleorderitemCrForm.getPurchaseOrderId())){
-                    PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(saleorderitemCrForm.getPurchaseOrderId());
-                    if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)){
-                        purchaseorderitemEntity.setIsTransfer("1");
-                        purchaseorderitemService.updateById(purchaseorderitemEntity);
+                String[] purchaseIdList = saleorderitemCrForm.getPurchaseOrderId().split(",");
+                for (String purchaseId : purchaseIdList) {
+                    if (StringUtils.isNotEmpty(purchaseId)) {
+                        PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(purchaseId);
+                        if (ObjectUtils.isNotEmpty(purchaseorderitemEntity)) {
+                            purchaseorderitemEntity.setIsTransfer("1");
+                            purchaseorderitemService.updateById(purchaseorderitemEntity);
+                        }
                     }
                 }
             }
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java
index 32a06266..b987b6bf 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java
@@ -81,7 +81,7 @@ public class SalesbacksoitemEntity  {
     private String remark;
 
     @TableField("ACTUAL_AMOUNT")
-    private String actualAmount;
+    private BigDecimal actualAmount;
 
     @TableField("STATUS")
     private String status;
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml
index 83213966..2f9cd032 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml
@@ -74,10 +74,10 @@ WHERE a.delete_mark = 0 and
             AND (b.ticketno LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{poundlistPagination.keyword},'%'))
         </if>
 		<if test="poundlistPagination.startDate != null and poundlistPagination.endDate != null">
-			AND a.POUND_DATE &gt; #{poundlistPagination.startDate} AND a.POUND_DATE &lt;= #{poundlistPagination.endDate}
+			AND a.pound_date &gt; #{poundlistPagination.startDate} AND a.pound_date &lt;= #{poundlistPagination.endDate}
 		</if>
 		<if test="poundlistPagination.poundlistNo != null and poundlistPagination.poundlistNo != ''">
-			AND a.POUNDLIST_NO LIKE CONCAT('%',#{poundlistPagination.poundlistNo},'%')
+			AND a.poundlist_no LIKE CONCAT('%',#{poundlistPagination.poundlistNo},'%')
 		</if>
 		<if test="poundlistPagination.businessId != null and poundlistPagination.businessId != ''">
 			AND h.F_RealName LIKE CONCAT('%',#{poundlistPagination.businessId},'%')
@@ -100,6 +100,12 @@ WHERE a.delete_mark = 0 and
 		<if test="poundlistPagination.isExpense != null and poundlistPagination.isExpense != ''">
 			AND a.is_expense = #{poundlistPagination.isExpense}
 		</if>
+		<if test="poundlistPagination.purchaseStatus != null and poundlistPagination.purchaseStatus != ''">
+			AND a.purchase_status = #{poundlistPagination.purchaseStatus}
+		</if>
+		<if test="poundlistPagination.salesStatus != null and poundlistPagination.salesStatus != ''">
+			AND a.sales_status = #{poundlistPagination.salesStatus}
+		</if>
 		<if test="poundlistPagination.materialName != null and poundlistPagination.materialName != ''">
 			AND e.item_name LIKE CONCAT('%',#{poundlistPagination.materialName},'%')
 		</if>
diff --git a/SC-web/src/views/scm/basicInformation/invoices/Form.vue b/SC-web/src/views/scm/basicInformation/invoices/Form.vue
index 30bc46c9..e42ca4d6 100644
--- a/SC-web/src/views/scm/basicInformation/invoices/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/invoices/Form.vue
@@ -592,7 +592,8 @@
             sums[index] = '';
           }
         });
-
+        this.dataForm.invoiceAmount = sums[5];
+        this.dataForm.invoiceQuantity = sums[4];
         return sums;
       },
       invoiceQuantityChange(row) {
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/index.vue b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
index 99cc318a..cf1b3d20 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/index.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
@@ -1,1187 +1,794 @@
 <template>
-  <div class="JNPF-common-layout">
-    <div class="JNPF-common-layout-center">
-      <el-row class="JNPF-common-search-box" :gutter="16">
-        <el-form @submit.native.prevent>
-          <el-col :span="6">
-            <el-form-item label="磅单号">
-              <el-input
-                v-model="query.poundlistNo"
-                placeholder="请输入"
-                clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
+	<div class="JNPF-common-layout">
+
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+					  <el-form-item label="磅单号">
+					    <el-input v-model="query.poundlistNo" placeholder="请输入" clearable></el-input>
+					  </el-form-item>
+					</el-col>
           <el-col :span="6">
             <el-form-item label="业务员1">
-              <el-input
-                v-model="query.businessId"
-                placeholder="请输入"
-                clearable
-              ></el-input>
+              <el-input v-model="query.businessId" placeholder="请输入"  clearable></el-input>
             </el-form-item>
           </el-col>
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="物料名称">
-                <el-input
-                  v-model="query.materialName"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
+                <el-input v-model="query.materialName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="车牌号">
-                <el-input
-                  v-model="query.vehicleName"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
+                <el-input v-model="query.vehicleName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="采购合同">
-                <el-input
-                  v-model="query.purchaseName"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
+                <el-input v-model="query.purchaseName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="销售合同">
-                <el-input
-                  v-model="query.salesName"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
+                <el-input v-model="query.salesName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="供应商">
-                <el-input
-                  v-model="query.supplierName"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
+                <el-input v-model="query.supplierName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="客户">
-                <el-input
-                  v-model="query.customerName"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
+                <el-input v-model="query.customerName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="磅单日期">
-                <el-date-picker
-                  v-model="query.poundDate"
-                  type="daterange"
-                  value-format="timestamp"
-                  format="yyyy-MM-dd"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                >
+                <el-date-picker v-model="query.poundDate" type="daterange"
+                                value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
+                                end-placeholder="结束日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="是否开进项票">
-                <el-select
-                  v-model="query.isInvoicing"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                >
-                  <el-option
-                    v-for="(item, index) in isInvoicingOptions"
-                    :key="index"
-                    :label="item.fullName"
-                    :value="item.id"
-                  ></el-option>
+                <el-select v-model="query.isInvoicing" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                  <el-option v-for="(item, index) in isInvoicingOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="是否付款">
-                <el-select
-                  v-model="query.isPay"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                >
-                  <el-option
-                    v-for="(item, index) in isInvoicingOptions"
-                    :key="index"
-                    :label="item.fullName"
-                    :value="item.id"
-                  ></el-option>
+                <el-select v-model="query.isPay" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                  <el-option v-for="(item, index) in isInvoicingOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="是否回款">
-                <el-select
-                  v-model="query.isCollection"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                >
-                  <el-option
-                    v-for="(item, index) in isInvoicingOptions"
-                    :key="index"
-                    :label="item.fullName"
-                    :value="item.id"
-                  ></el-option>
+                <el-select v-model="query.isCollection" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                  <el-option v-for="(item, index) in isInvoicingOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="是否开销项票">
-                <el-select
-                  v-model="query.isExpense"
-                  placeholder="请选择"
-                  clearable
-                  :style="{ width: '100%' }"
-                >
-                  <el-option
-                    v-for="(item, index) in isInvoicingOptions"
-                    :key="index"
-                    :label="item.fullName"
-                    :value="item.id"
-                  ></el-option>
+                <el-select v-model="query.isExpense" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                  <el-option v-for="(item, index) in isInvoicingOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="采购状态">
+                <el-select v-model="query.purchaseStatus" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                  <el-option v-for="(item, index) in purchaseStatusOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="销售状态">
+                <el-select v-model="query.salesStatus" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                  <el-option v-for="(item, index) in salesStatusOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
           </template>
-          <el-col :span="6">
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()"
-                >查询</el-button
-              >
-              <el-button icon="el-icon-refresh-right" @click="resetAll()"
-                >重置</el-button
-              >
-              <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
-              >
-                收起</el-button
-              >
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-      <div class="JNPF-common-layout-main JNPF-flex-main">
-        <div class="JNPF-common-head">
-          <div>
-            <!-- <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()" v-has="'btn_add'">新增
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="resetAll()">重置</el-button>
+              <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>
+                收起</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<!-- <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()" v-has="'btn_add'">新增
 						</el-button> -->
-            <el-button
-              type="text"
-              icon="el-icon-download"
-              @click="exportData()"
-              v-has="'btn_add'"
-              >导出
-            </el-button>
-            <el-button
-              type="text"
-              icon="el-icon-delete"
-              @click="handleBatchRemoveDel()"
-              v-has="'btn_batchRemove'"
-              >批量删除
+						<el-button type="text" icon="el-icon-download" @click="exportData()" v-has="'btn_add'">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" v-has="'btn_batchRemove'">批量删除
+						</el-button>
+            <el-button type="text" icon="el-icon-check" @click="handleBatchCaigou()" v-has="'btn_handleBatchCaigou'">生成采购
             </el-button>
-            <el-button
-              type="text"
-              icon="el-icon-check"
-              @click="handleBatchCaigou()"
-              v-has="'btn_handleBatchCaigou'"
-              >生成采购
+            <el-button type="text" icon="el-icon-close" @click="createSale()" v-has="'btn_createSale'">生成销售
             </el-button>
-            <el-button
-              type="text"
-              icon="el-icon-close"
-              @click="createSale()"
-              v-has="'btn_createSale'"
-              >生成销售
-            </el-button>
-          </div>
-          <div class="JNPF-common-head-right">
-            <el-tooltip effect="dark" content="刷新" placement="top">
-              <el-link
-                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
-                :underline="false"
-                @click="reset()"
-              />
-            </el-tooltip>
-            <screenfull isContainer />
-          </div>
-        </div>
-        <JNPF-table
-          v-loading="listLoading"
-          :data="list"
-          @sort-change="sortChange"
-          has-c
-          @selection-change="handleSelectionChange"
-          custom-column
-          border
-          show-summary
-          :summary-method="getSummaries"
-        >
-          <!--          <el-table-column type="index" width="50" label="序号"    align="center" />-->
-          <el-table-column
-            prop="vehicleName"
-            label="车号"
-            sortable
-            width="120"
-            align="center"
-          />
-          <!--          <el-table-column prop="purchaseStatus" label="采购状态" sortable width="100" align="center" >-->
-          <!--            <template slot-scope="scope">-->
-          <!--              {{ scope.row.purchaseStatus | dynamicText(purchaseStatusOptions) }}-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <el-table-column
-            prop="purchaseStatus"
-            label="采购状态"
-            sortable
-            width="100"
-            align="center"
-          >
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+                    @selection-change="handleSelectionChange" custom-column border show-summary  :summary-method="getSummaries">
+<!--          <el-table-column type="index" width="50" label="序号"    align="center" />-->
+          <el-table-column prop="vehicleName" label="车号"    sortable width="120" align="center"  />
+<!--          <el-table-column prop="purchaseStatus" label="采购状态" sortable width="100" align="center" >-->
+<!--            <template slot-scope="scope">-->
+<!--              {{ scope.row.purchaseStatus | dynamicText(purchaseStatusOptions) }}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column prop="purchaseStatus" label="采购状态" sortable width="100" align="center">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.purchaseStatus == 99">已保存</el-tag>
-              <el-tag type="success" v-else-if="scope.row.purchaseStatus == 0"
-                >待开票</el-tag
-              >
-              <el-tag type="info" v-else-if="scope.row.purchaseStatus == 1"
-                >开票中</el-tag
-              >
-              <el-tag type="warning" v-else-if="scope.row.purchaseStatus == 2"
-                >已入库</el-tag
-              >
-              <el-tag type="danger" v-else-if="scope.row.purchaseStatus == 3"
-                >归档</el-tag
-              >
+              <el-tag v-if="scope.row.purchaseStatus==99">已保存</el-tag>
+              <el-tag type="success" v-else-if="scope.row.purchaseStatus==0">待开票</el-tag>
+              <el-tag type="info" v-else-if="scope.row.purchaseStatus==1">开票中</el-tag>
+              <el-tag type="warning" v-else-if="scope.row.purchaseStatus==2">已入库</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.purchaseStatus==3">归档</el-tag>
             </template>
           </el-table-column>
-          <!--          <el-table-column prop="salesStatus" label="销售状态" sortable width="100" align="center" >-->
-          <!--            <template slot-scope="scope">-->
-          <!--              {{ scope.row.salesStatus | dynamicText(salesStatusOptions) }}-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <el-table-column
-            prop="salesStatus"
-            label="销售状态"
-            sortable
-            width="100"
-            align="center"
-          >
+<!--          <el-table-column prop="salesStatus" label="销售状态" sortable width="100" align="center" >-->
+<!--            <template slot-scope="scope">-->
+<!--              {{ scope.row.salesStatus | dynamicText(salesStatusOptions) }}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column prop="salesStatus" label="销售状态" sortable width="100" align="center">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.salesStatus == 99">已保存</el-tag>
-              <el-tag type="success" v-else-if="scope.row.salesStatus == 0"
-                >待发货</el-tag
-              >
-              <el-tag type="info" v-else-if="scope.row.salesStatus == 1"
-                >待开票</el-tag
-              >
-              <el-tag type="warning" v-else-if="scope.row.salesStatus == 2"
-                >待回款</el-tag
-              >
-              <el-tag type="danger" v-else-if="scope.row.salesStatus == 3"
-                >归档</el-tag
-              >
+              <el-tag v-if="scope.row.salesStatus==99">已保存</el-tag>
+              <el-tag type="success" v-else-if="scope.row.salesStatus==0">待发货</el-tag>
+              <el-tag type="info" v-else-if="scope.row.salesStatus==1">待开票</el-tag>
+              <el-tag type="warning" v-else-if="scope.row.salesStatus==2">待回款</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.salesStatus==3">归档</el-tag>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="materialName"
-            label="物料名称"
-            sortable
-            width="150"
-            align="center"
-          />
-          <el-table-column
-            prop="settlement"
-            sortable
-            label="结算重量"
-            width="100"
-            align="center"
-          />
-          <el-table-column
-            prop="purchasePrice"
-            sortable
-            label="采购单价"
-            width="100"
-            align="center"
-          />
-          <el-table-column
-            prop="salesPrice"
-            sortable
-            label="销售价格"
-            width="100"
-            align="center"
-          />
-          <el-table-column
-            prop="collectPrice"
-            sortable
-            label="收货价格"
-            width="100"
-            align="center"
-          />
-          <el-table-column
-            prop="grossWeight"
-            sortable
-            label="毛重"
-            width="100"
-            align="center"
-          />
-          <el-table-column
-            prop="tareWeight"
-            sortable
-            label="皮重"
-            width="100"
-            align="center"
-          />
-          <el-table-column
-            prop="buckleWeight"
-            sortable
-            label="扣重"
-            width="100"
-            align="center"
-          />
-          <el-table-column
-            prop="netWeight"
-            sortable
-            label="净重"
-            width="100"
-            align="center"
-          />
-          <el-table-column
-            prop="unit"
-            label="单位"
-            sortable
-            width="100"
-            align="center"
-          >
+          <el-table-column prop="materialName" label="物料名称" sortable width="150" align="center" />
+          <el-table-column prop="settlement" sortable label="结算重量" width="100" align="center" />
+          <el-table-column prop="purchasePrice" sortable label="采购单价" width="100" align="center" />
+          <el-table-column prop="salesPrice" sortable label="销售价格" width="100" align="center" />
+          <el-table-column prop="collectPrice" sortable label="收货价格" width="100" align="center" />
+          <el-table-column prop="grossWeight" sortable label="毛重" width="100" align="center" />
+          <el-table-column prop="tareWeight" sortable label="皮重" width="100" align="center" />
+          <el-table-column prop="buckleWeight" sortable label="扣重" width="100" align="center" />
+          <el-table-column prop="netWeight" sortable label="净重" width="100" align="center" />
+          <el-table-column prop="unit" label="单位" sortable width="100" align="center" >
             <template slot-scope="scope">
               {{ scope.row.unit | dynamicText(unitOptions) }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="poundlistNo"
-            label="磅单号"
-            width="200"
-            align="center"
-            sortable
-          />
-          <el-table-column
-            prop="customerName"
-            label="客户名称"
-            sortable
-            width="150"
-            align="center"
-          />
-          <el-table-column
-            prop="salesName"
-            label="销售合同"
-            sortable
-            width="150"
-            align="center"
-          />
-          <el-table-column
-            prop="supplierName"
-            label="供应商名称"
-            sortable
-            width="150"
-            align="center"
-          />
-          <el-table-column
-            prop="purchaseName"
-            label="采购合同"
-            sortable
-            width="150"
-            align="center"
-          />
+          <el-table-column prop="poundlistNo" label="磅单号" width="200" align="center" sortable  />
+					<el-table-column prop="customerName" label="客户名称" sortable width="150" align="center" />
+					<el-table-column prop="salesName" label="销售合同" sortable width="150" align="center" />
+					<el-table-column prop="supplierName" label="供应商名称" sortable width="150" align="center" />
+					<el-table-column prop="purchaseName" label="采购合同" sortable width="150" align="center" />
 
-          <el-table-column
-            prop="advance"
-            label="是否垫资"
-            sortable
-            width="100"
-            align="center"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.advance | dynamicText(advanceOptions) }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="inputDateStr"
-            sortable
-            label="进项票日期"
-            width="150"
-            align="center"
-          />
-          <el-table-column
-            prop="outputDateStr"
-            sortable
-            label="销项票日期"
-            width="150"
-            align="center"
-          />
-          <el-table-column
-            prop="payDateStr"
-            sortable
-            label="付款日期"
-            width="150"
-            align="center"
-          />
-          <el-table-column
-            prop="paymentDateStr"
-            sortable
-            label="回款日期"
-            width="150"
-            align="center"
-          />
-          <el-table-column
-            prop="poundDateStr"
-            sortable
-            label="磅单日期"
-            width="150"
-            align="center"
-          />
-          <el-table-column
-            prop="creatorTimeStr"
-            sortable
-            label="创建日期"
-            width="150"
-            align="center"
-          />
-          <el-table-column
-            prop="businessName"
-            sortable
-            label="业务员"
-            width="150"
-            align="center"
-          />
-          <el-table-column
-            label="是否开进项票"
-            width="120"
-            sortable
-            prop="isInvoicing"
-            align="center"
-          >
+          <el-table-column prop="advance" label="是否垫资" sortable width="100" align="center" >
+						<template slot-scope="scope">
+							{{ scope.row.advance | dynamicText(advanceOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="inputDateStr" sortable label="进项票日期" width="150" align="center" />
+					<el-table-column prop="outputDateStr" sortable label="销项票日期" width="150" align="center" />
+					<el-table-column prop="payDateStr" sortable label="付款日期" width="150" align="center" />
+					<el-table-column prop="paymentDateStr" sortable label="回款日期" width="150" align="center" />
+					<el-table-column prop="poundDateStr" sortable label="磅单日期" width="150" align="center" />
+          <el-table-column prop="creatorTimeStr" sortable label="创建日期" width="150" align="center" />
+					<el-table-column prop="businessName" sortable label="业务员" width="150" align="center" />
+          <el-table-column label="是否开进项票" width="120" sortable prop="isInvoicing" align="center" >
             <template slot-scope="scope">
               {{ scope.row.isInvoicing | dynamicText(advanceOptions) }}
             </template>
           </el-table-column>
-          <el-table-column
-            label="是否付款"
-            width="120"
-            sortable
-            prop="isPay"
-            align="center"
-          >
+          <el-table-column label="是否付款" width="120" sortable prop="isPay" align="center" >
             <template slot-scope="scope">
               {{ scope.row.isPay | dynamicText(advanceOptions) }}
             </template>
           </el-table-column>
-          <el-table-column
-            label="是否回款"
-            width="120"
-            sortable
-            prop="isCollection"
-            align="center"
-          >
+          <el-table-column label="是否回款" width="120" sortable prop="isCollection" align="center" >
             <template slot-scope="scope">
               {{ scope.row.isCollection | dynamicText(advanceOptions) }}
             </template>
           </el-table-column>
-          <el-table-column
-            label="是否开销项票"
-            width="120"
-            sortable
-            prop="isExpense"
-            align="center"
-          >
+          <el-table-column label="是否开销项票" width="120" sortable prop="isExpense" align="center" >
             <template slot-scope="scope">
               {{ scope.row.isExpense | dynamicText(advanceOptions) }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="remark"
-            sortable
-            label="备注"
-            width="150"
-            align="center"
-          />
-          <el-table-column
-            prop="poundPictures"
-            label="磅单图片"
-            width="150"
-            align="center"
-          >
-            <template slot-scope="scope">
-              <span
-                v-if="scope.row.poundPictures != ''"
-                v-for="(item, index) in JSON.parse(scope.row.poundPictures)"
-                :key="index"
-              >
-                <el-popover placement="bottom" trigger="click" width="500">
-                  <img :src="define.comUrl + `${item.url}`" width="100%" />
-                  <img
-                    slot="reference"
-                    :src="define.comUrl + `${item.url}`"
-                    :alt="define.comUrl + `${item.url}`"
-                    style="max-height: 70px; max-width: 70px; padding: 5px"
-                  />
-                </el-popover>
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="vehiclePictures"
-            label="车辆图片"
-            width="150"
-            align="center"
-          >
-            <template slot-scope="scope">
-              <span
-                v-if="scope.row.vehiclePictures != ''"
-                v-for="(item, index) in JSON.parse(scope.row.vehiclePictures)"
-                :key="index"
-              >
-                <el-popover placement="bottom" trigger="click" width="500">
-                  <img :src="define.comUrl + `${item.url}`" width="100%" />
-                  <img
-                    slot="reference"
-                    :src="define.comUrl + `${item.url}`"
-                    :alt="define.comUrl + `${item.url}`"
-                    style="max-height: 70px; max-width: 70px; padding: 5px"
-                  />
-                </el-popover>
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            fixed="right"
-            width="150"
-            align="center"
-          >
-            <template slot-scope="scope">
-              <!--							<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
+					<el-table-column prop="remark" sortable label="备注" width="150" align="center" />
+					<el-table-column prop="poundPictures" label="磅单图片" width="150" align="center">
+						<template slot-scope="scope">
+							<span v-if="scope.row.poundPictures != ''" v-for="(item,index) in JSON.parse(scope.row.poundPictures)" :key="index">
+								<el-popover placement="bottom" trigger="click" width="500">
+									<img :src="define.comUrl + `${item.url}`" width="100%" />
+									<img
+										slot="reference"
+										:src="define.comUrl + `${item.url}`"
+										:alt="define.comUrl + `${item.url}`"
+										style="max-height: 70px;max-width: 70px; padding: 5px"
+									/>
+								</el-popover>
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="vehiclePictures" label="车辆图片" width="150" align="center">
+						<template slot-scope="scope">
+							<span v-if="scope.row.vehiclePictures != ''" v-for="(item,index) in JSON.parse(scope.row.vehiclePictures)" :key="index">
+								<el-popover placement="bottom" trigger="click" width="500">
+									<img :src="define.comUrl + `${item.url}`" width="100%" />
+									<img
+										slot="reference"
+										:src="define.comUrl + `${item.url}`"
+										:alt="define.comUrl + `${item.url}`"
+										style="max-height: 70px;max-width: 70px; padding: 5px"
+									/>
+								</el-popover>
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" fixed="right"  width="150" align="center">
+						<template slot-scope="scope">
+<!--							<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
 							</el-button>-->
-              <el-button
-                type="text"
-                @click="handleReturn(scope.row)"
-                v-has="'btn_remove'"
-                >驳回
-              </el-button>
-              <el-button
-                type="text"
-                class="JNPF-table-delBtn"
-                @click="handleDel(scope.row)"
-                v-has="'btn_remove'"
-                >删除
+              <el-button type="text" @click="handleReturn(scope.row)" v-has="'btn_handleReturn'">驳回
               </el-button>
-              <el-button
-                type="text"
-                @click="goDetail(scope.row.id)"
-                v-has="'btn_detail'"
-                >详情
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row)" v-has="'btn_remove'">删除
+							</el-button>
+              <el-button type="text" @click="goDetail(scope.row.id)" v-has="'btn_detail'">详情
               </el-button>
 
-              <el-button
-                type="text"
-                @click="addOvheicle(scope.row.id)"
-                v-has="'btn_addOvheicle'"
-                >添加车辆图片
+              <el-button type="text" @click="addOvheicle(scope.row.id)" v-has="'btn_addOvheicle'">添加车辆图片
               </el-button>
-            </template>
-          </el-table-column>
-        </JNPF-table>
-        <pagination
-          :total="total"
-          :page.sync="listQuery.currentPage"
-          :limit.sync="listQuery.pageSize"
-          @pagination="initData"
-        />
-      </div>
-    </div>
-    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <JNPF-Form2 v-if="formVisible2" ref="JNPFForm2" @refresh="refresh2" />
     <JNPF-Form4 v-if="formVisible4" ref="JNPFForm4" @refresh="refresh4" />
     <JNPF-Form6 v-if="formVisible6" ref="JNPFForm6" @refresh="refresh6" />
-    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
-    <Detail
-      v-if="detailVisible"
-      ref="Detail"
-      @refresh="detailVisible = false"
-    />
-  </div>
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
 </template>
 
 <script>
-import request from "@/utils/request";
-import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
-import JNPFForm from "./Form";
-import JNPFForm2 from "./PurchaseOrderForm";
-import JNPFForm4 from "./salesForm";
+	import  request from '@/utils/request'
+	import {
+		getDictionaryDataSelector
+	} from '@/api/systemData/dictionary'
+	import JNPFForm from './Form'
+  import JNPFForm2 from './PurchaseOrderForm'
+  import JNPFForm4 from './salesForm'
 
-import JNPFForm6 from "./VechicleForm";
-import ExportBox from "./ExportBox";
-import { getDataInterfaceRes } from "@/api/systemData/dataInterface";
-import Detail from "./Detail";
+  import JNPFForm6 from './VechicleForm'
+	import ExportBox from './ExportBox'
+	import {
+		getDataInterfaceRes
+	} from '@/api/systemData/dataInterface'
+	import Detail from './Detail'
 
-export default {
-  components: {
-    JNPFForm,
-    JNPFForm2,
-    JNPFForm4,
-    JNPFForm6,
-    ExportBox,
-    Detail,
-  },
-  data() {
-    return {
-      showAll: false,
-      detailVisible: false,
-      query: {
-        materialName: undefined,
-      },
-      treeProps: {
-        children: "children",
-        label: "fullName",
-        value: "id",
-      },
-      list: [],
-      listLoading: true,
-      multipleSelection: [],
-      multipleSelectionItem: [],
-      total: 0,
-      listQuery: {
-        currentPage: 1,
-        pageSize: 20,
-        sort: "desc",
-        sidx: "",
-      },
-      formVisible: false,
-      formVisible2: false,
-      formVisible3: false,
-      formVisible4: false,
-      formVisible6: false,
-      exportBoxVisible: false,
-      columnList: [
-        {
-          prop: "licenseNo",
-          label: "车号",
-        },
-        {
-          prop: "customerName",
-          label: "客户名称",
-        },
-        {
-          prop: "salesName",
-          label: "销售合同",
-        },
-        {
-          prop: "supplierName",
-          label: "供应商名称",
-        },
-        {
-          prop: "purchaseName",
-          label: "采购合同",
-        },
-        {
-          prop: "materialCode",
-          label: "物料编码",
-        },
-        {
-          prop: "materialName",
-          label: "物料名称",
-        },
-        {
-          prop: "advance",
-          label: "是否垫资",
-        },
-        {
-          prop: "unit",
-          label: "单位",
-        },
-        { prop: "creatorTime", label: "创建时间" },
-        {
-          prop: "grossWeight",
-          label: "毛重",
-        },
-        {
-          prop: "tareWeight",
-          label: "皮重",
-        },
-        {
-          prop: "buckleWeight",
-          label: "扣重",
-        },
-        {
-          prop: "netWeight",
-          label: "净重",
-        },
-        {
-          prop: "settlement",
-          label: "结算重量",
-        },
-        {
-          prop: "purchasePrice",
-          label: "采购单价",
-        },
-        {
-          prop: "salesPrice",
-          label: "销售价格",
-        },
-        {
-          prop: "collectPrice",
-          label: "收货价格",
-        },
-        {
-          prop: "inputDate",
-          label: "进项票日期",
-        },
-        {
-          prop: "outputDate",
-          label: "销项票日期",
-        },
-        {
-          prop: "payDate",
-          label: "付款日期",
-        },
-        {
-          prop: "paymentDate",
-          label: "回款日期",
-        },
-        {
-          prop: "poundDate",
-          label: "磅单日期",
-        },
-        {
-          prop: "businessName",
-          label: "业务员名称",
-        },
-        {
-          prop: "remark",
-          label: "备注",
-        },
-      ],
-      purchaseStatusOptions: [
-        {
-          fullName: "已保存",
-          id: "99",
-        },
-        {
-          fullName: "待开票",
-          id: "0",
-        },
-        {
-          fullName: "开票中",
-          id: "1",
-        },
-        {
-          fullName: "已入库",
-          id: "2",
-        },
-        {
-          fullName: "归档",
-          id: "3",
-        },
-      ],
-      salesStatusOptions: [
-        {
-          fullName: "已保存",
-          id: "99",
-        },
-        {
-          fullName: "待发货",
-          id: "0",
-        },
-        {
-          fullName: "待开票",
-          id: "1",
-        },
-        {
-          fullName: "待回款",
-          id: "2",
-        },
-        {
-          fullName: "归档",
-          id: "3",
-        },
-      ],
-      isInvoicingOptions: [
-        {
-          fullName: "是",
-          id: "1",
-        },
-        {
-          fullName: "否",
-          id: "0",
-        },
-      ],
-      advanceOptions: [
-        {
-          fullName: "是",
-          id: "1",
-        },
-        {
-          fullName: "否",
-          id: "0",
-        },
-      ],
-      advanceProps: {
-        label: "fullName",
-        value: "id",
-      },
-      transportTypeOptions: [
-        {
-          fullName: "汽运",
-          id: "0",
-        },
-        {
-          fullName: "船运",
-          id: "1",
-        },
-        {
-          fullName: "火车",
-          id: "2",
-        },
-      ],
-      transportTypeProps: {
-        label: "fullName",
-        value: "id",
-      },
-      unitOptions: [
-        {
-          fullName: "吨",
-          id: "0",
-        },
-        {
-          fullName: "千克",
-          id: "1",
-        },
-      ],
-      unitProps: {
-        label: "fullName",
-        value: "id",
+	export default {
+		components: {
+			JNPFForm,
+      JNPFForm2,
+      JNPFForm4,
+      JNPFForm6,
+			ExportBox,
+			Detail
+		},
+		data() {
+			return {
+        showAll: false,
+				detailVisible: false,
+				query: {
+					materialName: undefined,
+				},
+				treeProps: {
+					children: 'children',
+					label: 'fullName',
+					value: 'id'
+				},
+				list: [],
+				listLoading: true,
+				multipleSelection: [],
+        multipleSelectionItem: [],
+				total: 0,
+				listQuery: {
+					currentPage: 1,
+					pageSize: 20,
+					sort: "desc",
+					sidx: "",
+				},
+				formVisible: false,
+        formVisible2: false,
+        formVisible3: false,
+        formVisible4: false,
+        formVisible6: false,
+				exportBoxVisible: false,
+				columnList: [{
+						prop: 'licenseNo',
+						label: '车号'
+					},
+					{
+						prop: 'customerName',
+						label: '客户名称'
+					},
+					{
+						prop: 'salesName',
+						label: '销售合同'
+					},
+					{
+						prop: 'supplierName',
+						label: '供应商名称'
+					},
+					{
+						prop: 'purchaseName',
+						label: '采购合同'
+					},
+					{
+						prop: 'materialCode',
+						label: '物料编码'
+					},
+					{
+						prop: 'materialName',
+						label: '物料名称'
+					},
+					{
+						prop: 'advance',
+						label: '是否垫资'
+					},
+					{
+						prop: 'unit',
+						label: '单位'
+					},
+          { prop: 'creatorTime', label: '创建时间' },
+					{
+						prop: 'grossWeight',
+						label: '毛重'
+					},
+					{
+						prop: 'tareWeight',
+						label: '皮重'
+					},
+					{
+						prop: 'buckleWeight',
+						label: '扣重'
+					},
+					{
+						prop: 'netWeight',
+						label: '净重'
+					},
+					{
+						prop: 'settlement',
+						label: '结算重量'
+					},
+					{
+						prop: 'purchasePrice',
+						label: '采购单价'
+					},
+					{
+						prop: 'salesPrice',
+						label: '销售价格'
+					},
+          {
+            prop: 'collectPrice',
+            label: '收货价格'
+          },
+					{
+						prop: 'inputDate',
+						label: '进项票日期'
+					},
+					{
+						prop: 'outputDate',
+						label: '销项票日期'
+					},
+					{
+						prop: 'payDate',
+						label: '付款日期'
+					},
+					{
+						prop: 'paymentDate',
+						label: '回款日期'
+					},
+					{
+						prop: 'poundDate',
+						label: '磅单日期'
+					},
+					{
+						prop: 'businessName',
+						label: '业务员名称'
+					},
+					{
+						prop: 'remark',
+						label: '备注'
+					},
+				],
+        purchaseStatusOptions: [{
+					"fullName": "已保存",
+					"id": "99"
+				}, {
+					"fullName": "待开票",
+					"id": "0"
+				}, {
+					"fullName": "开票中",
+					"id": "1"
+				}, {
+					"fullName": "已入库",
+					"id": "2"
+				}, {
+					"fullName": "归档",
+					"id": "3"
+				}],
+        salesStatusOptions: [{
+					"fullName": "已保存",
+					"id": "99"
+				}, {
+					"fullName": "待发货",
+					"id": "0"
+				}, {
+					"fullName": "待开票",
+					"id": "1"
+				}, {
+					"fullName": "待回款",
+					"id": "2"
+				}, {
+					"fullName": "归档",
+					"id": "3"
+				}],
+        isInvoicingOptions: [{
+					"fullName": "是",
+					"id": "1"
+				}, {
+					"fullName": "否",
+					"id": "0"
+				}],
+				advanceOptions: [{
+					"fullName": "是",
+					"id": "1"
+				}, {
+					"fullName": "否",
+					"id": "0"
+				}],
+				advanceProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				transportTypeOptions: [{
+					"fullName": "汽运",
+					"id": "0"
+				}, {
+					"fullName": "船运",
+					"id": "1"
+				}, {
+					"fullName": "火车",
+					"id": "2"
+				}],
+				transportTypeProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+				unitOptions: [{
+					"fullName": "吨",
+					"id": "0"
+				}, {
+					"fullName": "千克",
+					"id": "1"
+				}],
+				unitProps: {
+					"label": "fullName",
+					"value": "id"
+				},
+			}
+		},
+		computed: {
+			menuId() {
+				return this.$route.meta.modelId || ''
+			}
+		},
+		created() {
+			this.initData()
+		},
+		methods: {
+      getSummaries(param) {
+        const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value)) && (index === 10 || index === 11 || index === 12 || index === 13)) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return this.jnpf.floatAdd(prev,curr);
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = '';
+          }
+        });
+
+        return sums;
       },
-    };
-  },
-  computed: {
-    menuId() {
-      return this.$route.meta.modelId || "";
-    },
-  },
-  created() {
-    this.initData();
-  },
-  methods: {
-    getSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = "合计";
-          return;
-        }
-        const values = data.map((item) => Number(item[column.property]));
-        if (
-          !values.every((value) => isNaN(value)) &&
-          (index === 10 || index === 11 || index === 12 || index === 13)
-        ) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return this.jnpf.floatAdd(prev, curr);
-            } else {
-              return prev;
-            }
-          }, 0);
-        } else {
-          sums[index] = "";
-        }
-      });
+			goDetail(id) {
+				this.detailVisible = true
+				this.$nextTick(() => {
+					this.$refs.Detail.init(id)
+				})
+			},
+			sortChange({
+				column,
+				prop,
+				order
+			}) {
+				this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+				this.listQuery.sidx = !order ? '' : prop
+				this.initData()
+			},
+			initData() {
+				this.listLoading = true;
+				let _query = {
+					...this.listQuery,
+					...this.query,
+					menuId: this.menuId
+				};
+				request({
+					url: `/api/poundlist/Poundlist/getList`,
+					method: 'post',
+					data: _query
+				}).then(res => {
+					var _list = [];
+					for (let i = 0; i < res.data.list.length; i++) {
+            res.data.list[i].inputDateStr = res.data.list[i].inputDate ? res.data.list[i].inputDate.substring(0,
+              10) : '';
+            res.data.list[i].outputDateStr = res.data.list[i].outputDate ? res.data.list[i].outputDate
+              .substring(0, 10) : '';
+            res.data.list[i].payDateStr = res.data.list[i].payDate ? res.data.list[i].payDate
+              .substring(0, 10) : '';
+            res.data.list[i].paymentDateStr = res.data.list[i].paymentDate ? res.data.list[i].paymentDate
+              .substring(0, 10) : '';
+            res.data.list[i].poundDateStr = res.data.list[i].poundDate ? res.data.list[i].poundDate
+              .substring(0, 10) : '';
+              res.data.list[i].creatorTimeStr = res.data.list[i].creatorTime ? res.data.list[i].creatorTime
+                .substring(0, 10) : '';
+						let _data = res.data.list[i];
+						_list.push(_data)
+					}
+					this.list = _list
+					this.total = res.data.pagination.total
 
-      return sums;
-    },
-    goDetail(id) {
-      this.detailVisible = true;
-      this.$nextTick(() => {
-        this.$refs.Detail.init(id);
-      });
-    },
-    sortChange({ column, prop, order }) {
-      this.listQuery.sort = order == "ascending" ? "asc" : "desc";
-      this.listQuery.sidx = !order ? "" : prop;
-      this.initData();
-    },
-    initData() {
-      this.listLoading = true;
-      let _query = {
-        ...this.listQuery,
-        ...this.query,
-        menuId: this.menuId,
-      };
-      request({
-        url: `/api/poundlist/Poundlist/getList`,
-        method: "post",
-        data: _query,
-      }).then((res) => {
-        var _list = [];
-        for (let i = 0; i < res.data.list.length; i++) {
-          res.data.list[i].inputDateStr = res.data.list[i].inputDate
-            ? res.data.list[i].inputDate.substring(0, 10)
-            : "";
-          res.data.list[i].outputDateStr = res.data.list[i].outputDate
-            ? res.data.list[i].outputDate.substring(0, 10)
-            : "";
-          res.data.list[i].payDateStr = res.data.list[i].payDate
-            ? res.data.list[i].payDate.substring(0, 10)
-            : "";
-          res.data.list[i].paymentDateStr = res.data.list[i].paymentDate
-            ? res.data.list[i].paymentDate.substring(0, 10)
-            : "";
-          res.data.list[i].poundDateStr = res.data.list[i].poundDate
-            ? res.data.list[i].poundDate.substring(0, 10)
-            : "";
-          res.data.list[i].creatorTimeStr = res.data.list[i].creatorTime
-            ? res.data.list[i].creatorTime.substring(0, 10)
-            : "";
-          let _data = res.data.list[i];
-          _list.push(_data);
+					this.listLoading = false
+				})
+			},
+      handleReturn(row){
+        if(row.purchaseStatus != '99' || row.salesStatus != '99'){
+          this.$message({
+            type: 'error',
+            message: '该磅单当前状态不允许驳回',
+            duration: 2500
+          });
+          return
         }
-        this.list = _list;
-        this.total = res.data.pagination.total;
-
-        this.listLoading = false;
-      });
-    },
-    handleReturn(row) {
-      if (row.purchaseStatus != "99" || row.salesStatus != "99") {
-        this.$message({
-          type: "error",
-          message: "该磅单当前状态不允许驳回",
-          duration: 2500,
-        });
-        return;
-      }
-      this.$confirm("是否确认驳回?", "提示", {
-        type: "warning",
-      })
-        .then(() => {
+        this.$confirm('是否确认驳回?', '提示', {
+          type: 'warning'
+        }).then(() => {
           request({
             url: `/api/poundlist/Poundlist/handleReturn/${row.id}`,
-            method: "post",
-          }).then((res) => {
-            this.$message({
-              type: "success",
-              message: res.msg,
-              onClose: () => {
-                this.initData();
-              },
-            });
-          });
-        })
-        .catch(() => {});
-    },
-    handleDel(row) {
-      if (row.purchaseStatus != "99" || row.salesStatus != "99") {
-        this.$message({
-          type: "error",
-          message: "该磅单已生成采购或销售无法删除",
-          duration: 2500,
-        });
-        return;
-      }
-      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-        type: "warning",
-      })
-        .then(() => {
-          request({
-            url: `/api/poundlist/Poundlist/${row.id}`,
-            method: "DELETE",
-          }).then((res) => {
+            method: 'post'
+          }).then(res => {
             this.$message({
-              type: "success",
+              type: 'success',
               message: res.msg,
               onClose: () => {
-                this.initData();
-              },
+                this.initData()
+              }
             });
-          });
-        })
-        .catch(() => {});
-    },
-    handleSelectionChange(val) {
-      this.multipleSelectionItem = val;
-      const res = val.map((item) => item.id);
-      this.multipleSelection = res;
-    },
-    handleBatchCaigou() {
-      if (!this.multipleSelectionItem.length) {
-        this.$message({
-          type: "error",
-          message: "请选择一条数据",
-          duration: 2500,
-        });
-        return;
-      }
-      var statusFlag = true;
-      var purchaseIdArr = [];
-      this.multipleSelectionItem.forEach((item, index) => {
-        /* //item.settlement = item.netWeight;
+          })
+        }).catch(() => {});
+      },
+			handleDel(row) {
+        if(row.purchaseStatus != '99' || row.salesStatus != '99'){
+          this.$message({
+          	type: 'error',
+          	message: '该磅单已生成采购或销售无法删除',
+          	duration: 2500,
+          })
+          return
+        }
+				this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/poundlist/Poundlist/${row.id}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {});
+			},
+			handleSelectionChange(val) {
+        this.multipleSelectionItem = val
+				const res = val.map(item => item.id)
+				this.multipleSelection = res
+			},
+      handleBatchCaigou(){
+        if (!this.multipleSelectionItem.length) {
+        	this.$message({
+        		type: 'error',
+        		message: '请选择一条数据',
+        		duration: 2500,
+        	})
+        	return
+        }
+        var statusFlag = true;
+        var purchaseIdArr = [];
+        this.multipleSelectionItem.forEach((item, index)=>{
+          /* //item.settlement = item.netWeight;
           item.pountType = item.poundType;
           //item.price = item.purchasePrice
           item.amount = item.settlement * item.price;
           item.notAmount = item.amount * (100 - 13) / 100;
           item.rateAmount = item.amount - item.notAmount;
 		  item.rate = '0'; */
-        purchaseIdArr.push(item.purchaseId);
-        if (item.purchaseStatus != "99" || item.isExamine != "1") {
-          statusFlag = false;
-        }
-      });
-      var newPurchaseIdArr = [...new Set(purchaseIdArr)]; //利用了Set结构不能接收重复数据的特点
-      if (!statusFlag) {
-        this.$message({
-          type: "error",
-          message: "磅单已生产采购订单或者未审核",
-          duration: 1000,
-        });
-        return;
-      }
-      if (newPurchaseIdArr.length != 1) {
-        this.$message({
-          type: "error",
-          message: "所选数据采购订单需一致",
-          duration: 1000,
-        });
-        return;
-      }
-      this.formVisible2 = true;
-      this.$nextTick(() => {
-        this.$refs.JNPFForm2.init(
-          JSON.parse(JSON.stringify(this.multipleSelectionItem))
-        );
-      });
-    },
-    createSale() {
-      if (!this.multipleSelection.length) {
-        this.$message({
-          type: "error",
-          message: "请选择一条数据",
-          duration: 2500,
+          purchaseIdArr.push(item.purchaseId);
+          if(item.purchaseStatus != '99' || item.isExamine != '1'){
+            statusFlag = false;
+          }
         });
-        return;
-      }
-      const ids = this.multipleSelection.join();
-      request({
-        url: `/api/poundlist/Poundlist/createsale/${ids}`,
-        method: "post",
-      }).then((res) => {
-        var list = [];
-        for (let i = 0; i < res.data.length; i++) {
-          // res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
-          //   10) : '';
-
-          let _data = res.data[i];
-          list.push(_data);
-        }
-        if (list.length > 0) {
-          // this.list = _list
-          this.formVisible4 = true;
-          this.$nextTick(() => {
-            this.$refs.JNPFForm4.init(list);
+        var newPurchaseIdArr = [...new Set(purchaseIdArr)]; //利用了Set结构不能接收重复数据的特点
+        if(!statusFlag){
+          this.$message({
+          	type: 'error',
+          	message: '磅单已生产采购订单或者未审核',
+            duration: 1000
           });
-        } else {
+          return
+        }
+        if(newPurchaseIdArr.length != 1){
           this.$message({
-            message: "未找到符合条件数据",
-            type: "error",
-            duration: 1000,
+          	type: 'error',
+          	message: '所选数据采购订单需一致',
+            duration: 1000
           });
+          return
         }
-        // this.$message({
-        //   type: 'success',
-        //   message: res.msg,
-        //   onClose: () => {
-        //     this.initData()
-        //   }
-        // });
-      });
-    },
-    handleBatchRemoveDel() {
-      if (!this.multipleSelection.length) {
-        this.$message({
-          type: "error",
-          message: "请选择一条数据",
-          duration: 2500,
-        });
-        return;
-      }
-      var statusFlag = true;
-      this.multipleSelectionItem.forEach((item, index) => {
-        if (item.purchaseStatus != "99" || item.salesStatus != "99") {
-          statusFlag = false;
+        this.formVisible2 = true
+        this.$nextTick(() => {
+        	this.$refs.JNPFForm2.init(JSON.parse(JSON.stringify(this.multipleSelectionItem)))
+        })
+      },
+      createSale(){
+        if (!this.multipleSelection.length) {
+          this.$message({
+            type: 'error',
+            message: '请选择一条数据',
+            duration: 2500,
+          })
+          return
         }
-      });
-      if (!statusFlag) {
-        this.$message({
-          type: "error",
-          message: "磅单已生产采购或者销售无法删除",
-          duration: 1000,
-        });
-        return;
-      }
-      const ids = this.multipleSelection.join();
-      this.$confirm("您确定要删除这些数据吗, 是否继续？", "提示", {
-        type: "warning",
-      })
-        .then(() => {
-          request({
-            url: `/api/poundlist/Poundlist/batchRemove/${ids}`,
-            method: "DELETE",
-          }).then((res) => {
+        const ids = this.multipleSelection.join()
+        request({
+          url: `/api/poundlist/Poundlist/createsale/${ids}`,
+          method: 'post'
+        }).then(res => {
+          var list = []
+          for (let i = 0; i < res.data.length; i++) {
+            // res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
+            //   10) : '';
+
+            let _data = res.data[i]
+            list.push(_data)
+          }
+          if (list.length>0) {
+            // this.list = _list
+            this.formVisible4 = true
+            this.$nextTick(() => {
+              this.$refs.JNPFForm4.init(list)
+            })
+          }else {
             this.$message({
-              type: "success",
-              message: res.msg,
-              onClose: () => {
-                this.initData();
-              },
+              message: '未找到符合条件数据',
+              type: 'error',
+              duration: 1000
+            })
+          }
+          // this.$message({
+          //   type: 'success',
+          //   message: res.msg,
+          //   onClose: () => {
+          //     this.initData()
+          //   }
+          // });
+        })
+      },
+			handleBatchRemoveDel() {
+				if (!this.multipleSelection.length) {
+					this.$message({
+						type: 'error',
+						message: '请选择一条数据',
+						duration: 2500,
+					})
+					return
+				}
+        var statusFlag = true;
+          this.multipleSelectionItem.forEach((item, index)=>{
+            if(item.purchaseStatus != '99' || item.salesStatus != '99'){
+              statusFlag = false;
+            }
+          });
+          if(!statusFlag){
+            this.$message({
+            	type: 'error',
+            	message: '磅单已生产采购或者销售无法删除',
+              duration: 1000
             });
+            return
+          }
+				const ids = this.multipleSelection.join()
+				this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+					type: 'warning'
+				}).then(() => {
+					request({
+						url: `/api/poundlist/Poundlist/batchRemove/${ids}`,
+						method: 'DELETE'
+					}).then(res => {
+						this.$message({
+							type: 'success',
+							message: res.msg,
+							onClose: () => {
+								this.initData()
+							}
+						});
+					})
+				}).catch(() => {})
+			},
+			addOrUpdateHandle(row) {
+        debugger
+        if(row.purchaseStatus != '99' || row.salesStatus != '99'){
+          this.$message({
+            type: 'error',
+            message: '该磅单当前状态不允许编辑',
+            duration: 2500
           });
-        })
-        .catch(() => {});
-    },
-    addOrUpdateHandle(row) {
-      debugger;
-      if (row.purchaseStatus != "99" || row.salesStatus != "99") {
-        this.$message({
-          type: "error",
-          message: "该磅单当前状态不允许编辑",
-          duration: 2500,
-        });
-        return;
-      }
-      var id = undefined;
-      if (row.isInvoicing == "1") {
-        var msg = "开进项票";
+          return
+        }
+        var id = undefined;
+        if(row.isInvoicing == '1'){
+          var msg = '开进项票';
 
         this.$message({
           type: "error",
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
index 8d0297a3..0c8dcf7b 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
@@ -725,7 +725,7 @@
         isDetail: false,
         dataForm: {
           isTransfer: '',
-          purchaseOrderId: '',
+          purchaseOrderId: [],
           documentNo: '',
           contractId: '',
           customerId: '',
@@ -1001,7 +1001,8 @@
         this.dataForm.contractName = list[0].contractName
         this.dataForm.customerName = list[0].customerName
         this.dataForm.isTransfer = list.isTransfer
-        this.dataForm.purchaseOrderId = list .purchaseOrderId
+        this.dataForm.purchaseOrderId = list.purchaseOrderId
+        debugger
         var num = 0
         var amount = 0
         var advance = 0
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue
index af551068..d3c39141 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue
@@ -557,7 +557,8 @@
             sums[index] = '';
           }
         });
-
+        this.dataForm.invoiceAmount = sums[5];
+        this.dataForm.invoiceQuantity = sums[4];
         return sums;
       },
       invoiceQuantityChange(row){
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
index 59e1a7ab..3c52b251 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
@@ -547,14 +547,14 @@
         }).catch(() => {})
       },
       toSaleHandle(){
-        if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length != 1) {
-        	this.$message({
-        		type: 'error',
-        		message: '请选择一条数据',
-        		duration: 2500
-        	})
-        	return
-        }
+        // if (!this.multipleSelectionItem.length || this.multipleSelectionItem.length != 1) {
+        // 	this.$message({
+        // 		type: 'error',
+        // 		message: '请选择一条数据',
+        // 		duration: 2500
+        // 	})
+        // 	return
+        // }
         var flag = true;
         this.multipleSelectionItem.forEach((item,index) => {
           if(item.isTransfer == '1'){
@@ -571,25 +571,31 @@
         }
         console.log('aaaaaaa', this.multipleSelectionItem)
         var ids = '';
-        this.multipleSelectionItem[0].poundlistEntityList.forEach((item, index)=>{
-          ids = ids + item.id + ',';
-        });
+        this.multipleSelectionItem.forEach((item,index) => {
+          item.poundlistEntityList.forEach((item2,index) => {
+            ids = ids + item2.id + ',';
+          })
+        })
+        // this.multipleSelectionItem[0].poundlistEntityList.forEach((item, index)=>{
+        //   ids = ids + item.id + ',';
+        // });
         if(ids.length > 0){
           ids = ids.substring(0, ids.length - 1);
         }
-        debugger
         request({
           url: `/api/poundlist/Poundlist/createsale/${ids}`,
           method: 'post'
         }).then(res => {
+          var purchaseIds = '';
+          this.multipleSelectionItem.forEach((item,index) => {
+            purchaseIds = purchaseIds + item.id + ',';
+          })
           var list = []
           for (let i = 0; i < res.data.length; i++) {
-            // res.data[i].isTransfer = '1'
-            // res.data[i].purchaseOrderId = this.multipleSelectionItem[0].id
             let _data = res.data[i]
-            _data.isTransfer = '1'
-            _data.purchaseOrderId = this.multipleSelectionItem[0].id
             list.push(_data)
+            list.purchaseOrderId = purchaseIds
+            list.isTransfer = '1'
           }
           if (list.length>0) {
             this.formVisible6 = true
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue
index eac17aee..6239bf86 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form3.vue
@@ -604,6 +604,7 @@
 							this.dataForm.businessName = this.$store.state.user.userInfo.userName;
 							this.dataForm.poundDate = new Date().getTime();
 							this.loading = false
+              debugger
 						});
 					} else {
 						this.clearData(this.dataForm)
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
index bde7d12a..7e05c183 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
@@ -155,13 +155,13 @@
                            width="200">
             <template slot-scope="scope">
               <el-button type="text"
-                         @click="continueUpload(scope.row.id)" v-has="'btn_continueUpload'">继续上传
+                         @click="continueUpload(scope.row.id)" v-has="'btn_submitDisabled'">继续上传
               </el-button>
               <el-button type="text"
                          @click="addOrUpdateHandle2(scope.row.id)" v-has="'btn_addOrUpdateHandle2'">审核
               </el-button>
                <el-button type="text"
-                         @click="addOrUpdateHandle(scope.row.id)">编辑
+                         @click="addOrUpdateHandle(scope.row.id)" v-has="'btn_edit'">编辑
               </el-button>
               <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-has="'btn_remove'">删除
               </el-button>