外协结算缺陷修改

dev-scheduling
jinna 1 day ago
parent b6bcd23f34
commit 9901e0354c
  1. 47
      src/views/oem/oemOrderSettlement/components/inReview.vue
  2. 20
      src/views/oem/oemOrderSettlement/components/proofreadingAndReview.vue
  3. 12
      src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
  4. 4
      src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
  5. 11
      src/views/oem/oemOrderSettlement/components/underReview.vue
  6. 20
      src/views/oem/oemOrderSettlement/components/unsettled.vue
  7. 12
      src/views/oem/oemOrderSettlement/index.vue
  8. 12
      src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue
  9. 79
      src/views/qualityManagement/inspectionArchiving/auditFile/index.vue

@ -46,7 +46,9 @@ export default {
}, },
approvalType:1, approvalType:1,
showDialog:false, showDialog:false,
searchParams:{}, searchParams:{
approvalStatusList:['1','2','5']
},
selectionList:[], selectionList:[],
option:{ option:{
height: 'auto', height: 'auto',
@ -137,13 +139,48 @@ export default {
}, },
{ {
label: '审核状态', label: '审核状态',
prop: 'approvalStatus', prop: 'approvalStatusList',
sortable: true, sortable: true,
filterable: true, filterable: true,
span: 24, span: 24,
width: 120, width: 120,
search:true, search:true,
hide:true,
type:'select',
multiple:true,
dicData:[
{
label:"待校对",
value:'1'
},
{
label:"校对中",
value:'2'
},
{
label:"待审核",
value:'5'
},
{
label:"审核通过",
value:'3'
},
{
label:"审核不通过",
value:'4'
},
]
},
{
label: '审核状态',
prop: 'approvalStatus',
sortable: true,
filterable: true,
span: 24,
width: 120,
search:false,
type:'select', type:'select',
// multiple:true,
dicData:[ dicData:[
{ {
label:"待校对", label:"待校对",
@ -249,6 +286,10 @@ export default {
}, },
searchReset(){ searchReset(){
this.query = { this.query = {
approvalStatusList:['1','2','5']
}
this.searchParams = {
approvalStatusList:['1','2','5']
} }
this.onLoad() this.onLoad()
}, },
@ -289,6 +330,8 @@ export default {
current:this.page.currentPage, current:this.page.currentPage,
size:this.page.pageSize, size:this.page.pageSize,
...this.query, ...this.query,
approvalStatusList:this.query && this.query.approvalStatusList && typeof(this.query.approvalStatusList) == 'object' ?
this.query.approvalStatusList.join(',') : this.query.approvalStatusList
} }
approvalList(params).then(res =>{ approvalList(params).then(res =>{
this.data = res.data.data.records this.data = res.data.data.records

@ -25,21 +25,21 @@
</div> </div>
<el-table :data="factoryData" v-if="checkBtn == '1'" v-loading="loading"> <el-table :data="factoryData" v-if="checkBtn == '1'" v-loading="loading">
<el-table-column label="#" type="index" width="55px" align="center"></el-table-column> <el-table-column label="#" type="index" width="55px" align="center"></el-table-column>
<el-table-column label="厂家代码" prop="ocCode" align="center"></el-table-column> <el-table-column label="厂家代码" prop="ocCode" align="center" width="350px"></el-table-column>
<el-table-column label="厂家名称" prop="ocName" align="center"></el-table-column> <el-table-column label="厂家名称" prop="ocName" align="center"></el-table-column>
<el-table-column label="结算批数" prop="batchCount" align="center"></el-table-column> <el-table-column label="结算批数" prop="batchCount" align="center" width="280px"></el-table-column>
<el-table-column label="结算金额(元)" prop="monthAmount" align="center"></el-table-column> <el-table-column label="结算金额(元)" prop="monthAmount" align="center" width="280px"></el-table-column>
</el-table> </el-table>
<el-table :data="factoryTypeData" v-if="checkBtn == '2'"> <el-table :data="factoryTypeData" v-if="checkBtn == '2'">
<el-table-column label="#" type="index" width="55px" align="center"></el-table-column> <el-table-column label="#" type="index" width="55px" align="center"></el-table-column>
<el-table-column label="厂家代码" prop="ocCode" align="center"></el-table-column> <el-table-column label="厂家代码" prop="ocCode" align="center" width="200px"></el-table-column>
<el-table-column label="厂家名称" prop="ocName" align="center"></el-table-column> <el-table-column label="厂家名称" prop="ocName" align="center"></el-table-column>
<el-table-column label="结算大类" prop="statementCategory" align="center"></el-table-column> <el-table-column label="结算大类" prop="statementCategory" align="center" width="150px"></el-table-column>
<el-table-column label="结算批数" prop="batchCount" align="center"></el-table-column> <el-table-column label="结算批数" prop="batchCount" align="center" width="150px"></el-table-column>
<el-table-column label="总面积(dm²)" prop="totalArea" align="center"></el-table-column> <el-table-column label="总面积(dm²)" prop="totalArea" align="center" width="150px"></el-table-column>
<el-table-column label="面积月占比(%)" prop="areaMonthRatio" align="center"></el-table-column> <el-table-column label="面积月占比(%)" prop="areaMonthRatio" align="center" width="150px"></el-table-column>
<el-table-column label="月结算金额(元)" prop="monthAmount" align="center"></el-table-column> <el-table-column label="月结算金额(元)" prop="monthAmount" align="center" width="150px"></el-table-column>
<el-table-column label="金额月占比(%)" prop="amountMonthRatio" align="center"></el-table-column> <el-table-column label="金额月占比(%)" prop="amountMonthRatio" align="center" width="150px"></el-table-column>
</el-table> </el-table>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">

@ -287,7 +287,7 @@ export default {
filter: true, filter: true,
span: 24, span: 24,
search: true, search: true,
width: 120, width: 180,
searchOrder:7, searchOrder:7,
}, },
{ {
@ -560,6 +560,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
this.loading = true;
// //
const params = { const params = {
...this.query, ...this.query,
@ -574,10 +575,12 @@ export default {
calculate(params).then(res => { calculate(params).then(res => {
// //
this.$message.success('结算成功'); this.$message.success('操作完成');
this.onLoad(); this.onLoad();
this.loading = false;
}).catch(() => { }).catch(() => {
// this.$message.error(''); // this.$message.error('');
this.loading = false;
}); });
}).catch(() => { }).catch(() => {
// //
@ -597,6 +600,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
this.loading = true;
let params = { let params = {
...this.query, ...this.query,
postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime[0], postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime[0],
@ -607,10 +611,12 @@ export default {
if(params.putStoreTime) delete params.putStoreTime; if(params.putStoreTime) delete params.putStoreTime;
console.log('params----------',params) console.log('params----------',params)
noSettlementItem(params).then(() => { noSettlementItem(params).then(() => {
this.$message.success('无需结算成功'); this.$message.success('操作完成');
this.onLoad(); this.onLoad();
this.loading = false;
}).catch(() => { }).catch(() => {
// this.$message.error(''); // this.$message.error('');
this.loading = false;
}); });
}).catch(() => { }).catch(() => {
// //

@ -279,7 +279,7 @@ export default {
filter: true, filter: true,
span: 24, span: 24,
search: true, search: true,
width: 120, width: 180,
searchOrder:7, searchOrder:7,
}, },
{ {
@ -369,7 +369,7 @@ export default {
filter: true, filter: true,
span: 24, span: 24,
search: false, search: false,
width: 120, width: 180,
}, },
{ {
label: '计量单位', label: '计量单位',

@ -44,6 +44,7 @@
clearable> clearable>
<el-option label="订单数据错误" value="订单数据错误"></el-option> <el-option label="订单数据错误" value="订单数据错误"></el-option>
<el-option label="无需结算" value="无需结算"></el-option> <el-option label="无需结算" value="无需结算"></el-option>
<el-option label="未找到报价单" value="未找到报价单"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -313,7 +314,7 @@ export default {
filter: true, filter: true,
span: 24, span: 24,
search: true, search: true,
width: 120, width: 180,
searchOrder:6, searchOrder:6,
}, },
{ {
@ -412,7 +413,7 @@ export default {
filter: true, filter: true,
span: 24, span: 24,
search: false, search: false,
width: 120, width: 180,
}, },
{ {
label: '计量单位', label: '计量单位',
@ -602,6 +603,7 @@ export default {
summitSettle(){ summitSettle(){
this.$refs.settleForm.validate(valid => { this.$refs.settleForm.validate(valid => {
if(valid){ if(valid){
this.loading = true;
let params = { let params = {
ids:this.selectionList.map(item => item.id), ids:this.selectionList.map(item => item.id),
...this.settleForm, ...this.settleForm,
@ -610,10 +612,13 @@ export default {
console.log('params----------',params) console.log('params----------',params)
confirmSettlement(params).then(res =>{ confirmSettlement(params).then(res =>{
if(res.data.code == 200){ if(res.data.code == 200){
this.$message.success('确认结算成功'); this.$message.success('操作完成');
this.isConfirm = false this.isConfirm = false
this.onLoad() this.onLoad()
this.loading = false;
} }
}).catch(() =>{
this.loading = false;
}) })
// this.$message.success('') // this.$message.success('')
// this.isConfirm = false // this.isConfirm = false

@ -356,7 +356,7 @@ export default {
filter: true, filter: true,
span: 24, span: 24,
search: true, search: true,
width: 120, width: 180,
searchOrder:6, searchOrder:6,
}, },
{ {
@ -598,6 +598,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
this.loading = true;
// //
const params = { const params = {
...this.query, ...this.query,
@ -610,11 +611,13 @@ export default {
calculate(params).then(res => { calculate(params).then(res => {
if(res.data.code == 200){ if(res.data.code == 200){
this.$message.success('结算成功'); this.$message.success('操作完成');
this.onLoad(); this.onLoad();
this.loading = false;
} }
}).catch(() => { }).catch(() => {
// this.$message.error(''); // this.$message.error('');
this.loading = false;
}); });
// oemSettleAccountsItem(params).then(res => { // oemSettleAccountsItem(params).then(res => {
@ -684,7 +687,7 @@ export default {
preSettlement(params).then(res =>{ preSettlement(params).then(res =>{
console.log('res----------',res) console.log('res----------',res)
if(res.data){ if(res.data){
this.$message.success('预结算成功') this.$message.success('操作完成')
this.openSettle = false this.openSettle = false
NProgress.start(); NProgress.start();
downloadXls(res.data, `预结算数据表${this.$dayjs().format('YYYY-MM-DD')}.xlsx`); downloadXls(res.data, `预结算数据表${this.$dayjs().format('YYYY-MM-DD')}.xlsx`);
@ -710,6 +713,7 @@ export default {
summitSupplement(){ summitSupplement(){
this.$refs.supplementForm.validate(valid =>{ this.$refs.supplementForm.validate(valid =>{
if(valid){ if(valid){
this.loading = true
let params = { let params = {
...this.supplementForm, ...this.supplementForm,
postPlatingStorageTimeStart:this.supplementForm && this.supplementForm.putStoreTime && this.supplementForm.putStoreTime[0], postPlatingStorageTimeStart:this.supplementForm && this.supplementForm.putStoreTime && this.supplementForm.putStoreTime[0],
@ -719,10 +723,13 @@ export default {
console.log('params----------',params) console.log('params----------',params)
supplement(params).then(res =>{ supplement(params).then(res =>{
if(res.data.code == 200){ if(res.data.code == 200){
this.$message.success('补充结算成功'); this.$message.success('操作完成');
this.openSupplement = false this.openSupplement = false
this.onLoad() this.onLoad()
this.loading = false
} }
}).catch(() =>{
this.loading = false
}) })
} }
}) })
@ -741,6 +748,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
}).then(() => { }).then(() => {
this.loading = true;
let params = { let params = {
...this.query, ...this.query,
postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime[0], postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime[0],
@ -749,10 +757,12 @@ export default {
if(params.putStoreTime) delete params.putStoreTime; if(params.putStoreTime) delete params.putStoreTime;
console.log('params----------',params) console.log('params----------',params)
noSettlementItem(params).then(() => { noSettlementItem(params).then(() => {
this.$message.success('无需结算成功'); this.$message.success('操作完成');
this.onLoad(); this.onLoad();
this.loading = false;
}).catch(() => { }).catch(() => {
// this.$message.error(''); // this.$message.error('');
this.loading = false;
}); });
}).catch(() => { }).catch(() => {
// //

@ -8,12 +8,12 @@
<el-tab-pane label="审核中" name="6" v-if="permission.inReview_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-tab-pane label="结算完成" name="4" v-if="permission.settlementCompleted_list"></el-tab-pane>
</el-tabs> </el-tabs>
<unsettled v-if="activeName=='1' && permission.unsettled_list"></unsettled> <unsettled v-show="activeName=='1' && permission.unsettled_list"></unsettled>
<!-- <settlementIn v-if="activeName=='2'"></settlementIn> --> <!-- <settlementIn v-show="activeName=='2'"></settlementIn> -->
<settlementAnomaly v-if="activeName=='3' && permission.settlementAnomaly_list"></settlementAnomaly> <settlementAnomaly v-show="activeName=='3' && permission.settlementAnomaly_list"></settlementAnomaly>
<settlementCompleted v-if="activeName=='4' && permission.settlementCompleted_list"></settlementCompleted> <settlementCompleted v-show="activeName=='4' && permission.settlementCompleted_list"></settlementCompleted>
<underReview v-if="activeName=='2' && permission.underReview_list"></underReview> <underReview v-show="activeName=='2' && permission.underReview_list"></underReview>
<inReview v-if="activeName == '6' && permission.inReview_list"></inReview> <inReview v-show="activeName == '6' && permission.inReview_list"></inReview>
</basic-container> </basic-container>
</template> </template>

@ -9,8 +9,8 @@
<div style="width: 88%;text-align:center;">热表分厂质量记录卡</div> <div style="width: 88%;text-align:center;">热表分厂质量记录卡</div>
</div> --> </div> -->
<div class="fixTopLeft">JONHON受控</div> <div class="fixTopLeft">JONHON受控</div>
<div class="printTitle">热表分厂质量记录卡</div> <div class="printTitle" style="color:#000;">热表分厂质量记录卡</div>
<div class="tableNo" style="text-align: left;width: 180px;float: right;">表号</div> <div class="tableNo" style="text-align: left;width: 180px;float: right;color:#000;">表号</div>
<table id="cus-table" cellspacing="0"> <table id="cus-table" cellspacing="0">
<template v-if="modelOne!= null && modelOne.dsPart!= null"> <template v-if="modelOne!= null && modelOne.dsPart!= null">
<tr> <tr>
@ -52,12 +52,12 @@
</template> </template>
<template v-if="modelTwo && modelTwo.length>0"> <template v-if="modelTwo && modelTwo.length>0">
<tr> <tr>
<td colspan="9" style="font-size:21px;">生产过程</td> <td colspan="9" style="font-size:21px;font-weight:550;">生产过程</td>
</tr> </tr>
<template v-for="(item,index) in modelTwo" > <template v-for="(item,index) in modelTwo" >
<tr v-if="index != 0" style="height: 20px;"></tr> <tr v-if="index != 0" style="height: 20px;"></tr>
<tr> <tr>
<td colspan="9" style="font-size:16px;"> <td colspan="9" style="font-size:16px;font-weight:550;">
{{item.orders}} - {{item.procedureSet.ppsName}} 工序详情 {{item.orders}} - {{item.procedureSet.ppsName}} 工序详情
</td> </td>
</tr> </tr>
@ -773,7 +773,7 @@ export default {
font-size: 22px; font-size: 22px;
font-weight: 700; font-weight: 700;
padding: 8px; padding: 8px;
color:#606266 color: #000000;
// margin-bottom: 6px; // margin-bottom: 6px;
} }
@ -814,7 +814,7 @@ export default {
} }
.fixTopLeft{ .fixTopLeft{
// position: fixed; // position: fixed;
float: left; // position: absolute;
top: 1; top: 1;
left: 0; left: 0;
font-family: 'SimHei'; font-family: 'SimHei';

@ -6,6 +6,7 @@
:table-loading="loading" :table-loading="loading"
:data="data" :data="data"
v-model="form" v-model="form"
v-model:search="search"
v-model:page="page" v-model:page="page"
ref="crud" ref="crud"
@row-update="rowUpdate" @row-update="rowUpdate"
@ -26,7 +27,6 @@
<span v-show="type == 'edit' || type == 'add'"> <span v-show="type == 'edit' || type == 'add'">
<jhSelect <jhSelect
:value="form.caId" :value="form.caId"
@input="val => (form.caId = val)"
placeholder="请搜索选择" placeholder="请搜索选择"
api-url="/blade-desk/BA/craftAbility/list" api-url="/blade-desk/BA/craftAbility/list"
echo-api="/blade-desk/BA/craftAbility/list" echo-api="/blade-desk/BA/craftAbility/list"
@ -43,6 +43,44 @@
/> />
</span> </span>
</template> </template>
<template #ppsId-form="{type}">
<span v-show="type == 'edit' || type == 'add'">
<jhSelect
:value="form.ppsId"
placeholder="请搜索选择"
api-url="/api/blade-desk/bsProcessSet/list"
echo-api="/api/blade-desk/bsProcessSet/list"
echoParamsKey="ids"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="name"
value-key="id"
search-key="name"
:debounce-time="500"
:title="'修改'"
/>
</span>
</template>
<template #ppsId-search="{ disabled, size }">
<jhSelect
:value="search.ppsId"
@input="val => (search.ppsId = String(val))"
placeholder="请搜索选择"
api-url="/api/blade-desk/bsProcessSet/list"
echo-api="/api/blade-desk/bsProcessSet/list"
echoParamsKey="ids"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="name"
value-key="id"
search-key="name"
:debounce-time="500"
/>
</template>
</avue-crud> </avue-crud>
</basic-container> </basic-container>
</template> </template>
@ -61,6 +99,7 @@ export default {
currentPage: 1, currentPage: 1,
total: 0, total: 0,
}, },
search:{},
query:{}, query:{},
option: { option: {
height: 'auto', height: 'auto',
@ -119,23 +158,39 @@ export default {
// }, // },
column: [ column: [
{ {
label: '工序', label:'工序',
prop: 'ppsId', prop: 'ppsId',
labelWidth: 150, labelWidth: 150,
search:true,
hide:true,
span: 24,
rules: [
{
required: true,
message: '请选择工序',
trigger: 'click',
},
],
},
{
label: '工序',
prop: 'ppsName',
labelWidth: 150,
// bind: 'bsProcedureSet.ppsName', // bind: 'bsProcedureSet.ppsName',
search: true, search: false,
sortable: 'custom', sortable: 'custom',
width: 150, width: 150,
span: 24, span: 24,
type: 'select', // type: 'select',
filterable: true, filterable: true,
remote: true, remote: true,
dicUrl:`/api/blade-desk/bsProcessSet/list?name={{key}}`, display:false,
props:{ // dicUrl:`/api/blade-desk/bsProcessSet/list?name={{key}}`,
label: 'name', // props:{
value: 'id', // label: 'name',
res: 'data.records', // value: 'id',
}, // res: 'data.records',
// },
rules: [ rules: [
{ {
required: true, required: true,
@ -329,7 +384,9 @@ export default {
this.onLoad(this.page); this.onLoad(this.page);
}, },
searchChange(params, done) { searchChange(params, done) {
this.query = params; console.log('params----------',params)
console.log('search----------',this.search)
this.query = this.search;
// this.page.currentPage = 1; // this.page.currentPage = 1;
this.onLoad(); this.onLoad();
done(); done();

Loading…
Cancel
Save