外协结算修改

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

@@ -139,19 +139,19 @@ export default {
                     },
                     {
                         label: '质量等级',
-                        prop: 'prodIdent',
+                        prop: 'productIdent',
                         sortable: true,
                         filter: true,
                         span: 24,
                         search: true,
                         width: 120,
-                        type:'select',
+                        // type:'select',
                         searchOrder:6,
-                        dicUrl:"/api/blade-scheduling/qualityGrade/getGrades",
-                        props:{
-                            label:'qualityGrade',
-                            value:"id"
-                        }
+                        // dicUrl:"/api/blade-scheduling/qualityGrade/getGrades",
+                        // props:{
+                        //     label:'qualityGrade',
+                        //     value:"id"
+                        // }
                     },
                     {
                         label: '工序',
@@ -180,6 +180,7 @@ export default {
                         search: true,
                         searchOrder:9,
                         width: 120,
+                        type:'select',
                         dicUrl:"/api/blade-desk/BA/craftAbility/findList",
                         props:{
                             label:"caName",
@@ -188,11 +189,11 @@ export default {
                     },
                     {
                         label: '流程卡号',
-                        prop: 'ocCode',
+                        prop: 'cardNo',
                         sortable: true,
                         filter: true,
                         span: 24,
-                        hide: true,
+                        // hide: true,
                         search: true,
                         width: 120,
                         searchOrder:3,

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

@@ -133,23 +133,23 @@ export default {
                     },
                     {
                         label: '质量等级',
-                        prop: 'prodIdent',
+                        prop: 'productIdent',
                         sortable: true,
                         filter: true,
                         span: 24,
                         search: true,
                         width: 120,
-                        type:'select',
+                        // type:'select',
                         searchOrder:6,
-                        dicUrl:"/api/blade-scheduling/qualityGrade/getGrades",
-                        props:{
-                            label:'qualityGrade',
-                            value:"id"
-                        }
+                        // dicUrl:"/api/blade-scheduling/qualityGrade/getGrades",
+                        // props:{
+                        //     label:'qualityGrade',
+                        //     value:"id"
+                        // }
                     },
                     {
                         label: '工序',
-                        prop: 'psId',
+                        prop: 'ppsId',
                         sortable: true,
                         filter: true,
                         span: 24,
@@ -201,10 +201,10 @@ export default {
                     },
                     {
                         label: '流程卡号',
-                        prop: 'ocName',
+                        prop: 'cardNo',
                         sortable: true,
                         filter: true,
-                        hide: true,
+                        // hide: true,
                         span: 24,
                         search: true,
                         width: 120,
@@ -427,7 +427,7 @@ export default {
                         sortable: true,
                         filter: true,
                         span: 24,
-                        search: true,
+                        search: false,
                         hide: true,
                         width: 120,
                         type:'select',
@@ -604,11 +604,16 @@ export default {
         },
         onLoad() {
             this.loading = true
-            getStatement({
+            let params = {
                 current:this.page.currentPage,
                 size:this.page.pageSize,
-                ...this.query
-            }).then(res =>{
+                ...this.query,
+                postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[0],
+                postPlatingStorageTimeEnd:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[1],
+                memo:this.query && this.query.memo && this.query.memo.length != 0 && this.query.memo.join(';'),
+            }
+            if(params.putStoreTime) delete params.putStoreTime;
+            getStatement(params).then(res =>{
                 this.data = res.data.data.records
                 this.page.total = res.data.data.total
                 this.loading = false

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

@@ -178,19 +178,19 @@ export default {
                     },
                     {
                         label: '质量等级',
-                        prop: 'prodIdent',
+                        prop: 'productIdent',
                         sortable: true,
                         filter: true,
                         span: 24,
                         search: true,
                         width: 120,
-                        type:'select',
+                        // type:'select',
                         searchOrder:5,
-                        dicUrl:"/api/blade-scheduling/qualityGrade/getGrades",
-                        props:{
-                            label:'qualityGrade',
-                            value:"id"
-                        }
+                        // dicUrl:"/api/blade-scheduling/qualityGrade/getGrades",
+                        // props:{
+                        //     label:'qualityGrade',
+                        //     value:"id"
+                        // }
                     },
                     {
                         label: '工序',
@@ -211,13 +211,14 @@ export default {
                     },
                     {
                         label: '工艺能力',
-                        prop: 'caName',
+                        prop: 'caId',
                         sortable: true,
                         filter: true,
                         span: 24,
                         search: true,
                         searchOrder:8,
                         width: 120,
+                        type:'select',
                         dicUrl:"/api/blade-desk/BA/craftAbility/findList",
                         props:{
                             label:"caName",

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">预结算</el-button>
-                        <el-button type="primary" @click="settlementFnNum">结算</el-button>
-                        <el-button type="danger" @click="onSubmit">无需结算</el-button>
+                        <el-button type="primary" @click="settlementFn" v-if="permission.unsettled_pre-settlement">预结算</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-form-item>
                 </el-form>
             </template>
             <template #menu-right>
-                <el-button type="primary" @click="handleSupplement">补充结算</el-button>
+                <el-button type="primary" @click="handleSupplement" v-if="permission.unsettled_supple-settlement">补充结算</el-button>
             </template>
             <template #menu></template>
         </avue-crud>
@@ -96,6 +96,7 @@ import 'nprogress/nprogress.css';
 import { downloadXls } from '@/utils/util';
 import settlementDailog from './SettlementDailog.vue'
 import {getStatement,noSettlementItem,calculate,preSettlement,supplement} from "@/api/outsourcingManagement/oemOrderSettlement"
+import { mapGetters } from 'vuex';
 export default {
     components: {
         settlementDailog
@@ -212,14 +213,15 @@ export default {
                         filter: true,
                         span: 24,
                         search: true,
-                        width: 120,
-                        type:'select',
                         searchOrder:5,
-                        dicUrl:"/api/blade-scheduling/qualityGrade/getGrades",
-                        props:{
-                            label:'qualityGrade',
-                            value:"id"
-                        }
+                        width: 120,
+                        // type:'select',
+                        // searchOrder:5,
+                        // dicUrl:"/api/blade-scheduling/qualityGrade/getGrades",
+                        // props:{
+                        //     label:'qualityGrade',
+                        //     value:"id"
+                        // }
                     },
                     {
                         label:"流程卡号",
@@ -490,6 +492,9 @@ export default {
             }
         }
     },
+    computed: {
+        ...mapGetters(['permission']),
+    },
     methods: {
         // 表格排序
         sortChange({ prop, order }) {

src/views/oem/oemOrderSettlement/index.vue

@@ -1,19 +1,19 @@
 <template>
     <basic-container>
         <el-tabs v-model="activeName" class="demo-tabs" @tab-change="tabPositionChange">
-            <el-tab-pane label="未结算" name="1"></el-tab-pane>
-            <el-tab-pane label="待确认" name="2"></el-tab-pane>
+            <el-tab-pane label="未结算" name="1" v-if="permission.unsettled_list"></el-tab-pane>
+            <el-tab-pane label="待确认" name="2" v-if="permission.underReview_list"></el-tab-pane>
             <!-- <el-tab-pane label="结算中" name="2"></el-tab-pane> -->
-            <el-tab-pane label="结算异常" name="3"></el-tab-pane>
-            <el-tab-pane label="审核中" name="6"></el-tab-pane>
-             <el-tab-pane label="结算完成" name="4"></el-tab-pane>
+            <el-tab-pane label="结算异常" name="3" v-if="permission.settlementAnomaly_list"></el-tab-pane>
+            <el-tab-pane label="审核中" name="6" v-if="permission.inReview_list"></el-tab-pane>
+             <el-tab-pane label="结算完成" name="4" v-if="permission.settlementCompleted_list"></el-tab-pane>
         </el-tabs>
-        <unsettled v-if="activeName=='1'"></unsettled>
+        <unsettled v-if="activeName=='1' && permission.unsettled_list"></unsettled>
         <!-- <settlementIn v-if="activeName=='2'"></settlementIn> -->
-        <settlementAnomaly v-if="activeName=='3'"></settlementAnomaly>
-        <settlementCompleted v-if="activeName=='4'"></settlementCompleted>
-        <underReview v-if="activeName=='2'"></underReview>
-        <inReview v-if="activeName == '6'"></inReview>
+        <settlementAnomaly v-if="activeName=='3' && permission.settlementAnomaly_list"></settlementAnomaly>
+        <settlementCompleted v-if="activeName=='4' && permission.settlementCompleted_list"></settlementCompleted>
+        <underReview v-if="activeName=='2' && permission.underReview_list"></underReview>
+        <inReview v-if="activeName == '6' && permission.inReview_list"></inReview>
         
     </basic-container>
 </template>
@@ -24,6 +24,7 @@ import settlementAnomaly from './components/settlementAnomaly.vue'
 import  settlementCompleted from './components/settlementCompleted.vue'
 import underReview from './components/underReview.vue'
 import inReview from './components/inReview.vue'
+import { mapGetters } from 'vuex';
 export default {
     components:{
         unsettled,
@@ -39,6 +40,9 @@ export default {
             isOpen:false,
         }
     },
+    computed: {
+        ...mapGetters(['permission']),
+    },
     methods:{
 
     }