外协结算修改

src/api/outsourcingManagement/oemOrderSettlement.js

@@ -29,8 +29,8 @@ export const preSettlementItem = params => {
 export const noSettlementItem = params => {
   return request({
     url: '/blade-desk/mesOemStatement/noSettlement',
-    method: 'post',
+    method: 'get',
-    data: params,
+    params,
   });
 };
 //审核
@@ -87,3 +87,12 @@ export const updateData = params => {
     data: params,
   });
 };
+
+// 结算确认
+export const confirmSettlement = params => {
+  return request({
+    url: '/api/blade-desk/mesOemStatement/settlementConfirm',
+    method: 'post',
+    data: params,
+  });
+};

src/views/oem/oemOrderSettlement/components/underReview.vue

@@ -17,13 +17,13 @@
                 <el-form-item label="确认结果" prop="confirmResult">
                     <el-radio-group v-model="settleForm.confirmResult" @change="changeResult">
                         <el-radio label="1">结算正确</el-radio>
-                        <el-radio label="2">结算异常</el-radio>
+                        <el-radio label="0">结算异常</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="异常原因" prop="confirmReason" v-if="settleForm.confirmResult == 2">
+                <el-form-item label="异常原因" prop="errorReason" v-if="settleForm.confirmResult == 0">
-                    <el-select v-model="settleForm.confirmReason">
+                    <el-select v-model="settleForm.errorReason">
-                        <el-option label="订单数据错误" value="1"></el-option>
+                        <el-option label="订单数据错误" value="订单数据错误"></el-option>
-                        <el-option label="无需结算" value="2"></el-option>
+                        <el-option label="无需结算" value="无需结算"></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import {getStatement} from "@/api/outsourcingManagement/oemOrderSettlement"
+import {getStatement,confirmSettlement} from "@/api/outsourcingManagement/oemOrderSettlement"
 export default {
     data(){
         return{
@@ -73,7 +73,7 @@ export default {
             settleForm:{},
             settleRules:{
                 confirmResult:[{required: true, message: '请选择结算结果',trigger:'blur'}],
-                confirmReason:[{required: false, message: '请填写异常原因',trigger:'blur'}],
+                errorReason:[{required: false, message: '请填写异常原因',trigger:'blur'}],
             },
             isReview:false,
             reviewForm:{},
@@ -486,7 +486,9 @@ export default {
             done()
         },
         searchReset(){
-            this.query = {}
+            this.query = {
+                rosStatusList:2
+            }
             this.onLoad()
         },
         selectionChange(list){
@@ -494,9 +496,11 @@ export default {
         },
         currentChange(currentPage){
             this.page.currentPage = currentPage;
+            this.onLoad()
         },
         sizeChange(pageSize){
             this.page.pageSize = pageSize;
+            this.onLoad()
         },
         refreshChange(){
             this.onLoad();
@@ -523,17 +527,30 @@ export default {
         },
         changeResult(val){
             console.log('val-----------------',val)
-            if(val == 2){
+            if(val == 0){
-                this.settleRules.confirmReason[0].required = true
+                this.settleRules.errorReason[0].required = true
             }else{
-                this.settleRules.confirmReason[0].required = false
+                this.settleRules.errorReason[0].required = false
             }
         },
         summitSettle(){
             this.$refs.settleForm.validate(valid => {
                 if(valid){
-                    this.$message.success('结算成功！')
+                    let params = {
-                    this.isConfirm = false
+                        ids:this.selectionList.map(item => item.id),
+                        ...this.settleForm,
+                        confirmResult:this.settleForm.confirmResult == 1 ? true : false
+                    }
+                    console.log('params----------',params)
+                    confirmSettlement(params).then(res =>{
+                        if(res.data.code == 200){
+                            this.$message.success('确认结算成功');
+                            this.isConfirm = false
+                            this.onLoad()
+                        }
+                    })
+                    // this.$message.success('结算成功！')
+                    // this.isConfirm = false
                 }
             })
         },

src/views/oem/oemOrderSettlement/index.vue

@@ -13,6 +13,7 @@
         <settlementAnomaly v-if="activeName=='3'"></settlementAnomaly>
         <settlementCompleted v-if="activeName=='4'"></settlementCompleted>
         <underReview v-if="activeName=='2'"></underReview>
+        <inReview v-if="activeName == '6'"></inReview>
         
     </basic-container>
 </template>
@@ -22,13 +23,15 @@ import settlementIn from './components/settlementIn.vue'
 import settlementAnomaly from './components/settlementAnomaly.vue'
 import  settlementCompleted from './components/settlementCompleted.vue'
 import underReview from './components/underReview.vue'
+import inReview from './components/inReview.vue'
 export default {
     components:{
         unsettled,
         settlementIn,
         settlementAnomaly,
         settlementCompleted,
-        underReview
+        underReview,
+        inReview
     },
     data() {
         return {