diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
index 9f245f7c..82b704be 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
@@ -61,8 +61,6 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
         int total=0;
 		int tradeuploadNum =0;
         QueryWrapper<TradeuploadEntity> tradeuploadQueryWrapper=new QueryWrapper<>();
-        tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getIsExamine,"0");
-        tradeuploadQueryWrapper.lambda().eq(TradeuploadEntity::getPoundType,"0");
     boolean pcPermission = false;
     boolean appPermission = false;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
diff --git a/SC-web/src/views/scm/basicInformation/collection/Form.vue b/SC-web/src/views/scm/basicInformation/collection/Form.vue
index 828626e7..8735795b 100644
--- a/SC-web/src/views/scm/basicInformation/collection/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/Form.vue
@@ -1,18 +1,4 @@
 <template>
-<<<<<<< HEAD
-<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-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="">
@@ -21,7 +7,6 @@
           <el-col :span="8">
             <el-form-item label="单据编号" prop="documentNo">
               <el-input v-model="dataForm.documentNo" placeholder="系统自动生成" readonly>
->>>>>>> ddaf1c11476266e400901543653df705c0f58f87
 
               </el-input>
             </el-form-item>
@@ -103,123 +88,6 @@
                 <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
                   :disabled="item.disabled"></el-option>
 
-<<<<<<< HEAD
-                </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="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 :summary-method="getSummaries" >
-        <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column prop="amount" label="收款金额" width="120" align="center">
-                <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="订单金额" width="130" align="center">
-                <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="已收款金额" width="130" align="center">
-                <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="销售订单编号" width="130" 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" :excludeFields="excludeFields" @change="popupSelect2"
-                  >
-                  </popupSelect>
-            </template>
-        </el-table-column>
-            <el-table-column prop="lastModifyUserId" label="合同编号" width="130" align="center">
-                <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="重量" width="130" align="center">
-                <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="垫资金额" width="130" align="center">
-                <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="税额" width="130" align="center">
-                <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="不含税金额" width="130" align="center">
-                <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="业务日期" width="130" align="center">
-                <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"  align="center">
-        <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-select>
             </el-form-item>
           </el-col>
@@ -327,7 +195,6 @@
                       <el-button type="text" icon="el-icon-plus">添加</el-button>
                     </div>
                   </el-form-item>
->>>>>>> ddaf1c11476266e400901543653df705c0f58f87
                 </el-col>
               </el-tab-pane>
             </el-tabs>
@@ -342,49 +209,6 @@
   </el-dialog>
 </template>
 <script>
-<<<<<<< HEAD
-    import request from '@/utils/request'
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    export default {
-        components: {},
-        props: [],
-        data() {
-            return {
-                excludeFields: [],
-                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"}],
-=======
   import request from '@/utils/request'
   import {
     getDataInterfaceRes
@@ -518,7 +342,6 @@
           "fullName": "已付款",
           "id": "3"
         }],
->>>>>>> ddaf1c11476266e400901543653df705c0f58f87
 
         taxRateOptions: [{
           "fullName": "13",
@@ -563,185 +386,6 @@
             this.dataForm.collection_item0List[i].creatorTime = b.creator_time;
           }
         }
-<<<<<<< HEAD
-        },
-        computed: {},
-        watch: {},
-        created() {
-        },
-        mounted() {},
-        methods: {
-          getSummaries(param) {
-            const { columns, data } = param;
-            const sums = [];
-            columns.forEach((column, index) => {
-              if (index === 0) {
-                sums[index] = '合计';
-                return;
-              }
-              const values = data.map(item => Number(item[column.property]));
-              if (!values.every(value => isNaN(value)) && (index === 1)) {
-                sums[index] = values.reduce((prev, curr) => {
-                  const value = Number(curr);
-                  if (!isNaN(value)) {
-                    return prev + curr;
-                  } else {
-                    return prev;
-                  }
-                }, 0);
-              } else {
-                sums[index] = '';
-              }
-            });
-
-            return sums;
-          },
-          popupSelect(e,d){
-            this.excludeFields = [];
-            this.dataForm.collection_item0List = [];
-            this.dataForm.customerCode = d.id;
-          },
-          popupSelect2(a,b) {
-            var excludeFields = [];
-            for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
-              excludeFields.push(this.dataForm.collection_item0List[i].documentNo);
-              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;
-              }
-            }
-            this.excludeFields = excludeFields;
-          },
-				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
-            },
-        },
-    }
-
-=======
       },
       collection_item0Exist() {
         let isOk = true;
@@ -864,5 +508,4 @@
       },
     },
   }
->>>>>>> ddaf1c11476266e400901543653df705c0f58f87
 </script>
diff --git a/SC-web/src/views/scm/basicInformation/collection/index.vue b/SC-web/src/views/scm/basicInformation/collection/index.vue
index 37726d72..3d8d6db0 100644
--- a/SC-web/src/views/scm/basicInformation/collection/index.vue
+++ b/SC-web/src/views/scm/basicInformation/collection/index.vue
@@ -1,97 +1,6 @@
 <template>
   <div class="JNPF-common-layout">
 
-<<<<<<< HEAD
-        <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-plus"  @click="addOrUpdateHandle()">编辑
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-delete"  @click="handleBatchRemoveDel()">批量删除
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导入
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-document-checked"  @click="confirmprice()">审核
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-document-delete"  @click="confirmprice()">弃审
-                                    </el-button>
-                                    <el-button type="text" icon="el-icon-check"  @click="confirmprice()">提交
-                                    </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-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 width="200 " align="center" fixed="left"/>
-                            <el-table-column prop="customerName" label="客户名称" sortable width="220" align="center" fixed="left"/>
-                                <el-table-column label="币别 " sortable width="90" prop="currency" algin="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="160" align="center"/>
-                            <el-table-column prop="collectionBank" sortable label="收款银行" width="130" align="center"/>
-                                <el-table-column label="收款类型 " sortable width="100" prop="paymentType" algin="center">
-                                    <template slot-scope="scope">
-                                        {{ scope.row.paymentType | dynamicText(paymentTypeOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="结算类型" sortable width="100" prop="settlementType" algin="center">
-                                    <template slot-scope="scope">
-                                        {{ scope.row.settlementType | dynamicText(settlementTypeOptions) }}
-                                    </template>
-                                </el-table-column>
-                                <el-table-column label="单据状态" sortable width="110" prop="status" algin="center">
-                                    <template slot-scope="scope">
-                                        {{ scope.row.status | dynamicText(statusOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="creatorUserName" label="制单人"  sortable width="130" 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 class="JNPF-common-layout-center">
       <el-row class="JNPF-common-search-box" :gutter="16">
         <el-form @submit.native.prevent>
@@ -132,7 +41,6 @@
             </el-tooltip>
             <screenfull isContainer />
           </div>
->>>>>>> ddaf1c11476266e400901543653df705c0f58f87
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
           @selection-change="handleSelectionChange" border>
diff --git a/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue b/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue
index e0854abb..b00598be 100644
--- a/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue
@@ -34,26 +34,11 @@
                 </el-form-item>
             </el-col>
             <el-col :span="24" >
-<<<<<<< HEAD
-                <el-form-item  label="安全库存" prop="safety"  :rules="[
-              {
-              required: true,
-              message: '请输入',
-              trigger: 'blur'
-              },
-              {
-              validator:this.numberRule,
-              trigger: 'blur'
-              }
-              ]" >
-                    <el-input-number    v-model="dataForm.safety" placeholder="数字文本"  :step="1" >
-=======
                 <el-form-item  label="安全库存"
  prop="safety" >
                     <el-input-number    v-model="dataForm.safety"
  placeholder="数字文本"  :step="1" >
 
->>>>>>> ddaf1c11476266e400901543653df705c0f58f87
                 </el-input-number>
                 </el-form-item>
             </el-col>
@@ -114,21 +99,13 @@
                             maximum : 1,
                             safety : 1,
                             minimum : 1,
-                            unit : "0",
+                            unit : "",
                             warehouseId : "",
                             creatorTime : "",
                             lastModifyTime : "",
             },
             rules:
             {
-              areaname: [
-                {
-                  required: true,
-                  message: '请输入',
-                  trigger: 'change'
-                },
-              ],
-
                             warehouseId: [
                                 {
                                     required: true,
@@ -141,14 +118,6 @@
                     warehouseIdcolumnOptions:[ {"label":"仓库名称","value":"NAME"}, {"label":"ERP库存组织名称","value":"inventory_org_name"}, {"label":"ERP库存组织详情名称","value":"inventory_org_detail_name"},],
 
         }
-        const numberRule = (rule,value,callback) => {
-              if(this.dataForm.safety(value) > this.dataForm.maximum){
-                callback(new Error('安全库存不能大于最高库存'))
-              }
-        }
-        return {
-              numberRule: numberRule(),
-        }
         },
         computed: {},
         watch: {},
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
index 772bc6b4..7957115f 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
@@ -7,16 +7,16 @@
 <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
     <template v-if="!loading">
             <el-col :span="24" >
-                <el-form-item  label="磅单上传"  
+                <el-form-item  label="磅单上传"
  prop="poundPictures" >
-                    <JNPF-UploadFz    v-model="dataForm.poundPictures"
+                    <JNPF-UploadImg    v-model="dataForm.poundPictures"
  :fileSize="500"    sizeUnit="MB"  :limit="9"  buttonText="点击上传" >
 
-                </JNPF-UploadFz>
+                </JNPF-UploadImg>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="物料名称"  
+                <el-form-item  label="物料名称"
  prop="materialId" >
                     <popupSelect    v-model="dataForm.materialId"
  placeholder="请选择物料编码"  clearable  field="materialId" interfaceId="381037852907038533" :columnOptions="materialIdcolumnOptions" propsValue="id" relationField="description" popupType="dialog"
@@ -27,7 +27,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="客户名称"  
+                <el-form-item  label="客户名称"
  prop="customerId" >
                     <popupSelect    v-model="dataForm.customerId"
  placeholder="请选择客户"  clearable  field="customerId" interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
@@ -38,7 +38,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="销售合同"  
+                <el-form-item  label="销售合同"
  prop="salesId" >
                     <popupSelect    v-model="dataForm.salesId"
  placeholder="请选择合同"  clearable  field="salesId" interfaceId="381037852907038533" :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
@@ -49,7 +49,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="车牌号"  
+                <el-form-item  label="车牌号"
  prop="vehicleId" >
                     <popupSelect    v-model="dataForm.vehicleId"
  placeholder="请选择车辆"  clearable  field="vehicleId" interfaceId="381432451370615173" :columnOptions="vehicleIdcolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
@@ -60,7 +60,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="24" >
-                <el-form-item  label="车辆图片"  
+                <el-form-item  label="车辆图片"
  prop="vehiclePictures" >
                     <JNPF-UploadImg    v-model="dataForm.vehiclePictures"
  :fileSize="500"    sizeUnit="MB"  :limit="9" >
@@ -69,7 +69,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="磅单时间"  
+                <el-form-item  label="磅单时间"
  prop="poundDate" >
                     <el-date-picker    v-model="dataForm.poundDate"
  placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
@@ -78,7 +78,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="磅单号"  
+                <el-form-item  label="磅单号"
  prop="poundlistNo" >
                     <el-input    v-model="dataForm.poundlistNo"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
@@ -87,7 +87,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="皮重"  
+                <el-form-item  label="皮重"
  prop="tareWeight" >
                     <el-input    v-model="dataForm.tareWeight"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
@@ -96,7 +96,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="毛重"  
+                <el-form-item  label="毛重"
  prop="grossWeight" >
                     <el-input    v-model="dataForm.grossWeight"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
@@ -105,7 +105,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="扣重"  
+                <el-form-item  label="扣重"
  prop="buckleWeight" >
                     <el-input    v-model="dataForm.buckleWeight"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
@@ -114,7 +114,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="净重"  
+                <el-form-item  label="净重"
  prop="netWeight" >
                     <el-input    v-model="dataForm.netWeight"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
@@ -123,7 +123,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="单位 "  
+                <el-form-item  label="单位 "
  prop="unit" >
                     <el-select    v-model="dataForm.unit"
  placeholder="请选择"  clearable  :style='{"width":"100%"}'>
@@ -133,7 +133,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="运输类型"  
+                <el-form-item  label="运输类型"
  prop="transportType" >
                     <el-select    v-model="dataForm.transportType"
  placeholder="请选择"  clearable  :style='{"width":"100%"}'>
@@ -143,7 +143,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="是否垫资"  
+                <el-form-item  label="是否垫资"
  prop="advance" >
                     <el-select    v-model="dataForm.advance"
  placeholder="请选择"  clearable  :style='{"width":"100%"}'>
@@ -153,7 +153,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="运费"  
+                <el-form-item  label="运费"
  prop="transportPrice" >
                     <el-input    v-model="dataForm.transportPrice"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
@@ -162,7 +162,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="销售价格"  
+                <el-form-item  label="销售价格"
  prop="salesPrice" >
                     <el-input    v-model="dataForm.salesPrice"
  placeholder="请输入"  clearable  :style='{"width":"100%"}'>
@@ -171,7 +171,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="业务员"  
+                <el-form-item  label="业务员"
  prop="creatorUserName" >
                     <popupSelect    v-model="dataForm.creatorUserName"
  placeholder="请选择业务员"  clearable  field="creatorUserName" interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="creatorUserNamecolumnOptions" propsValue="F_RealName" relationField="F_RealName" popupType="dialog"
@@ -182,7 +182,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="自然人"  
+                <el-form-item  label="自然人"
  prop="naturalId" >
                     <popupSelect    v-model="dataForm.naturalId"
  placeholder="请选择自然人"  clearable  field="naturalId" interfaceId="395933800510599301" :columnOptions="naturalIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog"
@@ -193,7 +193,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="备注"  
+                <el-form-item  label="备注"
  prop="remark" >
                     <el-input    v-model="dataForm.remark"
  placeholder="请输入备注信息"  clearable  :style='{"width":"100%"}'>
@@ -202,7 +202,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="24" >
-                <el-form-item  label="磅单日期"  
+                <el-form-item  label="磅单日期"
  prop="creatorTime" >
                     <el-input    v-model="dataForm.creatorTime"
  placeholder="系统自动生成"  readonly >
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
index 118ac88a..b1ec31f8 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/index.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="JNPF-common-layout">
 
-<<<<<<< HEAD
         <div class="JNPF-common-layout-center">
             <el-row class="JNPF-common-search-box" :gutter="16">
                 <el-form @submit.native.prevent>
@@ -104,116 +103,6 @@ width="150" >
         <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
         <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
     </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.materialName" 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>
-					</div>
-					<div class="JNPF-common-head-right">
-						<el-tooltip effect="dark" content="刷新" placement="top">
-							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-								@click="reset()" />
-						</el-tooltip>
-						<screenfull isContainer />
-					</div>
-				</div>
-				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
-					@selection-change="handleSelectionChange" border>
-          <el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
-					<el-table-column prop="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 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="运费" 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">
-									<img :src="`/dev${item.url}`" width="100%" />
-									<img
-										slot="reference"
-										:src="`/dev${item.url}`"
-										:alt="`/dev${item.url}`"
-										style="max-height: 70px;max-width: 70px; padding: 5px"
-									/>
-								</el-popover>
-							</span>
-						</template>
-					</el-table-column>
-					<el-table-column prop="vehiclePictures" label="车辆图片" width="150" align="center">
-						<template slot-scope="scope">
-							<span v-for="(item,index) in JSON.parse(scope.row.vehiclePictures)" :key="index">
-								<el-popover placement="bottom" trigger="click" width="1000">
-									<img :src="`/dev${item.url}`" width="100%" />
-									<img
-										slot="reference"
-										:src="`/dev${item.url}`"
-										:alt="`/dev${item.url}`"
-										style="max-height: 70px;max-width: 70px; padding: 5px"
-									/>
-								</el-popover>
-							</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="操作" fixed="right" width="100" 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>
-						</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>
->>>>>>> ddaf1c11476266e400901543653df705c0f58f87
 </template>
 
 <script>