问题修改

dev-scheduling
jinna 3 days ago
parent 00f3461021
commit 64e48b604b
  1. 35
      src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
  2. 32
      src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
  3. 28
      src/views/oem/oemOrderSettlement/components/underReview.vue
  4. 28
      src/views/oem/oemOrderSettlement/components/unsettled.vue
  5. 2
      src/views/oem/oemOrderSettlement/index.vue
  6. 2
      src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
  7. 5
      src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue

@ -12,6 +12,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" @click="settlementFnNum" v-if="permission.settlementAnomaly_settlement">结算</el-button>
<!-- <el-button type="danger" @click="">无需结算</el-button> -->
</el-form-item>
</el-form>
</template>
@ -22,6 +23,25 @@
<template #menu>
</template>
<template #ocIds-search="{ type }">
<jhSelect
:value="searchParams.ocIds"
@input="val => (searchParams.ocIds = val)"
placeholder="请搜索选择"
api-url="/blade-desk/BA/Oem/list"
echo-api="/blade-desk/BA/Oem/list"
echoParamsKey="ids"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="ocName"
labelPre="code"
value-key="id"
search-key="code"
:debounce-time="500"
/>
</template>
</avue-crud>
<settlementDailog v-if="isOpen" :showDialog="isOpen" :type="settlementType" :statementList="selectionList" :settleResult="settleResult" @closeDialog="closeDialog" @refresh="refreshTable"></settlementDailog>
@ -190,14 +210,19 @@ export default {
},
{
label: '结算大类',
prop: 'statementCategory',
prop: 'statementCategoryId',
sortable: 'custom',
type:"select",
filter: true,
span: 24,
search: true,
width: 120,
searchOrder:19,
dicUrl:"/api/blade-desk/mesOemStatementCategory/listForSelect",
props:{
label:'statementCategory',
value:"id"
},
},
{
label: '流程卡号',
@ -349,6 +374,7 @@ export default {
prop: 'memo',
sortable: true,
filterable: true,
clearable:true,
span: 24,
search: true,
width: 120,
@ -433,7 +459,7 @@ export default {
},
{
label: '外协厂商',
prop: 'ocId',
prop: 'ocIds',
sortable: true,
filterable: true,
span: 24,
@ -620,7 +646,8 @@ export default {
...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 && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ? this.query.memo.join(';') : this.query.memo,
memo:this.query && this.query.memo && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ?
this.query.memo.join(';') : this.query.memo && this.query.memo.indexOf(',') != -1 ? this.query.memo.split(',').join(';') : this.query.memo,
// memo:this.query && this.query.memo && this.query.memo.length != 0 && this.query.memo.join(';'),
}
if(params.putStoreTime) delete params.putStoreTime;

@ -8,6 +8,25 @@
<template #menu-left>
<el-button type="primary" @click="pushERP" v-if="permission.settlementCompleted_pushERP">推送ERP</el-button>
</template>
<template #ocIds-search="{ type }">
<jhSelect
:value="searchParams.ocIds"
@input="val => (searchParams.ocIds = val)"
placeholder="请搜索选择"
api-url="/blade-desk/BA/Oem/list"
echo-api="/blade-desk/BA/Oem/list"
echoParamsKey="ids"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="ocName"
labelPre="code"
value-key="id"
search-key="code"
:debounce-time="500"
/>
</template>
<template #menu-right>
</template>
@ -183,14 +202,19 @@ export default {
},
{
label: '结算大类',
prop: 'statementCategory',
prop: 'statementCategoryId',
sortable: 'custom',
type:"select",
filter: true,
span: 24,
search: true,
width: 120,
searchOrder:19,
dicUrl:"/api/blade-desk/mesOemStatementCategory/listForSelect",
props:{
label:'statementCategory',
value:"id"
},
},
{
label: '厂家代码',
@ -636,7 +660,9 @@ export default {
...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 && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ? this.query.memo.join(';') : this.query.memo,
// memo:this.query && this.query.memo && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ? this.query.memo.join(';') : this.query.memo,
memo:this.query && this.query.memo && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ?
this.query.memo.join(';') : this.query.memo && this.query.memo.indexOf(',') != -1 ? this.query.memo.split(',').join(';') : this.query.memo,
}
if(params.putStoreTime) delete params.putStoreTime;
getStatement(params).then(res =>{

@ -10,6 +10,25 @@
<el-button type="primary" @click="settleConfirm" v-if="permission.underReview_settlementConfirm">结算确认</el-button>
<el-button type="primary" @click="initiateReview" v-if="permission.underReview_initiateCheck">发起审核</el-button>
</template>
<template #ocIds-search="{ type }">
<jhSelect
:value="searchParams.ocIds"
@input="val => (searchParams.ocIds = val)"
placeholder="请搜索选择"
api-url="/blade-desk/BA/Oem/list"
echo-api="/blade-desk/BA/Oem/list"
echoParamsKey="ids"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="ocName"
labelPre="code"
value-key="id"
search-key="code"
:debounce-time="500"
/>
</template>
</avue-crud>
<!-- 结算确认 -->
<el-dialog title="结算确认" :modelValue="isConfirm" append-to-body width="30%">
@ -228,14 +247,19 @@ export default {
},
{
label: '结算大类',
prop: 'statementCategory',
prop: 'statementCategoryId',
sortable: 'custom',
type:"select",
filter: true,
span: 24,
search: true,
width: 120,
searchOrder:19,
dicUrl:"/api/blade-desk/mesOemStatementCategory/listForSelect",
props:{
label:'statementCategory',
value:"id"
},
},
{
label: '厂家代码',

@ -22,6 +22,25 @@
<el-button type="primary" @click="handleSupplement" v-if="permission.unsettled_suppleSettlement">补充结算</el-button>
</template>
<template #menu></template>
<template #ocIds-search="{ type }">
<jhSelect
:value="searchParams.ocIds"
@input="val => (searchParams.ocIds = val)"
placeholder="请搜索选择"
api-url="/blade-desk/BA/Oem/list"
echo-api="/blade-desk/BA/Oem/list"
echoParamsKey="ids"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="ocName"
labelPre="code"
value-key="id"
search-key="code"
:debounce-time="500"
/>
</template>
</avue-crud>
<!-- 预结算弹窗 -->
<el-dialog title="预结算" append-to-body :modelValue="openSettle" width="30%">
@ -269,14 +288,19 @@ export default {
// },
{
label: '结算大类',
prop: 'statementCategory',
prop: 'statementCategoryId',
sortable: 'custom',
type:"select",
filter: true,
span: 24,
search: true,
width: 120,
searchOrder:19,
dicUrl:"/api/blade-desk/mesOemStatementCategory/listForSelect",
props:{
label:'statementCategory',
value:"id"
},
},
{
label: '厂家代码',

@ -2,9 +2,9 @@
<basic-container>
<el-tabs v-model="activeName" class="demo-tabs" @tab-change="tabPositionChange">
<el-tab-pane label="未结算" name="1" v-if="permission.unsettled_list"></el-tab-pane>
<el-tab-pane label="结算异常" name="3" v-if="permission.settlementAnomaly_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" 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>

@ -9,7 +9,7 @@
<template #menu-left>
<el-button type="primary" @click="batchSet()" v-if="permission.tankSolutionTaskDispose_batchFill">批量填报</el-button>
<el-button type="primary" @click="checkFn()" v-if="permission.tankSolutionTaskDispose_check">审核</el-button>
<el-button type="primary" @click="getMedicineFn()" v-if="permission.tankSolutionTaskDispose_medicine"></el-button>
<el-button type="primary" @click="getMedicineFn()" v-if="permission.tankSolutionTaskDispose_medicine"></el-button>
</template>
<template #menu="scope">
<el-button type="text" @click="handleView(scope.row, 'view')" v-if="permission.tankSolutionTaskDispose_detail">详情</el-button>

@ -313,7 +313,7 @@ export default {
value: 1,
},
{
label: '电控制',
label: '电控制',
prop: 'dqkz',
width: 120,
type: 'switch',
@ -346,7 +346,8 @@ export default {
value: 1,
},
{
label: '循环水箱',
label: '循环系统',
// label: '',
prop: 'xhsx',
width: 120,
type: 'switch',

Loading…
Cancel
Save