完善维修单管理

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' }
+    })
   }
 }

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')
     }

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

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

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

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

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

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: '',