diff --git a/anrui-scm/anrui-scm-ui/src/api/anruiscm/scmotherinbound.js b/anrui-scm/anrui-scm-ui/src/api/anruiscm/scmotherinbound.js
index ac8239d378..2b11fb0cdc 100644
--- a/anrui-scm/anrui-scm-ui/src/api/anruiscm/scmotherinbound.js
+++ b/anrui-scm/anrui-scm-ui/src/api/anruiscm/scmotherinbound.js
@@ -93,7 +93,7 @@ export default {
   // 获取客户可搜索下拉列表
   kehu: function(data) {
     return request({
-      url: '/buscenter/v1/busorder/likeGetCustomerName',
+      url: '/crm/v1/crmcustomer/cusList',
       method: 'post',
       params: data
     })
diff --git a/anrui-scm/anrui-scm-ui/src/api/anruiscm/scmotheroutbound.js b/anrui-scm/anrui-scm-ui/src/api/anruiscm/scmotheroutbound.js
index 54bc95dc27..93cd96d003 100644
--- a/anrui-scm/anrui-scm-ui/src/api/anruiscm/scmotheroutbound.js
+++ b/anrui-scm/anrui-scm-ui/src/api/anruiscm/scmotheroutbound.js
@@ -1,7 +1,6 @@
 import request from '@/utils/request'
 // 其他出库单
 export default {
-
   // 查询分页列表
   listPage: function(params) {
     return request({
@@ -83,7 +82,7 @@ export default {
   // 获取客户可搜索下拉列表
   kehu: function(data) {
     return request({
-      url: '/buscenter/v1/busorder/likeGetCustomerName',
+      url: '/crm/v1/crmcustomer/cusList',
       method: 'post',
       params: data
     })
@@ -98,16 +97,7 @@ export default {
       data: data
     })
   },
-  // 获取组织（单选组织架构）
-  getOrg: function() {
-    return request({
-      url: '/portal/v1/sysorganization/getListOrg',
-      method: 'get',
-      params: data
-      // data: data
-    })
-  },
-  //获取物料编码
+  // 获取物料编码
   getWlxx: function(data) {
     return request({
       url: '/scm/v1/scmmaterial/mNumsDown',
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotherinbound/scmotherinbound.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotherinbound/scmotherinbound.vue
index d351d602f0..66e15d079d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotherinbound/scmotherinbound.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotherinbound/scmotherinbound.vue
@@ -3,65 +3,40 @@
     <div v-show="viewState === 1">
       <button-bar view-title="其他入库单" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="searchcon">
-        <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' :
-          '显示查询条件' }}
-        </el-button>
+        <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
         <div v-show="isSearchShow" class="search">
           <el-form :inline="true" class="tab-header">
             <el-form-item label="单据编号">
               <el-input v-model="queryParams.params.billNo" placeholder="请输入单据编号" clearable/>
             </el-form-item>
             <el-form-item label="单据类型">
-              <el-select v-model="queryParams.params.billType" @change="changeBillType" style="width:200px"
-                         filterable placeholder="请选择" clearable>
-                <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue"
-                           :value="item.dictKey"></el-option>
+              <el-select v-model="queryParams.params.billType" @change="changeBillType" style="width:200px" filterable placeholder="请选择" clearable>
+                <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
               </el-select>
-              <!--              <el-input v-model="queryParams.params.billType" placeholder="请输入单据类型" clearable/>-->
             </el-form-item>
             <el-form-item label="供应商" class="search_label">
-              <el-select v-model="queryParams.params.manufacturerName" @change="changeManu" style="width:200px"
-                         filterable placeholder="请选择" clearable>
-                <el-option v-for="item in manu_list" :key="item.sid" :label="item.manufacturerName"
-                           :value="item.sid"></el-option>
+              <el-select v-model="queryParams.params.manufacturerName" @change="changeManu" style="width:200px" filterable placeholder="请选择" clearable>
+                <el-option v-for="item in manu_list" :key="item.sid" :label="item.manufacturerName" :value="item.sid"></el-option>
               </el-select>
-              <!--              <el-input v-model="queryParams.params.manufacturerName" placeholder="请输入供应商" clearable/>-->
             </el-form-item>
             <el-form-item label="客户" class="search_label">
-              <el-select v-model="queryParams.params.customer" @change="changeCustomer" style="width:200px"
-                         filterable placeholder="请选择" clearable>
-                <el-option v-for="item in customer_list" :key="item.sid" :label="item.customerName"
-                           :value="item.sid"></el-option>
+              <el-select v-model="queryParams.params.customer" @change="changeCustomer" style="width:200px" filterable placeholder="请选择" clearable>
+                <el-option v-for="item in customer_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
               </el-select>
-              <!--              <el-input v-model="queryParams.params.customer" placeholder="请输入客户" clearable/>-->
             </el-form-item>
             <el-form-item label="货主" class="search_label">
               <el-input v-model="queryParams.params.cargoOwner" placeholder="请输入货主" clearable/>
             </el-form-item>
             <el-form-item label="货主类型">
-              <el-select v-model="queryParams.params.cargoOwnerType" @change="changeCargoType" style="width:200px"
-                         filterable placeholder="请选择" clearable>
-                <el-option v-for="item in cargoType_list" :key="item.dictKey" :label="item.dictValue"
-                           :value="item.dictKey"></el-option>
+              <el-select v-model="queryParams.params.cargoOwnerType" @change="changeCargoType" style="width:200px" filterable placeholder="请选择" clearable>
+                <el-option v-for="item in cargoType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
               </el-select>
-              <!--              <el-input v-model="queryParams.params.cargoOwnerType" placeholder="请输入货主类型" clearable/>-->
             </el-form-item>
             <el-form-item label="单据状态">
-              <el-select v-model="queryParams.params.billState" @change="changeBillState" style="width:200px"
-                         filterable placeholder="请选择" clearable>
-                <el-option v-for="item in billState_list" :key="item.dictKey" :label="item.dictValue"
-                           :value="item.dictKey"></el-option>
+              <el-select v-model="queryParams.params.billState" @change="changeBillState" style="width:200px" filterable placeholder="请选择" clearable>
+                <el-option v-for="item in billState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
               </el-select>
-              <!--              <el-input v-model="queryParams.params.billState" placeholder="请输入单据状态" clearable/>-->
             </el-form-item>
-            <!--            <el-form-item label="验收员" class="search_label">-->
-            <!--              <el-select v-model="queryParams.params.inspectorName" @change="changeInspectorName" style="width:200px"-->
-            <!--                         filterable placeholder="请选择">-->
-            <!--                <el-option v-for="item in Inspector_list" :key="item.dictKey" :label="item.dictValue"-->
-            <!--                           :value="item.dictKey"></el-option>-->
-            <!--              </el-select>-->
-            <!--              <el-input v-model="queryParams.params.inspectorName" placeholder="请输入验收员" clearable/>-->
-            <!--            </el-form-item>-->
             <el-divider/>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" @click="dosearch">查询</el-button>
@@ -73,24 +48,13 @@
       <!--Start 项目列表头部-->
       <div class="listtop">
         <div class="tit">其他入库单列表</div>
-        <pageye
-          v-show="dataList.length > 0"
-          :total="queryParams.total"
-          :page.sync="queryParams.current"
-          :limit.sync="queryParams.size"
-          class="pagination"
-          @pagination="loadList"/>
+        <pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
       </div>
       <!--End 项目列表头部-->
 
       <!--Start 项目列表-->
       <div class="listcon">
-        <el-table
-          v-loading="tableLoading"
-          :data="dataList"
-          border
-          style="width: 100%"
-          @selection-change="handleSelectionChange">
+        <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
           <el-table-column width="50px" type="selection" align="center"/>
           <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
           <el-table-column prop="billNo" label="单据编号" align="center">
@@ -112,14 +76,7 @@
       <div class="pages">
         <div class="tit"/>
         <!-- 翻页 -->
-        <pagination
-          v-show="dataList.length > 0"
-          :total="queryParams.total"
-          :page.sync="queryParams.current"
-          :limit.sync="queryParams.size"
-          class="pagination"
-          @pagination="loadList"
-        />
+        <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
       </div>
     </div>
     <!--End 查询和其列表部分-->
@@ -133,432 +90,412 @@
 </template>
 
 <script>
-  import req from '@/api/anruiscm/scmotherinbound'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import divAdd from './scmotherinboundAdd'
-  import divInfo from './scmotherinboundInfo'
-  import { setuser, getuser } from '@/utils/baocun'
+import req from '@/api/anruiscm/scmotherinbound'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import divAdd from './scmotherinboundAdd'
+import divInfo from './scmotherinboundInfo'
 
-  export default {
-    name: 'ScmOtherInboundIndex',
-    components: {
-      ButtonBar,
-      Pagination,
-      pageye,
-      divAdd,
-      divInfo
+export default {
+  name: 'ScmOtherInboundIndex',
+  components: {
+    ButtonBar,
+    Pagination,
+    pageye,
+    divAdd,
+    divInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false, // 显示隐藏
+      tableLoading: false,
+      // 下拉框
+      billType_list: [], // 单据类型
+      manu_list: [], // 供应商
+      customer_list: [], // 客户
+      cargoType_list: [], // 货主类型
+      billState_list: [], // 单据状态
+      // Inspector_list: [], // 验收员
+      // 列表数据
+      dataList: [],
+      // sid数组
+      sids: [], // 用于导出的时候保存已选择SID
+      sides: '', // 一条数据的sid
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          billNo: '', // 单据编号
+          billType: '', // 单据类型
+          manufacturerName: '', // 供应商
+          cargoOwnerType: '', // 货主类型
+          orgName: '', // 部门
+          cargoOwner: '', // 货主
+          inspectorName: '', // 验收员
+          billState: '', // 单据状态
+          customer: '', // 客户
+          date: '', // 日期
+          remarks: '' // 备注
+        }
+      },
+      row: {}
+    }
+  },
+  created() {
+    this.loadList()
+    // 下拉框
+    this.getBillType() // 单据类型
+    this.getManu() // 供应商 可搜索
+    this.getCustomer() // 客户 可搜索
+    this.getCargoType() // 货主类型
+    this.getBillState() // 单据状态
+  },
+  methods: {
+    resetState() {
+      this.viewState = 1
     },
-    data() {
-      return {
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false, // 显示隐藏
-        tableLoading: false,
-        //下拉框
-        billType_list: [], //单据类型
-        manu_list: [], //供应商
-        customer_list: [], //客户
-        cargoType_list: [], // 货主类型
-        billState_list: [], // 单据状态
-        // Inspector_list: [], // 验收员
-        // 列表数据
-        dataList: [],
-        // sid数组
-        sids: [], // 用于导出的时候保存已选择SID
-        sides: '', // 一条数据的sid
-        queryParams: {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            billNo: '', // 单据编号
-            billType: '', // 单据类型
-            manufacturerName: '', // 供应商
-            cargoOwnerType: '', // 货主类型
-            orgName: '', // 部门
-            cargoOwner: '', // 货主
-            inspectorName: '', // 验收员
-            billState: '', // 单据状态
-            customer: '', // 客户
-            date: '', // 日期
-            remarks: '' // 备注
-          }
-        },
-        row: {}
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'toEdit':
+          this.toEdit()
+          break
+        case 'doSubmit':
+          this.doSubmit()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doImport':
+          this.doImport()
+          break
+        case 'doExport':
+          this.doExport()
+          break
+        default:
+          break
       }
     },
-    created() {
-      this.loadList()
-      //下拉框
-      this.getBillType() // 单据类型
-      this.getManu() // 供应商 可搜索
-      this.getCustomer() //客户 可搜索
-      this.getCargoType() // 货主类型
-      this.getBillState() // 单据状态
+
+    // 获取数据sid
+    handleSelectionChange(row) {
+      console.log('aaa', row)
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+      this.row = row
+      this.sides = this.sids.join() // 将sid数组的元素转化成字符串
+      console.log('获取sids数组', this.sids)
     },
-    methods: {
-      resetState() {
-        this.viewState = 1
-      },
-      btnHandle(btnKey) {
-        console.log('XXXXXXXXXXXXXXX' + btnKey)
-        switch (btnKey) {
-          case 'toAdd':
-            this.toAdd()
-            break
-          case 'toEdit':
-            this.toEdit()
-            break
-          case 'doSubmit':
-            this.doSubmit()
-            break
-          case 'doDel':
-            this.doDel()
-            break
-          case 'doImport':
-            this.doImport()
-            break
-          case 'doExport':
-            this.doExport()
-            break
-          default:
-            break
-        }
-      },
 
-      // 获取数据sid
-      handleSelectionChange(row) {
-        console.log('aaa', row)
-        const aa = []
-        row.forEach(element => {
-          aa.push(element.sid)
-          setuser(this.sids)
+    toAdd(row) {
+      this.viewState = 2
+      this.$refs['divadd'].showAdd()
+    },
+    toEdit() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
+        return
+      }
+      if (this.sids.length > 1) {
+        this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
+        return
+      }
+      this.viewState = 3
+      const sid = this.sids[0]
+      const row = this.row
+      this.$refs['divadd'].showEdit(sid, row)
+    },
+    doSubmit(row) {
+      // 提交的代码
+      this.btndisabled = true
+      req
+        .doSubmit(this.queryParams.params, this.sids)
+        .then(resp => {
+          console.log(resp)
+          this.btndisabled = false
         })
-        this.sids = aa
-        this.row = row
-        this.sides = this.sids.join() //将sid数组的元素转化成字符串
-        console.log('获取sids数组', this.sids)
-      },
-
-      toAdd(row) {
-        this.viewState = 2
-        this.$refs['divadd'].showAdd()
-      },
-      toEdit() {
-        if (this.sids.length === 0) {
-          this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
-          return
-        }
-        if (this.sids.length > 1) {
-          this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
-          return
-        }
-        this.viewState = 3
-        const sid = this.sids[0]
-        const row = this.row
-        this.$refs['divadd'].showEdit(sid, row)
-      },
-      doSubmit(row) {
-        // 提交的代码
-        this.btndisabled = true
-        req
-          .doSubmit(this.queryParams.params, this.sids)
-          .then(resp => {
-            console.log(resp)
-            this.btndisabled = false
+        .catch(() => {
+          this.btndisabled = false
+        })
+    },
+    doDel(row) {
+      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)'
           })
-          .catch(() => {
-            this.btndisabled = false
+          const _this = this
+          req.delBySids(this.sids).then(resp => {
+            loading.close()
+            _this.$message({ type: 'success', message: resp.msg, showClose: true })
+            _this.loadList()
           })
-      },
-      doDel(row) {
-        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)'
-            })
-            const _this = this
-            req.delBySids(this.sids).then(resp => {
+            .catch(e => {
               loading.close()
-              _this.$message({ type: 'success', message: resp.msg, showClose: true })
-              _this.loadList()
             })
-              .catch(e => {
-                loading.close()
-              })
-          })
-          .catch(() => {
-          })
-      },
-      doImport(row) {
-        // 导入的代码
-        req
-          .importExcel(this.queryParams.params, this.sids)
-          .then(resp => {
-            console.log(resp)
-          })
-          .catch(() => {
-          })
-      },
-      doExport(sids) {
-        // 导出的代码
-        req
-          .exportExcel(this.queryParams.params, this.sids)
-          .then(resp => {
-            var map = resp.data
-            const fileName = map.filename // 导出文件名
-            // // 对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
-            // // IE10以上支持blob但是依然不支持download
-            const link = document.createElement('a') // 创建a标签
-            link.download = fileName // a标签添加属性
-            link.style.display = 'none'
-            link.href = map.downurl
-            document.body.appendChild(link)
-            link.click() // 执行下载
-            URL.revokeObjectURL(link.href) // 释放url
-            document.body.removeChild(link) // 释放标签
-          })
-          .catch(() => {
-          })
-      },
-      dosearch() {
-        this.queryParams.current = 1
-        this.loadList()
-      },
-
-      //下拉框-单据类型 changeBillType
-      getBillType() {
-        req.pullDown({
-          type: 'billsType'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.billType_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
         })
-      },
-      // dictKey: "01"; dictType: "invoicingNature"
-      changeBillType(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.billType_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
-          }
+        .catch(() => {
         })
-        this.queryParams.params.billType = bb.name
-        // this.queryParams.params.billType = bb.sid
-        console.log('name', this.queryParams.params.billType)
-      },
-
-      //可模糊检索下拉框-供应商
-      getManu() {
-        req.changShang({}).then((res) => {
-          if (res.code === '200') {
-            this.manu_list = res.data
-            console.log('下拉框请求11122', res.data)
-          }
+    },
+    doImport(row) {
+      // 导入的代码
+      req
+        .importExcel(this.queryParams.params, this.sids)
+        .then(resp => {
+          console.log(resp)
         })
-      },
-      changeManu(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.manu_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.sid == value) {
-            bb = {
-              name: e.manufacturerName,
-              sid: e.sid
-            }
-          }
+        .catch(() => {
         })
-        this.queryParams.params.manufacturerName = bb.name
-        // this.queryParams.params.manufacturerSid = bb.sid
-        console.log('name', this.queryParams.params.manufacturerName, 'sid', this.queryParams.params.manufacturerSid)
-      },
-
-      //可模糊检索下拉框-客户
-      getCustomer() {
-        req.kehu({}).then((res) => {
-          if (res.code === '200') {
-            this.customer_list = res.data
-            console.log('下拉框请求11133', res.data)
-          }
+    },
+    doExport(sids) {
+      // 导出的代码
+      req
+        .exportExcel(this.queryParams.params, this.sids)
+        .then(resp => {
+          var map = resp.data
+          const fileName = map.filename // 导出文件名
+          // // 对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
+          // // IE10以上支持blob但是依然不支持download
+          const link = document.createElement('a') // 创建a标签
+          link.download = fileName // a标签添加属性
+          link.style.display = 'none'
+          link.href = map.downurl
+          document.body.appendChild(link)
+          link.click() // 执行下载
+          URL.revokeObjectURL(link.href) // 释放url
+          document.body.removeChild(link) // 释放标签
         })
-      },
-      changeCustomer(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.customer_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.sid == value) {
-            bb = {
-              // type: e.dictType,
-              name: e.customerName,
-              // key: e.dictKey,
-              sid: e.sid
-            }
-          }
+        .catch(() => {
         })
-        this.queryParams.params.customer = bb.name
-        // this.queryParams.params.customerSid = bb.sid
-        console.log('name', this.queryParams.params.manufacturerName)
-      },
-      //下拉框-货主类型
-      getCargoType() {
-        req.pullDown({
-          type: 'cargoOwnerType'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.cargoType_list = res.data
-            console.log('下拉框请求111', res.data)
+    },
+    dosearch() {
+      this.queryParams.current = 1
+      this.loadList()
+    },
+
+    // 下拉框-单据类型 changeBillType
+    getBillType() {
+      req.pullDown({
+        type: 'billsType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.billType_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
+    changeBillType(value) {
+      console.log('触发下拉框按钮')
+      let bb = null
+      this.billType_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-      },
-      changeCargoType(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.cargoType_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
+        }
+      })
+      this.queryParams.params.billType = bb.name
+      console.log('name', this.queryParams.params.billType)
+    },
+
+    // 可模糊检索下拉框-供应商
+    getManu() {
+      req.changShang({}).then((res) => {
+        if (res.code === '200') {
+          this.manu_list = res.data
+          console.log('下拉框请求11122', res.data)
+        }
+      })
+    },
+    changeManu(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.manu_list.forEach((e) => {
+        if (e.sid === value) {
+          bb = {
+            name: e.manufacturerName,
+            sid: e.sid
           }
-        })
-        this.queryParams.params.cargoOwnerType = bb.name
-        // this.queryParams.params.cargoOwnerType = bb.sid
-        console.log('name', this.queryParams.params.cargoOwnerType)
-      },
+        }
+      })
+      this.queryParams.params.manufacturerName = bb.name
+      // this.queryParams.params.manufacturerSid = bb.sid
+      console.log('name', this.queryParams.params.manufacturerName, 'sid', this.queryParams.params.manufacturerSid)
+    },
 
-      // 下拉框-单据状态
-      getBillState() {
-        req.pullDown({
-          type: 'billState'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.billState_list = res.data
-            console.log('下拉框请求111', res.data)
+    // 可模糊检索下拉框-客户
+    getCustomer() {
+      req.kehu({}).then((res) => {
+        if (res.code === '200') {
+          this.customer_list = res.data
+          console.log('下拉框请求11133', res.data)
+        }
+      })
+    },
+    changeCustomer(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.customer_list.forEach((e) => {
+        if (e.sid === value) {
+          bb = {
+            name: e.name,
+            sid: e.sid
           }
-        })
-      },
-      changeBillState(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.billState_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
+        }
+      })
+      this.queryParams.params.customer = bb.name
+      console.log('name', this.queryParams.params.manufacturerName)
+    },
+    // 下拉框-货主类型
+    getCargoType() {
+      req.pullDown({
+        type: 'cargoOwnerType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.cargoType_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
+    changeCargoType(value) {
+      console.log('触发下拉框按钮')
+      let bb = null
+      this.cargoType_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-        this.queryParams.params.billState = bb.name
-        // this.formobj..scmOtherInboundDto.billState = bb.sid
-        console.log('name', this.queryParams.params.billState)
-      },
+        }
+      })
+      this.queryParams.params.cargoOwnerType = bb.name
+      console.log('name', this.queryParams.params.cargoOwnerType)
+    },
 
-      resetQuery() {
-        this.queryParams.params = {}
-        this.queryParams.params.sid = '' // sid
-        this.queryParams.params.name = '' // 登录名
-        this.dosearch()
-      },
-      // 查询
-      loadList() {
-        const _this = this
-        this.tableLoading = true
-        req
-          .listPage(this.queryParams)
-          .then(resp => {
-            console.log('查询列表', resp)
-            _this.tableLoading = false
-            const data = resp.data
-            _this.queryParams.total = data.total
-            _this.dataList = data.records
-            // for (var i = 0; i < data.records.length; i++) {
-            //   var timeArr = data.records[i].createTime.split(' ');
-            //   this.dataList[i].createTime = timeArr[0];
-            // }
-          })
-          .catch(() => {
-            _this.tableLoading = false
-          })
-      },
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      toInfo(row) {
-        this.viewState = 4
-        const billNo = row.billNo
-        console.log('打开详情', billNo)
-        this.$refs['divinfo'].showInfo(billNo, row)
-      }
+    // 下拉框-单据状态
+    getBillState() {
+      req.pullDown({
+        type: 'billState'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.billState_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
+    changeBillState(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.billState_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
+          }
+        }
+      })
+      this.queryParams.params.billState = bb.name
+      console.log('name', this.queryParams.params.billState)
+    },
+
+    resetQuery() {
+      this.queryParams.params = {}
+      this.queryParams.params.sid = '' // sid
+      this.queryParams.params.name = '' // 登录名
+      this.dosearch()
+    },
+    // 查询
+    loadList() {
+      const _this = this
+      this.tableLoading = true
+      req.listPage(this.queryParams).then(resp => {
+        console.log('查询列表', resp)
+        _this.tableLoading = false
+        const data = resp.data
+        _this.queryParams.total = data.total
+        _this.dataList = data.records
+      })
+        .catch(() => {
+          _this.tableLoading = false
+        })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    toInfo(row) {
+      this.viewState = 4
+      const billNo = row.billNo
+      console.log('打开详情', billNo)
+      this.$refs['divinfo'].showInfo(billNo, row)
     }
   }
+}
 </script>
 <style scoped>
-  /deep/ .el-collapse {
-    border-top: 0px solid #e6ebf5;
-    border-bottom: 0px solid #e6ebf5;
-  }
+/deep/ .el-collapse {
+  border-top: 0px solid #e6ebf5;
+  border-bottom: 0px solid #e6ebf5;
+}
 
-  /deep/ .el-collapse-item__content {
-    margin: 0;
-    padding: 0;
-  }
+/deep/ .el-collapse-item__content {
+  margin: 0;
+  padding: 0;
+}
 
-  /deep/ .el-collapse-item__wrap {
-    border-bottom: 0px solid #ebeef5;
-  }
+/deep/ .el-collapse-item__wrap {
+  border-bottom: 0px solid #ebeef5;
+}
 
-  /deep/ .el-collapse-item__header {
-    border-bottom: 0px solid #e6ebf5;
-  }
+/deep/ .el-collapse-item__header {
+  border-bottom: 0px solid #e6ebf5;
+}
 
-  .searchbtn {
-    border: #2cab69 1px solid;
-    color: #2cab69;
-  }
+.searchbtn {
+  border: #2cab69 1px solid;
+  color: #2cab69;
+}
 
-  .search_label /deep/ .el-form-item__label {
-    width: 68px;
-  }
+.search_label /deep/ .el-form-item__label {
+  width: 68px;
+}
 
-  /deep/ .el-form-item {
-    margin-bottom: 5px;
-  }
+/deep/ .el-form-item {
+  margin-bottom: 5px;
+}
 
-  /*/deep/ .el-form-item:nth-of-type(4) {*/
-  /*  margin-right: 260px;*/
-  /*}*/
+/*/deep/ .el-form-item:nth-of-type(4) {*/
+/*  margin-right: 260px;*/
+/*}*/
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotherinbound/scmotherinboundAdd.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotherinbound/scmotherinboundAdd.vue
index 6cbd34655f..5e6181f0d5 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotherinbound/scmotherinboundAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotherinbound/scmotherinboundAdd.vue
@@ -6,13 +6,7 @@
       <div>{{ viewTitle }}</div>
       <!--start 添加修改按钮-->
       <div>
-        <el-button
-          type="primary"
-          size="small"
-          :disabled="submitdisabled"
-          @click="dialogStatus === 'add' ? saveAdd() : saveEdit()"
-        >保存
-        </el-button>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="dialogStatus === 'add' ? saveAdd() : saveEdit()">保存</el-button>
         <el-button type="primary" size="small" @click="dialogStatus === 'create' ? saveAdd() : saveEdit()">提交
         </el-button>
         <el-button type="primary" size="small">打印</el-button>
@@ -44,18 +38,8 @@
           <el-row>
             <el-col :span="8">
               <el-form-item prop="billType" label="单据类型">
-                <el-select
-                  v-model="formobj.scmOtherInboundDto.billType"
-                  placeholder="请选择"
-                  @change="changeBillType"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in billType_list"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey"
-                  />
+                <el-select v-model="formobj.scmOtherInboundDto.billType" placeholder="请选择" @change="changeBillType" clearable>
+                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
                 <!--<el-input v-model="formobj.billType" placeholder="入库人姓名" class="addinputw" clearable/>-->
               </el-form-item>
@@ -63,36 +47,15 @@
 
             <el-col :span="8">
               <el-form-item prop="manufacturerName" label="供应商">
-                <el-select
-                  v-model="formobj.scmOtherInboundDto.manufacturerName"
-                  filterable
-                  placeholder="请选择"
-                  @change="changeManu"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in manu_list"
-                    :key="item.sid"
-                    :label="item.manufacturerName"
-                    :value="item.sid"
-                  />
+                <el-select v-model="formobj.scmOtherInboundDto.manufacturerName" filterable placeholder="请选择" @change="changeManu" clearable>
+                  <el-option v-for="item in manu_list" :key="item.sid" :label="item.manufacturerName" :value="item.sid"/>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="cargoOwnerType" label="货主类型">
-                <el-select
-                  v-model="formobj.scmOtherInboundDto.cargoOwnerType"
-                  placeholder="请选择"
-                  @change="changeCargoType"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in cargoType_list"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey"
-                  />
+                <el-select v-model="formobj.scmOtherInboundDto.cargoOwnerType" placeholder="请选择" @change="changeCargoType" clearable>
+                  <el-option v-for="item in cargoType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -101,257 +64,145 @@
           <el-row>
             <el-col :span="8">
               <el-form-item prop="cargoOwner" label="货主">
-                <el-input
-                  v-model="formobj.scmOtherInboundDto.cargoOwner"
-                  placeholder="请输入货主"
-                  class="addinputw"
-                  clearable
-                />
+                <el-input v-model="formobj.scmOtherInboundDto.cargoOwner" placeholder="请输入货主" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="stockOrgName" label="库存组织"> <!---->
-                <el-select v-model="formobj.scmOtherInboundDto.stockOrgName" @change="stockOrgNameChange"
-                           placeholder="请选择" class="addinputw" clearable>
-                  <el-option v-for="item in stockOrgName_list" :key="item.sid" :label="item.name"
-                             :value="item.name" clearable></el-option>
+              <el-form-item prop="stockOrgName" label="库存组织">
+                <el-select v-model="formobj.scmOtherInboundDto.stockOrgName" @change="stockOrgNameChange" placeholder="请选择" class="addinputw" clearable>
+                  <el-option v-for="item in stockOrgName_list" :key="item.sid" :label="item.name" :value="item.name" clearable></el-option>
                 </el-select>
-<!--                <el-cascader-->
-<!--                  :key="refreshItem"-->
-<!--                  v-model="stockOrgName_list"-->
-<!--                  :options="orgOptions"-->
-<!--                  :props="orgProps"-->
-<!--                  @change="stockOrgNameChange"-->
-<!--                  clearable-->
-<!--                />-->
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="inspectorName" label="验收员">
-                <el-input
-                  v-model="formobj.scmOtherInboundDto.inspectorName"
-                  placeholder="请输入验收员"
-                  class="addinputw"
-                  clearable
-                />
+                <el-input v-model="formobj.scmOtherInboundDto.inspectorName" placeholder="请输入验收员" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <el-form-item prop="billState" label="单据状态">
-                <el-select
-                  v-model="formobj.scmOtherInboundDto.billState"
-                  placeholder="请选择"
-                  @change="changeBillState"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in billState_list"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey"
-                  />
+                <el-select v-model="formobj.scmOtherInboundDto.billState" placeholder="请选择" @change="changeBillState" clearable>
+                  <el-option v-for="item in billState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="inventoryDirection" label="库存方向">
-                <el-select
-                  v-model="formobj.scmOtherInboundDto.inventoryDirection"
-                  placeholder="请选择"
-                  @change="changeInventory"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in inventory_list"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey"
-                  />
+                <el-select v-model="formobj.scmOtherInboundDto.inventoryDirection" placeholder="请选择" @change="changeInventory" clearable>
+                  <el-option v-for="item in inventory_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="warehouseKeeperName" label="仓管员">
-                <el-input
-                  v-model="formobj.scmOtherInboundDto.warehouseKeeperName"
-                  placeholder="请输入仓管员"
-                  class="addinputw"
-                  clearable
-                />
+                <el-input v-model="formobj.scmOtherInboundDto.warehouseKeeperName" placeholder="请输入仓管员" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <el-form-item prop="date" label="日期">
-                <el-date-picker
-                  v-model="formobj.scmOtherInboundDto.date"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="选择日期"
-                />
+                <el-date-picker v-model="formobj.scmOtherInboundDto.date" type="date" value-format="yyyy-MM-dd"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="invenGroupName" label="库存组"> <!--v-model="invenGroupName"-->
-                <el-cascader
-                  :key="refreshItem"
-                  v-model="invenGroupName_list"
-                  :options="options"
-                  :props="props"
-                  @change="salesDepNameChange"
-                  clearable
-                />
+                <el-cascader :key="refreshItem" v-model="invenGroupName_list" :options="options" :props="props" @change="salesDepNameChange" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="customer" label="客户">
-                <el-select
-                  v-model="formobj.scmOtherInboundDto.customer"
-                  filterable
-                  placeholder="请选择"
-                  @change="changeCustomer"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in customer_list"
-                    :key="item.sid"
-                    :label="item.customerName"
-                    :value="item.sid"
-                  />
+                <el-select v-model="formobj.scmOtherInboundDto.customer" filterable placeholder="请选择" @change="changeCustomer" clearable>
+                  <el-option v-for="item in customer_list" :key="item.sid" :label="item.name" :value="item.sid"/>
                 </el-select>
-                <!--                <el-input v-model="formobj.scmOtherInboundDto.customer" placeholder="请输入客户" class="addinputw"-->
-                <!--                          clearable/>-->
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <el-form-item prop="remarks" label="备注">
-                <el-input v-model="formobj.scmOtherInboundDto.remarks" placeholder="请输入备注" class="addinputw"
-                          clearable/>
+                <el-input v-model="formobj.scmOtherInboundDto.remarks" placeholder="请输入备注" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
         </div>
         <div class="addtable">
           <div class="tabletitle">
-            <div class="titlename">
-              货物明细
-            </div>
+            <div class="titlename">货物明细</div>
             <el-button size="small" type="primary" @click="addtableData">添加</el-button>
           </div>
           <template class="tablelist">
-            <!--          :rules="rules"  <el-table :data="tableData" :index="index" border tyle="width: 100%">-->
-            <el-table
-              :data="formobj.scmOtherInboundDetailDto"
-              :index="index"
-              border
-              style="width: 100%"
-              show-summary
-              :summary-method="getSummaries"
-            >
-              <el-table-column
-                align="center"
-                label="序号"
-                type="index"
-                width="50"
-              />
+            <el-table :data="formobj.scmOtherInboundDetailDto" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column align="center" label="序号" type="index" width="50"/>
               <el-table-column label="操作" width="80" align="center">
                 <template slot-scope="scope">
-                  <el-button
-                    type="danger"
-                    size="mini"
-                    @click="dataDelete(scope.$index,formobj.scmOtherInboundDetailDto[scope.$index])"
-                  >删除
-                  </el-button>
+                  <el-button type="danger" size="mini" @click="dataDelete(scope.$index,formobj.scmOtherInboundDetailDto[scope.$index])">删除</el-button>
                 </template>
               </el-table-column>
               <el-table-column prop="mNum" width="150" label="物料编码" align="center">
                 <template slot-scope="props">
-                  <el-select v-model="props.row.mNum" placeholder="请选择" style="width: 120px;"
-                             @change="changeMnum(props.row,this)" clearable>
-                    <el-option v-for="item in mnum_list" :key="item.sid" :label="item.mNum"
-                               :value="item.mNum"></el-option>
+                  <el-select v-model="props.row.mNum" placeholder="请选择" style="width: 120px;" @change="changeMnum(props.row,this)" clearable>
+                    <el-option v-for="item in mnum_list" :key="item.sid" :label="item.mNum" :value="item.mNum"></el-option>
                   </el-select>
-                  <!--                  <el-input v-model="props.row.mNum" style="width:120px;" class="tableinput"/>-->
                 </template>
               </el-table-column>
               <el-table-column prop="mName" width="150" label="物料名称" align="center">
                 <template slot-scope="props">
-                  <!--                  <el-input v-model="props.row.mName" style="width:120px;" class="tableinput"/>-->
-                  <span>{{props.row.mName}}</span>
+                  <span>{{ props.row.mName }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="model" width="150" label="规格型号" align="center">
                 <template slot-scope="props">
-                  <!--                  <el-input v-model="props.row.model" style="width:120px;" class="tableinput"/>-->
-                  <span>{{props.row.model}}</span>
+                  <span>{{ props.row.model }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="year" width="95" label="年度" align="center">
                 <template slot-scope="props">
                   <el-input v-model="props.row.year" style="width:70px;" class="tableinput"/>
-                  <!--<span>{{props.row.count}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column prop="logisticsCustomer" width="95" label="物流客户" align="center">
                 <template slot-scope="props">
                   <el-input v-model="props.row.logisticsCustomer" style="width:70px;" class="tableinput"/>
-                  <!-- <span>{{props.row.leviedSubtotal}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column prop="company" width="150" label="单位" align="center">
                 <template slot-scope="props">
-                  <!--                  <el-select v-model="props.row.company" @change="changeCompany"-->
-                  <!--                             placeholder="请选择" class="addinputw" clearable>-->
-                  <!--                    <el-option v-for="item in company_list" :key="item.dictKey" :label="item.dictValue"-->
-                  <!--                               :value="item.dictKey" clearable></el-option>-->
-                  <!--                  </el-select>-->
-                  <span>{{props.row.company}}</span>
+                  <span>{{ props.row.company }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="netReceiptsNum" width="150" label="实收数量" align="center">
                 <template slot-scope="props">
                   <el-input v-model="props.row.netReceiptsNum" style="width:120px;" class="tableinput"/>
-                  <!-- <span>{{props.row.productLine}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column prop="receivingWarehouse" width="150" label="收货仓库" align="center">
                 <template slot-scope="props">
-                  <el-select v-model="props.row.receivingWarehouse" @change="changeWarehouse(props.row,this)"
-                             placeholder="请选择" class="addinputw" clearable>
-                    <el-option v-for="item in warehouse_list" :key="item.sid" :label="item.warehouseName"
-                               :value="item.warehouseName" clearable></el-option>
+                  <el-select v-model="props.row.receivingWarehouse" @change="changeWarehouse(props.row,this)" placeholder="请选择" class="addinputw" clearable>
+                    <el-option v-for="item in warehouse_list" :key="item.sid" :label="item.warehouseName" :value="item.warehouseName" clearable></el-option>
                   </el-select>
-                  <!--                  <el-input v-model="props.row.receivingWarehouse" style="width:120px;" class="tableinput"/>-->
-                  <!--<span>{{props.row.mName}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column prop="position" width="150" label="仓位" align="center">
                 <template slot-scope="props">
                   <el-input v-model="props.row.position" style="width:120px;" class="tableinput"/>
-                  <!--<span>{{props.row.remarks}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column prop="batchNum" width="150" label="批号" align="center">
                 <template slot-scope="props">
                   <el-input v-model="props.row.batchNum" style="width:120px;" class="tableinput"/>
-                  <!--<span>{{props.row.remarks}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column prop="cargoOwner" width="120" label="货主" align="center">
                 <template slot-scope="props">
                   <el-input v-model="props.row.cargoOwner" style="width:90px;" class="tableinput"/>
-                  <!--<span>{{props.row.remarks}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column prop="remarks" width="150" label="备注" align="center">
                 <template slot-scope="props">
-                  <!--                  <el-input v-model="props.row.remarks" style="width:120px;" class="tableinput"/>-->
-                  <span>{{props.row.remarks}}</span>
+                  <span>{{ props.row.remarks }}</span>
                 </template>
               </el-table-column>
             </el-table>
@@ -364,171 +215,166 @@
 </template>
 
 <script>
-  import req from '@/api/anruiscm/scmotherinbound'
+import req from '@/api/anruiscm/scmotherinbound'
 
-  export default {
-    name: 'ScmOtherInboundAdd',
-    data() {
-      return {
-        viewTitle: '',
-        dialogStatus: '',
-        index: 0,
-        scmOtherInboundDetailDto: [],
-        // 级联列表
-        orgSid:'',
-        orgName_list: [], // 部门
-        stockOrgName_list: [], // 库存组织
-        invenGroupName_list: [], // 库存组
-        dataArr: [],
-        refreshItem: 0, // 级联列表key值
-        options: [], // 级联列表选项
-        props: { // props传值
-          value: 'sid',
-          label: 'name',
-          children: 'children',
-          multiple: true
-        },
-        // 组织单选
-        orgProps: {
-          value: 'sid',
-          label: 'name',
-          children: 'children',
-          checkStrictly: true
-        },
-        orgOptions: [],
-        orgArr: [],
-        // 下拉框
-        billType_list: [], // 单据类型
-        manu_list: [], // 供应商(可搜索)
-        customer_list: [], // 客户(可搜索)
-        cargoType_list: [], // 货主类型
-        billState_list: [], // 单据状态
-        mnum_list: [],//物料编码
-        inventory_list: [], // 库存方向
-        company_list: [],//单位
-        warehouse_list: [], // 仓库
-        // 表单数据
-        formobj: {
-          sid: '', // 一条数据的sid
-          userSid: window.sessionStorage.getItem('userSid'), // 用户人sid
-          // creatorName: window.sessionStorage.getItem('name'), // 用户人姓名
-          scmOtherInboundDto: {
-            orgSid: window.sessionStorage.getItem('orgSid'), // 部门sid
-            orgName: window.sessionStorage.getItem('departmentName'), // 部门名称
-            makeListName: window.sessionStorage.getItem('name'),//制单人
-            id: '',
-            billNo: '', // 单据编号
-            billType: '', // 单据类型
-            manufacturerName: '', // 供应商
-            manufacturerSid: '', // 供应商sid
-            cargoOwnerType: '', // 货主类型
-            // orgName: '', // 部门
-            // orgSid: '', // 部门sid
-            cargoOwner: '', // 货主
-            stockOrgName: '', // 库存组织
-            stockOrgSid: '', // 库存组织sid  ！！！报错异常
-            inspectorName: '', // 验收员
-            billState: '', // 单据状态
-            warehouseKeeperName: '', // 仓管员
-            date: '', // 日期
-            invenGroupName: '', // 库存组
-            invenGroupSid: '', // 库存组sid   ！！！报错异常
-            customer: '', // 客户
-            customerSid: '', // 客户sid
-            remarks: '' // 备注
-          },
-          scmOtherInboundDetailDto: [{
-            sid: '',
-            mNum: '', // 物料编码
-            mName: '', // 物料名称
-            model: '', // 规格型号
-            year: '', // 年度
-            logisticsCustomer: '', // 物流客户
-            company: '', // 单位
-            netReceiptsNum: '', // 实收数量
-            receivingWarehouse: '', // 收货仓库
-            position: '', // 仓位
-            batchNum: '', // 批号
-            cargoOwner: '', // 货主
-            remarks: '' // 备注
-          }]
-        },
-        rules: {
-          billType: [{ required: true, message: '单据类型不能为空', trigger: 'change' }], // 单据类型
-          cargoOwnerType: [{ required: true, message: '货主类型不能为空', trigger: 'change' }], // 货主类型
-          orgName: [{ required: true, message: '部门不能为空', trigger: 'change' }], // 部门
-          cargoOwner: [{ required: true, message: '货主不能为空', trigger: 'blur' }], // 货主
-          stockOrgName: [{ required: true, message: '库存组织不能为空', trigger: 'change' }], // 库存组织
-          inventoryDirection: [{ required: true, message: '库存方向不能为空', trigger: 'change' }], // 库存方向
-          date: [{ required: true, message: '日期不能为空', trigger: 'blur' }] // 日期
+export default {
+  name: 'ScmOtherInboundAdd',
+  data() {
+    return {
+      viewTitle: '',
+      dialogStatus: '',
+      index: 0,
+      scmOtherInboundDetailDto: [],
+      // 级联列表
+      orgSid: '',
+      orgName_list: [], // 部门
+      stockOrgName_list: [], // 库存组织
+      invenGroupName_list: [], // 库存组
+      dataArr: [],
+      refreshItem: 0, // 级联列表key值
+      options: [], // 级联列表选项
+      props: { // props传值
+        value: 'sid',
+        label: 'name',
+        children: 'children',
+        multiple: true
+      },
+      // 组织单选
+      orgProps: {
+        value: 'sid',
+        label: 'name',
+        children: 'children',
+        checkStrictly: true
+      },
+      orgOptions: [],
+      orgArr: [],
+      // 下拉框
+      billType_list: [], // 单据类型
+      manu_list: [], // 供应商(可搜索)
+      customer_list: [], // 客户(可搜索)
+      cargoType_list: [], // 货主类型
+      billState_list: [], // 单据状态
+      mnum_list: [], // 物料编码
+      inventory_list: [], // 库存方向
+      company_list: [], // 单位
+      warehouse_list: [], // 仓库
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        userSid: window.sessionStorage.getItem('userSid'), // 用户人sid
+        // creatorName: window.sessionStorage.getItem('name'), // 用户人姓名
+        scmOtherInboundDto: {
+          orgSid: window.sessionStorage.getItem('orgSid'), // 部门sid
+          orgName: window.sessionStorage.getItem('departmentName'), // 部门名称
+          makeListName: window.sessionStorage.getItem('name'), // 制单人
+          id: '',
+          billNo: '', // 单据编号
+          billType: '', // 单据类型
+          manufacturerName: '', // 供应商
+          manufacturerSid: '', // 供应商sid
+          cargoOwnerType: '', // 货主类型
+          // orgName: '', // 部门
+          // orgSid: '', // 部门sid
+          cargoOwner: '', // 货主
+          stockOrgName: '', // 库存组织
+          stockOrgSid: '', // 库存组织sid  ！！！报错异常
+          inspectorName: '', // 验收员
+          billState: '', // 单据状态
+          warehouseKeeperName: '', // 仓管员
+          date: '', // 日期
+          invenGroupName: '', // 库存组
+          invenGroupSid: '', // 库存组sid   ！！！报错异常
+          customer: '', // 客户
+          customerSid: '', // 客户sid
+          remarks: '' // 备注
         },
-        submitdisabled: false
-      }
+        scmOtherInboundDetailDto: [{
+          sid: '',
+          mNum: '', // 物料编码
+          mName: '', // 物料名称
+          model: '', // 规格型号
+          year: '', // 年度
+          logisticsCustomer: '', // 物流客户
+          company: '', // 单位
+          netReceiptsNum: '', // 实收数量
+          receivingWarehouse: '', // 收货仓库
+          position: '', // 仓位
+          batchNum: '', // 批号
+          cargoOwner: '', // 货主
+          remarks: '' // 备注
+        }]
+      },
+      rules: {
+        billType: [{ required: true, message: '单据类型不能为空', trigger: 'change' }], // 单据类型
+        cargoOwnerType: [{ required: true, message: '货主类型不能为空', trigger: 'change' }], // 货主类型
+        orgName: [{ required: true, message: '部门不能为空', trigger: 'change' }], // 部门
+        cargoOwner: [{ required: true, message: '货主不能为空', trigger: 'blur' }], // 货主
+        stockOrgName: [{ required: true, message: '库存组织不能为空', trigger: 'change' }], // 库存组织
+        inventoryDirection: [{ required: true, message: '库存方向不能为空', trigger: 'change' }], // 库存方向
+        date: [{ required: true, message: '日期不能为空', trigger: 'blur' }] // 日期
+      },
+      submitdisabled: false
+    }
+  },
+  created() {
+    // this.addDate()
+    // 下拉框
+    this.getBillType() // 单据类型
+    this.getManu() // 供应商 可搜索
+    this.getCustomer() // 客户 可搜索
+    this.getCargoType() // 货主类型
+    this.getBillState() // 单据状态
+    this.getInventory() // 库存方向
+    this.getCompany() // 单位
+    this.getWlxx() // 物料编码
+    this.getWarehouse() // 仓库
+    // 部门级联列表
+    this.getBuMen()
+    // 组织级联列表
+    this.getOrg()
+  },
+  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 (column.property === 'netReceiptsNum') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+          this.totalMoney = sums[index] += ''
+        } else {
+          sums[index] = ''
+        }
+      })
+      return sums
     },
-    created() {
-      // this.addDate()
-      // 下拉框
-      this.getBillType() // 单据类型
-      this.getManu() // 供应商 可搜索
-      this.getCustomer() // 客户 可搜索
-      this.getCargoType() // 货主类型
-      this.getBillState() // 单据状态
-      this.getInventory() // 库存方向
-      this.getCompany() //单位
-      this.getWlxx() //物料编码
-      this.getWarehouse() // 仓库
-      // 部门级联列表
-      this.getBuMen()
-      // 组织级联列表
-      this.getOrg()
+    // 级联列表 部门
+    getBuMen() {
+      req.salesDepName().then((res) => {
+        if (res.code === '200') {
+          this.options = res.data
+          console.log('请求到的级联列表', this.options)
+          this.BuMen0(this.options)
+        }
+      })
     },
-    methods: {
-      // @keydown.native="keydown($event)"
-      // keydown(e){
-      //   if(e.keyCode == 32){
-      //     e.returnValue = false
-      //   }
-      // },
-      // 合计
-      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 === 'netReceiptsNum') {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-            this.totalMoney = sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
-        })
-        return sums
-      },
-      // 级联列表 部门
-      getBuMen() {
-        req.salesDepName().then((res) => {
-          if (res.code === '200') {
-            this.options = res.data
-            console.log('请求到的级联列表', this.options)
-            this.BuMen0(this.options)
-          }
-        })
-      },
-      BuMen0(data) {
-        data.forEach((e) => {
+    BuMen0(data) {
+      data.forEach((e) => {
+        if(e.children) {
           if (e.children.length != 0) {
             this.BuMen0(e.children)
           } else {
@@ -536,568 +382,553 @@
             this.dataArr.push(e)
             return
           }
-        })
-      },
-      // 部门
-      orgNameChange(e) {
-        console.log('选中结果：' + JSON.stringify(e))
-        var result = ''
-        var result_Sid = ''
-        if (e.length > 0) {
-          // 循环多选项
-          e.forEach((item) => {
-            var last_id = item[item.length - 1]
-            // 循环查找名字
-            this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
-            this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            result = result + this.select_temp_Name + ','
-            result_Sid = result_Sid + this.select_temp_Sid + ','
-          })
-        }
-        if (result !== '') {
-          result = result.substring(0, result.length - 1)
-        }
-        if (result_Sid !== '') {
-          result_Sid = result_Sid.substring(0, result_Sid.length - 1)
-        }
-        this.formobj.scmOtherInboundDto.orgName = result
-        this.formobj.scmOtherInboundDto.orgSid = result_Sid
-        console.log('选中名称：' + this.formobj.scmOtherInboundDto.orgName, this.formobj.scmOtherInboundDto.orgSid)
-      },
-      // 库存组
-      salesDepNameChange(e) {
-        console.log('选中结果：' + JSON.stringify(e))
-        var result = ''
-        var result_Sid = ''
-        if (e.length > 0) {
-          // 循环多选项
-          e.forEach((item) => {
-            var last_id = item[item.length - 1]
-            // 循环查找名字
-            this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
-            this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            result = result + this.select_temp_Name + ','
-            result_Sid = result_Sid + this.select_temp_Sid + ','
-          })
-        }
-        if (result !== '') {
-          result = result.substring(0, result.length - 1)
-        }
-        if (result_Sid !== '') {
-          result_Sid = result_Sid.substring(0, result_Sid.length - 1)
         }
-        this.formobj.scmOtherInboundDto.invenGroupName = result
-        this.formobj.scmOtherInboundDto.invenGroupSid = result_Sid
-        console.log('选中名称：' + this.formobj.scmOtherInboundDto.invenGroupName, this.formobj.scmOtherInboundDto.invenGroupSid)
-      },
+      })
+    },
+    // 部门
+    orgNameChange(e) {
+      console.log('选中结果：' + JSON.stringify(e))
+      var result = ''
+      var result_Sid = ''
+      if (e.length > 0) {
+        // 循环多选项
+        e.forEach((item) => {
+          var last_id = item[item.length - 1]
+          // 循环查找名字
+          this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
+          this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          result = result + this.select_temp_Name + ','
+          result_Sid = result_Sid + this.select_temp_Sid + ','
+        })
+      }
+      if (result !== '') {
+        result = result.substring(0, result.length - 1)
+      }
+      if (result_Sid !== '') {
+        result_Sid = result_Sid.substring(0, result_Sid.length - 1)
+      }
+      this.formobj.scmOtherInboundDto.orgName = result
+      this.formobj.scmOtherInboundDto.orgSid = result_Sid
+      console.log('选中名称：' + this.formobj.scmOtherInboundDto.orgName, this.formobj.scmOtherInboundDto.orgSid)
+    },
+    // 库存组
+    salesDepNameChange(e) {
+      console.log('选中结果：' + JSON.stringify(e))
+      var result = ''
+      var result_Sid = ''
+      if (e.length > 0) {
+        // 循环多选项
+        e.forEach((item) => {
+          var last_id = item[item.length - 1]
+          // 循环查找名字
+          this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
+          this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          result = result + this.select_temp_Name + ','
+          result_Sid = result_Sid + this.select_temp_Sid + ','
+        })
+      }
+      if (result !== '') {
+        result = result.substring(0, result.length - 1)
+      }
+      if (result_Sid !== '') {
+        result_Sid = result_Sid.substring(0, result_Sid.length - 1)
+      }
+      this.formobj.scmOtherInboundDto.invenGroupName = result
+      this.formobj.scmOtherInboundDto.invenGroupSid = result_Sid
+      console.log('选中名称：' + this.formobj.scmOtherInboundDto.invenGroupName, this.formobj.scmOtherInboundDto.invenGroupSid)
+    },
 
-      // --- 循环查询
-      findOrgId(id, options) {
-        console.log('这是部门id',id)
-        for (var i = 0; i < options.length; i++) {
-          if (id == options[i].sid) {
-            this.select_temp_Name = options[i].name // 保存找到的内容
-            this.select_temp_Sid = options[i].sid
-            return true
-          } else {
-            // 判断是否最后一级
-            if (options[i].children !== undefined) {
-              // 不是的话查询下一级
-              if (this.findOrgId(id, options[i].children)) {
-                return true
-              }
+    // --- 循环查询
+    findOrgId(id, options) {
+      console.log('这是部门id', id)
+      for (var i = 0; i < options.length; i++) {
+        if (id === options[i].sid) {
+          this.select_temp_Name = options[i].name // 保存找到的内容
+          this.select_temp_Sid = options[i].sid
+          return true
+        } else {
+          // 判断是否最后一级
+          if (options[i].children !== undefined && options[i].children !== null) {
+            // 不是的话查询下一级
+            if (this.findOrgId(id, options[i].children)) {
+              return true
             }
           }
         }
-      },
-      // 级联列表 组织（单选）
-      getOrg() {
-        req.getOrg().then((res) => {
-          if (res.code === '200') {
-            this.stockOrgName_list = res.data
+      }
+    },
+    // 级联列表 组织（单选）
+    getOrg() {
+      req.getOrg().then((res) => {
+        if (res.code === '200') {
+          this.stockOrgName_list = res.data
 
+        }
+      })
+    },
+    stockOrgNameChange(value) {
+      console.log('触发下拉框按钮', value)
+      let bb = {}
+      this.stockOrgName_list.forEach((e) => {
+        if (e.name == value) {
+          bb = {
+            name: e.name,
+            key: e.id,
+            sid: e.sid
           }
-        })
-      },
-      stockOrgNameChange(value) {
-        console.log('触发下拉框按钮',value)
-        let bb = {}
-        this.stockOrgName_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.name == value) {
-            bb = {
-              name: e.name,
-              key: e.id,
-              sid: e.sid
-            }
-          }
-        })
-        this.formobj.scmOtherInboundDto.stockOrgName = bb.name
-        this.formobj.scmOtherInboundDto.stockOrgSid = bb.sid
-        console.log('name', this.formobj.scmOtherInboundDto.stockOrgName, this.formobj.scmOtherInboundDto.stockOrgSid)
-      },
+        }
+      })
+      this.formobj.scmOtherInboundDto.stockOrgName = bb.name
+      this.formobj.scmOtherInboundDto.stockOrgSid = bb.sid
+      console.log('name', this.formobj.scmOtherInboundDto.stockOrgName, this.formobj.scmOtherInboundDto.stockOrgSid)
+    },
 
-      // 下拉框-单据类型 changeBillType
-      getBillType() {
-        req.pullDown({
-          type: 'billsType'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.billType_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
-        })
-      },
-      // dictKey: "01"; dictType: "invoicingNature"
-      changeBillType(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.billType_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
+    // 下拉框-单据类型 changeBillType
+    getBillType() {
+      req.pullDown({
+        type: 'billsType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.billType_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
+    changeBillType(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.billType_list.forEach((e) => {
+        // eslint-disable-next-line eqeqeq
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-        this.formobj.scmOtherInboundDto.billType = bb.name
-        // this.formobj.scmOtherInboundDto.billType = bb.sid
-        console.log('name', this.formobj.scmOtherInboundDto.billType)
-      },
+        }
+      })
+      this.formobj.scmOtherInboundDto.billType = bb.name
+      console.log('name', this.formobj.scmOtherInboundDto.billType)
+    },
 
-      // 可模糊检索下拉框-供应商
-      getManu() {
-        req.changShang({}).then((res) => {
-          if (res.code === '200') {
-            this.manu_list = res.data
-            console.log('下拉框请求11122', res.data)
-          }
-        })
-      },
-      changeManu(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.manu_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.sid == value) {
-            bb = {
-              // type: e.dictType,
-              name: e.manufacturerName,
-              // key: e.dictKey,
-              sid: e.sid
-            }
+    // 可模糊检索下拉框-供应商
+    getManu() {
+      req.changShang({}).then((res) => {
+        if (res.code === '200') {
+          this.manu_list = res.data
+          console.log('下拉框请求11122', res.data)
+        }
+      })
+    },
+    changeManu(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.manu_list.forEach((e) => {
+        if (e.sid == value) {
+          bb = {
+            name: e.manufacturerName,
+            sid: e.sid
           }
-        })
-        this.formobj.scmOtherInboundDto.manufacturerName = bb.name
-        this.formobj.scmOtherInboundDto.manufacturerSid = bb.sid
-        console.log('name', this.formobj.scmOtherInboundDto.manufacturerName, 'sid', this.formobj.scmOtherInboundDto.manufacturerSid)
-      },
+        }
+      })
+      this.formobj.scmOtherInboundDto.manufacturerName = bb.name
+      this.formobj.scmOtherInboundDto.manufacturerSid = bb.sid
+      console.log('name', this.formobj.scmOtherInboundDto.manufacturerName, 'sid', this.formobj.scmOtherInboundDto.manufacturerSid)
+    },
 
-      // 可模糊检索下拉框-客户
-      getCustomer() {
-        req.kehu({}).then((res) => {
-          if (res.code === '200') {
-            this.customer_list = res.data
-            console.log('下拉框请求11133', res.data)
-          }
-        })
-      },
-      changeCustomer(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.customer_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.sid == value) {
-            bb = {
-              // type: e.dictType,
-              name: e.customerName,
-              // key: e.dictKey,
-              sid: e.sid
-            }
+    // 可模糊检索下拉框-客户
+    getCustomer() {
+      req.kehu({}).then((res) => {
+        if (res.code === '200') {
+          this.customer_list = res.data
+          console.log('下拉框请求11133', res.data)
+        }
+      })
+    },
+    changeCustomer(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.customer_list.forEach((e) => {
+        if (e.sid === value) {
+          bb = {
+            name: e.name,
+            sid: e.sid
           }
-        })
-        this.formobj.scmOtherInboundDto.customer = bb.name
-        this.formobj.scmOtherInboundDto.customerSid = bb.sid
-        console.log('name', this.formobj.scmOtherInboundDto.manufacturerName)
-      },
+        }
+      })
+      this.formobj.scmOtherInboundDto.customer = bb.name
+      this.formobj.scmOtherInboundDto.customerSid = bb.sid
+      console.log('name', this.formobj.scmOtherInboundDto.manufacturerName)
+    },
 
-      // 下拉框-货主类型
-      getCargoType() {
-        req.pullDown({
-          type: 'cargoOwnerType'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.cargoType_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
-        })
-      },
-      changeCargoType(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.cargoType_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
+    // 下拉框-货主类型
+    getCargoType() {
+      req.pullDown({
+        type: 'cargoOwnerType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.cargoType_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
+    changeCargoType(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.cargoType_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-        this.formobj.scmOtherInboundDto.cargoOwnerType = bb.name
-        // this.formobj.scmOtherInboundDto.cargoOwnerType = bb.sid
-        console.log('name', this.formobj.scmOtherInboundDto.cargoOwnerType)
-      },
+        }
+      })
+      this.formobj.scmOtherInboundDto.cargoOwnerType = bb.name
+      console.log('name', this.formobj.scmOtherInboundDto.cargoOwnerType)
+    },
 
-      // 下拉框-单据状态
-      getBillState() {
-        req.pullDown({
-          type: 'billState'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.billState_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
-        })
-      },
-      changeBillState(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.billState_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
+    // 下拉框-单据状态
+    getBillState() {
+      req.pullDown({
+        type: 'billState'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.billState_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
+    changeBillState(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.billState_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-        this.formobj.scmOtherInboundDto.billState = bb.name
-        // this.formobj..scmOtherInboundDto.billState = bb.sid
-        console.log('name', this.formobj.scmOtherInboundDto.billState)
-      },
+        }
+      })
+      this.formobj.scmOtherInboundDto.billState = bb.name
+      console.log('name', this.formobj.scmOtherInboundDto.billState)
+    },
 
-      // 下拉框-库存方向
-      getInventory() {
-        req.pullDown({
-          type: 'inventoryDirection'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.inventory_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
-        })
-      },
-      changeInventory(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.inventory_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
-          }
-        })
-        this.formobj.scmOtherInboundDto.inventoryDirection = bb.name
-        // this.formobj.scmOtherInboundDto.inventoryDirection = bb.sid
-        console.log('name', this.formobj.scmOtherInboundDto.inventoryDirection)
-      },
-      //下拉框-单位 getCompany
-      getCompany() {
-        req.pullDown({
-          type: 'basicUnit'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.company_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
-        })
-      },
-      changeCompany(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.company_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
-          }
-        })
-        this.formobj.scmOtherInboundDetailDto.company = bb.name
-        console.log('name', this.formobj.scmOtherInboundDetailDto.company)
-      },
-      //下拉框-物料编码
-      getWlxx() {
-        req.getWlxx({}).then(res => {
-          this.mnum_list = res.data
-        })
-      },
-      changeMnum(row) {
-        req.getWlxxInfo().then(res => {
-          var data = res.data
-          for (var i = 0; i < data.length; i++) {
-            if (data[i].mNum === row.mNum) {
-              row.mName = data[i].mName
-              row.model = data[i].model
-              row.company = data[i].unit
-              row.remarks = data[i].remarks
-            }
+    // 下拉框-库存方向
+    getInventory() {
+      req.pullDown({
+        type: 'inventoryDirection'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.inventory_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
+    changeInventory(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.inventory_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-      },
-      //下拉框-仓库 warehouse basicUnit
-      getWarehouse() {
-        req.getWarehouse().then((res) => {
-          if (res.code === '200') {
-            this.warehouse_list = res.data
+        }
+      })
+      this.formobj.scmOtherInboundDto.inventoryDirection = bb.name
+      console.log('name', this.formobj.scmOtherInboundDto.inventoryDirection)
+    },
+    // 下拉框-单位 getCompany
+    getCompany() {
+      req.pullDown({
+        type: 'basicUnit'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.company_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
+    changeCompany(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.company_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-      },
-      changeWarehouse(row) {
-        for (var i = 0; i < this.warehouse_list.length; i++) {
-          if (this.warehouse_list[i].warehouseName === row.receivingWarehouse) {
-            row.receivingWarehouse = this.warehouse_list[i].warehouseName
+        }
+      })
+      this.formobj.scmOtherInboundDetailDto.company = bb.name
+      console.log('name', this.formobj.scmOtherInboundDetailDto.company)
+    },
+    // 下拉框-物料编码
+    getWlxx() {
+      req.getWlxx({}).then(res => {
+        this.mnum_list = res.data
+      })
+    },
+    changeMnum(row) {
+      req.getWlxxInfo().then(res => {
+        var data = res.data
+        for (var i = 0; i < data.length; i++) {
+          if (data[i].mNum === row.mNum) {
+            row.mName = data[i].mName
+            row.model = data[i].model
+            row.company = data[i].unit
+            row.remarks = data[i].remarks
           }
         }
-      },
+      })
+    },
+    // 下拉框-仓库 warehouse basicUnit
+    getWarehouse() {
+      req.getWarehouse().then((res) => {
+        if (res.code === '200') {
+          this.warehouse_list = res.data
+        }
+      })
+    },
+    changeWarehouse(row) {
+      for (var i = 0; i < this.warehouse_list.length; i++) {
+        if (this.warehouse_list[i].warehouseName === row.receivingWarehouse) {
+          row.receivingWarehouse = this.warehouse_list[i].warehouseName
+        }
+      }
+    },
 
-      // 明细表添加一行数据
-      addtableData() {
-        this.formobj.scmOtherInboundDetailDto.push({
-          sid: '',
-          mNum: '', // 物料编码
-          mName: '', // 物料名称
-          model: '', // 规格型号
-          year: '', // 年度
-          logisticsCustomer: '', // 物流客户
-          company: '', // 单位
-          netReceiptsNum: '', // 实收数量
-          receivingWarehouse: '', // 收货仓库
-          position: '', // 仓位
-          batchNum: '', // 批号
-          cargoOwner: '', // 货主
-          remarks: '' // 备注
-        })
-      },
+    // 明细表添加一行数据
+    addtableData() {
+      this.formobj.scmOtherInboundDetailDto.push({
+        sid: '',
+        mNum: '', // 物料编码
+        mName: '', // 物料名称
+        model: '', // 规格型号
+        year: '', // 年度
+        logisticsCustomer: '', // 物流客户
+        company: '', // 单位
+        netReceiptsNum: '', // 实收数量
+        receivingWarehouse: '', // 收货仓库
+        position: '', // 仓位
+        batchNum: '', // 批号
+        cargoOwner: '', // 货主
+        remarks: '' // 备注
+      })
+    },
 
-      // 明细表删除一行数据
-      dataDelete(index, row) {
-        this.formobj.scmOtherInboundDetailDto.splice(index, 1)
-      },
+    // 明细表删除一行数据
+    dataDelete(index, row) {
+      this.formobj.scmOtherInboundDetailDto.splice(index, 1)
+    },
 
-      // 返回（===既判断又赋值）
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.formobj.sid = ''
-        this.formobj.scmOtherInboundDto = {}
-        this.formobj.scmOtherInboundDetailDto = [{}]
-        this.stockOrgName_list = [] //库存组织
-        this.invenGroupName_list = [] //库存组
-        this.refreshItem++
-        this.$refs['form_obj'].resetFields()
-        this.$emit('doback')
-      },
+    // 返回（===既判断又赋值）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj.sid = ''
+      this.formobj.scmOtherInboundDto = {}
+      this.formobj.scmOtherInboundDetailDto = [{}]
+      this.stockOrgName_list = [] // 库存组织
+      this.invenGroupName_list = [] // 库存组
+      this.refreshItem++
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    },
 
-      showAdd() {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        this.dialogStatus = 'add'
-        this.viewTitle = '【新增】其他入库单'
-      },
+    showAdd() {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.dialogStatus = 'add'
+      this.viewTitle = '【新增】其他入库单'
+    },
 
-      showEdit(sid, row) {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        this.dialogStatus = 'edit'
-        this.viewTitle = '【编辑】其他入库单'
-        req.fetchBySid(sid).then(resp => {
-          const data = resp.data
-          this.formobj.sid = sid
-          const obj = {
-            makeListDate: data.date,
-            billNo: data.billNo,
-            makeListName: window.sessionStorage.getItem('name'),
-            billType: data.billType, //单据类型
-            manufacturerName: data.manufacturerName, // 供应商
-            manufacturerSid: data.manufacturerSid,
-            cargoOwnerType: data.cargoOwnerType, // 货主类型
-            cargoOwner: data.cargoOwner, // 货主
-            stockOrgName: data.stockOrgName, //库存组织
-            stockOrgSid: data.stockOrgSid, //库存组织sid 111
-            inspectorName: data.inspectorName, //验收员
-            billState: data.billState, //单据状态
-            inventoryDirection: data.inventoryDirection, // 库存方向
-            warehouseKeeperName: data.warehouseKeeperName, //仓管员
-            date: data.date,//日期
-            invenGroupName: data.invenGroupName, //库存组
-            invenGroupSid: data.invenGroupSid, // 库存组sid 111
-            customer: data.customer, // 客户
-            customerSid: data.customerSid, //客户sid
-            remarks: data.remarks //备注
-          }
-          this.formobj.scmOtherInboundDto = obj
-          this.stockOrgName_list = data.stockOrgSid //库存组织sid
-          this.invenGroupName_list = data.invenGroupSid //库存组sid
-          //明细表
-          this.formobj.scmOtherInboundDetailDto = data.scmOtherInboundDetailVoList
-        }).catch(e => {
-          this.formobj = row
-        })
-      },
+    showEdit(sid, row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.dialogStatus = 'edit'
+      this.viewTitle = '【编辑】其他入库单'
+      req.fetchBySid(sid).then(resp => {
+        const data = resp.data
+        this.formobj.sid = sid
+        const obj = {
+          makeListDate: data.date,
+          billNo: data.billNo,
+          makeListName: window.sessionStorage.getItem('name'),
+          billType: data.billType, // 单据类型
+          manufacturerName: data.manufacturerName, // 供应商
+          manufacturerSid: data.manufacturerSid,
+          cargoOwnerType: data.cargoOwnerType, // 货主类型
+          cargoOwner: data.cargoOwner, // 货主
+          stockOrgName: data.stockOrgName, // 库存组织
+          stockOrgSid: data.stockOrgSid, // 库存组织sid 111
+          inspectorName: data.inspectorName, // 验收员
+          billState: data.billState, // 单据状态
+          inventoryDirection: data.inventoryDirection, // 库存方向
+          warehouseKeeperName: data.warehouseKeeperName, // 仓管员
+          date: data.date, // 日期
+          invenGroupName: data.invenGroupName, // 库存组
+          invenGroupSid: data.invenGroupSid, // 库存组sid 111
+          customer: data.customer, // 客户
+          customerSid: data.customerSid, // 客户sid
+          remarks: data.remarks // 备注
+        }
+        this.formobj.scmOtherInboundDto = obj
+        this.stockOrgName_list = data.stockOrgSid // 库存组织sid
+        this.invenGroupName_list = data.invenGroupSid // 库存组sid
+        // 明细表
+        this.formobj.scmOtherInboundDetailDto = data.scmOtherInboundDetailVoList
+      }).catch(e => {
+        this.formobj = row
+      })
+    },
 
-      saveAdd() {
-        const _this = this
-        var table_mNum = ''
-        this.formobj.scmOtherInboundDetailDto.forEach((item) => {
-          table_mNum = item.mNum
+    saveAdd() {
+      const _this = this
+      var table_mNum = ''
+      this.formobj.scmOtherInboundDetailDto.forEach((item) => {
+        table_mNum = item.mNum
+      })
+      if (table_mNum === '') {
+        this.$message({
+          type: 'warning',
+          message: '请填写货物明细表'
         })
-        if (table_mNum === '') {
-          this.$message({
-            type: 'warning',
-            message: '请填写货物明细表'
+        return false
+      }
+      this.$refs['form_obj'].validate(valid => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveAdd(this.formobj).then(resp => {
+            this.submitdisabled = false
+            console.log(resp)
+            if (resp.code === '200') {
+              this.$notify({
+                title: '提示',
+                message: '添加成功',
+                type: 'success',
+                duration: 2000
+              })
+              _this.$message({ showClose: true, type: 'success', message: resp.msg })
+              _this.handleReturn('true')
+            }
+          }).catch(() => {
+            this.submitdisabled = false
           })
+        } else {
           return false
         }
-        this.$refs['form_obj'].validate(valid => {
-          if (valid) {
-            this.submitdisabled = true
-            req.saveAdd(this.formobj).then(resp => {
-              this.submitdisabled = false
-              console.log(resp)
-              if (resp.code === '200') {
-                this.$notify({
-                  title: '提示',
-                  message: '添加成功',
-                  type: 'success',
-                  duration: 2000
-                })
-                _this.$message({ showClose: true, type: 'success', message: resp.msg })
-                _this.handleReturn('true')
-              }
-            }).catch(() => {
-              this.submitdisabled = false
-            })
-          } else {
-            return false
-          }
-        })
-      },
+      })
+    },
 
-      saveEdit() {
-        const _this = this
-        // Start 库存组织字符串赋值
-        var stockOrg_Sid = ''
-        if (this.stockOrgName_list.length > 0) {
-          this.stockOrgName_list.forEach((item) => {
-            var last_id = item[item.length - 1]
-            this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            stockOrg_Sid = stockOrg_Sid + this.select_temp_Sid + ','
-          })
-        }
-        if (stockOrg_Sid !== '') {
-          stockOrg_Sid = stockOrg_Sid.substring(0, stockOrg_Sid.length - 1)
-        }
-        this.formobj.scmOtherInboundDto.stockOrgSid = stockOrg_Sid
-        console.log('重新赋值后的组织结构', this.formobj.scmOtherInboundDto.stockOrgSid)
-        //End
-        // Start 库存组字符串赋值
-        var invenGroup_Sid = ''
-        if (this.invenGroupName_list.length > 0) {
-          this.invenGroupName_list.forEach((item) => {
-            var last_id = item[item.length - 1]
-            this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            invenGroup_Sid = invenGroup_Sid + this.select_temp_Sid + ','
-          })
-        }
-        if (invenGroup_Sid !== '') {
-          invenGroup_Sid = invenGroup_Sid.substring(0, invenGroup_Sid.length - 1)
-        }
-        this.formobj.scmOtherInboundDto.invenGroupSid = invenGroup_Sid
-        console.log('重新赋值后的组织结构', this.formobj.scmOtherInboundDto.invenGroupSid)
-        //End
-        this.$refs['form_obj'].validate(valid => {
-          if (valid) {
-            this.submitdisabled = true
-            req.saveEdit(this.formobj, this.formobj.sid).then(resp => {
-              this.submitdisabled = false
-              _this.$message({ showClose: true, type: 'success', message: resp.msg })
-              _this.handleReturn('true')
-            }).catch(() => {
-              this.submitdisabled = false
-            })
-          } else {
-            return false
-          }
+    saveEdit() {
+      const _this = this
+      // Start 库存组织字符串赋值
+      var stockOrg_Sid = ''
+      if (this.stockOrgName_list.length > 0) {
+        this.stockOrgName_list.forEach((item) => {
+          var last_id = item[item.length - 1]
+          this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          stockOrg_Sid = stockOrg_Sid + this.select_temp_Sid + ','
+        })
+      }
+      if (stockOrg_Sid !== '') {
+        stockOrg_Sid = stockOrg_Sid.substring(0, stockOrg_Sid.length - 1)
+      }
+      this.formobj.scmOtherInboundDto.stockOrgSid = stockOrg_Sid
+      console.log('重新赋值后的组织结构', this.formobj.scmOtherInboundDto.stockOrgSid)
+      // End
+      // Start 库存组字符串赋值
+      var invenGroup_Sid = ''
+      if (this.invenGroupName_list.length > 0) {
+        this.invenGroupName_list.forEach((item) => {
+          var last_id = item[item.length - 1]
+          this.select_temp_Sid = ''  // 临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          invenGroup_Sid = invenGroup_Sid + this.select_temp_Sid + ','
         })
       }
+      if (invenGroup_Sid !== '') {
+        invenGroup_Sid = invenGroup_Sid.substring(0, invenGroup_Sid.length - 1)
+      }
+      this.formobj.scmOtherInboundDto.invenGroupSid = invenGroup_Sid
+      console.log('重新赋值后的组织结构', this.formobj.scmOtherInboundDto.invenGroupSid)
+      //End
+      this.$refs['form_obj'].validate(valid => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveEdit(this.formobj, this.formobj.sid).then(resp => {
+            this.submitdisabled = false
+            _this.$message({showClose: true, type: 'success', message: resp.msg})
+            _this.handleReturn('true')
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
     }
   }
+}
 </script>
 
 <style scoped>
-  /deep/ .el-table {
-    overflow-x: auto;
-  }
+/deep/ .el-table {
+  overflow-x: auto;
+}
 
-  /deep/ .el-table__header-wrapper,
-  /deep/ .el-table__body-wrapper,
-  /deep/ .el-table__footer-wrapper {
-    overflow: visible;
-  }
+/deep/ .el-table__header-wrapper,
+/deep/ .el-table__body-wrapper,
+/deep/ .el-table__footer-wrapper {
+  overflow: visible;
+}
 
-  /deep/ .el-table::after {
-    position: relative;
-  }
+/deep/ .el-table::after {
+  position: relative;
+}
 
-  /deep/ .el-table--scrollable-x .el-table__body-wrapper {
-    overflow: visible;
-  }
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: visible;
+}
 
-  /* 利用穿透，设置input边框隐藏 */
-  .invoiceadd >>> .el-input__inner {
-    border: 0;
-    border-bottom: 1px solid #e0e3eb !important;
-  }
+/* 利用穿透，设置input边框隐藏 */
+.invoiceadd >>> .el-input__inner {
+  border: 0;
+  border-bottom: 1px solid #e0e3eb !important;
+}
 
-  .tablelist >>> .el-input__inner {
-    border: 0;
-  }
+.tablelist >>> .el-input__inner {
+  border: 0;
+}
 
-  /* 如果你的 el-input type 设置成textarea ，就要用这个了 */
-  /*.invoiceadd>>>.el-textarea__inner {
-    border: 0;
-    resize: none;!* 这个是去掉 textarea 下面拉伸的那个标志，如下图 *!
-  }*/
-  .invoiceadd >>> .el-form-item__content {
-    margin-left: 0 !important;
-  }
+/* 如果你的 el-input type 设置成textarea ，就要用这个了 */
+/*.invoiceadd>>>.el-textarea__inner {
+  border: 0;
+  resize: none;!* 这个是去掉 textarea 下面拉伸的那个标志，如下图 *!
+}*/
+.invoiceadd >>> .el-form-item__content {
+  margin-left: 0 !important;
+}
 
-  .el-input {
-    width: 230px;
-  }
+.el-input {
+  width: 230px;
+}
 
-  .el-col .el-form-item {
-    margin-bottom: 10px;
-  }
+.el-col .el-form-item {
+  margin-bottom: 10px;
+}
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotheroutbound/scmotheroutbound.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotheroutbound/scmotheroutbound.vue
index 2c6bd1fad5..b8a3ba0a30 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotheroutbound/scmotheroutbound.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotheroutbound/scmotheroutbound.vue
@@ -3,8 +3,7 @@
     <div v-show="viewState == 1">
       <button-bar view-title="其他出库单" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="searchcon">
-        <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' :
-          '显示查询条件' }}
+        <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
         </el-button>
         <div v-show="isSearchShow" class="search">
           <el-form :inline="true" class="tab-header">
@@ -12,25 +11,17 @@
               <el-input v-model="queryParams.params.billNo" placeholder="请输入单据编号" clearable/>
             </el-form-item>
             <el-form-item label="单据类型">
-              <el-select v-model="queryParams.params.billType" @change="changeBillType" style="width:200px"
-                         filterable placeholder="请选择" clearable>
-                <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue"
-                           :value="item.dictKey"></el-option>
+              <el-select v-model="queryParams.params.billType" @change="changeBillType" style="width:200px" filterable placeholder="请选择" clearable>
+                <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
               </el-select>
-              <!--              <el-input v-model="queryParams.params.billType" placeholder="请输入单据类型" clearable/>-->
             </el-form-item>
             <el-form-item label="客户" class="search_label">
-              <el-select v-model="queryParams.params.customerName" @change="changeCustomer" style="width:200px"
-                         filterable placeholder="请选择" clearable>
-                <el-option v-for="item in customer_list" :key="item.sid" :label="item.customerName"
-                           :value="item.sid"></el-option>
+              <el-select v-model="queryParams.params.customerName" @change="changeCustomer" style="width:200px" filterable placeholder="请选择" clearable>
+                <el-option v-for="item in customer_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
               </el-select>
-              <!--              <el-input v-model="queryParams.params.customerName" placeholder="请输入客户名称" clearable/>-->
             </el-form-item>
             <el-form-item label="领料部门">
-              <el-cascader :key="refreshItem" v-model="pickingDep_list" @change="pickingDepChange"
-                           :options="options" :props="props" clearable/>
-              <!--              <el-input v-model="queryParams.params.pickingDepName" placeholder="请输入领料部门" clearable/>-->
+              <el-cascader :key="refreshItem" v-model="pickingDep_list" @change="pickingDepChange" :options="options" :props="props" clearable/>
             </el-form-item>
             <el-form-item label="领料人" class="search_label">
               <el-input v-model="queryParams.params.pickingPerson" placeholder="请输入领料人" clearable/>
@@ -52,24 +43,12 @@
       <!--Start 项目列表头部-->
       <div class="listtop">
         <div class="tit">其他出库单列表</div>
-        <pageye
-          v-show="dataList.length > 0"
-          :total="queryParams.total"
-          :page.sync="queryParams.current"
-          :limit.sync="queryParams.size"
-          class="pagination"
-          @pagination="loadList"
-        />
+        <pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
       </div>
       <!--End 项目列表头部-->
       <!--Start 项目列表-->
       <div class="listcon">
-        <el-table
-          v-loading="tableLoading"
-          :data="dataList"
-          border
-          style="width: 100%"
-          @selection-change="handleSelectionChange">
+        <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
           <el-table-column width="50px" type="selection" align="center"/>
           <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
           <el-table-column prop="billNo" label="单据编号" align="center">
@@ -91,14 +70,7 @@
       <div class="pages">
         <div class="tit"/>
         <!-- 翻页 -->
-        <pagination
-          v-show="dataList.length > 0"
-          :total="queryParams.total"
-          :page.sync="queryParams.current"
-          :limit.sync="queryParams.size"
-          class="pagination"
-          @pagination="loadList"
-        />
+        <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
       </div>
     </div>
     <!--End 查询和其列表部分-->
@@ -112,417 +84,407 @@
 </template>
 
 <script>
-  import req from '@/api/anruiscm/scmotheroutbound'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import divAdd from './scmotheroutboundAdd'
-  import divInfo from './scmotheroutboundInfo'
-  import { setuser, getuser } from '@/utils/baocun'
-
-  export default {
-    name: 'ScmOtherOutboundIndex',
-    components: {
-      ButtonBar,
-      Pagination,
-      pageye,
-      divAdd,
-      divInfo
+import req from '@/api/anruiscm/scmotheroutbound'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import divAdd from './scmotheroutboundAdd'
+import divInfo from './scmotheroutboundInfo'
+export default {
+  name: 'ScmOtherOutboundIndex',
+  components: {
+    ButtonBar,
+    Pagination,
+    pageye,
+    divAdd,
+    divInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false,
+      tableLoading: false,
+      // 下拉框
+      billType_list: [], // 单据类型
+      customer_list: [], // 客户
+      // 级联列表
+      pickingDep_list: [], // 领料部门
+      dataArr: [],
+      refreshItem: 0, // 级联列表key值
+      options: [], // 级联列表选项
+      props: { // props传值
+        value: 'sid',
+        label: 'name',
+        children: 'children',
+        multiple: true
+      },
+      dataList: [],
+      sids: [], // 用于导出的时候保存已选择SID
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          billNo: '', // 单据编号
+          billType: '', // 单据类型
+          customerName: '', // 客户
+          pickingDepName: '', // 领料部门
+          businessType: '', // 业务类型
+          cargoOwnerType: '', // 货主类型
+          stockOrgSid: '', // 库存组织sid
+          stockOrgName: '', // 库存组织
+          pickingPersonSid: '', // 领料人sid
+          pickingPerson: '', // 领料人
+          cargoOwnerSid: '', // 货主sid
+          cargoOwner: '', // 货主
+          claimOrgSid: '', // 领用组织sid
+          claimOrgName: '', // 领用组织
+          warehouseKeeperSid: '', // 仓管员sid
+          warehouseKeeperName: '', // 仓管员
+          billState: '', // 单据状态
+          inventoryDirection: '', // 库存方向
+          invenGroupSid: '', // 库存组sid
+          invenGroupName: '', // 库存组
+          date: '', // 日期
+          transferInDepartment: '' // 调入部门
+        }
+      },
+      row: {}
+    }
+  },
+  created() {
+    this.loadList()
+    // 下拉框
+    this.getBillType() // 单据类型
+    this.getCustomer() // 客户 可搜索
+    this.getBuMen() // 获取部门组织框架
+  },
+  methods: {
+    resetState() {
+      this.viewState = 1
     },
-    data() {
-      return {
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        tableLoading: false,
-        //下拉框
-        billType_list: [], //单据类型
-        customer_list: [], //客户
-        //级联列表
-        pickingDep_list: [], // 领料部门
-        dataArr: [],
-        refreshItem: 0, // 级联列表key值
-        options: [], // 级联列表选项
-        props: {  // props传值
-          value: 'sid',
-          label: 'name',
-          children: 'children',
-          multiple: true
-        },
-        dataList: [],
-        sids: [], // 用于导出的时候保存已选择SID
-        queryParams: {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            billNo: '', // 单据编号
-            billType: '', // 单据类型
-            customerName: '', // 客户
-            pickingDepName: '', // 领料部门
-            businessType: '', // 业务类型
-            cargoOwnerType: '', // 货主类型
-            stockOrgSid: '', // 库存组织sid
-            stockOrgName: '', // 库存组织
-            pickingPersonSid: '', // 领料人sid
-            pickingPerson: '', // 领料人
-            cargoOwnerSid: '', // 货主sid
-            cargoOwner: '', // 货主
-            claimOrgSid: '', // 领用组织sid
-            claimOrgName: '', // 领用组织
-            warehouseKeeperSid: '', // 仓管员sid
-            warehouseKeeperName: '', // 仓管员
-            billState: '', // 单据状态
-            inventoryDirection: '', // 库存方向
-            invenGroupSid: '', // 库存组sid
-            invenGroupName: '', // 库存组
-            date: '', // 日期
-            transferInDepartment: '' // 调入部门
-          }
-        },
-        row: {}
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'toEdit':
+          this.toEdit()
+          break
+        case 'doSubmit':
+          this.doSubmit()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doImport':
+          this.doImport()
+          break
+        case 'doExport':
+          this.doExport()
+          break
+        default:
+          break
       }
     },
-    created() {
-      this.loadList()
-      //下拉框
-      this.getBillType() // 单据类型
-      this.getCustomer() //客户 可搜索
-      this.getBuMen() //获取部门组织框架
+    toAdd(row) {
+      this.viewState = 2
+      this.$refs['divadd'].showAdd()
     },
-    methods: {
-      resetState() {
-        this.viewState = 1
-      },
-      btnHandle(btnKey) {
-        console.log('XXXXXXXXXXXXXXX    ' + btnKey)
-        switch (btnKey) {
-          case 'toAdd':
-            this.toAdd()
-            break
-          case 'toEdit':
-            this.toEdit()
-            break
-          case 'doSubmit':
-            this.doSubmit()
-            break
-          case 'doDel':
-            this.doDel()
-            break
-          case 'doImport':
-            this.doImport()
-            break
-          case 'doExport':
-            this.doExport()
-            break
-          default:
-            break
-        }
-      },
-      toAdd(row) {
-        this.viewState = 2
-        this.$refs['divadd'].showAdd()
-      },
-      toEdit() {
-        if (this.sids.length === 0) {
-          this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
-          return
-        }
-        if (this.sids.length > 1) {
-          this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
-          return
-        }
-        this.viewState = 3
-        const sid = this.sids[0]
-        const row = this.row
-        this.$refs['divadd'].showEdit(sid,row)
-      },
-      doSubmit(row) {
-        // 提交的代码
-        this.btndisabled = true
-        req
-          .doSubmit(this.queryParams.params, this.sids)
-          .then(resp => {
-            console.log(resp)
-            this.btndisabled = false
-          })
-          .catch(() => {
-            this.btndisabled = false
-          })
-      },
-      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'
+    toEdit() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' })
+        return
+      }
+      if (this.sids.length > 1) {
+        this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' })
+        return
+      }
+      this.viewState = 3
+      const sid = this.sids[0]
+      const row = this.row
+      this.$refs['divadd'].showEdit(sid, row)
+    },
+    doSubmit(row) {
+      // 提交的代码
+      this.btndisabled = true
+      req
+        .doSubmit(this.queryParams.params, this.sids)
+        .then(resp => {
+          console.log(resp)
+          this.btndisabled = false
         })
-          .then(() => {
-            const loading = this.$loading({
-              lock: true,
-              text: 'Loading',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            })
-            const _this = this
-            req
-              .delBySids(this.sids)
-              .then(resp => {
-                loading.close()
-                _this.$message({ type: 'success', message: resp.msg, showClose: true })
-                _this.loadList()
-              })
-              .catch(e => {
-                loading.close()
-              })
-          })
-          .catch(() => {
-          })
-      },
-      //下拉框-单据类型 changeBillType
-      getBillType() {
-        req.pullDown({
-          type: 'billsType'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.billType_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
+        .catch(() => {
+          this.btndisabled = false
         })
-      },
-      // dictKey: "01"; dictType: "invoicingNature"
-      changeBillType(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.billType_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
-          }
+    },
+    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)'
+          })
+          const _this = this
+          req
+            .delBySids(this.sids)
+            .then(resp => {
+              loading.close()
+              _this.$message({ type: 'success', message: resp.msg, showClose: true })
+              _this.loadList()
+            })
+            .catch(e => {
+              loading.close()
+            })
         })
-        this.queryParams.params.billType = bb.name
-        // this.queryParams.params.billType = bb.sid
-        console.log('name', this.queryParams.params.billType)
-      },
-      //可模糊检索下拉框-客户
-      getCustomer() {
-        req.kehu({}).then((res) => {
-          if (res.code === '200') {
-            this.customer_list = res.data
-            console.log('下拉框请求11133', res.data)
-          }
+        .catch(() => {
         })
-      },
-      changeCustomer(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.customer_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.sid == value) {
-            bb = {
-              // type: e.dictType,
-              name: e.customerName,
-              // key: e.dictKey,
-              sid: e.sid
-            }
+    },
+    // 下拉框-单据类型 changeBillType
+    getBillType() {
+      req.pullDown({
+        type: 'billsType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.billType_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
+    changeBillType(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.billType_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-        this.queryParams.params.customerName = bb.name
-        // this.queryParams.params.customerSid = bb.sid
-        console.log('name', this.queryParams.params.customerName)
-      },
-      // 级联列表 领料部门 pickingDepChange
-      getBuMen() {
-        req.salesDepName().then((res) => {
-          if (res.code === '200') {
-            this.options = res.data
-            console.log('请求到的级联列表', this.options)
-            this.BuMen0(this.options)
+        }
+      })
+      this.queryParams.params.billType = bb.name
+      console.log('name', this.queryParams.params.billType)
+    },
+    // 可模糊检索下拉框-客户
+    getCustomer() {
+      req.kehu({}).then((res) => {
+        if (res.code === '200') {
+          this.customer_list = res.data
+          console.log('下拉框请求11133', res.data)
+        }
+      })
+    },
+    changeCustomer(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.customer_list.forEach((e) => {
+        if (e.sid === value) {
+          bb = {
+            name: e.name,
+            sid: e.sid
           }
-        })
-      },
-      BuMen0(data) {
-        data.forEach((e) => {
-          if (e.children.length != 0) {
+        }
+      })
+      this.queryParams.params.customerName = bb.name
+      console.log('name', this.queryParams.params.customerName)
+    },
+    // 级联列表 领料部门 pickingDepChange
+    getBuMen() {
+      req.salesDepName().then((res) => {
+        if (res.code === '200') {
+          this.options = res.data
+          console.log('请求到的级联列表', this.options)
+          this.BuMen0(this.options)
+        }
+      })
+    },
+    BuMen0(data) {
+      data.forEach((e) => {
+        if (e.children) {
+          if (e.children.length !== 0) {
             this.BuMen0(e.children)
           } else {
             delete e.children
             this.dataArr.push(e)
             return
           }
-        })
-      },
-      //部门
-      pickingDepChange(e) {
-        console.log('选中结果：' + JSON.stringify(e))
-        var result = ''
-        var result_Sid = ''
-        if (e.length > 0) {
-          // 循环多选项
-          e.forEach((item) => {
-            var last_id = item[item.length - 1]
-            // 循环查找名字
-            this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
-            this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            result = result + this.select_temp_Name + ','
-            result_Sid = result_Sid + this.select_temp_Sid + ','
-          })
         }
-        if (result !== '') {
-          result = result.substring(0, result.length - 1)
-        }
-        if (result_Sid !== '') {
-          result_Sid = result_Sid.substring(0, result_Sid.length - 1)
-        }
-        this.queryParams.params.pickingDepName = result
-        // this.formobj.scmOtherInboundDto.orgSid = result_Sid
-        console.log('选中名称：' + this.queryParams.params.pickingDepName, result_Sid)
-      },
-      // --- 循环查询
-      findOrgId(id, options) {
-        for (var i = 0; i < options.length; i++) {
-          if (id == options[i].sid) {
-            this.select_temp_Name = options[i].name // 保存找到的内容
-            this.select_temp_Sid = options[i].sid
-            return true
-          } else {
-            // 判断是否最后一级
-            if (options[i].children !== undefined) {
-              // 不是的话查询下一级
-              if (this.findOrgId(id, options[i].children)) {
-                return true
-              }
+      })
+    },
+    // 部门
+    pickingDepChange(e) {
+      console.log('选中结果：' + JSON.stringify(e))
+      var result = ''
+      var result_Sid = ''
+      if (e.length > 0) {
+        // 循环多选项
+        e.forEach((item) => {
+          var last_id = item[item.length - 1]
+          // 循环查找名字
+          this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
+          this.select_temp_Sid = ''  // 临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          result = result + this.select_temp_Name + ','
+          result_Sid = result_Sid + this.select_temp_Sid + ','
+        })
+      }
+      if (result !== '') {
+        result = result.substring(0, result.length - 1)
+      }
+      if (result_Sid !== '') {
+        result_Sid = result_Sid.substring(0, result_Sid.length - 1)
+      }
+      this.queryParams.params.pickingDepName = result
+      console.log('选中名称：' + this.queryParams.params.pickingDepName, result_Sid)
+    },
+    // --- 循环查询
+    findOrgId(id, options) {
+      for (var i = 0; i < options.length; i++) {
+        if (id === options[i].sid) {
+          this.select_temp_Name = options[i].name // 保存找到的内容
+          this.select_temp_Sid = options[i].sid
+          return true
+        } else {
+          // 判断是否最后一级
+          if (options[i].children !== undefined && options[i].children !== null) {
+            // 不是的话查询下一级
+            if (this.findOrgId(id, options[i].children)) {
+              return true
             }
           }
         }
-      },
+      }
+    },
 
-      doImport() {
-        // 导入的代码
-        req
-          .importExcel(this.queryParams.params)
-          .then(resp => {
-            console.log(resp)
-          })
-          .catch(() => {
-          })
-      },
-      doExport(row) {
-        // 导出的代码
-        req
-          .exportExcel(this.queryParams.params, this.sids)
-          .then(resp => {
-            var map = resp.data
-            const fileName = map.filename // 导出文件名
-            // // 对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
-            // // IE10以上支持blob但是依然不支持download
-            const link = document.createElement('a') // 创建a标签
-            link.download = fileName // a标签添加属性
-            link.style.display = 'none'
-            link.href = map.downurl
-            document.body.appendChild(link)
-            link.click() // 执行下载
-            URL.revokeObjectURL(link.href) // 释放url
-            document.body.removeChild(link) // 释放标签
-          })
-          .catch(() => {
-          })
-      },
-      dosearch() {
-        this.queryParams.current = 1
-        this.loadList()
-      },
-      resetQuery() {
-        this.queryParams.params = {}
-        this.pickingDep_list = []
-        this.dosearch()
-        this.queryParams.params.sid = '' // sid
-        this.queryParams.params.name = '' // 登录名
-      },
-      loadList() {
-        const _this = this
-        this.tableLoading = true
-        req
-          .listPage(this.queryParams)
-          .then(resp => {
-            console.log('列表查询', resp)
-            _this.tableLoading = false
-            const data = resp.data
-            _this.queryParams.total = data.total
-            _this.dataList = data.records
-          })
-          .catch(() => {
-            _this.tableLoading = false
-          })
-      },
-      // 获取数据sid
-      handleSelectionChange(row) {
-        console.log('aaa', row)
-        const aa = []
-        row.forEach(element => {
-          aa.push(element.sid)
-          setuser(this.sids)
+    doImport() {
+      // 导入的代码
+      req
+        .importExcel(this.queryParams.params)
+        .then(resp => {
+          console.log(resp)
         })
-        this.sids = aa
-        this.row = row
-        // this.sides = this.sids.join(); //将sid数组的元素转化成字符串
-        console.log('获取sids数组', this.sids)
-      },
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      toInfo(row) {
-        const billNo = row.billNo
-        console.log('打开详情', billNo)
-        this.$refs['divinfo'].showInfo(billNo,row)
-        this.viewState = 4
-      }
+        .catch(() => {
+        })
+    },
+    doExport(row) {
+      // 导出的代码
+      req
+        .exportExcel(this.queryParams.params, this.sids)
+        .then(resp => {
+          var map = resp.data
+          const fileName = map.filename // 导出文件名
+          // // 对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
+          // // IE10以上支持blob但是依然不支持download
+          const link = document.createElement('a') // 创建a标签
+          link.download = fileName // a标签添加属性
+          link.style.display = 'none'
+          link.href = map.downurl
+          document.body.appendChild(link)
+          link.click() // 执行下载
+          URL.revokeObjectURL(link.href) // 释放url
+          document.body.removeChild(link) // 释放标签
+        })
+        .catch(() => {
+        })
+    },
+    dosearch() {
+      this.queryParams.current = 1
+      this.loadList()
+    },
+    resetQuery() {
+      this.queryParams.params = {}
+      this.pickingDep_list = []
+      this.dosearch()
+      this.queryParams.params.sid = '' // sid
+      this.queryParams.params.name = '' // 登录名
+    },
+    loadList() {
+      const _this = this
+      this.tableLoading = true
+      req
+        .listPage(this.queryParams)
+        .then(resp => {
+          console.log('列表查询', resp)
+          _this.tableLoading = false
+          const data = resp.data
+          _this.queryParams.total = data.total
+          _this.dataList = data.records
+        })
+        .catch(() => {
+          _this.tableLoading = false
+        })
+    },
+    // 获取数据sid
+    handleSelectionChange(row) {
+      console.log('aaa', row)
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+      this.row = row
+      console.log('获取sids数组', this.sids)
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    toInfo(row) {
+      const billNo = row.billNo
+      console.log('打开详情', billNo)
+      this.$refs['divinfo'].showInfo(billNo, row)
+      this.viewState = 4
     }
   }
+}
 </script>
 <style scoped>
-  /deep/ .el-collapse {
-    border-top: 0 solid #e6ebf5;
-    border-bottom: 0 solid #e6ebf5;
-  }
+/deep/ .el-collapse {
+  border-top: 0 solid #e6ebf5;
+  border-bottom: 0 solid #e6ebf5;
+}
 
-  /deep/ .el-collapse-item__content {
-    margin: 0;
-    padding: 0;
-  }
+/deep/ .el-collapse-item__content {
+  margin: 0;
+  padding: 0;
+}
 
-  /deep/ .el-collapse-item__wrap {
-    border-bottom: 0 solid #ebeef5;
-  }
+/deep/ .el-collapse-item__wrap {
+  border-bottom: 0 solid #ebeef5;
+}
 
-  /deep/ .el-collapse-item__header {
-    border-bottom: 0 solid #e6ebf5;
-  }
+/deep/ .el-collapse-item__header {
+  border-bottom: 0 solid #e6ebf5;
+}
 
-  .searchbtn {
-    border: #2cab69 1px solid;
-    color: #2cab69;
-  }
+.searchbtn {
+  border: #2cab69 1px solid;
+  color: #2cab69;
+}
 
-  .search_label /deep/ .el-form-item__label {
-    width: 68px;
-  }
+.search_label /deep/ .el-form-item__label {
+  width: 68px;
+}
 
-  /deep/ .el-form-item {
-    margin-bottom: 5px;
-  }
+/deep/ .el-form-item {
+  margin-bottom: 5px;
+}
 
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotheroutbound/scmotheroutboundAdd.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotheroutbound/scmotheroutboundAdd.vue
index 9b81a64ac9..6f1c0af68d 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotheroutbound/scmotheroutboundAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmotheroutbound/scmotheroutboundAdd.vue
@@ -1,4 +1,4 @@
-<template xmlns="">
+<template>
   <div>
     <!--标题按钮部分开始-->
     <div class="tab-header webtop">
@@ -6,8 +6,7 @@
       <div>{{ viewTitle }}</div>
       <!--start 添加修改按钮-->
       <div>
-        <el-button type="primary" size="small" :disabled="submitdisabled"
-                   @click="dialogStatus === 'add' ? saveAdd() : saveEdit()">保存
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="dialogStatus === 'add' ? saveAdd() : saveEdit()">保存
         </el-button>
         <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
       </div>
@@ -20,7 +19,6 @@
       <div class="title">其他出库单</div> <!---->
       <el-form ref="form_obj" :model="formobj.scmOtherOutboundDto" :rules="rules" :inline="true" label-width="120px">
         <div style="border-bottom:  2px solid #e0e3eb; height: 40px;">
-          <!--第一行-->
           <el-row>
             <el-col :span="10" style="margin-left: 80px; height: 20px;">
               <el-form-item label="单据编号:">{{ formobj.scmOtherOutboundDto.billNo }}</el-form-item>
@@ -37,116 +35,83 @@
           <el-row>
             <el-col :span="8">
               <el-form-item prop="billType" label="单据类型">
-                <el-select v-model="formobj.scmOtherOutboundDto.billType" @change="changeBillType"
-                           placeholder="请选择" clearable>
-                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"></el-option>
+                <el-select v-model="formobj.scmOtherOutboundDto.billType" @change="changeBillType" placeholder="请选择" clearable>
+                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-
             <el-col :span="8">
               <el-form-item prop="customerName" label="客户">
-                <el-select v-model="formobj.scmOtherOutboundDto.customerName" @change="changeCustomer"
-                           filterable placeholder="请选择" clearable>
-                  <el-option v-for="item in customer_list" :key="item.sid" :label="item.customerName"
-                             :value="item.sid"></el-option>
+                <el-select v-model="formobj.scmOtherOutboundDto.customerName" @change="changeCustomer" filterable placeholder="请选择" clearable>
+                  <el-option v-for="item in customer_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="pickingDepName" label="领料部门">
-                <el-cascader :key="refreshItem" v-model="pickingDep_list" @change="pickingDepChange"
-                             :options="options" :props="props" clearable/>
+                <el-cascader :key="refreshItem" v-model="pickingDep_list" @change="pickingDepChange" :options="options" :props="props" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
             <el-col :span="8">
               <el-form-item prop="businessType" label="业务类型">
-                <el-select v-model="formobj.scmOtherOutboundDto.businessType" @change="changeBusinessType"
-                           placeholder="请选择" clearable>
-                  <el-option v-for="item in businessType_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"></el-option>
+                <el-select v-model="formobj.scmOtherOutboundDto.businessType" @change="changeBusinessType" placeholder="请选择" clearable>
+                  <el-option v-for="item in businessType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="cargoOwnerType" label="货主类型">
-                <el-select v-model="formobj.scmOtherOutboundDto.cargoOwnerType" @change="changeCargoType"
-                           placeholder="请选择" clearable>
-                  <el-option v-for="item in cargoType_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"></el-option>
+                <el-select v-model="formobj.scmOtherOutboundDto.cargoOwnerType" @change="changeCargoType" placeholder="请选择" clearable>
+                  <el-option v-for="item in cargoType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="stockOrgName" label="库存组织">
-                <el-select v-model="formobj.scmOtherOutboundDto.stockOrgName" @change="stockOrgNameChange"
-                           placeholder="请选择" class="addinputw" clearable>
-                  <el-option v-for="item in stockOrgName_list" :key="item.sid" :label="item.name"
-                             :value="item.name" clearable></el-option>
+                <el-select v-model="formobj.scmOtherOutboundDto.stockOrgName" @change="stockOrgNameChange" placeholder="请选择" class="addinputw" clearable>
+                  <el-option v-for="item in stockOrgName_list" :key="item.sid" :label="item.name" :value="item.name" clearable></el-option>
                 </el-select>
-<!--                <el-cascader :key="refreshItem" v-model="stockOrgName_list" class="addinputw"-->
-<!--                             @change="stockOrgNameChange"-->
-<!--                             :options="orgOptions" :props="orgProps" clearable/>-->
-                <!--                <el-cascader :key="refreshItem" v-model="stockOrgName_list" @change="stockOrgNameChange"-->
-                <!--                             :options="options" :props="props" clearable/>-->
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <el-form-item prop="pickingPerson" label="领料人">
-                <el-input v-model="formobj.scmOtherOutboundDto.pickingPerson" placeholder="请输入领料人" class="addinputw"
-                          clearable/>
+                <el-input v-model="formobj.scmOtherOutboundDto.pickingPerson" placeholder="请输入领料人" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="cargoOwner" label="货主">
-                <el-input v-model="formobj.scmOtherOutboundDto.cargoOwner" placeholder="请输入货主" class="addinputw"
-                          clearable/>
+                <el-input v-model="formobj.scmOtherOutboundDto.cargoOwner" placeholder="请输入货主" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="claimOrgName" label="领用组织">
-                <el-select v-model="formobj.scmOtherOutboundDto.claimOrgName" @change="claimOrgNameChange"
-                           placeholder="请选择" class="addinputw" clearable>
-                  <el-option v-for="item in claimOrgName_list" :key="item.sid" :label="item.name"
-                             :value="item.name" clearable></el-option>
+                <el-select v-model="formobj.scmOtherOutboundDto.claimOrgName" @change="claimOrgNameChange" placeholder="请选择" class="addinputw" clearable>
+                  <el-option v-for="item in claimOrgName_list" :key="item.sid" :label="item.name" :value="item.name" clearable></el-option>
                 </el-select>
-<!--                <el-cascader :key="refreshItem" v-model="claimOrgName_list" class="addinputw"-->
-<!--                             @change="claimOrgNameChange"-->
-<!--                             :options="orgOptions" :props="orgProps" clearable/>-->
-                <!--                <el-cascader :key="refreshItem" v-model="claimOrgName_list" @change="claimOrgNameChange"-->
-                <!--                             :options="options" :props="props" clearable/>-->
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="8">
               <el-form-item prop="warehouseKeeperName" label="仓管员">
-                <el-input v-model="formobj.scmOtherOutboundDto.warehouseKeeperName" placeholder="请输入仓管员"
-                          class="addinputw"
-                          clearable/>
+                <el-input v-model="formobj.scmOtherOutboundDto.warehouseKeeperName" placeholder="请输入仓管员" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="billState" label="单据状态">
-                <el-select v-model="formobj.scmOtherOutboundDto.billState" @change="changeBillState"
-                           placeholder="请选择" clearable>
-                  <el-option v-for="item in billState_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"></el-option>
+                <el-select v-model="formobj.scmOtherOutboundDto.billState" @change="changeBillState" placeholder="请选择" clearable>
+                  <el-option v-for="item in billState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="inventoryDirection" label="库存方向">
-                <el-select v-model="formobj.scmOtherOutboundDto.inventoryDirection" @change="changeInventory"
-                           placeholder="请选择" clearable>
-                  <el-option v-for="item in inventory_list" :key="item.dictKey" :label="item.dictValue"
-                             :value="item.dictKey"></el-option>
+                <el-select v-model="formobj.scmOtherOutboundDto.inventoryDirection" @change="changeInventory" placeholder="请选择" clearable>
+                  <el-option v-for="item in inventory_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -154,24 +119,17 @@
           <el-row>
             <el-col :span="8">
               <el-form-item prop="invenGroupName" label="库存组">
-                <el-cascader :key="refreshItem" v-model="invenGroupName_list" @change="salesDepNameChange"
-                             :options="options" :props="props" clearable/>
+                <el-cascader :key="refreshItem" v-model="invenGroupName_list" @change="salesDepNameChange" :options="options" :props="props" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="date" label="日期">
-                <el-date-picker
-                  v-model="formobj.scmOtherOutboundDto.date"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="选择日期"
-                />
+                <el-date-picker v-model="formobj.scmOtherOutboundDto.date" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="transferInDepartment" label="调入部门">
-                <el-cascader :key="refreshItem" v-model="transferIn_list" @change="transferInChange"
-                             :options="options" :props="props" clearable/>
+                <el-cascader :key="refreshItem" v-model="transferIn_list" @change="transferInChange" :options="options" :props="props" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -184,1067 +142,929 @@
         <!--Start 货物明细表-->
         <div class="addtable">
           <div class="tabletitle">
-            <div class="titlename">
-              货物明细
-            </div>
+            <div class="titlename">货物明细</div>
             <el-button size="small" type="primary" @click="addtableData">添加</el-button>
           </div>
           <template class="tablelist">
-            <el-table
-              :data="formobj.scmOtherOutboundDetailDtoList"
-              :index="index"
-              border
-              style="width: 100%"
-              show-summary
-              :summary-method="getSummaries"
-            >
-              <el-table-column
-                align="center"
-                label="序号"
-                type="index"
-                width="50"/>
+            <el-table :data="formobj.scmOtherOutboundDetailDtoList" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
+              <el-table-column align="center" label="序号" type="index" width="50"/>
               <el-table-column label="操作" width="80" align="center">
                 <template slot-scope="scope">
-                  <el-button type="danger" size="mini"
-                             @click="dataDelete(scope.$index,formobj.scmOtherOutboundDetailDtoList[scope.$index])">删除
+                  <el-button type="danger" size="mini" @click="dataDelete(scope.$index,formobj.scmOtherOutboundDetailDtoList[scope.$index])">删除
                   </el-button>
                 </template>
               </el-table-column>
               <el-table-column prop="mnum" width="150" label="物料编码" align="center">
                 <template slot-scope="props">
-                  <el-select v-model="props.row.mnum" placeholder="请选择" style="width: 120px;"
-                             @change="changeMnum(props.row,this)">
-                    <el-option v-for="item in mnum_list" :key="item.sid" :label="item.mNum"
-                               :value="item.mNum"></el-option>
+                  <el-select v-model="props.row.mnum" placeholder="请选择" style="width: 120px;" @change="changeMnum(props.row,this)">
+                    <el-option v-for="item in mnum_list" :key="item.sid" :label="item.mNum" :value="item.mNum"></el-option>
                   </el-select>
-                  <!--                  <el-input v-model="props.row.mnum" style="width:120px;" class="tableinput"/>-->
                 </template>
               </el-table-column>
               <el-table-column prop="mname" width="150" label="物料名称" align="center">
                 <template slot-scope="props">
-                  <!--                  <el-input v-model="props.row.mname" style="width:120px;" class="tableinput"/>-->
-                  <span>{{props.row.mname}}</span>
+                  <span>{{ props.row.mname }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="model" width="150" label="规格型号" align="center">
                 <template slot-scope="props">
-                  <!--                  <el-input v-model="props.row.model" style="width:120px;" class="tableinput"/>-->
-                  <span>{{props.row.model}}</span>
+                  <span>{{ props.row.model }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="year" width="95" label="年度" align="center">
                 <template slot-scope="props">
                   <el-input v-model="props.row.year" style="width:70px;" class="tableinput"/>
-                  <!--<span>{{props.row.count}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column prop="logisticsCustomer" width="95" label="物流客户" align="center">
                 <template slot-scope="props">
                   <el-input v-model="props.row.logisticsCustomer" style="width:70px;" class="tableinput"/>
-                  <!-- <span>{{props.row.leviedSubtotal}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column prop="company" width="150" label="单位" align="center">
                 <template slot-scope="props">
-                  <!--                  <el-select v-model="props.row.company" @change="changeCompany"-->
-                  <!--                             placeholder="请选择" class="addinputw" clearable>-->
-                  <!--                    <el-option v-for="item in company_list" :key="item.dictKey" :label="item.dictValue"-->
-                  <!--                               :value="item.dictKey" clearable></el-option>-->
-                  <!--                  </el-select>-->
-                  <span>{{props.row.company}}</span>
+                  <span>{{ props.row.company }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="realHairNum" width="125" label="实发数量" align="center">
                 <template slot-scope="props">
                   <el-input v-model="props.row.realHairNum" style="width:110px;" class="tableinput"/>
-                  <!-- <span>{{props.row.productLine}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column prop="deliveryWarehouse" width="150" label="发货仓库" align="center">
                 <template slot-scope="props">
-                  <el-select v-model="props.row.deliveryWarehouse" @change="changeWarehouse"
-                             placeholder="请选择" class="addinputw" clearable>
-                    <el-option v-for="item in warehouse_list" :key="item.sid" :label="item.warehouseName"
-                               :value="item.warehouseName" clearable></el-option>
+                  <el-select v-model="props.row.deliveryWarehouse" @change="changeWarehouse" placeholder="请选择" class="addinputw" clearable>
+                    <el-option v-for="item in warehouse_list" :key="item.sid" :label="item.warehouseName" :value="item.warehouseName" clearable></el-option>
                   </el-select>
-                  <!-- <el-input v-model="props.row.deliveryWarehouse" style="width:135px;" class="tableinput"/>-->
-                  <!--<span>{{props.row.mName}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column prop="cargoOwner" width="120" label="货主" align="center">
                 <template slot-scope="props">
                   <el-input v-model="props.row.cargoOwner" style="width:105px;" class="tableinput"/>
-                  <!--<span>{{props.row.remarks}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column prop="remarks" width="150" label="备注" align="center">
                 <template slot-scope="props">
-                  <!--                  <el-input v-model="props.row.remarks" style="width:120px;" class="tableinput"/>-->
-                  <span>{{props.row.remarks}}</span>
+                  <span>{{ props.row.remarks }}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="shippingUnit" width="120" label="出货单价" align="center">
                 <template slot-scope="props">
                   <el-input v-model="props.row.shippingUnit" style="width:105px;" class="tableinput"/>
-                  <!-- <span>{{props.row.productLine}}</span>-->
                 </template>
               </el-table-column>
               <el-table-column prop="deliveryAmount" width="120" label="出库金额" align="center">
                 <template slot-scope="props">
                   <el-input v-model="props.row.deliveryAmount" style="width:105px;" class="tableinput"/>
-                  <!-- <span>{{props.row.productLine}}</span>-->
                 </template>
               </el-table-column>
             </el-table>
           </template>
         </div>
-        <!--End 货物明细表-->
       </el-form>
     </div>
-    <!--End 添加修改部分-->
   </div>
 </template>
 
 <script>
-  import req from '@/api/anruiscm/scmotheroutbound'
+import req from '@/api/anruiscm/scmotheroutbound'
 
-  export default {
-    name: 'ScmOtherOutboundAdd',
-    data() {
-      return {
-        viewTitle: '',
-        dialogStatus: 'add',
-        index: 0,
-        //明细表数据
-        tableData: [],
-        // 下拉框
-        billType_list: [], //单据类型
-        customer_list: [], //客户
-        businessType_list: [], //业务类型
-        cargoType_list: [], // 货主类型
-        billState_list: [],//单据状态
-        inventory_list: [],//库存方向
-        company_list: [],//单位
-        mnum_list: [], //物料编码
-        pickingDep_list: [], //领料部门
-        stockOrgName_list: [],//库存组织
-        claimOrgName_list: [],//领用组织
-        invenGroupName_list: [],//库存组
-        transferIn_list: [],//调入部门
-        warehouse_list: [], // 发货仓库
-        //级联列表
-        dataArr: [],
-        refreshItem: 0, // 级联列表key值
-        options: [], // 级联列表选项
-        props: {  // props传值
-          value: 'sid',
-          label: 'name',
-          children: 'children',
-          multiple: true
-        },
-        // 组织(单选)
-        orgProps: {
-          value: 'sid',
-          label: 'name',
-          children: 'children',
-          checkStrictly: true
-        },
-        orgOptions: [],
-        orgArr: [],
-        formobj: {
-          sid: '', // 一条数据的sid
-          userSid: window.sessionStorage.getItem('userSid'), // 用户人sid
-          scmOtherOutboundDto: {
-            orgSid: window.sessionStorage.getItem('orgSid'), // 部门sid
-            orgName: window.sessionStorage.getItem('departmentName'), // 部门名称
-            makeListName: window.sessionStorage.getItem('name'),
-            makeListDate: '', //制单日期
-            billNo: '',//单据编号
-            billState: '',//单据状态
-            billType: '',  //单据类型
-            businessType: '',  //业务类型
-            cargoOwner: '',  //货主
-            cargoOwnerSid: '',  //货主sid
-            cargoOwnerType: '',  //货主类型
-            claimOrgName: '', //领用组织
-            claimOrgSid: '', //  领用组织sid
-            customerName: '', //  客户名称
-            customerSid: '', //  客户sid
-            date: '', //  日期
-            invenGroupName: '', //  库存组
-            invenGroupSid: '', //  库存组sid
-            inventoryDirection: '', //  库存方向
-            pickingDepName: '', //  领料部门
-            pickingDepSid: '', //  领料部门sid
-            pickingPerson: '', //  领料人
-            pickingPersonSid: '', //  领料人sid
-            stockOrgName: '', //  库存组织
-            stockOrgSid: '', //  库存组织sid
-            transferInDepartment: '', //  调入部门
-            transferInDepartmentSid: '', //调入部门sid
-            warehouseKeeperName: '', // 仓管员
-            warehouseKeeperSid: '', //  仓管员sid
-            remarks: '' //备注
-          },
-          scmOtherOutboundDetailDtoList: [{
-            batchNum: '', //批号
-            billSid: '', //单据sid
-            cargoOwner: '', //货主
-            company: '', //单位
-            deliveryAmount: '', //出库金额
-            deliveryWarehouse: '', // 发货仓库
-            logisticsCustomer: '', //物流客户
-            mname: '', // 物料名称
-            mnum: '', //物料编码
-            model: '', //规格型号
-            position: '', //仓位
-            // productGroupName: '', //产品组
-            // productGroupSid: '', //产品组sid
-            realHairNum: '', //实发数量
-            shippingUnit: '',  //出货单价？？
-            year: '' //年度
-          }]
-        },
-        rules: {
-          billType: [{ required: true, message: '单据类型不能为空', trigger: 'change' }], // 单据类型
-          businessType: [{ required: true, message: '业务类型不能为空', trigger: 'change' }], // 业务类型
-          cargoOwnerType: [{ required: true, message: '货主类型不能为空', trigger: 'change' }], // 货主类型
-          stockOrgName: [{ required: true, message: '库存组织不能为空', trigger: 'change' }], // 库存组织
-          inventoryDirection: [{ required: true, message: '库存方向不能为空', trigger: 'change' }], // 库存方向
-          date: [{ required: true, message: '日期不能为空', trigger: 'blur' }], // 日期
-          transferInDepartment: [{ required: true, message: '调入部门不能为空', trigger: 'change' }] // 调入部门
+export default {
+  name: 'ScmOtherOutboundAdd',
+  data() {
+    return {
+      viewTitle: '',
+      dialogStatus: 'add',
+      index: 0,
+      // 明细表数据
+      tableData: [],
+      // 下拉框
+      billType_list: [], // 单据类型
+      customer_list: [], // 客户
+      businessType_list: [], // 业务类型
+      cargoType_list: [], // 货主类型
+      billState_list: [], // 单据状态
+      inventory_list: [], // 库存方向
+      company_list: [], // 单位
+      mnum_list: [], // 物料编码
+      pickingDep_list: [], // 领料部门
+      stockOrgName_list: [], // 库存组织
+      claimOrgName_list: [], // 领用组织
+      invenGroupName_list: [], // 库存组
+      transferIn_list: [], // 调入部门
+      warehouse_list: [], // 发货仓库
+      // 级联列表
+      dataArr: [],
+      refreshItem: 0, // 级联列表key值
+      options: [], // 级联列表选项
+      props: { // props传值
+        value: 'sid',
+        label: 'name',
+        children: 'children',
+        multiple: true
+      },
+      // 组织(单选)
+      orgProps: {
+        value: 'sid',
+        label: 'name',
+        children: 'children',
+        checkStrictly: true
+      },
+      orgOptions: [],
+      orgArr: [],
+      formobj: {
+        sid: '', // 一条数据的sid
+        userSid: window.sessionStorage.getItem('userSid'), // 用户人sid
+        scmOtherOutboundDto: {
+          orgSid: window.sessionStorage.getItem('orgSid'), // 部门sid
+          orgName: window.sessionStorage.getItem('departmentName'), // 部门名称
+          makeListName: window.sessionStorage.getItem('name'),
+          makeListDate: '', // 制单日期
+          billNo: '', // 单据编号
+          billState: '', // 单据状态
+          billType: '', // 单据类型
+          businessType: '', // 业务类型
+          cargoOwner: '', // 货主
+          cargoOwnerSid: '', // 货主sid
+          cargoOwnerType: '', // 货主类型
+          claimOrgName: '', // 领用组织
+          claimOrgSid: '', // 领用组织sid
+          customerName: '', // 客户名称
+          customerSid: '', // 客户sid
+          date: '', //  日期
+          invenGroupName: '', //  库存组
+          invenGroupSid: '', //  库存组sid
+          inventoryDirection: '', //  库存方向
+          pickingDepName: '', //  领料部门
+          pickingDepSid: '', //  领料部门sid
+          pickingPerson: '', //  领料人
+          pickingPersonSid: '', //  领料人sid
+          stockOrgName: '', //  库存组织
+          stockOrgSid: '', //  库存组织sid
+          transferInDepartment: '', //  调入部门
+          transferInDepartmentSid: '', // 调入部门sid
+          warehouseKeeperName: '', // 仓管员
+          warehouseKeeperSid: '', //  仓管员sid
+          remarks: '' // 备注
         },
-        submitdisabled: false
-      }
-    },
-    created() {
-      this.getBillType() //单据类型
-      this.getCustomer() //客户
-      this.getBillState() //单据状态
-      this.getCargoType() //货主类型
-      this.getBusinessType() //业务类型
-      this.getInventory() //库存方向
-      this.getCompany() //单位
-      this.getBuMen() //部门
-      this.getWlxx() //物料编码
-      this.getWarehouse() // 发货仓库
-      this.getOrg()
-    },
-    methods: {
-      //下拉框-单据类型 changeBillType
-      getBillType() {
-        req.pullDown({
-          type: 'billsType'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.billType_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
-        })
+        scmOtherOutboundDetailDtoList: [{
+          batchNum: '', // 批号
+          billSid: '', // 单据sid
+          cargoOwner: '', // 货主
+          company: '', // 单位
+          deliveryAmount: '', // 出库金额
+          deliveryWarehouse: '', // 发货仓库
+          logisticsCustomer: '', // 物流客户
+          mname: '', // 物料名称
+          mnum: '', // 物料编码
+          model: '', // 规格型号
+          position: '', // 仓位
+          // productGroupName: '', //产品组
+          // productGroupSid: '', //产品组sid
+          realHairNum: '', // 实发数量
+          shippingUnit: '', // 出货单价？？
+          year: '' // 年度
+        }]
       },
-      // dictKey: "01"; dictType: "invoicingNature"
-      changeBillType(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.billType_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
-          }
-        })
-        this.formobj.scmOtherOutboundDto.billType = bb.name
-        // this.formobj.scmOtherOutboundDto.billType = bb.sid
-        console.log('name', this.formobj.scmOtherOutboundDto.billType)
+      rules: {
+        billType: [{ required: true, message: '单据类型不能为空', trigger: 'change' }], // 单据类型
+        businessType: [{ required: true, message: '业务类型不能为空', trigger: 'change' }], // 业务类型
+        cargoOwnerType: [{ required: true, message: '货主类型不能为空', trigger: 'change' }], // 货主类型
+        stockOrgName: [{ required: true, message: '库存组织不能为空', trigger: 'change' }], // 库存组织
+        inventoryDirection: [{ required: true, message: '库存方向不能为空', trigger: 'change' }], // 库存方向
+        date: [{ required: true, message: '日期不能为空', trigger: 'blur' }], // 日期
+        transferInDepartment: [{ required: true, message: '调入部门不能为空', trigger: 'change' }] // 调入部门
       },
-      //可模糊检索下拉框-客户
-      getCustomer() {
-        req.kehu({}).then((res) => {
-          if (res.code === '200') {
-            this.customer_list = res.data
-            console.log('下拉框请求11133', res.data)
+      submitdisabled: false
+    }
+  },
+  created() {
+    this.getBillType() // 单据类型
+    this.getCustomer() // 客户
+    this.getBillState() // 单据状态
+    this.getCargoType() // 货主类型
+    this.getBusinessType() // 业务类型
+    this.getInventory() // 库存方向
+    this.getCompany() // 单位
+    this.getBuMen() // 部门
+    this.getWlxx() // 物料编码
+    this.getWarehouse() // 发货仓库
+    this.getOrg()
+  },
+  methods: {
+    // 下拉框-单据类型 changeBillType
+    getBillType() {
+      req.pullDown({
+        type: 'billsType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.billType_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
+    changeBillType(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.billType_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-      },
+        }
+      })
+      this.formobj.scmOtherOutboundDto.billType = bb.name
+      console.log('name', this.formobj.scmOtherOutboundDto.billType)
+    },
+    // 可模糊检索下拉框-客户
+    getCustomer() {
+      req.kehu({}).then((res) => {
+        if (res.code === '200') {
+          this.customer_list = res.data
+          console.log('下拉框请求11133', res.data)
+        }
+      })
+    },
 
-      changeCustomer(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.customer_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.sid == value) {
-            bb = {
-              // type: e.dictType,
-              name: e.customerName,
-              // key: e.dictKey,
-              sid: e.sid
-            }
-          }
-        })
-        this.formobj.scmOtherOutboundDto.customerName = bb.name
-        this.formobj.scmOtherOutboundDto.customerSid = bb.sid
-        console.log('name', this.formobj.scmOtherOutboundDto.customerName)
-      },
-      // 级联列表 部门 OrgName
-      getBuMen() {
-        req.salesDepName().then((res) => {
-          if (res.code === '200') {
-            this.options = res.data
-            console.log('请求到的级联列表', this.options)
-            this.BuMen0(this.options)
+    changeCustomer(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.customer_list.forEach((e) => {
+        if (e.sid === value) {
+          bb = {
+            name: e.name,
+            sid: e.sid
           }
-        })
-      },
-      BuMen0(data) {
-        data.forEach((e) => {
-          if (e.children.length != 0) {
+        }
+      })
+      this.formobj.scmOtherOutboundDto.customerName = bb.name
+      this.formobj.scmOtherOutboundDto.customerSid = bb.sid
+      console.log('name', this.formobj.scmOtherOutboundDto.customerName)
+    },
+    // 级联列表 部门 OrgName
+    getBuMen() {
+      req.salesDepName().then((res) => {
+        if (res.code === '200') {
+          this.options = res.data
+          console.log('请求到的级联列表', this.options)
+          this.BuMen0(this.options)
+        }
+      })
+    },
+    BuMen0(data) {
+      data.forEach((e) => {
+        if (e.children) {
+          if (e.children.length !== 0) {
             this.BuMen0(e.children)
           } else {
             delete e.children
             this.dataArr.push(e)
             return
           }
+        }
+      })
+    },
+    // 领料部门
+    pickingDepChange(e) {
+      console.log('选中结果：' + JSON.stringify(e))
+      var result = ''
+      var result_Sid = ''
+      if (e.length > 0) {
+        // 循环多选项
+        e.forEach((item) => {
+          var last_id = item[item.length - 1]
+          // 循环查找名字
+          this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
+          this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          result = result + this.select_temp_Name + ','
+          result_Sid = result_Sid + this.select_temp_Sid + ','
         })
-      },
-      // 领料部门
-      pickingDepChange(e) {
-        console.log('选中结果：' + JSON.stringify(e))
-        var result = ''
-        var result_Sid = ''
-        if (e.length > 0) {
-          // 循环多选项
-          e.forEach((item) => {
-            var last_id = item[item.length - 1]
-            // 循环查找名字
-            this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
-            this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            result = result + this.select_temp_Name + ','
-            result_Sid = result_Sid + this.select_temp_Sid + ','
-          })
+      }
+      if (result !== '') {
+        result = result.substring(0, result.length - 1)
+      }
+      if (result_Sid !== '') {
+        result_Sid = result_Sid.substring(0, result_Sid.length - 1)
+      }
+      this.formobj.scmOtherOutboundDto.pickingDepName = result
+      this.formobj.scmOtherOutboundDto.pickingDepSid = result_Sid
+      console.log('选中名称：' + this.formobj.scmOtherOutboundDto.pickingDepName, this.formobj.scmOtherOutboundDto.pickingDepSid)
+    },
+
+    // 调入部门
+    transferInChange(e) {
+      console.log('选中结果：' + JSON.stringify(e))
+      var result = ''
+      var result_Sid = ''
+      if (e.length > 0) {
+        // 循环多选项
+        e.forEach((item) => {
+          var last_id = item[item.length - 1]
+          // 循环查找名字
+          this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
+          this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          result = result + this.select_temp_Name + ','
+          result_Sid = result_Sid + this.select_temp_Sid + ','
+        })
+      }
+      if (result !== '') {
+        result = result.substring(0, result.length - 1)
+      }
+      if (result_Sid !== '') {
+        result_Sid = result_Sid.substring(0, result_Sid.length - 1)
+      }
+      this.formobj.scmOtherOutboundDto.transferInDepartment = result
+      this.formobj.scmOtherOutboundDto.transferInDepartmentSid = result_Sid
+      console.log('选中名称：' + this.formobj.scmOtherOutboundDto.transferInDepartment, result_Sid)
+    },
+    // 库存组
+    salesDepNameChange(e) {
+      console.log('选中结果：' + JSON.stringify(e))
+      var result = ''
+      var result_Sid = ''
+      if (e.length > 0) {
+        // 循环多选项
+        e.forEach((item) => {
+          var last_id = item[item.length - 1]
+          // 循环查找名字
+          this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
+          this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          result = result + this.select_temp_Name + ','
+          result_Sid = result_Sid + this.select_temp_Sid + ','
+        })
+      }
+      if (result !== '') {
+        result = result.substring(0, result.length - 1)
+      }
+      if (result_Sid !== '') {
+        result_Sid = result_Sid.substring(0, result_Sid.length - 1)
+      }
+      this.formobj.scmOtherOutboundDto.invenGroupName = result
+      this.formobj.scmOtherOutboundDto.invenGroupSid = result_Sid
+      console.log('选中名称：' + this.formobj.scmOtherOutboundDto.invenGroupName, this.formobj.scmOtherOutboundDto.invenGroupSid)
+    },
+
+    // --- 循环查询
+    findOrgId(id, options) {
+      for (var i = 0; i < options.length; i++) {
+        if (id === options[i].sid) {
+          this.select_temp_Name = options[i].name // 保存找到的内容
+          this.select_temp_Sid = options[i].sid
+          return true
+        } else {
+          // 判断是否最后一级
+          if (options[i].children !== undefined && options[i].children !== null) {
+            // 不是的话查询下一级
+            if (this.findOrgId(id, options[i].children)) {
+              return true
+            }
+          }
         }
-        if (result !== '') {
-          result = result.substring(0, result.length - 1)
+      }
+    },
+    // 组织(单选)
+    getOrg() {
+      req.getOrg().then((res) => {
+        if (res.code === '200') {
+          this.stockOrgName_list = res.data
+          this.claimOrgName_list = res.data
         }
-        if (result_Sid !== '') {
-          result_Sid = result_Sid.substring(0, result_Sid.length - 1)
+      })
+    },
+    stockOrgNameChange(value) {
+      console.log('触发下拉框按钮', value)
+      let bb = {}
+      this.stockOrgName_list.forEach((e) => {
+        if (e.name === value) {
+          bb = {
+            name: e.name,
+            key: e.id,
+            sid: e.sid
+          }
         }
-        this.formobj.scmOtherOutboundDto.pickingDepName = result
-        this.formobj.scmOtherOutboundDto.pickingDepSid = result_Sid
-        console.log('选中名称：' + this.formobj.scmOtherOutboundDto.pickingDepName, this.formobj.scmOtherOutboundDto.pickingDepSid)
-      },
-
-      // 调入部门
-      transferInChange(e) {
-        console.log('选中结果：' + JSON.stringify(e))
-        var result = ''
-        var result_Sid = ''
-        if (e.length > 0) {
-          // 循环多选项
-          e.forEach((item) => {
-            var last_id = item[item.length - 1]
-            // 循环查找名字
-            this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
-            this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            result = result + this.select_temp_Name + ','
-            result_Sid = result_Sid + this.select_temp_Sid + ','
-          })
+      })
+      this.formobj.scmOtherOutboundDto.stockOrgName = bb.name
+      this.formobj.scmOtherOutboundDto.stockOrgSid = bb.sid
+      console.log('name', this.formobj.scmOtherOutboundDto.stockOrgName, this.formobj.scmOtherOutboundDto.stockOrgSid)
+    },
+    claimOrgNameChange(value) {
+      console.log('触发下拉框按钮', value)
+      let bb = {}
+      this.claimOrgName_list.forEach((e) => {
+        if (e.name === value) {
+          bb = {
+            name: e.name,
+            key: e.id,
+            sid: e.sid
+          }
         }
-        if (result !== '') {
-          result = result.substring(0, result.length - 1)
+      })
+      this.formobj.scmOtherOutboundDto.claimOrgName = bb.name
+      this.formobj.scmOtherOutboundDto.claimOrgSid = bb.sid
+      console.log('name', this.formobj.scmOtherOutboundDto.claimOrgName, this.formobj.scmOtherOutboundDto.claimOrgSid)
+    },
+    // 下拉框-业务类型 changeBillType
+    getBusinessType() {
+      req.pullDown({
+        type: 'businessType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.businessType_list = res.data
+          console.log('下拉框请求111', res.data)
         }
-        if (result_Sid !== '') {
-          result_Sid = result_Sid.substring(0, result_Sid.length - 1)
+      })
+    },
+    changeBusinessType(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.businessType_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
+          }
         }
-        this.formobj.scmOtherOutboundDto.transferInDepartment = result
-        this.formobj.scmOtherOutboundDto.transferInDepartmentSid = result_Sid
-        console.log('选中名称：' + this.formobj.scmOtherOutboundDto.transferInDepartment, result_Sid)
-      },
-      //库存组
-      salesDepNameChange(e) {
-        console.log('选中结果：' + JSON.stringify(e))
-        var result = ''
-        var result_Sid = ''
-        if (e.length > 0) {
-          // 循环多选项
-          e.forEach((item) => {
-            var last_id = item[item.length - 1]
-            // 循环查找名字
-            this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
-            this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            result = result + this.select_temp_Name + ','
-            result_Sid = result_Sid + this.select_temp_Sid + ','
-          })
+      })
+      this.formobj.scmOtherOutboundDto.businessType = bb.name
+      console.log('name', this.formobj.scmOtherOutboundDto.billType)
+    },
+    // 下拉框-货主类型
+    getCargoType() {
+      req.pullDown({
+        type: 'cargoOwnerType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.cargoType_list = res.data
+          console.log('下拉框请求111', res.data)
         }
-        if (result !== '') {
-          result = result.substring(0, result.length - 1)
+      })
+    },
+    changeCargoType(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.cargoType_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
+          }
         }
-        if (result_Sid !== '') {
-          result_Sid = result_Sid.substring(0, result_Sid.length - 1)
+      })
+      this.formobj.scmOtherOutboundDto.cargoOwnerType = bb.name
+      this.formobj.scmOtherOutboundDto.cargoOwnerSid = bb.sid
+      console.log('name', this.formobj.scmOtherOutboundDto.cargoOwnerType, this.formobj.scmOtherOutboundDto.cargoOwnerSid)
+    },
+    // 下拉框-单据状态
+    getBillState() {
+      req.pullDown({
+        type: 'billState'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.billState_list = res.data
+          console.log('下拉框请求111', res.data)
         }
-        this.formobj.scmOtherOutboundDto.invenGroupName = result
-        this.formobj.scmOtherOutboundDto.invenGroupSid = result_Sid
-        console.log('选中名称：' + this.formobj.scmOtherOutboundDto.invenGroupName, this.formobj.scmOtherOutboundDto.invenGroupSid)
-      },
-
-      // --- 循环查询
-      findOrgId(id, options) {
-        for (var i = 0; i < options.length; i++) {
-          if (id == options[i].sid) {
-            this.select_temp_Name = options[i].name // 保存找到的内容
-            this.select_temp_Sid = options[i].sid
-            return true
-          } else {
-            // 判断是否最后一级
-            if (options[i].children !== undefined) {
-              // 不是的话查询下一级
-              if (this.findOrgId(id, options[i].children)) {
-                return true
-              }
-            }
+      })
+    },
+    changeBillState(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.billState_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
         }
-      },
-      // 组织(单选)
-      getOrg() {
-        req.getOrg().then((res) => {
-          if (res.code === '200') {
-            this.stockOrgName_list = res.data
-            this.claimOrgName_list = res.data
+      })
+      this.formobj.scmOtherOutboundDto.billState = bb.name
+      console.log('name', this.formobj.scmOtherOutboundDto.billState)
+    },
+    // 下拉框-库存方向
+    getInventory() {
+      req.pullDown({
+        type: 'inventoryDirection'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.inventory_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
+    changeInventory(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.inventory_list.forEach((e) => {
+        // eslint-disable-next-line eqeqeq
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-      },
-      stockOrgNameChange(value) {
-        console.log('触发下拉框按钮',value)
-        let bb = {}
-        this.stockOrgName_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.name == value) {
-            bb = {
-              name: e.name,
-              key: e.id,
-              sid: e.sid
-            }
+        }
+      })
+      this.formobj.scmOtherOutboundDto.inventoryDirection = bb.name
+      console.log('name', this.formobj.scmOtherOutboundDto.inventoryDirection)
+    },
+    // 下拉框-单位 getCompany
+    getCompany() {
+      req.pullDown({
+        type: 'basicUnit'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.company_list = res.data
+          console.log('下拉框请求111', res.data)
+        }
+      })
+    },
+    changeCompany(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.company_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-        this.formobj.scmOtherOutboundDto.stockOrgName = bb.name
-        this.formobj.scmOtherOutboundDto.stockOrgSid = bb.sid
-        console.log('name', this.formobj.scmOtherOutboundDto.stockOrgName, this.formobj.scmOtherOutboundDto.stockOrgSid)
-      },
-      claimOrgNameChange(value) {
-        console.log('触发下拉框按钮',value)
-        let bb = {}
-        this.claimOrgName_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.name == value) {
-            bb = {
-              name: e.name,
-              key: e.id,
-              sid: e.sid
-            }
+        }
+      })
+      this.formobj.scmOtherOutboundDetailDtoList.company = bb.name
+      console.log('name', this.formobj.scmOtherOutboundDetailDtoList.company)
+    },
+    // 下拉框-物料编码
+    getWlxx() {
+      req.getWlxx({}).then(res => {
+        this.mnum_list = res.data
+      })
+    },
+    changeMnum(row) {
+      req.getWlxxInfo().then(res => {
+        var data = res.data
+        for (var i = 0; i < data.length; i++) {
+          if (data[i].mNum === row.mnum) {
+            row.mname = data[i].mName
+            row.model = data[i].model
+            row.company = data[i].unit
+            row.remarks = data[i].remarks
           }
-        })
-        this.formobj.scmOtherOutboundDto.claimOrgName = bb.name
-        this.formobj.scmOtherOutboundDto.claimOrgSid = bb.sid
-        console.log('name', this.formobj.scmOtherOutboundDto.claimOrgName, this.formobj.scmOtherOutboundDto.claimOrgSid)
-      },
+        }
+      })
+    },
+    // 下拉框-仓库
+    getWarehouse() {
+      req.getWarehouse().then((res) => {
+        if (res.code === '200') {
+          this.warehouse_list = res.data
+        }
+      })
+    },
+    changeWarehouse(value, row) {
+      for (var i = 0; i < this.warehouse_list.length; i++) {
+        if (this.warehouse_list[i].warehouseName === row.deliveryWarehouse) {
+          row.deliveryWarehouse = this.warehouse_list[i].warehouseName
+        }
+      }
+    },
 
-      // org0(data) {
-      //   data.forEach((e) => {
-      //     if (e.children.length != 0) {
-      //       this.org0(e.children)
-      //     } else {
-      //       delete e.children
-      //       this.orgArr.push(e)
-      //       return
-      //     }
-      //   })
-      // },
-      // //领用组织
-      // claimOrgNameChange(e) {
-      //   console.log('选中结果：' + JSON.stringify(e))
-      //   var result = ''
-      //   var result_Sid = ''
-      //   if (e.length > 0) {
-      //     // 循环多选项
-      //     e.forEach((item) => {
-      //       var last_id = item[item.length - 1]
-      //       // 循环查找名字
-      //       this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
-      //       this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-      //       this.gainOrgId(last_id, this.orgOptions)
-      //       result = result + this.select_temp_Name + ','
-      //       result_Sid = result_Sid + this.select_temp_Sid + ','
-      //     })
-      //   }
-      //   if (result !== '') {
-      //     result = result.substring(0, result.length - 1)
-      //   }
-      //   if (result_Sid !== '') {
-      //     result_Sid = result_Sid.substring(0, result_Sid.length - 1)
-      //   }
-      //   this.formobj.scmOtherOutboundDto.claimOrgName = result
-      //   this.formobj.scmOtherOutboundDto.claimOrgSid = result_Sid
-      //   console.log('选中名称：' + this.formobj.scmOtherOutboundDto.orgName, this.formobj.scmOtherOutboundDto.orgSid)
-      // },
-      //
-      // //库存组织
-      // stockOrgNameChange(e) {
-      //   console.log('选中结果：' + JSON.stringify(e))
-      //   var result = ''
-      //   var result_Sid = ''
-      //   if (e.length > 0) {
-      //     // 循环多选项
-      //     e.forEach((item) => {
-      //       var last_id = item[item.length - 1]
-      //       // 循环查找名字
-      //       this.select_temp_Name = '' // 临时遍历，用来保存选中结果(组织名称)
-      //       this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-      //       this.gainOrgId(last_id, this.orgOptions)
-      //       result = result + this.select_temp_Name + ','
-      //       result_Sid = result_Sid + this.select_temp_Sid + ','
-      //     })
-      //   }
-      //   if (result !== '') {
-      //     result = result.substring(0, result.length - 1)
-      //   }
-      //   if (result_Sid !== '') {
-      //     result_Sid = result_Sid.substring(0, result_Sid.length - 1)
-      //   }
-      //   this.formobj.scmOtherOutboundDto.stockOrgName = result
-      //   this.formobj.scmOtherOutboundDto.stockOrgSid = result_Sid
-      //   console.log('选中名称：' + this.formobj.scmOtherOutboundDto.orgName, result_Sid)
-      // },
-      // // --- 循环查询
-      // gainOrgId(id, orgOptions) {
-      //   for (var i = 0; i < orgOptions.length; i++) {
-      //     if (orgOptions[i].sid) {
-      //       this.select_temp_Name = orgOptions[i].name // 保存找到的内容
-      //       this.select_temp_Sid = orgOptions[i].sid
-      //       return true
-      //     } else {
-      //       // 判断是否最后一级
-      //       if (orgOptions[i].children !== undefined) {
-      //         // 不是的话查询下一级
-      //         if (this.gainOrgId(id, orgOptions[i].children)) {
-      //           return true
-      //         }
-      //       }
-      //     }
-      //   }
-      // },
+    // 明细表添加一行数据
+    addtableData() {
+      this.formobj.scmOtherOutboundDetailDtoList.push({
+        batchNum: '', // 批号
+        billSid: '', // 单据sid
+        cargoOwner: '', // 货主
+        company: '', // 单位
+        deliveryAmount: '', // 出库金额
+        deliveryWarehouse: '', // 发货仓库
+        logisticsCustomer: '', // 物流客户
+        mname: '', // 物料名称
+        mnum: '', // 物料编码
+        model: '', // 规格型号
+        position: '', // 仓位
+        // productGroupName: '', //产品组
+        // productGroupSid: '', //产品组sid
+        realHairNum: '', // 实发数量
+        shippingUnit: '', // 出货单价？？
+        year: '' // 年度
+      })
+    },
+    // 删除一行
+    dataDelete(index, row) {
+      this.formobj.scmOtherOutboundDetailDtoList.splice(index, 1)
+    },
 
-      //下拉框-业务类型 changeBillType
-      getBusinessType() {
-        req.pullDown({
-          type: 'businessType'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.businessType_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
-        })
-      },
-      // dictKey: "01"; dictType: "invoicingNature"
-      changeBusinessType(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.businessType_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
-          }
-        })
-        this.formobj.scmOtherOutboundDto.businessType = bb.name
-        // this.formobj.scmOtherOutboundDto.billType = bb.sid
-        console.log('name', this.formobj.scmOtherOutboundDto.billType)
-      },
-      //下拉框-货主类型
-      getCargoType() {
-        req.pullDown({
-          type: 'cargoOwnerType'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.cargoType_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
-        })
-      },
-      changeCargoType(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.cargoType_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
-          }
-        })
-        this.formobj.scmOtherOutboundDto.cargoOwnerType = bb.name
-        this.formobj.scmOtherOutboundDto.cargoOwnerSid = bb.sid
-        console.log('name', this.formobj.scmOtherOutboundDto.cargoOwnerType, this.formobj.scmOtherOutboundDto.cargoOwnerSid)
-      },
-      // 下拉框-单据状态
-      getBillState() {
-        req.pullDown({
-          type: 'billState'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.billState_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
-        })
-      },
-      changeBillState(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.billState_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
+    // 合计
+    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) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
             }
+          }, 0)
+          switch (column.property) { // column.property可以匹配它的每一列的命名， 然后赋值
+            case 'realHairNum':
+              sums[index] += ' ' // 实发数量
+              break
+            case
+            'shippingUnit':
+              sums[index] += ' 元' // 出货单价
+              break
+            case
+            'deliveryAmount':
+              sums[index] += ' 元' // 出库金额
+              break
+            default:
+              sums[index] = ''
+              break
           }
-        })
-        this.formobj.scmOtherOutboundDto.billState = bb.name
-        // this.formobj..scmOtherOutboundDto.billState = bb.sid
-        console.log('name', this.formobj.scmOtherOutboundDto.billState)
-      },
-      // 下拉框-库存方向
-      getInventory() {
-        req.pullDown({
-          type: 'inventoryDirection'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.inventory_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
-        })
-      },
-      changeInventory(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.inventory_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
+        }
+      })
+      return sums
+    },
+
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj.sid = ''
+      this.formobj.scmOtherOutboundDto = {}
+      this.formobj.scmOtherOutboundDetailDtoList = [{}]
+      this.pickingDep_list = [] // 领料部门
+      this.stockOrgName_list = [] // 库存组织
+      this.claimOrgName_list = [] // 领用组织
+      this.invenGroupName_list = [] // 库存组
+      this.transferIn_list = [] // 调入部门
+      this.refreshItem++
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    },
+    showAdd() {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.dialogStatus = 'add'
+      this.viewTitle = '【新增】其他出库单'
+    },
+    showEdit(sid, row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.dialogStatus = 'edit'
+      this.viewTitle = '【编辑】其他出库单'
+      const _this = this
+      req.fetchBySid(sid)
+        .then(resp => {
+          const data = resp.data
+          _this.formobj.sid = sid // SID
+          const obj = {
+            makeListDate: data.date,
+            makeListName: window.sessionStorage.getItem('name'),
+            billNo: data.billNo,
+            billType: data.billType,
+            customerSid: data.customerSid,
+            customerName: data.customerName,
+            pickingDepSid: data.pickingDepSid,
+            pickingDepName: data.pickingDepName,
+            businessType: data.businessType,
+            cargoOwnerType: data.cargoOwnerType,
+            stockOrgSid: data.stockOrgSid,
+            stockOrgName: data.stockOrgName,
+            pickingPersonSid: data.pickingPersonSid,
+            pickingPerson: data.pickingPerson,
+            cargoOwnerSid: data.cargoOwnerSid,
+            cargoOwner: data.cargoOwner,
+            claimOrgSid: data.claimOrgSid,
+            claimOrgName: data.claimOrgName,
+            warehouseKeeperSid: data.warehouseKeeperSid,
+            warehouseKeeperName: data.warehouseKeeperName,
+            billState: data.billState,
+            inventoryDirection: data.inventoryDirection,
+            invenGroupSid: data.invenGroupSid,
+            invenGroupName: data.invenGroupName,
+            date: data.date,
+            transferInDepartment: data.transferInDepartment,
+            transferInDepartmentSid: data.transferInDepartmentSid,
+            remarks: data.remarks
           }
+          this.formobj.scmOtherOutboundDto = obj
+          this.pickingDep_list = data.pickingDepSid // 领料部门
+          this.stockOrgName_list = data.stockOrgSid // 库存组织
+          this.claimOrgName_list = data.claimOrgSid // 领用组织
+          this.invenGroupName_list = data.invenGroupSid // 库存组
+          this.transferIn_list = data.transferInDepartmentSid // 调入部门
+          // 明细表
+          _this.formobj.scmOtherOutboundDetailDtoList = data.scmOtherOutboundDetailVoList
         })
-        this.formobj.scmOtherOutboundDto.inventoryDirection = bb.name
-        // this.formobj.scmOtherOutboundDto.inventoryDirection = bb.sid
-        console.log('name', this.formobj.scmOtherOutboundDto.inventoryDirection)
-      },
-      //下拉框-单位 getCompany
-      getCompany() {
-        req.pullDown({
-          type: 'basicUnit'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.company_list = res.data
-            console.log('下拉框请求111', res.data)
-          }
+        .catch(e => {
+          this.formobj = row
         })
-      },
-      changeCompany(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.company_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.dictKey == value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
-          }
-        })
-        this.formobj.scmOtherOutboundDetailDtoList.company = bb.name
-        console.log('name', this.formobj.scmOtherOutboundDetailDtoList.company)
-      },
-      //下拉框-物料编码
-      getWlxx() {
-        req.getWlxx({}).then(res => {
-          this.mnum_list = res.data
+    },
+
+    saveAdd() {
+      const _this = this
+      var table_mNum = ''
+      this.formobj.scmOtherOutboundDetailDtoList.forEach((item) => {
+        table_mNum = item.mnum
+      })
+      if (table_mNum === '') {
+        this.$message({
+          type: 'warning',
+          message: '请填写货物明细表'
         })
-      },
-      changeMnum(row) {
-        req.getWlxxInfo().then(res => {
-          var data = res.data
-          for (var i = 0; i < data.length; i++) {
-            if (data[i].mNum === row.mnum) {
-              row.mname = data[i].mName
-              row.model = data[i].model
-              row.company = data[i].unit
-              row.remarks = data[i].remarks
+        return false
+      }
+      this.$refs['form_obj'].validate(valid => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveAdd(this.formobj).then(resp => {
+            this.submitdisabled = false
+            console.log(resp)
+            if (resp.code === '200') {
+              this.$notify({
+                title: '提示',
+                message: '添加成功',
+                type: 'success',
+                duration: 2000
+              })
+              _this.$message({ showClose: true, type: 'success', message: resp.msg })
+              _this.handleReturn('true')
             }
-          }
-        })
-      },
-      //下拉框-仓库
-      getWarehouse() {
-        req.getWarehouse().then((res) => {
-          if (res.code === '200') {
-            this.warehouse_list = res.data
-          }
-        })
-      },
-      changeWarehouse(value, row) {
-        for (var i = 0; i < this.warehouse_list.length; i++) {
-          if (this.warehouse_list[i].warehouseName === row.deliveryWarehouse) {
-            row.deliveryWarehouse = this.warehouse_list[i].warehouseName
-          }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
         }
-      },
+      })
+    },
 
-      // 明细表添加一行数据
-      addtableData() {
-        this.formobj.scmOtherOutboundDetailDtoList.push({
-          batchNum: '', //批号
-          billSid: '', //单据sid
-          cargoOwner: '', //货主
-          company: '', //单位
-          deliveryAmount: '', //出库金额
-          deliveryWarehouse: '', // 发货仓库
-          logisticsCustomer: '', //物流客户
-          mname: '', // 物料名称
-          mnum: '', //物料编码
-          model: '', //规格型号
-          position: '', //仓位
-          // productGroupName: '', //产品组
-          // productGroupSid: '', //产品组sid
-          realHairNum: '', //实发数量
-          shippingUnit: '',  //出货单价？？
-          year: '' //年度
+    saveEdit() {
+      // Start 领料部门字符串赋值
+      var pickingDep_Sid = ''
+      if (this.pickingDep_list.length > 0) {
+        this.pickingDep_list.forEach((item) => {
+          var last_id = item[item.length - 1]
+          this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          pickingDep_Sid = pickingDep_Sid + this.select_temp_Sid + ','
         })
-      },
-      //删除一行
-      dataDelete(index, row) {
-        this.formobj.scmOtherOutboundDetailDtoList.splice(index, 1)
-      },
+      }
+      if (pickingDep_Sid !== '') {
+        pickingDep_Sid = pickingDep_Sid.substring(0, pickingDep_Sid.length - 1)
+      }
+      this.formobj.scmOtherOutboundDto.pickingDepSid = pickingDep_Sid
+      console.log('重新赋值后的组织结构', this.formobj.scmOtherOutboundDto.pickingDepSid)
+      // End
 
-      //合计
-      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) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            switch (column.property) {  // column.property可以匹配它的每一列的命名， 然后赋值
-              case 'realHairNum':
-                sums[index] += ' ' //实发数量
-                break
-              case
-              'shippingUnit':
-                sums[index] += ' 元' //出货单价
-                break
-              case
-              'deliveryAmount':
-                sums[index] += ' 元' //出库金额
-                break
-              default:
-                sums[index] = ''
-                break
-            }
-          }
+      // Start 库存组织字符串赋值
+      var stockOrg_Sid = ''
+      if (this.stockOrgName_list.length > 0) {
+        this.stockOrgName_list.forEach((item) => {
+          var last_id = item[item.length - 1]
+          this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          stockOrg_Sid = stockOrg_Sid + this.select_temp_Sid + ','
         })
+      }
+      if (stockOrg_Sid !== '') {
+        stockOrg_Sid = stockOrg_Sid.substring(0, stockOrg_Sid.length - 1)
+      }
+      this.formobj.scmOtherOutboundDto.stockOrgSid = stockOrg_Sid
+      console.log('重新赋值后的组织结构', this.formobj.scmOtherOutboundDto.stockOrgSid)
+      // End
 
-        return sums
-      },
-
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.formobj.sid = ''
-        this.formobj.scmOtherOutboundDto = {}
-        this.formobj.scmOtherOutboundDetailDtoList = [{}]
-        this.pickingDep_list = []  //领料部门
-        this.stockOrgName_list = [] //库存组织
-        this.claimOrgName_list = [] //领用组织
-        this.invenGroupName_list = [] //库存组
-        this.transferIn_list = [] //调入部门
-        this.refreshItem++
-        this.$refs['form_obj'].resetFields()
-        this.$emit('doback')
-      },
-      showAdd() {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
+      // Start 领用组织字符串赋值
+      var claimOrg_Sid = ''
+      if (this.claimOrgName_list.length > 0) {
+        this.claimOrgName_list.forEach((item) => {
+          var last_id = item[item.length - 1]
+          this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          claimOrg_Sid = claimOrg_Sid + this.select_temp_Sid + ','
         })
-        this.dialogStatus = 'add'
-        this.viewTitle = '【新增】其他出库单'
-      },
-      showEdit(sid, row) {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
+      }
+      if (claimOrg_Sid !== '') {
+        claimOrg_Sid = claimOrg_Sid.substring(0, claimOrg_Sid.length - 1)
+      }
+      this.formobj.scmOtherOutboundDto.claimOrgSid = claimOrg_Sid
+      console.log('重新赋值后的组织结构', this.formobj.scmOtherOutboundDto.claimOrgSid)
+      // End
+
+      // Start 库存组字符串赋值
+      var invenGroup_Sid = ''
+      if (this.invenGroupName_list.length > 0) {
+        this.invenGroupName_list.forEach((item) => {
+          var last_id = item[item.length - 1]
+          this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          invenGroup_Sid = invenGroup_Sid + this.select_temp_Sid + ','
         })
-        this.dialogStatus = 'edit'
-        this.viewTitle = '【编辑】其他出库单'
-        const _this = this
-        req.fetchBySid(sid)
-          .then(resp => {
-            const data = resp.data
-            _this.formobj.sid = sid // SID
-            const obj = {
-              makeListDate: data.date,
-              makeListName: window.sessionStorage.getItem('name'),
-              billNo: data.billNo,
-              billType: data.billType,
-              customerSid: data.customerSid,
-              customerName: data.customerName,
-              pickingDepSid: data.pickingDepSid,
-              pickingDepName: data.pickingDepName,
-              businessType: data.businessType,
-              cargoOwnerType: data.cargoOwnerType,
-              stockOrgSid: data.stockOrgSid,
-              stockOrgName: data.stockOrgName,
-              pickingPersonSid: data.pickingPersonSid,
-              pickingPerson: data.pickingPerson,
-              cargoOwnerSid: data.cargoOwnerSid,
-              cargoOwner: data.cargoOwner,
-              claimOrgSid: data.claimOrgSid,
-              claimOrgName: data.claimOrgName,
-              warehouseKeeperSid: data.warehouseKeeperSid,
-              warehouseKeeperName: data.warehouseKeeperName,
-              billState: data.billState,
-              inventoryDirection: data.inventoryDirection,
-              invenGroupSid: data.invenGroupSid,
-              invenGroupName: data.invenGroupName,
-              date: data.date,
-              transferInDepartment: data.transferInDepartment,
-              transferInDepartmentSid: data.transferInDepartmentSid,
-              remarks: data.remarks
-            }
-            this.formobj.scmOtherOutboundDto = obj
-            this.pickingDep_list = data.pickingDepSid//领料部门
-            this.stockOrgName_list = data.stockOrgSid//库存组织
-            this.claimOrgName_list = data.claimOrgSid//领用组织
-            this.invenGroupName_list = data.invenGroupSid//库存组
-            this.transferIn_list = data.transferInDepartmentSid//调入部门
-            //明细表
-            _this.formobj.scmOtherOutboundDetailDtoList = data.scmOtherOutboundDetailVoList
-          })
-          .catch(e => {
-            this.formobj = row
-          })
-      },
+      }
+      if (invenGroup_Sid !== '') {
+        invenGroup_Sid = invenGroup_Sid.substring(0, invenGroup_Sid.length - 1)
+      }
+      this.formobj.scmOtherOutboundDto.invenGroupSid = invenGroup_Sid
+      console.log('重新赋值后的组织结构', this.formobj.scmOtherOutboundDto.invenGroupSid)
+      // End
 
-      saveAdd() {
-        const _this = this
-        var table_mNum = ''
-        this.formobj.scmOtherOutboundDetailDtoList.forEach((item) => {
-          table_mNum = item.mnum
+      // Start 调入部门字符串赋值
+      var transferIn_Sid = ''
+      if (this.transferIn_list.length > 0) {
+        this.transferIn_list.forEach((item) => {
+          var last_id = item[item.length - 1]
+          this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          transferIn_Sid = transferIn_Sid + this.select_temp_Sid + ','
         })
-        if (table_mNum === '') {
-          this.$message({
-            type: 'warning',
-            message: '请填写货物明细表'
+      }
+      if (transferIn_Sid !== '') {
+        transferIn_Sid = transferIn_Sid.substring(0, transferIn_Sid.length - 1)
+      }
+      this.formobj.scmOtherOutboundDto.transferInDepartmentSid = transferIn_Sid
+      console.log('重新赋值后的组织结构', this.formobj.scmOtherOutboundDto.transferInDepartmentSid)
+      // End
+      const _this = this
+      this.$refs['form_obj'].validate(valid => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveEdit(this.formobj, this.formobj.sid).then(resp => {
+            this.submitdisabled = false
+            _this.$message({ showClose: true, type: 'success', message: resp.msg })
+            _this.handleReturn('true')
+          }).catch(() => {
+            this.submitdisabled = false
           })
+        } else {
           return false
         }
-        this.$refs['form_obj'].validate(valid => {
-          if (valid) {
-            this.submitdisabled = true
-            req.saveAdd(this.formobj).then(resp => {
-              this.submitdisabled = false
-              console.log(resp)
-              if (resp.code === '200') {
-                this.$notify({
-                  title: '提示',
-                  message: '添加成功',
-                  type: 'success',
-                  duration: 2000
-                })
-                _this.$message({ showClose: true, type: 'success', message: resp.msg })
-                _this.handleReturn('true')
-              }
-            }).catch(() => {
-              this.submitdisabled = false
-            })
-          } else {
-            return false
-          }
-        })
-      },
-
-      saveEdit() {
-        // Start 领料部门字符串赋值
-        var pickingDep_Sid = ''
-        if (this.pickingDep_list.length > 0) {
-          this.pickingDep_list.forEach((item) => {
-            var last_id = item[item.length - 1]
-            this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            pickingDep_Sid = pickingDep_Sid + this.select_temp_Sid + ','
-          })
-        }
-        if (pickingDep_Sid !== '') {
-          pickingDep_Sid = pickingDep_Sid.substring(0, pickingDep_Sid.length - 1)
-        }
-        this.formobj.scmOtherOutboundDto.pickingDepSid = pickingDep_Sid
-        console.log('重新赋值后的组织结构', this.formobj.scmOtherOutboundDto.pickingDepSid)
-        //End
-
-        // Start 库存组织字符串赋值
-        var stockOrg_Sid = ''
-        if (this.stockOrgName_list.length > 0) {
-          this.stockOrgName_list.forEach((item) => {
-            var last_id = item[item.length - 1]
-            this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            stockOrg_Sid = stockOrg_Sid + this.select_temp_Sid + ','
-          })
-        }
-        if (stockOrg_Sid !== '') {
-          stockOrg_Sid = stockOrg_Sid.substring(0, stockOrg_Sid.length - 1)
-        }
-        this.formobj.scmOtherOutboundDto.stockOrgSid = stockOrg_Sid
-        console.log('重新赋值后的组织结构', this.formobj.scmOtherOutboundDto.stockOrgSid)
-        //End
-
-        // Start 领用组织字符串赋值
-        var claimOrg_Sid = ''
-        if (this.claimOrgName_list.length > 0) {
-          this.claimOrgName_list.forEach((item) => {
-            var last_id = item[item.length - 1]
-            this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            claimOrg_Sid = claimOrg_Sid + this.select_temp_Sid + ','
-          })
-        }
-        if (claimOrg_Sid !== '') {
-          claimOrg_Sid = claimOrg_Sid.substring(0, claimOrg_Sid.length - 1)
-        }
-        this.formobj.scmOtherOutboundDto.claimOrgSid = claimOrg_Sid
-        console.log('重新赋值后的组织结构', this.formobj.scmOtherOutboundDto.claimOrgSid)
-        //End
-
-        // Start 库存组字符串赋值
-        var invenGroup_Sid = ''
-        if (this.invenGroupName_list.length > 0) {
-          this.invenGroupName_list.forEach((item) => {
-            var last_id = item[item.length - 1]
-            this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            invenGroup_Sid = invenGroup_Sid + this.select_temp_Sid + ','
-          })
-        }
-        if (invenGroup_Sid !== '') {
-          invenGroup_Sid = invenGroup_Sid.substring(0, invenGroup_Sid.length - 1)
-        }
-        this.formobj.scmOtherOutboundDto.invenGroupSid = invenGroup_Sid
-        console.log('重新赋值后的组织结构', this.formobj.scmOtherOutboundDto.invenGroupSid)
-        //End
-
-        // Start 调入部门字符串赋值
-        var transferIn_Sid = ''
-        if (this.transferIn_list.length > 0) {
-          this.transferIn_list.forEach((item) => {
-            var last_id = item[item.length - 1]
-            this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            transferIn_Sid = transferIn_Sid + this.select_temp_Sid + ','
-          })
-        }
-        if (transferIn_Sid !== '') {
-          transferIn_Sid = transferIn_Sid.substring(0, transferIn_Sid.length - 1)
-        }
-        this.formobj.scmOtherOutboundDto.transferInDepartmentSid = transferIn_Sid
-        console.log('重新赋值后的组织结构', this.formobj.scmOtherOutboundDto.transferInDepartmentSid)
-        //End
-        const _this = this
-        this.$refs['form_obj'].validate(valid => {
-          if (valid) {
-            this.submitdisabled = true
-            req.saveEdit(this.formobj, this.formobj.sid).then(resp => {
-              this.submitdisabled = false
-              _this.$message({ showClose: true, type: 'success', message: resp.msg })
-              _this.handleReturn('true')
-            }).catch(() => {
-              this.submitdisabled = false
-            })
-          } else {
-            return false
-          }
-        })
-      }
+      })
     }
   }
+}
 </script>
 
 <style scoped>
-  /deep/ .el-table {
-    overflow-x: auto;
-  }
+/deep/ .el-table {
+  overflow-x: auto;
+}
 
-  /deep/ .el-table__header-wrapper,
-  /deep/ .el-table__body-wrapper,
-  /deep/ .el-table__footer-wrapper {
-    overflow: visible;
-  }
+/deep/ .el-table__header-wrapper,
+/deep/ .el-table__body-wrapper,
+/deep/ .el-table__footer-wrapper {
+  overflow: visible;
+}
 
-  /deep/ .el-table::after {
-    position: relative;
-  }
+/deep/ .el-table::after {
+  position: relative;
+}
 
-  /deep/ .el-table--scrollable-x .el-table__body-wrapper {
-    overflow: visible;
-  }
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: visible;
+}
 
-  /* 利用穿透，设置input边框隐藏 */
-  .invoiceadd >>> .el-input__inner {
-    border: 0;
-    border-bottom: 1px solid #e0e3eb !important;
-  }
+/* 利用穿透，设置input边框隐藏 */
+.invoiceadd >>> .el-input__inner {
+  border: 0;
+  border-bottom: 1px solid #e0e3eb !important;
+}
 
-  /* 如果你的 el-input type 设置成textarea ，就要用这个了 */
-  /*.invoiceadd>>>.el-textarea__inner {
-    border: 0;
-    resize: none;!* 这个是去掉 textarea 下面拉伸的那个标志，如下图 *!
-  }*/
-  .invoiceadd >>> .el-form-item__content {
-    margin-left: 0 !important;
-  }
+/* 如果你的 el-input type 设置成textarea ，就要用这个了 */
+/*.invoiceadd>>>.el-textarea__inner {
+  border: 0;
+  resize: none;!* 这个是去掉 textarea 下面拉伸的那个标志，如下图 *!
+}*/
+.invoiceadd >>> .el-form-item__content {
+  margin-left: 0 !important;
+}
 
-  .el-input {
-    width: 230px;
-  }
+.el-input {
+  width: 230px;
+}
 
-  .el-col .el-form-item {
-    margin-bottom: 10px;
-  }
+.el-col .el-form-item {
+  margin-bottom: 10px;
+}
 </style>