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

dev-scheduling
zhangdi 3 days ago
commit e2880a8def
  1. 13
      src/api/energyManagement/energyManagement.js
  2. 1
      src/components/jh-select/index.vue
  3. 2
      src/views/costManagement/subjectFeeMaintenance.vue
  4. 30
      src/views/energyManagement/components/batchAddWater.vue
  5. 31
      src/views/energyManagement/components/electricityTarget.vue
  6. 14
      src/views/energyManagement/components/waterTarget.vue
  7. 37
      src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
  8. 34
      src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
  9. 30
      src/views/oem/oemOrderSettlement/components/underReview.vue
  10. 28
      src/views/oem/oemOrderSettlement/components/unsettled.vue
  11. 2
      src/views/oem/oemOrderSettlement/index.vue
  12. 8
      src/views/productionTesting/productionQuality.vue
  13. 2
      src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
  14. 5
      src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue

@ -65,10 +65,19 @@ export const getDetail = (params) => {
});
};
// 提交
// 新增
export const submit = (params) => {
return request({
url: '/blade-desk/bsEnergyTarget/submit',
url: '/blade-desk/bsEnergyTarget/save',
method: 'post',
data: params,
});
};
// 修改
export const update = (params) => {
return request({
url: '/blade-desk/bsEnergyTarget/update',
method: 'post',
data: params,
});

@ -98,7 +98,6 @@ export default {
},
methods: {
debounce(func, wait) {
console.log('22222222222222222')
let timeout = null;
return (...args) => {
clearTimeout(timeout);

@ -46,7 +46,7 @@
<el-form-item label="类型" prop="subjectType">
<el-radio-group v-model="addForm.subjectType">
<el-radio label="0">制造费用</el-radio>
<el-radio label="1">作业中心材料费用</el-radio>
<el-radio label="1">erp作业中心材料费用</el-radio>
</el-radio-group>
</el-form-item>
</el-form>

@ -139,7 +139,7 @@
</template>
<script>
import {getDetail,submit} from '@/api/energyManagement/energyManagement'
import {getDetail,submit,update} from '@/api/energyManagement/energyManagement'
export default {
props:{
showAdd:{
@ -195,15 +195,18 @@ export default {
}
},
mounted(){
this.openShow = this.showAdd
if (this.moldAddMore && this.form.tableData.length === 0) {
this.addTable();
this.openShow = this.showAdd
}else{
getDetail({
type:this.type == 'water' ? 1 : 2,
year:this.checkYear
}).then(res =>{
res.data.data.originalYear = res.data.data.year
this.form.tableData = [res.data.data]
this.openShow = this.showAdd
console.log('form--------',this.form.tableData)
})
}
},
@ -256,16 +259,21 @@ export default {
submitData.map(item =>{
item.type = this.type == 'water' ? 1 : 2
})
}
submit(submitData).then(res =>{
if(res.data.code == 200){
this.$message.success(this.checkYear == '' ? '新增成功' : '修改成功')
this.closeDialog(true)
}
})
submit(submitData).then(res =>{
if(res.data.code == 200){
this.$message.success('新增成功')
this.closeDialog(true)
}
})
}else{
update(submitData[0]).then(res =>{
if(res.data.code == 200){
this.$message.success('修改成功')
this.closeDialog(true)
}
})
}
})
}
}

@ -39,15 +39,15 @@
templateName="用电目标模板.xls"
importUrl="/blade-desk/bsEnergyTarget/electric-import-excel"
@closeDialog="closeDialog"></basic-import>
<batchAddWater
v-if="showAdd"
type="electricity"
:showAdd="showAdd"
:moldAddMore="moldAddMore"
:checkYear="checkYear"
@closeDialog="closeDialog"
></batchAddWater>
</div>
<batchAddWater
v-if="showAdd"
type="electricity"
:showAdd="showAdd"
:moldAddMore="moldAddMore"
:checkYear="checkYear"
@closeDialog="closeDialog"
></batchAddWater>
</template>
<script>
import basicImport from '@/components/basic-import/main.vue'
@ -240,6 +240,7 @@ export default {
},
methods: {
handleAdd(){
console.log('11111111111111111111')
this.showAdd = true
this.moldAddMore = true
},
@ -370,6 +371,20 @@ export default {
type:2,
...this.query
}).then(res =>{
res.data.data.records.map(item =>{
item.m01Target = item.m01Target == -1 ? 0 : item.m01Target
item.m02Target = item.m02Target == -1 ? 0 : item.m02Target
item.m03Target = item.m03Target == -1 ? 0 : item.m03Target
item.m04Target = item.m04Target == -1 ? 0 : item.m04Target
item.m05Target = item.m05Target == -1 ? 0 : item.m05Target
item.m06Target = item.m06Target == -1 ? 0 : item.m06Target
item.m07Target = item.m07Target == -1 ? 0 : item.m07Target
item.m08Target = item.m08Target == -1 ? 0 : item.m08Target
item.m09Target = item.m09Target == -1 ? 0 : item.m09Target
item.m10Target = item.m10Target == -1 ? 0 : item.m10Target
item.m11Target = item.m11Target == -1 ? 0 : item.m11Target
item.m12Target = item.m12Target == -1 ? 0 : item.m12Target
})
this.data = res.data.data.records;
this.page.total = res.data.data.total;
this.loading = false;

@ -387,6 +387,20 @@ export default {
console.log('res.data:', res.data);
if (res.data && res.data.data) {
res.data.data.records.map(item =>{
item.m01Target = item.m01Target == -1 ? 0 : item.m01Target
item.m02Target = item.m02Target == -1 ? 0 : item.m02Target
item.m03Target = item.m03Target == -1 ? 0 : item.m03Target
item.m04Target = item.m04Target == -1 ? 0 : item.m04Target
item.m05Target = item.m05Target == -1 ? 0 : item.m05Target
item.m06Target = item.m06Target == -1 ? 0 : item.m06Target
item.m07Target = item.m07Target == -1 ? 0 : item.m07Target
item.m08Target = item.m08Target == -1 ? 0 : item.m08Target
item.m09Target = item.m09Target == -1 ? 0 : item.m09Target
item.m10Target = item.m10Target == -1 ? 0 : item.m10Target
item.m11Target = item.m11Target == -1 ? 0 : item.m11Target
item.m12Target = item.m12Target == -1 ? 0 : item.m12Target
})
this.data = res.data.data.records || [];
this.page.total = res.data.data.total || 0;
console.log('数据处理成功:', {

@ -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>
@ -188,16 +208,21 @@ export default {
value:"id"
},
},
{
{
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>
@ -181,16 +200,21 @@ export default {
},
searchOrder:9,
},
{
{
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%">
@ -226,16 +245,21 @@ export default {
value:"id"
},
},
{
{
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>

@ -179,9 +179,13 @@
</el-table-column>
<el-table-column label="镀前镀后" prop="testType" align="center">
<template #default="scope1">
<el-input v-model="scope1.row.testType"
<!-- <el-input v-model="scope1.row.testType"
:disabled="scope.row.checkUserRealName != null && scope.row.checkUserRealName != '' "
></el-input>
></el-input> -->
<el-select placeholder="请选择" v-model="scope1.row.testType">
<el-option label="镀前" value="1"></el-option>
<el-option label="镀后" value="2"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="量具" prop="actMtId" align="center">

@ -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