diff --git a/src/api/repair/tickets/Tickets.js b/src/api/repair/tickets/Tickets.js
index 0beede8..a4bb7dd 100644
--- a/src/api/repair/tickets/Tickets.js
+++ b/src/api/repair/tickets/Tickets.js
@@ -37,7 +37,7 @@ export function setTicketsVoid(data){
   })
 }
 
-// 结算
+// 收款
 export function setTicketsPaid(data){
   return request({
     url: preUrl + "/paid",
@@ -46,6 +46,31 @@ export function setTicketsPaid(data){
   })
 }
 
+// 结算
+export function setTicketsSettlement(data){
+  return request({
+    url: preUrl + "/settlement",
+    method: 'post',
+    data
+  })
+}
+// 结算审核
+export function settlementReview(data){
+  return request({
+    url: preUrl + "/settlementReview",
+    method: 'post',
+    data
+  })
+}
+// 查询审批金额
+export function getSettlement(data){
+  return request({
+    url: preUrl + "/getSettlement",
+    method: 'GET',
+    params: data
+  })
+}
+
 
 export function print(id) {
   return request({
diff --git a/src/views/repair/tickets/Components/TicketSearch.vue b/src/views/repair/tickets/Components/TicketSearch.vue
index 2808cba..4e7f2e9 100644
--- a/src/views/repair/tickets/Components/TicketSearch.vue
+++ b/src/views/repair/tickets/Components/TicketSearch.vue
@@ -114,14 +114,21 @@ export default {
     async getPage() {
       switch (this.TicketType) {
         case "tu":
-          this.queryParams.ticketsStatus = "01"
+          // this.queryParams.ticketsStatus = "01"
+          this.queryParams.payStatus = "02"
           break
         case "tp":
-          this.queryParams.ticketsStatus = "02"
+          // this.queryParams.ticketsStatus = "02"
+          this.queryParams.payStatus = "03"
           break
         case "tv":
+          // this.queryParams.ticketsStatus = "03"
           this.queryParams.ticketsStatus = "03"
           break
+        case "ts":
+          // this.queryParams.ticketsStatus = "04"
+          this.queryParams.payStatus = "01"
+          break
         default:
           break
       }
diff --git a/src/views/repair/tickets/Components/TicketTable.vue b/src/views/repair/tickets/Components/TicketTable.vue
index 75a76e7..2527a4a 100644
--- a/src/views/repair/tickets/Components/TicketTable.vue
+++ b/src/views/repair/tickets/Components/TicketTable.vue
@@ -64,11 +64,11 @@
           <dict-tag :type="DICT_TYPE.REPAIR_TYPE" v-model="scope.row.repairType"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="状态" align="center" prop="ticketsWorkStatus" width="80">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :type="DICT_TYPE.REPAIR_TICKETS_WORK_STATUS" v-model="scope.row.ticketsWorkStatus"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column label="状态" align="center" prop="ticketsWorkStatus" width="80">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :type="DICT_TYPE.REPAIR_TICKETS_WORK_STATUS" v-model="scope.row.ticketsWorkStatus"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
       <el-table-column label="客户信息" align="center">
         <el-table-column label="客户名称" align="center" prop="userName" width="100"/>
         <el-table-column label="车牌号" align="center" prop="carNo" width="100"/>
@@ -82,27 +82,27 @@
           {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
         </template>
       </el-table-column>
-<!--      <el-table-column label="预计完工" align="center" prop="outTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          {{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column label="预计完工" align="center" prop="outTime" width="180">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          {{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
       <el-table-column label="合计金额" align="center" prop="totalPrice" width="80"/>
       <el-table-column label="参考成本" align="center" prop="cost" width="80"/>
       <el-table-column label="参考毛利" align="center" prop="profit" width="80"/>
-<!--      <el-table-column label="领料状态" align="center" prop="partStatus" width="80">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :type="DICT_TYPE.REPAIR_PART_STATUS" v-model="scope.row.partStatus"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column label="领料状态" align="center" prop="partStatus" width="80">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :type="DICT_TYPE.REPAIR_PART_STATUS" v-model="scope.row.partStatus"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
       <el-table-column label="服务顾问" align="center" prop="adviserName" width="100"/>
       <el-table-column label="备注" align="center" prop="remark" width="180"/>
       <el-table-column label="所属门店" align="center" prop="corpId" width="180"/>
-<!--      <el-table-column label="工单状态" align="center" prop="ticketsStatus" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :type="DICT_TYPE.REPAIR_TICKETS_STATUS" v-model="scope.row.ticketsStatus"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column label="工单状态" align="center" prop="ticketsStatus" width="180">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <dict-tag :type="DICT_TYPE.REPAIR_TICKETS_STATUS" v-model="scope.row.ticketsStatus"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
       <el-table-column label="操作" fixed="right" align="center" width="230">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleShow(scope.row)"
@@ -110,8 +110,16 @@
           </el-button>
           <el-button v-hasPermi="['repair:tk:paid']" size="mini" type="text" icon="el-icon-finished"
                      @click="handlePaid(scope.row)" v-if="TicketType === 'tu'"
+          >收款
+          </el-button>
+          <el-button v-hasPermi="['repair:tk:settlement']" size="mini" type="text" icon="el-icon-finished"
+                     @click="handleSettlement(scope.row,'js')" v-if="TicketType === 'ts' && !scope.row.settlement"
           >结算
           </el-button>
+          <el-button v-hasPermi="['repair:tk:settlement']" size="mini" type="text" icon="el-icon-finished"
+                     @click="handleSettlement(scope.row,'jssh')" v-if="TicketType === 'ts' && scope.row.settlement"
+          >结算审核
+          </el-button>
           <!--          <el-button v-if="TicketType === 'tp'" size="mini" type="text" icon="el-icon-refresh-right"-->
           <!--          >返结-->
           <!--          </el-button>-->
@@ -123,10 +131,11 @@
                      @click="handlePrint(scope.row)"
           >下载打印
           </el-button>
-<!--          <el-button size="mini" v-hasPermi="['repair:tk:edit']" type="text" icon="el-icon-setting" @click="handleEditTicket(scope.row)">-->
-<!--            编辑工单-->
-<!--          </el-button>-->
-          <el-button size="mini" v-hasPermi="['repair:tk:remove']" type="text" icon="el-icon-remove" @click="handleRemove(scope.row)">
+          <!--          <el-button size="mini" v-hasPermi="['repair:tk:edit']" type="text" icon="el-icon-setting" @click="handleEditTicket(scope.row)">-->
+          <!--            编辑工单-->
+          <!--          </el-button>-->
+          <el-button size="mini" v-hasPermi="['repair:tk:remove']" type="text" icon="el-icon-remove"
+                     @click="handleRemove(scope.row)">
             删除
           </el-button>
         </template>
@@ -157,21 +166,58 @@
     <TicketsShow ref="ticketsShow"/>
     <EditTickets ref="editTicket" @success="returnSuccess"/>
 
-    <el-dialog title="结算信息" :visible.sync="dialogVisible" width="40%" v-dialogDrag append-to-body>
+    <el-dialog title="收款信息" :visible.sync="dialogVisible" width="40%" v-dialogDrag append-to-body>
+      <el-form :model="settlementFormData" ref="formRefSettlement" :inline="true" label-width="10rem"
+               :rules="settlementFormRules">
+        <el-row :gutter="1">
+          <el-col :span="24">
+            <el-form-item label="金额" prop="payType">
+              <el-input disabled v-model="settlementFormData.money"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="1">
+          <el-col :span="24">
+            <el-form-item label="优惠类型" prop="payType">
+              <el-radio-group disabled v-model="settlementFormData.discountType" @change="jisuan">
+                <el-radio :label="item.value" :key="item.value" v-for="item in discountTypeList">{{ item.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="1">
+          <el-col :span="24">
+            <el-form-item label="优惠" prop="payType">
+              <el-input-number disabled v-model="settlementFormData.discount" @change="jisuan"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="1">
+          <el-col :span="24">
+            <el-form-item label="实付金额" prop="payType">
+              <el-input disabled v-model="settlementFormData.actualMoney"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
       <el-form :model="formData" ref="formRef" :inline="true" label-width="10rem" :rules="formRules">
         <el-row :gutter="1">
           <el-col :span="24">
-            <el-form-item label="结算方法" prop="payType">
+            <el-form-item label="收款方法" prop="payType">
               <el-select v-model="formData.payType">
-                <el-option v-for="item in this.getDictDataByCode(DICT_TYPE.REPAIR_PAY_TYPE)" :key="item.value" :label="item.label" :value="item.value" />
+                <el-option v-for="item in this.getDictDataByCode(DICT_TYPE.REPAIR_PAY_TYPE)" :key="item.value"
+                           :label="item.label" :value="item.value"/>
               </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="1">
           <el-col :span="24">
-            <el-form-item label="结算备注" prop="remark">
-              <el-input style="width:30rem" type="textarea" v-model="formData.remark" :autosize="{ minRows: 4, maxRows: 8}"/>
+            <el-form-item label="收款备注" prop="remark">
+              <el-input style="width:30rem" type="textarea" v-model="formData.remark"
+                        :autosize="{ minRows: 4, maxRows: 8}"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -181,11 +227,67 @@
         <el-button @click="dialogVisible = false">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="settlementType === 'jssh' ? '结算审核': '结算信息'" :visible.sync="dialogVisibleSettlement"
+               width="40%" v-dialogDrag append-to-body>
+      <el-form :model="settlementFormData" ref="formRefSettlement" :inline="true" label-width="10rem"
+               :rules="settlementFormRules">
+        <el-row :gutter="1">
+          <el-col :span="24">
+            <el-form-item label="金额" prop="payType">
+              <el-input disabled v-model="settlementFormData.money"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="1">
+          <el-col :span="24">
+            <el-form-item label="优惠类型" prop="payType">
+              <el-radio-group v-model="settlementFormData.discountType" @change="jisuan">
+                <el-radio :label="item.value" :key="item.value" v-for="item in discountTypeList">{{ item.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="1">
+          <el-col :span="24">
+            <el-form-item label="优惠" prop="payType">
+              <el-input-number v-model="settlementFormData.discount" @change="jisuan"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="1">
+          <el-col :span="24">
+            <el-form-item label="实付金额" prop="payType">
+              <el-input v-model="settlementFormData.actualMoney"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+<!--        <el-row :gutter="1">-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="结算备注" prop="remark">-->
+<!--              <el-input style="width:30rem" type="textarea" v-model="formData.remark"-->
+<!--                        :autosize="{ minRows: 4, maxRows: 8}"/>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="doSettlement">确 定</el-button>
+        <el-button @click="dialogVisibleSettlement = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {setTicketsVoid, setTicketsPaid, setTicketsPrint, removeTicketById} from '@/api/repair/tickets/Tickets'
+import {
+  setTicketsVoid,
+  setTicketsPaid,
+  setTicketsPrint,
+  removeTicketById,
+  setTicketsSettlement, settlementReview, getSettlement
+} from '@/api/repair/tickets/Tickets'
 import TicketsShow from "@/views/repair/tickets/Components/TicketsShow.vue";
 import {getByNameAndMobile} from "@/api/base/customer";
 import EditTickets from "@/views/repair/tickets/form/EditTickets.vue";
@@ -203,8 +305,12 @@ export default {
       type: Array,
       default: []
     },
-    isWXCW:{
-      type:Boolean
+    isWXCW: {
+      type: Boolean
+    },
+    defaultDiscountType: {
+      type: [Number, String],
+      default: '1'
     }
   },
   data() {
@@ -216,11 +322,32 @@ export default {
         billingRemark: null,
         payType: null
       },
-      formRules:{
+      settlementFormData: {
+        actualMoney: 0,
+        discountType: this.defaultDiscountType,
+        discount: 0
+      },
+      formRules: {
         payType: [{required: true, message: '支付方式不能为空', trigger: 'blur'}]
       },
+      settlementFormRules: {
+        discountType: [{required: true, message: '优惠类型不能为空', trigger: 'blur'}],
+        discount: [{required: true, message: '优惠不能为空', trigger: 'blur'}]
+      },
       dialogVisible: false,
-      isHangAccount: false
+      dialogVisibleSettlement: false,
+      isHangAccount: false,
+      settlementType: null,
+      discountTypeList: [
+        {
+          label: '金额',
+          value: '1'
+        },
+        {
+          label: '折扣',
+          value: '2'
+        }
+      ]
     }
   },
   methods: {
@@ -251,7 +378,7 @@ export default {
      * 打印
      */
     async handlePrint(row) {
-      window.open(process.env.VUE_APP_BASE_API + '/admin-api/repair/tickets/print/'+row.id)
+      window.open(process.env.VUE_APP_BASE_API + '/admin-api/repair/tickets/print/' + row.id)
     },
 
     async doPrint(data) {
@@ -262,7 +389,19 @@ export default {
       } catch {
       }
     },
+    jisuan() {
+      // 根据优惠类型计算
+      if (this.settlementFormData.discountType === '1') {
+        this.settlementFormData.actualMoney = this.settlementFormData.money - this.settlementFormData.discount
+      } else if (this.settlementFormData.discountType === '2') {
+        // 保留小数点后两位
+        this.settlementFormData.actualMoney = this.settlementFormData.money * (1 - this.settlementFormData.discount / 100)
+        this.settlementFormData.actualMoney = parseFloat(this.settlementFormData.actualMoney).toFixed(2)
+      }
+      console.log(this.settlementFormData)
+    },
 
+    //收款
     handlePaid(row) {
       this.formData = {
         id: null,
@@ -274,14 +413,51 @@ export default {
       this.formData['ticketsStatus'] = '02'
       this.dialogVisible = true
       this.checkIsHangAccount(row)
+      this.getSettlement(row)
     },
-    async checkIsHangAccount(row){
+
+    //结算
+    handleSettlement(row, type) {
+      this.settlementType = type
+      if (type == 'js') {
+        this.settlementFormData = {
+          ticketId: row.id,
+          money: row.totalPrice,
+          actualMoney: row.totalPrice,
+          discountType: this.defaultDiscountType, // 加上这一行
+          discount: 0 // 加上这一行
+        }
+      } else if (type === 'jssh') {
+        this.settlementFormData = row.settlement
+        this.settlementFormData['ticketId'] = row.id
+      }
+      this.dialogVisibleSettlement = true
+
+    },
+    async checkIsHangAccount(row) {
       const data = {
         cusName: row.userName, phoneNumber: row.userMobile
       }
       const res = await getByNameAndMobile(data)
       this.isHangAccount = res.data.isHangAccount === '1'
     },
+    async getSettlement(row) {
+      const data = {
+        id: row.id
+      }
+      const res = await getSettlement(data)
+      if (res.data) {
+        this.settlementFormData = res.data
+      }else {
+        this.settlementFormData = {
+          ticketId: null,
+          money: null,
+          actualMoney: null,
+          discountType: null,
+          discount: null
+        }
+      }
+    },
     async doPaid() {
       try {
         await this.$refs['formRef'].validate()
@@ -289,32 +465,48 @@ export default {
         this.$modal.msgSuccess(this.formData.payType === '01' ? "等待客户支付" : "结算成功")
         this.dialogVisible = false
         this.$emit("setVoid")
-      }catch{}
+      } catch {
+      }
     },
-    getDictDataByCode(code){
+    async doSettlement() {
+      try {
+        await this.$refs['formRefSettlement'].validate()
+        if (this.settlementType === 'jssh') {
+          await settlementReview(this.settlementFormData)
+        } else {
+          await setTicketsSettlement(this.settlementFormData)
+        }
+        this.$modal.msgSuccess("提交成功")
+        this.dialogVisibleSettlement = false
+        this.$emit("setVoid")
+      } catch {
+      }
+    },
+    getDictDataByCode(code) {
       const data = this.getDictDatas(code);
-      if (this.isHangAccount){
+      if (this.isHangAccount) {
         return data
-      }else {
+      } else {
         return data.filter(item => !item.label.includes("挂账"))
       }
     },
-    handleEditTicket(row){
+    handleEditTicket(row) {
       this.$refs.editTicket.open(row)
     },
-    returnSuccess(){
+    returnSuccess() {
       this.$emit("success")
     },
-    async handleRemove(row){
+    async handleRemove(row) {
       try {
         const id = row.id
-        if (id){
+        if (id) {
           await this.$modal.confirm("确认删除工单" + row.ticketNo + "吗？")
           await removeTicketById(id)
           await this.listTickets()
           this.$modal.msgSuccess("删除成功")
         }
-      }catch{}
+      } catch {
+      }
     }
   }
 }
diff --git a/src/views/repair/tickets/SettlementTicket.vue b/src/views/repair/tickets/SettlementTicket.vue
new file mode 100644
index 0000000..c6f3c62
--- /dev/null
+++ b/src/views/repair/tickets/SettlementTicket.vue
@@ -0,0 +1,22 @@
+<template>
+  <div class="app-container">
+    <TicketSearch :ticket-type="'ts'"/>
+  </div>
+</template>
+
+<script>
+import TicketSearch from "@/views/repair/tickets/Components/TicketSearch.vue";
+
+export default {
+  name: "UnpaidTicket",
+  components: {TicketSearch},
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>