diff --git a/SC-web/src/views/scm/basicInformation/receiptout/index.vue b/SC-web/src/views/scm/basicInformation/receiptout/index.vue
index 391b956c..894959bd 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/index.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/index.vue
@@ -1,26 +1,26 @@
 <template>
-    <div class="JNPF-common-layout">
+  <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-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="业务类型">
               <el-select v-model="query.type" placeholder="请选择" clearable>
                 <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id"
-                  :disabled="item.disabled"></el-option>
+                           :disabled="item.disabled"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="客户名称">
-              <el-input v-model="query.customerName" placeholder="请输入" clearable> </el-input>
+              <el-input v-model="query.customerName" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -34,9 +34,9 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="text" v-has="'btn_add'"   icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="text" v-has="'btn_add'" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text"  v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" v-has="'btn_download'" icon="el-icon-download" @click="exportData()">导出
             </el-button>
             <el-button type="text" v-has="'btn_batchRemove'" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
@@ -47,351 +47,354 @@
           </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-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="reset()"/>
             </el-tooltip>
-            <screenfull isContainer />
+            <screenfull isContainer/>
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
-          @selection-change="handleSelectionChange" border>
-          <el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
-          <el-table-column prop="documentNo" label="单据编号" width="200" sortable align="center" fixed="left" />
-          <el-table-column prop="customerName" label="客户名称" width="150" sortable align="center" fixed="left" />
-          <el-table-column prop="amount" label="出库金额" width="120" sortable align="center" />
-          <el-table-column prop="num" label="出库数量" width="120" sortable align="center" />
-          <el-table-column label="币别" width="80" sortable prop="currency" align="center" >
+                    @selection-change="handleSelectionChange" border>
+          <el-table-column type="index" width="50" label="序号" fixed="left" align="center"/>
+          <el-table-column prop="documentNo" label="单据编号" width="200" sortable align="center" fixed="left"/>
+          <el-table-column prop="customerName" label="客户名称" width="150" sortable align="center" fixed="left"/>
+          <el-table-column prop="amount" label="出库金额" width="120" sortable align="center"/>
+          <el-table-column prop="num" label="出库数量" width="120" sortable align="center"/>
+          <el-table-column label="币别" width="80" sortable prop="currency" align="center">
             <template slot-scope="scope">
               {{ scope.row.currency | dynamicText(currencyOptions) }}
             </template>
           </el-table-column>
-          <el-table-column prop="issueDate" label="出库日期" width="120" sortable align="center" sortable="custom" />
-          <el-table-column prop="sourceNo" label="来源单号" width="200" sortable align="center" />
-          <el-table-column label="业务类型" width="120" sortable prop="type" align="center" >
+          <el-table-column prop="issueDate" label="出库日期" width="120" sortable align="center" sortable="custom"/>
+          <el-table-column prop="sourceNo" label="来源单号" width="200" sortable align="center"/>
+          <el-table-column label="业务类型" width="120" sortable prop="type" align="center">
             <template slot-scope="scope">
               {{ scope.row.type | dynamicText(typeOptions) }}
             </template>
           </el-table-column>
-          <el-table-column prop="remark" label="备注" width="120" sortable align="center" />
-          <el-table-column label="单据状态" width="120" sortable prop="status" align="center" >
+          <el-table-column prop="remark" label="备注" width="120" sortable align="center"/>
+          <el-table-column label="单据状态" width="120" sortable prop="status" align="center">
             <template slot-scope="scope">
               {{ scope.row.status | dynamicText(statusOptions) }}
             </template>
           </el-table-column>
-          <el-table-column prop="creatorTime" label="创建时间" width="120" sortable align="center" />
-          <el-table-column prop="creatorUserName" label="创建人名称" width="120" sortable align="center" />
+          <el-table-column prop="creatorTime" label="创建时间" width="120" sortable align="center"/>
+          <el-table-column prop="creatorUserName" label="创建人名称" width="120" sortable align="center"/>
           <el-table-column label="操作" fixed="right" width="150">
             <template slot-scope="scope">
-              <el-button type="text"  v-has="'btn_edit'"  @click="addOrUpdateHandle(scope.row.id)">编辑
+              <el-button type="text" v-has="'btn_edit'" @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
-              <el-button type="text" v-has="'btn_remove'"  class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" v-has="'btn_remove'" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button type="text"  v-has="'btn_detail'"  @click="goDetail(scope.row.id)">详情
+              <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
         <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+                    @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.type" placeholder="请选择"
-                                                   clearable>
-                                            <el-option v-for="(item, index) in typeOptions" :key="index"
-                                                       :label="item.fullName" :value="item.id"
-                                                       :disabled="item.disabled"></el-option>
-                                        </el-select>
-                                </el-form-item>
-                            </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <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" border>
-                            <el-table-column prop="documentNo" label="单据编号" width="0" align="left"
-/>
-                            <el-table-column prop="customerId" label="客户名称" width="0" align="left"
-/>
-                            <el-table-column prop="amount" 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="issueDate" label="出库日期" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="sourceNo" label="来源单号" width="0" align="left"
-/>
-                                <el-table-column label="业务类型" width="0" prop="type" algin="left"
->
-                                    <template slot-scope="scope">
-                                        {{ scope.row.type | dynamicText(typeOptions) }}
-                                    </template>
-                                </el-table-column>
-                            <el-table-column prop="remark" label="备注" width="0" align="left"
-/>
-                                <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="creatorTime" label="创建时间" width="0" align="left"
-/>
-                            <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 class="JNPF-common-layout-center">
+        <el-row class="JNPF-common-search-box" :gutter="16">
+          <el-form @submit.native.prevent>
+            <el-col :span="6">
+              <el-form-item label="单据编号">
+                <el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="业务类型">
+                <el-select v-model="query.type" placeholder="请选择"
+                           clearable>
+                  <el-option v-for="(item, index) in typeOptions" :key="index"
+                             :label="item.fullName" :value="item.id"
+                             :disabled="item.disabled"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item>
+                <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" border>
+            <el-table-column prop="documentNo" label="单据编号" width="0" align="left"
+            />
+            <el-table-column prop="customerId" label="客户名称" width="0" align="left"
+            />
+            <el-table-column prop="amount" 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="issueDate" label="出库日期" width="0" align="left"
+                             sortable="custom"/>
+            <el-table-column prop="sourceNo" label="来源单号" width="0" align="left"
+            />
+            <el-table-column label="业务类型" width="0" prop="type" algin="left"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.type | dynamicText(typeOptions) }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="remark" label="备注" width="0" align="left"
+            />
+            <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="creatorTime" label="创建时间" width="0" align="left"
+            />
+            <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>
-        <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"/>
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
+      </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>
+  </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,
-                                type: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: 'customerId', label: '客户名称'},
-                    {prop: 'amount', label: '出库金额'},
-                    {prop: 'num', label: '出库数量'},
-                    {prop: 'currency', label: '币别'},
-                    {prop: 'issueDate', label: '出库日期'},
-                    {prop: 'sourceNo', label: '来源单号'},
-                    {prop: 'type', label: '业务类型'},
-                    {prop: 'remark', label: '备注'},
-                    {prop: 'status', label: '单据状态'},
-                    {prop: 'creatorTime', label: '创建时间'},
-                    {prop: 'creatorUserName', label: '创建人名称'},
-                ],
-                                typeOptions:[{"fullName":"销售出库","id":"0"},{"fullName":"购销出库","id":"1"}],
-                            typeProps:{"label":"fullName","value":"id"},
-                                currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                            currencyProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
-                            statusProps:{"label":"fullName","value":"id"},
-            }
+  export default {
+    components: {JNPFForm, ExportBox, Detail},
+    data() {
+      return {
+        detailVisible: false,
+        query: {
+          documentNo: undefined,
+          type: 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/receipout/Receiptout/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: 'customerId', label: '客户名称'},
+          {prop: 'amount', label: '出库金额'},
+          {prop: 'num', label: '出库数量'},
+          {prop: 'currency', label: '币别'},
+          {prop: 'issueDate', label: '出库日期'},
+          {prop: 'sourceNo', label: '来源单号'},
+          {prop: 'type', label: '业务类型'},
+          {prop: 'remark', label: '备注'},
+          {prop: 'status', label: '单据状态'},
+          {prop: 'creatorTime', label: '创建时间'},
+          {prop: 'creatorUserName', label: '创建人名称'},
+        ],
+        typeOptions: [{"fullName": "销售出库", "id": "0"}, {"fullName": "购销出库", "id": "1"}],
+        typeProps: {"label": "fullName", "value": "id"},
+        currencyOptions: [{"fullName": "人民币", "id": "0"}, {"fullName": "美元", "id": "1"}, {"fullName": "英镑", "id": "2"}],
+        currencyProps: {"label": "fullName", "value": "id"},
+        statusOptions: [{"fullName": "已保存", "id": "0"}, {"fullName": "审批中", "id": "1"}, {"fullName": "已审批", "id": "2"}],
+        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/receipout/Receiptout/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/receipout/Receiptout/${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/receipout/Receiptout/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/receipout/Receiptout/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/receipout/Receiptout/${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/receipout/Receiptout/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/receipout/Receiptout/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/saleorder/index.vue b/SC-web/src/views/scm/basicInformation/saleorder/index.vue
index 0c785526..fe610572 100644
--- a/SC-web/src/views/scm/basicInformation/saleorder/index.vue
+++ b/SC-web/src/views/scm/basicInformation/saleorder/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>
@@ -93,7 +92,7 @@
         <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>
@@ -209,7 +208,8 @@ width="150" >
         <JNPF-Form5 v-if="formVisible" ref="JNPFForm5" @refresh="refresh"/>
         <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
         <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
->>>>>>> 0ca55ae8a6b3041ec1706aa97ac7c9fc103e10cf
+
+    </div>
     </div>
 </template>