|
@@ -16,12 +16,35 @@
|
|
v-model="filterForm.data.may"
|
|
v-model="filterForm.data.may"
|
|
style="width: 100%;"
|
|
style="width: 100%;"
|
|
:type="'daterange'"
|
|
:type="'daterange'"
|
|
- :timegranId="filterForm.data.timegranid"
|
|
|
|
- :oneFoo="getTableData"
|
|
|
|
></zj-timegran-date>
|
|
></zj-timegran-date>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-col :span="3">
|
|
|
|
|
|
+ <el-col :span="6">
|
|
|
|
+ <el-form-item label="编号">
|
|
|
|
+ <el-input
|
|
|
|
+ v-model="filterForm.data.id"
|
|
|
|
+ style="width: 100%;"
|
|
|
|
+ refcous="true"
|
|
|
|
+ ></el-input>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ <el-col :span="6">
|
|
|
|
+ <el-form-item label="工序">
|
|
|
|
+ <el-select
|
|
|
|
+ filterable clearable
|
|
|
|
+ v-model="filterForm.data.workprocType"
|
|
|
|
+ multiple
|
|
|
|
+ placeholder=""
|
|
|
|
+ style="width: 100%;"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="item of nameObj.workprocid.arr"
|
|
|
|
+ :key="item.id"
|
|
|
|
+ :value="item.id"
|
|
|
|
+ :label="item.name"
|
|
|
|
+ ></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
</el-form>
|
|
</el-form>
|
|
@@ -37,6 +60,30 @@
|
|
v-privilege="activeMenu + 'audit'"
|
|
v-privilege="activeMenu + 'audit'"
|
|
:loading="loading"
|
|
:loading="loading"
|
|
>提交审核</el-button>
|
|
>提交审核</el-button>
|
|
|
|
+ <el-button
|
|
|
|
+ type="primary"
|
|
|
|
+ size="mini"
|
|
|
|
+ v-privilege="activeMenu + 'approve'"
|
|
|
|
+ @click="approval()"
|
|
|
|
+ >批准</el-button>
|
|
|
|
+ <el-button
|
|
|
|
+ type="danger"
|
|
|
|
+ size="mini"
|
|
|
|
+ v-privilege="activeMenu + 'approve'"
|
|
|
|
+ @click="nopass()"
|
|
|
|
+ >不通过</el-button>
|
|
|
|
+ <el-button
|
|
|
|
+ type="primary"
|
|
|
|
+ size="mini"
|
|
|
|
+ v-privilege="activeMenu + 'AGREE'"
|
|
|
|
+ @click="agreement()"
|
|
|
|
+ >同意</el-button>
|
|
|
|
+ <el-button
|
|
|
|
+ type="danger"
|
|
|
|
+ size="mini"
|
|
|
|
+ v-privilege="activeMenu + 'reject'"
|
|
|
|
+ @click="rejected()"
|
|
|
|
+ >驳回</el-button>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :span="8" style="float:right; text-align: right;">
|
|
<el-col :span="8" style="float:right; text-align: right;">
|
|
<div>
|
|
<div>
|
|
@@ -179,12 +226,12 @@
|
|
type="selection"
|
|
type="selection"
|
|
width="40"
|
|
width="40"
|
|
align="center"
|
|
align="center"
|
|
- v-if="checkstate"
|
|
|
|
:selectable='checkboxT'
|
|
:selectable='checkboxT'
|
|
fixed="left"
|
|
fixed="left"
|
|
class-name="cnspicuous"
|
|
class-name="cnspicuous"
|
|
></el-table-column>
|
|
></el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
prop="id"
|
|
prop="id"
|
|
label="国贸订单编号"
|
|
label="国贸订单编号"
|
|
fixed="left"
|
|
fixed="left"
|
|
@@ -192,18 +239,20 @@
|
|
:show-overflow-tooltip="true"
|
|
:show-overflow-tooltip="true"
|
|
></el-table-column>
|
|
></el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
prop="workprocType"
|
|
prop="workprocType"
|
|
label="工序"
|
|
label="工序"
|
|
align="center"
|
|
align="center"
|
|
fixed="left"
|
|
fixed="left"
|
|
- width="120px"
|
|
|
|
|
|
+ width="69px"
|
|
:show-overflow-tooltip="true"
|
|
:show-overflow-tooltip="true"
|
|
>
|
|
>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <span>{{ nameObj.workprocid.obj[scope.row.workprocType] ? nameObj.workprocid.obj[scope.row.workprocType] : scope.row.workprocType }}</span>
|
|
|
|
|
|
+ <span>{{ nameObj.workprocid.obj[scope.row.workprocType] ? nameObj.workprocid.obj[scope.row.workprocType].name : scope.row.workprocType }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
prop="jhTime"
|
|
prop="jhTime"
|
|
label="排产日期"
|
|
label="排产日期"
|
|
align="center"
|
|
align="center"
|
|
@@ -212,6 +261,7 @@
|
|
:show-overflow-tooltip="true"
|
|
:show-overflow-tooltip="true"
|
|
></el-table-column>
|
|
></el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
prop="deliveryDate"
|
|
prop="deliveryDate"
|
|
label="交货日期"
|
|
label="交货日期"
|
|
align="center"
|
|
align="center"
|
|
@@ -220,6 +270,7 @@
|
|
:show-overflow-tooltip="true"
|
|
:show-overflow-tooltip="true"
|
|
></el-table-column>
|
|
></el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
prop="grades"
|
|
prop="grades"
|
|
label="钢种"
|
|
label="钢种"
|
|
align="center"
|
|
align="center"
|
|
@@ -229,6 +280,7 @@
|
|
>
|
|
>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
prop="specifications"
|
|
prop="specifications"
|
|
label="规格"
|
|
label="规格"
|
|
fixed="left"
|
|
fixed="left"
|
|
@@ -239,6 +291,7 @@
|
|
>
|
|
>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
prop="lengths"
|
|
prop="lengths"
|
|
label="长度"
|
|
label="长度"
|
|
align="center"
|
|
align="center"
|
|
@@ -247,6 +300,7 @@
|
|
>
|
|
>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
prop="lengthtimesWidth"
|
|
prop="lengthtimesWidth"
|
|
label="高度*宽度"
|
|
label="高度*宽度"
|
|
align="center"
|
|
align="center"
|
|
@@ -255,7 +309,8 @@
|
|
>
|
|
>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
- prop="planWeight"
|
|
|
|
|
|
+ sortable
|
|
|
|
+ prop="planweight"
|
|
label="计划量"
|
|
label="计划量"
|
|
align="center"
|
|
align="center"
|
|
width="110px"
|
|
width="110px"
|
|
@@ -278,20 +333,25 @@
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
prop="planWeightOld"
|
|
prop="planWeightOld"
|
|
|
|
+ align="center"
|
|
label="原计划量"
|
|
label="原计划量"
|
|
- width="54px"
|
|
|
|
|
|
+ width="74px"
|
|
:show-overflow-tooltip="true"
|
|
:show-overflow-tooltip="true"
|
|
>
|
|
>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
prop="tzl"
|
|
prop="tzl"
|
|
|
|
+ align="center"
|
|
label="调整量"
|
|
label="调整量"
|
|
- width="54px"
|
|
|
|
|
|
+ width="74px"
|
|
:show-overflow-tooltip="true"
|
|
:show-overflow-tooltip="true"
|
|
>
|
|
>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
prop="submitter"
|
|
prop="submitter"
|
|
label="提交人"
|
|
label="提交人"
|
|
align="center"
|
|
align="center"
|
|
@@ -300,6 +360,7 @@
|
|
>
|
|
>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
prop="submitTime"
|
|
prop="submitTime"
|
|
label="提交时间"
|
|
label="提交时间"
|
|
align="center"
|
|
align="center"
|
|
@@ -308,14 +369,43 @@
|
|
>
|
|
>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
|
|
+ prop="gmReviewer"
|
|
|
|
+ label="审核人(国贸)"
|
|
|
|
+ align="center"
|
|
|
|
+ width="120px"
|
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
|
+ >
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ sortable
|
|
|
|
+ prop="gmReviewerTime"
|
|
|
|
+ label="审核时间(国贸)"
|
|
|
|
+ align="center"
|
|
|
|
+ width="120px"
|
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
|
+ >
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ sortable
|
|
prop="reviewer"
|
|
prop="reviewer"
|
|
- label="审核人"
|
|
|
|
|
|
+ label="审核人(生产部)"
|
|
|
|
+ align="center"
|
|
|
|
+ width="120px"
|
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
|
+ >
|
|
|
|
+ </el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ sortable
|
|
|
|
+ prop="reviewerTime"
|
|
|
|
+ label="审核时间(生产部)"
|
|
align="center"
|
|
align="center"
|
|
width="120px"
|
|
width="120px"
|
|
:show-overflow-tooltip="true"
|
|
:show-overflow-tooltip="true"
|
|
>
|
|
>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
|
|
+ sortable
|
|
prop="state"
|
|
prop="state"
|
|
label="审核状态"
|
|
label="审核状态"
|
|
align="center"
|
|
align="center"
|
|
@@ -328,15 +418,7 @@
|
|
>{{ nameObj.state.obj[scope.row.state] ? nameObj.state.obj[scope.row.state].name : scope.row.state }}</span>
|
|
>{{ nameObj.state.obj[scope.row.state] ? nameObj.state.obj[scope.row.state].name : scope.row.state }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column
|
|
|
|
- prop="reviewerTime"
|
|
|
|
- label="审核时间"
|
|
|
|
- align="center"
|
|
|
|
- width="120px"
|
|
|
|
- :show-overflow-tooltip="true"
|
|
|
|
- >
|
|
|
|
- </el-table-column>
|
|
|
|
- <el-table-column
|
|
|
|
|
|
+ <!-- <el-table-column
|
|
class-name="gn-TableDownloadExcel-none"
|
|
class-name="gn-TableDownloadExcel-none"
|
|
label="操作"
|
|
label="操作"
|
|
v-if="czstate"
|
|
v-if="czstate"
|
|
@@ -350,7 +432,7 @@
|
|
type="primary"
|
|
type="primary"
|
|
size="mini"
|
|
size="mini"
|
|
v-privilege="activeMenu + 'approve'"
|
|
v-privilege="activeMenu + 'approve'"
|
|
- @click="approval(scope.row)"
|
|
|
|
|
|
+ @click="approval()"
|
|
>批准</el-button>
|
|
>批准</el-button>
|
|
<el-button
|
|
<el-button
|
|
type="primary"
|
|
type="primary"
|
|
@@ -366,7 +448,7 @@
|
|
>驳回</el-button>
|
|
>驳回</el-button>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
- </el-table-column>
|
|
|
|
|
|
+ </el-table-column> -->
|
|
</el-table>
|
|
</el-table>
|
|
</el-form>
|
|
</el-form>
|
|
<el-pagination
|
|
<el-pagination
|
|
@@ -410,32 +492,19 @@ export default {
|
|
show: true,
|
|
show: true,
|
|
data: {
|
|
data: {
|
|
show: false,
|
|
show: false,
|
|
|
|
+ id: '',
|
|
clock: '',
|
|
clock: '',
|
|
clockc: '',
|
|
clockc: '',
|
|
- workprocid: [],
|
|
|
|
|
|
+ workprocType: [],
|
|
location: [],
|
|
location: [],
|
|
networkid: [],
|
|
networkid: [],
|
|
|
|
+ auditStatus: [],
|
|
state: '',
|
|
state: '',
|
|
- itemname: '',
|
|
|
|
- searchtype: '0',
|
|
|
|
- measureid: '',
|
|
|
|
- productid: '',
|
|
|
|
may: '',
|
|
may: '',
|
|
- weightMonth: '',
|
|
|
|
- weightDay: '',
|
|
|
|
unit: '',
|
|
unit: '',
|
|
- jxdays: '',
|
|
|
|
- createtime: '',
|
|
|
|
- createman: '',
|
|
|
|
- updatetime: '',
|
|
|
|
- updateman: '',
|
|
|
|
memo: '',
|
|
memo: '',
|
|
startTime: '',
|
|
startTime: '',
|
|
- endTime: '',
|
|
|
|
- kxf_weight: '',
|
|
|
|
- yxf_weight: '',
|
|
|
|
- gx: '',
|
|
|
|
- workproc_type: ''
|
|
|
|
|
|
+ endTime: ''
|
|
},
|
|
},
|
|
rules: {
|
|
rules: {
|
|
},
|
|
},
|
|
@@ -443,85 +512,6 @@ export default {
|
|
networkid: false
|
|
networkid: false
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- dialog: {
|
|
|
|
- fRow: null,
|
|
|
|
- editorBox: {
|
|
|
|
- show: false,
|
|
|
|
- type: '',
|
|
|
|
- form: {
|
|
|
|
- default: {
|
|
|
|
- workprocid: ''
|
|
|
|
- },
|
|
|
|
- data: {
|
|
|
|
- workprocid: '',
|
|
|
|
- unitid: '',
|
|
|
|
- jxdays: '',
|
|
|
|
- memo: '',
|
|
|
|
- grades: '',
|
|
|
|
- specifications: '',
|
|
|
|
- transportType: '',
|
|
|
|
- chemicalStandard: '',
|
|
|
|
- purpose: '',
|
|
|
|
- planWeight: '',
|
|
|
|
- jhTime: '',
|
|
|
|
- lengths: '',
|
|
|
|
- surfaceStandard: '',
|
|
|
|
- dimension: '',
|
|
|
|
- lengthTimesWidth: '',
|
|
|
|
- iateralArea: '',
|
|
|
|
- deliveryDate: ''
|
|
|
|
- },
|
|
|
|
- rules: {
|
|
|
|
- planWeight: [
|
|
|
|
- { required: true, message: '该项不能为空', trigger: 'change' },
|
|
|
|
- { validator: zCheckNumber1, trigger: 'change' }
|
|
|
|
- ],
|
|
|
|
- lengths: [
|
|
|
|
- { validator: zCheckNumber1, trigger: 'change' }
|
|
|
|
- ],
|
|
|
|
- weightDay: [
|
|
|
|
- { required: true, message: '该项不能为空', trigger: 'change' },
|
|
|
|
- { validator: zCheckNumber1, trigger: 'change' }
|
|
|
|
- ],
|
|
|
|
- specifications: [
|
|
|
|
- { required: true, message: '该项不能为空', trigger: 'change' }
|
|
|
|
- ],
|
|
|
|
- may: [
|
|
|
|
- { required: true, message: '该项不能为空', trigger: 'change' }
|
|
|
|
- ],
|
|
|
|
- grades: [
|
|
|
|
- { required: true, message: '该项不能为空', trigger: 'change' }
|
|
|
|
- ],
|
|
|
|
- unitid: [
|
|
|
|
- { required: true, message: '该项不能为空', trigger: 'change' }
|
|
|
|
- ],
|
|
|
|
- memo: [
|
|
|
|
- { required: true, message: '该项不能为空', trigger: 'change' }
|
|
|
|
- ],
|
|
|
|
- kxf_weight: [
|
|
|
|
- { required: true, message: '该项不能为空', trigger: 'change' },
|
|
|
|
- { validator: zCheckNumber1, trigger: 'change' }
|
|
|
|
- ],
|
|
|
|
- yxf_weight: [
|
|
|
|
- { required: true, message: '该项不能为空', trigger: 'change' },
|
|
|
|
- { validator: zCheckNumber1, trigger: 'change' }
|
|
|
|
- ]
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
- editorBox2: {
|
|
|
|
- show: false,
|
|
|
|
- type: '',
|
|
|
|
- form: {
|
|
|
|
- data: {
|
|
|
|
- may: ''
|
|
|
|
- },
|
|
|
|
- rules: {
|
|
|
|
- may: [{ required: true, message: '该项不能为空', trigger: 'change' }]
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
pageSize: 100,
|
|
pageSize: 100,
|
|
total: 0,
|
|
total: 0,
|
|
@@ -654,8 +644,25 @@ export default {
|
|
]
|
|
]
|
|
},
|
|
},
|
|
workprocid: {
|
|
workprocid: {
|
|
- obj: {},
|
|
|
|
- arr: []
|
|
|
|
|
|
+ obj: {'AT2004': {name: '炼钢'}, 'AT2005': {name: '一高线'}, 'AT2006': {name: '二高线'}, 'AT2007': {name: '型钢'}},
|
|
|
|
+ arr: [
|
|
|
|
+ {
|
|
|
|
+ id: 'AT2004',
|
|
|
|
+ name: '炼钢'
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ id: 'AT2005',
|
|
|
|
+ name: '一高线'
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ id: 'AT2006',
|
|
|
|
+ name: '二高线'
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ id: 'AT2007',
|
|
|
|
+ name: '型钢'
|
|
|
|
+ }
|
|
|
|
+ ]
|
|
},
|
|
},
|
|
location: {
|
|
location: {
|
|
obj: {},
|
|
obj: {},
|
|
@@ -767,36 +774,10 @@ export default {
|
|
if (that.butPrivilege.CHECK || that.butPrivilege.UNDOCHECK) {
|
|
if (that.butPrivilege.CHECK || that.butPrivilege.UNDOCHECK) {
|
|
that.isCheck = true;
|
|
that.isCheck = true;
|
|
}
|
|
}
|
|
- // 管理员在这里录入数据
|
|
|
|
- if (that.loginName === 'admin' && that.filterForm.disabled.networkid) {
|
|
|
|
- that.isCheck = false;
|
|
|
|
- }
|
|
|
|
- // 接收路由参数
|
|
|
|
- if (that.$route.query.gx) {
|
|
|
|
- that.filterForm.data.gx = that.$route.query.gx;
|
|
|
|
- let its = that.filterForm.data.gx.split(',');
|
|
|
|
- if (its && its.length > 10) {
|
|
|
|
- that.pageSize = 50;
|
|
|
|
- that.custom = 0;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- if (that.$route.query.gx !== 'LG') {
|
|
|
|
- that.getGrades();
|
|
|
|
- that.getSpecifications();
|
|
|
|
- that.getStandards();
|
|
|
|
- }
|
|
|
|
- if (that.$route.query.gx === 'LG') {
|
|
|
|
- that.getGradesASLg();
|
|
|
|
- that.getSpecificationsAsLg();
|
|
|
|
- that.getStandardsAsLg();
|
|
|
|
- }
|
|
|
|
- that.getNodeData();
|
|
|
|
- // that.getLocation();
|
|
|
|
|
|
+ that.getRoles();
|
|
that.getUnitIdData();
|
|
that.getUnitIdData();
|
|
that.getLocateIdData();
|
|
that.getLocateIdData();
|
|
- // that.getTableData();
|
|
|
|
that.getlengthTimesWidth();
|
|
that.getlengthTimesWidth();
|
|
- that.getRoles();
|
|
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
// 计算树区域高度
|
|
// 计算树区域高度
|
|
@@ -805,7 +786,7 @@ export default {
|
|
},
|
|
},
|
|
// 自定义的表格合计方法:只给指定列进行合计
|
|
// 自定义的表格合计方法:只给指定列进行合计
|
|
getSummaries (param) {
|
|
getSummaries (param) {
|
|
- const prop = ['planWeight', 'planWeightOld', 'tzl']; // 合计列绑定的prop
|
|
|
|
|
|
+ const prop = ['planweight', 'planWeightOld', 'tzl']; // 合计列绑定的prop
|
|
return commonSummaries(param, prop);
|
|
return commonSummaries(param, prop);
|
|
},
|
|
},
|
|
rowClick (row) {
|
|
rowClick (row) {
|
|
@@ -1010,30 +991,6 @@ export default {
|
|
}
|
|
}
|
|
});
|
|
});
|
|
},
|
|
},
|
|
- // 获取工序列表
|
|
|
|
- getNodeData () {
|
|
|
|
- let that = this
|
|
|
|
- let url = 'pass/ems/v1/trmworkprocs/getIdAndName?issettle=1';
|
|
|
|
- that.axios.get(url)
|
|
|
|
- .then(function (res) {
|
|
|
|
- if (res.code === '0') {
|
|
|
|
- let arr = [];
|
|
|
|
- let obj = {};
|
|
|
|
- for (let item of res.data) {
|
|
|
|
- arr.push({
|
|
|
|
- id: item.id,
|
|
|
|
- name: item.name
|
|
|
|
- })
|
|
|
|
- obj[item.id] = item.name;
|
|
|
|
- }
|
|
|
|
- that.nameObj.workprocid.arr = arr;
|
|
|
|
- that.nameObj.workprocid.obj = obj;
|
|
|
|
- that.connn();
|
|
|
|
- } else {
|
|
|
|
- that.$message.error(res.message);
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
- },
|
|
|
|
connn () {
|
|
connn () {
|
|
let that = this;
|
|
let that = this;
|
|
if (!that.filterForm.data.networkid || that.filterForm.data.networkid.length === 0) {
|
|
if (!that.filterForm.data.networkid || that.filterForm.data.networkid.length === 0) {
|
|
@@ -1131,9 +1088,11 @@ export default {
|
|
let that = this,
|
|
let that = this,
|
|
params = {},
|
|
params = {},
|
|
pData = {
|
|
pData = {
|
|
- workprocType: that.filterForm.data.id,
|
|
|
|
|
|
+ id: that.filterForm.data.id,
|
|
|
|
+ workprocType: that.filterForm.data.workprocType.toString(),
|
|
startTime: that.filterForm.data.may[0],
|
|
startTime: that.filterForm.data.may[0],
|
|
- endTime: that.filterForm.data.may[1]
|
|
|
|
|
|
+ endTime: that.filterForm.data.may[1],
|
|
|
|
+ auditStatus: that.filterForm.data.auditStatus.toString()
|
|
};
|
|
};
|
|
for (let key in pData) {
|
|
for (let key in pData) {
|
|
if (pData[key]) {
|
|
if (pData[key]) {
|
|
@@ -1166,7 +1125,9 @@ export default {
|
|
submitTime: item.SUBMIT_TIME,
|
|
submitTime: item.SUBMIT_TIME,
|
|
planweight: item.PLAN_WEIGHT,
|
|
planweight: item.PLAN_WEIGHT,
|
|
planWeightOld: item.PLAN_WEIGHT_OLD,
|
|
planWeightOld: item.PLAN_WEIGHT_OLD,
|
|
- deliveryDate: item.DELIVERYDATE,
|
|
|
|
|
|
+ deliveryDate: item.DELIVERY_DATE,
|
|
|
|
+ gmReviewer: item.GM_REVIEWER,
|
|
|
|
+ gmReviewerTime: item.GM_REVIEWER_TIME,
|
|
tzl: item.TZL
|
|
tzl: item.TZL
|
|
});
|
|
});
|
|
}
|
|
}
|
|
@@ -1251,20 +1212,6 @@ export default {
|
|
that.pageSize = val;
|
|
that.pageSize = val;
|
|
that.getTableData(1);
|
|
that.getTableData(1);
|
|
},
|
|
},
|
|
- // 重置搜索
|
|
|
|
- tableDataCancel () {
|
|
|
|
- let that = this;
|
|
|
|
- for (let key in that.filterForm.data) {
|
|
|
|
- if (!that.filterForm.disabled || !that.filterForm.disabled[key]) {
|
|
|
|
- if (that.filterForm.data[key] instanceof Array) {
|
|
|
|
- that.filterForm.data[key] = [];
|
|
|
|
- } else {
|
|
|
|
- that.filterForm.data[key] = '';
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- that.getTableData(1);
|
|
|
|
- },
|
|
|
|
keyDown (event1, disabledFlag) {
|
|
keyDown (event1, disabledFlag) {
|
|
let tdTarget = event1.target;
|
|
let tdTarget = event1.target;
|
|
let _this = this;
|
|
let _this = this;
|
|
@@ -1534,15 +1481,19 @@ export default {
|
|
let gmywid = this.nameObj.roleList.obj['国贸-业务人员'].id;
|
|
let gmywid = this.nameObj.roleList.obj['国贸-业务人员'].id;
|
|
let gmldid = this.nameObj.roleList.obj['国贸-部门领导'].id;
|
|
let gmldid = this.nameObj.roleList.obj['国贸-部门领导'].id;
|
|
if (this.qrRole.includes(roleId)) {
|
|
if (this.qrRole.includes(roleId)) {
|
|
|
|
+ this.filterForm.data.auditStatus.push('2', '3', '4');
|
|
this.spread = true;
|
|
this.spread = true;
|
|
this.czstate = true;
|
|
this.czstate = true;
|
|
}
|
|
}
|
|
if (this.qrRole.includes(gmywid)) {
|
|
if (this.qrRole.includes(gmywid)) {
|
|
|
|
+ this.filterForm.data.auditStatus.push('0', '1', '2', '3', '4');
|
|
this.checkstate = true;
|
|
this.checkstate = true;
|
|
}
|
|
}
|
|
if (this.qrRole.includes(gmldid)) {
|
|
if (this.qrRole.includes(gmldid)) {
|
|
|
|
+ this.filterForm.data.auditStatus.push('1', '2', '3', '4');
|
|
this.czstate = true;
|
|
this.czstate = true;
|
|
}
|
|
}
|
|
|
|
+ this.getTableData();
|
|
})
|
|
})
|
|
});
|
|
});
|
|
// 获取角色信息
|
|
// 获取角色信息
|
|
@@ -1648,11 +1599,7 @@ export default {
|
|
id: that.tableFormDataObj[key].id,
|
|
id: that.tableFormDataObj[key].id,
|
|
planWeight: that.tableFormDataObj[key].planweight,
|
|
planWeight: that.tableFormDataObj[key].planweight,
|
|
auditStatus: '1',
|
|
auditStatus: '1',
|
|
- planWeightOld: that.tableFormDataObj[key].planWeightOld,
|
|
|
|
- submitter: that.tableFormDataObj[key].submitter,
|
|
|
|
- submitTime: that.tableFormDataObj[key].submitTime,
|
|
|
|
- reviewer: that.tableFormDataObj[key].reviewer,
|
|
|
|
- reviewerTime: that.tableFormDataObj[key].reviewerTime
|
|
|
|
|
|
+ planWeightOld: that.tableFormDataObj[key].planWeightOld
|
|
});
|
|
});
|
|
that.loading = true;
|
|
that.loading = true;
|
|
that.axios.put('pass/ems/v1/emsprodplanweightadjustments/submitaudit', SubmitData)
|
|
that.axios.put('pass/ems/v1/emsprodplanweightadjustments/submitaudit', SubmitData)
|
|
@@ -1674,58 +1621,161 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
+ } else {
|
|
|
|
+ this.$message.error('至少要选择一条数据');
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- approval (row) {
|
|
|
|
|
|
+ // 批准
|
|
|
|
+ approval () {
|
|
let that = this;
|
|
let that = this;
|
|
- that.axios.put('pass/ems/v1/emsprodplanweightadjustments/approval/' + row.id)
|
|
|
|
- .then(function (res) {
|
|
|
|
- if (res.code === '0') {
|
|
|
|
- that.$message({
|
|
|
|
- message: '操作成功',
|
|
|
|
- type: 'success'
|
|
|
|
- });
|
|
|
|
- that.getTableData();
|
|
|
|
- } else {
|
|
|
|
- that.$message.error(res.message);
|
|
|
|
- }
|
|
|
|
- }).catch(function () {
|
|
|
|
- that.loading = false;
|
|
|
|
- });
|
|
|
|
|
|
+ if (that.multipleSelection.length > 0) {
|
|
|
|
+ that.$refs['dialog_form_arr'].validate((valid, obj) => {
|
|
|
|
+ if (valid) {
|
|
|
|
+ let SubmitData = [];
|
|
|
|
+ for (let key in that.tableFormDataObj) {
|
|
|
|
+ SubmitData.push({
|
|
|
|
+ id: that.tableFormDataObj[key].id
|
|
|
|
+ });
|
|
|
|
+ that.loading = true;
|
|
|
|
+ that.axios.put('pass/ems/v1/emsprodplanweightadjustments/approval/', SubmitData)
|
|
|
|
+ .then(function (res) {
|
|
|
|
+ if (res.code === '0') {
|
|
|
|
+ that.$message({
|
|
|
|
+ message: '提交成功',
|
|
|
|
+ type: 'success'
|
|
|
|
+ });
|
|
|
|
+ that.getTableData();
|
|
|
|
+ that.dialog.editorBox.show = false;
|
|
|
|
+ } else {
|
|
|
|
+ that.$message.error(res.message);
|
|
|
|
+ }
|
|
|
|
+ that.loading = false;
|
|
|
|
+ }).catch(function () {
|
|
|
|
+ that.loading = false;
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ } else {
|
|
|
|
+ this.$message.error('至少要选择一条数据');
|
|
|
|
+ }
|
|
|
|
+ // that.axios.put('pass/ems/v1/emsprodplanweightadjustments/approval/' + row.id)
|
|
|
|
+ // .then(function (res) {
|
|
|
|
+ // if (res.code === '0') {
|
|
|
|
+ // that.$message({
|
|
|
|
+ // message: '操作成功',
|
|
|
|
+ // type: 'success'
|
|
|
|
+ // });
|
|
|
|
+ // that.getTableData();
|
|
|
|
+ // } else {
|
|
|
|
+ // that.$message.error(res.message);
|
|
|
|
+ // }
|
|
|
|
+ // }).catch(function () {
|
|
|
|
+ // that.loading = false;
|
|
|
|
+ // });
|
|
},
|
|
},
|
|
- rejected (row) {
|
|
|
|
|
|
+ // 不通过
|
|
|
|
+ nopass () {
|
|
let that = this;
|
|
let that = this;
|
|
- that.axios.put('pass/ems/v1/emsprodplanweightadjustments/rejected/' + row.id)
|
|
|
|
- .then(function (res) {
|
|
|
|
- if (res.code === '0') {
|
|
|
|
- that.$message({
|
|
|
|
- message: '操作成功',
|
|
|
|
- type: 'success'
|
|
|
|
- });
|
|
|
|
- that.getTableData();
|
|
|
|
- } else {
|
|
|
|
- that.$message.error(res.message);
|
|
|
|
- }
|
|
|
|
- }).catch(function () {
|
|
|
|
- that.loading = false;
|
|
|
|
- });
|
|
|
|
|
|
+ if (that.multipleSelection.length > 0) {
|
|
|
|
+ that.$refs['dialog_form_arr'].validate((valid, obj) => {
|
|
|
|
+ if (valid) {
|
|
|
|
+ let SubmitData = [];
|
|
|
|
+ for (let key in that.tableFormDataObj) {
|
|
|
|
+ SubmitData.push({
|
|
|
|
+ id: that.tableFormDataObj[key].id
|
|
|
|
+ });
|
|
|
|
+ that.loading = true;
|
|
|
|
+ that.axios.put('pass/ems/v1/emsprodplanweightadjustments/nopass/', SubmitData)
|
|
|
|
+ .then(function (res) {
|
|
|
|
+ if (res.code === '0') {
|
|
|
|
+ that.$message({
|
|
|
|
+ message: '提交成功',
|
|
|
|
+ type: 'success'
|
|
|
|
+ });
|
|
|
|
+ that.getTableData();
|
|
|
|
+ that.dialog.editorBox.show = false;
|
|
|
|
+ } else {
|
|
|
|
+ that.$message.error(res.message);
|
|
|
|
+ }
|
|
|
|
+ that.loading = false;
|
|
|
|
+ }).catch(function () {
|
|
|
|
+ that.loading = false;
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ } else {
|
|
|
|
+ this.$message.error('至少要选择一条数据');
|
|
|
|
+ }
|
|
},
|
|
},
|
|
- agreement (row) {
|
|
|
|
|
|
+ rejected () {
|
|
let that = this;
|
|
let that = this;
|
|
- that.axios.put('pass/ems/v1/emsprodplanweightadjustments/agreement/' + row.id)
|
|
|
|
- .then(function (res) {
|
|
|
|
- if (res.code === '0') {
|
|
|
|
- that.$message({
|
|
|
|
- message: '操作成功',
|
|
|
|
- type: 'success'
|
|
|
|
- });
|
|
|
|
- that.getTableData();
|
|
|
|
- } else {
|
|
|
|
- that.$message.error(res.message);
|
|
|
|
- }
|
|
|
|
- }).catch(function () {
|
|
|
|
- that.loading = false;
|
|
|
|
- });
|
|
|
|
|
|
+ if (that.multipleSelection.length > 0) {
|
|
|
|
+ that.$refs['dialog_form_arr'].validate((valid, obj) => {
|
|
|
|
+ if (valid) {
|
|
|
|
+ let SubmitData = [];
|
|
|
|
+ for (let key in that.tableFormDataObj) {
|
|
|
|
+ SubmitData.push({
|
|
|
|
+ id: that.tableFormDataObj[key].id
|
|
|
|
+ });
|
|
|
|
+ that.loading = true;
|
|
|
|
+ that.axios.put('pass/ems/v1/emsprodplanweightadjustments/rejected/', SubmitData)
|
|
|
|
+ .then(function (res) {
|
|
|
|
+ if (res.code === '0') {
|
|
|
|
+ that.$message({
|
|
|
|
+ message: '提交成功',
|
|
|
|
+ type: 'success'
|
|
|
|
+ });
|
|
|
|
+ that.getTableData();
|
|
|
|
+ that.dialog.editorBox.show = false;
|
|
|
|
+ } else {
|
|
|
|
+ that.$message.error(res.message);
|
|
|
|
+ }
|
|
|
|
+ that.loading = false;
|
|
|
|
+ }).catch(function () {
|
|
|
|
+ that.loading = false;
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ } else {
|
|
|
|
+ this.$message.error('至少要选择一条数据');
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ agreement () {
|
|
|
|
+ let that = this;
|
|
|
|
+ if (that.multipleSelection.length > 0) {
|
|
|
|
+ that.$refs['dialog_form_arr'].validate((valid, obj) => {
|
|
|
|
+ if (valid) {
|
|
|
|
+ let SubmitData = [];
|
|
|
|
+ for (let key in that.tableFormDataObj) {
|
|
|
|
+ SubmitData.push({
|
|
|
|
+ id: that.tableFormDataObj[key].id
|
|
|
|
+ });
|
|
|
|
+ that.loading = true;
|
|
|
|
+ that.axios.put('pass/ems/v1/emsprodplanweightadjustments/agreement/', SubmitData)
|
|
|
|
+ .then(function (res) {
|
|
|
|
+ if (res.code === '0') {
|
|
|
|
+ that.$message({
|
|
|
|
+ message: '提交成功',
|
|
|
|
+ type: 'success'
|
|
|
|
+ });
|
|
|
|
+ that.getTableData();
|
|
|
|
+ that.dialog.editorBox.show = false;
|
|
|
|
+ } else {
|
|
|
|
+ that.$message.error(res.message);
|
|
|
|
+ }
|
|
|
|
+ that.loading = false;
|
|
|
|
+ }).catch(function () {
|
|
|
|
+ that.loading = false;
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ } else {
|
|
|
|
+ this.$message.error('至少要选择一条数据');
|
|
|
|
+ }
|
|
},
|
|
},
|
|
// 下发
|
|
// 下发
|
|
issue (state) {
|
|
issue (state) {
|