diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue
index b557d824..8735795b 100644
--- a/SC-web/src/views/scm/basicInformation/collection/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue
@@ -1,426 +1,511 @@
 <template>
-<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="1000px">
-<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-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="customerName" >
-                  <popupSelect    v-model="dataForm.customerName"
-                                  placeholder="请选择"  clearable  field="customerName" interfaceId="393371066040385285" :columnOptions="customerNamecolumnOptions" propsValue="supplier_nm" relationField="supplier_nm" popupType="dialog"
-                                  popupTitle="选择数据"  popupWidth="800px" @change="popupSelect"
-                  >
-                  </popupSelect>
-                </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="customerName">
+              <popupSelect v-model="dataForm.customerName" placeholder="请选择" clearable field="customerName"
+                interfaceId="393371066040385285" :columnOptions="customerNamecolumnOptions" propsValue="supplier_nm"
+                relationField="supplier_nm" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
+                @change="popupSelect">
+              </popupSelect>
+            </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="collectionCount" >
-                    <el-input    v-model="dataForm.collectionCount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="收款账户" prop="collectionCount">
+              <el-input v-model="dataForm.collectionCount" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="收款银行"
- prop="collectionBank" >
-                    <el-input    v-model="dataForm.collectionBank"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="收款银行" prop="collectionBank">
+              <el-input v-model="dataForm.collectionBank" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="收款类型 "
- prop="paymentType" >
-                    <el-select    v-model="dataForm.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-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="收款类型 " prop="paymentType">
+              <el-select v-model="dataForm.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>
-                </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>
+              </el-select>
+            </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>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="结算类型"
- prop="settlementType" >
-                    <el-select    v-model="dataForm.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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="结算类型" prop="settlementType">
+              <el-select v-model="dataForm.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>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="备注信息"
- prop="remark" >
-                    <el-input    v-model="dataForm.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="备注信息" prop="remark">
+              <el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="收款凭证"
- prop="voucher" >
-                    <JNPF-UploadFz    v-model="dataForm.voucher"
- :fileSize="5"    sizeUnit="MB"  :limit="9"  buttonText="点击上传" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="收款凭证" prop="voucher">
+              <JNPF-UploadFz v-model="dataForm.voucher" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传">
 
-                </JNPF-UploadFz>
-                </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>
+              </JNPF-UploadFz>
+            </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="制单人"
- prop="creatorUserName" >
-                    <el-input    v-model="dataForm.creatorUserName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="制单人" prop="creatorUserName">
+              <el-input v-model="dataForm.creatorUserName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24">
-                <el-tabs  v-model="activeojnisi"  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.collection_item0List" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="amount" label="收款金额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.amount"
- placeholder="请输入"  clearable  :style='{"width":"200%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="creatorUserId" label="订单金额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.price"
- placeholder="请输入"  clearable  :style='{"width":"200%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="creatorUserName" label="已收款金额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.amountCollected"
- placeholder="请输入"  clearable  :style='{"width":"200%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="deleteTime" label="销售订单编号">
-                <template slot-scope="scope">
-                  <popupSelect   v-model="scope.row.documentNo"
-                                 placeholder="请选择"  clearable  :field="'deleteTime'+scope.$index"  interfaceId="393372436705378053" :columnOptions="jg_collection_item0deleteTimecolumnOptions" propsValue="document_no" relationField="document_no" popupType="dialog"
-                                 popupWidth="800px" :bissId="dataForm.customerCode" @change="popupSelect2"
-                  >
-                  </popupSelect>
-            </template>
-        </el-table-column>
-            <el-table-column prop="lastModifyUserId" label="合同编号">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.contractCode"
- placeholder="请输入"  clearable  :style='{"width":"200%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="lastModifyUserName" label="重量">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.num"
- placeholder="请输入"  clearable  :style='{"width":"200%"}'>
-                </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="lastModifyTime" label="垫资金额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.advanceAmount"
- placeholder="请输入"  clearable  :style='{"width":"200%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="deleteUserId" label="税额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.rate"
- placeholder="请输入"  clearable  :style='{"width":"200%"}'>
-                </el-input>
-            </template>
-        </el-table-column>
-            <el-table-column prop="deleteUserName" label="不含税金额">
-                <template slot-scope="scope">
-                    <el-input   v-model="scope.row.notPrice"
- placeholder="请输入"  clearable  :style='{"width":"200%"}'>
-                </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":"200%"}' 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="delcollection_item0List(scope.$index)">删除</el-button>
-        </template>
-    </el-table-column>
-    </el-table>
-    <div class="table-actions" @click="addcollection_item0List()">
-        <el-button type="text" icon="el-icon-plus">添加</el-button>
-    </div>
-    </el-form-item>
-    </el-col>
-            </el-tab-pane >
-            </el-tabs>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-tabs v-model="activeojnisi" 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.collection_item0List" size='mini' show-summary>
+                      <el-table-column type="index" width="50" label="序号" align="center" />
+                      <el-table-column prop="amount" label="收款金额" align="center" >
+                        <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="creatorUserId" label="订单金额" align="center" >
+                        <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="creatorUserName" label="已收款金额" align="center" >
+                        <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="deleteTime" label="销售订单编号" align="center" >
+                        <template slot-scope="scope">
+                          <popupSelect v-model="scope.row.documentNo" placeholder="请选择" clearable
+                            :field="'deleteTime'+scope.$index" interfaceId="393372436705378053"
+                            :columnOptions="jg_collection_item0deleteTimecolumnOptions" propsValue="document_no"
+                            relationField="document_no" popupType="dialog" popupWidth="800px"
+                            :bissId="dataForm.customerCode" @change="popupSelect2">
+                          </popupSelect>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="lastModifyUserId" label="合同编号" align="center" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.contractCode" placeholder="请输入" clearable
+                            :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="lastModifyUserName" label="数量" align="center" >
+                        <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="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="lastModifyTime" label="垫资金额" align="center" >
+                        <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="deleteUserId" label="税额" align="center" >
+                        <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="deleteUserName" label="不含税金额" align="center" >
+                        <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" >
+                        <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="delcollection_item0List(scope.$index)">删除</el-button>
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                    <div class="table-actions" @click="addcollection_item0List()">
+                      <el-button type="text" icon="el-icon-plus">添加</el-button>
+                    </div>
+                  </el-form-item>
                 </el-col>
-    </template>
-</el-form>
+              </el-tab-pane>
+            </el-tabs>
+          </el-col>
+        </template>
+      </el-form>
     </el-row>
     <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+      <el-button @click="visible = false"> 取 消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
     </span>
-    </el-dialog>
+  </el-dialog>
 </template>
 <script>
-    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: {
-                            customerCode : '',
-                            documentNo : '',
-                            customerName : '',
-                            amountCollected : '',
-                            collectionCount : '',
-                            collectionBank : '',
-                            paymentType : "0",
-                            currency : "0",
-                            settlementType : "0",
-                            remark : '',
-                            voucher : [],
-                            status : "0",
-                            creatorUserName : '',
-                        collection_item0List:[],
-            },
-                            activeojnisi:'0',
-            rules:
-            {
-            },
-              customerNamecolumnOptions:[ {"label":"客户编码","value":"supplier_cd"}, {"label":"客户名称","value":"supplier_nm"}, {"label":"客户地点名称","value":"supplier_site_code"}, {"label":"客户等级","value":"customer_level"},],
-              jg_collection_item0deleteTimecolumnOptions:[ {"label":"销售订单ID","value":"id"},{"label":"销售订单编号","value":"document_no"}, {"label":"合同编号","value":"contract_code"},
-                {"label":"订单金额","value":"price"}, {"label":"已收款金额","value":"amount_collected"},
-                {"label":"重量","value":"num"}, {"label":"垫资金额","value":"advance_amount"},
-                {"label":"税额","value":"rate"}, {"label":"不含税金额","value":"not_price"}, {"label":"业务日期","value":"creator_time"},],
-                        paymentTypeOptions:[{"fullName":"货款","id":"0"},{"fullName":"运费","id":"1"},{"fullName":"仓储","id":"2"}],
-                        currencyOptions:[{"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"}],
-                        statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"},{"fullName":"已付款","id":"3"}],
-
-                        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"}],
-        }
-        },
-        computed: {},
-        watch: {},
-        created() {
+  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: {
+          customerCode: '',
+          documentNo: '',
+          customerName: '',
+          amountCollected: '',
+          collectionCount: '',
+          collectionBank: '',
+          paymentType: "0",
+          currency: "0",
+          settlementType: "0",
+          remark: '',
+          voucher: [],
+          status: "0",
+          creatorUserName: '',
+          collection_item0List: [],
         },
-        mounted() {},
-        methods: {
-          popupSelect(e,d){
-            this.dataForm.customerCode = d.id;
+        activeojnisi: '0',
+        rules: {},
+        customerNamecolumnOptions: [{
+          "label": "客户编码",
+          "value": "supplier_cd"
+        }, {
+          "label": "客户名称",
+          "value": "supplier_nm"
+        }, {
+          "label": "客户地点名称",
+          "value": "supplier_site_code"
+        }, {
+          "label": "客户等级",
+          "value": "customer_level"
+        }, ],
+        jg_collection_item0deleteTimecolumnOptions: [{
+            "label": "销售订单ID",
+            "value": "id"
+          }, {
+            "label": "销售订单编号",
+            "value": "document_no"
+          }, {
+            "label": "合同编号",
+            "value": "contract_code"
           },
-          popupSelect2(a,b) {
-            for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
-              if (a == this.dataForm.collection_item0List[i].documentNo) {
-                this.dataForm.collection_item0List[i].id = b.id;
-                this.dataForm.collection_item0List[i].price = b.price;
-                this.dataForm.collection_item0List[i].amountCollected = b.amount_collected;
-                this.dataForm.collection_item0List[i].contractCode = b.contract_code;
-                this.dataForm.collection_item0List[i].num = b.num;
-                this.dataForm.collection_item0List[i].advanceAmount = b.advance_amount;
-                this.dataForm.collection_item0List[i].rate = b.rate;
-                this.dataForm.collection_item0List[i].notPrice = b.not_price;
-                this.dataForm.collection_item0List[i].creatorTime = b.creator_time;
-              }
-            }
+          {
+            "label": "订单金额",
+            "value": "price"
+          }, {
+            "label": "已收款金额",
+            "value": "amount_collected"
           },
-				collection_item0Exist() {
-				let isOk = true;
-					for(let i=0;i<this.dataForm.collection_item0List.length;i++){
-						const e = this.dataForm.collection_item0List[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/collection/Collection/'+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.collection_item0Exist()) return
-                            this.request()
-                    }
-                })
-            },
-            request() {
-                var _data =this.dataList()
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/collection/Collection',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/collection/Collection/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-                addcollection_item0List(){
-                    let item = {
-                            amount:undefined,
-                            creatorUserId:undefined,
-                            creatorUserName:undefined,
-                            deleteTime:undefined,
-                            lastModifyUserId:undefined,
-                            lastModifyUserName:undefined,
-                            taxRate:undefined,
-                            lastModifyTime:undefined,
-                            deleteUserId:undefined,
-                            deleteUserName:undefined,
-                            creatorTime:undefined,
-                }
-                    this.dataForm.collection_item0List.push(item)
-                },
-                delcollection_item0List(index) {
-                    this.dataForm.collection_item0List.splice(index, 1);
-                },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                        _data.voucher = JSON.stringify(_data.voucher)
-                    for(let i=0;i<_data.collection_item0List.length;i++){
-                        var _list = _data.collection_item0List[i];
-                    }
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                        _dataAll.voucher = JSON.parse( _dataAll.voucher)
-                    for(let i=0;i<_dataAll.collection_item0List.length;i++){
-                        var _list = _dataAll.collection_item0List[i];
-                    }
-                this.dataForm = _dataAll
-            },
-        },
-    }
+          {
+            "label": "重量",
+            "value": "num"
+          }, {
+            "label": "垫资金额",
+            "value": "advance_amount"
+          },
+          {
+            "label": "税额",
+            "value": "rate"
+          }, {
+            "label": "不含税金额",
+            "value": "not_price"
+          }, {
+            "label": "业务日期",
+            "value": "creator_time"
+          },
+        ],
+        paymentTypeOptions: [{
+          "fullName": "货款",
+          "id": "0"
+        }, {
+          "fullName": "运费",
+          "id": "1"
+        }, {
+          "fullName": "仓储",
+          "id": "2"
+        }],
+        currencyOptions: [{
+          "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"
+        }],
+        statusOptions: [{
+          "fullName": "已保存",
+          "id": "0"
+        }, {
+          "fullName": "审批中",
+          "id": "1"
+        }, {
+          "fullName": "已审批",
+          "id": "2"
+        }, {
+          "fullName": "已付款",
+          "id": "3"
+        }],
 
+        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"
+        }],
+      }
+    },
+    computed: {},
+    watch: {},
+    created() {},
+    mounted() {},
+    methods: {
+      popupSelect(e, d) {
+        this.dataForm.customerCode = d.id;
+      },
+      popupSelect2(a, b) {
+        for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
+          if (a == this.dataForm.collection_item0List[i].documentNo) {
+            this.dataForm.collection_item0List[i].id = b.id;
+            this.dataForm.collection_item0List[i].price = b.price;
+            this.dataForm.collection_item0List[i].amountCollected = b.amount_collected;
+            this.dataForm.collection_item0List[i].contractCode = b.contract_code;
+            this.dataForm.collection_item0List[i].num = b.num;
+            this.dataForm.collection_item0List[i].advanceAmount = b.advance_amount;
+            this.dataForm.collection_item0List[i].rate = b.rate;
+            this.dataForm.collection_item0List[i].notPrice = b.not_price;
+            this.dataForm.collection_item0List[i].creatorTime = b.creator_time;
+          }
+        }
+      },
+      collection_item0Exist() {
+        let isOk = true;
+        for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
+          const e = this.dataForm.collection_item0List[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/collection/Collection/' + 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.collection_item0Exist()) return
+            this.request()
+          }
+        })
+      },
+      request() {
+        var _data = this.dataList()
+        if (!this.dataForm.id) {
+          request({
+            url: '/api/collection/Collection',
+            method: 'post',
+            data: _data
+          }).then((res) => {
+            this.$message({
+              message: res.msg,
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refresh', true)
+              }
+            })
+          })
+        } else {
+          request({
+            url: '/api/collection/Collection/' + this.dataForm.id,
+            method: 'PUT',
+            data: _data
+          }).then((res) => {
+            this.$message({
+              message: res.msg,
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refresh', true)
+              }
+            })
+          })
+        }
+      },
+      addcollection_item0List() {
+        let item = {
+          amount: undefined,
+          creatorUserId: undefined,
+          creatorUserName: undefined,
+          deleteTime: undefined,
+          lastModifyUserId: undefined,
+          lastModifyUserName: undefined,
+          taxRate: undefined,
+          lastModifyTime: undefined,
+          deleteUserId: undefined,
+          deleteUserName: undefined,
+          creatorTime: undefined,
+        }
+        this.dataForm.collection_item0List.push(item)
+      },
+      delcollection_item0List(index) {
+        this.dataForm.collection_item0List.splice(index, 1);
+      },
+      dataList() {
+        var _data = JSON.parse(JSON.stringify(this.dataForm));
+        _data.voucher = JSON.stringify(_data.voucher)
+        for (let i = 0; i < _data.collection_item0List.length; i++) {
+          var _list = _data.collection_item0List[i];
+        }
+        return _data;
+      },
+      dataInfo(dataAll) {
+        let _dataAll = dataAll
+        _dataAll.voucher = JSON.parse(_dataAll.voucher)
+        for (let i = 0; i < _dataAll.collection_item0List.length; i++) {
+          var _list = _dataAll.collection_item0List[i];
+        }
+        this.dataForm = _dataAll
+      },
+    },
+  }
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/collection/index.vue b/SC-web/src/views/scm/basicInformation/collection/index.vue
index baf671fb..3d8d6db0 100644
--- a/SC-web/src/views/scm/basicInformation/collection/index.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/index.vue
@@ -1,323 +1,423 @@
 <template>
-    <div class="JNPF-common-layout">
+  <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>
-                            <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="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="confirmprice()">认款
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="documentNo" label="单据编号" width="0" align="left"
-/>
-                            <el-table-column prop="customerName" label="客户名称" width="0" align="left"
-/>
-                                <el-table-column label="币别 " width="0" prop="currency" algin="left"
->
-                                    <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="collectionCount" label="收款账户" width="0" align="left"
-/>
-                            <el-table-column prop="collectionBank" label="收款银行" width="0" align="left"
-/>
-                                <el-table-column label="收款类型 " width="0" prop="paymentType" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.paymentType | dynamicText(paymentTypeOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="结算类型" width="0" prop="settlementType" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.settlementType | dynamicText(settlementTypeOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="单据状态 " width="0" prop="status" algin="left"
->
-                                    <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 label="操作" fixed="right"
-width="150" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                                        <el-button type="text"
-                                                   @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>
+          <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>
+              <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" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            </el-button>
+            <el-button type="text" 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>
+            <el-button type="text" icon="el-icon-check" @click="exportData()">提交
+            </el-button>
+            <el-button type="text" icon="el-icon-check" @click="confirmprice()">认款
+            </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-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <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="单据编号" fixed="left" sortable width="200" align="center" />
+          <el-table-column prop="customerName" label="客户名称" fixed="left" sortable width="200" 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="amountCollected" sortable label="收款金额" width="150" align="center" />
+          <el-table-column prop="collectionCount" sortable label="收款账户" width="150" align="center" />
+          <el-table-column prop="collectionBank" sortable label="收款银行" width="150" align="center" />
+          <el-table-column label="收款类型" sortable width="150" prop="paymentType" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.paymentType | dynamicText(paymentTypeOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="结算类型" sortable width="150" prop="settlementType" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.settlementType | dynamicText(settlementTypeOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="单据状态" sortable width="150" prop="status" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.status | dynamicText(statusOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="creatorUserName" sortable label="制单人" width="150" align="center" />
+          <el-table-column label="操作" fixed="right" width="150">
+            <template slot-scope="scope">
+              <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+              </el-button>
+              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              </el-button>
+              <el-button type="text" @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>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+  </div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+  import request from '@/utils/request'
+  import {
+    getDictionaryDataSelector
+  } from '@/api/systemData/dictionary'
+  import JNPFForm from './Form'
+  import ExportBox from './ExportBox'
+  import {
+    getDataInterfaceRes
+  } from '@/api/systemData/dataInterface'
+  import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                documentNo:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'documentNo', label: '单据编号'},
-                    {prop: 'customerName', label: '客户名称'},
-                    {prop: 'currency', label: '币别 '},
-                    {prop: 'amountCollected', label: '收款金额'},
-                    {prop: 'collectionCount', label: '收款账户'},
-                    {prop: 'collectionBank', label: '收款银行'},
-                    {prop: 'paymentType', label: '收款类型 '},
-                    {prop: 'settlementType', label: '结算类型'},
-                    {prop: 'status', label: '单据状态 '},
-                    {prop: 'creatorUserName', label: '制单人'},
-                ],
-                                paymentTypeOptions:[{"fullName":"货款","id":"0"},{"fullName":"运费","id":"1"},{"fullName":"仓储","id":"2"}],
-                            paymentTypeProps:{"label":"fullName","value":"id"},
-                                currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                            currencyProps:{"label":"fullName","value":"id"},
-                                settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
-                            settlementTypeProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"},{"fullName":"已付款","id":"3"}],
-                            statusProps:{"label":"fullName","value":"id"},
-            }
+  export default {
+    components: {
+      JNPFForm,
+      ExportBox,
+      Detail
+    },
+    data() {
+      return {
+        detailVisible: false,
+        query: {
+          documentNo: undefined,
         },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
+        treeProps: {
+          children: 'children',
+          label: 'fullName',
+          value: 'id'
         },
-        created() {
-                this.initData()
+        list: [],
+        listLoading: true,
+        multipleSelection: [],
+        total: 0,
+        listQuery: {
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "",
         },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/collection/Collection/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+        formVisible: false,
+        exportBoxVisible: false,
+        columnList: [{
+            prop: 'documentNo',
+            label: '单据编号'
+          },
+          {
+            prop: 'customerName',
+            label: '客户名称'
+          },
+          {
+            prop: 'currency',
+            label: '币别 '
+          },
+          {
+            prop: 'amountCollected',
+            label: '收款金额'
+          },
+          {
+            prop: 'collectionCount',
+            label: '收款账户'
+          },
+          {
+            prop: 'collectionBank',
+            label: '收款银行'
+          },
+          {
+            prop: 'paymentType',
+            label: '收款类型 '
+          },
+          {
+            prop: 'settlementType',
+            label: '结算类型'
+          },
+          {
+            prop: 'status',
+            label: '单据状态 '
+          },
+          {
+            prop: 'creatorUserName',
+            label: '制单人'
+          },
+        ],
+        paymentTypeOptions: [{
+          "fullName": "货款",
+          "id": "0"
+        }, {
+          "fullName": "运费",
+          "id": "1"
+        }, {
+          "fullName": "仓储",
+          "id": "2"
+        }],
+        paymentTypeProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        currencyOptions: [{
+          "fullName": "人民币",
+          "id": "0"
+        }, {
+          "fullName": "美元",
+          "id": "1"
+        }, {
+          "fullName": "英镑",
+          "id": "2"
+        }],
+        currencyProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        settlementTypeOptions: [{
+          "fullName": "现金",
+          "id": "0"
+        }, {
+          "fullName": "赊购",
+          "id": "1"
+        }, {
+          "fullName": "网银",
+          "id": "2"
+        }, {
+          "fullName": "银企直连",
+          "id": "3"
+        }, {
+          "fullName": "银票",
+          "id": "4"
+        }, {
+          "fullName": "商票",
+          "id": "5"
+        }],
+        settlementTypeProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        statusOptions: [{
+          "fullName": "已保存",
+          "id": "0"
+        }, {
+          "fullName": "审批中",
+          "id": "1"
+        }, {
+          "fullName": "已审批",
+          "id": "2"
+        }, {
+          "fullName": "已付款",
+          "id": "3"
+        }],
+        statusProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+      }
+    },
+    computed: {
+      menuId() {
+        return this.$route.meta.modelId || ''
+      }
+    },
+    created() {
+      this.initData()
+    },
+    methods: {
+      goDetail(id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(id)
+        })
+      },
+      sortChange({
+        column,
+        prop,
+        order
+      }) {
+        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+        this.listQuery.sidx = !order ? '' : prop
+        this.initData()
+      },
+      initData() {
+        this.listLoading = true;
+        let _query = {
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        };
+        request({
+          url: `/api/collection/Collection/getList`,
+          method: 'post',
+          data: _query
+        }).then(res => {
+          var _list = [];
+          for (let i = 0; i < res.data.list.length; i++) {
+            let _data = res.data.list[i];
+            _list.push(_data)
+          }
+          this.list = _list
+          this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/collection/Collection/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/collection/Collection/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            confirmprice(){
-              if (!this.multipleSelection.length) {
-                this.$message({
-                  type: 'error',
-                  message: '请选择一条数据',
-                  duration: 1500,
-                })
-                return
+          this.listLoading = false
+        })
+      },
+      handleDel(id) {
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/collection/Collection/${id}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
               }
-              let id = this.multipleSelection.join()
-              let param = {};
-              param = this.list.find(function(param) {
-                debugger
-                return param.id == id;
-              })
-              request({
-                url: `/api/collection/Collection/confirmprice`,
-                method: 'POST',
-                data: param
-              }).then(res => {
-                this.$message({
-                  type: 'success',
-                  message: res.msg,
-                  onClose: () => {
-                    this.initData()
-                  }
-                });
-              })
-            },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/collection/Collection/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
+            });
+          })
+        }).catch(() => {});
+      },
+      handleSelectionChange(val) {
+        const res = val.map(item => item.id)
+        this.multipleSelection = res
+      },
+      handleBatchRemoveDel() {
+        if (!this.multipleSelection.length) {
+          this.$message({
+            type: 'error',
+            message: '请选择一条数据',
+            duration: 1500,
+          })
+          return
+        }
+        const ids = this.multipleSelection.join()
+        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/collection/Collection/batchRemove/${ids}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
                 this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
+              }
+            });
+          })
+        }).catch(() => {})
+      },
+      confirmprice() {
+        if (!this.multipleSelection.length) {
+          this.$message({
+            type: 'error',
+            message: '请选择一条数据',
+            duration: 1500,
+          })
+          return
+        }
+        let id = this.multipleSelection.join()
+        let param = {};
+        param = this.list.find(function(param) {
+          debugger
+          return param.id == id;
+        })
+        request({
+          url: `/api/collection/Collection/confirmprice`,
+          method: 'POST',
+          data: param
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
             }
+          });
+        })
+      },
+      addOrUpdateHandle(id, isDetail) {
+        this.formVisible = true
+        this.$nextTick(() => {
+          this.$refs.JNPFForm.init(id, isDetail)
+        })
+      },
+      exportData() {
+        this.exportBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.columnList)
+        })
+      },
+      download(data) {
+        let query = {
+          ...data,
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        }
+        request({
+          url: `/api/collection/Collection/Actions/Export`,
+          method: 'GET',
+          data: query
+        }).then(res => {
+          if (!res.data.url) return
+          this.jnpf.downloadFile(res.data.url)
+          this.$refs.ExportBox.visible = false
+          this.exportBoxVisible = false
+        })
+      },
+      search() {
+        this.listQuery = {
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "",
+        }
+        this.initData()
+      },
+      refresh(isrRefresh) {
+        this.formVisible = false
+        if (isrRefresh) this.reset()
+      },
+      reset() {
+        for (let key in this.query) {
+          this.query[key] = undefined
         }
+        this.search()
+      }
     }
+  }
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/payment/index.vue b/SC-web/src/views/scm/basicInformation/payment/index.vue
index a94fc4d5..f517fdd2 100644
--- a/SC-web/src/views/scm/basicInformation/payment/index.vue
+++ b/SC-web/src/views/scm/basicInformation/payment/index.vue
@@ -44,6 +44,7 @@
         </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="paymentno" label="来源单号" fixed="left" sortable width="200" align="center"  />
           <el-table-column prop="documentno" label="单据编号" fixed="left" sortable width="200" align="center"  />
           <el-table-column prop="suppliername" label="供应商" fixed="left" sortable width="150" align="center"  />
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/Form.vue b/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
index 3f2c7379..146ce2c7 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
@@ -1,352 +1,349 @@
 <template>
-	<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="1000px">
-		<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="12">
-						<el-form-item label="物料编码" prop="materialCode">
-							<popup-select v-model="dataForm.materialCode" placeholder="请选择" clearable
-								field="materialCode" interfaceId="381037852907038533"  :columnOptions="materialCodecolumnOptions" propsValue="item_code" relationField="item_code" 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="1200px">
+    <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="12">
+            <el-form-item label="物料编码" prop="materialCode">
+              <popup-select v-model="dataForm.materialCode" placeholder="请选择" clearable field="materialCode"
+                interfaceId="381037852907038533" :columnOptions="materialCodecolumnOptions" propsValue="item_code"
+                relationField="item_code" popupType="dialog" popupTitle="选择数据" popupWidth="800px">
 
-							</popup-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="物料名称" prop="materialName">
-							<el-input v-model="dataForm.materialName" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              </popup-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物料名称" prop="materialName">
+              <el-input v-model="dataForm.materialName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="销售合同" prop="salesName">
-							<popup-select v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
-              interfaceId="381038993740949317" :columnOptions="salesNamecolumnOptions" propsValue="contract_name" relationField="contract_name" popupType="dialog"
-              popupTitle="选择数据"  popupWidth="800px">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="销售合同" prop="salesName">
+              <popup-select v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
+                interfaceId="381038993740949317" :columnOptions="salesNamecolumnOptions" propsValue="contract_name"
+                relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px">
 
-							</popup-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="客户名称" prop="customerName">
-							<el-input v-model="dataForm.customerName" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              </popup-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户名称" prop="customerName">
+              <el-input v-model="dataForm.customerName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="是否垫资" prop="advance">
-							<el-select v-model="dataForm.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-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否垫资" prop="advance">
+              <el-select v-model="dataForm.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>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="销售价格" prop="salesPrice">
-							<el-input-number v-model="dataForm.salesPrice" placeholder="数字文本" :step="1">
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="销售价格" prop="salesPrice">
+              <el-input-number v-model="dataForm.salesPrice" placeholder="数字文本" :step="1">
 
-							</el-input-number>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="运输方式" prop="transportType">
-							<el-select v-model="dataForm.transportType" placeholder="请选择" clearable
-								:style='{"width":"100%"}'>
-								<el-option v-for="(item, index) in transportTypeOptions" :key="index"
-									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
+              </el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="运输方式" prop="transportType">
+              <el-select v-model="dataForm.transportType" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                <el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName"
+                  :value="item.id" :disabled="item.disabled"></el-option>
 
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="运费" prop="departmentId">
-							<el-input-number v-model="dataForm.departmentId" placeholder="数字文本" :step="1">
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="运费" prop="departmentId">
+              <el-input-number v-model="dataForm.departmentId" placeholder="数字文本" :step="1">
 
-							</el-input-number>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="车号" prop="licenseNo">
-							<popupSelect v-model="dataForm.licenseNo" placeholder="请选择" clearable field="licenseNo"
-              interfaceId="381432451370615173" :columnOptions="licenseNocolumnOptions" propsValue="ticketno" relationField="ticketno" popupType="dialog"
-              popupTitle="选择数据"  popupWidth="800px">
+              </el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="车号" prop="licenseNo">
+              <popupSelect v-model="dataForm.licenseNo" placeholder="请选择" clearable field="licenseNo"
+                interfaceId="381432451370615173" :columnOptions="licenseNocolumnOptions" propsValue="ticketno"
+                relationField="ticketno" popupType="dialog" popupTitle="选择数据" popupWidth="800px">
 
-							</popupSelect>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="业务员名称" prop="businessName">
-							<el-input v-model="dataForm.businessName" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              </popupSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="业务员名称" prop="businessName">
+              <el-input v-model="dataForm.businessName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="磅单图片" prop="poundPictures">
-							<JNPF-UploadImg v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="9">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="磅单图片" prop="poundPictures">
+              <JNPF-UploadImg v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="9">
 
-							</JNPF-UploadImg>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="皮重" prop="tareWeight">
-							<el-input-number v-model="dataForm.tareWeight" placeholder="数字文本" :step="1">
+              </JNPF-UploadImg>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="皮重" prop="tareWeight">
+              <el-input-number v-model="dataForm.tareWeight" placeholder="数字文本" :step="1">
 
-							</el-input-number>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="毛重" prop="grossWeight">
-							<el-input-number v-model="dataForm.grossWeight" placeholder="数字文本" :step="1">
+              </el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="毛重" prop="grossWeight">
+              <el-input-number v-model="dataForm.grossWeight" placeholder="数字文本" :step="1">
 
-							</el-input-number>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="扣重" prop="buckleWeight">
-							<el-input-number v-model="dataForm.buckleWeight" placeholder="数字文本" :step="1">
+              </el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="扣重" prop="buckleWeight">
+              <el-input-number v-model="dataForm.buckleWeight" placeholder="数字文本" :step="1">
 
-							</el-input-number>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="净重" prop="netWeight">
-							<el-input-number v-model="dataForm.netWeight" placeholder="数字文本" :step="1">
+              </el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="净重" prop="netWeight">
+              <el-input-number v-model="dataForm.netWeight" placeholder="数字文本" :step="1">
 
-							</el-input-number>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="备注" prop="remark">
-							<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
+              </el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="司机名称" prop="driverName">
-							<el-input v-model="dataForm.driverName" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="司机名称" prop="driverName">
+              <el-input v-model="dataForm.driverName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="车辆图片" prop="vehiclePictures">
-							<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="车辆图片" prop="vehiclePictures">
+              <JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
 
-							</JNPF-UploadImg>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="制单人" prop="creatorusername">
-							<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              </JNPF-UploadImg>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="制单人" prop="creatorusername">
+              <el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="供应商名称" prop="supplierName">
-							<el-input v-model="dataForm.supplierName" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="供应商名称" prop="supplierName">
+              <el-input v-model="dataForm.supplierName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="采购合同" prop="purchaseName">
-							<relationForm v-model="dataForm.purchaseName" placeholder="请选择" clearable
-								field="purchaseName" modelId="294090217084722181"
-								:columnOptions="purchaseNamecolumnOptions" relationField="selectField121">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="采购合同" prop="purchaseName">
+              <relationForm v-model="dataForm.purchaseName" placeholder="请选择" clearable field="purchaseName"
+                modelId="294090217084722181" :columnOptions="purchaseNamecolumnOptions" relationField="selectField121">
 
-							</relationForm>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="单位" prop="unit">
-							<el-select v-model="dataForm.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>
+              </relationForm>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位" prop="unit">
+              <el-select v-model="dataForm.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>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="结算重量" prop="settlement">
-							<el-input v-model="dataForm.settlement" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="结算重量" prop="settlement">
+              <el-input v-model="dataForm.settlement" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="采购单价" prop="purchasePrice">
-							<el-input v-model="dataForm.purchasePrice" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="采购单价" prop="purchasePrice">
+              <el-input v-model="dataForm.purchasePrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="进项票日期" prop="inputDate">
-							<el-date-picker v-model="dataForm.inputDate" placeholder="请选择" clearable
-								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
-								value-format="timestamp">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="进项票日期" prop="inputDate">
+              <el-date-picker v-model="dataForm.inputDate" placeholder="请选择" clearable :style='{"width":"100%"}'
+                type="datetime" format="yyyy-MM-dd" value-format="timestamp">
 
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="销项票日期" prop="outputDate">
-							<el-date-picker v-model="dataForm.outputDate" placeholder="请选择" clearable
-								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
-								value-format="timestamp">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="销项票日期" prop="outputDate">
+              <el-date-picker v-model="dataForm.outputDate" placeholder="请选择" clearable :style='{"width":"100%"}'
+                type="datetime" format="yyyy-MM-dd" value-format="timestamp">
 
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="付款日期" prop="payDate">
-							<el-date-picker v-model="dataForm.payDate" placeholder="请选择" clearable
-								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
-								value-format="timestamp">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="付款日期" prop="payDate">
+              <el-date-picker v-model="dataForm.payDate" placeholder="请选择" clearable :style='{"width":"100%"}'
+                type="datetime" format="yyyy-MM-dd" value-format="timestamp">
 
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="回款日期" prop="paymentDate">
-							<el-date-picker v-model="dataForm.paymentDate" placeholder="请选择" clearable
-								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
-								value-format="timestamp">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="回款日期" prop="paymentDate">
+              <el-date-picker v-model="dataForm.paymentDate" placeholder="请选择" clearable :style='{"width":"100%"}'
+                type="datetime" format="yyyy-MM-dd" value-format="timestamp">
 
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="磅单日期" prop="poundDate">
-							<el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable
-								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
-								value-format="timestamp">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="磅单日期" prop="poundDate">
+              <el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable :style='{"width":"100%"}'
+                type="datetime" format="yyyy-MM-dd" value-format="timestamp">
 
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-				</template>
-			</el-form>
-		</el-row>
-		<span slot="footer" class="dialog-footer">
-			<el-button @click="visible = false"> 取 消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
-		</span>
-	</el-dialog>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </template>
+      </el-form>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false"> 取 消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+    </span>
+  </el-dialog>
 </template>
 <script>
-	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: {
-					materialCode: "",
-					materialName: '',
-					salesName: "",
-					customerName: '',
-					advance: "",
-					salesPrice: '',
-					transportType: "",
-					departmentId: 11.225,
-					licenseNo: "",
-					businessName: '',
-					poundPictures: [],
-					tareWeight: '',
-					grossWeight: '',
-					buckleWeight: '',
-					netWeight: '',
-					remark: '',
-					driverName: '',
-					vehiclePictures: [],
-					creatorusername: '',
-					supplierName: '',
-					purchaseName: "",
-					unit: "",
-					settlement: '',
-					purchasePrice: '',
-					inputDate: '',
-					outputDate: '',
-					payDate: '',
-					paymentDate: '',
-					poundDate: '',
-				},
-				rules: {
-					materialCode: [{
-						required: true,
-						message: '请选择',
-						trigger: 'change'
-					}, ],
-					salesName: [{
-						required: true,
-						message: '请选择',
-						trigger: 'change'
-					}, ],
-					licenseNo: [{
-						required: true,
-						message: '请选择',
-						trigger: 'change'
-					}, ],
-					poundPictures: [{
-						required: true,
-						message: '请至少选择一个',
-						trigger: 'click'
-					}, ],
-					tareWeight: [{
-						required: true,
-						message: '数字文本',
-						trigger: ["blur", "change"]
-					}, ],
-					grossWeight: [{
-						required: true,
-						message: '数字文本',
-						trigger: ["blur", "change"]
-					}, ],
-					buckleWeight: [{
-						required: true,
-						message: '数字文本',
-						trigger: ["blur", "change"]
-					}, ],
-					netWeight: [{
-						required: true,
-						message: '数字文本',
-						trigger: ["blur", "change"]
-					}, ],
-				},
-        materialCodecolumnOptions:[ {"label":"物料编码","value":"item_code"},
-          {"label":"物料名称","value":"description"},
-          {"label":"库存组织","value":"organization_id"},
-          {"label":"默认库区","value":"areaname"},],
-        salesNamecolumnOptions: [{
-          "label": "合同编码",
-          "value": "contract_code"
+  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: {
+          materialCode: "",
+          materialName: '',
+          salesName: "",
+          customerName: '',
+          advance: "",
+          salesPrice: '',
+          transportType: "",
+          departmentId: 11.225,
+          licenseNo: "",
+          businessName: '',
+          poundPictures: [],
+          tareWeight: '',
+          grossWeight: '',
+          buckleWeight: '',
+          netWeight: '',
+          remark: '',
+          driverName: '',
+          vehiclePictures: [],
+          creatorusername: '',
+          supplierName: '',
+          purchaseName: "",
+          unit: "",
+          settlement: '',
+          purchasePrice: '',
+          inputDate: '',
+          outputDate: '',
+          payDate: '',
+          paymentDate: '',
+          poundDate: '',
+        },
+        rules: {
+          materialCode: [{
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          }, ],
+          salesName: [{
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          }, ],
+          licenseNo: [{
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          }, ],
+          poundPictures: [{
+            required: true,
+            message: '请至少选择一个',
+            trigger: 'click'
+          }, ],
+          tareWeight: [{
+            required: true,
+            message: '数字文本',
+            trigger: ["blur", "change"]
+          }, ],
+          grossWeight: [{
+            required: true,
+            message: '数字文本',
+            trigger: ["blur", "change"]
+          }, ],
+          buckleWeight: [{
+            required: true,
+            message: '数字文本',
+            trigger: ["blur", "change"]
+          }, ],
+          netWeight: [{
+            required: true,
+            message: '数字文本',
+            trigger: ["blur", "change"]
+          }, ],
         },
+        materialCodecolumnOptions: [{
+            "label": "物料编码",
+            "value": "item_code"
+          },
+          {
+            "label": "物料名称",
+            "value": "description"
+          },
+          {
+            "label": "库存组织",
+            "value": "organization_id"
+          },
+          {
+            "label": "默认库区",
+            "value": "areaname"
+          },
+        ],
+        salesNamecolumnOptions: [{
+            "label": "合同编码",
+            "value": "contract_code"
+          },
           {
             "label": "合同名称",
             "value": "contract_name"
@@ -358,28 +355,29 @@
           {
             "label": "供应商/客户名称",
             "value": "name"
-          },],
-				advanceOptions: [{
-					"fullName": "是",
-					"id": "1"
-				}, {
-					"fullName": "否",
-					"id": "0"
-				}],
-				transportTypeOptions: [{
-					"fullName": "汽运",
-					"id": "0"
-				}, {
-					"fullName": "船运",
-					"id": "1"
-				}, {
-					"fullName": "火车",
-					"id": "2"
-				}],
-				licenseNocolumnOptions:  [{
-          "label": "车牌号",
-          "value": "ticketno"
-        },
+          },
+        ],
+        advanceOptions: [{
+          "fullName": "是",
+          "id": "1"
+        }, {
+          "fullName": "否",
+          "id": "0"
+        }],
+        transportTypeOptions: [{
+          "fullName": "汽运",
+          "id": "0"
+        }, {
+          "fullName": "船运",
+          "id": "1"
+        }, {
+          "fullName": "火车",
+          "id": "2"
+        }],
+        licenseNocolumnOptions: [{
+            "label": "车牌号",
+            "value": "ticketno"
+          },
           {
             "label": "司机",
             "value": "drivername"
@@ -399,114 +397,115 @@
           {
             "label": "创建时间",
             "value": "f_creatortime"
-          },],
-				purchaseNamecolumnOptions: [{
-					"label": "事件等级",
-					"value": "selectField121"
-				}, ],
-				unitOptions: [{
-					"fullName": "吨",
-					"id": "0"
-				}, {
-					"fullName": "千克",
-					"id": "1"
-				}],
+          },
+        ],
+        purchaseNamecolumnOptions: [{
+          "label": "事件等级",
+          "value": "selectField121"
+        }, ],
+        unitOptions: [{
+          "fullName": "吨",
+          "id": "0"
+        }, {
+          "fullName": "千克",
+          "id": "1"
+        }],
 
-			}
-		},
-		computed: {},
-		watch: {},
-		created() {},
-		mounted() {},
-		methods: {
-			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/poundlist/Poundlist/' + 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) {
-						this.request()
-					}
-				})
-			},
-			request() {
-				var _data = this.dataList()
-				if (!this.dataForm.id) {
-					request({
-						url: '/api/poundlist/Poundlist',
-						method: 'post',
-						data: _data
-					}).then((res) => {
-						this.$message({
-							message: res.msg,
-							type: 'success',
-							duration: 1000,
-							onClose: () => {
-								this.visible = false
-								this.$emit('refresh', true)
-							}
-						})
-					})
-				} else {
-					request({
-						url: '/api/poundlist/Poundlist/' + this.dataForm.id,
-						method: 'PUT',
-						data: _data
-					}).then((res) => {
-						this.$message({
-							message: res.msg,
-							type: 'success',
-							duration: 1000,
-							onClose: () => {
-								this.visible = false
-								this.$emit('refresh', true)
-							}
-						})
-					})
-				}
-			},
-			dataList() {
-				var _data = JSON.parse(JSON.stringify(this.dataForm));
-				_data.poundPictures = JSON.stringify(_data.poundPictures)
-				_data.vehiclePictures = JSON.stringify(_data.vehiclePictures)
-				return _data;
-			},
-			dataInfo(dataAll) {
-				let _dataAll = dataAll
-				_dataAll.poundPictures = JSON.parse(_dataAll.poundPictures)
-				_dataAll.vehiclePictures = JSON.parse(_dataAll.vehiclePictures)
-				this.dataForm = _dataAll
-			},
-		},
-	}
+      }
+    },
+    computed: {},
+    watch: {},
+    created() {},
+    mounted() {},
+    methods: {
+      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/poundlist/Poundlist/' + 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) {
+            this.request()
+          }
+        })
+      },
+      request() {
+        var _data = this.dataList()
+        if (!this.dataForm.id) {
+          request({
+            url: '/api/poundlist/Poundlist',
+            method: 'post',
+            data: _data
+          }).then((res) => {
+            this.$message({
+              message: res.msg,
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refresh', true)
+              }
+            })
+          })
+        } else {
+          request({
+            url: '/api/poundlist/Poundlist/' + this.dataForm.id,
+            method: 'PUT',
+            data: _data
+          }).then((res) => {
+            this.$message({
+              message: res.msg,
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refresh', true)
+              }
+            })
+          })
+        }
+      },
+      dataList() {
+        var _data = JSON.parse(JSON.stringify(this.dataForm));
+        _data.poundPictures = JSON.stringify(_data.poundPictures)
+        _data.vehiclePictures = JSON.stringify(_data.vehiclePictures)
+        return _data;
+      },
+      dataInfo(dataAll) {
+        let _dataAll = dataAll
+        _dataAll.poundPictures = JSON.parse(_dataAll.poundPictures)
+        _dataAll.vehiclePictures = JSON.parse(_dataAll.vehiclePictures)
+        this.dataForm = _dataAll
+      },
+    },
+  }
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/index.vue b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
index 62b35058..70d19e2d 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/index.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
@@ -20,12 +20,16 @@
 			<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>
 						<el-button type="text" 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">
@@ -35,40 +39,41 @@
 						<screenfull isContainer />
 					</div>
 				</div>
-				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-					@selection-change="handleSelectionChange">
-					<el-table-column prop="licenseNo" label="车号" width="0" align="left" />
-					<el-table-column prop="customerName" label="客户名称" width="0" align="left" />
-					<el-table-column prop="salesName" label="销售合同" width="0" align="left" />
-					<el-table-column prop="supplierName" label="供应商名称" width="0" align="left" />
-					<el-table-column prop="purchaseName" label="采购合同" width="0" align="left" />
-					<el-table-column prop="materialCode" label="物料编码" width="0" align="left" />
-					<el-table-column prop="materialName" label="物料名称" width="0" align="left" />
-					<el-table-column label="是否垫资" width="0" prop="advance" algin="left">
+				<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="licenseNo" label="车号" fixed="left" sortable width="120" align="center" />
+					<el-table-column prop="customerName" label="客户名称" sortable width="150" align="center" />
+					<el-table-column prop="salesName" label="销售合同" sortable width="150" align="center" />
+					<el-table-column prop="supplierName" label="供应商名称" sortable width="150" align="center" />
+					<el-table-column prop="purchaseName" label="采购合同" sortable width="150" align="center" />
+					<el-table-column prop="materialCode" label="物料编码" sortable width="150" align="center" />
+					<el-table-column prop="materialName" label="物料名称" sortable width="150" align="center" />
+          <el-table-column prop="advance" label="是否垫资" sortable width="100" align="center" >
 						<template slot-scope="scope">
 							{{ scope.row.advance | dynamicText(advanceOptions) }}
 						</template>
 					</el-table-column>
-					<el-table-column label="单位" width="0" prop="unit" algin="left">
+          <el-table-column prop="unit" label="单位" sortable width="100" align="center" >
 						<template slot-scope="scope">
 							{{ scope.row.unit | dynamicText(unitOptions) }}
 						</template>
 					</el-table-column>
-					<el-table-column prop="grossWeight" label="毛重" width="0" align="left" />
-					<el-table-column prop="tareWeight" label="皮重" width="0" align="left" />
-					<el-table-column prop="buckleWeight" label="扣重" width="0" align="left" />
-					<el-table-column prop="netWeight" label="净重" width="0" align="left" />
-					<el-table-column prop="settlement" label="结算重量" width="0" align="left" />
-					<el-table-column prop="purchasePrice" label="采购单价" width="0" align="left" />
-					<el-table-column prop="salesPrice" label="销售价格" width="0" align="left" />
-					<el-table-column prop="inputDate" label="进项票日期" width="0" align="left" />
-					<el-table-column prop="outputDate" label="销项票日期" width="0" align="left" />
-					<el-table-column prop="payDate" label="付款日期" width="0" align="left" />
-					<el-table-column prop="paymentDate" label="回款日期" width="0" align="left" />
-					<el-table-column prop="poundDate" label="磅单日期" width="0" align="left" />
-					<el-table-column prop="businessName" label="业务员" width="0" align="left" />
-					<el-table-column prop="remark" label="备注" width="0" align="left" />
-					<el-table-column prop="poundPictures" label="磅单图片" width="0" align="left">
+					<el-table-column prop="grossWeight" sortable label="毛重" width="100" align="center" />
+					<el-table-column prop="tareWeight" sortable label="皮重" width="100" align="center" />
+					<el-table-column prop="buckleWeight" sortable label="扣重" width="100" align="center" />
+					<el-table-column prop="netWeight" sortable label="净重" width="100" align="center" />
+					<el-table-column prop="settlement" sortable label="结算重量" width="100" align="center" />
+					<el-table-column prop="purchasePrice" sortable label="采购单价" width="100" align="center" />
+					<el-table-column prop="salesPrice" sortable label="销售价格" width="100" align="center" />
+					<el-table-column prop="inputDate" sortable label="进项票日期" width="150" align="center" />
+					<el-table-column prop="outputDate" sortable label="销项票日期" width="150" align="center" />
+					<el-table-column prop="payDate" sortable label="付款日期" width="150" align="center" />
+					<el-table-column prop="paymentDate" sortable label="回款日期" width="150" align="center" />
+					<el-table-column prop="poundDate" sortable label="磅单日期" width="150" align="center" />
+					<el-table-column prop="businessName" sortable label="业务员" width="150" align="center" />
+					<el-table-column prop="remark" sortable label="备注" width="150" align="center" />
+					<el-table-column prop="poundPictures" label="磅单图片" width="150" align="center">
 						<template slot-scope="scope">
 							<span v-for="(item,index) in JSON.parse(scope.row.poundPictures)" :key="index">
 								<el-popover placement="bottom" trigger="click" width="1000">
@@ -83,7 +88,7 @@
 							</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="vehiclePictures" label="车辆图片" width="0" align="left">
+					<el-table-column prop="vehiclePictures" label="车辆图片" width="150" align="center">
 						<template slot-scope="scope">
 							<span v-for="(item,index) in JSON.parse(scope.row.vehiclePictures)" :key="index">
 								<el-popover placement="bottom" trigger="click" width="1000">
@@ -98,7 +103,7 @@
 							</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="操作" fixed="right" width="100">
+					<el-table-column label="操作" fixed="right" width="100" align="center">
 						<template slot-scope="scope">
 							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
 							</el-button>
@@ -327,6 +332,16 @@
 				}).then(res => {
 					var _list = [];
 					for (let i = 0; i < res.data.list.length; i++) {
+            res.data.list[i].inputDate = res.data.list[i].inputDate ? res.data.list[i].inputDate.substring(0,
+              10) : '';
+            res.data.list[i].outputDate = res.data.list[i].outputDate ? res.data.list[i].outputDate
+              .substring(0, 10) : '';
+            res.data.list[i].payDate = res.data.list[i].payDate ? res.data.list[i].payDate
+              .substring(0, 10) : '';
+            res.data.list[i].paymentDate = res.data.list[i].paymentDate ? res.data.list[i].paymentDate
+              .substring(0, 10) : '';
+            res.data.list[i].poundDate = res.data.list[i].poundDate ? res.data.list[i].poundDate
+              .substring(0, 10) : '';
 						let _data = res.data.list[i];
 						_list.push(_data)
 					}
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
index cc665ecf..80c29142 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/Form.vue
@@ -1,947 +1,1087 @@
 <template>
-<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="1000px">
-<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-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"
-  >
+              </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>
+              </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>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="对方合同"
- prop="contractNo" >
-                    <el-input    v-model="dataForm.contractNo"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="对方合同" prop="contractNo">
+              <el-input v-model="dataForm.contractNo" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="垫资金额"
- prop="advanceAmount" >
-                    <el-input    v-model="dataForm.advanceAmount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="垫资金额" prop="advanceAmount">
+              <el-input v-model="dataForm.advanceAmount" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="数量"
- prop="num" >
-                    <el-input    v-model="dataForm.num"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="数量" prop="num">
+              <el-input v-model="dataForm.num" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="金额"
- prop="price" >
-                    <el-input    v-model="dataForm.price"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="金额" prop="price">
+              <el-input v-model="dataForm.price" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="不含税金额"
- prop="notPrice" >
-                    <el-input    v-model="dataForm.notPrice"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="不含税金额" prop="notPrice">
+              <el-input v-model="dataForm.notPrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="备注信息"
- prop="remark" >
-                    <el-input    v-model="dataForm.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="备注信息" prop="remark">
+              <el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="客户名称"
- prop="costomerName" >
-                    <el-input    v-model="dataForm.costomerName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户名称" prop="costomerName">
+              <el-input v-model="dataForm.costomerName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
-                </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="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="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%"}'>
+              </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%"}'>
 
-                </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-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>
+              </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>
 
-                </el-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="制单人"
- prop="creatorUserName" >
-                    <el-input    v-model="dataForm.creatorUserName"
- placeholder="系统自动生成"  readonly >
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="制单人" prop="creatorUserName">
+              <el-input v-model="dataForm.creatorUserName" placeholder="系统自动生成" readonly>
 
-                </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">
+              </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>
-          <!--                    <el-input   v-model="scope.row.poundPictures"-->
-          <!-- placeholder="请输入"  clearable  :style='{"width":"100%"}'>-->
-          <!--                </el-input>-->
-        </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>
+                          </JNPF-UploadImg>
+                          <!--                    <el-input   v-model="scope.row.poundPictures"-->
+                          <!-- placeholder="请输入"  clearable  :style='{"width":"100%"}'>-->
+                          <!--                </el-input>-->
+                        </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>
-    </template>
-</el-form>
+              </el-tab-pane>
+              <el-tab-pane label="补充信息">
+              </el-tab-pane>
+            </el-tabs>
+          </el-col>
+        </template>
+      </el-form>
     </el-row>
     <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
+      <el-button @click="visible = false"> 取 消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> 确 定</el-button>
     </span>
-    </el-dialog>
+  </el-dialog>
 </template>
 <script>
-    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"}],
-        }
+  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: [],
         },
-        computed: {},
-        watch: {},
-        created() {
+        activexvlbvm: '0',
+        rules: {
+          contractName: [{
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          }, ],
         },
-        mounted() {},
-        methods: {
-          popupSelectChange(e,d){
-            this.dataForm.costomerName = d.name;
-            this.dataForm.contractCode = d.contract_code;
+        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"
           },
-          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;
+          {
+            "label": "计量单位",
+            "value": "unit"
+          }, {
+            "label": "是否垫资",
+            "value": "advance"
+          }, {
+            "label": "销售单价",
+            "value": "sales_price"
           },
-				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)
-                            }
-                        })
-                    })
-                }else{
-                    request({
-                        url: '/api/saleorder/Saleorder/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                this.visible = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    })
-                }
-            },
-                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
-            },
-        },
-    }
-
+          {
+            "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)
+              }
+            })
+          })
+        } else {
+          request({
+            url: '/api/saleorder/Saleorder/' + this.dataForm.id,
+            method: 'PUT',
+            data: _data
+          }).then((res) => {
+            this.$message({
+              message: res.msg,
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refresh', true)
+              }
+            })
+          })
+        }
+      },
+      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
+      },
+    },
+  }
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/saleorder/index.vue b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
index fc78a048..e6ac4555 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
@@ -1,300 +1,386 @@
 <template>
-    <div class="JNPF-common-layout">
+  <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.status" placeholder="请选择"
-                                                   clearable>
-                                            <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="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="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
-                                    </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
-                        </el-tooltip>
-                        <screenfull isContainer/>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="documentNo" label="单据编号" width="0" align="left"
-/>
-                            <el-table-column prop="costomerName" label="客户名称" width="0" align="left"
-/>
-                            <el-table-column prop="price" label="金额" width="0" align="left"
-/>
-                            <el-table-column prop="num" label="数量" width="0" align="left"
-/>
-                                <el-table-column label="币别" width="0" prop="currency" algin="left"
->
-                                    <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="invoiceNum" label="发票数量" width="0" align="left"
-/>
-                            <el-table-column prop="invoiceAmount" label="发票金额" width="0" align="left"
-/>
-                                <el-table-column label="来源系统" width="0" prop="sourceSystem" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.sourceSystem | dynamicText(sourceSystemOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="单据状态 " width="0" prop="status" algin="left"
->
-                                    <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 label="操作" fixed="right"
-width="150" >
-                            <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
-                                        </el-button>
-                                        <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
-                                        </el-button>
-                                        <el-button type="text"  
-                                                   @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>
+          <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.status" placeholder="请选择" clearable>
+                <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="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" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            </el-button>
+            <el-button type="text" 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>
+            <el-button type="text" icon="el-icon-check" @click="exportData()">回款
+            </el-button>
+            <el-button type="text" icon="el-icon-close" @click="exportData()">归档
+            </el-button>
+            <el-button type="text" icon="el-icon-check" @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-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+        <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="单据编号" sortable fixed="left" width="200" align="center" />
+          <el-table-column prop="costomerName" label="客户名称" sortable fixed="left" width="150" align="center" />
+          <el-table-column prop="price" label="金额" sortable width="150" align="center" />
+          <el-table-column prop="num" label="数量" sortable width="150" align="center" />
+          <el-table-column label="币别" width="100" sortable prop="currency" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.currency | dynamicText(currencyOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="amountCollected" sortable label="已回款金额" width="150" align="center" />
+          <el-table-column prop="invoiceNum" sortable label="发票数量" width="150" align="center" />
+          <el-table-column prop="invoiceAmount" sortable label="发票金额" width="150" align="center" />
+          <el-table-column label="来源系统" width="150" sortable prop="sourceSystem" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.sourceSystem | dynamicText(sourceSystemOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="单据状态 " width="150" sortable prop="status" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.status | dynamicText(statusOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="creatorUserName" label="制单人" sortable width="150" align="center" />
+          <el-table-column label="操作" fixed="right" width="150" align="center" >
+            <template slot-scope="scope">
+              <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+              </el-button>
+              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              </el-button>
+              <el-button type="text" @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>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+  </div>
 </template>
 
 <script>
-    import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
-    import JNPFForm from './Form'
-    import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
-    import Detail from './Detail'
+  import request from '@/utils/request'
+  import {
+    getDictionaryDataSelector
+  } from '@/api/systemData/dictionary'
+  import JNPFForm from './Form'
+  import ExportBox from './ExportBox'
+  import {
+    getDataInterfaceRes
+  } from '@/api/systemData/dataInterface'
+  import Detail from './Detail'
 
-    export default {
-        components: {JNPFForm, ExportBox,Detail},
-        data() {
-            return {
-                detailVisible: false,
-                query: {
-                                documentNo:undefined,
-                                status:undefined,
-                },
-                treeProps: {
-                    children: 'children',
-                    label: 'fullName',
-                    value: 'id'
-                },
-                list: [],
-                listLoading: true,
- multipleSelection: [],                    total: 0,
-                listQuery: {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                },
-                formVisible: false,
-                exportBoxVisible: false,
-                columnList: [
-                    {prop: 'documentNo', label: '单据编号'},
-                    {prop: 'costomerName', label: '客户名称'},
-                    {prop: 'price', label: '金额'},
-                    {prop: 'num', label: '数量'},
-                    {prop: 'currency', label: '币别'},
-                    {prop: 'amountCollected', label: '已回款金额'},
-                    {prop: 'invoiceNum', label: '发票数量'},
-                    {prop: 'invoiceAmount', label: '发票金额'},
-                    {prop: 'sourceSystem', label: '来源系统'},
-                    {prop: 'status', label: '单据状态 '},
-                    {prop: 'creatorUserName', label: '制单人'},
-                ],
-                                currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                            currencyProps:{"label":"fullName","value":"id"},
-                                sourceSystemOptions:[{"fullName":"人工创建","id":"0"},{"fullName":"商城平台","id":"1"}],
-                            sourceSystemProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待回款","id":"3"},{"fullName":"回款中","id":"4"},{"fullName":"归档","id":"5"}],
-                            statusProps:{"label":"fullName","value":"id"},
-            }
+  export default {
+    components: {
+      JNPFForm,
+      ExportBox,
+      Detail
+    },
+    data() {
+      return {
+        detailVisible: false,
+        query: {
+          documentNo: undefined,
+          status: undefined,
         },
-        computed: {
-            menuId() {
-                return this.$route.meta.modelId || ''
-            }
+        treeProps: {
+          children: 'children',
+          label: 'fullName',
+          value: 'id'
         },
-        created() {
-                this.initData()
+        list: [],
+        listLoading: true,
+        multipleSelection: [],
+        total: 0,
+        listQuery: {
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "",
         },
-        methods: {
-            goDetail(id){
-                this.detailVisible = true
-                this.$nextTick(() => {
-                    this.$refs.Detail.init(id)
-                })
-            },
-            sortChange({column, prop, order}) {
-                this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-                this.listQuery.sidx = !order ? '' : prop
-                this.initData()
-            },
-            initData() {
-                this.listLoading = true;
-                let _query = {
-                    ...this.listQuery,
-                    ...this.query,
-                    menuId:this.menuId
-                };
-                request({
-                    url: `/api/saleorder/Saleorder/getList`,
-                    method: 'post',
-                    data: _query
-                }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
-                        _list.push(_data)
-                    }
-                    this.list = _list
-                        this.total = res.data.pagination.total
+        formVisible: false,
+        exportBoxVisible: false,
+        columnList: [{
+            prop: 'documentNo',
+            label: '单据编号'
+          },
+          {
+            prop: 'costomerName',
+            label: '客户名称'
+          },
+          {
+            prop: 'price',
+            label: '金额'
+          },
+          {
+            prop: 'num',
+            label: '数量'
+          },
+          {
+            prop: 'currency',
+            label: '币别'
+          },
+          {
+            prop: 'amountCollected',
+            label: '已回款金额'
+          },
+          {
+            prop: 'invoiceNum',
+            label: '发票数量'
+          },
+          {
+            prop: 'invoiceAmount',
+            label: '发票金额'
+          },
+          {
+            prop: 'sourceSystem',
+            label: '来源系统'
+          },
+          {
+            prop: 'status',
+            label: '单据状态 '
+          },
+          {
+            prop: 'creatorUserName',
+            label: '制单人'
+          },
+        ],
+        currencyOptions: [{
+          "fullName": "人民币",
+          "id": "0"
+        }, {
+          "fullName": "美元",
+          "id": "1"
+        }, {
+          "fullName": "英镑",
+          "id": "2"
+        }],
+        currencyProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        sourceSystemOptions: [{
+          "fullName": "人工创建",
+          "id": "0"
+        }, {
+          "fullName": "商城平台",
+          "id": "1"
+        }],
+        sourceSystemProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        statusOptions: [{
+          "fullName": "已保存",
+          "id": "0"
+        }, {
+          "fullName": "开票中",
+          "id": "1"
+        }, {
+          "fullName": "付款申请",
+          "id": "2"
+        }, {
+          "fullName": "待回款",
+          "id": "3"
+        }, {
+          "fullName": "回款中",
+          "id": "4"
+        }, {
+          "fullName": "归档",
+          "id": "5"
+        }],
+        statusProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+      }
+    },
+    computed: {
+      menuId() {
+        return this.$route.meta.modelId || ''
+      }
+    },
+    created() {
+      this.initData()
+    },
+    methods: {
+      goDetail(id) {
+        this.detailVisible = true
+        this.$nextTick(() => {
+          this.$refs.Detail.init(id)
+        })
+      },
+      sortChange({
+        column,
+        prop,
+        order
+      }) {
+        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+        this.listQuery.sidx = !order ? '' : prop
+        this.initData()
+      },
+      initData() {
+        this.listLoading = true;
+        let _query = {
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        };
+        request({
+          url: `/api/saleorder/Saleorder/getList`,
+          method: 'post',
+          data: _query
+        }).then(res => {
+          var _list = [];
+          for (let i = 0; i < res.data.list.length; i++) {
+            let _data = res.data.list[i];
+            _list.push(_data)
+          }
+          this.list = _list
+          this.total = res.data.pagination.total
 
-                    this.listLoading = false
-                })
-            },
-            handleDel(id) {
-                this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    request({
-                        url: `/api/saleorder/Saleorder/${id}`,
-                        method: 'DELETE'
-                    }).then(res => {
-                        this.$message({
-                            type: 'success',
-                            message: res.msg,
-                            onClose: () => {
-                                this.initData()
-                            }
-                        });
-                    })
-                }).catch(() => {
-                });
-            },
-                handleSelectionChange(val) {
-                    const res = val.map(item => item.id)
-                    this.multipleSelection = res
-                },
-                handleBatchRemoveDel() {
-                    if (!this.multipleSelection.length) {
-                        this.$message({
-                            type: 'error',
-                            message: '请选择一条数据',
-                            duration: 1500,
-                        })
-                        return
-                    }
-                    const ids = this.multipleSelection.join()
-                    this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                        type: 'warning'
-                    }).then(() => {
-                        request({
-                            url: `/api/saleorder/Saleorder/batchRemove/${ids}`,
-                            method: 'DELETE'
-                        }).then(res => {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                                onClose: () => {
-                                    this.initData()
-                                }
-                            });
-                        })
-                    }).catch(() => {
-                    })
-                },
-            addOrUpdateHandle(id, isDetail) {
-                this.formVisible = true
-                this.$nextTick(() => {
-                    this.$refs.JNPFForm.init(id, isDetail)
-                })
-            },
-            exportData() {
-                this.exportBoxVisible = true
-                this.$nextTick(() => {
-                    this.$refs.ExportBox.init(this.columnList)
-                })
-            },
-            download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
-                request({
-                    url: `/api/saleorder/Saleorder/Actions/Export`,
-                    method: 'GET',
-                    data: query
-                }).then(res => {
-                    if (!res.data.url) return
-                    this.jnpf.downloadFile(res.data.url)
-                    this.$refs.ExportBox.visible = false
-                    this.exportBoxVisible = false
-                })
-            },
-            search() {
-                this.listQuery = {
-                        currentPage: 1,
-                        pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
-                }
+          this.listLoading = false
+        })
+      },
+      handleDel(id) {
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/saleorder/Saleorder/${id}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
                 this.initData()
-            },
-            refresh(isrRefresh) {
-                this.formVisible = false
-                if (isrRefresh) this.reset()
-            },
-            reset() {
-                for (let key in this.query) {
-                    this.query[key] = undefined
-                }
-                this.search()
-            }
+              }
+            });
+          })
+        }).catch(() => {});
+      },
+      handleSelectionChange(val) {
+        const res = val.map(item => item.id)
+        this.multipleSelection = res
+      },
+      handleBatchRemoveDel() {
+        if (!this.multipleSelection.length) {
+          this.$message({
+            type: 'error',
+            message: '请选择一条数据',
+            duration: 1500,
+          })
+          return
+        }
+        const ids = this.multipleSelection.join()
+        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          request({
+            url: `/api/saleorder/Saleorder/batchRemove/${ids}`,
+            method: 'DELETE'
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: res.msg,
+              onClose: () => {
+                this.initData()
+              }
+            });
+          })
+        }).catch(() => {})
+      },
+      addOrUpdateHandle(id, isDetail) {
+        this.formVisible = true
+        this.$nextTick(() => {
+          this.$refs.JNPFForm.init(id, isDetail)
+        })
+      },
+      exportData() {
+        this.exportBoxVisible = true
+        this.$nextTick(() => {
+          this.$refs.ExportBox.init(this.columnList)
+        })
+      },
+      download(data) {
+        let query = {
+          ...data,
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        }
+        request({
+          url: `/api/saleorder/Saleorder/Actions/Export`,
+          method: 'GET',
+          data: query
+        }).then(res => {
+          if (!res.data.url) return
+          this.jnpf.downloadFile(res.data.url)
+          this.$refs.ExportBox.visible = false
+          this.exportBoxVisible = false
+        })
+      },
+      search() {
+        this.listQuery = {
+          currentPage: 1,
+          pageSize: 20,
+          sort: "desc",
+          sidx: "",
+        }
+        this.initData()
+      },
+      refresh(isrRefresh) {
+        this.formVisible = false
+        if (isrRefresh) this.reset()
+      },
+      reset() {
+        for (let key in this.query) {
+          this.query[key] = undefined
         }
+        this.search()
+      }
     }
+  }
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
index 14f51cfb..ec5ad1a7 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
@@ -20,7 +20,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>
@@ -35,33 +35,34 @@
 						<screenfull isContainer />
 					</div>
 				</div>
-				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-					@selection-change="handleSelectionChange">
-					<el-table-column prop="licenseNo" label="车号" width="0" align="left" />
-					<el-table-column prop="materialName" label="物料名称" width="0" align="left" />
-					<el-table-column prop="grossWeight" label="毛重" width="0" align="left" />
-					<el-table-column prop="tareWeight" label="皮重" width="0" align="left" />
-					<el-table-column prop="buckleWeight" label="扣重" width="0" align="left" />
-					<el-table-column prop="netWeight" label="净重" width="0" align="left" />
-					<el-table-column prop="driverName" label="司机名称" width="0" align="left" />
-					<el-table-column prop="customerName" label="客户名称" width="0" align="left" />
-					<el-table-column prop="salesName" label="销售合同" width="0" align="left" />
-					<el-table-column label="是否垫资" width="0" prop="advance" algin="left">
+				<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="licenseNo" label="车号" fixed="left" sortable width="120" align="center" />
+					<el-table-column prop="materialName" label="物料名称" fixed="left" sortable sortable width="150" align="center" />
+					<el-table-column prop="grossWeight" label="毛重" width="100" sortable align="center" />
+					<el-table-column prop="tareWeight" label="皮重" width="100" sortable align="center" />
+					<el-table-column prop="buckleWeight" label="扣重" width="100" sortable align="center" />
+					<el-table-column prop="netWeight" label="净重" width="100" sortable align="center" />
+					<el-table-column prop="driverName" label="司机名称" width="120" sortable align="center" />
+					<el-table-column prop="customerName" label="客户名称" width="150" sortable align="center" />
+					<el-table-column prop="salesName" label="销售合同" width="150" sortable align="center" />
+          <el-table-column prop="advance" label="是否垫资" width="120" sortable align="center" >
 						<template slot-scope="scope">
 							{{ scope.row.advance | dynamicText(advanceOptions) }}
 						</template>
 					</el-table-column>
-					<el-table-column label="运输方式" width="0" prop="transportType" algin="left">
+          <el-table-column prop="transportType" label="运输方式" sortable width="100" align="center" >
 						<template slot-scope="scope">
 							{{ scope.row.transportType | dynamicText(transportTypeOptions) }}
 						</template>
 					</el-table-column>
-					<el-table-column prop="departmentId" label="运费" width="0" align="left" />
-					<el-table-column prop="salesPrice" label="销售价格" width="0" align="left" />
-					<el-table-column prop="creatorusername" label="制单人" width="0" align="left" />
-					<el-table-column prop="businessName" label="业务员" width="0" align="left" />
-					<el-table-column prop="remark" label="备注" width="0" align="left" />
-					<el-table-column prop="poundPictures" label="磅单图片" width="0" align="left">
+					<el-table-column prop="departmentId" label="运费" sortable width="100" align="center" />
+					<el-table-column prop="salesPrice" label="销售价格" sortable width="100" align="center" />
+					<el-table-column prop="creatorusername" label="制单人" sortable width="150" align="center" />
+					<el-table-column prop="businessName" label="业务员" sortable width="150" align="center" />
+					<el-table-column prop="remark" label="备注" sortable width="150" align="center" />
+					<el-table-column prop="poundPictures" label="磅单图片" width="150" align="center">
 						<template slot-scope="scope">
 							<span v-for="(item,index) in JSON.parse(scope.row.poundPictures)" :key="index">
 								<el-popover placement="bottom" trigger="click" width="1000">
@@ -76,7 +77,7 @@
 							</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="vehiclePictures" label="车辆图片" width="0" align="left">
+					<el-table-column prop="vehiclePictures" label="车辆图片" width="150" align="center">
 						<template slot-scope="scope">
 							<span v-for="(item,index) in JSON.parse(scope.row.vehiclePictures)" :key="index">
 								<el-popover placement="bottom" trigger="click" width="1000">
@@ -91,7 +92,7 @@
 							</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="操作" fixed="right" width="100">
+					<el-table-column label="操作" fixed="right" width="100" align="center">
 						<template slot-scope="scope">
 							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
 							</el-button>