Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/api/outsourcingManagement/oemOrderSettlement.js

@@ -132,3 +132,12 @@ export const approvalSubmit = params => {
     data: params,
   });
 };
+
+// 推送erp
+export const pushErp = params => {
+  return request({
+    url: '/api/blade-desk/mesOemStatement/pushToErp',
+    method: 'post',
+    data: params,
+  });
+};

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

@@ -19,7 +19,7 @@
     </div>
 </template>
 <script>
-import {getStatement} from "@/api/outsourcingManagement/oemOrderSettlement"
+import {getStatement,pushErp} from "@/api/outsourcingManagement/oemOrderSettlement"
 import { mapGetters } from 'vuex';
 export default {
     components: {
@@ -561,11 +561,26 @@ export default {
             })
         },
         pushERP(){
-            this.$confirm('确认将所有待推送数据同步至ERP？?', {
+            if(this.data.length == 0){
+                this.$message.error('请先查询数据');
+                return;
+            }
+            this.$confirm('确认将所有待推送数据同步至ERP?', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 type: 'warning',
             }).then(() => {
+                pushErp().then(res =>{
+                    console.log('res-------',res)
+                    if(res.data.code == 200){
+                        if(res.data.data.success == res.data.data.total){
+                            this.$message.success(res.data.msg)
+                        }else{
+                            this.$message.error(res.data.msg)
+                        }
+                        this.onLoad()
+                    }
+                })
             })
         },
         // 多选

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

@@ -12,14 +12,14 @@
                         <el-input v-model="form.price"></el-input>
                     </el-form-item>
                     <el-form-item>
-                        <el-button type="primary" @click="settlementFn" v-if="permission.unsettled_pre-settlement">预结算</el-button>
+                        <el-button type="primary" @click="settlementFn" v-if="permission.unsettled_preSettlement">预结算</el-button>
                         <el-button type="primary" @click="settlementFnNum" v-if="permission.unsettled_settlement">结算</el-button>
-                        <el-button type="danger" @click="onSubmit" v-if="permission.unsettled_no-settlement">无需结算</el-button>
+                        <el-button type="danger" @click="onSubmit" v-if="permission.unsettled_noSettlement">无需结算</el-button>
                     </el-form-item>
                 </el-form>
             </template>
             <template #menu-right>
-                <el-button type="primary" @click="handleSupplement" v-if="permission.unsettled_supple-settlement">补充结算</el-button>
+                <el-button type="primary" @click="handleSupplement" v-if="permission.unsettled_suppleSettlement">补充结算</el-button>
             </template>
             <template #menu></template>
         </avue-crud>
@@ -495,6 +495,10 @@ export default {
     computed: {
         ...mapGetters(['permission']),
     },
+    mounted(){
+        // console.log('11111111111111')
+        // console.log('unsettled_no-settlement------',this.permission.unsettled_no-settlement)
+    },
     methods: {
         // 表格排序
         sortChange({ prop, order }) {
@@ -638,6 +642,7 @@ export default {
                         postPlatingStorageTimeStart:this.settleForm && this.settleForm.putStoreTime && this.settleForm.putStoreTime[0],
                         postPlatingStorageTimeEnd:this.settleForm && this.settleForm.putStoreTime && this.settleForm.putStoreTime[1],
                         rosStatusList:this.settleForm.settleStatus.join(','),
+                        price:this.form && this.form.price,
                     }
                     console.log('params----------',params)
                     preSettlement(params).then(res =>{