From abafa47f5fa93a4f12953c9a20d6223ac28a6437 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 08:35:21 +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   |   4 +-
 .../scm/basicInformation/receiptout/index.vue | 105 +-
 .../scm/basicInformation/saleorder/Form.vue   | 943 ------------------
 .../scm/basicInformation/saleorder/index.vue  |  32 +-
 4 files changed, 23 insertions(+), 1061 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 51a50f76..512d97ed 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
@@ -186,7 +186,9 @@ public class SaleorderitemController {
                         QueryWrapper<ReservoirareaEntity> queryWrapper3 = new QueryWrapper<>();
                         queryWrapper3.lambda().eq(ReservoirareaEntity::getId,materialEntity.getOutArea());
                         ReservoirareaEntity reservoirareaEntity = reservoirareaService.getOne(queryWrapper3);
-                        entity.setWarehouseId(reservoirareaEntity.getWarehouseId());
+                        if (ObjectUtils.isNotEmpty(reservoirareaEntity)) {
+                            entity.setWarehouseId(reservoirareaEntity.getWarehouseId());
+                        }
                     }
                     QueryWrapper<PoundlistEntity> queryWrapper3 = new QueryWrapper<>();
                     queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId());
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/index.vue b/SC-web/src/views/scm/basicInformation/receiptout/index.vue
index 894959bd..a5075600 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/index.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/index.vue
@@ -1,99 +1,5 @@
 <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.documentNo" placeholder="请输入" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="业务类型">
-              <el-select v-model="query.type" placeholder="请选择" clearable>
-                <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id"
-                           :disabled="item.disabled"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="客户名称">
-              <el-input v-model="query.customerName" placeholder="请输入" clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <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="reset()">重置</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" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
-            </el-button>
-            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
-            </el-button>
-            <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
-            </el-button>
-            <el-button type="text" icon="el-icon-check" @click="exportData()">审核
-            </el-button>
-            <el-button type="text" icon="el-icon-close" @click="exportData()">弃审
-            </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 :hasNO="false"
-                    @selection-change="handleSelectionChange" border>
-          <el-table-column type="index" width="50" label="序号" fixed="left" align="center"/>
-          <el-table-column prop="documentNo" label="单据编号" width="200" sortable align="center" fixed="left"/>
-          <el-table-column prop="customerName" label="客户名称" width="150" sortable align="center" fixed="left"/>
-          <el-table-column prop="amount" label="出库金额" width="120" sortable align="center"/>
-          <el-table-column prop="num" label="出库数量" width="120" sortable align="center"/>
-          <el-table-column label="币别" width="80" sortable prop="currency" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.currency | dynamicText(currencyOptions) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="issueDate" label="出库日期" width="120" sortable align="center" sortable="custom"/>
-          <el-table-column prop="sourceNo" label="来源单号" width="200" sortable align="center"/>
-          <el-table-column label="业务类型" width="120" sortable prop="type" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.type | dynamicText(typeOptions) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="remark" label="备注" width="120" sortable align="center"/>
-          <el-table-column label="单据状态" width="120" sortable prop="status" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.status | dynamicText(statusOptions) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="creatorTime" label="创建时间" width="120" sortable align="center"/>
-          <el-table-column prop="creatorUserName" label="创建人名称" width="120" sortable align="center"/>
-          <el-table-column label="操作" fixed="right" width="150">
-            <template slot-scope="scope">
-              <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
-              </el-button>
-              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
-              </el-button>
-              <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
-              </el-button>
-            </template>
-          </el-table-column>
-        </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-                    @pagination="initData"/>
-      </div>
-
       <div class="JNPF-common-layout-center">
         <el-row class="JNPF-common-search-box" :gutter="16">
           <el-form @submit.native.prevent>
@@ -123,7 +29,7 @@
         <div class="JNPF-common-layout-main JNPF-flex-main">
           <div class="JNPF-common-head">
             <div>
-              <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+              <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
               </el-button>
               <el-button type="text" icon="el-icon-download" @click="exportData()">导出
               </el-button>
@@ -179,13 +85,11 @@
             <el-table-column label="操作" fixed="right"
                              width="150">
               <template slot-scope="scope">
-                <el-button type="text"
-                           @click="addOrUpdateHandle(scope.row.id)">编辑
+                <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
                 </el-button>
-                <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+                <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
                 </el-button>
-                <el-button type="text"
-                           @click="goDetail(scope.row.id)">详情
+                <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
                 </el-button>
               </template>
             </el-table-column>
@@ -199,7 +103,6 @@
       <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
 
     </div>
-  </div>
 </template>
 
 <script>
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
index e174adbb..ab7dcbc9 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
@@ -322,433 +322,6 @@
     <el-table-column label="操作" width="50" >
         <template slot-scope="scope">
             <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delsalesorder_item0List(scope.$index)">删除</el-button>
-<!--=======-->
-<!--              </el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="24">-->
-<!--            <el-tabs v-model="activexvlbvm" tab-position="top" class="mb-20">-->
-<!--              <el-tab-pane label="磅单信息">-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item label-width="0">-->
-<!--                    <div class="JNPF-common-title">-->
-<!--                      <h2></h2>-->
-<!--                    </div>-->
-<!--                    <el-table :data="dataForm.salesorder_item0List" size='mini'>-->
-<!--                      <el-table-column type="index" width="50" label="序号" align="center" />-->
-<!--                      <el-table-column prop="licenseNum" label="车牌号">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <popupSelect v-model="scope.row.licenseNum" placeholder="请选择" clearable-->
-<!--                            :field="'licenseNum'+scope.$index" interfaceId="391151974030035653"-->
-<!--                            :bissId="dataForm.contractCode" :columnOptions="salesorder_item0licenseNumcolumnOptions"-->
-<!--                            propsValue="license_no" relationField="license_no" popupType="dialog"-->
-<!--                            @change="popupSelectChange2" popupWidth="800px">-->
-
-<!--                       </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>-->
-<!--                      <el-table-column prop="poundType" label="类型">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-select v-model="scope.row.poundType" placeholder="请选择" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                            <el-option v-for="(item, index) in poundTypeOptions" :key="index" :label="item.fullName"-->
-<!--                              :value="item.id" :disabled="item.disabled"></el-option>-->
-<!--                          </el-select>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="netWeight" label="净重">-->
-<!--                        <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="单位">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-select v-model="scope.row.unit" placeholder="请选择" clearable :style='{"width":"100%"}'>-->
-<!--                            <el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName"-->
-<!--                              :value="item.id" :disabled="item.disabled"></el-option>-->
-<!--                          </el-select>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="advance" label="是否垫资">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-select v-model="scope.row.advance" placeholder="请选择" clearable :style='{"width":"100%"}'>-->
-<!--                            <el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"-->
-<!--                              :value="item.id" :disabled="item.disabled"></el-option>-->
-<!--                          </el-select>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="unitPrice" label="含税单价">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.unitPrice" placeholder="请输入" clearable :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="settlement" label="结算重量">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.settlement" placeholder="请输入" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="rate" label="税率 ">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-select v-model="scope.row.rate" placeholder="请选择" clearable :style='{"width":"100%"}'>-->
-<!--                            <el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName"-->
-<!--                              :value="item.id" :disabled="item.disabled"></el-option>-->
-<!--                          </el-select>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="price" label="金额">-->
-<!--                        <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="不含税金额">-->
-<!--                        <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="poundPictures" label="磅单图片">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <JNPF-UploadImg v-model="scope.row.poundPictures" :fileSize="500" sizeUnit="MB" :limit="9">-->
-
-<!--                          </JNPF-UploadImg>-->
-<!--                          &lt;!&ndash;                    <el-input   v-model="scope.row.poundPictures"&ndash;&gt;-->
-<!--                          &lt;!&ndash; placeholder="请输入"  clearable  :style='{"width":"100%"}'>&ndash;&gt;-->
-<!--                          &lt;!&ndash;                </el-input>&ndash;&gt;-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="vehiclePictures" label="车辆图片">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.vehiclePictures" placeholder="请输入" clearable-->
-<!--                            :style='{"width":"300%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column label="操作" width="50">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-button size="mini" type="text" class="JNPF-table-delBtn"-->
-<!--                            @click="delsalesorder_item0List(scope.$index)">删除</el-button>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                    </el-table>-->
-<!--                    <div class="table-actions" @click="addsalesorder_item0List()">-->
-<!--                      <el-button type="text" icon="el-icon-plus">添加</el-button>-->
-<!--                    </div>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-tab-pane>-->
-<!--              <el-tab-pane label="发货信息">-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item label-width="0">-->
-<!--                    <div class="JNPF-common-title">-->
-<!--                      <h2></h2>-->
-<!--                    </div>-->
-<!--                    <el-table :data="dataForm.receiptoutsoitemList" size='mini'>-->
-<!--                      <el-table-column type="index" width="50" label="序号" align="center" />-->
-<!--                      <el-table-column prop="documentNo" label="出库单号">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.documentNo" placeholder="请输入" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="issueDate" label="出库日期 ">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-date-picker v-model="scope.row.issueDate" placeholder="请选择" clearable-->
-<!--                            :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">-->
-<!--                          </el-date-picker>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="num" label="出库数量">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="amount" label="出库金额">-->
-<!--                        <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 label="操作" width="50">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-button size="mini" type="text" class="JNPF-table-delBtn"-->
-<!--                            @click="delreceiptoutsoitemList(scope.$index)">删除</el-button>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                    </el-table>-->
-<!--                    <div class="table-actions" @click="addreceiptoutsoitemList()">-->
-<!--                      <el-button type="text" icon="el-icon-plus">添加</el-button>-->
-<!--                    </div>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-tab-pane>-->
-<!--              <el-tab-pane label="收款信息">-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item label-width="0">-->
-<!--                    <div class="JNPF-common-title">-->
-<!--                      <h2></h2>-->
-<!--                    </div>-->
-<!--                    <el-table :data="dataForm.collectionsoitemList" size='mini'>-->
-<!--                      <el-table-column type="index" width="50" label="序号" align="center" />-->
-<!--                      <el-table-column prop="paymentType" label="收款类型 ">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-select v-model="scope.row.paymentType" placeholder="请选择" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                            <el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName"-->
-<!--                              :value="item.id" :disabled="item.disabled"></el-option>-->
-<!--                          </el-select>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="amountCollected" label="收款金额">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.amountCollected" placeholder="请输入" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="remark" label="备注">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column label="操作" width="50">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-button size="mini" type="text" class="JNPF-table-delBtn"-->
-<!--                            @click="delcollectionsoitemList(scope.$index)">删除</el-button>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                    </el-table>-->
-<!--                    <div class="table-actions" @click="addcollectionsoitemList()">-->
-<!--                      <el-button type="text" icon="el-icon-plus">添加</el-button>-->
-<!--                    </div>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-tab-pane>-->
-<!--              <el-tab-pane label="发票信息">-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item label-width="0">-->
-<!--                    <div class="JNPF-common-title">-->
-<!--                      <h2></h2>-->
-<!--                    </div>-->
-<!--                    <el-table :data="dataForm.arinvoices_item0soitemList" size='mini'>-->
-<!--                      <el-table-column type="index" width="50" label="序号" align="center" />-->
-<!--                      <el-table-column prop="invoiceNo" label="发票编号">-->
-<!--                        <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="invoiceCode" label="发票代码">-->
-<!--                        <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="involceAmount" label="发票金额">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.involceAmount" placeholder="请输入" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="invoiceQuantity" label="发票数量">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.invoiceQuantity" placeholder="请输入" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="taxRate" label="税率 ">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-select v-model="scope.row.taxRate" placeholder="请选择" clearable :style='{"width":"100%"}'>-->
-<!--                            <el-option v-for="(item, index) in taxRateOptions" :key="index" :label="item.fullName"-->
-<!--                              :value="item.id" :disabled="item.disabled"></el-option>-->
-<!--                          </el-select>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="amountNotTax" label="不含税金额">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.amountNotTax" placeholder="请输入" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="taxAmount" label="税额">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.taxAmount" placeholder="请输入" clearable :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="invoiceStatus" label="发票状态 ">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-select v-model="scope.row.invoiceStatus" placeholder="请选择" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                            <el-option v-for="(item, index) in invoiceStatusOptions" :key="index" :label="item.fullName"-->
-<!--                              :value="item.id" :disabled="item.disabled"></el-option>-->
-<!--                          </el-select>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="creatorUserName" label="开票人">-->
-<!--                        <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="开票日期">-->
-<!--                        <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">-->
-<!--                          </el-date-picker>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="attachMent" label="发票附件 ">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <JNPF-UploadFz v-model="scope.row.attachMent" :fileSize="5" sizeUnit="MB" :limit="9"-->
-<!--                            buttonText="点击上传">-->
-<!--                          </JNPF-UploadFz>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column label="操作" width="50">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-button size="mini" type="text" class="JNPF-table-delBtn"-->
-<!--                            @click="delarinvoices_item0soitemList(scope.$index)">删除</el-button>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                    </el-table>-->
-<!--                    <div class="table-actions" @click="addarinvoices_item0soitemList()">-->
-<!--                      <el-button type="text" icon="el-icon-plus">添加</el-button>-->
-<!--                    </div>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-tab-pane>-->
-<!--              <el-tab-pane label="费用信息">-->
-<!--              </el-tab-pane>-->
-<!--              <el-tab-pane label="退货信息">-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item label-width="0">-->
-<!--                    <div class="JNPF-common-title">-->
-<!--                      <h2></h2>-->
-<!--                    </div>-->
-<!--                    <el-table :data="dataForm.salesbacksoitemList" size='mini'>-->
-<!--                      <el-table-column type="index" width="50" label="序号" align="center" />-->
-<!--                      <el-table-column prop="documentNo" label="退货单号">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.documentNo" placeholder="请输入" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="refundNum" label="退货数量">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.refundNum" placeholder="请输入" clearable :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="refundAmount" label="退款金额">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.refundAmount" placeholder="请输入" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="creatorTime" label="退货日期">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-date-picker v-model="scope.row.creatorTime" placeholder="请选择" clearable-->
-<!--                            :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">-->
-<!--                          </el-date-picker>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column label="操作" width="50">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-button size="mini" type="text" class="JNPF-table-delBtn"-->
-<!--                            @click="delsalesbacksoitemList(scope.$index)">删除</el-button>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                    </el-table>-->
-<!--                    <div class="table-actions" @click="addsalesbacksoitemList()">-->
-<!--                      <el-button type="text" icon="el-icon-plus">添加</el-button>-->
-<!--                    </div>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-tab-pane>-->
-<!--              <el-tab-pane label="退款信息">-->
-<!--                <el-col :span="24">-->
-<!--                  <el-form-item label-width="0">-->
-<!--                    <div class="JNPF-common-title">-->
-<!--                      <h2></h2>-->
-<!--                    </div>-->
-<!--                    <el-table :data="dataForm.paymentsoitemList" size='mini'>-->
-<!--                      <el-table-column type="index" width="50" label="序号" align="center" />-->
-<!--                      <el-table-column prop="documentno" label="付款单号">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.documentno" placeholder="请输入" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="settlementtype" label="付款方式">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-select v-model="scope.row.settlementtype" placeholder="请选择" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                            <el-option v-for="(item, index) in settlementtypeOptions" :key="index"-->
-<!--                              :label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>-->
-<!--                          </el-select>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="duedate" label="付款日期">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-date-picker v-model="scope.row.duedate" placeholder="请选择" clearable-->
-<!--                            :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">-->
-<!--                          </el-date-picker>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="paymentamount" label="付款金额">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.paymentamount" placeholder="请输入" clearable-->
-<!--                            :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column prop="remark" label="备注">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-input v-model="scope.row.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>-->
-<!--                          </el-input>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                      <el-table-column label="操作" width="50">-->
-<!--                        <template slot-scope="scope">-->
-<!--                          <el-button size="mini" type="text" class="JNPF-table-delBtn"-->
-<!--                            @click="delpaymentsoitemList(scope.$index)">删除</el-button>-->
-<!--                        </template>-->
-<!--                      </el-table-column>-->
-<!--                    </el-table>-->
-<!--                    <div class="table-actions" @click="addpaymentsoitemList()">-->
-<!--                      <el-button type="text" icon="el-icon-plus">添加</el-button>-->
-<!--                    </div>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-<!--              </el-tab-pane>-->
-<!--              <el-tab-pane label="补充信息">-->
-<!--              </el-tab-pane>-->
-<!--            </el-tabs>-->
-<!--          </el-col>-->
-<!--&gt;>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3-->
         </template>
     </el-table-column>
     </el-table>
@@ -1256,378 +829,6 @@
               if (index === 0) {
                 sums[index] = '合计';
                 return;
-// =======
-//   import request from '@/utils/request'
-//   import {
-//     getDataInterfaceRes
-//   } from '@/api/systemData/dataInterface'
-//   import {
-//     getDictionaryDataSelector
-//   } from '@/api/systemData/dictionary'
-//   export default {
-//     components: {},
-//     props: [],
-//     data() {
-//       return {
-//         visible: false,
-//         loading: false,
-//         isDetail: false,
-//         dataForm: {
-//           documentNo: '',
-//           contractName: "",
-//           currency: "0",
-//           contractNo: '',
-//           advanceAmount: '',
-//           num: '',
-//           price: '',
-//           notPrice: '',
-//           remark: '',
-//           costomerName: '',
-//           amountCollected: '',
-//           invoiceNum: '',
-//           invoiceAmount: '',
-//           sourceSystem: "0",
-//           status: "0",
-//           creatorUserName: "",
-//           salesorder_item0List: [],
-//           receiptoutsoitemList: [],
-//           collectionsoitemList: [],
-//           arinvoices_item0soitemList: [],
-//           salesbacksoitemList: [],
-//           paymentsoitemList: [],
-//         },
-//         activexvlbvm: '0',
-//         rules: {
-//           contractName: [{
-//             required: true,
-//             message: '请选择',
-//             trigger: 'change'
-//           }, ],
-//         },
-//         contractNamecolumnOptions: [{
-//           "label": "合同编码",
-//           "value": "contract_code"
-//         }, {
-//           "label": "合同名称",
-//           "value": "contract_name"
-//         }, {
-//           "label": "合同类型",
-//           "value": "contract_type"
-//         }, {
-//           "label": "供应商/客户名称",
-//           "value": "name"
-//         }, ],
-//         currencyOptions: [{
-//           "fullName": "人民币",
-//           "id": "0"
-//         }, {
-//           "fullName": "美元",
-//           "id": "1"
-//         }, {
-//           "fullName": "英镑",
-//           "id": "2"
-//         }],
-//         sourceSystemOptions: [{
-//           "fullName": "人工创建",
-//           "id": "0"
-//         }, {
-//           "fullName": "商城平台",
-//           "id": "1"
-//         }],
-//         statusOptions: [{
-//           "fullName": "已保存",
-//           "id": "0"
-//         }, {
-//           "fullName": "开票中",
-//           "id": "1"
-//         }, {
-//           "fullName": "付款申请",
-//           "id": "2"
-//         }, {
-//           "fullName": "待回款",
-//           "id": "3"
-//         }, {
-//           "fullName": "回款中",
-//           "id": "4"
-//         }, {
-//           "fullName": "归档",
-//           "id": "5"
-//         }],
-//
-//         salesorder_item0licenseNumcolumnOptions: [{
-//             "label": "车牌号",
-//             "value": "license_no"
-//           }, {
-//             "label": "物料名称",
-//             "value": "material_name"
-//           }, {
-//             "label": "磅单类型",
-//             "value": "pound_type"
-//           }, {
-//             "label": "净重",
-//             "value": "net_weight"
-//           },
-//           {
-//             "label": "计量单位",
-//             "value": "unit"
-//           }, {
-//             "label": "是否垫资",
-//             "value": "advance"
-//           }, {
-//             "label": "销售单价",
-//             "value": "sales_price"
-//           },
-//           {
-//             "label": "结算重量",
-//             "value": "settlement"
-//           }, {
-//             "label": "税率",
-//             "value": "rate"
-//           }, {
-//             "label": "备注",
-//             "value": "remark"
-//           },
-//           {
-//             "label": "磅单图片",
-//             "value": "pound_pictures"
-//           }, {
-//             "label": "车辆图片",
-//             "value": "vehicle_pictures"
-//           },
-//         ],
-//         poundTypeOptions: [{
-//           "fullName": "贸易",
-//           "id": "0"
-//         }, {
-//           "fullName": "其他",
-//           "id": "1"
-//         }],
-//         unitOptions: [{
-//           "fullName": "吨",
-//           "id": "0"
-//         }, {
-//           "fullName": "千克",
-//           "id": "1"
-//         }],
-//         advanceOptions: [{
-//           "fullName": "否",
-//           "id": "0"
-//         }, {
-//           "fullName": "是",
-//           "id": "1"
-//         }],
-//         rateOptions: [{
-//           "fullName": "13",
-//           "id": "0"
-//         }, {
-//           "fullName": "9",
-//           "id": "1"
-//         }, {
-//           "fullName": "6",
-//           "id": "2"
-//         }, {
-//           "fullName": "5",
-//           "id": "3"
-//         }, {
-//           "fullName": "3",
-//           "id": "4"
-//         }, {
-//           "fullName": "0",
-//           "id": "5"
-//         }],
-//         paymentTypeOptions: [{
-//           "fullName": "贷款",
-//           "id": "0"
-//         }, {
-//           "fullName": "运费",
-//           "id": "1"
-//         }, {
-//           "fullName": "仓储",
-//           "id": "2"
-//         }],
-//         taxRateOptions: [{
-//           "fullName": "13",
-//           "id": "0"
-//         }, {
-//           "fullName": "9",
-//           "id": "1"
-//         }, {
-//           "fullName": "6",
-//           "id": "2"
-//         }, {
-//           "fullName": "5",
-//           "id": "3"
-//         }, {
-//           "fullName": "3",
-//           "id": "4"
-//         }, {
-//           "fullName": "0",
-//           "id": "5"
-//         }],
-//         invoiceStatusOptions: [{
-//           "fullName": "正常",
-//           "id": "0"
-//         }, {
-//           "fullName": "红冲",
-//           "id": "1"
-//         }, {
-//           "fullName": "作废",
-//           "id": "2"
-//         }],
-//         settlementtypeOptions: [{
-//           "fullName": "现金",
-//           "id": "0"
-//         }, {
-//           "fullName": "赊购",
-//           "id": "1"
-//         }, {
-//           "fullName": "网银",
-//           "id": "2"
-//         }, {
-//           "fullName": "银企直连",
-//           "id": "3"
-//         }, {
-//           "fullName": "银票",
-//           "id": "4"
-//         }, {
-//           "fullName": "商票",
-//           "id": "5"
-//         }],
-//       }
-//     },
-//     computed: {},
-//     watch: {},
-//     created() {},
-//     mounted() {},
-//     methods: {
-//       popupSelectChange(e, d) {
-//         this.dataForm.costomerName = d.name;
-//         this.dataForm.contractCode = d.contract_code;
-//       },
-//       popupSelectChange2(a, b) {
-//         let settlementSum = 0;
-//         for (let i = 0; i < this.dataForm.salesorder_item0List.length; i++) {
-//           if (a == this.dataForm.salesorder_item0List[i].licenseNum) {
-//             this.dataForm.salesorder_item0List[i].materialName = b.material_name;
-//             this.dataForm.salesorder_item0List[i].settlement = b.settlement;
-//             this.dataForm.salesorder_item0List[i].netWeight = b.net_weight;
-//             this.dataForm.salesorder_item0List[i].unit = b.unit;
-//             this.dataForm.salesorder_item0List[i].advance = b.advance;
-//             this.dataForm.salesorder_item0List[i].rate = b.rate;
-//             this.dataForm.salesorder_item0List[i].remark = b.remark;
-//             this.dataForm.salesorder_item0List[i].poundPictures = b.pound_pictures;
-//             this.dataForm.salesorder_item0List[i].vehiclePictures = b.vehicle_pictures;
-//             this.dataForm.salesorder_item0List[i].poundType = b.pound_type;
-//             this.dataForm.salesorder_item0List[i].unitPrice = b.sales_price;
-//             settlementSum = settlementSum + settlement;
-//           }
-//         }
-//         this.dataForm.num = settlementSum;
-//       },
-//       salesorder_item0Exist() {
-//         let isOk = true;
-//         for (let i = 0; i < this.dataForm.salesorder_item0List.length; i++) {
-//           const e = this.dataForm.salesorder_item0List[i];
-//         }
-//         return isOk;
-//       },
-//       receiptoutsoitemExist() {
-//         let isOk = true;
-//         for (let i = 0; i < this.dataForm.receiptoutsoitemList.length; i++) {
-//           const e = this.dataForm.receiptoutsoitemList[i];
-//         }
-//         return isOk;
-//       },
-//       collectionsoitemExist() {
-//         let isOk = true;
-//         for (let i = 0; i < this.dataForm.collectionsoitemList.length; i++) {
-//           const e = this.dataForm.collectionsoitemList[i];
-//         }
-//         return isOk;
-//       },
-//       arinvoices_item0soitemExist() {
-//         let isOk = true;
-//         for (let i = 0; i < this.dataForm.arinvoices_item0soitemList.length; i++) {
-//           const e = this.dataForm.arinvoices_item0soitemList[i];
-//         }
-//         return isOk;
-//       },
-//       salesbacksoitemExist() {
-//         let isOk = true;
-//         for (let i = 0; i < this.dataForm.salesbacksoitemList.length; i++) {
-//           const e = this.dataForm.salesbacksoitemList[i];
-//         }
-//         return isOk;
-//       },
-//       paymentsoitemExist() {
-//         let isOk = true;
-//         for (let i = 0; i < this.dataForm.paymentsoitemList.length; i++) {
-//           const e = this.dataForm.paymentsoitemList[i];
-//         }
-//         return isOk;
-//       },
-//       clearData(data) {
-//         for (let key in data) {
-//           if (data[key] instanceof Array) {
-//             data[key] = [];
-//           } else if (data[key] instanceof Object) {
-//             this.clearData(data[key]);
-//           } else {
-//             data[key] = "";
-//           }
-//         }
-//       },
-//       init(id, isDetail) {
-//         this.dataForm.id = id || 0;
-//         this.visible = true;
-//         this.isDetail = isDetail || false;
-//         this.$nextTick(() => {
-//           this.$refs['elForm'].resetFields();
-//           if (this.dataForm.id) {
-//             this.loading = true
-//             request({
-//               url: '/api/saleorder/Saleorder/' + this.dataForm.id,
-//               method: 'get'
-//             }).then(res => {
-//               this.dataInfo(res.data)
-//               this.loading = false
-//             });
-//           } else {
-//             this.clearData(this.dataForm)
-//           }
-//         });
-//         this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-//       },
-//       // 表单提交
-//       dataFormSubmit() {
-//         this.$refs['elForm'].validate((valid) => {
-//           if (valid) {
-//             if (!this.salesorder_item0Exist()) return
-//             if (!this.receiptoutsoitemExist()) return
-//             if (!this.collectionsoitemExist()) return
-//             if (!this.arinvoices_item0soitemExist()) return
-//             if (!this.salesbacksoitemExist()) return
-//             if (!this.paymentsoitemExist()) return
-//             this.request()
-//           }
-//         })
-//       },
-//       request() {
-//         var _data = this.dataList()
-//         if (!this.dataForm.id) {
-//           request({
-//             url: '/api/saleorder/Saleorder',
-//             method: 'post',
-//             data: _data
-//           }).then((res) => {
-//             this.$message({
-//               message: res.msg,
-//               type: 'success',
-//               duration: 1000,
-//               onClose: () => {
-//                 this.visible = false
-//                 this.$emit('refresh', true)
-// >>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3
               }
               const values = data.map(item => Number(item[column.property]));
               if (!values.every(value => isNaN(value)) && (index === 8 || index === 10 || index === 11   )) {
@@ -1642,7 +843,6 @@
               } else {
                 sums[index] = '';
               }
-// <<<<<<< HEAD
             });
             this.dataForm.num = sums[8];
             this.dataForm.price = sums[10]
@@ -1950,147 +1150,4 @@
             },
         },
     }
-
-// =======
-//             })
-//           })
-//         }
-//       },
-//       addsalesorder_item0List() {
-//         let item = {
-//           licenseNum: undefined,
-//           materialName: undefined,
-//           poundType: undefined,
-//           netWeight: undefined,
-//           unit: undefined,
-//           advance: undefined,
-//           unitPrice: undefined,
-//           settlement: undefined,
-//           rate: undefined,
-//           price: undefined,
-//           noPrice: undefined,
-//           poundPictures: undefined,
-//           vehiclePictures: undefined,
-//         }
-//         this.dataForm.salesorder_item0List.push(item)
-//       },
-//       delsalesorder_item0List(index) {
-//         this.dataForm.salesorder_item0List.splice(index, 1);
-//       },
-//       addreceiptoutsoitemList() {
-//         let item = {
-//           documentNo: undefined,
-//           issueDate: undefined,
-//           num: undefined,
-//           amount: undefined,
-//         }
-//         this.dataForm.receiptoutsoitemList.push(item)
-//       },
-//       delreceiptoutsoitemList(index) {
-//         this.dataForm.receiptoutsoitemList.splice(index, 1);
-//       },
-//       addcollectionsoitemList() {
-//         let item = {
-//           paymentType: undefined,
-//           amountCollected: undefined,
-//           remark: undefined,
-//         }
-//         this.dataForm.collectionsoitemList.push(item)
-//       },
-//       delcollectionsoitemList(index) {
-//         this.dataForm.collectionsoitemList.splice(index, 1);
-//       },
-//       addarinvoices_item0soitemList() {
-//         let item = {
-//           invoiceNo: undefined,
-//           invoiceCode: undefined,
-//           involceAmount: undefined,
-//           invoiceQuantity: undefined,
-//           taxRate: undefined,
-//           amountNotTax: undefined,
-//           taxAmount: undefined,
-//           invoiceStatus: undefined,
-//           creatorUserName: undefined,
-//           invoiceDate: undefined,
-//           attachMent: undefined,
-//         }
-//         this.dataForm.arinvoices_item0soitemList.push(item)
-//       },
-//       delarinvoices_item0soitemList(index) {
-//         this.dataForm.arinvoices_item0soitemList.splice(index, 1);
-//       },
-//       addsalesbacksoitemList() {
-//         let item = {
-//           documentNo: undefined,
-//           refundNum: undefined,
-//           refundAmount: undefined,
-//           creatorTime: undefined,
-//         }
-//         this.dataForm.salesbacksoitemList.push(item)
-//       },
-//       delsalesbacksoitemList(index) {
-//         this.dataForm.salesbacksoitemList.splice(index, 1);
-//       },
-//       addpaymentsoitemList() {
-//         let item = {
-//           documentno: undefined,
-//           settlementtype: undefined,
-//           duedate: undefined,
-//           paymentamount: undefined,
-//           remark: undefined,
-//         }
-//         this.dataForm.paymentsoitemList.push(item)
-//       },
-//       delpaymentsoitemList(index) {
-//         this.dataForm.paymentsoitemList.splice(index, 1);
-//       },
-//       dataList() {
-//         var _data = JSON.parse(JSON.stringify(this.dataForm));
-//         for (let i = 0; i < _data.salesorder_item0List.length; i++) {
-//           var _list = _data.salesorder_item0List[i];
-//         }
-//         for (let i = 0; i < _data.receiptoutsoitemList.length; i++) {
-//           var _list = _data.receiptoutsoitemList[i];
-//         }
-//         for (let i = 0; i < _data.collectionsoitemList.length; i++) {
-//           var _list = _data.collectionsoitemList[i];
-//         }
-//         for (let i = 0; i < _data.arinvoices_item0soitemList.length; i++) {
-//           var _list = _data.arinvoices_item0soitemList[i];
-//           _list.attachMent = JSON.stringify(_list.attachMent)
-//         }
-//         for (let i = 0; i < _data.salesbacksoitemList.length; i++) {
-//           var _list = _data.salesbacksoitemList[i];
-//         }
-//         for (let i = 0; i < _data.paymentsoitemList.length; i++) {
-//           var _list = _data.paymentsoitemList[i];
-//         }
-//         return _data;
-//       },
-//       dataInfo(dataAll) {
-//         let _dataAll = dataAll
-//         for (let i = 0; i < _dataAll.salesorder_item0List.length; i++) {
-//           var _list = _dataAll.salesorder_item0List[i];
-//         }
-//         for (let i = 0; i < _dataAll.receiptoutsoitemList.length; i++) {
-//           var _list = _dataAll.receiptoutsoitemList[i];
-//         }
-//         for (let i = 0; i < _dataAll.collectionsoitemList.length; i++) {
-//           var _list = _dataAll.collectionsoitemList[i];
-//         }
-//         for (let i = 0; i < _dataAll.arinvoices_item0soitemList.length; i++) {
-//           var _list = _dataAll.arinvoices_item0soitemList[i];
-//           _list.attachMent = JSON.parse(_list.attachMent)
-//         }
-//         for (let i = 0; i < _dataAll.salesbacksoitemList.length; i++) {
-//           var _list = _dataAll.salesbacksoitemList[i];
-//         }
-//         for (let i = 0; i < _dataAll.paymentsoitemList.length; i++) {
-//           var _list = _dataAll.paymentsoitemList[i];
-//         }
-//         this.dataForm = _dataAll
-//       },
-//     },
-//   }
-// >>>>>>> 6b66ea0276198dd5eb24cd6f115f6e164cbd7df3
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/index.vue b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
index 617906c9..a6281c86 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
@@ -30,7 +30,7 @@
             <div class="JNPF-common-layout-main JNPF-flex-main">
                 <div class="JNPF-common-head">
                     <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
+                                    <el-button type="text" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
                                     </el-button>
                                     <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
                                     </el-button>
@@ -56,43 +56,43 @@
                     </div>
                 </div>
                 <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange" border>
-                            <el-table-column prop="documentNo" label="单据编号" width="0" align="left"
+                            <el-table-column prop="documentNo" label="单据编号" width="0" align="center"
 />
-                            <el-table-column prop="erpNo" label="ERP订单号" width="0" align="left"
+                            <el-table-column prop="erpNo" label="ERP订单号" width="0" align="center"
 />
-                            <el-table-column prop="contractId" label="合同名称" width="0" align="left"
+                            <el-table-column prop="contractId" label="合同名称" width="0" align="center"
 />
-                            <el-table-column prop="customerId" label="客户名称" width="0" align="left"
+                            <el-table-column prop="customerId" label="客户名称" width="0" align="center"
 />
-                            <el-table-column prop="price" label="金额" width="0" align="left"
+                            <el-table-column prop="price" label="金额" width="0" align="center"
 />
-                            <el-table-column prop="num" label="重量" width="0" align="left"
+                            <el-table-column prop="num" label="重量" width="0" align="center"
 />
-                                <el-table-column label="币别" width="0" prop="currency" algin="left"
+                                <el-table-column label="币别" width="0" prop="currency" algin="center"
 >
                                     <template slot-scope="scope">
                                         {{ scope.row.currency | dynamicText(currencyOptions) }}
                                     </template>
                                 </el-table-column>
-                            <el-table-column prop="amountCollected" label="已回款金额" width="0" align="left"
+                            <el-table-column prop="amountCollected" label="已回款金额" width="0" align="center"
 />
-                            <el-table-column prop="invoiceNum" label="发票数量" width="0" align="left"
+                            <el-table-column prop="invoiceNum" label="发票数量" width="0" align="center"
 />
-                            <el-table-column prop="invoiceAmount" label="发票金额" width="0" align="left"
+                            <el-table-column prop="invoiceAmount" label="发票金额" width="0" align="center"
 />
-                            <el-table-column prop="advanceAmount" label="垫资金额" width="0" align="left"
+                            <el-table-column prop="advanceAmount" label="垫资金额" width="0" align="center"
 />
-                            <el-table-column prop="creatorTime" label="制单时间"    width="0" align="left"
+                            <el-table-column prop="creatorTime" label="制单时间"    width="0" align="center"
 />
-                                <el-table-column label="单据状态 " width="0" prop="status" algin="left"
+                                <el-table-column label="单据状态 " width="0" prop="status" algin="center"
 >
                                     <template slot-scope="scope">
                                         {{ scope.row.status | dynamicText(statusOptions) }}
                                     </template>
                                 </el-table-column>
-                            <el-table-column prop="creatorUserName" label="制单人" width="0" align="left"
+                            <el-table-column prop="creatorUserName" label="制单人" width="0" align="center"
 />
-                        <el-table-column label="操作" fixed="right"
+                        <el-table-column label="操作" fixed="right" algin="center"
 width="150" >
                             <template slot-scope="scope">
                                         <el-button type="text"