From a0fa5bb64ba69d34dbf743668940429987be6ad3 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 15 May 2024 17:14:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/api/operation/repairbill.js     |  9 ++++
 .../operation/repairbill/repairbillAdd.vue    | 12 ++---
 .../repairbill/repairbillBYLeaveFactory.vue   | 52 +++++++------------
 .../repairbill/repairbillByBeCompleted.vue    | 52 +++++++------------
 .../repairbill/repairbillByMaintain.vue       | 52 +++++++------------
 .../repairbill/repairbillBySendWork.vue       | 52 +++++++------------
 .../repairbill/repairbillBySettleAccounts.vue | 52 +++++++------------
 .../operation/repairbill/repairbillInfo.vue   | 13 +++++
 8 files changed, 123 insertions(+), 171 deletions(-)

diff --git a/yxt-as-ui/src/api/operation/repairbill.js b/yxt-as-ui/src/api/operation/repairbill.js
index 865d8dd16a..05398b1422 100644
--- a/yxt-as-ui/src/api/operation/repairbill.js
+++ b/yxt-as-ui/src/api/operation/repairbill.js
@@ -48,5 +48,14 @@ export default {
       data: data,
       headers: { 'Content-Type': 'application/json' }
     })
+  },
+  // 确认材料费
+  settle: function(data) {
+    return request({
+      url: '/as/v1/AsBusrepairBill/settle',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
   }
 }
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
index 63f3551b87..e4ab7f1c08 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
@@ -6,9 +6,9 @@
         <div>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="selectCustomer()" v-show="formobj.nodeName == '登记' ||formobj.nodeName == ''">选择客户</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()" v-show="formobj.nodeName !== '结算'">提交</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="settleAccounts()" v-show="formobj.nodeName == '结算'">结算</el-button>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="confirmCLF()" v-show="formobj.nodeName == '结算' && formobj.subject == '保外'">确认材料费</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="confirmCLF()" v-show="formobj.nodeName == '结算' && formobj.subject == '保内'">确认材料费</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -442,7 +442,7 @@
           </el-col>
           <el-col :span="8">
             <div class="span-sty">付款人编号</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.settleVo.payerName" clearable placeholder="" /></el-form-item>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.settleVo.payerNo" clearable placeholder="" /></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">应收金额</div>
@@ -470,7 +470,7 @@
         <el-row>
           <el-col :span="8">
             <div class="span-sty">其他结算方式</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.settleVo.otherSettleValue" clearable placeholder="" />
+            <el-form-item>
               <el-select class="addinputInfo" v-model="formobj.settleVo.otherSettleValue" placeholder="请选择" @change="otherSettleChange" clearable filterable>
                 <el-option v-for="item in otherSettle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
               </el-select>
@@ -1072,7 +1072,6 @@ export default {
     },
     settleAccounts() {
       this.settleVisible = true
-      // this.formobj.payableAmount = this.yfjeTotal
     },
     settleChange(value) {
       const choose = this.settle_list.filter((item) => item.dictValue === value)
@@ -1094,7 +1093,7 @@ export default {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
-          req.settlement(this.formobj).then((res) => {
+          req.settle(this.formobj).then((res) => {
             if (res.success) {
               this.$message({ showClose: true, type: 'success', message: '结算成功' })
               this.handleReturn('true')
@@ -1221,6 +1220,7 @@ export default {
         },
         showReSettleBtn: true
       }
+      this.settleVisible = false
       this.submitdisabled = false
       this.$emit('doback')
     }
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue
index a8985f38b3..d6a35ca46c 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue
@@ -146,6 +146,7 @@ import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/operation/repairbill'
 import repairbillAdd from './repairbillAdd'
 import repairbillInfo from './repairbillInfo'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'RepairBYLeaveFactory',
@@ -160,13 +161,6 @@ export default {
     return {
       btndisabled: false,
       btnList: [
-        {
-          type: 'primary',
-          size: 'small',
-          icon: 'plus',
-          btnKey: 'toAdd',
-          btnLabel: '新增'
-        },
         {
           type: 'primary',
           size: 'small',
@@ -195,20 +189,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
-      billType_list: [
-        {
-          dictKey: '0',
-          dictValue: '正常工单'
-        },
-        {
-          dictKey: '1',
-          dictValue: '保险理赔'
-        },
-        {
-          dictKey: '2',
-          dictValue: '协议单位'
-        }
-      ],
+      billType_list: [],
       state_list: [
         {
           dictKey: '1',
@@ -216,7 +197,7 @@ export default {
         },
         {
           dictKey: '0',
-          dictValue: '是'
+          dictValue: '否'
         }
       ],
       FormLoading: false,
@@ -224,7 +205,7 @@ export default {
       // 翻页
       listQuery: {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           startTime: '',
@@ -258,12 +239,20 @@ export default {
   },
   created() {
     // 初始化变量
+    this.init()
     this.getList()
   },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
+    init() {
+      typeValues({ type: 'billType' }).then((res) => {
+        if (res.success) {
+          this.billType_list = res.data
+        }
+      })
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -276,9 +265,6 @@ export default {
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
-        case 'toAdd':
-          this.toAdd()
-          break
         case 'toEdit':
           this.toEdit()
           break
@@ -333,7 +319,7 @@ export default {
     handleReset() {
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           startTime: '',
@@ -365,13 +351,13 @@ export default {
       }
       this.getList()
     },
-    toAdd() {
-      this.viewState = 2
-      this.$refs['divAdd'].showAdd()
-    },
     toEdit() {
-      this.viewState = 3
-      this.$refs['divAdd'].showEdit()
+      if (this.sids.length === 1) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(this.sids[0])
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+      }
     },
     toInfo(row) {
       this.viewState = 4
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue
index f8f0570c55..f8e9399dc8 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillByBeCompleted.vue
@@ -146,6 +146,7 @@ import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/operation/repairbill'
 import repairbillAdd from './repairbillAdd'
 import repairbillInfo from './repairbillInfo'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'RepairBillByCompleted',
@@ -160,13 +161,6 @@ export default {
     return {
       btndisabled: false,
       btnList: [
-        {
-          type: 'primary',
-          size: 'small',
-          icon: 'plus',
-          btnKey: 'toAdd',
-          btnLabel: '新增'
-        },
         {
           type: 'primary',
           size: 'small',
@@ -195,20 +189,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
-      billType_list: [
-        {
-          dictKey: '0',
-          dictValue: '正常工单'
-        },
-        {
-          dictKey: '1',
-          dictValue: '保险理赔'
-        },
-        {
-          dictKey: '2',
-          dictValue: '协议单位'
-        }
-      ],
+      billType_list: [],
       state_list: [
         {
           dictKey: '1',
@@ -216,7 +197,7 @@ export default {
         },
         {
           dictKey: '0',
-          dictValue: '是'
+          dictValue: '否'
         }
       ],
       FormLoading: false,
@@ -224,7 +205,7 @@ export default {
       // 翻页
       listQuery: {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           startTime: '',
@@ -258,12 +239,20 @@ export default {
   },
   created() {
     // 初始化变量
+    this.init()
     this.getList()
   },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
+    init() {
+      typeValues({ type: 'billType' }).then((res) => {
+        if (res.success) {
+          this.billType_list = res.data
+        }
+      })
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -276,9 +265,6 @@ export default {
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
-        case 'toAdd':
-          this.toAdd()
-          break
         case 'toEdit':
           this.toEdit()
           break
@@ -333,7 +319,7 @@ export default {
     handleReset() {
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           startTime: '',
@@ -365,13 +351,13 @@ export default {
       }
       this.getList()
     },
-    toAdd() {
-      this.viewState = 2
-      this.$refs['divAdd'].showAdd()
-    },
     toEdit() {
-      this.viewState = 3
-      this.$refs['divAdd'].showEdit()
+      if (this.sids.length === 1) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(this.sids[0])
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+      }
     },
     toInfo(row) {
       this.viewState = 4
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue
index 75809fbae7..658d316334 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillByMaintain.vue
@@ -146,6 +146,7 @@ import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/operation/repairbill'
 import repairbillAdd from './repairbillAdd'
 import repairbillInfo from './repairbillInfo'
+import {typeValues} from "@/api/Common/dictcommons";
 
 export default {
   name: 'RepairBillByMaintain',
@@ -160,13 +161,6 @@ export default {
     return {
       btndisabled: false,
       btnList: [
-        {
-          type: 'primary',
-          size: 'small',
-          icon: 'plus',
-          btnKey: 'toAdd',
-          btnLabel: '新增'
-        },
         {
           type: 'primary',
           size: 'small',
@@ -195,20 +189,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
-      billType_list: [
-        {
-          dictKey: '0',
-          dictValue: '正常工单'
-        },
-        {
-          dictKey: '1',
-          dictValue: '保险理赔'
-        },
-        {
-          dictKey: '2',
-          dictValue: '协议单位'
-        }
-      ],
+      billType_list: [],
       state_list: [
         {
           dictKey: '1',
@@ -216,7 +197,7 @@ export default {
         },
         {
           dictKey: '0',
-          dictValue: '是'
+          dictValue: '否'
         }
       ],
       FormLoading: false,
@@ -224,7 +205,7 @@ export default {
       // 翻页
       listQuery: {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           startTime: '',
@@ -258,12 +239,20 @@ export default {
   },
   created() {
     // 初始化变量
+    this.init()
     this.getList()
   },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
+    init() {
+      typeValues({ type: 'billType' }).then((res) => {
+        if (res.success) {
+          this.billType_list = res.data
+        }
+      })
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -276,9 +265,6 @@ export default {
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
-        case 'toAdd':
-          this.toAdd()
-          break
         case 'toEdit':
           this.toEdit()
           break
@@ -333,7 +319,7 @@ export default {
     handleReset() {
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           startTime: '',
@@ -365,13 +351,13 @@ export default {
       }
       this.getList()
     },
-    toAdd() {
-      this.viewState = 2
-      this.$refs['divAdd'].showAdd()
-    },
     toEdit() {
-      this.viewState = 3
-      this.$refs['divAdd'].showEdit()
+      if (this.sids.length === 1) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(this.sids[0])
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+      }
     },
     toInfo(row) {
       this.viewState = 4
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue
index aebb36169c..7496012378 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillBySendWork.vue
@@ -146,6 +146,7 @@ import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/operation/repairbill'
 import repairbillAdd from './repairbillAdd'
 import repairbillInfo from './repairbillInfo'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'RepairBillBySendWork',
@@ -160,13 +161,6 @@ export default {
     return {
       btndisabled: false,
       btnList: [
-        {
-          type: 'primary',
-          size: 'small',
-          icon: 'plus',
-          btnKey: 'toAdd',
-          btnLabel: '新增'
-        },
         {
           type: 'primary',
           size: 'small',
@@ -195,20 +189,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
-      billType_list: [
-        {
-          dictKey: '0',
-          dictValue: '正常工单'
-        },
-        {
-          dictKey: '1',
-          dictValue: '保险理赔'
-        },
-        {
-          dictKey: '2',
-          dictValue: '协议单位'
-        }
-      ],
+      billType_list: [],
       state_list: [
         {
           dictKey: '1',
@@ -216,7 +197,7 @@ export default {
         },
         {
           dictKey: '0',
-          dictValue: '是'
+          dictValue: '否'
         }
       ],
       FormLoading: false,
@@ -224,7 +205,7 @@ export default {
       // 翻页
       listQuery: {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           startTime: '',
@@ -258,12 +239,20 @@ export default {
   },
   created() {
     // 初始化变量
+    this.init()
     this.getList()
   },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
+    init() {
+      typeValues({ type: 'billType' }).then((res) => {
+        if (res.success) {
+          this.billType_list = res.data
+        }
+      })
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -276,9 +265,6 @@ export default {
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
-        case 'toAdd':
-          this.toAdd()
-          break
         case 'toEdit':
           this.toEdit()
           break
@@ -333,7 +319,7 @@ export default {
     handleReset() {
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           startTime: '',
@@ -365,13 +351,13 @@ export default {
       }
       this.getList()
     },
-    toAdd() {
-      this.viewState = 2
-      this.$refs['divAdd'].showAdd()
-    },
     toEdit() {
-      this.viewState = 3
-      this.$refs['divAdd'].showEdit()
+      if (this.sids.length === 1) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(this.sids[0])
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+      }
     },
     toInfo(row) {
       this.viewState = 4
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue
index ef629b3ab7..34d0cbe26a 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue
@@ -146,6 +146,7 @@ import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/operation/repairbill'
 import repairbillAdd from './repairbillAdd'
 import repairbillInfo from './repairbillInfo'
+import { typeValues } from '@/api/Common/dictcommons'
 
 export default {
   name: 'RepairBillBySettleAccounts',
@@ -160,13 +161,6 @@ export default {
     return {
       btndisabled: false,
       btnList: [
-        {
-          type: 'primary',
-          size: 'small',
-          icon: 'plus',
-          btnKey: 'toAdd',
-          btnLabel: '新增'
-        },
         {
           type: 'primary',
           size: 'small',
@@ -195,20 +189,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
-      billType_list: [
-        {
-          dictKey: '0',
-          dictValue: '正常工单'
-        },
-        {
-          dictKey: '1',
-          dictValue: '保险理赔'
-        },
-        {
-          dictKey: '2',
-          dictValue: '协议单位'
-        }
-      ],
+      billType_list: [],
       state_list: [
         {
           dictKey: '1',
@@ -216,7 +197,7 @@ export default {
         },
         {
           dictKey: '0',
-          dictValue: '是'
+          dictValue: '否'
         }
       ],
       FormLoading: false,
@@ -224,7 +205,7 @@ export default {
       // 翻页
       listQuery: {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           startTime: '',
@@ -258,12 +239,20 @@ export default {
   },
   created() {
     // 初始化变量
+    this.init()
     this.getList()
   },
   mounted() {
     this.$refs['btnbar'].setButtonList(this.btnList)
   },
   methods: {
+    init() {
+      typeValues({ type: 'billType' }).then((res) => {
+        if (res.success) {
+          this.billType_list = res.data
+        }
+      })
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -276,9 +265,6 @@ export default {
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
-        case 'toAdd':
-          this.toAdd()
-          break
         case 'toEdit':
           this.toEdit()
           break
@@ -333,7 +319,7 @@ export default {
     handleReset() {
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           startTime: '',
@@ -365,13 +351,13 @@ export default {
       }
       this.getList()
     },
-    toAdd() {
-      this.viewState = 2
-      this.$refs['divAdd'].showAdd()
-    },
     toEdit() {
-      this.viewState = 3
-      this.$refs['divAdd'].showEdit()
+      if (this.sids.length === 1) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(this.sids[0])
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+      }
     },
     toInfo(row) {
       this.viewState = 4
diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
index 3fa465871d..1071c960d0 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue
@@ -4,6 +4,7 @@
       <div class="tab-header webtop">
         <div>{{ viewTitle }}</div>
         <div>
+          <el-button type="primary" size="small" @click="negativeSettlement()">反结算</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -271,14 +272,19 @@
         </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: '',
@@ -459,6 +465,13 @@ export default {
         }
       })
     },
+    resetState() {
+      this.viewState = 1
+    },
+    negativeSettlement() {
+      this.viewState = 2
+      this.$refs['divFJS'].showAdd(this.formobj.sid )
+    },
     handleReturn() {
       this.formobj = {
         sid: '',

From 7ca17fac1224831241e2e17df82a8b40fb13550c Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 15 May 2024 17:43:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=8F=8D=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/operation/workslrsettlement.js    | 112 ++++
 yxt-as-ui/src/router/index.js                 |  35 +-
 .../workslrsettlement/workslrsettlement.vue   | 340 +++++++++++
 .../workslrsettlementAdd.vue                  | 359 +++++++++++
 .../workslrsettlementInfo.vue                 | 312 ++++++++++
 .../workslrsettlementDaiBan.vue               | 556 ++++++++++++++++++
 .../fanjiesuanFlow/workslrsettlementEdit.vue  | 335 +++++++++++
 .../fanjiesuanFlow/workslrsettlementYiBan.vue | 348 +++++++++++
 8 files changed, 2390 insertions(+), 7 deletions(-)
 create mode 100644 yxt-as-ui/src/api/operation/workslrsettlement.js
 create mode 100644 yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue
 create mode 100644 yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementAdd.vue
 create mode 100644 yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementInfo.vue
 create mode 100644 yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue
 create mode 100644 yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue
 create mode 100644 yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue

diff --git a/yxt-as-ui/src/api/operation/workslrsettlement.js b/yxt-as-ui/src/api/operation/workslrsettlement.js
new file mode 100644
index 0000000000..faf29470b0
--- /dev/null
+++ b/yxt-as-ui/src/api/operation/workslrsettlement.js
@@ -0,0 +1,112 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/as/v1/asbusrepairbillreversesettle/listPage',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/as/v1/asbusrepairbillreversesettle/saveReverseSettle',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  reverseSettleInit: function(data) {
+    return request({
+      url: '/as/v1/asbusrepairbillreversesettle/reverseSettleInit',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  fetchBySid: function(data) {
+    return request({
+      url: '/as/v1/asbusrepairbillreversesettle/fetchDetailsBySid/' + data,
+      method: 'get'
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/as/v1/asbusrepairbillreversesettle/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  submit: function(data) {
+    return request({
+      url: '/as/v1/asbusrepairbillreversesettle/submit',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（同意）
+  complete: function(params) {
+    return request({
+      url: '/pms/v1/asbusrepairbillreversesettle/complete',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（加签）
+  delegate: function(params) {
+    return request({
+      url: '/pms/v1/asbusrepairbillreversesettle/delegate',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（驳回）
+  reject: function(params) {
+    return request({
+      url: '/pms/v1/asbusrepairbillreversesettle/reject',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（终止）
+  breakProcess: function(params) {
+    return request({
+      url: '/pms/v1/asbusrepairbillreversesettle/breakProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（撤回）
+  revokeProcess: function(params) {
+    return request({
+      url: '/pms/v1/asbusrepairbillreversesettle/revokeProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 审批流程（同意）获取下一环节
+  getNextNodesForSubmit: function(data) {
+    return request({
+      url: '/pms/v1/asbusrepairbillreversesettle/getNextNodesForSubmit',
+      method: 'get',
+      params: data
+    })
+  },
+  // 审批流程（驳回）获取上一环节
+  getPreviousNodesForReject: function(data) {
+    return request({
+      url: '/pms/v1/asbusrepairbillreversesettle/getPreviousNodesForReject',
+      method: 'get',
+      params: data
+    })
+  }
+}
diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js
index 8925a2ed36..838b13a27d 100644
--- a/yxt-as-ui/src/router/index.js
+++ b/yxt-as-ui/src/router/index.js
@@ -91,13 +91,13 @@ export const constantRoutes = [{
         component: () => import('@/views/operation/repairbill/repairbillBYLeaveFactory.vue'),
         name: 'RepairBillBYLeaveFactory',
         meta: { title: '维修单管理(出厂)', noCache: true }
-      }
-      // {
-      //   path: '/workslrsettlement/workslrsettlement',
-      //   component: () => import('@/views/operation/workslrsettlement/workslrsettlement.vue'),
-      //   name: 'WorkSLRSettlement',
-      //   meta: { title: '工单反结算管理', noCache: true }
-      // },
+      },
+      {
+        path: '/workslrsettlement/workslrsettlement',
+        component: () => import('@/views/operation/workslrsettlement/workslrsettlement.vue'),
+        name: 'WorkSLRSettlement',
+        meta: { title: '工单反结算管理', noCache: true }
+      },
     ]
   },
   {
@@ -463,6 +463,27 @@ export const constantRoutes = [{
       import('@/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue'),
     name: 'PurchaseReturnYiBan'
   },
+  // 工单反结算管理--编辑
+  {
+    path: '/fanjiesuanFlow/workslrsettlementEdit',
+    component: () =>
+      import('@/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue'),
+    name: 'WorkSLRSettlementEdit'
+  },
+  // 工单反结算管理--待办
+  {
+    path: '/fanjiesuanFlow/workslrsettlementDaiBan',
+    component: () =>
+      import('@/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue'),
+    name: 'WorkSLRSettlementDaiBan'
+  },
+  // 工单反结算管理--已办
+  {
+    path: '/fanjiesuanFlow/workslrsettlementYiBan',
+    component: () =>
+      import('@/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue'),
+    name: 'WorkSLRSettlementYiBan'
+  },
   // 404 page must be placed at the end !!!
   // { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue
new file mode 100644
index 0000000000..498714af7a
--- /dev/null
+++ b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue
@@ -0,0 +1,340 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="工单反结算申请管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.dept" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请日期">
+                <el-date-picker v-model="listQuery.params.applyDateStart" 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.applyDateEnd" 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.closeDateStart" 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.closeDateEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="工单编号">
+                <el-input v-model="listQuery.params.sourceBillNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="工单类型">
+                <el-select v-model="listQuery.params.billType" clearable placeholder="请选择" filterable>
+                  <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="科目">
+                <el-input v-model="listQuery.params.subject" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车牌号">
+                <el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">工单反结算申请列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" width="180px" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="流程状态" width="150" header-align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
+                <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="billNo" label="单据编号" align="center" width="130" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="dept" label="申请部门" align="center" width="120" />
+            <el-table-column prop="createByName" label="申请人" align="center" width="120" />
+            <el-table-column prop="applyDate" label="申请日期" align="center" width="120" />
+            <el-table-column prop="closeDate" label="办结日期" align="center" width="120" />
+            <el-table-column prop="sourceBillNo" label="工单编号" align="center" width="120" />
+            <el-table-column prop="billType" label="工单类型" align="center" width="120" />
+            <el-table-column prop="subject" label="科目" align="center" width="100" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="160" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+            <el-table-column prop="reason" label="反结算原因" align="center" min-width="200" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+    <!--新增及修改 -->
+    <workslrsettlementAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+    <!-- 详情 -->
+    <workslrsettlementInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/operation/workslrsettlement'
+import workslrsettlementAdd from './workslrsettlementAdd'
+import workslrsettlementInfo from './workslrsettlementInfo'
+import { typeValues } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'WorkSLRSettlement',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    workslrsettlementAdd,
+    workslrsettlementInfo
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      billType_list: [],
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          orgPath: '',
+          userSid: '',
+          menuUrl: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          applyDateStart: '',
+          applyDateEnd: '',
+          closeDateStart: '',
+          closeDateEnd: '',
+          sourceBillNo: '',
+          billType: '',
+          subject: '',
+          customerName: '',
+          vinNo: '',
+          vehMark: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.init()
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'billType' }).then((res) => {
+        if (res.success) {
+          this.billType_list = res.data
+        }
+      })
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
+      req.listPage(this.listQuery).then(response => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 点击重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          orgPath: '',
+          userSid: '',
+          menuUrl: '',
+          useOrgName: '',
+          dept: '',
+          createByName: '',
+          billNo: '',
+          applyDateStart: '',
+          applyDateEnd: '',
+          closeDateStart: '',
+          closeDateEnd: '',
+          sourceBillNo: '',
+          billType: '',
+          subject: '',
+          customerName: '',
+          vinNo: '',
+          vehMark: ''
+        }
+      }
+      this.getList()
+    },
+    toEdit(row) {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit(row)
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
+    // 删除
+    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.deleteBySids(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(() => {
+      })
+    },
+    // 修改、编辑、详情返回列表页面
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
diff --git a/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementAdd.vue b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementAdd.vue
new file mode 100644
index 0000000000..4fdc527302
--- /dev/null
+++ b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementAdd.vue
@@ -0,0 +1,359 @@
+<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" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.reason" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">维修工单信息</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">工单编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">单据日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">服务顾问</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</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.settleDate }}</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.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.vehMark }}/{{ formobj.vinNo }}</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.customerOrg }}</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">{{ jeTotal }} = 工时费：{{ gsfTotal }} + 材料费：{{ clfTotal }} + 附加费：{{ fjfTotal }} + 税额：{{ seTotal }}</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">{{ ysjeTotal }} = 合计金额：{{ jeTotal }} - 优惠：<span>{{ formobj.discountAmount }}</span> - 优惠券：<span>{{ formobj.coupon }}</span> - 积分抵扣：<span>{{ formobj.scoreDeduct }}</span></span></el-form-item>
+            </el-col>
+          </el-row>
+          <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="subject" label="科目" align="center" width="150" />
+            <el-table-column prop="repairerName" label="维修人" align="center" width="200" />
+            <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-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="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="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="count" label="数量" width="100" align="center" />
+            <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>
+          <div class="title">附加项目</div>
+          <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-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/operation/workslrsettlement'
+
+export default {
+  name: 'WorkSLRSettlementAdd',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      // service服务
+      serviceKey: 1,
+      // subjoin附加项目
+      subjoinKey: 2,
+      formobj: {
+        sid: '',
+        createByName: '',
+        billNo: '',
+        billType: '',
+        subject: '',
+        waitorName: '',
+        customerName: '',
+        mobile: '',
+        customerOrg: '',
+        vehMark: '',
+        vinNo: '',
+        sitemVos: [],
+        aitemVos: [],
+        goodsDetailsVos: [],
+        orgPath: '',
+        deptSid: '',
+        dept: '',
+        useSid: '',
+        useOrgSid: '',
+        useOrgName: '',
+        reason: '',
+        applyDate: '',
+        sourceSid: '',
+        amount: '',
+        coupon: '',
+        scoreDeduct: '',
+        sourceBillDate: '',
+        settleDate: '',
+        taxRate: '',
+        taskId: '',
+        instanceId: ''
+      },
+      rules: {}
+    }
+  },
+  computed: {
+    // 计算工时费 = 服务项目列表中所有销售价之和
+    gsfTotal() {
+      let gsf = '0'
+      if (this.formobj.sitemVos.length > 0) {
+        this.formobj.sitemVos.forEach((e) => {
+          if (e.serviceItem !== '') {
+            gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return gsf
+    },
+    // 计算材料费 = 商品列表中所有销售价之和
+    clfTotal() {
+      let clf = '0'
+      if (this.formobj.goodsDetailsVos.length > 0) {
+        this.formobj.goodsDetailsVos.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            clf = Math.round((parseFloat(clf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return clf
+    },
+    // 计算附加费 == 附加项目列表中所有销售价之和
+    fjfTotal() {
+      let fjf = '0'
+      if (this.formobj.aitemVos.length > 0) {
+        this.formobj.aitemVos.forEach((e) => {
+          if (e.aitemName !== '') {
+            fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return fjf
+    },
+    // 计算税额 = 材料费 * 税率
+    seTotal() {
+      let se = '0'
+      se = Math.round((parseFloat(this.clfTotal) * parseFloat(this.formobj.taxRate !== '' ? this.formobj.taxRate : '0')) * 100) / 100
+      return se
+    },
+    // 计算合计金额 = 工时费 + 材料费 + 附加费 + 税额
+    jeTotal() {
+      let je = '0'
+      je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal) + parseFloat(this.seTotal)) * 100) / 100
+      return je
+    },
+    // 计算应收金额
+    ysjeTotal() {
+      let ysje = '0'
+      ysje = Math.round((parseFloat(ysje) + parseFloat(this.jeTotal) - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') - parseFloat(this.formobj.coupon !== '' ? this.formobj.coupon : '0') - parseFloat(this.formobj.scoreDeduct !== '' ? this.formobj.scoreDeduct : '0')) * 100) / 100
+      return ysje
+    }
+  },
+  methods: {
+    showAdd(sid) {
+      this.viewTitle = '【新增】工单反结算'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.reverseSettleInit({ sid: sid, userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).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(',')
+              }
+            })
+          }
+        }
+      })
+    },
+    showEdit(row) {
+      this.viewTitle = '【编辑】工单反结算'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid(row.sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '提交成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '',
+        createByName: '',
+        billNo: '',
+        billType: '',
+        subject: '',
+        waitorName: '',
+        customerName: '',
+        mobile: '',
+        customerOrg: '',
+        vehMark: '',
+        vinNo: '',
+        sitemVos: [],
+        aitemVos: [],
+        goodsDetailsVos: [],
+        orgPath: '',
+        deptSid: '',
+        dept: '',
+        useSid: '',
+        useOrgSid: '',
+        useOrgName: '',
+        reason: '',
+        applyDate: '',
+        sourceSid: '',
+        amount: '',
+        coupon: '',
+        scoreDeduct: '',
+        sourceBillDate: '',
+        settleDate: '',
+        taxRate: '',
+        taskId: '',
+        instanceId: ''
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>
diff --git a/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementInfo.vue b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementInfo.vue
new file mode 100644
index 0000000000..61948d2d4d
--- /dev/null
+++ b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlementInfo.vue
@@ -0,0 +1,312 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.reason }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">维修工单信息</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">工单编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">单据日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">服务顾问</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</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.settleDate }}</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.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.vehMark }}/{{ formobj.vinNo }}</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.customerOrg }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <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="subject" label="科目" align="center" width="150" />
+            <el-table-column prop="repairerName" label="维修人" width="100" 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-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="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="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="count" label="数量" width="100" align="center" />
+            <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>
+          <div class="title">附加项目</div>
+          <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">合计金额</div>
+              <el-form-item><span class="addinputInfo">{{ jeTotal }} = 工时费：{{ gsfTotal }} + 材料费：{{ clfTotal }} + 附加费：{{ fjfTotal }} + 税额：{{ seTotal }}</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">{{ ysjeTotal }} = 合计金额：{{ jeTotal }} - 优惠：<span>{{ formobj.discountAmount }}</span> - 优惠券：<span>{{ formobj.coupon }}</span> - 积分抵扣：<span>{{ formobj.scoreDeduct }}</span></span></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/operation/workslrsettlement'
+
+export default {
+  name: 'WorkSLRSettlementInfo',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      // service服务
+      serviceKey: 1,
+      // subjoin附加项目
+      subjoinKey: 2,
+      formobj: {
+        sid: '',
+        createByName: '',
+        billNo: '',
+        billType: '',
+        subject: '',
+        waitorName: '',
+        customerName: '',
+        mobile: '',
+        customerOrg: '',
+        vehMark: '',
+        vinNo: '',
+        sitemVos: [],
+        aitemVos: [],
+        goodsDetailsVos: [],
+        orgPath: '',
+        deptSid: '',
+        dept: '',
+        useSid: '',
+        useOrgSid: '',
+        useOrgName: '',
+        reason: '',
+        applyDate: '',
+        sourceSid: '',
+        amount: '',
+        coupon: '',
+        scoreDeduct: '',
+        sourceBillDate: '',
+        settleDate: '',
+        taxRate: '',
+        taskId: '',
+        instanceId: ''
+      },
+      rules: {}
+    }
+  },
+  computed: {
+    // 计算工时费 = 服务项目列表中所有销售价之和
+    gsfTotal() {
+      let gsf = '0'
+      if (this.formobj.sitemVos.length > 0) {
+        this.formobj.sitemVos.forEach((e) => {
+          if (e.serviceItem !== '') {
+            gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return gsf
+    },
+    // 计算材料费 = 商品列表中所有销售价之和
+    clfTotal() {
+      let clf = '0'
+      if (this.formobj.goodsDetailsVos.length > 0) {
+        this.formobj.goodsDetailsVos.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            clf = Math.round((parseFloat(clf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return clf
+    },
+    // 计算附加费 == 附加项目列表中所有销售价之和
+    fjfTotal() {
+      let fjf = '0'
+      if (this.formobj.aitemVos.length > 0) {
+        this.formobj.aitemVos.forEach((e) => {
+          if (e.aitemName !== '') {
+            fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return fjf
+    },
+    // 计算税额 = 材料费 * 税率
+    seTotal() {
+      let se = '0'
+      se = Math.round((parseFloat(this.clfTotal) * parseFloat(this.formobj.taxRate !== '' ? this.formobj.taxRate : '0')) * 100) / 100
+      return se
+    },
+    // 计算合计金额 = 工时费 + 材料费 + 附加费 + 税额
+    jeTotal() {
+      let je = '0'
+      je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal) + parseFloat(this.seTotal)) * 100) / 100
+      return je
+    },
+    // 计算应收金额
+    ysjeTotal() {
+      let ysje = '0'
+      ysje = Math.round((parseFloat(ysje) + parseFloat(this.jeTotal) - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') - parseFloat(this.formobj.coupon !== '' ? this.formobj.coupon : '0') - parseFloat(this.formobj.scoreDeduct !== '' ? this.formobj.scoreDeduct : '0')) * 100) / 100
+      return ysje
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '工单反结算详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid(row.sid).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(',')
+              }
+            })
+          }
+        }
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '',
+        createByName: '',
+        billNo: '',
+        billType: '',
+        subject: '',
+        waitorName: '',
+        customerName: '',
+        mobile: '',
+        customerOrg: '',
+        vehMark: '',
+        vinNo: '',
+        sitemVos: [],
+        aitemVos: [],
+        goodsDetailsVos: [],
+        orgPath: '',
+        deptSid: '',
+        dept: '',
+        useSid: '',
+        useOrgSid: '',
+        useOrgName: '',
+        reason: '',
+        applyDate: '',
+        sourceSid: '',
+        amount: '',
+        coupon: '',
+        scoreDeduct: '',
+        sourceBillDate: '',
+        settleDate: '',
+        taxRate: '',
+        taskId: '',
+        instanceId: ''
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>
diff --git a/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue b/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue
new file mode 100644
index 0000000000..69f8c8ada7
--- /dev/null
+++ b/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementDaiBan.vue
@@ -0,0 +1,556 @@
+<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" @click="openCountersign('加签')">加 签</el-button>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+      </div>
+      <div class="">
+        <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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.reason }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">维修工单信息</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">工单编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">单据日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">服务顾问</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</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.settleDate }}</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.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.vehMark }}/{{ formobj.vinNo }}</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.customerOrg }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <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="subject" label="科目" align="center" width="150" />
+            <el-table-column prop="repairerName" label="维修人" width="100" 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-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="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="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="count" label="数量" width="100" align="center" />
+            <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>
+          <div class="title">附加项目</div>
+          <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">合计金额</div>
+              <el-form-item><span class="addinputInfo">{{ jeTotal }} = 工时费：{{ gsfTotal }} + 材料费：{{ clfTotal }} + 附加费：{{ fjfTotal }} + 税额：{{ seTotal }}</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">{{ ysjeTotal }} = 合计金额：{{ jeTotal }} - 优惠：<span>{{ formobj.discountAmount }}</span> - 优惠券：<span>{{ formobj.coupon }}</span> - 积分抵扣：<span>{{ formobj.scoreDeduct }}</span></span></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
+      <el-form class="formadd" >
+        <el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span class="icon">*</span>加签人员:
+          </el-col>
+          <el-col :span="20">
+            <el-form-item>
+              <el-select v-model="countersign.assignee" placeholder="请选择" filterable>
+                <el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span>当前环节:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :class="{rowClass:!currentLink}">
+          <el-col :span="4" class="tleftb">
+            <span>意见:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
+          </el-col>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/operation/workslrsettlement'
+
+export default {
+  name: 'WorkSLRSettlementDaiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      // service服务
+      serviceKey: 1,
+      // subjoin附加项目
+      subjoinKey: 2,
+      formobj: {
+        sid: '',
+        createByName: '',
+        billNo: '',
+        billType: '',
+        subject: '',
+        waitorName: '',
+        customerName: '',
+        mobile: '',
+        customerOrg: '',
+        vehMark: '',
+        vinNo: '',
+        sitemVos: [],
+        aitemVos: [],
+        goodsDetailsVos: [],
+        orgPath: '',
+        deptSid: '',
+        dept: '',
+        useSid: '',
+        useOrgSid: '',
+        useOrgName: '',
+        reason: '',
+        applyDate: '',
+        sourceSid: '',
+        amount: '',
+        coupon: '',
+        scoreDeduct: '',
+        sourceBillDate: '',
+        settleDate: '',
+        taxRate: '',
+        taskId: '',
+        instanceId: ''
+      },
+      rules: {},
+      options: [],
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      countersignLink: false,
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      // 加签按钮所需参数
+      countersign: {
+        taskId: '',
+        assignee: '',
+        userSid: '',
+        instanceId: '',
+        views: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加签参数
+    this.countersign.taskId = obj.taskId
+    this.countersign.userSid = window.sessionStorage.getItem('userSid')
+    this.countersign.instanceId = obj.instanceId
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  computed: {
+    // 计算工时费 = 服务项目列表中所有销售价之和
+    gsfTotal() {
+      let gsf = '0'
+      if (this.formobj.sitemVos.length > 0) {
+        this.formobj.sitemVos.forEach((e) => {
+          if (e.serviceItem !== '') {
+            gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return gsf
+    },
+    // 计算材料费 = 商品列表中所有销售价之和
+    clfTotal() {
+      let clf = '0'
+      if (this.formobj.goodsDetailsVos.length > 0) {
+        this.formobj.goodsDetailsVos.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            clf = Math.round((parseFloat(clf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return clf
+    },
+    // 计算附加费 == 附加项目列表中所有销售价之和
+    fjfTotal() {
+      let fjf = '0'
+      if (this.formobj.aitemVos.length > 0) {
+        this.formobj.aitemVos.forEach((e) => {
+          if (e.aitemName !== '') {
+            fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return fjf
+    },
+    // 计算税额 = 材料费 * 税率
+    seTotal() {
+      let se = '0'
+      se = Math.round((parseFloat(this.clfTotal) * parseFloat(this.formobj.taxRate !== '' ? this.formobj.taxRate : '0')) * 100) / 100
+      return se
+    },
+    // 计算合计金额 = 工时费 + 材料费 + 附加费 + 税额
+    jeTotal() {
+      let je = '0'
+      je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal) + parseFloat(this.seTotal)) * 100) / 100
+      return je
+    },
+    // 计算应收金额
+    ysjeTotal() {
+      let ysje = '0'
+      ysje = Math.round((parseFloat(ysje) + parseFloat(this.jeTotal) - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') - parseFloat(this.formobj.coupon !== '' ? this.formobj.coupon : '0') - parseFloat(this.formobj.scoreDeduct !== '' ? this.formobj.scoreDeduct : '0')) * 100) / 100
+      return ysje
+    }
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '工单反结算详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid(sid).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(',')
+              }
+            })
+          }
+        }
+      })
+    },
+    // 加签
+    openCountersign(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = true
+      this.dialogList.comment = ''
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = '同意'
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleReject()
+        }
+      } else if (this.operation === '终止') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleStop()
+        }
+      } else if (this.operation === '加签') {
+        this.handleCountersign()
+      }
+    },
+    /** 加签 */
+    handleCountersign() {
+      if (this.countersign.assignee === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
+        return
+      }
+      if (this.dialogList.comment === '') {
+        this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        return
+      }
+      this.countersign.views = this.dialogList.comment
+      req.delegate(this.countersign).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.complete(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.rowClass{
+  border-top: 1px solid #E0E3EB;
+}
+</style>
diff --git a/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue b/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue
new file mode 100644
index 0000000000..bfe14204cf
--- /dev/null
+++ b/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementEdit.vue
@@ -0,0 +1,335 @@
+<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" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
+        </div>
+      </div>
+      <div class="">
+        <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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.reason" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">维修工单信息</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">工单编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">单据日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">服务顾问</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</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.settleDate }}</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.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.vehMark }}/{{ formobj.vinNo }}</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.customerOrg }}</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">{{ jeTotal }} = 工时费：{{ gsfTotal }} + 材料费：{{ clfTotal }} + 附加费：{{ fjfTotal }} + 税额：{{ seTotal }}</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">{{ ysjeTotal }} = 合计金额：{{ jeTotal }} - 优惠：<span>{{ formobj.discountAmount }}</span> - 优惠券：<span>{{ formobj.coupon }}</span> - 积分抵扣：<span>{{ formobj.scoreDeduct }}</span></span></el-form-item>
+            </el-col>
+          </el-row>
+          <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="subject" label="科目" align="center" width="150" />
+            <el-table-column prop="repairerName" label="维修人" align="center" width="200" />
+            <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-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="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="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="count" label="数量" width="100" align="center" />
+            <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>
+          <div class="title">附加项目</div>
+          <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-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/operation/workslrsettlement'
+
+export default {
+  name: 'WorkSLRSettlementEdit',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      // service服务
+      serviceKey: 1,
+      // subjoin附加项目
+      subjoinKey: 2,
+      formobj: {
+        sid: '',
+        createByName: '',
+        billNo: '',
+        billType: '',
+        subject: '',
+        waitorName: '',
+        customerName: '',
+        mobile: '',
+        customerOrg: '',
+        vehMark: '',
+        vinNo: '',
+        sitemVos: [],
+        aitemVos: [],
+        goodsDetailsVos: [],
+        orgPath: '',
+        deptSid: '',
+        dept: '',
+        useSid: '',
+        useOrgSid: '',
+        useOrgName: '',
+        reason: '',
+        applyDate: '',
+        sourceSid: '',
+        amount: '',
+        coupon: '',
+        scoreDeduct: '',
+        sourceBillDate: '',
+        settleDate: '',
+        taxRate: '',
+        taskId: '',
+        instanceId: ''
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  computed: {
+    // 计算工时费 = 服务项目列表中所有销售价之和
+    gsfTotal() {
+      let gsf = '0'
+      if (this.formobj.sitemVos.length > 0) {
+        this.formobj.sitemVos.forEach((e) => {
+          if (e.serviceItem !== '') {
+            gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return gsf
+    },
+    // 计算材料费 = 商品列表中所有销售价之和
+    clfTotal() {
+      let clf = '0'
+      if (this.formobj.goodsDetailsVos.length > 0) {
+        this.formobj.goodsDetailsVos.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            clf = Math.round((parseFloat(clf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return clf
+    },
+    // 计算附加费 == 附加项目列表中所有销售价之和
+    fjfTotal() {
+      let fjf = '0'
+      if (this.formobj.aitemVos.length > 0) {
+        this.formobj.aitemVos.forEach((e) => {
+          if (e.aitemName !== '') {
+            fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return fjf
+    },
+    // 计算税额 = 材料费 * 税率
+    seTotal() {
+      let se = '0'
+      se = Math.round((parseFloat(this.clfTotal) * parseFloat(this.formobj.taxRate !== '' ? this.formobj.taxRate : '0')) * 100) / 100
+      return se
+    },
+    // 计算合计金额 = 工时费 + 材料费 + 附加费 + 税额
+    jeTotal() {
+      let je = '0'
+      je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal) + parseFloat(this.seTotal)) * 100) / 100
+      return je
+    },
+    // 计算应收金额
+    ysjeTotal() {
+      let ysje = '0'
+      ysje = Math.round((parseFloat(ysje) + parseFloat(this.jeTotal) - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') - parseFloat(this.formobj.coupon !== '' ? this.formobj.coupon : '0') - parseFloat(this.formobj.scoreDeduct !== '' ? this.formobj.scoreDeduct : '0')) * 100) / 100
+      return ysje
+    }
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '【编辑】工单反结算'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '提交成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>
diff --git a/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue b/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue
new file mode 100644
index 0000000000..b941998ae9
--- /dev/null
+++ b/yxt-as-ui/src/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue
@@ -0,0 +1,348 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+        </div>
+      </div>
+      <div class="">
+        <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.dept }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</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.reason }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">维修工单信息</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">工单编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">单据日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.sourceBillDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">服务顾问</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.waitorName }}</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.settleDate }}</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.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.vehMark }}/{{ formobj.vinNo }}</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.customerOrg }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <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="subject" label="科目" align="center" width="150" />
+            <el-table-column prop="repairerName" label="维修人" width="100" 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-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="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="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="count" label="数量" width="100" align="center" />
+            <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>
+          <div class="title">附加项目</div>
+          <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">合计金额</div>
+              <el-form-item><span class="addinputInfo">{{ jeTotal }} = 工时费：{{ gsfTotal }} + 材料费：{{ clfTotal }} + 附加费：{{ fjfTotal }} + 税额：{{ seTotal }}</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">{{ ysjeTotal }} = 合计金额：{{ jeTotal }} - 优惠：<span>{{ formobj.discountAmount }}</span> - 优惠券：<span>{{ formobj.coupon }}</span> - 积分抵扣：<span>{{ formobj.scoreDeduct }}</span></span></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/operation/workslrsettlement'
+
+export default {
+  name: 'WorkSLRSettlementYiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      tableKey: 0,
+      index: 0,
+      // service服务
+      serviceKey: 1,
+      // subjoin附加项目
+      subjoinKey: 2,
+      formobj: {
+        sid: '',
+        createByName: '',
+        billNo: '',
+        billType: '',
+        subject: '',
+        waitorName: '',
+        customerName: '',
+        mobile: '',
+        customerOrg: '',
+        vehMark: '',
+        vinNo: '',
+        sitemVos: [],
+        aitemVos: [],
+        goodsDetailsVos: [],
+        orgPath: '',
+        deptSid: '',
+        dept: '',
+        useSid: '',
+        useOrgSid: '',
+        useOrgName: '',
+        reason: '',
+        applyDate: '',
+        sourceSid: '',
+        amount: '',
+        coupon: '',
+        scoreDeduct: '',
+        sourceBillDate: '',
+        settleDate: '',
+        taxRate: '',
+        taskId: '',
+        instanceId: ''
+      },
+      rules: {},
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  computed: {
+    // 计算工时费 = 服务项目列表中所有销售价之和
+    gsfTotal() {
+      let gsf = '0'
+      if (this.formobj.sitemVos.length > 0) {
+        this.formobj.sitemVos.forEach((e) => {
+          if (e.serviceItem !== '') {
+            gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return gsf
+    },
+    // 计算材料费 = 商品列表中所有销售价之和
+    clfTotal() {
+      let clf = '0'
+      if (this.formobj.goodsDetailsVos.length > 0) {
+        this.formobj.goodsDetailsVos.forEach((e) => {
+          if (e.goodsSpuName !== '') {
+            clf = Math.round((parseFloat(clf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return clf
+    },
+    // 计算附加费 == 附加项目列表中所有销售价之和
+    fjfTotal() {
+      let fjf = '0'
+      if (this.formobj.aitemVos.length > 0) {
+        this.formobj.aitemVos.forEach((e) => {
+          if (e.aitemName !== '') {
+            fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+          }
+        })
+      }
+      return fjf
+    },
+    // 计算税额 = 材料费 * 税率
+    seTotal() {
+      let se = '0'
+      se = Math.round((parseFloat(this.clfTotal) * parseFloat(this.formobj.taxRate !== '' ? this.formobj.taxRate : '0')) * 100) / 100
+      return se
+    },
+    // 计算合计金额 = 工时费 + 材料费 + 附加费 + 税额
+    jeTotal() {
+      let je = '0'
+      je = Math.round((parseFloat(je) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this.fjfTotal) + parseFloat(this.seTotal)) * 100) / 100
+      return je
+    },
+    // 计算应收金额
+    ysjeTotal() {
+      let ysje = '0'
+      ysje = Math.round((parseFloat(ysje) + parseFloat(this.jeTotal) - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') - parseFloat(this.formobj.coupon !== '' ? this.formobj.coupon : '0') - parseFloat(this.formobj.scoreDeduct !== '' ? this.formobj.scoreDeduct : '0')) * 100) / 100
+      return ysje
+    }
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '工单反结算详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid(sid).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(',')
+              }
+            })
+          }
+        }
+      })
+    },
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      req.revokeProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>