diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmmaterial/scmmaterial.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmmaterial/scmmaterial.vue
index 5934e84688..23c29ecdb9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmmaterial/scmmaterial.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmmaterial/scmmaterial.vue
@@ -3,8 +3,7 @@
     <div v-show="viewState == 1">
       <button-bar ref="btnbar" 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-row>
@@ -21,7 +20,7 @@
                 <el-input v-model="queryParams.params.model" placeholder="请输入规格型号" clearable/>
               </el-form-item>
               <el-form-item label="物料分组">
-                <el-select v-model="queryParams.params.mGroup" @change='changemGroup' filterable placeholder="请选择" style="width:200px">
+                <el-select v-model="queryParams.params.mGroup" @change='changemGroup' clearable filterable placeholder="请选择" style="width:200px">
                   <el-option v-for="item in mGroup_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
                   </el-option>
                 </el-select>
@@ -29,25 +28,25 @@
             </el-row>
             <el-row>
               <el-form-item label="数据状态">
-                <el-select v-model="queryParams.params.state" @change='changestate' filterable placeholder="请选择" style="width:200px">
+                <el-select v-model="queryParams.params.state" @change='changestate' clearable filterable placeholder="请选择" style="width:200px">
                   <el-option label="已审核" value="0"/>
                   <el-option label="未审核" value="1"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="禁用状态">
-                <el-select v-model="queryParams.params.isEnable" @change='changeisEnable' filterable placeholder="请选择" style="width:200px">
+                <el-select v-model="queryParams.params.isEnable" @change='changeisEnable' clearable filterable placeholder="请选择" style="width:200px">
                   <el-option label="可用" value="0"/>
                   <el-option label="不可用" value="1"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="物料属性">
-                <el-select v-model="queryParams.params.mAttribute" @change='changemAttribute' filterable placeholder="请选择" style="width:200px">
+                <el-select v-model="queryParams.params.mAttribute" @change='changemAttribute' clearable filterable placeholder="请选择" style="width:200px">
                   <el-option v-for="item in mAttribute_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
                   </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="存货类别">
-                <el-select v-model="queryParams.params.inventoryType" @change='changeinventoryType' filterable placeholder="请选择" style="width:200px">
+                <el-select v-model="queryParams.params.inventoryType" @change='changeinventoryType' clearable filterable placeholder="请选择" style="width:200px">
                   <el-option v-for="item in inventoryType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
                   </el-option>
                 </el-select>
@@ -58,18 +57,18 @@
                 <el-input v-model="queryParams.params.storageLocation" placeholder="请输入物料简称" clearable/>
               </el-form-item>
               <el-form-item label="生产厂家">
-                <el-select v-model="queryParams.params.manufacturerSid" @change='changemAttribute' filterable placeholder="请选择" style="width:200px">
+                <el-select v-model="queryParams.params.manufacturerSid" @change='changemAttribute' clearable filterable placeholder="请选择" style="width:200px">
                   <el-option v-for="item in manufacturer_list" :key="item.sid" :label="item.manufacturerName" :value="item.sid">
                   </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="入库时间">
                 <div class="block" style="float: left;">
-                  <el-date-picker v-model="queryParams.params.warehousingStartTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                  <el-date-picker v-model="queryParams.params.warehousingStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 </div>
                 <div style="float: left;">至</div>
                 <div class="block" style="float: left;">
-                  <el-date-picker v-model="queryParams.params.warehousingEndTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/>
+                  <el-date-picker v-model="queryParams.params.warehousingEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 </div>
               </el-form-item>
             </el-row>
diff --git a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmreturn/scmreturnAdd.vue b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmreturn/scmreturnAdd.vue
index 3925fe90ab..b02fa526e8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmreturn/scmreturnAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/anruiscm/scmreturn/scmreturnAdd.vue
@@ -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="primary" size="small" :disabled="submitdisabled">提交</el-button>
         <el-button type="primary" size="small" :disabled="submitdisabled">打印</el-button>
@@ -57,8 +56,7 @@
           <el-col :span="5">
             <el-form-item prop="billTypeValue">
               <el-select v-model="formobj.billType" @change='changebillType' filterable placeholder="请选择" clearable>
-                <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue"
-                           :value="item.dictKey">
+                <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -68,8 +66,7 @@
           </el-col>
           <el-col :span="5">
             <el-form-item prop="returnCustomer">
-              <el-select v-model="formobj.returnCustomer" @change="changereturnCustomer" class="addinputw" filterable
-                         placeholder="请选择" clearable>
+              <el-select v-model="formobj.returnCustomer" @change="changereturnCustomer" class="addinputw" filterable placeholder="请选择" clearable>
                 <el-option v-for="item in returnCustomer_list" :key="item.sid" :label="item.name" :value="item.sid">
                 </el-option>
               </el-select>
@@ -80,16 +77,9 @@
           </el-col>
           <el-col :span="5">
             <el-form-item prop="stockOrgName">
-              <el-select v-model="formobj.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.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" style="height:20px"-->
-<!--                           @change="stockOrgNameChange" :options="options" :props="props" clearable/>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -107,8 +97,7 @@
           </el-col>
           <el-col :span="5">
             <el-form-item prop="stockDepName">
-              <el-cascader :key="refreshItem" v-model="stockDepName_list" style="height:20px"
-                           @change="stockDepNameChange" :options="options" :props="props" clearable/>
+              <el-cascader :key="refreshItem" v-model="stockDepName_list" style="height:20px" @change="stockDepNameChange" :options="options" :props="props" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="3" class="el-form-item-right">
@@ -116,8 +105,7 @@
           </el-col>
           <el-col :span="5">
             <el-form-item prop="date">
-              <el-date-picker value-format="yyyy-MM-dd" v-model="formobj.date" clearable type="date"
-                              placeholder="开始日期"/>
+              <el-date-picker value-format="yyyy-MM-dd" v-model="formobj.date" clearable type="date" placeholder="开始日期"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -135,10 +123,8 @@
           </el-col>
           <el-col :span="5">
             <el-form-item prop="projectCategory">
-              <el-select v-model="formobj.projectCategory" @change='changeprojectCategory' filterable placeholder="请选择"
-                         clearable>
-                <el-option v-for="item in projectCategory_list" :key="item.dictKey" :label="item.dictValue"
-                           :value="item.dictKey">
+              <el-select v-model="formobj.projectCategory" @change='changeprojectCategory' filterable placeholder="请选择" clearable>
+                <el-option v-for="item in projectCategory_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -148,10 +134,8 @@
           </el-col>
           <el-col :span="5">
             <el-form-item prop="billStateValue">
-              <el-select v-model="formobj.billStateValue" @change='changebillState' class="addinputw" filterable
-                         placeholder="请选择" clearable>
-                <el-option v-for="item in billState_list" :key="item.dictKey" :label="item.dictValue"
-                           :value="item.dictKey">
+              <el-select v-model="formobj.billStateValue" @change='changebillState' class="addinputw" 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-form-item>
@@ -179,15 +163,9 @@
           </el-col>
           <el-col :span="5">
             <el-form-item prop="salesOrgName">
-              <el-select v-model="formobj.salesOrgName" @change="salesOrgNameChange"
-                         placeholder="请选择" class="addinputw" clearable>
-                <el-option v-for="item in salesOrgName_list" :key="item.sid" :label="item.name"
-                           :value="item.name" clearable></el-option>
+              <el-select v-model="formobj.salesOrgName" @change="salesOrgNameChange" placeholder="请选择" class="addinputw" clearable>
+                <el-option v-for="item in salesOrgName_list" :key="item.sid" :label="item.name" :value="item.name" clearable></el-option>
               </el-select>
-<!--              <el-cascader :key="refreshItem" v-model="salesOrgName_list" class="addinputw" @change="salesOrgNameChange"-->
-<!--                           :options="orgOptions" :props="orgProps" clearable/>-->
-<!--              <el-cascader :key="refreshItem" v-model="salesOrgName_list" style="height:20px"-->
-<!--                           @change="salesOrgNameChange" :options="options" :props="props" clearable/>-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -216,23 +194,19 @@
         </el-table-column>
         <el-table-column label="物料编码" header-align="center" width="175">
           <template slot-scope="scope">
-            <el-select v-model="scope.row.mNum" placeholder="请选择" style="width: 120px;"
-                       @change="changeMnum(scope.row,this)" clearable>
-              <el-option v-for="item in tablemNum_list" :key="item.sid" :label="item.mNum"
-                         :value="item.mNum"></el-option>
+            <el-select v-model="scope.row.mNum" placeholder="请选择" style="width: 120px;" @change="changeMnum(scope.row,this)" clearable>
+              <el-option v-for="item in tablemNum_list" :key="item.sid" :label="item.mNum" :value="item.mNum"></el-option>
             </el-select>
           </template>
         </el-table-column>
         <el-table-column label="物料名称" header-align="center" width="150">
           <template slot-scope="scope">
-            <!--              <el-input v-model="scope.row.mName" placeholder="" class="addinputw" clearable />-->
-            <span>{{scope.row.mName}}</span>
+            <span>{{ scope.row.mName }}</span>
           </template>
         </el-table-column>
         <el-table-column label="规格型号" header-align="center" width="150">
           <template slot-scope="scope">
-            <!--              <el-input v-model="scope.row.model" placeholder="" class="addinputw" clearable />-->
-            <span>{{scope.row.model}}</span>
+            <span>{{ scope.row.model }}</span>
           </template>
         </el-table-column>
         <el-table-column label="年度" header-align="center" width="150">
@@ -272,10 +246,8 @@
         </el-table-column>
         <el-table-column label="仓库" header-align="center" width="175">
           <template slot-scope="scope">
-            <el-select v-model="scope.row.warehouse" @change="changeWarehouse(scope.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="scope.row.warehouse" @change="changeWarehouse(scope.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>
           </template>
         </el-table-column>
@@ -287,17 +259,14 @@
         <el-table-column label="库存状态" header-align="center" width="125">
           <template slot-scope="scope">
             <el-select v-model="scope.row.invenState" style="width:100px" filterable placeholder="请选择" clearable>
-              <el-option v-for="item in tableInvenState_list" :key="item.dictKey" :label="item.dictValue"
-                         :value="item.dictValue">
+              <el-option v-for="item in tableInvenState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
               </el-option>
             </el-select>
           </template>
         </el-table-column>
         <el-table-column label="退货日期" header-align="center" width="245">
           <template slot-scope="scope">
-            <!-- <el-input v-model="scope.row.returnGoodsDate" placeholder="" class="addinputw" clearable /> -->
-            <el-date-picker value-format="yyyy-MM-dd" v-model="scope.row.returnGoodsDate" clearable type="date"
-                            placeholder="开始日期"/>
+            <el-date-picker value-format="yyyy-MM-dd" v-model="scope.row.returnGoodsDate" clearable type="date" placeholder="开始日期"/>
           </template>
         </el-table-column>
         <el-table-column label="计划跟踪号" header-align="center" width="150">
@@ -307,8 +276,7 @@
         </el-table-column>
         <el-table-column label="备注" header-align="center" width="150">
           <template slot-scope="scope">
-            <!--            <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>-->
-            <span>{{scope.row.remarks}}</span>
+            <span>{{ scope.row.remarks }}</span>
           </template>
         </el-table-column>
         <el-table-column label="质量型号" header-align="center" width="150">
@@ -318,10 +286,8 @@
         </el-table-column>
         <el-table-column label="车辆类型" header-align="center" width="125">
           <template slot-scope="scope">
-            <el-select v-model="scope.row.vehicleTypeValue" @change="tableChangeVehicleTypeValue(scope.row)"
-                       style="width:100px" filterable placeholder="请选择" clearable>
-              <el-option v-for="item in tablevehicleTypeValue_list" :key="item.dictKey" :label="item.dictValue"
-                         :value="item.dictValue">
+            <el-select v-model="scope.row.vehicleTypeValue" @change="tableChangeVehicleTypeValue(scope.row)" style="width:100px" filterable placeholder="请选择" clearable>
+              <el-option v-for="item in tablevehicleTypeValue_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
               </el-option>
             </el-select>
           </template>
@@ -333,739 +299,655 @@
 </template>
 
 <script>
-  import req from '@/api/anruiscm/scmreturn'
+import req from '@/api/anruiscm/scmreturn'
 
-  export default {
-    name: 'ScmReturnAdd',
-    data() {
-      return {
-        viewTitle: '',
-        dialogStatus: 'add',
-        tableKey: 0,
-        refreshItem: 0,
-        index: 0,
-        options: [],
-        dataArr: [],
-        props: {
-          value: 'sid',
-          label: 'name',
-          children: 'children',
-          multiple: true
-        },
-        // 组织(单选)
-        orgProps: {
-          value: 'sid',
-          label: 'name',
-          children: 'children',
-          checkStrictly: true
-        },
-        orgOptions: [],
-        orgArr: [],
-        billType_list: [], //单据类型
-        billState_list: [], //单据状态
-        projectCategory_list: [], //项目类别
-        returnCustomer_list: [], //退货客户
-        stockOrgName_list: [],  //库存组织
-        salesOrgName_list: [], //销售组织
-        stockDepName_list: [], // 库存部门
-        tablemNum_list: [], //货物明细--物料编码
-        tableWarehouse_list: [], //货物明细--仓库
-        tableInvenState_list: [], //货物明细--库存状态
-        tablevehicleTypeValue_list: [], //货物明细--车辆类型
-        warehouse_list: [], // 货物明细--仓库
-        tableData: [],
-        formobj: {
-          orgSid: window.sessionStorage.getItem('orgSid'),
-          sid: '',
-          billNo: '', // 单据编号
-          createTime: '', //制单日期
-          staffName: '', //制单人
-          billTypeValue: '', // 单据类型
-          billType: '',
-          returnCustomer: '', // 退货客户
-          stockOrgSid: '', // 库存组织sid
-          stockOrgName: '', // 库存组织
-          calculationCurrency: '', // 计算币别
-          stockDepSid: '', // 库存部门sid
-          stockDepName: '', // 库存部门
-          date: '', // 日期
-          reasonForReturn: '', // 退货原因
-          billState: '', // 单据状态
-          billStateValue: '',
-          placeOfDelivery: '', // 交货地点
-          warehouseKeeperSid: '', // 仓管员sid
-          warehouseKeeperName: '', // 仓管员
-          salesOrgSid: '', // 销售组织sid
-          salesOrgName: '', // 销售组织
-          projectCategory: '', // 项目类别
-          userSid: window.sessionStorage.getItem('userSid'),
-          list: []
-        },
-        submitdisabled: false
-      }
-    },
-    created() {
-      this.billType()
-      this.billState()
-      this.projectCategory()
-      this.tableWarehouse()
-      this.tableInvenState()
-      this.tablemNum()
-      this.tablevehicleTypeValue()
-      this.returnCustomer()
-      this.getZuZhi()
-      this.getWarehouse()
-      this.getOrg()
-    },
-    methods: {
-      // 组织
-      getZuZhi() {
-        req.salesDepName().then((res) => {
-          if (res.code === '200') {
-            this.options = res.data
-            this.zuzhi0(this.options)
-          }
-        })
+export default {
+  name: 'ScmReturnAdd',
+  data() {
+    return {
+      viewTitle: '',
+      dialogStatus: 'add',
+      tableKey: 0,
+      refreshItem: 0,
+      index: 0,
+      options: [],
+      dataArr: [],
+      props: {
+        value: 'sid',
+        label: 'name',
+        children: 'children',
+        multiple: true
       },
-      zuzhi0(data) {
-        data.forEach((e) => {
-          if (e.children.length != 0) {
+      // 组织(单选)
+      orgProps: {
+        value: 'sid',
+        label: 'name',
+        children: 'children',
+        checkStrictly: true
+      },
+      orgOptions: [],
+      orgArr: [],
+      billType_list: [], // 单据类型
+      billState_list: [], // 单据状态
+      projectCategory_list: [], // 项目类别
+      returnCustomer_list: [], // 退货客户
+      stockOrgName_list: [], // 库存组织
+      salesOrgName_list: [], // 销售组织
+      stockDepName_list: [], // 库存部门
+      tablemNum_list: [], // 货物明细--物料编码
+      tableWarehouse_list: [], // 货物明细--仓库
+      tableInvenState_list: [], // 货物明细--库存状态
+      tablevehicleTypeValue_list: [], // 货物明细--车辆类型
+      warehouse_list: [], // 货物明细--仓库
+      tableData: [],
+      formobj: {
+        orgSid: window.sessionStorage.getItem('orgSid'),
+        sid: '',
+        billNo: '', // 单据编号
+        createTime: '', // 制单日期
+        staffName: '', // 制单人
+        billTypeValue: '', // 单据类型
+        billType: '',
+        returnCustomer: '', // 退货客户
+        stockOrgSid: '', // 库存组织sid
+        stockOrgName: '', // 库存组织
+        calculationCurrency: '', // 计算币别
+        stockDepSid: '', // 库存部门sid
+        stockDepName: '', // 库存部门
+        date: '', // 日期
+        reasonForReturn: '', // 退货原因
+        billState: '', // 单据状态
+        billStateValue: '',
+        placeOfDelivery: '', // 交货地点
+        warehouseKeeperSid: '', // 仓管员sid
+        warehouseKeeperName: '', // 仓管员
+        salesOrgSid: '', // 销售组织sid
+        salesOrgName: '', // 销售组织
+        projectCategory: '', // 项目类别
+        userSid: window.sessionStorage.getItem('userSid'),
+        list: []
+      },
+      submitdisabled: false
+    }
+  },
+  created() {
+    this.billType()
+    this.billState()
+    this.projectCategory()
+    this.tableWarehouse()
+    this.tableInvenState()
+    this.tablemNum()
+    this.tablevehicleTypeValue()
+    this.returnCustomer()
+    this.getZuZhi()
+    this.getWarehouse()
+    this.getOrg()
+  },
+  methods: {
+    // 组织
+    getZuZhi() {
+      req.salesDepName().then((res) => {
+        if (res.code === '200') {
+          this.options = res.data
+          this.zuzhi0(this.options)
+        }
+      })
+    },
+    zuzhi0(data) {
+      data.forEach((e) => {
+        if (e.children) {
+          if (e.children.length !== 0) {
             this.zuzhi0(e.children)
           } else {
             delete e.children
             this.dataArr.push(e)
             return
           }
-        })
-      },
-      // --- 循环查询
-      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
-              }
-            }
-          }
-        }
-      },
-      stockDepNameChange(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.stockDepName = result
-        this.formobj.stockDepSid = result_Sid
-        console.log('选中名称：' + this.formobj.stockDepName)
-      },
-
-
-      // 组织(单选)
-      getOrg() {
-        req.getOrg().then((res) => {
-          if (res.code === '200') {
-            this.stockOrgName_list = res.data
-            this.salesOrgName_list = res.data
-          }
-        })
-      },
-      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.stockOrgName = bb.name
-        this.formobj.stockOrgSid = bb.sid
-        console.log('name', this.formobj.stockOrgName, this.formobj.stockOrgSid)
-      },
-      salesOrgNameChange(value) {
-        console.log('触发下拉框按钮',value)
-        let bb = {}
-        this.salesOrgName_list.forEach((e) => {
-          // eslint-disable-next-line eqeqeq
-          if (e.name == value) {
-            bb = {
-              name: e.name,
-              key: e.id,
-              sid: e.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
             }
           }
+        }
+      }
+    },
+    stockDepNameChange(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.salesOrgName = bb.name
-        this.formobj.salesOrgSid = bb.sid
-        console.log('name', this.formobj.salesOrgName, this.formobj.salesOrgSid)
-      },
+      }
+      if (result !== '') {
+        result = result.substring(0, result.length - 1)
+      }
+      if (result_Sid !== '') {
+        result_Sid = result_Sid.substring(0, result_Sid.length - 1)
+      }
+      this.formobj.stockDepName = result
+      this.formobj.stockDepSid = result_Sid
+      console.log('选中名称：' + this.formobj.stockDepName)
+    },
 
-      // org0(data) {
-      //   data.forEach((e) => {
-      //     if (e.children.length != 0) {
-      //       this.org0(e.children)
-      //     } else {
-      //       delete e.children
-      //       this.orgArr.push(e)
-      //       return
-      //     }
-      //   })
-      // },
-      // 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.stockOrgName = result
-      //   this.formobj.stockOrgSid = result_Sid
-      //   console.log('选中名称：' + this.formobj.stockOrgName)
-      // },
-      // salesOrgNameChange(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.salesOrgName = result
-      //   this.formobj.salesOrgSid = result_Sid
-      //   console.log('选中名称：' + this.formobj.salesOrgName)
-      // },
-      // // --- 循环查询
-      // 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
-      //         }
-      //       }
-      //     }
-      //   }
-      // },
-      //单据编号、制单人、制单编号回显
-      billNoAndStaffName() {
-        req.billNoAndStaffName({ userSid: window.sessionStorage.getItem('userSid') }).then((response) => {
-          if (response.code === '200') {
-            this.formobj.billNo = response.data.billNo
-            this.formobj.createTime = response.data.createTime
-            this.formobj.staffName = response.data.staffName
-          }
-        })
-      },
-      //单据类型
-      billType() {
-        req.pullDown({ psid: 0, type: 'billsType' }).then((response) => {
-          if (response.code === '200') {
-            this.billType_list = response.data
+    // 组织(单选)
+    getOrg() {
+      req.getOrg().then((res) => {
+        if (res.code === '200') {
+          this.stockOrgName_list = res.data
+          this.salesOrgName_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
           }
-        })
-      },
-      changebillType(value) {
-        let bb = null
-        this.billType_list.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              name: e.dictValue,
-              value: e.dictKey
-            }
+        }
+      })
+      this.formobj.stockOrgName = bb.name
+      this.formobj.stockOrgSid = bb.sid
+      console.log('name', this.formobj.stockOrgName, this.formobj.stockOrgSid)
+    },
+    salesOrgNameChange(value) {
+      console.log('触发下拉框按钮', value)
+      let bb = {}
+      this.salesOrgName_list.forEach((e) => {
+        if (e.name === value) {
+          bb = {
+            name: e.name,
+            key: e.id,
+            sid: e.sid
           }
-        })
-        this.formobj.billTypeValue = bb.name
-        this.formobj.billType = bb.value
-      },
-      //退货客户
-      returnCustomer() {
-        req.GetreturnCustomer().then((response) => {
-          if (response.code === '200') {
-            this.returnCustomer_list = response.data
+        }
+      })
+      this.formobj.salesOrgName = bb.name
+      this.formobj.salesOrgSid = bb.sid
+      console.log('name', this.formobj.salesOrgName, this.formobj.salesOrgSid)
+    },
+    // 单据编号、制单人、制单编号回显
+    billNoAndStaffName() {
+      req.billNoAndStaffName({userSid: window.sessionStorage.getItem('userSid')}).then((response) => {
+        if (response.code === '200') {
+          this.formobj.billNo = response.data.billNo
+          this.formobj.createTime = response.data.createTime
+          this.formobj.staffName = response.data.staffName
+        }
+      })
+    },
+    // 单据类型
+    billType() {
+      req.pullDown({ psid: 0, type: 'billsType' }).then((response) => {
+        if (response.code === '200') {
+          this.billType_list = response.data
+        }
+      })
+    },
+    changebillType(value) {
+      let bb = null
+      this.billType_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            name: e.dictValue,
+            value: e.dictKey
           }
-        })
-      },
-      changereturnCustomer(value) {
-        let bb = null
-        this.returnCustomer_list.forEach((e) => {
-          if (e.sid == value) {
-            bb = {
-              name: e.name,
-              value: e.sid
-            }
+        }
+      })
+      this.formobj.billTypeValue = bb.name
+      this.formobj.billType = bb.value
+    },
+    // 退货客户
+    returnCustomer() {
+      req.GetreturnCustomer().then((response) => {
+        if (response.code === '200') {
+          this.returnCustomer_list = response.data
+        }
+      })
+    },
+    changereturnCustomer(value) {
+      let bb = null
+      this.returnCustomer_list.forEach((e) => {
+        if (e.sid === value) {
+          bb = {
+            name: e.name,
+            value: e.sid
           }
-        })
-        this.formobj.returnCustomer = bb.name
-      },
+        }
+      })
+      this.formobj.returnCustomer = bb.name
+    },
 
-      //单据状态
-      billState() {
-        req.pullDown({ psid: 0, type: 'billState' }).then((response) => {
-          if (response.code === '200') {
-            this.billState_list = response.data
-          }
-        })
-      },
-      changebillState(value) {
-        let bb = null
-        this.billState_list.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              name: e.dictValue,
-              value: e.dictKey
-            }
-          }
-        })
-        this.formobj.billState = bb.value
-        this.formobj.billStateValue = bb.name
-      },
-      //项目类别
-      projectCategory() {
-        req.pullDown({ psid: 0, type: 'finItemType' }).then((response) => {
-          if (response.code === '200') {
-            this.projectCategory_list = response.data
-          }
-        })
-      },
-      changeprojectCategory(value) {
-        let bb = null
-        this.projectCategory_list.forEach((e) => {
-          if (e.dictKey == value) {
-            bb = {
-              name: e.dictValue,
-              value: e.dictKey
-            }
-          }
-        })
-        this.formobj.projectCategory = bb.name
-      },
-      //货物明细--仓库
-      tableWarehouse() {
-        req.pullDown({ psid: 0, type: 'warehouse' }).then((response) => {
-          if (response.code === '200') {
-            this.tableWarehouse_list = response.data
-          }
-        })
-      },
-      //货物明细--库存状态
-      tableInvenState() {
-        req.pullDown({ psid: 0, type: 'invenState' }).then((response) => {
-          if (response.code === '200') {
-            this.tableInvenState_list = response.data
+    // 单据状态
+    billState() {
+      req.pullDown({ psid: 0, type: 'billState' }).then((response) => {
+        if (response.code === '200') {
+          this.billState_list = response.data
+        }
+      })
+    },
+    changebillState(value) {
+      let bb = null
+      this.billState_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            name: e.dictValue,
+            value: e.dictKey
           }
-        })
-      },
-      //货物明细--车辆类型
-      tablevehicleTypeValue() {
-        req.pullDown({ psid: 0, type: 'vehicleType' }).then((response) => {
-          if (response.code === '200') {
-            this.tablevehicleTypeValue_list = response.data
+        }
+      })
+      this.formobj.billState = bb.value
+      this.formobj.billStateValue = bb.name
+    },
+    // 项目类别
+    projectCategory() {
+      req.pullDown({ psid: 0, type: 'finItemType' }).then((response) => {
+        if (response.code === '200') {
+          this.projectCategory_list = response.data
+        }
+      })
+    },
+    changeprojectCategory(value) {
+      let bb = null
+      this.projectCategory_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            name: e.dictValue,
+            value: e.dictKey
           }
-        })
-      },
-      //货物明细--车辆类型
-      tableChangeVehicleTypeValue(row) {
-        for (var i = 0; i < this.tablevehicleTypeValue_list.length; i++) {
-          if (this.tablevehicleTypeValue_list[i].dictValue === row.vehicleTypeValue) {
-            row.vehicleType = this.tablevehicleTypeValue_list[i].dictKey
+        }
+      })
+      this.formobj.projectCategory = bb.name
+    },
+    // 货物明细--仓库
+    tableWarehouse() {
+      req.pullDown({ psid: 0, type: 'warehouse' }).then((response) => {
+        if (response.code === '200') {
+          this.tableWarehouse_list = response.data
+        }
+      })
+    },
+    // 货物明细--库存状态
+    tableInvenState() {
+      req.pullDown({ psid: 0, type: 'invenState' }).then((response) => {
+        if (response.code === '200') {
+          this.tableInvenState_list = response.data
+        }
+      })
+    },
+    // 货物明细--车辆类型
+    tablevehicleTypeValue() {
+      req.pullDown({ psid: 0, type: 'vehicleType' }).then((response) => {
+        if (response.code === '200') {
+          this.tablevehicleTypeValue_list = response.data
+        }
+      })
+    },
+    // 货物明细--车辆类型
+    tableChangeVehicleTypeValue(row) {
+      for (var i = 0; i < this.tablevehicleTypeValue_list.length; i++) {
+        if (this.tablevehicleTypeValue_list[i].dictValue === row.vehicleTypeValue) {
+          row.vehicleType = this.tablevehicleTypeValue_list[i].dictKey
+        }
+      }
+    },
+    // 货物明细--物料编码
+    tablemNum() {
+      req.getWlxx({}).then(res => {
+        this.tablemNum_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
           }
         }
-      },
-      //货物明细--物料编码
-      tablemNum() {
-        req.getWlxx({}).then(res => {
-          this.tablemNum_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.warehouse) {
+          row.warehouse = this.warehouse_list[i].warehouseName
+        }
+      }
+      console.log('仓库', row.warehouse)
+    },
+    // 货物明细--新增
+    addCommodity() {
+      this.tableData.push({
+        billSid: '',
+        mName: '',
+        mNum: '',
+        model: '',
+        year: '',
+        logisticsCustomer: '',
+        inventoryUnit: '',
+        shouldReturnNum: '',
+        realRetreatNum: '',
+        isGifts: '',
+        returnGoodsType: '',
+        warehouse: '',
+        position: '',
+        invenState: '',
+        returnGoodsDate: '',
+        planTrackingNumber: '',
+        qualityType: '',
+        vehicleType: '',
+        vehicleTypeValue: ''
+      })
+    },
+    // 货物明细--删除
+    dataDelete(index, row) {
+      this.tableData.splice(this.tableData.indexOf(row), 1)
+    },
+    // 货物明细--合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (!values.every(value => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
             }
-          }
-        })
-      },
-      //下拉框-仓库 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.warehouse) {
-            row.warehouse = this.warehouse_list[i].warehouseName
-          }
+          }, 0)
+          sums[index] += ''
+        } else {
+          sums[index] = ''
         }
-        console.log('仓库', row.warehouse)
-      },
-      //货物明细--新增
-      addCommodity() {
-        this.tableData.push({
-          billSid: '',
-          mName: '',
-          mNum: '',
-          model: '',
-          year: '',
-          logisticsCustomer: '',
-          inventoryUnit: '',
-          shouldReturnNum: '',
-          realRetreatNum: '',
-          isGifts: '',
-          returnGoodsType: '',
-          warehouse: '',
-          position: '',
-          invenState: '',
-          returnGoodsDate: '',
-          planTrackingNumber: '',
-          qualityType: '',
-          vehicleType: '',
-          vehicleTypeValue: ''
-        })
-      },
-      //货物明细--删除
-      dataDelete(index, row) {
-        this.tableData.splice(this.tableData.indexOf(row), 1)
-      },
-      //货物明细--合计
-      getSummaries(param) {
-        const { columns, data } = param
-        const sums = []
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计'
-            return
-          }
-          const values = data.map(item => Number(item[column.property]))
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-          } else {
-            sums[index] = ''
-          }
-        })
+      })
 
-        return sums
-      },
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.formobj.sid = '',
-          this.formobj.billNo = '', // 单据编号
-          this.formobj.createTime = '', //制单日期
-          this.formobj.staffName = '', //制单人
-          this.formobj.billTypeValue = '', // 单据类型
-          this.formobj.billType = '',
-          this.formobj.returnCustomer = '', // 退货客户
-          this.formobj.stockOrgSid = '', // 库存组织sid
-          this.formobj.stockOrgName = '', // 库存组织
-          this.formobj.calculationCurrency = '', // 计算币别
-          this.formobj.stockDepSid = '', // 库存部门sid
-          this.formobj.stockDepName = '', // 库存部门
-          this.formobj.date = '', // 日期
-          this.formobj.reasonForReturn = '', // 退货原因
-          this.formobj.billState = '', // 单据状态
-          this.formobj.billStateValue = '',
-          this.formobj.placeOfDelivery = '', // 交货地点
-          this.formobj.warehouseKeeperSid = '', // 仓管员sid
-          this.formobj.warehouseKeeperName = '', // 仓管员
-          this.formobj.salesOrgSid = '', // 销售组织sid
-          this.formobj.salesOrgName = '', // 销售组织
-          this.formobj.projectCategory = '', // 项目类别
-          this.formobj.userSid = window.sessionStorage.getItem('userSid'),
-          this.formobj.list = [],
-          this.$refs['form_obj'].resetFields()
-        this.stockOrgName_list = [],  //库存组织
-          this.stockDepName_list = [], // 库存部门
-          this.salesOrgName_list = [],
-          this.tableData = [],
-          this.refreshItem++,
-          this.$emit('doback')
-      },
-      showAdd() {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        this.dialogStatus = 'add'
-        this.viewTitle = '【新增】销售退货单'
-        // this.billNoAndStaffName()
-      },
-      showEdit(row) {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        this.dialogStatus = 'edit'
-        this.viewTitle = '【编辑】销售退货单'
-        this.formobj.sid = row.sid
-        const _this = this
-        console.log(row.sid)
-        req.fetchBySid(row.sid).then(resp => {
-          const vdata = resp.data.data
-          this.formobj.billNo = vdata.billNo // 单据编号
-          this.formobj.createTime = vdata.createTime //制单日期
-          this.formobj.staffName = vdata.makeListName //制单人
-          this.formobj.billTypeValue = vdata.billTypeValue // 单据类型
-          this.formobj.billType = vdata.billType
-          this.formobj.returnCustomer = vdata.returnCustomer // 退货客户
-          this.stockOrgName_list = vdata.stockOrgSid // 库存组织sid
-          this.formobj.calculationCurrency = vdata.calculationCurrency // 计算币别
-          this.stockDepName_list = vdata.stockDepSid // 库存部门sid
-          this.formobj.date = vdata.date // 日期
-          this.formobj.reasonForReturn = vdata.reasonForReturn // 退货原因
-          this.formobj.billState = vdata.billState // 单据状态
-          this.formobj.billStateValue = vdata.billStateValue
-          this.formobj.placeOfDelivery = vdata.placeOfDelivery // 交货地点
-          this.formobj.warehouseKeeperSid = vdata.warehouseKeeperSid // 仓管员sid
-          this.formobj.warehouseKeeperName = vdata.warehouseKeeperName // 仓管员
-          this.salesOrgName_list = vdata.salesOrgSid // 销售组织sid
-          this.formobj.projectCategory = vdata.projectCategory // 项目类别
-          this.formobj.stockOrgName = vdata.stockOrgName // 库存组织
-          this.formobj.stockDepName = vdata.stockDepName // 库存部门
-          this.formobj.salesOrgName = vdata.salesOrgName // 销售组织
-          this.tableData = vdata.list
-        }).catch(e => {
-          this.formobj = row
-        })
-      },
-      saveAdd() {
-        const _this = this
-        this.formobj.list = this.tableData
-        var table_mNum = ''
-        this.formobj.list.forEach((item) => {
-          table_mNum = item.mNum
+      return sums
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj.sid = '',
+        this.formobj.billNo = '', // 单据编号
+        this.formobj.createTime = '', // 制单日期
+        this.formobj.staffName = '', // 制单人
+        this.formobj.billTypeValue = '', // 单据类型
+        this.formobj.billType = '',
+        this.formobj.returnCustomer = '', // 退货客户
+        this.formobj.stockOrgSid = '', // 库存组织sid
+        this.formobj.stockOrgName = '', // 库存组织
+        this.formobj.calculationCurrency = '', // 计算币别
+        this.formobj.stockDepSid = '', // 库存部门sid
+        this.formobj.stockDepName = '', // 库存部门
+        this.formobj.date = '', // 日期
+        this.formobj.reasonForReturn = '', // 退货原因
+        this.formobj.billState = '', // 单据状态
+        this.formobj.billStateValue = '',
+        this.formobj.placeOfDelivery = '', // 交货地点
+        this.formobj.warehouseKeeperSid = '', // 仓管员sid
+        this.formobj.warehouseKeeperName = '', // 仓管员
+        this.formobj.salesOrgSid = '', // 销售组织sid
+        this.formobj.salesOrgName = '', // 销售组织
+        this.formobj.projectCategory = '', // 项目类别
+        this.formobj.userSid = window.sessionStorage.getItem('userSid'),
+        this.formobj.list = [],
+        this.$refs['form_obj'].resetFields()
+      this.stockOrgName_list = [] // 库存组织
+        this.stockDepName_list = [], // 库存部门
+        this.salesOrgName_list = [],
+        this.tableData = [],
+        this.refreshItem++,
+        this.$emit('doback')
+    },
+    showAdd() {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.dialogStatus = 'add'
+      this.viewTitle = '【新增】销售退货单'
+      // this.billNoAndStaffName()
+    },
+    showEdit(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.dialogStatus = 'edit'
+      this.viewTitle = '【编辑】销售退货单'
+      this.formobj.sid = row.sid
+      console.log(row.sid)
+      req.fetchBySid(row.sid).then(resp => {
+        const vdata = resp.data.data
+        this.formobj.billNo = vdata.billNo // 单据编号
+        this.formobj.createTime = vdata.createTime // 制单日期
+        this.formobj.staffName = vdata.makeListName // 制单人
+        this.formobj.billTypeValue = vdata.billTypeValue // 单据类型
+        this.formobj.billType = vdata.billType
+        this.formobj.returnCustomer = vdata.returnCustomer // 退货客户
+        this.stockOrgName_list = vdata.stockOrgSid // 库存组织sid
+        this.formobj.calculationCurrency = vdata.calculationCurrency // 计算币别
+        this.stockDepName_list = vdata.stockDepSid // 库存部门sid
+        this.formobj.date = vdata.date // 日期
+        this.formobj.reasonForReturn = vdata.reasonForReturn // 退货原因
+        this.formobj.billState = vdata.billState // 单据状态
+        this.formobj.billStateValue = vdata.billStateValue
+        this.formobj.placeOfDelivery = vdata.placeOfDelivery // 交货地点
+        this.formobj.warehouseKeeperSid = vdata.warehouseKeeperSid // 仓管员sid
+        this.formobj.warehouseKeeperName = vdata.warehouseKeeperName // 仓管员
+        this.salesOrgName_list = vdata.salesOrgSid // 销售组织sid
+        this.formobj.projectCategory = vdata.projectCategory // 项目类别
+        this.formobj.stockOrgName = vdata.stockOrgName // 库存组织
+        this.formobj.stockDepName = vdata.stockDepName // 库存部门
+        this.formobj.salesOrgName = vdata.salesOrgName // 销售组织
+        this.tableData = vdata.list
+      }).catch(e => {
+        this.formobj = row
+      })
+    },
+    saveAdd() {
+      const _this = this
+      this.formobj.list = this.tableData
+      var table_mNum = ''
+      this.formobj.list.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
+            _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
-              _this.$message({ showClose: true, type: 'success', message: resp.msg })
-              _this.handleReturn('true')
-            }).catch(() => {
-              this.submitdisabled = false
-            })
-          } else {
-            return false
-          }
-        })
-      },
-      saveEdit(row) {
-        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.stockOrgSid = stockOrg_Sid
-        console.log('重新赋值后的组织结构', this.formobj.stockOrgSid)
-        //End 库存组织
+      })
+    },
+    saveEdit(row) {
+      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.stockOrgSid = stockOrg_Sid
+      // console.log('重新赋值后的组织结构', this.formobj.stockOrgSid)
+      // // End 库存组织
 
-        // Start 库存部门字符串赋值
-        var stockDep_Sid = ''
-        if (this.stockDepName_list.length > 0) {
-          this.stockDepName_list.forEach((item) => {
-            var last_id = item[item.length - 1]
-            this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            stockDep_Sid = stockDep_Sid + this.select_temp_Sid + ','
-          })
-        }
-        if (stockDep_Sid !== '') {
-          stockDep_Sid = stockDep_Sid.substring(0, stockDep_Sid.length - 1)
-        }
-        this.formobj.stockDepSid = stockDep_Sid
-        console.log('重新赋值后的组织结构', this.formobj.stockDepSid)
-        //End 库存部门
+      // Start 库存部门字符串赋值
+      var stockDep_Sid = ''
+      if (this.stockDepName_list.length > 0) {
+        this.stockDepName_list.forEach((item) => {
+          var last_id = item[item.length - 1]
+          this.select_temp_Sid = ''  // 临时遍历，用来保存选中结果(组织Sid)
+          this.findOrgId(last_id, this.options)
+          stockDep_Sid = stockDep_Sid + this.select_temp_Sid + ','
+        })
+      }
+      if (stockDep_Sid !== '') {
+        stockDep_Sid = stockDep_Sid.substring(0, stockDep_Sid.length - 1)
+      }
+      this.formobj.stockDepSid = stockDep_Sid
+      console.log('重新赋值后的组织结构', this.formobj.stockDepSid)
+      // End 库存部门
 
-        // Start 销售组织字符串赋值
-        var salesOrg_Sid = ''
-        if (this.salesOrgName_list.length > 0) {
-          this.salesOrgName_list.forEach((item) => {
-            var last_id = item[item.length - 1]
-            this.select_temp_Sid = ''  //临时遍历，用来保存选中结果(组织Sid)
-            this.findOrgId(last_id, this.options)
-            salesOrg_Sid = salesOrg_Sid + this.select_temp_Sid + ','
+      // // Start 销售组织字符串赋值
+      // var salesOrg_Sid = ''
+      // if (this.salesOrgName_list.length > 0) {
+      //   this.salesOrgName_list.forEach((item) => {
+      //     var last_id = item[item.length - 1]
+      //     this.select_temp_Sid = '' // 临时遍历，用来保存选中结果(组织Sid)
+      //     this.findOrgId(last_id, this.options)
+      //     salesOrg_Sid = salesOrg_Sid + this.select_temp_Sid + ','
+      //   })
+      // }
+      // if (salesOrg_Sid !== '') {
+      //   salesOrg_Sid = salesOrg_Sid.substring(0, salesOrg_Sid.length - 1)
+      // }
+      // this.formobj.salesOrgSid = salesOrg_Sid
+      // console.log('重新赋值后的组织结构', this.formobj.salesOrgSid)
+      // // End 销售组织
+      this.formobj.list = this.tableData
+      console.log(this.formobj)
+      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')
           })
-        }
-        if (salesOrg_Sid !== '') {
-          salesOrg_Sid = salesOrg_Sid.substring(0, salesOrg_Sid.length - 1)
-        }
-        this.formobj.salesOrgSid = salesOrg_Sid
-        console.log('重新赋值后的组织结构', this.formobj.salesOrgSid)
-        //End 销售组织
-        this.formobj.list = this.tableData
-        console.log(this.formobj)
-        this.$refs['form_obj'].validate(valid => {
-          if (valid) {
-            this.submitdisabled = true
-            req.saveEdit(this.formobj, this.formobj.sid).then(resp => {
+            .catch(() => {
               this.submitdisabled = false
-              _this.$message({ showClose: true, type: 'success', message: resp.msg })
-              _this.handleReturn('true')
             })
-              .catch(() => {
-                this.submitdisabled = false
-              })
-          } else {
-            return 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;
+}
 
-  .el-table--scrollable-x .el-table__body-wrapper {
-    overflow: visible;
-  }
+.el-table--scrollable-x .el-table__body-wrapper {
+  overflow: visible;
+}
 
 
-  .wlInfo {
-    text-align: center;
-    font-size: 28px;
-    line-height: 90px;
-  }
+.wlInfo {
+  text-align: center;
+  font-size: 28px;
+  line-height: 90px;
+}
 
-  .lineone {
-    border-bottom: 2px solid #e0e3eb;
-  }
+.lineone {
+  border-bottom: 2px solid #e0e3eb;
+}
 
-  .lineone .el-form-item {
-    margin-bottom: 2px;
-  }
+.lineone .el-form-item {
+  margin-bottom: 2px;
+}
 
-  .lineone >>> .el-input__inner {
-    border: 0;
-  }
+.lineone >>> .el-input__inner {
+  border: 0;
+}
 
-  .formadd-copy >>> .el-input__inner {
-    border-top: 0px;
-    border-left: 0px;
-    border-right: 0px;
-    border-bottom: 1px solid #e0e3eb;
-    height: 20px !important;
-  }
+.formadd-copy >>> .el-input__inner {
+  border-top: 0px;
+  border-left: 0px;
+  border-right: 0px;
+  border-bottom: 1px solid #e0e3eb;
+  height: 20px !important;
+}
 
-  .el-form-item-right {
-    text-align: right;
-  }
+.el-form-item-right {
+  text-align: right;
+}
 
-  .linetwo {
-    margin-top: 20px;
-  }
+.linetwo {
+  margin-top: 20px;
+}
 
-  .tableStyle {
-    background-color: #018ad2;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    border: 1px solid #dfe4ed;
-    height: 40px;
-  }
+.tableStyle {
+  background-color: #018ad2;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #dfe4ed;
+  height: 40px;
+}
 </style>