Merge remote-tracking branch 'origin/master'

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

@@ -10,6 +10,22 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  update: function(data) {
+    return request({
+      url: '/as/v1/AsBusclaimBill/update',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  delBySids: function(data) {
+    return request({
+      url: '/as/v1/AsBusclaimBill/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
   downloadExcel: function() {
     return request({
       url: '/as/v1/AsBusclaimBill/downloadExcel',
@@ -19,5 +35,16 @@ export default {
         'Content-Type': 'application/json'
       }
     })
+  },
+  excelList: function(data) {
+    return request({
+      url: '/as/v1/AsBusclaimBill/excelList',
+      method: 'post',
+      data: data,
+      responseType: 'blob', // 表明返回服务器返回的数据类型
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
   }
 }

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

@@ -12,14 +12,37 @@
               <el-form-item label="索赔单号">
                 <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
               </el-form-item>
+              <el-form-item label="索赔单类型">
+                <el-input v-model="listQuery.params.shClaimTypeValue" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="维修单号">
                 <el-input v-model="listQuery.params.repairBillNo" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="单据状态">
+              <el-form-item label="进厂日期">
+                <el-date-picker v-model="listQuery.params.entryTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.entryTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="竣工日期">
+                <el-date-picker v-model="listQuery.params.finishTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.finishTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="结算日期">
+                <el-date-picker v-model="listQuery.params.settleTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.settleTimeEnd" 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.state" placeholder="请选择" clearable filterable>
                   <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="审核时间">
+                <el-date-picker v-model="listQuery.params.auditDateStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.auditDateEnd" 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.invoiceState" placeholder="请选择" clearable filterable>
                   <el-option v-for="item in invoiceState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
@@ -48,8 +71,12 @@
             <el-table-column type="selection" align="center" width="50" />
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
             <el-table-column prop="repairBillNo" label="维修单号" align="center" min-width="170" />
+            <el-table-column prop="shClaimTypeValue" label="索赔单类型" align="center" width="130" />
             <el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+            <el-table-column prop="entryTime" label="进厂日期" align="center" width="120" />
+            <el-table-column prop="finishTime" label="竣工日期" align="center" width="120" />
+            <el-table-column prop="settleTime" label="结算日期" align="center" width="120" />
             <el-table-column prop="billNo" label="索赔单号" align="center" width="170" />
             <el-table-column prop="modifyTime" label="更新时间" align="center" width="120" />
             <el-table-column prop="claimHourAmount" label="索赔工时费" align="center" width="120" />
@@ -57,12 +84,10 @@
             <el-table-column prop="claimOutAmount" label="外出费" align="center" width="100" />
             <el-table-column prop="claimSubsidyAmount" label="厂家补助" align="center" width="120" />
             <el-table-column prop="claimRescueAmount" label="施救费" align="center" width="120" />
-            <el-table-column prop="claimOtherAmount" label="索赔其它费用" align="center" width="120" />
-            <el-table-column label="单据状态" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.state == '0' ? '审核中' : scope.row.state == '1' ? '已通过' : scope.row.state == '2' ? '未通过' : scope.row.state == '3' ? '作废' : '' }}</span>
-              </template>
-            </el-table-column>
+            <el-table-column prop="claimOtherAmount" label="索赔其它费用" align="center" width="140" />
+            <el-table-column prop="claimTotalAmount" label="索赔合计" align="center" width="120" />
+            <el-table-column prop="state" label="审核状态" align="center" width="100" />
+            <el-table-column prop="auditDate" label="审核时间" align="center" width="120" />
             <el-table-column label="开票状态" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.invoiceState == '1' ? '开票中' : scope.row.invoiceState == '2' ? '已开票' : scope.row.invoiceState == '0' ? '未开票' : '' }}</span>
@@ -122,6 +147,67 @@
         <el-button size="small" @click="dialogVisible = false">取消</el-button>
       </div>
     </el-dialog>
+    <!-- 编辑 -->
+    <el-dialog center :visible.sync="dialogVisibleByForm" width="70%">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="8">
+            <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-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><el-input class="addinputInfo addinputw" @keyup.native="formobj.claimHourAmount = getNumber(formobj.claimHourAmount, 2)" v-model="formobj.claimHourAmount" clearable placeholder="" /></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">材料费</div>
+            <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.claimGoodsAmount = getNumber(formobj.claimGoodsAmount, 2)" v-model="formobj.claimGoodsAmount" clearable placeholder="" /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">外出费</div>
+            <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.claimOutAmount = getNumber(formobj.claimOutAmount, 2)" v-model="formobj.claimOutAmount" clearable placeholder="" /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">厂家补助</div>
+            <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.claimSubsidyAmount = getNumber(formobj.claimSubsidyAmount, 2)" v-model="formobj.claimSubsidyAmount" clearable placeholder="" /></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">施救费</div>
+            <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.claimRescueAmount = getNumber(formobj.claimRescueAmount, 2)" v-model="formobj.claimRescueAmount" clearable placeholder="" /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">其它费用</div>
+            <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.claimOtherAmount = getNumber(formobj.claimOtherAmount, 2)" v-model="formobj.claimOtherAmount" clearable placeholder="" /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">审核状态</div>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.state" clearable placeholder="" /></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <div class="span-sty">审核时间</div>
+            <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.auditDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <div class="span-sty">保单时间</div>
+            <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.policyDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" 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="FormByConfirm">确定</el-button>
+        <el-button size="small" @click="FormByColse">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -142,6 +228,27 @@ export default {
     return {
       btndisabled: false,
       btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: 'export',
+          btnKey: 'doExport',
+          btnLabel: '导出'
+        },
         {
           type: 'success',
           size: 'small',
@@ -163,22 +270,27 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
+      multipleSelection: [],
       state_list: [
         {
           dictKey: '0',
-          dictValue: '审核中'
+          dictValue: '审核不通过'
         },
         {
           dictKey: '1',
-          dictValue: '已通过'
+          dictValue: '未提报'
         },
         {
           dictKey: '2',
-          dictValue: '未通过'
+          dictValue: '审核通过'
         },
         {
           dictKey: '3',
           dictValue: '作废'
+        },
+        {
+          dictKey: '4',
+          dictValue: '已驳回'
         }
       ],
       invoiceState_list: [
@@ -215,7 +327,16 @@ export default {
         params: {
           billNo: '',
           repairBillNo: '',
+          shClaimTypeValue: '',
+          entryTimeStart: '',
+          entryTimeEnd: '',
+          finishTimeStart: '',
+          finishTimeEnd: '',
+          settleTimeStart: '',
+          settleTimeEnd: '',
           state: '',
+          auditDateStart: '',
+          auditDateEnd: '',
           invoiceState: '',
           adjustState: '',
           createBySid: '',
@@ -231,6 +352,21 @@ export default {
       },
       headers: {
         token: window.sessionStorage.getItem('token')
+      },
+      dialogVisibleByForm: false,
+      formobj: {
+        sid: '',
+        billNo: '',
+        vinNo: '',
+        claimHourAmount: '',
+        claimGoodsAmount: '',
+        claimOutAmount: '',
+        claimSubsidyAmount: '',
+        claimRescueAmount: '',
+        claimOtherAmount: '',
+        state: '',
+        auditDate: '',
+        policyDate: ''
       }
     }
   },
@@ -253,6 +389,15 @@ export default {
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
+        case 'toEdit':
+          this.toEdit()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doExport':
+          this.doExport()
+          break
         case 'doImport':
           this.doImport()
           break
@@ -270,6 +415,7 @@ export default {
         aa.push(element.sid)
       })
       this.sids = aa
+      this.multipleSelection = row
     },
     // 表中序号
     indexMethod(index) {
@@ -307,7 +453,16 @@ export default {
         params: {
           billNo: '',
           repairBillNo: '',
+          shClaimTypeValue: '',
+          entryTimeStart: '',
+          entryTimeEnd: '',
+          finishTimeStart: '',
+          finishTimeEnd: '',
+          settleTimeStart: '',
+          settleTimeEnd: '',
           state: '',
+          auditDateStart: '',
+          auditDateEnd: '',
           invoiceState: '',
           adjustState: '',
           createBySid: '',
@@ -316,10 +471,99 @@ export default {
       }
       this.getList()
     },
-    doImport() {
-      this.dialogVisible = true
-      this.fileList = []
-      this.uploadResultMesssage = ''
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
+    toEdit() {
+      if (this.multipleSelection.length === 1) {
+        this.dialogVisibleByForm = true
+        this.formobj = {
+          sid: this.multipleSelection[0].sid,
+          billNo: this.multipleSelection[0].billNo,
+          vinNo: this.multipleSelection[0].vinNo,
+          claimHourAmount: this.multipleSelection[0].claimHourAmount,
+          claimGoodsAmount: this.multipleSelection[0].claimGoodsAmount,
+          claimOutAmount: this.multipleSelection[0].claimOutAmount,
+          claimSubsidyAmount: this.multipleSelection[0].claimSubsidyAmount,
+          claimRescueAmount: this.multipleSelection[0].claimRescueAmount,
+          claimOtherAmount: this.multipleSelection[0].claimOtherAmount,
+          state: this.multipleSelection[0].state,
+          auditDate: this.multipleSelection[0].auditDate,
+          policyDate: this.multipleSelection[0].policyDate
+        }
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+      }
+    },
+    FormByConfirm() {
+      req.update(this.formobj).then((resp) => {
+        if (resp.success) {
+          this.$message({ showClose: true, type: 'success', message: '操作成功' })
+          this.getList()
+          this.FormByColse()
+        }
+      })
+    },
+    FormByColse() {
+      this.dialogVisibleByForm = false
+      this.formobj = {
+        sid: '',
+        billNo: '',
+        vinNo: '',
+        claimHourAmount: '',
+        claimGoodsAmount: '',
+        claimOutAmount: '',
+        claimSubsidyAmount: '',
+        claimRescueAmount: '',
+        claimOtherAmount: '',
+        state: '',
+        auditDate: '',
+        policyDate: ''
+      }
+    },
+    doDel() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+        return
+      }
+      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        req.delBySids(this.sids).then(resp => {
+          if (resp.success) {
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+          }
+          this.getList()
+          loading.close()
+        }).catch(e => {
+          loading.close()
+        })
+      }).catch(() => {
+      })
     },
     downLoad() {
       const loading = this.$loading({
@@ -346,6 +590,36 @@ export default {
         loading.close()
       })
     },
+    doExport() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      req.excelList(this.listQuery.params).then((resp) => {
+        loading.close()
+        const blob = new Blob([resp], {
+          type: 'application/vnd.ms-excel'
+        })
+        const fileName = '厂家索赔单' + '.xls'
+        const elink = document.createElement('a')
+        elink.download = fileName
+        elink.style.display = 'nonde'
+        elink.href = URL.createObjectURL(blob)
+        document.body.appendChild(elink)
+        elink.click()
+        URL.revokeObjectURL(elink.href)
+        document.body.removeChild(elink)
+      }).catch(() => {
+        loading.close()
+      })
+    },
+    doImport() {
+      this.dialogVisible = true
+      this.fileList = []
+      this.uploadResultMesssage = ''
+    },
     handleChange(file) {
       this.uploadData.fileName = file.name
     },
@@ -376,4 +650,17 @@ export default {
 }
 </script>
 <style scoped>
+.span-sty {
+  width: 80px !important;
+}
+.addinputInfo {
+  margin-left: 75px !important;
+}
+/deep/ .el-form-item__error {
+  margin-left: 75px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 75px !important;
+  width: calc(100% - 70px);
+}
 </style>