From 3bc47ffd76fd8f34c6cba7f558040cee3775256f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Mon, 6 Mar 2023 11:59:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SaleorderitemController.java   |   7 +-
 .../scm/basicInformation/arinvoices/Form.vue  |  18 +-
 .../scm/basicInformation/collection/Form.vue  |  24 +--
 .../basicInformation/poundlist/salesForm.vue  |  26 +--
 .../scm/basicInformation/receiptout/Form.vue  |  24 +--
 .../scm/basicInformation/saleback/Form.vue    |  52 +----
 .../scm/basicInformation/saleorder/Form.vue   | 186 ++++++------------
 .../saleorder/arinvoicesForm.vue              |  38 ++--
 .../saleorder/collectionForm.vue              |  20 +-
 .../saleorder/receiptoutForm.vue              |  24 +--
 .../saleorder/salebackForm.vue                |  20 +-
 11 files changed, 169 insertions(+), 270 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 512d97ed..7ada6219 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
@@ -151,7 +151,7 @@ public class SaleorderitemController {
      * @param poundlistEntity
      * @return
      */
-    @PostMapping("/updatePrice/{id}")
+    @PutMapping("/updatePrice/{id}")
     public ActionResult updatePrice(@PathVariable("id") String id ,@RequestBody PoundlistEntity poundlistEntity){
         String ids = id;
         PoundlistEntity entity = poundlistEntity;
@@ -165,6 +165,7 @@ public class SaleorderitemController {
      * @return
      */
     @PostMapping("/delivery/{ids}")
+    @Transactional
     public ActionResult delivery(@PathVariable("ids") String ids){
         String[] idList = ids.split(",");
         List<SaleorderitemEntity> list = new ArrayList<>();
@@ -211,6 +212,7 @@ public class SaleorderitemController {
      */
 
     @PostMapping("/invoiceentry/{ids}")
+    @Transactional
     public ActionResult invoiceEntry(@PathVariable("ids") String ids){
         String[] idList = ids.split(",");
         for (String id : idList) {
@@ -261,6 +263,7 @@ public class SaleorderitemController {
      * @return
      */
     @PostMapping("/archive/{ids}")
+    @Transactional
     public ActionResult archive(@PathVariable("ids") String ids){
         String[] idList = ids.split(",");
         for (String id : idList) {
@@ -306,6 +309,7 @@ public class SaleorderitemController {
      * @return
      */
     @PostMapping("/materialback/{ids}")
+    @Transactional
     public ActionResult materialBack(@PathVariable("ids") String ids) {
         String[] idList = ids.split(",");
         List<SaleorderitemEntity> list = new ArrayList<>();
@@ -345,6 +349,7 @@ public class SaleorderitemController {
      * @return
      */
     @PostMapping("/collection/{ids}")
+    @Transactional
     public ActionResult collection(@PathVariable("ids") String ids) {
         String[] idList = ids.split(",");
         List<SaleorderitemEntity> list = new ArrayList<>();
diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
index 32a0f7b5..7b98220f 100644
--- a/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/arinvoices/Form.vue
@@ -132,7 +132,7 @@
             </div>
     <el-table :data="dataForm.arinvoices_item1List" size='mini'   >
         <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="materialId" label="物料">
+            <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="397736371898382533" :columnOptions="arinvoices_item1materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
@@ -141,21 +141,21 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="quantity" label="数量">
+            <el-table-column prop="quantity" label="数量" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.quantity"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="unitPrice" label="单价">
+            <el-table-column prop="unitPrice" label="单价" align="center" width="130">
                 <template slot-scope="scope">
                   <el-input   v-model="scope.row.unitPrice"
                               placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                   </el-input>
             </template>
         </el-table-column>
-      <el-table-column prop="unit" label="单位">
+      <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%"}'>
@@ -163,14 +163,14 @@
           </el-select>
         </template>
       </el-table-column>
-            <el-table-column prop="amount" label="金额">
+            <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%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="taxRate" label="税率 ">
+            <el-table-column prop="taxRate" label="税率 " align="center" width="130">
                 <template slot-scope="scope">
                     <el-select   v-model="scope.row.taxRate"
  placeholder="请选择"  clearable  :style='{"width":"100%"}'>
@@ -178,21 +178,21 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="taxAmount" label="税额">
+            <el-table-column prop="taxAmount" label="税额" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.taxAmount"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="amountNotTax" label="不含税金额">
+            <el-table-column prop="amountNotTax" label="不含税金额" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.amountNotTax"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="remark" label="备注信息">
+            <el-table-column prop="remark" label="备注信息" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.remark"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue
index 79df6c19..f2e9e2ce 100644
--- a/SC-web/src/views/scm/basicInformation/collection/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue
@@ -118,30 +118,26 @@
                     </div>
                     <el-table :data="dataForm.collection_item0List" size='mini' >
                       <el-table-column type="index" width="50" label="序号" align="center" />
-                      <el-table-column prop="amount" label="收款金额" align="center" >
+                      <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%"}' @change="amountSum">
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="price" label="订单金额" align="center" >
+                      <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%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="amountCollected" label="已收款金额" align="center" >
+                      <el-table-column prop="amountCollected" label="已收款金额"  align="center" width="130">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.amountCollected" placeholder="请输入" clearable
                             :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-<!--<<<<<<< HEAD-->
-                      <el-table-column prop="salesorderId" label="销售订单编号" align="center" >
-<!--=======-->
-<!--                      <el-table-column prop="deleteTime" label="销售订单编号" align="center" >-->
-<!--&gt;>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3-->
+                      <el-table-column prop="salesorderId" label="销售订单编号" align="center" width="130">
                         <template slot-scope="scope">
                           <popupSelect v-model="scope.row.salesorderId" placeholder="请选择" clearable
                             :field="'salesorderId'+scope.$index" interfaceId="393372436705378053"
@@ -151,7 +147,7 @@
                           </popupSelect>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="contractId" label="合同编号" align="center" >
+                      <el-table-column prop="contractId" label="合同编号"  align="center" width="130">
                         <template slot-scope="scope">
                           <popupSelect v-model="scope.row.contractId" placeholder="请选择" clearable
                                        :field="'contractId'+scope.$index" interfaceId="398848549678332037"
@@ -161,7 +157,7 @@
                           </popupSelect>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="num" label="数量" align="center" >
+                      <el-table-column prop="num" label="数量"  align="center" width="130">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'>
                           </el-input>
@@ -175,26 +171,26 @@
                       <!--                </el-select>-->
                       <!--            </template>-->
                       <!--        </el-table-column>-->
-                      <el-table-column prop="advanceAmount" label="垫资金额" align="center" >
+                      <el-table-column prop="advanceAmount" label="垫资金额"  align="center" width="130">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.advanceAmount" placeholder="请输入" clearable
                             :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="rate" label="税额" align="center" >
+                      <el-table-column prop="rate" label="税额"  align="center" width="130">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.rate" placeholder="请输入" clearable :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="notPrice" label="不含税金额" align="center" >
+                      <el-table-column prop="notPrice" label="不含税金额"  align="center" width="130">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.notPrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="creatorTime" label="业务日期" align="center" >
+                      <el-table-column prop="creatorTime" label="业务日期"  align="center" width="130">
                         <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">
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
index 5bbe58f2..ffbac12e 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
@@ -175,7 +175,7 @@
             </div>
     <el-table :data="dataForm.salesorder_item0List" size='mini'   >
         <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="vehicleId" label="车号">
+            <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"
@@ -185,7 +185,7 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="materialId" label="物料名称">
+            <el-table-column prop="materialId" label="物料名称" 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"
@@ -194,7 +194,7 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="poundType" label="类型">
+            <el-table-column prop="poundType" label="类型" align="center" width="110">
                 <template slot-scope="scope">
                     <el-select   v-model="scope.row.poundType"
  placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
@@ -202,14 +202,14 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="netWeight" label="净重">
+            <el-table-column prop="netWeight" label="净重" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.netWeight"
  placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="unit" label="单位">
+            <el-table-column prop="unit" label="单位" align="center" >
                 <template slot-scope="scope">
                     <el-select   v-model="scope.row.unit"
  placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
@@ -217,7 +217,7 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="advance" label="是否垫资">
+            <el-table-column prop="advance" label="是否垫资" align="center" >
                 <template slot-scope="scope">
                     <el-select   v-model="scope.row.advance"
  placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled>
@@ -225,21 +225,21 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="unitPrice" label="单价">
+            <el-table-column prop="unitPrice" label="单价" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.unitPrice"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+ placeholder="请输入"  clearable  :style='{"width":"100%"}' @change="editPrice(scope.row)">
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="settlement" label="结算重量">
+            <el-table-column prop="settlement" label="结算重量" align="center" width="130">
                 <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="rate" label="税率 ">
+            <el-table-column prop="rate" label="税率 " align="center" width="110">
                 <template slot-scope="scope">
                     <el-select   v-model="scope.row.rate"
  placeholder="请选择"  clearable  :style='{"width":"100%"}' @change="computeNoPrice">
@@ -247,21 +247,21 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="price" label="金额">
+            <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="noPrice" label="不含税金额">
+            <el-table-column prop="noPrice" label="不含税金额" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.noPrice"
  placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="remark" label="备注">
+            <el-table-column prop="remark" label="备注"align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.remark"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
index f43458ab..3eb2a7e3 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
@@ -112,7 +112,7 @@
             </div>
     <el-table :data="dataForm.receiptout_item0List" size='mini'   >
         <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="vehicleId" label="车牌号">
+            <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" :columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
@@ -121,7 +121,7 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="materialId" label="物料名称">
+            <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="398719564478785669" :columnOptions="receiptout_item0materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
@@ -130,7 +130,7 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="reservoirareaId" label="库区名称">
+            <el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">
                 <template slot-scope="scope">
                     <popupSelect   v-model="scope.row.reservoirareaId"
  placeholder="请选择"  clearable  :field="'reservoirareaId'+scope.$index"  interfaceId="392939299932268421" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
@@ -139,7 +139,7 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="warehouseId" label="仓库名称">
+            <el-table-column prop="warehouseId" label="仓库名称" align="center" width="130">
                 <template slot-scope="scope">
                   <popupSelect   v-model="scope.row.warehouseId"
                                  placeholder="请选择"  clearable  :field="'reservoirareaId'+scope.$index"  interfaceId="399117969575232581" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog"
@@ -147,14 +147,14 @@
                   </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="deliveryNum" label="出库数量">
+            <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%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="unit" label="计量单位">
+            <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%"}'>
@@ -162,14 +162,14 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="price" label="单价">
+            <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%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="rate" label="税率">
+            <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%"}'>
@@ -177,28 +177,28 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="amount" label="金额">
+            <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%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="rateAmount" label="税额">
+            <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%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="batchNo" label="批次号">
+            <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%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="poundType" label="磅单类型">
+            <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%"}'>
diff --git a/SC-web/src/views/scm/basicInformation/saleback/Form.vue b/SC-web/src/views/scm/basicInformation/saleback/Form.vue
index f7b2133d..9bf80ece 100644
--- a/SC-web/src/views/scm/basicInformation/saleback/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleback/Form.vue
@@ -64,19 +64,7 @@
 										</div>
 										<el-table :data="dataForm.saleback_item0List" size='mini'>
 											<el-table-column type="index" width="50" label="序号" align="center" />
-<!--<<<<<<< HEAD-->
-<!--											<el-table-column prop="licenseNum" label="车牌号">-->
-<!--												<template slot-scope="scope">-->
-<!--													<popupSelect v-model="scope.row.licenseNum" placeholder="请选择"-->
-<!--														clearable :field="'licenseNum'+scope.$index"-->
-<!--														interfaceId="383568082196537541" :bissId="dataForm.salesOrderId" :excludeFields="excludeFields"-->
-<!--														:columnOptions="saleback_item0licenseNumcolumnOptions"-->
-<!--														propsValue="license_num" relationField="license_num"-->
-<!--														popupType="dialog" popupWidth="800px" @change="popupSelectChange2">-->
-<!--													</popupSelect>-->
-<!--												</template>-->
-<!--											</el-table-column>-->
-                      <el-table-column prop="vehicleId" label="车辆ID">
+                      <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="400554150653457925"
@@ -86,7 +74,7 @@
                           </popupSelect>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="materialId" label="物料名称">
+                      <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="381037852907038533" :columnOptions="jg_salesback_item0materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
@@ -94,34 +82,14 @@
                           </popupSelect>
                         </template>
                       </el-table-column>
-<!--=======-->
-<!--											<el-table-column prop="licenseNum" label="车牌号">-->
-<!--												<template slot-scope="scope">-->
-<!--													<popupSelect v-model="scope.row.licenseNum" placeholder="请选择"-->
-<!--														clearable :field="'licenseNum'+scope.$index"-->
-<!--														interfaceId="383568082196537541" :bissId="dataForm.salesOrderId" :excludeFields="excludeFields"-->
-<!--														:columnOptions="saleback_item0licenseNumcolumnOptions"-->
-<!--														propsValue="license_num" relationField="license_num"-->
-<!--														popupType="dialog" popupWidth="800px" @change="popupSelectChange2">-->
-<!--													</popupSelect>-->
-<!--												</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%"}'>-->
-<!--													</el-input>-->
-<!--												</template>-->
-<!--											</el-table-column>-->
-<!--&gt;>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3-->
-											<el-table-column prop="settlement" label="结算重量 ">
+											<el-table-column prop="settlement" label="结算重量 " align="center" width="130">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.settlement" placeholder="请输入" clearable
 														:style='{"width":"100%"}'>
 													</el-input>
 												</template>
 											</el-table-column>
-											<el-table-column prop="unit" label="计量单位 ">
+											<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%"}'>
@@ -131,14 +99,14 @@
 													</el-select>
 												</template>
 											</el-table-column>
-											<el-table-column prop="price" label="采购单价">
+											<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%"}'>
 													</el-input>
 												</template>
 											</el-table-column>
-											<el-table-column prop="rate" label="税率">
+											<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%"}'>
@@ -148,21 +116,21 @@
 													</el-select>
 												</template>
 											</el-table-column>
-											<el-table-column prop="amount" label="应退金额">
+											<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%"}'>
 													</el-input>
 												</template>
 											</el-table-column>
-											<el-table-column prop="notAmount" label="税额">
+											<el-table-column prop="notAmount" label="税额" align="center" width="130">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.notAmount" placeholder="请输入" clearable
 														:style='{"width":"100%"}'>
 													</el-input>
 												</template>
 											</el-table-column>
-                      <el-table-column prop="businessId" label="业务员">
+                      <el-table-column prop="businessId" label="业务员" align="center" width="130">
                         <template slot-scope="scope">
                           <popupSelect   v-model="scope.row.businessId"
                                          placeholder="请选择"  clearable  :field="'businessId'+scope.$index"  interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="jg_salesback_item0businessIdcolumnOptions" propsValue="F_Id" relationField="F_RealName" popupType="dialog"
@@ -170,7 +138,7 @@
                           </popupSelect>
                         </template>
                       </el-table-column>
-											<el-table-column prop="pountType" label="磅单类型 ">
+											<el-table-column prop="pountType" label="磅单类型 " align="center" width="130">
 												<template slot-scope="scope">
 													<el-select v-model="scope.row.pountType" placeholder="请选择" clearable
 														:style='{"width":"100%"}'>
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
index ab7dcbc9..d532e932 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
@@ -34,36 +34,6 @@
  placeholder="请选择"  clearable  field="costomerCode" interfaceId="398016916830126469"  :columnOptions="costomerCodecolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
  popupTitle="选择数据"  popupWidth="800px"
   >
-<!--=======-->
-<!--  <el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body-->
-<!--    :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1500px">-->
-<!--    <el-row :gutter="15" class="">-->
-<!--      <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">-->
-<!--        <template v-if="!loading">-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="单据编号" prop="documentNo">-->
-<!--              <el-input v-model="dataForm.documentNo" placeholder="系统自动生成" readonly>-->
-
-<!--              </el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="合同名称" prop="contractName">-->
-<!--              <popupSelect v-model="dataForm.contractName" placeholder="请选择" clearable field="contractName"-->
-<!--                interfaceId="391146878474963333" :columnOptions="contractNamecolumnOptions" propsValue="contract_name"-->
-<!--                relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"-->
-<!--                @change="popupSelectChange">-->
-
-<!--              </popupSelect>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="币别" prop="currency">-->
-<!--              <el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'>-->
-<!--                <el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id"-->
-<!--                  :disabled="item.disabled"></el-option>-->
-<!--&gt;>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3-->
-
                 </popupSelect>
                 </el-form-item>
             </el-col>
@@ -131,91 +101,7 @@
                 </el-input>
                 </el-form-item>
             </el-col>
-<!--            <el-col :span="8" >
-                <el-form-item  label="已回款金额"
- prop="amountCollected" >
-                    <el-input    v-model="dataForm.amountCollected"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="发票数量"
- prop="invoiceNum" >
-                    <el-input    v-model="dataForm.invoiceNum"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="发票金额"
- prop="invoiceAmount" >
-                    <el-input    v-model="dataForm.invoiceAmount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
-<<<<<<< HEAD
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="单据状态 "
- prop="status" >
-                    <el-select    v-model="dataForm.status"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
-
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="ERP订单号"
- prop="erpNo" >
-                    <el-input    v-model="dataForm.erpNo"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-=======
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="来源系统" prop="sourceSystem">
-              <el-select v-model="dataForm.sourceSystem" placeholder="请选择" clearable :style='{"width":"100%"}'>
-                <el-option v-for="(item, index) in sourceSystemOptions" :key="index" :label="item.fullName"
-                  :value="item.id" :disabled="item.disabled"></el-option>
-
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="单据状态 " prop="status">
-              <el-select v-model="dataForm.status" placeholder="请选择" clearable :style='{"width":"100%"}'>
-                <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
-                  :disabled="item.disabled"></el-option>
->>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3
-
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="制单人"
- prop="creatorUserName" >
-                    <el-input    v-model="dataForm.creatorUserName"
- placeholder="系统自动生成"  readonly >
-
-<<<<<<< HEAD
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="制单时间"
- prop="creatorTime" >
-                    <el-input    v-model="dataForm.creatorTime"
- placeholder="系统自动生成"  readonly >
-
-                </el-input>
-                </el-form-item>
-            </el-col>-->
             <el-col :span="24">
                 <el-tabs  v-model="activemtmitd"  tab-position="top" class="mb-20">
                 <el-tab-pane  label="磅单信息">
@@ -226,7 +112,7 @@
             </div>
     <el-table :data="dataForm.salesorder_item0List" size='mini' show-summary :summary-method="getSummaries" >
         <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="vehicleId" label="车号">
+            <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="391151974030035653"
@@ -236,7 +122,7 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="materialId" label="物料名称">
+            <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"
@@ -245,7 +131,7 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="poundType" label="类型">
+            <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%"}'>
@@ -253,14 +139,14 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="netWeight" label="净重">
+            <el-table-column prop="netWeight" label="净重" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.netWeight"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="unit" label="单位">
+            <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%"}'>
@@ -268,7 +154,7 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="advance" label="是否垫资">
+            <el-table-column prop="advance" label="是否垫资" align="center" width="130">
                 <template slot-scope="scope">
                     <el-select   v-model="scope.row.advance"
  placeholder="请选择"  clearable  :style='{"width":"100%"}'>
@@ -276,21 +162,21 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="unitPrice" label="单价">
+            <el-table-column prop="unitPrice" label="单价" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.unitPrice"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+ placeholder="请输入"  clearable  :style='{"width":"100%"}' @change="editUnitPrice(scope.row)">
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="settlement" label="结算重量">
+            <el-table-column prop="settlement" label="结算重量" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.settlement"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="rate" label="税率 ">
+            <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">
@@ -298,21 +184,21 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="price" label="金额">
+            <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%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="noPrice" label="不含税金额">
+            <el-table-column prop="noPrice" label="不含税金额" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.noPrice"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="remark" label="备注">
+            <el-table-column prop="remark" label="备注" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.remark"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
@@ -730,7 +616,6 @@
     </el-dialog>
 </template>
 <script>
-// <<<<<<< HEAD
     import request from '@/utils/request'
     import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
     import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
@@ -810,6 +695,51 @@
         },
         mounted() {},
         methods: {
+          editUnitPrice(row){
+            debugger
+            var advanceAmount = 0;
+            var price = 0;
+            var notPrice = 0;
+            this.dataForm.salesorder_item0List.forEach((item, index)=>{
+              if(row.vehicleId == item.vehicleId){
+                debugger
+                if (item.remark == null || item.remark === ""){
+                  debugger
+                  this.$message({
+                    type: 'warning',
+                    message: '请在备注说明修改单价原因',
+                    duration: 1500,
+                  })
+                  return
+                }
+                item.price = parseFloat(item.settlement) * parseFloat(item.unitPrice);//子表金额
+                this.taxRateOptions.forEach((item2)=>{
+                  if(item2.id == row.rate){
+                    item.noPrice = item.price * (100 - item2.fullName) / 100;//子表不含税金额
+                  }
+                });
+                // request({
+                //   url: '/api/saleorder/Saleorderitem/updatePrice'+row.poundlistId,
+                //   method: 'PUT',
+                //   data: item.price
+                // }).then((res) => {
+                //   this.$message({
+                //     message: res.msg,
+                //     type: 'success',
+                //     duration: 1000,
+                //   })
+                // })
+              }
+              if(item.advance == '1'){//垫资
+                advanceAmount = advanceAmount + item.price;//垫资金额
+              }
+              price = price + item.price;//主表金额
+              notPrice = notPrice + parseFloat(item.noPrice);//主表不含税金额
+            });
+            this.dataForm.advanceAmount = advanceAmount;
+            this.dataForm.price = price;
+            this.dataForm.notPrice = notPrice;
+          },
           computeNoPrice(){
             let notPrice = 0;
             for (let i = 0;i<this.dataForm.salesorder_item0List.length;i++) {
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
index 3dc387b3..e70a3b34 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/arinvoicesForm.vue
@@ -132,7 +132,7 @@
             </div>
     <el-table :data="dataForm.arinvoices_item1List" size='mini'   >
         <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="materialId" label="物料">
+            <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="397736371898382533" :columnOptions="arinvoices_item1materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
@@ -141,21 +141,21 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="quantity" label="数量">
+            <el-table-column prop="quantity" label="数量" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.quantity"
  placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="unitPrice" label="单价">
+            <el-table-column prop="unitPrice" label="单价" align="center" width="130">
                 <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="unit" label="单位">
+      <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>
@@ -163,14 +163,14 @@
           </el-select>
         </template>
       </el-table-column>
-            <el-table-column prop="amount" label="金额">
+            <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="taxRate" label="税率 ">
+            <el-table-column prop="taxRate" label="税率 " align="center" width="130">
                 <template slot-scope="scope">
                     <el-select   v-model="scope.row.taxRate"
  placeholder="请选择"  clearable  :style='{"width":"100%"}' disabled @change="computeAmount">
@@ -178,21 +178,21 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="taxAmount" label="税额">
+            <el-table-column prop="taxAmount" label="税额" align="center" width="130">
                 <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="amountNotTax" label="不含税金额">
+            <el-table-column prop="amountNotTax" label="不含税金额" align="center" width="130">
                 <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="remark" label="备注信息">
+            <el-table-column prop="remark" label="备注信息" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.remark"
  placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
@@ -219,35 +219,35 @@
             </div>
     <el-table :data="dataForm.arinvoices_item0List" size='mini'   >
         <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="invoiceCode" label="发票代码">
+            <el-table-column prop="invoiceCode" label="发票代码" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.invoiceCode"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="invoiceNo" label="发票号码">
+            <el-table-column prop="invoiceNo" label="发票号码" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.invoiceNo"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="invoiceQuantity" label="发票数量">
+            <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%"}' @change="invoiceQuantitySum">
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="involceAmount" label="发票金额">
+            <el-table-column prop="involceAmount" label="发票金额" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.involceAmount"
  placeholder="请输入"  clearable  :style='{"width":"100%"}' @change="involceAmountSum">
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="taxRate" label="税率 ">
+            <el-table-column prop="taxRate" label="税率 " align="center" width="130">
                 <template slot-scope="scope">
                     <el-select   v-model="scope.row.taxRate"
  placeholder="请选择"  clearable  :style='{"width":"100%"}' @change="rateCompute">
@@ -255,21 +255,21 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="taxAmount" label="税额">
+            <el-table-column prop="taxAmount" label="税额" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.taxAmount"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="amountNotTax" label="不含税金额">
+            <el-table-column prop="amountNotTax" label="不含税金额" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.amountNotTax"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="invoiceStatus" label="发票状态">
+            <el-table-column prop="invoiceStatus" label="发票状态" align="center" width="130">
                 <template slot-scope="scope">
                     <el-select   v-model="scope.row.invoiceStatus"
  placeholder="请选择"  clearable  :style='{"width":"100%"}' >
@@ -277,14 +277,14 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="creatorUserName" label="开票人">
+            <el-table-column prop="creatorUserName" label="开票人" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.creatorUserName"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="invoiceDate" label="开票日期">
+            <el-table-column prop="invoiceDate" label="开票日期" align="center" width="130">
                 <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" >
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
index d7f7a8dd..8db38349 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/collectionForm.vue
@@ -130,28 +130,28 @@
             </div>
     <el-table :data="dataForm.collection_item0List" size='mini'   >
         <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="amount" label="收款金额">
+            <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%"}'  @change="amountSum">
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="price" label="订单金额">
+            <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="amountCollected" label="已收款金额">
+            <el-table-column prop="amountCollected" label="已收款金额" align="center" width="130">
                 <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="salesorderId" label="销售订单">
+            <el-table-column prop="salesorderId" label="销售订单" align="center" width="130">
                 <template slot-scope="scope">
                     <popupSelect   v-model="scope.row.salesorderId"
  placeholder="请选择"  clearable  :field="'salesorderId'+scope.$index"  interfaceId="399077559599480261" :columnOptions="collection_item0salesorderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
@@ -160,7 +160,7 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="contractId" label="合同编码">
+            <el-table-column prop="contractId" label="合同编码" align="center" width="130">
                 <template slot-scope="scope">
                     <popupSelect   v-model="scope.row.contractId"
  placeholder="请选择"  clearable  :field="'deleteTime'+scope.$index"  interfaceId="398848549678332037" :columnOptions="collection_item0deleteTimecolumnOptions" propsValue="id" relationField="contract_code" popupType="dialog"
@@ -169,35 +169,35 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="num" label="重量">
+            <el-table-column prop="num" label="重量" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.num"
  placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="advanceAmount" label="垫资金额">
+            <el-table-column prop="advanceAmount" label="垫资金额" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.advanceAmount"
  placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="rate" label="税额">
+            <el-table-column prop="rate" label="税额" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.rate"
  placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="notPrice" label="不含税金额">
+            <el-table-column prop="notPrice" label="不含税金额" align="center" width="130">
                 <template slot-scope="scope">
                     <el-input   v-model="scope.row.notPrice"
  placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
                 </el-input>
             </template>
         </el-table-column>
-            <el-table-column prop="creatorTime" label="业务日期">
+            <el-table-column prop="creatorTime" label="业务日期" align="center" width="130">
                 <template slot-scope="scope">
                     <el-date-picker   v-model="scope.row.creatorTime"
  placeholder="请选择"  clearable  :style='{"width":"200%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp"  disabled>
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
index 0c6f1d23..7e7ecf24 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/receiptoutForm.vue
@@ -112,7 +112,7 @@
             </div>
     <el-table :data="dataForm.receiptout_item0List" size='mini'   >
         <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="vehicleId" label="车牌号">
+            <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" :columnOptions="receiptout_item0vehicleIdcolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
@@ -121,7 +121,7 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="materialId" label="物料名称">
+            <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="398719564478785669" :columnOptions="receiptout_item0materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
@@ -130,7 +130,7 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="reservoirareaId" label="库区名称">
+            <el-table-column prop="reservoirareaId" label="库区名称" align="center" width="130">
                 <template slot-scope="scope">
                     <popupSelect   v-model="scope.row.reservoirareaId"
  placeholder="请选择"  clearable  :field="'reservoirareaId'+scope.$index"  interfaceId="381404161809350213" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="areaname" popupType="dialog"
@@ -139,7 +139,7 @@
                 </popupSelect>
             </template>
         </el-table-column>
-            <el-table-column prop="warehouseId" label="仓库名称">
+            <el-table-column prop="warehouseId" label="仓库名称" align="center" width="130">
                 <template slot-scope="scope">
                   <popupSelect   v-model="scope.row.warehouseId"
                                  placeholder="请选择"  clearable  :field="'reservoirareaId'+scope.$index"  interfaceId="399117969575232581" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog"
@@ -147,21 +147,21 @@
                   </popupSelect>
             </template>
         </el-table-column>
-      <el-table-column prop="batchNo" label="批次号">
+      <el-table-column prop="batchNo" label="批次号" align="center" width="180">
         <template slot-scope="scope">
           <el-input   v-model="scope.row.batchNo"
                       placeholder="系统自动生成"  readonly>
           </el-input>
         </template>
       </el-table-column>
-            <el-table-column prop="deliveryNum" label="出库数量">
+            <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="计量单位">
+            <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>
@@ -169,14 +169,14 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="price" label="单价">
+            <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="税率">
+            <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>
@@ -184,21 +184,21 @@
                 </el-select>
             </template>
         </el-table-column>
-            <el-table-column prop="amount" label="金额">
+            <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="税额">
+            <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="poundType" label="磅单类型">
+            <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>
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue b/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
index 178d42d2..18d3058c 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/salebackForm.vue
@@ -75,7 +75,7 @@
 <!--													</popupSelect>-->
 <!--												</template>-->
 <!--											</el-table-column>-->
-                      <el-table-column prop="vehicleId" label="车辆ID">
+                      <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="400554150653457925"
@@ -85,7 +85,7 @@
                           </popupSelect>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="materialId" label="物料名称">
+                      <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="381037852907038533" :columnOptions="jg_salesback_item0materialIdcolumnOptions" propsValue="id" relationField="item_name" popupType="dialog"
@@ -93,14 +93,14 @@
                           </popupSelect>
                         </template>
                       </el-table-column>
-											<el-table-column prop="settlement" label="结算重量 ">
+											<el-table-column prop="settlement" label="结算重量 " align="center" width="130">
 												<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="unit" label="计量单位 ">
+											<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>
@@ -110,14 +110,14 @@
 													</el-select>
 												</template>
 											</el-table-column>
-											<el-table-column prop="price" label="销售单价">
+											<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="税率">
+											<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>
@@ -127,21 +127,21 @@
 													</el-select>
 												</template>
 											</el-table-column>
-											<el-table-column prop="amount" label="应退金额">
+											<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="notAmount" label="税额">
+											<el-table-column prop="notAmount" label="税额" align="center" width="130">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.notAmount" placeholder="请输入" clearable
 														:style='{"width":"100%"}' disabled>
 													</el-input>
 												</template>
 											</el-table-column>
-                      <el-table-column prop="businessId" label="业务员">
+                      <el-table-column prop="businessId" label="业务员" align="center" width="130">
                         <template slot-scope="scope">
                           <popupSelect   v-model="scope.row.businessId"
                                          placeholder="请选择"  clearable  :field="'businessId'+scope.$index"  interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="jg_salesback_item0businessIdcolumnOptions" propsValue="F_Id" relationField="F_RealName" popupType="dialog"
@@ -149,7 +149,7 @@
                           </popupSelect>
                         </template>
                       </el-table-column>
-											<el-table-column prop="pountType" label="磅单类型 ">
+											<el-table-column prop="pountType" label="磅单类型 " align="center" width="130">
 												<template slot-scope="scope">
 													<el-select v-model="scope.row.pountType" placeholder="请选择" clearable
 														:style='{"width":"100%"}' disabled>