diff --git a/yxt-as-ui/src/api/maintenance/maintenanceOutbound.js b/yxt-as-ui/src/api/maintenance/maintenanceOutbound.js
index f36c1baf26..178a0a52c5 100644
--- a/yxt-as-ui/src/api/maintenance/maintenanceOutbound.js
+++ b/yxt-as-ui/src/api/maintenance/maintenanceOutbound.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export default {
 
-  // 初始化
+  // 选择工单初始化数据
   initBill: function(data) {
     return request({
       url: '/as/v1/AsBusrepairInventorybill/init',
@@ -36,4 +36,15 @@ export default {
     });
   },
 
+
+  // 详情
+  detailsBill: function(data) {
+    return request({
+      url: '/as/v1/AsBusrepairInventorybill/details',
+      method: 'get',
+      params: data
+    });
+  },
+
+
 }
diff --git a/yxt-as-ui/src/api/maintenance/maintenanceReturnBound.js b/yxt-as-ui/src/api/maintenance/maintenanceReturnBound.js
index e69de29bb2..215f5d0bc3 100644
--- a/yxt-as-ui/src/api/maintenance/maintenanceReturnBound.js
+++ b/yxt-as-ui/src/api/maintenance/maintenanceReturnBound.js
@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+export default {
+
+  // 选择工单初始化数据
+  initBill: function(data) {
+    return request({
+      url: '/as/v1/AsBusrepairInventorybill/init',
+      method: 'get',
+      params: data
+    });
+  },
+
+
+  // 查询分页列表
+  getGoodsListPage: function(params) {
+    return request({
+      url: '/wms/apiadmin/WmsOutBill/getInventoryList',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 新增、保存
+  saveBill: function(data) {
+    return request({
+      url: '/as/v1/AsBusrepairInventorybill/quitBill',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+
+  // 详情
+  detailsBill: function(data) {
+    return request({
+      url: '/as/v1/AsBusrepairInventorybill/details',
+      method: 'get',
+      params: data
+    });
+  },
+
+}
diff --git a/yxt-as-ui/src/api/storage/allocation.js b/yxt-as-ui/src/api/storage/allocation.js
index 1bdada1657..35883a698a 100644
--- a/yxt-as-ui/src/api/storage/allocation.js
+++ b/yxt-as-ui/src/api/storage/allocation.js
@@ -44,9 +44,13 @@ export default {
   // 查询所有仓库
   getWarehouses: function(params) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouseinfo/selectAll',
-      method: 'get'
-    })
+      url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
+   method: 'post',
+     data: params,
+     headers: {
+       'Content-Type': 'application/json'
+     }
+   })
   },
 
 
@@ -55,7 +59,7 @@ export default {
     return request({
       url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
       method: 'get',
-      data: data,
+      params: data,
       headers: { 'Content-Type': 'application/json' }
     });
   },
diff --git a/yxt-as-ui/src/api/storage/inOutStorage.js b/yxt-as-ui/src/api/storage/inOutStorage.js
index fce7a4d454..efd393df55 100644
--- a/yxt-as-ui/src/api/storage/inOutStorage.js
+++ b/yxt-as-ui/src/api/storage/inOutStorage.js
@@ -31,17 +31,22 @@ export default {
   // 查询所有仓库
   getWarehouses: function(params) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouseinfo/selectAll',
-      method: 'get'
+      url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
+    method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
 
   // 根据仓库查询库位
   getWarehouseareas: function(data) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
-      method: 'get',
-      data: data,
+     url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
+     method: 'get',
+     params: data,
+     headers: { 'Content-Type': 'application/json' }
     });
   },
 }
diff --git a/yxt-as-ui/src/api/storage/maintenanceInOrOutBound.js b/yxt-as-ui/src/api/storage/maintenanceInOrOutBound.js
new file mode 100644
index 0000000000..f6f41d6ddb
--- /dev/null
+++ b/yxt-as-ui/src/api/storage/maintenanceInOrOutBound.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export default {
+
+// 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/as/v1/AsBusrepairInventorybill/pageList',
+      method: 'post',
+      data: params,
+       headers: { 'Content-Type': 'application/json' }
+    })
+  },
+
+
+
+}
diff --git a/yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js b/yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js
index de107221d9..2df214b95d 100644
--- a/yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js
+++ b/yxt-as-ui/src/api/storage/oldPartsInAndOutStorage.js
@@ -39,17 +39,22 @@ export default {
   // 查询所有仓库
   getWarehouses: function(params) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouseinfo/selectAll',
-      method: 'get'
-    })
+      url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
+   method: 'post',
+     data: params,
+     headers: {
+       'Content-Type': 'application/json'
+     }
+   })
   },
 
   // 根据仓库查询库位
   getWarehouseareas: function(data) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
-      method: 'get',
-      data: data,
+   url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
+   method: 'get',
+   params: data,
+   headers: { 'Content-Type': 'application/json' }
     });
   },
 
diff --git a/yxt-as-ui/src/api/storage/oldPartsInvertory.js b/yxt-as-ui/src/api/storage/oldPartsInvertory.js
index 1d55dac802..64fdd01e6b 100644
--- a/yxt-as-ui/src/api/storage/oldPartsInvertory.js
+++ b/yxt-as-ui/src/api/storage/oldPartsInvertory.js
@@ -61,17 +61,22 @@ export default {
   // 查询所有仓库
   getWarehouses: function(params) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehouseinfo/selectAll',
-      method: 'get'
+      url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
+    method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
     })
   },
 
   // 根据仓库查询库位
   getWarehouseareas: function(data) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
-      method: 'get',
-      data: data,
+     url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
+     method: 'get',
+     params: data,
+     headers: { 'Content-Type': 'application/json' }
     });
   },
 
diff --git a/yxt-as-ui/src/api/warehouse/warehouseArea.js b/yxt-as-ui/src/api/warehouse/warehouseArea.js
index a47db53428..08e52db09c 100644
--- a/yxt-as-ui/src/api/warehouse/warehouseArea.js
+++ b/yxt-as-ui/src/api/warehouse/warehouseArea.js
@@ -30,11 +30,10 @@ export default {
   // 根据仓库sid查询库区
   getAllWarehouseareaBysid: function(params) {
     return request({
-      url: '/wms/apiadmin/base/wmswarehousearea/selectAll?ckSid='+params,
-      method: 'get',
-      headers: {
-        'Content-Type': 'application/json'
-      }
+     url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
+     method: 'get',
+     params: data,
+     headers: { 'Content-Type': 'application/json' }
     })
   },
 
diff --git a/yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue b/yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue
index bfee50b7e9..223960d840 100644
--- a/yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue
+++ b/yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue
@@ -24,22 +24,22 @@
           <el-row class="first_row">
 
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 操作人</div>
+              <div class="span-sty"><span class="must">*</span> 制单人</div>
               <el-form-item prop="createByName">
                 <span class="addinputw addinputInfo">{{formobj.createByName}}</span>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 操作部门</div>
+              <div class="span-sty"><span class="must">*</span> 制单部门</div>
               <el-form-item prop="deptName">
                 <span class="addinputw addinputInfo">{{formobj.deptName}}</span>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
-              <div class="span-sty">操作日期</div>
-              <el-form-item>
+              <div class="span-sty">制单日期</div>
+              <el-form-item prop="createByName">
                 <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
               </el-form-item>
             </el-col>
@@ -75,15 +75,15 @@
 
           <el-row>
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 维修工单编号</div>
-              <el-form-item prop="sourceBillNo">
+              <div class="span-sty">维修工单编号</div>
+              <el-form-item>
                 <span class="addinputw addinputInfo">{{formobj.sourceBillNo}}</span>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 单据日期</div>
-              <el-form-item prop="billDate">
+              <div class="span-sty">单据日期</div>
+              <el-form-item>
                 <span class="addinputw addinputInfo">{{formobj.billDate}}</span>
               </el-form-item>
             </el-col>
@@ -99,15 +99,15 @@
           <el-row>
 
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 工单类型</div>
-              <el-form-item prop="billType">
+              <div class="span-sty">工单类型</div>
+              <el-form-item>
                 <span class="addinputw addinputInfo">{{formobj.billType}}</span>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 科目</div>
-              <el-form-item prop="subject">
+              <div class="span-sty">科目</div>
+              <el-form-item>
                 <span class="addinputw addinputInfo">{{formobj.subject}}</span>
               </el-form-item>
             </el-col>
@@ -123,15 +123,15 @@
           <el-row>
 
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 客户名称</div>
-              <el-form-item prop="customerName">
+              <div class="span-sty">客户名称</div>
+              <el-form-item>
                 <span class="addinputw addinputInfo">{{formobj.customerName}}</span>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 车牌号/车架号</div>
-              <el-form-item prop="vehMark">
+              <div class="span-sty">车牌号/车架号</div>
+              <el-form-item>
                 <span class="addinputw addinputInfo">{{formobj.vehMark}}/{{formobj.vinNo}}</span>
               </el-form-item>
             </el-col>
@@ -194,8 +194,12 @@
                       <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
                       <el-table-column prop="unit" label="单位" align="center" />
                     </el-table>
-                    <el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size"
-                      layout="total, pager" :total="commodityQuery.total" />
+
+                    <pagination v-show="commodityData.length > 0" :total="commodityQuery.total" :page.sync="commodityQuery.current"
+                      :limit.sync="commodityQuery.size" class="total pager" @pagination="commodityInput(scope.row)" />
+
+                  <!--  <el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size"
+                      layout="total, pager" :total="commodityQuery.total" /> -->
                   </div>
                   <el-input slot="reference" v-model="scope.row.goodsSpuName" @input="commodityInput(scope.row)"
                     clearable placeholder="商品名称" />
@@ -289,11 +293,10 @@
         },
         receivePerList: [],
         // commodity商品
-        commodityKey: 1,
         commodityLoading: false,
         commodityQuery: {
           current: 1,
-          size: 2,
+          size: 10,
           total: 0,
           params: {
             name: '',
@@ -304,51 +307,27 @@
         commodityData: [],
 
         rules: {
-          goodsName: [{
+          createByName: [{
             required: true,
-            message: '商品名称不能为空',
+            message: '制单人不能为空',
             trigger: 'blur'
           }],
-          goodsCode: [{
+          deptName: [{
             required: true,
-            message: '商品编码不能为空',
+            message: '制单部门不能为空',
             trigger: 'blur'
           }],
-          goodsUnitName: [{
+          createTime: [{
             required: true,
-            message: '请选择计量单位',
-            trigger: 'change'
-          }],
-          goodsTypeName: [{
-            required: true,
-            message: '请选择商品类别',
-            trigger: 'change'
-          }],
-          brandName: [{
-            required: true,
-            message: '请选择商品品牌',
-            trigger: 'change'
-          }],
-          manufacturerName: [{
-            required: true,
-            message: '请选择商品厂家',
-            trigger: 'change'
-          }],
-          sortNo: [{
-            required: true,
-            message: '商品排序不能为空',
-            trigger: 'blur'
-          }],
-          inventoryAlertUpperLimit: [{
-            required: true,
-            message: '商品上限不能为空',
+            message: '制单日期不能为空',
             trigger: 'blur'
           }],
-          inventoryAlertLowerLimitt: [{
+          warehouseManager: [{
             required: true,
-            message: '商品下限不能为空',
-            trigger: 'blur'
+            message: '请选择领料人',
+            trigger: 'change'
           }],
+
         }
       }
     },
@@ -424,6 +403,38 @@
 
       saveOrUpdate() {
         console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+        if (this.formobj.detailList.length == 0) {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: "商品不能为空"
+          })
+          return
+        }
+
+        for (var i = 0; i < this.formobj.detailList.length; i++) {
+          var item = this.formobj.detailList[i]
+
+          if (item.goodSpuSid == '') {
+            this.$message({
+              showClose: true,
+              type: 'warning',
+              message: "请添加商品"
+            })
+            return
+          }
+
+          if (Number(item.count) == 0) {
+            this.$message({
+              showClose: true,
+              type: 'warning',
+              message: "商品出库数量不能0"
+            })
+            return
+          }
+        }
+
         this.$refs['form_obj'].validate((valid) => {
           if (valid) {
 
@@ -525,7 +536,7 @@
         row.warehouseRackSid = value.warehouseRackSid
         row.warehouseRackCode = value.warehouseRackCode
         row.outboundCount = value.outboundCount
-        row.count = 0
+        row.count =0
         row.amount = 0.00
         row.price = value.price
         row.remarks = ''
@@ -554,7 +565,7 @@
           "warehouseRackCode": "",
           "count": 0,
           "price": '',
-          'amount':0.00,
+          'amount': 0.00,
           "outboundCount": 0,
           "remarks": ""
         }
@@ -569,12 +580,12 @@
         this.formobj.detailList.splice(index, 1)
 
       },
-     commodityComputeYHAndXSJE(row, val) {
-       console.log("aaa", row);
-       console.log("aaa", val);
+      commodityComputeYHAndXSJE(row, val) {
+        console.log("aaa", row);
+        console.log("aaa", val);
 
-       row.amount = (Number(row.count) * Number(row.price)).toFixed(2)
-     },
+        row.amount = (Number(row.count) * Number(row.price)).toFixed(2)
+      },
 
     }
   }
diff --git a/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue b/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue
index 84d6665f85..d71ba344de 100644
--- a/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue
+++ b/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue
@@ -1,368 +1,388 @@
 <template>
-  <div>
-
-    <div class="tab-header webtop">
-      <!-- 标题 -->
-      <div>【新增】维修出库</div>
-      <!-- start 添加修改按钮 -->
-      <div>
-        <el-button type="primary" size="small" @click="seleMaintenance">选择维修工单</el-button>
-        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">出库</el-button>
-        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+
+      <div class="tab-header webtop">
+        <!-- 标题 -->
+        <div>【新增】维修退库</div>
+        <!-- start 添加修改按钮 -->
+        <div>
+          <el-button type="primary" size="small" @click="seleMaintenance">选择维修工单</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">退库</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">清空</el-button>
+        </div>
+        <!-- end 添加修改按钮 -->
+        <!-- end 详情按钮 -->
       </div>
-      <!-- end 添加修改按钮 -->
-      <!-- end 详情按钮 -->
-    </div>
 
-    <div class="listconadd">
+      <div class="listconadd">
 
-      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <!-- <div class="title">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <!-- <div class="title">
           <div>基础信息</div>
         </div> -->
-        <el-row class="first_row">
-
-          <el-col :span="8">
-            <div class="span-sty"><span class="must">*</span> 操作人</div>
-            <el-form-item prop="goodsName">
-              <span class="addinputw addinputInfo">{{formobj.goodsName}}</span>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <div class="span-sty"><span class="must">*</span> 操作部门</div>
-            <el-form-item prop="goodsCode">
-              <span class="addinputw addinputInfo">{{formobj.goodsName}}</span>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <div class="span-sty">操作日期</div>
-            <el-form-item>
-              <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
-            </el-form-item>
-          </el-col>
-
-        </el-row>
-
-        <el-row>
-
-          <el-col :span="8">
-            <div class="span-sty"><span class="must">*</span> 领料人</div>
-            <el-form-item prop="goodsUnitName">
-              <el-select v-model="formobj.goodsUnitName" placeholder="请选择领料人" class="addinputw"
-                @change="selectunitNameChange">
-                <el-option v-for="item in unitNameList" :key="item.sid" :label="item.unitName" :value="item.sid" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="16">
-            <div class="span-sty">备注</div>
-            <el-form-item>
-              <el-input v-model="formobj.indexes" placeholder="备注" class="addinputw addinputInfo" clearable />
-            </el-form-item>
-          </el-col>
-
-        </el-row>
-
-        <div class="title titleOne">
-          <div>维修工单</div>
-        </div>
-
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty"><span class="must">*</span> 维修工单编号</div>
-            <el-form-item prop="goodsName">
-              <span class="addinputw addinputInfo">{{formobj.goodsName}}</span>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <div class="span-sty"><span class="must">*</span> 单据日期</div>
-            <el-form-item prop="goodsCode">
-              <span class="addinputw addinputInfo">{{formobj.goodsName}}</span>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <div class="span-sty">服务顾问</div>
-            <el-form-item>
-              <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-
-          <el-col :span="8">
-            <div class="span-sty"><span class="must">*</span> 工单类型</div>
-            <el-form-item prop="goodsName">
-              <span class="addinputw addinputInfo">{{formobj.goodsName}}</span>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <div class="span-sty"><span class="must">*</span> 科目</div>
-            <el-form-item prop="goodsCode">
-              <span class="addinputw addinputInfo">{{formobj.goodsName}}</span>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <div class="span-sty"></div>
-            <el-form-item>
-              <el-form-item><span class="addinputw addinputInfo"></span></el-form-item>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-
-          <el-col :span="8">
-            <div class="span-sty"><span class="must">*</span> 客户名称</div>
-            <el-form-item prop="goodsName">
-              <span class="addinputw addinputInfo">{{formobj.goodsName}}</span>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <div class="span-sty"><span class="must">*</span> 车牌号/车架号</div>
-            <el-form-item prop="goodsCode">
-              <span class="addinputw addinputInfo">{{formobj.goodsName}}</span>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <div class="span-sty">客户单位</div>
-            <el-form-item>
-              <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <div class="title titleOne">
-          <div>服务项目</div>
-        </div>
-        <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border>
-          <!-- <el-table-column type="selection" align="center" width="50"/> -->
-          <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-          <el-table-column label="操作" wid align="center" width="80">
-            <template slot-scope="scope">
-              <el-button type="primary" size="mini"
-                @click="showGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">商品出库</el-button>
-            </template>
-          </el-table-column>
-          <el-table-column label="服务项目" prop="goodsSkuCode" align="center" />
-          <el-table-column label="工种" prop="title" align="center" />
-          <el-table-column label="科目" prop="externalCode" align="center" />
-          <el-table-column label="维修人" prop="indexes" align="center" />
-          <el-table-column label="考核工时" prop="ownSpec" align="center" />
-          <el-table-column label="工时单价" prop="ownSpec" align="center" />
-          <el-table-column label="工时数" prop="ownSpec" align="center" />
-          <el-table-column label="销售价" prop="ownSpec" align="center" />
-          <el-table-column label="折扣" prop="ownSpec" align="center" />
-          <el-table-column label="优惠" prop="ownSpec" align="center" />
-          <el-table-column label="金额" prop="ownSpec" align="center" />
-          <el-table-column label="备注" prop="ownSpec" align="center" />
-        </el-table>
-
-        <div class="title titleOne">
-          <div>商品列表</div>
-            <el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">全退</el-button>
-        </div>
-        <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border>
-          <!-- <el-table-column type="selection" align="center" width="50"/> -->
-          <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-          <el-table-column label="操作" wid align="center" width="80">
-            <template slot-scope="scope">
-              <el-button type="primary" size="mini"
-                @click="showGoodsSkuDttail(scope.row.baseGoodsSkuExtend)">删除</el-button>
-            </template>
-          </el-table-column>
-          <el-table-column label="项目名称" prop="goodsSkuCode" align="center" />
-          <el-table-column label="商品名称" prop="title" align="center" />
-          <el-table-column label="商品编码" prop="externalCode" align="center" />
-          <el-table-column label="规格" prop="indexes" align="center" />
-          <el-table-column label="单位" prop="ownSpec" align="center" />
-          <el-table-column label="仓库" prop="ownSpec" align="center" />
-          <el-table-column label="库位" prop="ownSpec" align="center" />
-          <el-table-column label="销售单价" prop="ownSpec" align="center" />
-          <el-table-column label="已出数量" prop="ownSpec" align="center" />
-          <el-table-column label="退库数量" align="center" width="120">
-            <template slot-scope="scope">
-              <el-input  @input="commodityComputeYHAndXSJE(scope.row,$event)"
-                v-model="scope.row.actualInCount" clearable placeholder=""
-                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
-            </template>
-          </el-table-column>
-          <el-table-column label="销售单价" prop="ownSpec" align="center" />
-          <el-table-column label="备注" align="center" width="220">
-            <template slot-scope="scope">
-              <el-input  v-model="scope.row.actualInCount" clearable placeholder="" />
-            </template>
-          </el-table-column>
-        </el-table>
-
-
-      </el-form>
+          <el-row class="first_row">
+
+            <el-col :span="8">
+              <div class="span-sty"><span class="must">*</span> 制单人</div>
+              <el-form-item prop="createByName">
+                <span class="addinputw addinputInfo">{{formobj.createByName}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty"><span class="must">*</span> 制单部门</div>
+              <el-form-item prop="deptName">
+                <span class="addinputw addinputInfo">{{formobj.deptName}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">制单日期</div>
+              <el-form-item prop="createByName">
+                <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty"><span class="must">*</span> 领料人</div>
+              <el-form-item prop="warehouseManager">
+                <el-select v-model="formobj.warehouseManager" filterable clearable placeholder="请选择"
+                  class="addinputw addinputInfo" @change="receivePerSelect">
+                  <el-option v-for="item in receivePerList" :key="item.sid" :label="item.name" :value="item.sid">
+                  </el-option>
+                </el-select>
+
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item>
+                <el-input v-model="formobj.remarks" placeholder="备注" class="addinputw addinputInfo" clearable />
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <div class="title titleOne">
+            <div>维修工单</div>
+          </div>
+
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">维修工单编号</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.sourceBillNo}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">单据日期</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.billDate}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">服务顾问</div>
+              <el-form-item>
+                <el-form-item><span class="addinputw addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">工单类型</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.billType}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">科目</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.subject}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty"></div>
+              <el-form-item>
+                <el-form-item><span class="addinputw addinputInfo"></span></el-form-item>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.customerName}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">车牌号/车架号</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.vehMark}}/{{formobj.vinNo}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">客户单位</div>
+              <el-form-item>
+                <el-form-item><span class="addinputw addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <div class="title titleOne">
+            <div>服务项目</div>
+          </div>
+          <el-table v-loading="listLoading" :data="formobj.sitemVoList" border>
+            <!-- <el-table-column type="selection" align="center" width="50"/> -->
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+            <el-table-column label="服务项目" prop="serviceItem" align="center" />
+            <el-table-column label="工种" prop="serviceType" align="center" />
+            <el-table-column label="科目" prop="subject" align="center" />
+            <el-table-column label="维修人" prop="repairerName" align="center" />
+            <el-table-column label="考核工时" prop="examineHourPrice" align="center" />
+            <el-table-column label="工时单价" prop="hourPrice" align="center" />
+            <el-table-column label="工时数" prop="hours" align="center" />
+            <el-table-column label="销售价" prop="price" align="center" />
+            <el-table-column label="折扣" prop="discount" align="center" />
+            <el-table-column label="优惠" prop="discountAmount" align="center" />
+            <el-table-column label="金额" prop="amount" align="center" />
+            <el-table-column label="备注" prop="remarks" align="center" />
+          </el-table>
+
+          <div class="title titleOne">
+            <div>商品列表</div>
+            <el-button type="primary" size="mini" class="btntopblueline" @click="returnAll()">全退</el-button>
+          </div>
+          <el-table v-loading="listLoading" :data="formobj.detailList" border>
+            <!-- <el-table-column type="selection" align="center" width="50"/> -->
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+            <el-table-column label="项目名称" prop="serviceItem" align="center" />
+            <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
+            <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
+            <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
+            <el-table-column label="单位" prop="unit" align="center" />
+            <!-- <el-table-column label="仓库" prop="warehouseName" align="center" />
+            <el-table-column label="库位" prop="warehouseRackCode" align="center" />
+            -->
+            <el-table-column label="仓库" align="center" width="180">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
+                  @change="selectWarehouseName(scope.row,$event)">
+                  <el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
+                  </el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="库位" align="center" width="180">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.warehouseRackCode" :disabled="scope.row.warehouseName==''" clearable
+                  @focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
+                  @change="selectWarehouseAreaCode(scope.row,$event)">
+                  <el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
+                  </el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="已出数量" prop="outboundCount" align="center" />
+            <el-table-column label="退库数量" align="center" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.count" clearable placeholder=""
+                  oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+              </template>
+            </el-table-column>
+            <el-table-column label="销售单价" prop="price" align="center" />
+            <el-table-column label="备注" align="center" width="220">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remarks" clearable placeholder="" />
+              </template>
+            </el-table-column>
+          </el-table>
+
+        </el-form>
 
+      </div>
     </div>
 
+    <!-- 选择维修单 -->
+    <chooseproducts v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState" />
+
   </div>
 </template>
 
 <script>
   import req from '@/api/maintenance/maintenanceReturnBound.js'
- import chooseproducts from './relation/chooseproducts'
- import {
-   selAllByOrgSidPath
- } from '@/api/Common/dictcommons'
-
- export default {
-   components: {
-     chooseproducts,
-   },
+  import req2 from '@/api/storage/allocation.js'
+  import chooseproducts from './relation/chooseproducts'
+  import {
+    getOrgSidByPath,
+    selAllByOrgSidPath
+  } from '@/api/Common/dictcommons'
+  import {
+    getCurrentDate
+  } from '@/utils/index.js'
+  export default {
+    components: {
+      chooseproducts,
+    },
     data() {
       return {
+        viewState: 1,
         listLoading: false,
-        activeNames: ['1'],
-        imgList: [],
         submitdisabled: false,
+
         formobj: {
           "sid": "",
-          "userSid": window.sessionStorage.getItem('userSid'),
-          "orgPath": window.sessionStorage.getItem('orgSidPath'),
-          "goodsName": "",
-          "goodsCode": "",
-          "goodsPY": "",
-          "barCode": "",
-          "goodsUnitSid": "",
-          "goodsUnitName": "",
-          "goodsTypeSid": "",
-          "goodsTypeName": "",
-          "indexes": "",
-          "shelfLife": "",
-          "brandSid": "",
-          "brandName": "",
-          "manufacturerSid": "",
-          "manufacturerName": "",
-          "isOriginalFactory": "2",
-          "isOriginalFactoryValue": "",
-          "sortNo": "",
-          "skuRemarks": "",
-          "inventoryAlertUpperLimit": "",
-          "inventoryAlertLowerLimit": "",
-          "isLockingSalesPrice": "2",
-          "isLockingSalesPriceValue": "",
-          "minimumSalesPrice": "",
-          "standardPurchasePrice": "",
-          "agencyPrice": "",
-          "picPath": []
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "sourceBillSid": "",
+          "warehouseManagerSid": "",
+          "warehouseManager": "",
+          "useOrgSid": "",
+          "createOrgSid": "",
+          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
+            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+          "createTime": getCurrentDate(),
+          "remarks": "",
+          "sourceBillNo": "",
+          "waitorName": "",
+          "billDate": "",
+          "billType": "",
+          "subject": "",
+          "customerName": "",
+          "vehMark": "",
+          "vinNo": "",
+          "customerOrg": "",
+          "sitemVoList": [
+
+          ],
+          "detailList": [
+
+          ]
         },
-        brandList: [],
-        cateList: [],
-        facturerList: [],
-        unitNameList: [],
+        receivePerList: [],
+        warehouseList: [],
+        warehouseRackList: [],
         rules: {
-          goodsName: [{
-            required: true,
-            message: '商品名称不能为空',
-            trigger: 'blur'
-          }],
-          goodsCode: [{
+          createByName: [{
             required: true,
-            message: '商品编码不能为空',
+            message: '制单人不能为空',
             trigger: 'blur'
           }],
-          goodsUnitName: [{
-            required: true,
-            message: '请选择计量单位',
-            trigger: 'change'
-          }],
-          goodsTypeName: [{
-            required: true,
-            message: '请选择商品类别',
-            trigger: 'change'
-          }],
-          brandName: [{
-            required: true,
-            message: '请选择商品品牌',
-            trigger: 'change'
-          }],
-          manufacturerName: [{
-            required: true,
-            message: '请选择商品厂家',
-            trigger: 'change'
-          }],
-          sortNo: [{
+          deptName: [{
             required: true,
-            message: '商品排序不能为空',
+            message: '制单部门不能为空',
             trigger: 'blur'
           }],
-          inventoryAlertUpperLimit: [{
+          createTime: [{
             required: true,
-            message: '商品上限不能为空',
+            message: '制单日期不能为空',
             trigger: 'blur'
           }],
-          inventoryAlertLowerLimitt: [{
+          warehouseManager: [{
             required: true,
-            message: '商品下限不能为空',
-            trigger: 'blur'
+            message: '请选择领料人',
+            trigger: 'change'
           }],
+
         }
       }
     },
     created() {
       this.initData()
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+
     },
     methods: {
+      initData() {
+        selAllByOrgSidPath({
+          orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.receivePerList = res.data
 
-      selectIsOriginalFactory(val) {
-        console.log('selectIsOriginalFactory》》》》', val)
-
-        this.formobj.isOriginalFactoryValue = val == '1' ? '是' : '否'
+            console.log("aaaaaa", this.receivePerList);
 
-      },
-      selectIsLockingSalesPrice(val) {
-        console.log('selectIsLockingSalesPrice》》》》', val)
+          }
+        })
 
-        this.formobj.isLockingSalesPriceValue = val == '1' ? '是' : '否'
+        this.getWarehouseList()
 
       },
-      initData() {
-        var parpams = {
-          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
-          userSid: window.sessionStorage.getItem('userSid'),
-          menuUrl: this.$route.path
-        }
-        req2.getAllBrand(parpams).then(resp => {
-          this.brandList = resp.data
-        })
-        req3.getAllType(parpams).then(resp => {
-          this.cateList = resp.data
-        })
-        req4.getAllFacturer(parpams).then(resp => {
-          this.facturerList = resp.data
-        })
-        req5.getAllUnit(parpams).then(resp => {
-          this.unitNameList = resp.data
-        })
-      },
       backData(value) {
-        console.log('backData》》》》', value)
-        console.log('imgList', this.imgList)
+        this.viewState = 1
+        // 初始化
+        var params = {
+          sid: value
+        }
+        req.initBill(params)
+          .then(resp => {
+            if (resp.success) {
+              console.log('>>>>>>>>>initBill', resp)
+
+              this.formobj = resp.data
+
+              this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
+                .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+              this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+                .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+              this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+              this.formobj.createByName = window.sessionStorage.getItem('name')
+              this.formobj.createTime = getCurrentDate()
+
+
+              getOrgSidByPath({
+                orgPath: window.sessionStorage.getItem('defaultOrgPath')
+              }).then((res) => {
+                if (res.success) {
+                  this.formobj.createOrgSid = res.data
+                  this.formobj.useOrgSid = res.data
+                }
+              })
 
-        this.formobj.picPath = this.imgList
 
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          })
+          .catch(() => {})
+
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      seleMaintenance() {
+        this.viewState = 2
+        const aa = []
+        this.$refs['divSp'].showData(aa, this.formobj.createOrgSid)
       },
 
       saveOrUpdate() {
         console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
         this.$refs['form_obj'].validate((valid) => {
           if (valid) {
 
-            req.saveGoods(this.formobj)
+            req.saveBill(this.formobj)
               .then(resp => {
                 if (resp.success) {
                   this.$message({
@@ -381,102 +401,108 @@
         })
       },
       handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.formobj = {
-          "sid": "",
-          "userSid": window.sessionStorage.getItem('userSid'),
-          "orgPath": window.sessionStorage.getItem('orgSidPath'),
-          "goodsName": "",
-          "goodsCode": "",
-          "goodsPY": "",
-          "barCode": "",
-          "goodsUnitSid": "",
-          "goodsUnitName": "",
-          "goodsTypeSid": "",
-          "goodsTypeName": "",
-          "indexes": "",
-          "shelfLife": "",
-          "brandSid": "",
-          "brandName": "",
-          "manufacturerSid": "",
-          "manufacturerName": "",
-          "isOriginalFactory": "2",
-          "isOriginalFactoryValue": "",
-          "sortNo": "",
-          "skuRemarks": "",
-          "inventoryAlertUpperLimit": "",
-          "inventoryAlertLowerLimit": "",
-          "isLockingSalesPrice": "2",
-          "isLockingSalesPriceValue": "",
-          "minimumSalesPrice": "",
-          "standardPurchasePrice": "",
-          "agencyPrice": "",
-          "picPath": []
-        }
-        this.imgList = []
-        this.$emit('doback')
-      },
-      showAdd() {
-        // var sid = require('uuid').v1()
-        // console.log('>>>>>>>>>showAdd', sid)
-
-        // this.formobj.sid = sid
-
         this.$nextTick(() => {
           this.$refs['form_obj'].clearValidate()
         })
-
+        this.formobj = {
+          "sid": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "sourceBillSid": "",
+          "warehouseManagerSid": "",
+          "warehouseManager": "",
+          "useOrgSid": "",
+          "createOrgSid": "",
+          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
+            'defaultOrgPath').lastIndexOf('/') + 1),
+          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem(
+            'defaultOrgPathName').lastIndexOf('/') + 1),
+          "createTime": getCurrentDate(),
+          "remarks": "",
+          "sourceBillNo": "",
+          "waitorName": "",
+          "billDate": "",
+          "billType": "",
+          "subject": "",
+          "customerName": "",
+          "vehMark": "",
+          "vinNo": "",
+          "customerOrg": "",
+          "sitemVoList": [
+
+          ],
+          "detailList": [
+
+          ]
+        }
       },
       indexMethod(index) {
         return index + 1
       },
-      showEdit(row) {
+      receivePerSelect(val) {
+        const choose = this.receivePerList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>receivePerSelect', choose)
+        this.formobj.warehouseManagerSid = choose[0].sid
+        this.formobj.warehouseManager = choose[0].name
+      },
 
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
+      getWarehouseList() {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
 
-        req.initGoods(row.sid)
-          .then(resp => {
-            if (resp.success) {
-              this.formobj = resp.data
+        req2.getWarehouses(parpams).then((res) => {
+          if (res.success) {
+            this.warehouseList = res.data
 
-              for (var i = 0; i < resp.data.picPath.length; i++) {
-                var item = resp.data.picPath[i]
-                this.imgList.push({
-                  url: item.url
-                })
-              }
-            }
-          })
-          .catch(e => {
-            this.formobj = row
-          })
-      },
-      selectBrandChange(val) {
-        const choose = this.brandList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectBrandChange', choose)
-        this.formobj.brandSid = choose[0].sid
-        this.formobj.brandName = choose[0].brandName
+            console.log("aaaaaa", this.warehouseList);
+
+          }
+        })
       },
-      selectCateChange(val) {
-        const choose = this.cateList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectCateChange', choose)
-        this.formobj.goodsTypeSid = choose[0].sid
-        this.formobj.goodsTypeName = choose[0].goodsTypeName
+      getWarehouseAreaList(sid) {
+        var query = {
+          ckSid: sid
+        }
+        req2.getWarehouseareas(query).then((res) => {
+          if (res.success) {
+            this.warehouseRackList = res.data
+
+            console.log("bbbbb", this.warehouseRackList);
+
+          }
+        })
       },
-      selectfacturerChange(val) {
-        const choose = this.facturerList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectfacturerChange', choose)
-        this.formobj.manufacturerSid = choose[0].sid
-        this.formobj.manufacturerName = choose[0].manufacturerName
+      selectWarehouseName(row, val) {
+        console.log("selectWarehouseName", row);
+        console.log("selectWarehouseName", val);
+        const choose = this.warehouseList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseName', choose)
+        row.warehouseName = choose[0].warehouseName
+        row.warehouseSid = choose[0].sid
+
+        row.warehouseRackCode = ''
+        row.warehouseRackSid = ''
+
       },
-      selectunitNameChange(val) {
-        const choose = this.unitNameList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectunitNameChange', choose)
-        this.formobj.goodsUnitSid = choose[0].sid
-        this.formobj.goodsUnitName = choose[0].unitName
+      selectWarehouseAreaCode(row, val) {
+        console.log("selectWarehouseAreaCode", val);
+
+        const choose = this.warehouseRackList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
+        row.warehouseRackCode = choose[0].areaCode
+        row.warehouseRackSid = choose[0].sid
+
       },
+      returnAll() {
+        for (var i = 0; i < this.formobj.detailList.length; i++) {
+          var item = this.formobj.detailList[i]
+
+          item.count = item.outboundCount
+
+        }
+      }
+
 
     }
   }
diff --git a/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/relation/chooseproducts.vue b/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/relation/chooseproducts.vue
index 27e41dbc46..1141cc140a 100644
--- a/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/relation/chooseproducts.vue
+++ b/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/relation/chooseproducts.vue
@@ -2,9 +2,9 @@
   <div class="app-container">
     <div>
       <div class="tab-header webtop">
-        <div>选择商品</div>
+        <div>选择维修工单</div>
         <div>
-          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <!-- <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button> -->
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -13,14 +13,22 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
-              <el-form-item label="商品名称" class="searchlist">
-                <el-input v-model="listQuery.params.goodsSpuName" placeholder="" clearable/>
+              <el-form-item label="工单编号" class="searchlist">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable />
               </el-form-item>
-              <el-form-item label="商品编码" class="searchlist">
-                <el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
+              <el-form-item label="客户名称" class="searchlist">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable />
               </el-form-item>
-              <el-form-item label="供应商" class="searchlist">
-                <el-input v-model="listQuery.params.manufacturerName" placeholder="" clearable />
+              <el-form-item label="车牌号" class="searchlist">
+                <el-input v-model="listQuery.params.vehMark" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="进厂日期">
+                <el-date-picker v-model="listQuery.params.entryStartTime" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>至
+                <el-date-picker v-model="listQuery.params.entryEndTime" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -30,24 +38,33 @@
           </div>
         </div>
         <div class="listtop">
-          <div class="tit">商品列表</div>
+          <div class="tit">维修工单列表</div>
           <!--          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
         </div>
         <div class="">
-          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" 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="goodsSpuName" label="商品名称" align="center" />
-            <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
-            <el-table-column prop="indexes" label="规格" align="center" />
-            <el-table-column prop="goodsUnitName" label="单位" align="center" />
-            <el-table-column prop="manufacturerName" label="供应商" align="center" />
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" 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 fixed label="操作" width="100" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">确认</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="billNo" label="工单编号" align="center" />
+            <el-table-column prop="billType" label="工单类型" align="center" />
+            <el-table-column prop="customerName" label="客户名称" align="center" />
+            <el-table-column prop="mobile" label="联系电话" align="center" />
+            <el-table-column prop="vinNo" label="车架号" align="center" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" />
+            <el-table-column prop="entryTime" label="进厂日期" align="center" />
           </el-table>
         </div>
         <div class="pages">
-          <div class="tit"/>
+          <div class="tit" />
           <!-- 翻页 -->
-          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
         </div>
       </div>
     </div>
@@ -55,110 +72,134 @@
 </template>
 
 <script>
-import Pagination from '@/components/pagination'
-import { getInventoryList } from '@/api/Common/dictcommons'
+  import Pagination from '@/components/pagination'
+  import {
+    getAsBusrepairBill
+  } from '@/api/Common/dictcommons'
 
-export default {
-  name: 'SelectVehicle',
-  components: {
-    Pagination
-  },
-  data() {
-    return {
-      isSearchShow: false,
-      searchxianshitit: '隐藏查询条件',
-      tableKey: 0,
-      sids: [],
-      list: [],
-      number: '',
-      listLoading: false,
-      listQuery: {
-        current: 1,
-        size: 5,
-        params: {
-          createOrgSid: '',
-          goodsSpuName: '',
-          goodsSkuCode: '',
-          manufacturerName: ''
-        },
-        total: 0
-      }
-    }
-  },
-  methods: {
-    // 搜索条件效果
-    clicksearchShow() {
-      this.isSearchShow = !this.isSearchShow
-      if (this.isSearchShow) {
-        this.searchxianshitit = '隐藏查询条件'
-      } else {
-        this.searchxianshitit = '显示查询条件'
-      }
+  export default {
+    name: 'SelectVehicle',
+    components: {
+      Pagination
     },
-    indexMethod(index) {
-      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-      var pageindex = index + 1 + pagestart
-      return pageindex
-    },
-    // 查询列表信息
-    getList() {
-      this.listLoading = true
-      getInventoryList(this.listQuery).then((response) => {
-        this.listLoading = false
-        if (response.success) {
-          this.listQuery.total = response.data.total
-          this.list = response.data.records
+    data() {
+      return {
+        isSearchShow: false,
+        searchxianshitit: '隐藏查询条件',
+        tableKey: 0,
+        sids: [],
+        list: [],
+        number: '',
+        listLoading: false,
+        listQuery: {
+          current: 1,
+          size: 10,
+          params: {
+            nodeCode: 3,
+            billNo: '',
+            customerName: '',
+            vehMark: '',
+            entryStartTime: '',
+            entryEndTime: ''
+          },
+          total: 0
         }
-      })
-    },
-    // 查询按钮
-    handleFilter() {
-      this.listQuery.current = 1
-      this.getList()
-    },
-    // 重置按钮
-    handleReset() {
-      this.listQuery.current = 1
-      this.listQuery.size = 5
-      this.listQuery.total = 0
-      this.listQuery.params.goodsSpuName = ''
-      this.listQuery.params.goodsSkuCode = ''
-      this.listQuery.params.manufacturerName = ''
-      this.getList()
-    },
-    handleSelectionChange(row) {
-      this.sids = row
-    },
-    showData(value, createOrgSid) {
-      // const aa = []
-      // if (value.length > 0) {
-      //   for (var i = 0; i < value.length; i++) {
-      //     aa.push(value[i].saleVehSid)
-      //   }
-      //   this.listQuery.params.saleVehSids = aa
-      // } else {
-      //   this.listQuery.params.saleVehSids = []
-      // }``
-      this.listQuery.params.createOrgSid = createOrgSid
-      this.listQuery.current = 1
-      this.listQuery.size = 5
-      this.listQuery.total = 0
-      this.getList()
-    },
-    // 添加修改返回
-    AddUpdateReturn() {
-      if (this.sids.length > 0) {
-        this.$emit('backData', this.sids)
-      } else {
-        this.$notify({ title: '提示', message: '请至少选择一条记录进行操作', type: 'error', duration: 2000 })
       }
     },
-    // 返回
-    handleReturn() {
-      this.$emit('doback')
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      indexMethod(index) {
+        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      // 查询列表信息
+      getList() {
+        this.listLoading = true
+        this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+        this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        // this.listQuery.params.menuUrl = this.$route.path
+        this.listQuery.params.menuUrl = ""
+        getAsBusrepairBill(this.listQuery).then((response) => {
+          this.listLoading = false
+          if (response.success) {
+            this.listQuery.total = response.data.total
+            this.list = response.data.records
+          }
+        })
+      },
+      // 查询按钮
+      handleFilter() {
+        this.listQuery.current = 1
+        this.getList()
+      },
+      // 重置按钮
+      handleReset() {
+        this.listQuery = {
+          current: 1,
+          size: 10,
+          params: {
+            nodeCode: 3,
+            billNo: '',
+            customerName: '',
+            vehMark: '',
+            entryStartTime: '',
+            entryEndTime: ''
+          },
+          total: 0
+        }
+        this.getList()
+      },
+      handleSelectionChange(row) {
+        this.sids = row
+      },
+      showData(value, createOrgSid) {
+        // const aa = []
+        // if (value.length > 0) {
+        //   for (var i = 0; i < value.length; i++) {
+        //     aa.push(value[i].saleVehSid)
+        //   }
+        //   this.listQuery.params.saleVehSids = aa
+        // } else {
+        //   this.listQuery.params.saleVehSids = []
+        // }``
+        this.listQuery.params.createOrgSid = createOrgSid
+        this.listQuery.current = 1
+        this.listQuery.size = 10
+        this.listQuery.total = 0
+        this.getList()
+      },
+      // 添加修改返回
+      AddUpdateReturn() {
+        if (this.sids.length > 0) {
+          this.$emit('backData', this.sids)
+        } else {
+          this.$notify({
+            title: '提示',
+            message: '请至少选择一条记录进行操作',
+            type: 'error',
+            duration: 2000
+          })
+        }
+      },
+
+      toInfo(row){
+         this.$emit('backData', row.sid)
+      },
+      // 返回
+      handleReturn() {
+        this.$emit('doback')
+      }
     }
   }
-}
 </script>
 <style scoped>
 </style>
diff --git a/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue b/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
index ff63852646..c4b60d434f 100644
--- a/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
+++ b/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
@@ -235,7 +235,10 @@
       },
 
       getWarehouseList() {
-        req.getWarehouses().then((res) => {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        req.getWarehouses(parpams).then((res) => {
           if (res.success) {
             this.warehouseList = res.data
 
diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
index ce75fa227b..b1459379d3 100644
--- a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
+++ b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
@@ -322,7 +322,10 @@
 
       },
       getWarehouseList() {
-        req2.getWarehouses().then((res) => {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        req2.getWarehouses(parpams).then((res) => {
           if (res.success) {
             this.warehouseList = res.data
 
@@ -657,7 +660,7 @@
           this.$refs['form_obj'].clearValidate()
         })
 
-        this.getWarehouseList()
+        // this.getWarehouseList()
         this.getsupplierLust()
         // this.getOrgPathSid()
         var params = {
diff --git a/yxt-as-ui/src/views/storage/inOutStorage/index.vue b/yxt-as-ui/src/views/storage/inOutStorage/index.vue
index 21b4899a77..aa1e7ae16c 100644
--- a/yxt-as-ui/src/views/storage/inOutStorage/index.vue
+++ b/yxt-as-ui/src/views/storage/inOutStorage/index.vue
@@ -261,7 +261,10 @@
 
       },
       getWarehouseList() {
-        req.getWarehouses().then((res) => {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        req.getWarehouses(parpams).then((res) => {
           if (res.success) {
             this.warehouseList = res.data
 
diff --git a/yxt-as-ui/src/views/storage/inStorage/inStorageAdd.vue b/yxt-as-ui/src/views/storage/inStorage/inStorageAdd.vue
index 9fe634012b..ede18db1d6 100644
--- a/yxt-as-ui/src/views/storage/inStorage/inStorageAdd.vue
+++ b/yxt-as-ui/src/views/storage/inStorage/inStorageAdd.vue
@@ -919,7 +919,10 @@
 
       },
       getWarehouseList() {
-        req2.getWarehouses().then((res) => {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        req2.getWarehouses(parpams).then((res) => {
           if (res.success) {
             this.warehouseList = res.data
 
diff --git a/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/index.vue b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/index.vue
index a82464ac2e..b10db8889d 100644
--- a/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/index.vue
+++ b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/index.vue
@@ -9,11 +9,11 @@
           </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.goodsID" placeholder="" clearable />
+              <el-form-item label="单据编号">
+                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="单据日期">
-                <el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
+                <el-date-picker v-model="queryParams.params.createTimestart" type="date" placeholder="选择日期"
                   format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
                 </el-date-picker>
                 至
@@ -22,7 +22,7 @@
                 </el-date-picker>
               </el-form-item>
               <el-form-item label="维修工单编号">
-                <el-input v-model="queryParams.params.vinNo" placeholder="" clearable />
+                <el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="业务类型">
                 <el-select v-model="queryParams.params.busTypeValue" filterable clearable placeholder="请选择"
@@ -32,10 +32,10 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="操作人">
-                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+                <el-input v-model="queryParams.params.createByName" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="经办人">
-                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+                <el-input v-model="queryParams.params.warehouseManager" placeholder="" clearable />
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -57,17 +57,17 @@
             <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
             <el-table-column label="单据编号" align="center">
               <template slot-scope="scope">
-                <div style="color: #1890FF; text-decoration: underline ;" @click="showResult(scope.row.sid)">
-                  {{ scope.row.confirmResult }}
+                <div style="color: #1890FF; text-decoration: underline ;" @click="showResult(scope.row)">
+                  {{ scope.row.billNo }}
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="goodsSpuName" label="单据时间"align="center" />
-            <el-table-column prop="goodsSkuCode" label="维修工单编号"  align="center" />
-            <el-table-column prop="vinNo" label="业务类型"  align="center" />
-            <el-table-column prop="manufacturerName" label="操作人" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="经办人" align="center" />
-            <el-table-column prop="unit" label="备注" align="center" />
+            <el-table-column prop="createTime" label="单据时间" align="center" />
+            <el-table-column prop="sourceBillNo" label="维修工单编号" align="center" />
+            <el-table-column prop="busTypeValue" label="业务类型" align="center" />
+            <el-table-column prop="createByName" label="操作人" align="center" />
+            <el-table-column prop="warehouseManager" label="经办人" align="center" />
+            <el-table-column prop="remarks" label="备注" align="center" />
 
           </el-table>
         </div>
@@ -82,26 +82,26 @@
     </div>
     <!-- End 查询和其列表部分 -->
     <!-- 新增修改部分组件 -->
-    <!-- <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" /> -->
-    <!-- <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" /> -->
+    <divOutInfo v-show="viewState == 2 " ref="divOutInfo" @doback="resetState" @reloadlist="loadList" />
+    <divReturnInfo v-show="viewState == 3" ref="divReturnInfo" @doback="resetState" @reloadlist="loadList" />
 
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/oldPartsInAndOutStorage.js'
+  import req from '@/api/storage/maintenanceInOrOutBound.js'
   import ButtonBar from '@/components/ButtonBar'
   import Pagination from '@/components/pagination'
   import pageye from '@/components/pagination/pageye'
-  // import divAdd from './oldPartsInStorageAdd.vue'
-  // import divInfo from './oldPartsInvertoryInfo.vue'
+  import divOutInfo from './maintenanceOutboundInfo.vue'
+  import divReturnInfo from './maintenanceReturnBoundInfo.vue'
   export default {
     components: {
       ButtonBar,
       Pagination,
       pageye,
-      // divAdd,
-      // divInfo
+      divOutInfo,
+      divReturnInfo
     },
     data() {
       return {
@@ -268,6 +268,18 @@
         }
       },
 
+      showResult(row) {
+
+        if (row.busTypeValue == '维修出库') {
+          this.viewState = 2
+          this.$refs['divOutInfo'].showAdd(row)
+        }
+        if (row.busTypeValue == '维修退库') {
+          this.viewState = 3
+          this.$refs['divReturnInfo'].showAdd(row)
+        }
+
+      },
       toRelevancy() {
         this.viewState = 4
         this.$refs['divinfo'].showAdd()
diff --git a/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceOutboundInfo.vue b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceOutboundInfo.vue
new file mode 100644
index 0000000000..9a4983ec4f
--- /dev/null
+++ b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceOutboundInfo.vue
@@ -0,0 +1,276 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+
+      <div class="tab-header webtop">
+        <!-- 标题 -->
+        <div>维修出库</div>
+        <!-- start 添加修改按钮 -->
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+        <!-- end 添加修改按钮 -->
+        <!-- end 详情按钮 -->
+      </div>
+
+      <div class="listconadd">
+
+        <el-form ref="form_obj" :model="formobj"  class="formaddcopy02">
+          <!-- <div class="title">
+          <div>基础信息</div>
+        </div> -->
+          <el-row class="first_row">
+
+            <el-col :span="8">
+              <div class="span-sty">制单人</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.createByName}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">制单部门</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.deptName}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">制单日期</div>
+              <el-form-item>
+                <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">领料人</div>
+              <el-form-item prop="warehouseManager">
+                <span class="addinputw addinputInfo">{{formobj.warehouseManager}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.remarks}}</span>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <div class="title titleOne">
+            <div>维修工单</div>
+          </div>
+
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">维修工单编号</div>
+              <el-form-item prop="sourceBillNo">
+                <span class="addinputw addinputInfo">{{formobj.sourceBillNo}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">单据日期</div>
+              <el-form-item prop="billDate">
+                <span class="addinputw addinputInfo">{{formobj.billDate}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">服务顾问</div>
+              <el-form-item>
+                <el-form-item><span class="addinputw addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">工单类型</div>
+              <el-form-item prop="billType">
+                <span class="addinputw addinputInfo">{{formobj.billType}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">科目</div>
+              <el-form-item prop="subject">
+                <span class="addinputw addinputInfo">{{formobj.subject}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty"></div>
+              <el-form-item>
+                <el-form-item><span class="addinputw addinputInfo"></span></el-form-item>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item prop="customerName">
+                <span class="addinputw addinputInfo">{{formobj.customerName}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">车牌号/车架号</div>
+              <el-form-item prop="vehMark">
+                <span class="addinputw addinputInfo">{{formobj.vehMark}}/{{formobj.vinNo}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">客户单位</div>
+              <el-form-item>
+                <el-form-item><span class="addinputw addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <div class="title titleOne">
+            <div>服务项目</div>
+          </div>
+          <el-table v-loading="listLoading" :data="formobj.sitemVoList" border>
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+            <el-table-column label="服务项目" prop="serviceItem" align="center" />
+            <el-table-column label="工种" prop="serviceType" align="center" />
+            <el-table-column label="科目" prop="subject" align="center" />
+            <el-table-column label="维修人" prop="repairerName" align="center" />
+            <el-table-column label="考核工时" prop="examineHourPrice" align="center" />
+            <el-table-column label="工时单价" prop="hourPrice" align="center" />
+            <el-table-column label="工时数" prop="hours" align="center" />
+            <el-table-column label="销售价" prop="price" align="center" />
+            <el-table-column label="折扣" prop="discount" align="center" />
+            <el-table-column label="优惠" prop="discountAmount" align="center" />
+            <el-table-column label="金额" prop="amount" align="center" />
+            <el-table-column label="备注" prop="remarks" align="center" />
+          </el-table>
+
+          <div class="title titleOne">
+            <div>商品列表</div>
+          </div>
+          <el-table v-loading="listLoading" :data="formobj.detailList" border>
+            <!-- <el-table-column type="selection" align="center" width="50"/> -->
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+            <el-table-column label="项目名称" prop="serviceItem" align="center" />
+            <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
+            <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
+            <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
+            <el-table-column label="单位" prop="unit" align="center" />
+            <el-table-column label="仓库" prop="warehouseName" align="center" />
+            <el-table-column label="库位" prop="warehouseRackCode" align="center" />
+            <el-table-column label="销售单价" prop="price" align="center" />
+            <el-table-column label="已出数量" prop="outboundCount" align="center" />
+            <el-table-column label="出库数量" prop="count" align="center" />
+            <el-table-column label="金额" prop="amount" align="center" />
+            <el-table-column label="备注" prop="remarks" align="center" />
+          </el-table>
+
+        </el-form>
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/maintenance/maintenanceOutbound.js'
+  export default {
+    components: {},
+    data() {
+      return {
+        viewState: 1,
+        listLoading: false,
+        submitdisabled: false,
+
+        formobj: {
+
+        },
+
+    }
+  },
+  created() {
+
+    },
+    methods: {
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {}
+        this.$emit('doback')
+      },
+      indexMethod(index) {
+        return index + 1
+      },
+      showAdd(row) {
+        var params = {
+          sid: row.sid
+        }
+        req.detailsBill(params)
+          .then(resp => {
+            if (resp.success) {
+              console.log('>>>>>>>>>initBill', resp)
+
+              this.formobj = resp.data
+
+
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          })
+          .catch(() => {})
+      },
+
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .el-radio /deep/ .el-radio__label {
+
+    font-size: 14px !important;
+
+  }
+</style>
diff --git a/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue
new file mode 100644
index 0000000000..f2305bde53
--- /dev/null
+++ b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue
@@ -0,0 +1,272 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>维修退库</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div class="listconadd">
+
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <!-- <div class="title">
+          <div>基础信息</div>
+        </div> -->
+        <el-row class="first_row">
+
+          <el-col :span="8">
+            <div class="span-sty">制单人</div>
+            <el-form-item>
+              <span class="addinputw addinputInfo">{{formobj.createByName}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">制单部门</div>
+            <el-form-item>
+              <span class="addinputw addinputInfo">{{formobj.deptName}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">制单日期</div>
+            <el-form-item>
+              <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="8">
+            <div class="span-sty">领料人</div>
+            <el-form-item prop="warehouseManager">
+              <span class="addinputw addinputInfo">{{formobj.warehouseManager}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="16">
+            <div class="span-sty">备注</div>
+            <el-form-item>
+              <span class="addinputw addinputInfo">{{formobj.remarks}}</span>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <div class="title titleOne">
+          <div>维修工单</div>
+        </div>
+
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">维修工单编号</div>
+            <el-form-item prop="sourceBillNo">
+              <span class="addinputw addinputInfo">{{formobj.sourceBillNo}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">单据日期</div>
+            <el-form-item prop="billDate">
+              <span class="addinputw addinputInfo">{{formobj.billDate}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">服务顾问</div>
+            <el-form-item>
+              <el-form-item><span class="addinputw addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="8">
+            <div class="span-sty">工单类型</div>
+            <el-form-item prop="billType">
+              <span class="addinputw addinputInfo">{{formobj.billType}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">科目</div>
+            <el-form-item prop="subject">
+              <span class="addinputw addinputInfo">{{formobj.subject}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty"></div>
+            <el-form-item>
+              <el-form-item><span class="addinputw addinputInfo"></span></el-form-item>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="8">
+            <div class="span-sty">客户名称</div>
+            <el-form-item prop="customerName">
+              <span class="addinputw addinputInfo">{{formobj.customerName}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">车牌号/车架号</div>
+            <el-form-item prop="vehMark">
+              <span class="addinputw addinputInfo">{{formobj.vehMark}}/{{formobj.vinNo}}</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <div class="span-sty">客户单位</div>
+            <el-form-item>
+              <el-form-item><span class="addinputw addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <div class="title titleOne">
+          <div>服务项目</div>
+        </div>
+        <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border>
+          <!-- <el-table-column type="selection" align="center" width="50"/> -->
+          <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+          <el-table-column label="服务项目" prop="serviceItem" align="center" />
+          <el-table-column label="工种" prop="serviceType" align="center" />
+          <el-table-column label="科目" prop="subject" align="center" />
+          <el-table-column label="维修人" prop="repairerName" align="center" />
+          <el-table-column label="考核工时" prop="examineHourPrice" align="center" />
+          <el-table-column label="工时单价" prop="hourPrice" align="center" />
+          <el-table-column label="工时数" prop="hours" align="center" />
+          <el-table-column label="销售价" prop="price" align="center" />
+          <el-table-column label="折扣" prop="discount" align="center" />
+          <el-table-column label="优惠" prop="discountAmount" align="center" />
+          <el-table-column label="金额" prop="amount" align="center" />
+          <el-table-column label="备注" prop="remarks" align="center" />
+        </el-table>
+
+        <div class="title titleOne">
+          <div>商品列表</div>
+        </div>
+        <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border>
+          <!-- <el-table-column type="selection" align="center" width="50"/> -->
+          <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+          <el-table-column label="项目名称" prop="serviceItem" align="center" />
+          <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
+          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
+          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
+          <el-table-column label="单位" prop="unit" align="center" />
+          <el-table-column label="仓库" prop="warehouseName" align="center" />
+          <el-table-column label="库位" prop="warehouseRackCode" align="center" />
+          <el-table-column label="已出数量" prop="outboundCount" align="center" />
+          <el-table-column label="退库数量" prop="count" align="center" />
+          <el-table-column label="销售单价" prop="price" align="center" />
+          <el-table-column label="备注" prop="remarks" align="center" />
+        </el-table>
+
+
+      </el-form>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/maintenance/maintenanceReturnBound.js'
+
+  export default {
+    components: {},
+    data() {
+      return {
+        listLoading: false,
+        activeNames: ['1'],
+        submitdisabled: false,
+        formobj: {
+
+        },
+
+      }
+    },
+    created() {},
+    methods: {
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {}
+        this.$emit('doback')
+      },
+      indexMethod(index) {
+        return index + 1
+      },
+      showAdd(row) {
+        var params = {
+          sid: row.sid
+        }
+        req.detailsBill(params)
+          .then(resp => {
+            if (resp.success) {
+              console.log('>>>>>>>>>initBill', resp)
+
+              this.formobj = resp.data
+
+
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          })
+          .catch(() => {})
+      },
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .el-radio /deep/ .el-radio__label {
+
+    font-size: 14px !important;
+
+  }
+</style>
diff --git a/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue b/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue
index 227441122c..fcdd4dac82 100644
--- a/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsInAndOutStorage/index.vue
@@ -390,7 +390,10 @@
         })
       },
       getWarehouseList() {
-        req.getWarehouses().then((res) => {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        req.getWarehouses(parpams).then((res) => {
           if (res.success) {
             this.warehouseList = res.data
 
diff --git a/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue b/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
index 0975301087..255ab7fa0d 100644
--- a/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsInvertory/index.vue
@@ -383,7 +383,10 @@
         })
       },
       getWarehouseList() {
-        req.getWarehouses().then((res) => {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        req.getWarehouses(parpams).then((res) => {
           if (res.success) {
             this.warehouseList = res.data
 
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
index f3f12bdbb0..8ef21a7aef 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
@@ -771,7 +771,7 @@
           orgPath: window.sessionStorage.getItem('defaultOrgPath'),
         }
 
-        req2.getWarehouses().then((res) => {
+        req2.getWarehouses(parpams).then((res) => {
           if (res.success) {
             this.warehouseList = res.data
 
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue b/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
index 589bf69013..73a3531d18 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
@@ -334,7 +334,10 @@
       },
 
       getWarehouseList() {
-        req2.getWarehouses().then((res) => {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        req2.getWarehouses(parpams).then((res) => {
           if (res.success) {
             this.warehouseList = res.data
 
diff --git a/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue b/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
index 05b2a19aad..1331e88bd1 100644
--- a/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
+++ b/yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
@@ -341,7 +341,10 @@
 
       },
       getWarehouseList() {
-        req2.getWarehouses().then((res) => {
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+        }
+        req2.getWarehouses(parpams).then((res) => {
           if (res.success) {
             this.warehouseList = res.data