diff --git a/yxt-as-ui/src/api/storage/oldPartsRecovery.js b/yxt-as-ui/src/api/storage/oldPartsRecovery.js
index 063722cf10..20e175d0b2 100644
--- a/yxt-as-ui/src/api/storage/oldPartsRecovery.js
+++ b/yxt-as-ui/src/api/storage/oldPartsRecovery.js
@@ -1,11 +1,9 @@
 import request from '@/utils/request'
 
 export default {
-
   // 查询分页列表
   listPage: function(params) {
     return request({
-      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
       url: '/as/v1/AsBusrepairBill/pageBillList',
       method: 'post',
       data: params,
@@ -14,42 +12,27 @@ export default {
       }
     })
   },
-
-  // 获取维修工单详情
-  getOneByBillNo: function(data) {
-    return request({
-      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-      url: '/as/v1/AsBusrepairBill/getOneByBillNo?sid=' + data,
-      method: 'get',
-    });
-  },
-
   // 保存旧件回收登记
   saveorUpdateOldRegister: function(data) {
     return request({
-      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
       url: '/wms/apiadmin/WmsOldRegister/saveorUpdateOldRegister',
       method: 'post',
       data: data,
       headers: {
         'Content-Type': 'application/json'
       }
-    });
+    })
   },
-
   // 获取旧件入库详情
   init: function(data) {
     return request({
-      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
       url: '/wms/apiadmin/WmsOldInventory/getInit?sid=' + data,
-      method: 'get',
-    });
+      method: 'get'
+    })
   },
-
   // 初始化旧件入库
   getOldDetailsByBillSid: function(params) {
     return request({
-      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
       url: '/as/v1/AsBusrepairInventorybillDetail/getOldDetailsByBillSid',
       method: 'post',
       params: params,
@@ -58,19 +41,15 @@ export default {
       }
     })
   },
-
   // 保存旧件入库
   saveInventory: function(data) {
     return request({
-      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
       url: '/wms/apiadmin/WmsOldInventory/saveInventory',
       method: 'post',
       data: data,
       headers: {
         'Content-Type': 'application/json'
       }
-    });
-  },
-
-
+    })
+  }
 }
diff --git a/yxt-as-ui/src/views/storage/oldPartsRecovery/index.vue b/yxt-as-ui/src/views/storage/oldPartsRecovery/index.vue
index f76896bb6a..6969b89613 100644
--- a/yxt-as-ui/src/views/storage/oldPartsRecovery/index.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsRecovery/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="旧件入库管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <button-bar ref="btnbar" view-title="旧件入库管理" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">
@@ -10,24 +10,21 @@
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
               <el-form-item label="维修单号">
-                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+                <el-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="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>至
-                <el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>
+                <el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
               </el-form-item>
               <el-form-item label="客户">
-                <el-input v-model="queryParams.params.customerName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.customerName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="车牌号">
-                <el-input v-model="queryParams.params.vehMark" placeholder="" clearable />
+                <el-input v-model="queryParams.params.vehMark" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="车架号">
-                <el-input v-model="queryParams.params.vinNo" placeholder="" clearable />
+                <el-input v-model="queryParams.params.vinNo" placeholder="" clearable/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -43,468 +40,345 @@
         <!-- End 项目列表头部 -->
         <!-- Start 项目列表 -->
         <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
-            @selection-change="selectionLineChangeHandle">
-            <el-table-column fixed width="50" type="selection" align="center" />
-            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-            <!-- <el-table-column fixed label="操作" align="center" width="180">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" :disabled="scope.row.billState=='完成'"
-                  @click="toEdit(scope.row)">办理</el-button>
-                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
-              </template>
-            </el-table-column> -->
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center"/>
+            <el-table-column fixed width="60" 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="showOrder(scope.row)">
-                  {{ scope.row.billNo }}
-                </div>
+                <span class="bluezi" @click="showOrder(scope.row)">{{ scope.row.billNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="taskName" label="环节" align="center" />
-            <el-table-column prop="billTime" label="单据日期" align="center" />
-            <el-table-column prop="customerName" label="客户名称" align="center" />
-            <el-table-column prop="vehMark" label="车牌号" align="center" />
-            <el-table-column prop="vinNo" label="车架号" align="center" />
-            <el-table-column prop="shortss" label="旧件回收说明" align="center" />
+            <el-table-column prop="taskName" label="环节" align="center"/>
+            <el-table-column prop="billTime" label="单据日期" align="center"/>
+            <el-table-column prop="customerName" label="客户名称" align="center"/>
+            <el-table-column prop="vehMark" label="车牌号" align="center"/>
+            <el-table-column prop="vinNo" label="车架号" align="center"/>
+            <el-table-column prop="shortss" label="旧件回收说明" align="center"/>
             <el-table-column label="旧件照片" align="center">
               <template slot-scope="scope">
-                <div style="color: #1890FF; text-decoration: underline ;" @click="showImage(scope.row.photos)">
-                  查看
-                </div>
+                <span class="bluezi" @click="showImage(scope.row.photos)">查看</span>
               </template>
             </el-table-column>
-            <!--  <el-table-column label="旧件照片" align="center">
-              <template slot-scope="scope">
-                <span v-for="(item,index) in scope.row.photos" :key="index">
-                  <el-popover placement="left" trigger="click" width="300">
-                    <img :src="item" width="100%" />
-                    <img slot="reference" :src="item" :alt="item" style="height: 50px;width: 50px; padding: 5px" />
-                  </el-popover>
-                </span>
-              </template>
-            </el-table-column> -->
-
           </el-table>
         </div>
         <!-- End 项目列表 -->
         <div class="pages">
-          <div class="tit" />
+          <div class="tit"/>
           <!--  翻页  -->
-          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
         </div>
       </div>
     </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" />
+    <oldPartsRecoveryAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="loadList"/>
+    <repairbillInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
 
     <el-dialog title="旧件照片" :visible.sync="dialogVisible" :before-close="handleClose">
-
-      <el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
-
-        <el-row class="first_row">
-          <el-col :span="24" class="trightb">
-            <el-image style="width: 120px;height: 120px; margin: 10px; background: #f1f1f1;"
-              v-for="(item,index) in fileList" :src="item" :preview-src-list="[item]">
-            </el-image>
-          </el-col>
-        </el-row>
-
-      </el-form>
+      <el-image style="width: 120px;height: 120px;" v-for="(item, index) in fileList" :key="index" :src="item" :preview-src-list="item" />
     </el-dialog>
 
     <el-dialog title="旧件回收登记" :visible.sync="dialogVisible2" :before-close="handleClose2">
       <el-form ref="form_obj" class="formaddcopy02" :rules="rules" style="margin-top: -30px;" :model="orderInfo">
-
         <el-row class="first_row">
-
           <el-col :span="24">
             <div class="span-sty">维修单号</div>
             <el-form-item><span class="addinputInfo">{{ orderInfo.billNo }}</span></el-form-item>
           </el-col>
-
         </el-row>
         <el-row>
-
           <el-col :span="24">
             <div class="span-sty"><span class="must">*</span> 旧件回收说明</div>
             <el-form-item prop="shortss">
-              <el-input v-model="orderInfo.shortss" placeholder="" class="addinputw addinputInfo"
-                style="padding-top: 5px;padding-bottom: 5px;" type="textarea" :rows="4" clearable />
-
+              <el-input v-model="orderInfo.shortss" placeholder="" class="addinputw addinputInfo" style="padding-top: 5px;padding-bottom: 5px;" type="textarea" :rows="4" clearable/>
             </el-form-item>
           </el-col>
-
         </el-row>
         <el-row>
-
           <el-col :span="24">
             <div class="span-sty"><span class="must">*</span> 旧件照片</div>
             <el-form-item prop="photos">
-              <upload-img ref="uploadImg" class="addinputInfo" :accept="accept" v-model="imgList" :limit="50"
-                bucket="map" :upload-data="{ type: '0001' }" @change="backData" />
-
+              <upload-img ref="uploadImg" class="addinputInfo" :accept="accept" v-model="imgList" :limit="50" bucket="map" :upload-data="{ type: '0001' }" @change="backData"/>
             </el-form-item>
           </el-col>
-
         </el-row>
       </el-form>
-
       <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
         <el-button type="primary" style="margin-top: 20px;" @click="saveExamine">确 定</el-button>
       </div>
-
     </el-dialog>
-
-
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/oldPartsRecovery.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import divAdd from './oldPartsRecoveryAdd.vue'
-  import divInfo from './repairbillInfo.vue'
-  import uploadImg from '@/components/uploadFile/uploadImg'
-  export default {
-    components: {
-      ButtonBar,
-      Pagination,
-      pageye,
-      divAdd,
-      divInfo,
-      uploadImg,
-    },
-    data() {
-      return {
-        dialogVisible: false,
-        dialogVisible2: false,
-        orderInfo: {},
-        fileList: [],
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        tableLoading: false,
-        dataList: [],
-        btnList: [{
-            type: 'primary',
-            size: 'small',
-            icon: 'plus',
-            btnKey: 'toAdd',
-            btnLabel: '回收登记'
-          },
-          {
-            type: 'primary',
-            size: 'small',
-            icon: 'plus',
-            btnKey: 'toUp',
-            btnLabel: '上架'
-          },
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        queryParams: {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "billNo": "",
-            "createTimeStart": "",
-            "createTimeEnd": "",
-            "vehMark": "",
-            "customerName": "",
-            "vinNo": "",
-            "userSid": "",
-            "orgPath": "",
-            "menuUrl": ""
-          }
+import req from '@/api/storage/oldPartsRecovery.js'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import oldPartsRecoveryAdd from './oldPartsRecoveryAdd.vue'
+import repairbillInfo from '../../operation/repairbill/repairbillInfo'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  components: {
+    ButtonBar,
+    Pagination,
+    oldPartsRecoveryAdd,
+    repairbillInfo,
+    uploadImg
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      dialogVisible2: false,
+      orderInfo: {},
+      fileList: [],
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      tableLoading: false,
+      dataList: [],
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '回收登记'
         },
-        sids: [],
-        selectionList: [],
-        imgList: [],
-        accept: '.jpg,.jpeg,.png,.pdf,.JPG,.JPEG',
-        rules: {
-          shortss: [{
-            required: true,
-            message: '回收说明不能为空',
-            trigger: 'change'
-          }],
-          photos: [{
-            required: true,
-            message: '旧件不能为空',
-            trigger: 'blur'
-          }],
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toUp',
+          btnLabel: '上架'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          billNo: '',
+          createTimeStart: '',
+          createTimeEnd: '',
+          vehMark: '',
+          customerName: '',
+          vinNo: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: ''
         }
+      },
+      sids: [],
+      selectionList: [],
+      imgList: [],
+      accept: '.jpg,.jpeg,.png,.pdf,.JPG,.JPEG',
+      rules: {
+        shortss: [{ required: true, message: '回收说明不能为空', trigger: 'change' }],
+        photos: [{ required: true, message: '旧件不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  created() {
+    this.loadList()
+  },
+  methods: {
+    backData(value) {
+      this.imgList = value
+      this.orderInfo.photos = []
+      for (var i = 0; i < this.imgList.length; i++) {
+        this.orderInfo.photos.push(this.imgList[i].url)
       }
     },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
+    selectionLineChangeHandle(val) {
+      this.selectionList = val
+      const aa = []
+      val.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
     },
-    created() {
-      this.loadList()
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
     },
-    methods: {
-      backData(value) {
-        console.log('backData》》》》', value)
-        console.log('imgList', this.imgList)
-        this.imgList = value
-        this.orderInfo.photos = []
-        for (var i = 0; i < this.imgList.length; i++) {
-          this.orderInfo.photos.push(this.imgList[i].url)
-        }
-
-
-      },
-      selectionLineChangeHandle(val) {
-        console.log("val", val);
-
-        this.selectionList = val
-        const aa = []
-        val.forEach(element => {
-          aa.push(element.sid)
-        })
-        this.sids = aa
-
-      },
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
+    btnHandle(btnKey) {
+      switch (btnKey) {
+        case 'doDel':
+          this.doDel()
+          break
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'toUp':
+          this.toUp()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    loadList() {
+      this.tableLoading = true
+      this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+      this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.queryParams.params.menuUrl = this.$route.path
+      req.listPage(this.queryParams).then((resp) => {
+        this.tableLoading = false
+        if (resp.success) {
+          const data = resp.data
+          this.queryParams.total = data.total
+          this.dataList = data.records
         } else {
-          this.searchxianshitit = '显示查询条件'
+          // 根据resp.code进行异常情况处理
+          this.dataList = []
+          this.queryParams.total = 0
         }
-      },
-      btnHandle(btnKey) {
-        switch (btnKey) {
-          case 'doDel':
-            this.doDel()
-            break
-          case 'toAdd':
-            this.toAdd()
-            break
-          case 'toUp':
-            this.toUp()
-            break
-          case 'doClose':
-            this.doClose()
-            break
-          default:
-            break
+      }).catch(() => {
+        this.tableLoading = false
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    dosearch() {
+      this.queryParams.current = 1
+      this.loadList()
+    },
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          billNo: '',
+          createTimeStart: '',
+          createTimeEnd: '',
+          vehMark: '',
+          customerName: '',
+          vinNo: '',
+          userSid: '',
+          orgPath: '',
+          menuUrl: ''
         }
-      },
-      loadList() {
-        this.tableLoading = true
-        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
-        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-        this.queryParams.params.menuUrl = this.$route.path
-        req.listPage(this.queryParams).then((resp) => {
-          this.tableLoading = false
-          if (resp.success) {
-            const data = resp.data
-            this.queryParams.total = data.total
-            this.dataList = data.records
-          } else {
-            // 根据resp.code进行异常情况处理
-            this.dataList = []
-            this.queryParams.total = 0
-          }
-        }).catch(() => {
-          this.tableLoading = false
+      }
+      this.loadList()
+    },
+    toAdd() {
+      if (this.selectionList.length !== 1) {
+        this.$message({
+          showClose: true,
+          type: 'warning',
+          message: '请选择一条记录操作.'
         })
-      },
-
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      dosearch() {
-        this.queryParams.current = 1
-        this.loadList()
-      },
-      resetQuery() {
-        this.queryParams = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "billNo": "",
-            "createTimeStart": "",
-            "createTimeEnd": "",
-            "vehMark": "",
-            "customerName": "",
-            "vinNo": "",
-            "userSid": "",
-            "orgPath": "",
-            "menuUrl": ""
-          }
-        }
-        this.loadList()
-      },
-
-      toAdd() {
-
-        if (this.selectionList.length != 1) {
-          this.$message({
-            showClose: true,
-            type: 'warning',
-            message: '请选择一条记录操作.'
-          })
-          return
-        }
-        this.imgList = []
-        this.orderInfo = JSON.parse(JSON.stringify(this.selectionList[0]));
-        for (var i = 0; i < this.selectionList[0].photos.length; i++) {
-          this.imgList.push({
-            url: this.selectionList[0].photos[i]
-          })
-        }
-
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
+        return
+      }
+      this.imgList = []
+      this.orderInfo = JSON.parse(JSON.stringify(this.selectionList[0]))
+      for (var i = 0; i < this.selectionList[0].photos.length; i++) {
+        this.imgList.push({
+          url: this.selectionList[0].photos[i]
         })
-        this.dialogVisible2 = true
-
-        // req.getOneByBillNo(this.selectionList[0].sid).then((resp) => {
-
-        //   this.orderInfo = resp.data
-
-
-        //   for (var i = 0; i < resp.data.photos.length; i++) {
-        //     this.imgList.push({
-        //       url: resp.data.photos[i].url
-        //     })
-        //   }
-
-        //   this.dialogVisible2 = true
-
-        // }).catch(() => {})
-
-
-      },
-      toUp() {
-        if (this.selectionList.length != 1) {
-          this.$message({
-            showClose: true,
-            type: 'warning',
-            message: '请选择一条记录操作.'
+      }
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.dialogVisible2 = true
+    },
+    toUp() {
+      if (this.selectionList.length !== 1) {
+        this.$message({
+          showClose: true,
+          type: 'warning',
+          message: '请选择一条记录操作.'
+        })
+        return
+      }
+      this.viewState = 2
+      this.$refs['divAdd'].showEdit(this.selectionList[0])
+    },
+    showImage(paths) {
+      this.fileList = paths
+      this.dialogVisible = true
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+    saveExamine() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          req.saveorUpdateOldRegister(this.orderInfo).then((resp) => {
+            this.orderInfo = {}
+            this.imgList = []
+            this.loadList()
+            this.dialogVisible2 = false
+          }).catch(() => {
           })
-          return
         }
-
-        this.viewState = 2
-        this.$refs['divadd'].showEdit(this.selectionList[0])
-      },
-      showImage(paths) {
-        this.fileList = paths
-        this.dialogVisible = true
-      },
-      handleClose() {
-        this.dialogVisible = false
-      },
-
-      saveExamine() {
-
-        console.log('saveExamine》》》》', this.orderInfo)
-
-        // if (this.orderInfo.shortss == '') {
-        //   this.$message({
-        //     showClose: true,
-        //     type: 'warning',
-        //     message: '旧件回收说明不能为空'
-        //   })
-        //   return
-        // }
-
-        // if (this.orderInfo.photos.length == 0) {
-        //   this.$message({
-        //     showClose: true,
-        //     type: 'warning',
-        //     message: '旧件照片不能为空'
-        //   })
-        //   return
-        // }
-
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
-            req.saveorUpdateOldRegister(this.orderInfo).then((resp) => {
-              this.orderInfo = {}
-              this.imgList = []
-              this.loadList()
-              this.dialogVisible2 = false
-            }).catch(() => {})
-
-          }
-        })
-
-      },
-      handleClose2() {
-        this.imgList = []
-        this.dialogVisible2 = false
-      },
-
-      showOrder(row) {
-        this.viewState = 4
-        this.$refs['divinfo'].showInfo(row)
-      },
-
-
-      doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
-      },
-
-      resetState() {
-        this.viewState = 1
-      },
-
+      })
+    },
+    handleClose2() {
+      this.imgList = []
+      this.dialogVisible2 = false
+    },
+    showOrder(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo({ sid: row.billSid })
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    },
+    resetState() {
+      this.viewState = 1
     }
   }
+}
 </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;
-  }
+/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;
+}
 </style>
diff --git a/yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue b/yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue
index af2256e1d7..0de52c6c03 100644
--- a/yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue
+++ b/yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue
@@ -34,17 +34,14 @@
             <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
           </el-col>
         </el-row>
-
-        <div class="title  titleOne">
-          <div>待上架旧件列表</div>
-        </div>
+        <div class="title">待上架旧件列表</div>
         <el-table v-loading="listLoading" :data="list" border>
-          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column prop="goodsID" label="商品ID" align="center" />
-          <el-table-column prop="goodsSpuName" label="商品名称" align="center" />
-          <el-table-column label="商品编码" align="center" width="180">
+          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table-column prop="goodsID" label="商品ID" align="center"/>
+          <el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
+          <el-table-column label="图号" align="center" width="180">
             <template slot-scope="scope">
-              <el-input ref="focusAssumptionInput" v-model="scope.row.goodsSkuCode" clearable placeholder="" />
+              <el-input ref="focusAssumptionInput" v-model="scope.row.goodsSkuCode" clearable placeholder=""/>
             </template>
           </el-table-column>
           <el-table-column prop="manufacturerName" label="厂家" align="center" />
@@ -53,8 +50,7 @@
           <el-table-column prop="count" label="数量" align="center" />
           <el-table-column label="仓库" align="center" width="180">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
-                @change="selectWarehouseChange(scope.row,$event)">
+              <el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable @change="selectWarehouseChange(scope.row,$event)">
                 <el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
                 </el-option>
               </el-select>
@@ -62,9 +58,7 @@
           </el-table-column>
           <el-table-column label="库区" align="center" width="180">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.warehouseAreaName" :disabled="scope.row.warehouseName==''" clearable
-                @focus="getWarehouseArea(scope.row)" placeholder="请选择"
-                @change="selectWarehouseAreaChange(scope.row,$event)">
+              <el-select v-model="scope.row.warehouseAreaName" :disabled="scope.row.warehouseName==''" clearable @focus="getWarehouseArea(scope.row)" placeholder="请选择" @change="selectWarehouseAreaChange(scope.row,$event)">
                 <el-option v-for="(item,i) in warehouseAreaList" :key="i" :label="item.areaName" :value="item.sid">
                 </el-option>
               </el-select>
@@ -72,251 +66,178 @@
           </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.warehouseAreaName==''" clearable
-                @focus="getAllTypeByAreaSid(scope.row)" placeholder="请选择"
-                @change="selectWarehouseRackChange(scope.row,$event)">
+              <el-select v-model="scope.row.warehouseRackCode" :disabled="scope.row.warehouseAreaName==''" clearable @focus="getAllTypeByAreaSid(scope.row)" placeholder="请选择" @change="selectWarehouseRackChange(scope.row,$event)">
                 <el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.rackCode" :value="item.sid">
                 </el-option>
               </el-select>
             </template>
           </el-table-column>
-
         </el-table>
-
-
       </el-form>
-
     </div>
-
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/oldPartsRecovery.js'
-  import req2 from '@/api/warehouse/warehouse.js'
-  import req3 from '@/api/warehouse/warehouseArea.js'
-  import req4 from '@/api/warehouse/goodsShelves.js'
-  export default {
-    components: {},
-    data() {
-      return {
-        listLoading: false,
-        submitdisabled: false,
-        formobj: {
-          billNo: "",
-          customerName: "",
-          vehMark: "",
-          vinNo: "",
-
-        },
-        list: [],
-        warehouseList: [],
-        warehouseAreaList: [],
-        warehouseRackList: []
-      }
-    },
-    created() {},
-    methods: {
-      indexMethod(index) {
-        return index + 1
+import req from '@/api/storage/oldPartsRecovery.js'
+import { getAllWarehouse, getWarehouseareas, getAllRackByKQSid } from '@/api/Common/dictcommons'
+
+export default {
+  components: {},
+  data() {
+    return {
+      listLoading: false,
+      submitdisabled: false,
+      formobj: {
+        billNo: '',
+        customerName: '',
+        vehMark: '',
+        vinNo: ''
       },
-      init() {
-        var parpams = {
-          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
-        }
-
-        req2.getAllWarehouse(parpams).then(resp => {
+      list: [],
+      warehouseList: [],
+      warehouseAreaList: [],
+      warehouseRackList: []
+    }
+  },
+  methods: {
+    indexMethod(index) {
+      return index + 1
+    },
+    init() {
+      getAllWarehouse({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), warehouseTypeValue: '旧件库' }).then((resp) => {
+        if (resp.success) {
           this.warehouseList = resp.data
-        })
-
-      },
-
-      getWarehouseArea(row) {
-        var params = {
-          ckSid: row.warehouseSid
         }
-
-        req3.getAllWarehouseareaBysid(params).then(resp => {
-          console.log('>>>>>>>>>getAllWarehousearea', resp)
+      })
+    },
+    getWarehouseArea(row) {
+      this.warehouseAreaList = []
+      getWarehouseareas({ ckSid: row.warehouseSid }).then((resp) => {
+        if (resp.success) {
           this.warehouseAreaList = resp.data
-        }).catch(() => {})
-      },
-
-      getAllTypeByAreaSid(row) {
-        var params = {
-          areaSid: row.warehouseAreaSid
         }
-
-        req4.getAllTypeByAreaSid(params).then(resp => {
-          console.log('>>>>>>>>>getAllTypeByAreaSid', resp)
+      })
+    },
+    getAllTypeByAreaSid(row) {
+      this.warehouseRackList = []
+      getAllRackByKQSid({ kqSid: row.warehouseAreaSid }).then((resp) => {
+        if (resp.success) {
           this.warehouseRackList = resp.data
-        }).catch(() => {})
-      },
-
-
-      selectWarehouseChange(row, val) {
-        const choose = this.warehouseList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectWarehouseChange', choose)
+        }
+      })
+    },
+    selectWarehouseChange(row, val) {
+      const choose = this.warehouseList.filter((item) => item.sid === val)
+      if (choose !== null && choose.length > 0) {
         row.warehouseSid = choose[0].sid
         row.warehouseName = choose[0].warehouseName
-        row.warehouseAreaSid = ''
-        row.warehouseAreaName = ''
-        row.warehouseRackSid = ''
-        row.warehouseRackCode = ''
-        this.getWarehouseArea(row)
-
-      },
-
-      selectWarehouseAreaChange(row, val) {
-        const choose = this.warehouseAreaList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectWarehouseAreaChange', choose)
+      } else {
+        row.warehouseSid = ''
+        row.warehouseName = ''
+      }
+      row.warehouseAreaSid = ''
+      row.warehouseAreaName = ''
+      row.warehouseRackSid = ''
+      row.warehouseRackCode = ''
+    },
+    selectWarehouseAreaChange(row, val) {
+      const choose = this.warehouseAreaList.filter((item) => item.sid === val)
+      if (choose !== null && choose.length > 0) {
         row.warehouseAreaSid = choose[0].sid
         row.warehouseAreaName = choose[0].areaName
-        row.warehouseRackSid = ''
-        row.warehouseRackCode = ''
-        this.getAllTypeByAreaSid(row)
-      },
-
-      selectWarehouseRackChange(row, val) {
-        const choose = this.warehouseRackList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectWarehouseRackChange', choose)
+      } else {
+        row.warehouseAreaSid = ''
+        row.warehouseAreaName = ''
+      }
+      row.warehouseRackSid = ''
+      row.warehouseRackCode = ''
+    },
+    selectWarehouseRackChange(row, val) {
+      const choose = this.warehouseRackList.filter((item) => item.sid === val)
+      if (choose !== null && choose.length > 0) {
         row.warehouseRackSid = choose[0].sid
         row.warehouseRackCode = choose[0].rackCode
-
-      },
-
-
-      saveOrUpdate() {
-        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
-
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
-
-            for (var i in this.list) {
-
-              var item = this.list[i]
-
-              if (item.goodsSkuCode == '') {
-                this.$message({
-                  showClose: true,
-                  type: 'warning',
-                  message: '商品编码不能为空'
-                })
-                return
-              }
-
-              if (item.warehouseSid == '' || item.warehouseName == '') {
-                this.$message({
-                  showClose: true,
-                  type: 'warning',
-                  message: '仓库不能为空'
-                })
-                return
-              }
-              if (item.warehouseAreaSid == '' || item.warehouseAreaName == '') {
-                this.$message({
-                  showClose: true,
-                  type: 'warning',
-                  message: '库区不能为空'
-                })
-                return
-              }
-              if (item.warehouseRackSid == '' || item.warehouseRackCode == '') {
-                this.$message({
-                  showClose: true,
-                  type: 'warning',
-                  message: '库位不能为空'
-                })
-                return
-              }
-
-
+      } else {
+        row.warehouseRackSid = ''
+        row.warehouseRackCode = ''
+      }
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          for (var i in this.list) {
+            var item = this.list[i]
+            if (item.goodsSkuCode === '') {
+              this.$message({ showClose: true, type: 'warning', message: '图号不能为空' })
+              return
             }
-
-            var info = {
-              createBySid: window.sessionStorage.getItem('userSid'),
-              orgPath: window.sessionStorage.getItem('defaultOrgPath'),
-              oldList: this.list
+            if (item.warehouseSid === '' || item.warehouseName === '') {
+              this.$message({ showClose: true, type: 'warning', message: '仓库不能为空' })
+              return
+            }
+            if (item.warehouseAreaSid === '' || item.warehouseAreaName === '') {
+              this.$message({ showClose: true, type: 'warning', message: '库区不能为空' })
+              return
+            }
+            if (item.warehouseRackSid === '' || item.warehouseRackCode === '') {
+              this.$message({ showClose: true, type: 'warning', message: '库位不能为空' })
+              return
             }
-
-            this.submitdisabled = true
-            req.saveInventory(info).then((res) => {
-              if (res.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: '保存成功'
-                })
-                this.handleReturn('true')
-              } else {
-                this.submitdisabled = false
-              }
-            }).catch(() => {
-              this.submitdisabled = false
-            })
           }
-        })
-      },
-
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.formobj = {
-            billNo: "",
-            customerName: "",
-            vehMark: "",
-            vinNo: "",
-
-          },
-          this.list = []
-
-        this.submitdisabled = false
-        this.$emit('doback')
-      },
-
-      showAdd() {},
-      showEdit(row) {
-        this.init()
-        var params = {
-          busRepairBillSid: row.billSid
-        }
-        this.formobj = row
-
-        req.getOldDetailsByBillSid(params)
-          .then(resp => {
-            if (resp.success) {
-              this.list = resp.data
+          var info = {
+            createBySid: window.sessionStorage.getItem('userSid'),
+            orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+            oldList: this.list
+          }
+          this.submitdisabled = true
+          req.saveInventory(info).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
             }
+          }).catch(() => {
+            this.submitdisabled = false
           })
-          .catch(e => {
-            this.list = []
-          })
-      },
+        }
+      })
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        billNo: '',
+        customerName: '',
+        vehMark: '',
+        vinNo: ''
+      }
+      this.list = []
+      this.submitdisabled = false
+      this.$emit('doback')
+    },
+    showEdit(row) {
+      this.init()
+      this.formobj = row
+      req.getOldDetailsByBillSid({ busRepairBillSid: row.billSid }).then(resp => {
+          if (resp.success) {
+            this.list = resp.data
+          }
+        }).catch(e => {
+          this.list = []
+      })
     }
   }
+}
 </script>
 <style scoped>
-  .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;
-  }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.first_row {
+  border-top: 1px solid #E0E3EB;
+}
 </style>
diff --git a/yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryInfo.vue b/yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryInfo.vue
deleted file mode 100644
index 81f71a4eb6..0000000000
--- a/yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryInfo.vue
+++ /dev/null
@@ -1,158 +0,0 @@
-<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="12">
-            <div class="span-sty">维修工单编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty">申请日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.billTime }}</span></el-form-item>
-          </el-col>
-
-        </el-row>
-
-        <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">客户名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty">车牌号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item>
-          </el-col>
-
-
-        </el-row>
-
-        <el-row>
-
-          <el-col :span="12">
-            <div class="span-sty">车架号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <!-- <div class="span-sty"></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item> -->
-          </el-col>
-
-        </el-row>
-
-        <el-row>
-
-          <el-col :span="24">
-            <div class="span-sty">旧件回收说明</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.shortss }}</span></el-form-item>
-          </el-col>
-
-        </el-row>
-
-        <el-row>
-
-          <el-col :span="24">
-            <div class="span-sty">旧件照片</div>
-            <el-form-item>
-              <el-image class="addinputInfo" style="width: 120px;height: 120px; margin: 10px;"
-                v-for="(item,index) in formobj.photos" :src="item.url" :preview-src-list="[item.url]">
-              </el-image>
-            </el-form-item>
-          </el-col>
-
-        </el-row>
-
-      </el-form>
-
-    </div>
-
-
-  </div>
-</template>
-
-<script>
-  import req from '@/api/storage/oldPartsRecovery.js'
-
-  export default {
-    components: {},
-    data() {
-      return {
-        listLoading: false,
-        submitdisabled: false,
-        formobj: {},
-      }
-    },
-    methods: {
-      indexMethod(index) {
-        return index + 1
-      },
-
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.$emit('doback')
-      },
-
-      showAdd() {
-
-      },
-      showEdit(row) {
-
-        var params = {
-          sid: row.sid
-        }
-        req.getOneByBillNo(params)
-          .then(resp => {
-            if (resp.success) {
-              this.formobj = resp.data
-            }
-          })
-          .catch(e => {
-            this.formobj = {}
-          })
-      }
-    }
-  }
-</script>
-<style scoped>
-  .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;
-  }
-</style>
diff --git a/yxt-as-ui/src/views/storage/oldPartsRecovery/repairbillInfo.vue b/yxt-as-ui/src/views/storage/oldPartsRecovery/repairbillInfo.vue
deleted file mode 100644
index ce6f0f2718..0000000000
--- a/yxt-as-ui/src/views/storage/oldPartsRecovery/repairbillInfo.vue
+++ /dev/null
@@ -1,632 +0,0 @@
-<template>
-  <div class="app-container">
-    <div v-show="viewState == 1">
-      <div class="tab-header webtop">
-        <div>{{ viewTitle }}</div>
-        <div>
-          <!-- <el-button type="primary" size="small" v-show="formobj.showReSettleBtn" @click="negativeSettlement()">反结算</el-button> -->
-          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
-        </div>
-      </div>
-      <div class="listconadd">
-        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-          <el-row style="border-top: 1px solid #e0e3eb">
-            <el-col :span="8">
-              <div class="span-sty">制单人</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">制单部门</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">制单日期</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.createDate }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <div class="span-sty">维修单类型</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">科目</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.subject }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">索赔厂家</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.claimManufacturer }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <div class="span-sty">是否外出</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.isGoOut == '1' ? '是' : '否' }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">进厂时间</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.entryTime }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">预计完工</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.estimatedFinishTime }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <div class="span-sty">服务顾问</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">班组</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.groupName }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">主修人</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.mainRepairers }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <div class="span-sty">备注(打印)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.printRemarks }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">备注</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">特殊标注</div>
-              <el-form-item><span
-                  class="addinputInfo">{{ formobj.isSpecialSign == '1' ? '有' : '否' }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-collapse v-model="activeNames">
-            <el-collapse-item title="客户信息" name="1">
-              <el-row style="border-top: 1px solid #e0e3eb">
-                <el-col :span="8">
-                  <div class="span-sty">客户</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <div class="span-sty">联系电话</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.mobile }}</span></el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <div class="span-sty">客户来源</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.customerSource }}</span></el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <div class="span-sty">车牌号</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <div class="span-sty">车架号</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <div class="span-sty">车型</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.vehModel }}</span></el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <div class="span-sty">行驶里程(Km)</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.mileage }}</span></el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <div class="span-sty">油量(L)</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.oil }}</span></el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <div class="span-sty">当前里程(Km)</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.currentMileage }}</span></el-form-item>
-                </el-col>
-              </el-row>
-            </el-collapse-item>
-            <el-collapse-item title="对接人信息" name="2">
-              <el-row style="border-top: 1px solid #e0e3eb">
-                <el-col :span="8">
-                  <div class="span-sty">对接人姓名</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.dockingPeople }}</span></el-form-item>
-                </el-col>
-                <el-col :span="16">
-                  <div class="span-sty">对接人电话</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.dockingPhone }}</span></el-form-item>
-                </el-col>
-              </el-row>
-            </el-collapse-item>
-            <el-collapse-item title="保险信息" name="3" v-show="formobj.billTypeKey == '1'">
-              <el-row style="border-top: 1px solid #e0e3eb">
-                <el-col :span="8">
-                  <div class="span-sty">责任划分</div>
-                  <el-form-item><span
-                      class="addinputInfo">{{ formobj.insuranceVo.responsibility }}</span></el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <div class="span-sty">责任比例</div>
-                  <el-form-item><span
-                      class="addinputInfo">{{ formobj.insuranceVo.responsibilityRatio }}</span></el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <div class="span-sty">是否存在人伤</div>
-                  <el-form-item><span
-                      class="addinputInfo">{{ formobj.insuranceVo.isPersonInjuries == '1' ? '是' : formobj.insuranceVo.isPersonInjuries == '0' ? '否' : ''  }}</span></el-form-item>
-                </el-col>
-              </el-row>
-              <el-table :key="insuranceKey" :data="formobj.insuranceVo.insuranceList" :index="index" border
-                style="width: 100%">
-                <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
-                <el-table-column prop="useInsurer" label="使用保险方" align="center" min-width="150" />
-                <el-table-column prop="insuranceType" label="使用险种" align="center" min-width="150" />
-                <el-table-column prop="insuranceCompany" label="保险公司" align="center" min-width="150" />
-                <el-table-column prop="claimBillNo" label="报案号" align="center" min-width="180" />
-                <el-table-column prop="investigator" label="勘察员及电话" align="center" min-width="220" />
-                <el-table-column prop="lossAdjuster" label="定损员及电话" align="center" min-width="220" />
-              </el-table>
-            </el-collapse-item>
-            <el-collapse-item title="发票信息" name="4" v-show="formobj.subject == '保外'">
-              <el-row style="border-top: 1px solid #e0e3eb">
-                <el-col :span="8">
-                  <div class="span-sty">是否开发票</div>
-                  <el-form-item><span
-                      class="addinputInfo">{{ formobj.invoiceVo.isInvoicing == '1' ? '是' : formobj.invoiceVo.isInvoicing == '0' ? '否' : '' }}</span></el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <div class="span-sty">发票类型</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceType }}</span></el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <div class="span-sty">税率</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.taxRate }}</span></el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <div class="span-sty">开票单位</div>
-                  <el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceCompany }}</span></el-form-item>
-                </el-col>
-                <el-col :span="16">
-                  <div class="span-sty">加税点的项目</div>
-                  <el-form-item>
-                    <el-checkbox-group class="addinputInfo" v-model="formobj.invoiceVo.taxItems">
-                      <el-checkbox disabled label="维修项目"></el-checkbox>
-                      <el-checkbox disabled label="维修用料"></el-checkbox>
-                      <el-checkbox disabled label="附加项目"></el-checkbox>
-                      <el-checkbox disabled label="其它附加项目"></el-checkbox>
-                    </el-checkbox-group>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-collapse-item>
-          </el-collapse>
-          <div class="title">维修项目</div>
-          <el-table :key="serviceKey" :data="formobj.sitemVos" :index="index" border style="width: 100%">
-            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
-            <el-table-column prop="serviceItem" label="维修项目" align="center" width="200" />
-            <el-table-column prop="serviceType" label="工种" align="center" width="150" />
-            <el-table-column prop="repairerName" label="维修人" width="200" align="center" />
-            <el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
-            <el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
-            <el-table-column prop="hours" label="工时数" align="center" width="100" />
-            <el-table-column prop="price" label="销售价" align="center" width="150" />
-            <el-table-column prop="discount" label="折扣" align="center" width="100" />
-            <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
-            <el-table-column prop="amount" label="金额" align="center" width="150" />
-            <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
-          </el-table>
-          <div class="title">维修用料</div>
-          <el-row>
-            <el-col :span="24">
-              <div class="span-sty span-sty-one" style="width: 300px;!important;">前台登记时对商品要求备注</div>
-              <el-form-item><span class="addinputInfo-one">{{ formobj.registerRemarks }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
-            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
-            <el-table-column prop="serviceItem" label="维修项目" width="200" align="center" />
-            <el-table-column prop="goodsID" label="商品ID" width="200" align="center" />
-            <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
-            <el-table-column prop="goodsSkuCode" label="图号" width="100" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
-            <el-table-column prop="unit" label="单位" width="100" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
-            <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
-            <el-table-column prop="count" label="数量" width="100" align="center" />
-            <el-table-column prop="price" label="单价" align="center" width="150" />
-            <el-table-column prop="discount" label="折扣" align="center" width="100" />
-            <el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
-            <el-table-column prop="amount" label="销售金额" width="100" align="center" />
-            <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
-            <el-table-column prop="operName" label=领料人 width="100" align="center" />
-            <el-table-column prop="receivedTime" label="接收时间" width="120" align="center" />
-            <el-table-column prop="partsSellers" label="配件销售人" min-width="150" align="center" />
-          </el-table>
-          <div class="title">附加项目</div>
-          <el-row>
-            <el-col :span="8">
-              <div class="span-sty">外出费(元)</div>
-              <el-form-item>
-                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
-                  <span class="addinputInfo">{{ formobj.outAmount }}</span>
-                  <span v-show="formobj.outKPAmount !== ''">开票金额：{{ formobj.outKPAmount }}</span>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="16">
-              <div class="span-sty">备注</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <div class="span-sty">厂家补助(元)</div>
-              <el-form-item>
-                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
-                  <span class="addinputInfo">{{ formobj.subsidyAmount }}</span>
-                  <span v-show="formobj.subsidyKPAmount !== ''">开票金额：{{ formobj.subsidyKPAmount }}</span>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="16">
-              <div class="span-sty">备注</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <div class="span-sty">施救费(元)</div>
-              <el-form-item>
-                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
-                  <span class="addinputInfo">{{ formobj.rescueAmount }}</span>
-                  <span v-show="formobj.rescueKPAmount !== ''">开票金额：{{ formobj.rescueKPAmount }}</span>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">备注</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item>
-                <div style="display: flex;flex-direction: column;justify-content:flex-start;align-items: flex-start;">
-                  <el-button type="text" v-for="(item, index) in formobj.fileName" :key="index"
-                    @click="handleOpen(item.url)">{{ item.name }}</el-button>
-                </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
-            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
-            <el-table-column prop="aitemName" label="其它附加项目" align="center" width="200" />
-            <el-table-column prop="price" label="销售价" align="center" width="150" />
-            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
-          </el-table>
-          <el-row>
-            <el-col :span="24">
-              <div class="span-sty" style="border-right: 0px">应收合计：</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.receivableAmount }} = 工时费：{{ formobj.hourAmount }} +
-                  材料费：{{ formobj.goodsAmount }} + 附加费：{{ formobj.addAmount }}</span></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <div class="span-sty" style="border-right: 0px">实收合计：</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.actualAmount }} = 应收合计：{{ formobj.receivableAmount }}
-                  - 优惠：{{ formobj.discountAmount }}</span></el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </div>
-    <!-- <workslrsettlementAdd v-show="viewState == 2" ref="divFJS" @doback="resetState" /> -->
-  </div>
-</template>
-
-<script>
-  import req from '@/api/operation/repairbill'
-  // import workslrsettlementAdd from '../workslrsettlement/workslrsettlementAdd'
-
-  export default {
-    name: 'RepairBillInfo',
-    components: {
-      // workslrsettlementAdd
-    },
-    data() {
-      return {
-        viewTitle: '',
-        viewState: 1,
-        activeNames: '1',
-        tableKey: 0,
-        index: 0,
-        // service服务
-        serviceKey: 1,
-        // subjoin附加项目
-        subjoinKey: 2,
-        // insuranceKey保险信息
-        insuranceKey: 3,
-        formobj: {
-          sid: '',
-          registerRemarks: '',
-          billNo: '',
-          createByName: '',
-          createBySid: '',
-          deptName: '',
-          deptSid: '',
-          createDate: '',
-          billTypeKey: '',
-          billType: '',
-          subjectSid: '',
-          subject: '',
-          claimManufacturerSid: '',
-          claimManufacturer: '',
-          isGoOut: '',
-          estimatedFinishTime: '',
-          entryTime: '',
-          nodeName: '',
-          waitorName: '',
-          waitorSid: '',
-          groupSid: '',
-          groupName: '',
-          mainRepairers: '',
-          printRemarks: '',
-          remarks: '',
-          isSpecialSign: '',
-          discountAmount: '',
-          coupon: '',
-          scoreDeduct: '',
-          nodeTime: '',
-          outDoorState: '',
-          outDoorTime: '',
-          customerSid: '',
-          customerName: '',
-          mobile: '',
-          customerOrg: '',
-          customerSource: '',
-          memberCardSid: '',
-          memberCarNumber: '',
-          vehMark: '',
-          vinNo: '',
-          vehModel: '',
-          mileage: '',
-          oil: '',
-          currentMileage: '',
-          dockingPeopleSid: '',
-          dockingPeople: '',
-          dockingPhone: '',
-          invoiceVo: {
-            isInvoicing: '',
-            invoiceType: '',
-            invoiceTypeKey: '',
-            invoiceCompanySid: '',
-            invoiceCompany: '',
-            taxRate: '',
-            taxItems: []
-          },
-          insuranceVo: {
-            responsibility: '',
-            responsibilityKey: '',
-            isPersonInjuries: '',
-            responsibilityRatioKey: '',
-            responsibilityRatio: '',
-            insuranceList: []
-          },
-          sitemVos: [],
-          aitemVos: [],
-          goodsDetailsVos: [],
-          operatorSid: '',
-          nodeCode: '',
-          settleVo: {
-            payerNo: '',
-            payerName: '',
-            receivableAmount: '',
-            depositdeductAmount: '',
-            settleKey: '',
-            settleValue: '',
-            settleAmount: '',
-            otherSettleKey: '',
-            otherSettleValue: '',
-            debts: '',
-            settleTime: '',
-            otherSettleAmount: ''
-          },
-          showReSettleBtn: true,
-          hourAmount: '',
-          otherAmount: '',
-          goodsAmount: '',
-          addAmount: '',
-          taxAmount: '',
-          outAmount: '',
-          outKPAmount: '',
-          subsidyAmount: '',
-          subsidyKPAmount: '',
-          rescueAmount: '',
-          rescueKPAmount: '',
-          actualAmount: '',
-          receivableAmount: '',
-          subsidyRemarks: '',
-          rescueRemarks: '',
-          outRemarks: '',
-          fileName: [],
-          operator: '',
-          useOrgSid: '',
-          createOrgSid: ''
-        },
-        rules: {}
-      }
-    },
-    methods: {
-      showInfo(row) {
-        this.viewTitle = '维修单详情'
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        req.fetchBySid(row.billSid).then((res) => {
-          if (res.success) {
-            this.formobj = res.data
-            if (this.formobj.sitemVos.length > 0) {
-              this.formobj.sitemVos.forEach((e) => {
-                if (e.staffNameList.length > 0) {
-                  e.repairerName = e.staffNameList.join(',')
-                }
-              })
-            }
-            if (this.formobj.goodsDetailsVos.length > 0) {
-              this.formobj.goodsDetailsVos.forEach((e) => {
-                if (e.partsSellers.length > 0) {
-                  e.partsSellers = e.partsSellers.join(',')
-                }
-              })
-            }
-          }
-        })
-      },
-      resetState() {
-        this.viewState = 1
-      },
-      handleOpen(value) {
-        window.open(value, '_blank')
-      },
-      negativeSettlement() {
-        this.viewState = 2
-        this.$refs['divFJS'].showAdd(this.formobj.sid)
-      },
-      handleReturn() {
-        this.formobj = {
-          sid: '',
-          registerRemarks: '',
-          billNo: '',
-          createByName: '',
-          createBySid: '',
-          deptName: '',
-          deptSid: '',
-          createDate: '',
-          billTypeKey: '',
-          billType: '',
-          subjectSid: '',
-          subject: '',
-          claimManufacturerSid: '',
-          claimManufacturer: '',
-          isGoOut: '',
-          estimatedFinishTime: '',
-          entryTime: '',
-          nodeName: '',
-          waitorName: '',
-          waitorSid: '',
-          groupSid: '',
-          groupName: '',
-          mainRepairers: '',
-          printRemarks: '',
-          remarks: '',
-          isSpecialSign: '',
-          discountAmount: '',
-          coupon: '',
-          scoreDeduct: '',
-          nodeTime: '',
-          outDoorState: '',
-          outDoorTime: '',
-          customerSid: '',
-          customerName: '',
-          mobile: '',
-          customerOrg: '',
-          customerSource: '',
-          memberCardSid: '',
-          memberCarNumber: '',
-          vehMark: '',
-          vinNo: '',
-          vehModel: '',
-          mileage: '',
-          oil: '',
-          currentMileage: '',
-          dockingPeopleSid: '',
-          dockingPeople: '',
-          dockingPhone: '',
-          invoiceVo: {
-            isInvoicing: '',
-            invoiceType: '',
-            invoiceTypeKey: '',
-            invoiceCompanySid: '',
-            invoiceCompany: '',
-            taxRate: '',
-            taxItems: []
-          },
-          insuranceVo: {
-            responsibility: '',
-            responsibilityKey: '',
-            isPersonInjuries: '',
-            responsibilityRatioKey: '',
-            responsibilityRatio: '',
-            insuranceList: []
-          },
-          sitemVos: [],
-          aitemVos: [],
-          goodsDetailsVos: [],
-          operatorSid: '',
-          nodeCode: '',
-          settleVo: {
-            payerNo: '',
-            payerName: '',
-            receivableAmount: '',
-            depositdeductAmount: '',
-            settleKey: '',
-            settleValue: '',
-            settleAmount: '',
-            otherSettleKey: '',
-            otherSettleValue: '',
-            debts: '',
-            settleTime: '',
-            otherSettleAmount: ''
-          },
-          showReSettleBtn: true,
-          hourAmount: '',
-          otherAmount: '',
-          goodsAmount: '',
-          addAmount: '',
-          taxAmount: '',
-          outAmount: '',
-          outKPAmount: '',
-          subsidyAmount: '',
-          subsidyKPAmount: '',
-          rescueAmount: '',
-          rescueKPAmount: '',
-          actualAmount: '',
-          receivableAmount: '',
-          subsidyRemarks: '',
-          rescueRemarks: '',
-          outRemarks: '',
-          fileName: [],
-          operator: '',
-          useOrgSid: '',
-          createOrgSid: ''
-        }
-        this.activeNames = '1'
-        this.$emit('doback')
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .span-sty {
-    width: 130px !important;
-  }
-
-  .addinputInfo {
-    margin-left: 120px !important;
-  }
-
-  .span-sty-one {
-    width: 180px !important;
-  }
-
-  .addinputInfo-one {
-    margin-left: 170px !important;
-  }
-
-  /deep/ .el-collapse .el-collapse-item .el-collapse-item__header {
-    height: 42px !important;
-    line-height: 42px !important;
-  }
-</style>