Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/api/operation/pendingclaim.js

@@ -4,10 +4,18 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/as/v1/asbusrepairbillreversesettle/listPage',
+      url: '/as/v1/AsBusrepairBill/billPageList',
       method: 'post',
       data: params,
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  save: function(data) {
+    return request({
+      url: '/as/v1/AsBusclaimBill/save',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  }
 }

yxt-as-ui/src/router/index.js

@@ -98,6 +98,12 @@ export const constantRoutes = [{
         name: 'WorkSLRSettlement',
         meta: { title: '工单反结算管理', noCache: true }
       },
+      {
+        path: '/pendingclaim/pendingclaim',
+        component: () => import('@/views/operation/pendingclaim/pendingclaim.vue'),
+        name: 'PendingClaim',
+        meta: { title: '待索赔维修工单', noCache: true }
+      },
     ]
   },
   {

yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue

@@ -27,8 +27,9 @@
                 <el-date-picker v-model="listQuery.params.createTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
               </el-form-item>
               <el-form-item label="工单类型">
-                <el-select v-model="listQuery.params.billType" placeholder="请选择" clearable filterable>
+                <el-select v-model="listQuery.params.billType" clearable placeholder="请选择" filterable>
-                  <el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
+                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
+                  </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="科目">
@@ -120,6 +121,44 @@
         <!--End查询列表部分-->
       </div>
     </div>
+    <el-dialog :visible.sync="dialogVisible" width="70%">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="24">
+            <div class="span-sty">维修工单编号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.repairBillNo }}</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.customerName }}</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.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.vinNo }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">厂家索赔单号</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.billNo" clearable placeholder="" /></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" size="small" @click="handleConfirm">确定</el-button>
+        <el-button size="small" @click="handleClose">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -128,6 +167,7 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/operation/pendingclaim'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'PendingClaim',
@@ -139,6 +179,7 @@ export default {
   data() {
     return {
       btndisabled: false,
+      dialogVisible: false,
       btnList: [
         {
           type: 'primary',
@@ -161,7 +202,8 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
-      supplier_list: [],
+      multipleSelection: [],
+      billType_list: [],
       FormLoading: false,
       listLoading: false,
       // 翻页
@@ -193,6 +235,16 @@ export default {
           groupName: '',
           mainRepairers: ''
         }
+      },
+      formobj: {
+        repairBillSid: '',
+        repairBillNo: '',
+        customerName: '',
+        vehMark: '',
+        vinNo: '',
+        billNo: '',
+        createBySid: '',
+        orgPath: ''
       }
     }
   },
@@ -206,6 +258,11 @@ export default {
   },
   methods: {
     init() {
+      typeValues({ type: 'billType' }).then((res) => {
+        if (res.success) {
+          this.billType_list = res.data
+        }
+      })
     },
     // 搜索条件效果
     clicksearchShow() {
@@ -232,6 +289,7 @@ export default {
     // 信息条数 获取点击时当前的sid
     handleSelectionChange(row) {
       const aa = []
+      this.multipleSelection = row
       row.forEach(element => {
         aa.push(element.sid)
       })
@@ -298,11 +356,44 @@ export default {
     },
     toMaintain() {
       if (this.sids.length === 1) {
-
+        this.dialogVisible = true
+        this.formobj.repairBillNo = this.multipleSelection[0].billNo
+        this.formobj.repairBillSid = this.multipleSelection[0].sid
+        this.formobj.customerName = this.multipleSelection[0].customerName
+        this.formobj.vehMark = this.multipleSelection[0].vehMark
+        this.formobj.vinNo = this.multipleSelection[0].vinNo
       } else {
         this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
       }
     },
+    handleConfirm() {
+      if (this.formobj.billNo === '') {
+        this.$message({ showClose: true, type: 'error', message: '厂家索赔单号不能为空' })
+        return
+      }
+      this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      req.save(this.formobj).then((resp) => {
+        if (resp.success) {
+          this.$message({ showClose: true, type: 'success', message: '保存成功' })
+          this.getList()
+          this.handleClose()
+        }
+      })
+    },
+    handleClose() {
+      this.dialogVisible = false
+      this.formobj = {
+        repairBillSid: '',
+        repairBillNo: '',
+        customerName: '',
+        vehMark: '',
+        vinNo: '',
+        billNo: '',
+        createBySid: '',
+        orgPath: ''
+      }
+    },
     doClose() {
       this.$store.dispatch('tagsView/delView', this.$route)
       this.$router.go(-1)
@@ -311,4 +402,10 @@ export default {
 }
 </script>
 <style scoped>
+.span-sty {
+  width: 80px !important;
+}
+.addinputInfo {
+  margin-left: 75px !important;
+}
 </style>