diff --git a/src/api/merchandiseReturn/merchandiseReturn.js b/src/api/merchandiseReturn/merchandiseReturn.js
new file mode 100644
index 0000000..6568633
--- /dev/null
+++ b/src/api/merchandiseReturn/merchandiseReturn.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/oms/v1/smssalesreturn/listPage',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 选择商品
+  chooseProducts: function(params) {
+    return request({
+      url: '/oms/apiadmin/base/basegoodsspu/getGoodsForSales',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  fetchBySid: function(data) {
+    return request({
+      url: '/oms/v1/smssalesreturn/fetchDetailsBySid/' + data,
+      method: 'get'
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/oms/v1/smssalesreturn/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/oms/v1/smssalesreturn/save',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  }
+}
diff --git a/src/router/index.js b/src/router/index.js
index cc6a8b9..a283b57 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -65,9 +65,24 @@ export const constantRoutes = [
         title: '销售订单管理',
         noCache: true
       }
+    }]
+  },
+  {
+    path: '/merchandiseReturn',
+    component: Layout,
+    redirect: '/merchandiseReturn',
+    meta: {
+      title: '商品退货管理'
     },
-
-    ]
+    children: [{
+      path: '/merchandiseReturn/merchandiseReturn',
+      component: () => import('@/views/merchandiseReturn/merchandiseReturn'),
+      name: 'MerchandiseReturn',
+      meta: {
+        title: '商品退货管理',
+        noCache: true
+      }
+    }]
   },
   {
     path: '/purchase',
diff --git a/src/views/merchandiseReturn/merchandiseReturn.vue b/src/views/merchandiseReturn/merchandiseReturn.vue
new file mode 100644
index 0000000..5aae1e5
--- /dev/null
+++ b/src/views/merchandiseReturn/merchandiseReturn.vue
@@ -0,0 +1,312 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="商品退货单管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="制单部门">
+                <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="制单日期">
+                <el-date-picker v-model="listQuery.params.startDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.endDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="仓库">
+                <el-input v-model="listQuery.params.warehouseName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="订单号">
+                <el-input v-model="listQuery.params.sourceBillNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="物流单号">
+                <el-input v-model="listQuery.params.logisticsNum" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="业务员">
+                <el-input v-model="listQuery.params.salesName" placeholder="" clearable/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">商品退货申请列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" width="180" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="small" @click="toEdit(scope.row)">办理</el-button>
+                <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="billNo" label="单据编号" align="center" width="190" />
+            <el-table-column prop="deptName" label="制单部门" align="center" width="130" />
+            <el-table-column prop="createByName" label="制单人" align="center" width="120" />
+            <el-table-column prop="createTime" label="制单日期" align="center" width="120" />
+            <el-table-column prop="billTypeValue" label="单据类型" align="center" width="100" />
+            <el-table-column prop="warehouseName" label="仓库" align="center" min-width="160" />
+            <el-table-column prop="customerName" label="客户名称" align="center" min-width="130" />
+            <el-table-column prop="amount" label="总金额" align="center" width="100" />
+            <el-table-column prop="sourceBillNo" label="订单号" align="center" width="100" />
+            <el-table-column prop="logisticsNum" label="物流单号" align="center" width="100" />
+            <el-table-column prop="salesName" label="业务员" align="center" width="100" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+    <!--新增及修改 -->
+    <merchandiseReturnAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!-- 详情 -->
+    <merchandiseReturnInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/merchandiseReturn/merchandiseReturn'
+import merchandiseReturnAdd from './merchandiseReturnAdd'
+import merchandiseReturnInfo from './merchandiseReturnInfo'
+
+export default {
+  name: 'MerchandiseReturn',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    merchandiseReturnAdd,
+    merchandiseReturnInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          createByName: '',
+          deptName: '',
+          billNo: '',
+          startDate: '',
+          endDate: '',
+          salesName: '',
+          billTypeKey: '',
+          customerName: '',
+          warehouseName: '',
+          sourceBillNo: '',
+          useOrgSid: '',
+          createOrgSid: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.useOrgSid = window.sessionStorage.getItem('orgSid')
+      this.listQuery.params.createOrgSid = window.sessionStorage.getItem('orgSid')
+      req.listPage(this.listQuery).then(response => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 点击重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          createByName: '',
+          deptName: '',
+          billNo: '',
+          startDate: '',
+          endDate: '',
+          salesName: '',
+          billTypeKey: '',
+          customerName: '',
+          warehouseName: '',
+          sourceBillNo: '',
+          useOrgSid: '',
+          createOrgSid: ''
+        }
+      }
+      this.getList()
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    toEdit(row) {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit(row)
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
+    // 删除
+    doDel() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+        return
+      }
+      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        req.deleteBySids(this.sids).then((resp) => {
+          if (resp.success) {
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+          }
+          this.getList()
+          loading.close()
+        }).catch(e => {
+          loading.close()
+        })
+      }).catch(() => {
+      })
+    },
+    // 修改、编辑、详情返回列表页面
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
diff --git a/src/views/merchandiseReturn/merchandiseReturnAdd.vue b/src/views/merchandiseReturn/merchandiseReturnAdd.vue
new file mode 100644
index 0000000..9d1cd15
--- /dev/null
+++ b/src/views/merchandiseReturn/merchandiseReturnAdd.vue
@@ -0,0 +1,455 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">制单人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">制单部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">制单日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">单据类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">仓库</div>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.warehouseSid" placeholder="请选择" @change="warehouseChange" clearable filterable>
+                  <el-option v-for="item in warehouse_list" :key="item.warehouseSid" :label="item.warehouseName" :value="item.warehouseSid"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">业务员</div>
+              <el-form-item></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">物流公司</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.logisticsName" clearable placeholder="" /></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">物流单号</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.logisticsNum" clearable placeholder="" /></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.customerName" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">结算账户</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankAccount" clearable placeholder="" /></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">记预收款</div>
+              <el-form-item>
+                <el-radio-group class="addinputInfo" v-model="formobj.isTotoPrepayment">
+                  <el-radio label="1">是</el-radio>
+                  <el-radio label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">订单号</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.sourceBillNo" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder=""/></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">商品</div>
+          <el-table :key="commodityKey" :data="formobj.goodsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column align="center" width="80">
+              <template slot="header" slot-scope="scope">
+                <i class="add-btn-icon el-icon-plus" style="color: red;font-size:20px" @click="commodityAdd(scope.row)"></i>
+              </template>
+              <template slot-scope="scope">
+                <i class="el-icon-delete" @click="commodityDelete(scope.$index)"></i>
+              </template>
+            </el-table-column>
+            <el-table-column label="商品名称" width="200" align="center">
+              <template slot-scope="scope">
+                <el-popover placement="right" width="500" trigger="click">
+                  <div>
+                    <el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row @current-change="commodityCurrentChange($event, scope.row)">
+                      <el-table-column fixed prop="goodsSpuName" label="商品名称" align="center" />
+                      <el-table-column prop="goodsSkuCode" label="商品" align="center" />
+                      <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
+                      <el-table-column prop="unit" label="单位" align="center" />
+                    </el-table>
+                    <el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size" layout="total, pager" :total="commodityQuery.total" />
+                  </div>
+                  <el-input slot="reference" v-model="scope.row.goodsSpuName" @input="commodityInput(scope.row.goodsSpuName)" clearable placeholder="商品名称"/>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
+            <el-table-column prop="weight" label="重量" width="100" align="center" />
+            <el-table-column prop="unit" label="单位" width="100" align="center" />
+            <el-table-column prop="auxiliaryUnit" label="辅单位数量" width="120" align="center" />
+            <el-table-column prop="count" label="数量" width="150" align="center">
+              <template slot-scope="scope">
+                <el-input @input="backAmountInput(scope.row)" @keyup.native="scope.row.count = getNumber(scope.row.count, 0)" v-model="scope.row.count" clearable placeholder="" />
+              </template>
+            </el-table-column>
+            <el-table-column label="标准售价" width="150" align="center">
+              <template slot-scope="scope">
+                <el-input @keyup.native="scope.row.maxPrice = getNumber(scope.row.maxPrice, 2)" v-model="scope.row.maxPrice" clearable placeholder="" />
+              </template>
+            </el-table-column>
+            <el-table-column label="折后单价" width="150" align="center">
+              <template slot-scope="scope">
+                <el-input @input="backAmountInput(scope.row)" @keyup.native="scope.row.discountPrice = getNumber(scope.row.discountPrice, 2)" v-model="scope.row.discountPrice" clearable placeholder="" />
+              </template>
+            </el-table-column>
+            <el-table-column label="批发价" width="150" align="center">
+              <template slot-scope="scope">
+                <el-input @keyup.native="scope.row.tradePrice = getNumber(scope.row.tradePrice, 2)" v-model="scope.row.tradePrice" clearable placeholder="" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="backAmount" label="销售金额小计" width="150" align="center" />
+            <el-table-column label="库位编码" width="150" align="center">
+              <template slot-scope="scope">
+                <el-input @keyup.native="scope.row.warehouseRackCode = getNumber(scope.row.warehouseRackCode, 2)" v-model="scope.row.warehouseRackCode" clearable placeholder="" />
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" min-width="300">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remarks" clearable placeholder="" />
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/merchandiseReturn/merchandiseReturn'
+import { getWareHouse } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'MerchandiseReturnAdd',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      warehouse_list: [], // 仓库
+      // commodity商品
+      commodityKey: 1,
+      commodityLoading: false,
+      commodityQuery: {
+        current: 1,
+        size: 2,
+        total: 0,
+        params: {
+          goodsName: '',
+          createOrgSid: ''
+        }
+      },
+      commodityData: [],
+      index: 0,
+      formobj: {
+        sid: '',
+        createBySid: '',
+        createByName: '',
+        useOrgSid: '',
+        createOrgSid: '',
+        remarks: '',
+        deptSid: '',
+        deptName: '',
+        createTime: '',
+        sourceBillSid: '',
+        sourceBillNo: '',
+        billTypeKey: '',
+        billTypeValue: '',
+        warehouseSid: '',
+        warehouseName: '',
+        bankAccount: '',
+        isTotoPrepayment: '',
+        logisticsName: '',
+        logisticsNum: '',
+        salesUserSid: '',
+        salesName: '',
+        customerSid: '',
+        customerName: '',
+        amount: '',
+        goodsList: []
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    init() {
+      getWareHouse({ createOrgSid: window.sessionStorage.getItem('orgSid') }).then((res) => {
+        if (res.success) {
+          this.warehouse_list = res.data
+        }
+      })
+    },
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
+    showAdd() {
+      this.viewTitle = '【新增】商品退货单'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.init()
+      this.formobj.createByName = window.sessionStorage.getItem('userName')
+      this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.createOrgSid = window.sessionStorage.getItem('orgSid')
+      this.formobj.useOrgSid = window.sessionStorage.getItem('orgSid')
+      this.formobj.billTypeValue = '销售退货'
+      this.formobj.billTypeKey = '001'
+      var nowDate = new Date()
+      var date = {
+        year: nowDate.getFullYear(),
+        month: nowDate.getMonth() + 1,
+        day: nowDate.getDate()
+      }
+      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
+    },
+    showEdit(row) {
+      this.viewTitle = '【编辑】商品退货单'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.init()
+      req.fetchBySid(row.sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    warehouseChange(value) {
+      const choose = this.warehouse_list.filter((item) => item.warehouseSid === value)
+      if (choose !== null && choose.length > 0) {
+        this.formobj.warehouseName = choose[0].warehouseName
+      } else {
+        this.formobj.warehouseName = ''
+      }
+    },
+    commodityAdd() {
+      this.formobj.goodsList.push({
+        goodSpuSid: '',
+        goodsSpuName: '',
+        goodsSkuSid: '',
+        goodsSkuTitle: '',
+        goodsSkuCode: '',
+        goodsSkuOwnSpec: '',
+        weight: '',
+        volume: '',
+        unit: '',
+        auxiliaryUnit: '',
+        price: '',
+        count: '',
+        discountRtate: '',
+        discountPrice: '',
+        dueAmount: '',
+        cost: '',
+        discountAmount: '',
+        amount: '',
+        inventoryCount: '',
+        remarks: ''
+      })
+    },
+    commodityInput(value) {
+      this.commodityQuery.params.createOrgSid = window.sessionStorage.getItem('orgSid')
+      this.commodityQuery.params.goodsName = value
+      this.commodityLoading = true
+      req.chooseProducts(this.commodityQuery).then((response) => {
+        if (response.success) {
+          this.commodityLoading = false
+          this.commodityData = response.data.records
+          this.commodityQuery.total = response.data.total
+        } else {
+          this.commodityLoading = false
+          this.commodityData = []
+          this.commodityQuery.total = 0
+        }
+      })
+    },
+    commodityCurrentChange(value, row) {
+      row.goodSpuSid = value.goodSpuSid
+      row.goodsSpuName = value.goodsSpuName
+      row.goodsSkuSid = value.goodsSkuSid
+      row.goodsSkuTitle = value.goodsSkuTitle
+      row.goodsSkuCode = value.goodsSkuCode
+      row.goodsSkuOwnSpec = value.goodsSkuOwnSpec
+      row.weight = value.weight
+      row.volume = value.volume
+      row.unit = value.unit
+      row.auxiliaryUnit = value.auxiliaryUnit
+      row.price = value.price
+      row.count = value.count
+      document.body.click()
+    },
+    commodityDelete(index) {
+      this.formobj.goodsList.splice(index, 1)
+    },
+    // 合计
+    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 (column.property === 'auxiliaryUnit') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        } else if (column.property === 'count') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        } else if (column.property === 'backAmount') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        }
+      })
+      return sums
+    },
+    // 计算销售金额小计= 数量 * 折后单价
+    backAmountInput(row) {
+      row.backAmount = Math.round((parseFloat(row.count !== '' ? row.count : '0') * parseFloat(row.discountPrice !== '' ? row.discountPrice : '0')) * 100) / 100
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        sid: '',
+        createBySid: '',
+        createByName: '',
+        useOrgSid: '',
+        createOrgSid: '',
+        remarks: '',
+        deptSid: '',
+        deptName: '',
+        createTime: '',
+        sourceBillSid: '',
+        sourceBillNo: '',
+        billTypeKey: '',
+        billTypeValue: '',
+        warehouseSid: '',
+        warehouseName: '',
+        bankAccount: '',
+        isTotoPrepayment: '',
+        logisticsName: '',
+        logisticsNum: '',
+        salesUserSid: '',
+        salesName: '',
+        customerSid: '',
+        customerName: '',
+        amount: '',
+        goodsList: []
+      }
+      this.commodityData = []
+      this.submitdisabled = false
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 120px !important;
+  width: calc(100% - 115px);
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+  display: inline;
+  line-height: 1px;
+  vertical-align: middle;
+}
+</style>
diff --git a/src/views/merchandiseReturn/merchandiseReturnInfo.vue b/src/views/merchandiseReturn/merchandiseReturnInfo.vue
new file mode 100644
index 0000000..2bbb382
--- /dev/null
+++ b/src/views/merchandiseReturn/merchandiseReturnInfo.vue
@@ -0,0 +1,248 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">制单人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">制单部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">制单日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">单据类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">仓库</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.warehouseName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">业务员</div>
+              <el-form-item></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">物流公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.logisticsName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">物流单号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.logisticsNum }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">结算账户</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bankAccount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">记预收款</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isTotoPrepayment == '1' ? '是' : formobj.isTotoPrepayment == '0' ? '否' : '' }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">订单号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">商品</div>
+          <el-table :key="commodityKey" :data="formobj.goodsList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="goodsSpuName" label="商品名称" width="200" align="center"/>
+            <el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
+            <el-table-column prop="weight" label="重量" width="100" align="center" />
+            <el-table-column prop="unit" label="单位" width="100" align="center" />
+            <el-table-column prop="auxiliaryUnit" label="辅单位数量" width="120" align="center" />
+            <el-table-column prop="count" label="数量" width="150" align="center" />
+            <el-table-column prop="maxPrice" label="标准售价" width="150" align="center" />
+            <el-table-column prop="discountPrice" label="折后单价" width="150" align="center" />
+            <el-table-column prop="tradePrice" label="批发价" width="150" align="center" />
+            <el-table-column prop="backAmount" label="销售金额小计" width="150" align="center" />
+            <el-table-column prop="warehouseRackCode" label="库位编码" width="150" align="center" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
+          </el-table>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/merchandiseReturn/merchandiseReturn'
+
+export default {
+  name: 'MerchandiseReturnInfo',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      // commodity商品
+      commodityKey: 1,
+      index: 0,
+      formobj: {
+        sid: '',
+        createBySid: '',
+        createByName: '',
+        useOrgSid: '',
+        createOrgSid: '',
+        remarks: '',
+        deptSid: '',
+        deptName: '',
+        createTime: '',
+        sourceBillSid: '',
+        sourceBillNo: '',
+        billTypeKey: '',
+        billTypeValue: '',
+        warehouseSid: '',
+        warehouseName: '',
+        bankAccount: '',
+        isTotoPrepayment: '',
+        logisticsName: '',
+        logisticsNum: '',
+        salesUserSid: '',
+        salesName: '',
+        customerSid: '',
+        customerName: '',
+        amount: '',
+        goodsList: []
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '销售退货单详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid(row.sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    // 合计
+    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 (column.property === 'auxiliaryUnit') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        } else if (column.property === 'count') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        } else if (column.property === 'backAmount') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        }
+      })
+      return sums
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '',
+        createBySid: '',
+        createByName: '',
+        useOrgSid: '',
+        createOrgSid: '',
+        remarks: '',
+        deptSid: '',
+        deptName: '',
+        createTime: '',
+        sourceBillSid: '',
+        sourceBillNo: '',
+        billTypeKey: '',
+        billTypeValue: '',
+        warehouseSid: '',
+        warehouseName: '',
+        bankAccount: '',
+        isTotoPrepayment: '',
+        logisticsName: '',
+        logisticsNum: '',
+        salesUserSid: '',
+        salesName: '',
+        customerSid: '',
+        customerName: '',
+        amount: '',
+        goodsList: []
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 120px !important;
+  width: calc(100% - 115px);
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+  display: inline;
+  line-height: 1px;
+  vertical-align: middle;
+}
+</style>