前端流程问题修改
This commit is contained in:
parent
579c0bf5b1
commit
dbe3c870af
|
|
@ -94,8 +94,21 @@
|
|||
<el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="审批结果 " align="center" prop="examineStatus" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="审批意见 " align="center" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.taskStatus==30"></span>
|
||||
<span v-if="scope.row.taskStatus==31||scope.row.taskStatus==98">{{ scope.row.leaseApplyInfoList[0].companyAuditRemark }} </span>
|
||||
<span v-if="scope.row.taskStatus==32||scope.row.taskStatus==99">{{ scope.row.leaseApplyInfoList[0].deptAuditRemark }} </span>
|
||||
<span v-if="scope.row.taskStatus==33||scope.row.taskStatus==100">{{ scope.row.leaseApplyInfoList[0].directAuditRemark }} </span>
|
||||
<span v-else>{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.leaseApplyInfoList[0].remark }}</span>
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
|
|
@ -409,9 +422,9 @@ export default {
|
|||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
// this.download('system/dict/type/export', {
|
||||
// ...this.queryParams
|
||||
// }, `type_${new Date().getTime()}.xlsx`)
|
||||
this.download('base/tm_task/applyExport', {
|
||||
...this.queryParams
|
||||
}, `领料申请单_${new Date().getTime()}.xlsx`)
|
||||
},
|
||||
/** 刷新缓存按钮操作 */
|
||||
handleRefreshCache() {
|
||||
|
|
|
|||
|
|
@ -407,7 +407,7 @@ export default {
|
|||
this.queryParams.examineStatusId = '32'
|
||||
}
|
||||
this.queryParams.unitId = data.unitId
|
||||
this.queryParams.proId = data.projectId
|
||||
this.queryParams.proId = data.proId
|
||||
this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfoList[0].phone
|
||||
this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
|
||||
this.queryParams.agreementCode = data.agreementCode
|
||||
|
|
|
|||
|
|
@ -111,16 +111,16 @@
|
|||
</div>
|
||||
|
||||
<!-- 同意 -->
|
||||
<el-dialog title="审核意见" :visible.sync="examineVisible">
|
||||
<el-input placeholder="请输入审核意见" v-model="queryParams.companyAuditRemarks "></el-input>
|
||||
<el-dialog title="审核意见" :visible.sync="examineVisible" width="600px">
|
||||
<el-input placeholder="请输入审核意见" type="textarea" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="handelExamine(false)">取 消</el-button>
|
||||
<el-button type="primary" @click="handelExamine(true)">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!-- 驳回 -->
|
||||
<el-dialog title="审核意见" :visible.sync="refuseVisible">
|
||||
<el-input placeholder="请输入审核意见" v-model="queryParams.companyAuditRemarks "></el-input>
|
||||
<el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px">
|
||||
<el-input placeholder="请输入审核意见" type="textarea" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="handelRefuse(false)">取 消</el-button>
|
||||
<el-button type="primary" @click="handelRefuse(true)">确 定</el-button>
|
||||
|
|
@ -236,6 +236,7 @@ export default {
|
|||
methods: {
|
||||
agree(){
|
||||
this.examineVisible = true
|
||||
this.queryParams.companyAuditRemarks = '同意'
|
||||
},
|
||||
handelExamine(type){
|
||||
if(type){
|
||||
|
|
@ -268,6 +269,7 @@ export default {
|
|||
//审核 驳回
|
||||
refuse(){
|
||||
this.refuseVisible = true
|
||||
this.queryParams.companyAuditRemarks = '驳回'
|
||||
},
|
||||
handelRefuse(type){
|
||||
if (this.queryParams.companyAuditRemarks=='') {
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@
|
|||
<span>时间:</span>{{ leaseApplyData.updateTimes }}
|
||||
</div>
|
||||
<div class="item" style="width: 50%;flex-shrink: 0;margin-bottom: 5px;font-size: 14px;">
|
||||
<span>编号:</span>{{ leaseApplyData.agreementCode }}
|
||||
<span>编号:</span>{{ leaseApplyData.code }}
|
||||
</div>
|
||||
</div>
|
||||
<el-table :data="leaseApplyDetails" class="table" style="margin-top: 20px">
|
||||
|
|
@ -451,9 +451,9 @@ export default {
|
|||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
// this.download('system/dict/type/export', {
|
||||
// ...this.queryParams
|
||||
// }, `type_${new Date().getTime()}.xlsx`)
|
||||
this.download('base/tm_task/applyExport', {
|
||||
...this.queryParams
|
||||
}, `领料审批单_${new Date().getTime()}.xlsx`)
|
||||
},
|
||||
/** 刷新缓存按钮操作 */
|
||||
handleRefreshCache() {
|
||||
|
|
|
|||
|
|
@ -429,16 +429,18 @@
|
|||
<el-table-column
|
||||
label="退料数量"
|
||||
align="center"
|
||||
prop="num"
|
||||
class-name="small-padding fixed-width"
|
||||
width="200"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<!-- <template slot-scope="scope">
|
||||
<el-input
|
||||
v-model="scope.row.num"
|
||||
:disabled="true"
|
||||
placeholder="请输入退料数量"
|
||||
clearable
|
||||
/>
|
||||
</template>
|
||||
</template> -->
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
|
|
|
|||
|
|
@ -126,8 +126,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
:disabled="!checkResultOne"
|
||||
v-hasPermi="['store:labelType:add']"
|
||||
:disabled="multiple"
|
||||
@click="checkClick"
|
||||
>批量审核</el-button
|
||||
>
|
||||
|
|
@ -153,7 +152,7 @@
|
|||
:data="typeList"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
|
||||
<el-table-column label="序号" sortable align="center" type="index" />
|
||||
<el-table-column
|
||||
label="报废审核单号"
|
||||
|
|
@ -230,8 +229,7 @@
|
|||
size="mini"
|
||||
type="primary"
|
||||
icon="el-icon-zoom-in"
|
||||
@click="handleSee(scope.row, 'see')"
|
||||
v-hasPermi="['store:labelType:edit']"
|
||||
@click="handleSee(scope.row, 'see')"
|
||||
>查看</el-button
|
||||
>
|
||||
<!-- -->
|
||||
|
|
@ -240,8 +238,7 @@
|
|||
type="warning"
|
||||
icon="el-icon-circle-check"
|
||||
:disabled="scope.row.taskStatus !== 58"
|
||||
@click="handleUpdate(scope.row, 'update')"
|
||||
v-hasPermi="['store:labelType:edit']"
|
||||
@click="handleUpdate(scope.row, 'update')"
|
||||
>审核</el-button
|
||||
>
|
||||
</template>
|
||||
|
|
@ -674,6 +671,13 @@ export default {
|
|||
this.open = true;
|
||||
this.title = "新建";
|
||||
},
|
||||
selectable(row){
|
||||
if(row.taskStatus==58){
|
||||
return true
|
||||
}else{
|
||||
return false
|
||||
}
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.selectionList = selection
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@
|
|||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
v-hasPermi="['store:labelType:add']"
|
||||
|
||||
@click="complete(1)"
|
||||
>提交审核</el-button
|
||||
>
|
||||
|
|
@ -222,8 +222,7 @@
|
|||
size="mini"
|
||||
type="primary"
|
||||
icon="el-icon-zoom-in"
|
||||
@click="handleSee(scope.row, 'see')"
|
||||
v-hasPermi="['store:labelType:edit']"
|
||||
@click="handleSee(scope.row, 'see')"
|
||||
>查看</el-button
|
||||
>
|
||||
<el-button
|
||||
|
|
@ -231,8 +230,7 @@
|
|||
type="warning"
|
||||
icon="el-icon-edit"
|
||||
:disabled="scope.row.repairStatusCode !== '43'"
|
||||
@click="handleUpdate(scope.row, 'update')"
|
||||
v-hasPermi="['store:labelType:edit']"
|
||||
@click="handleUpdate(scope.row, 'update')"
|
||||
>维修</el-button
|
||||
>
|
||||
<!-- <el-button
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
:disabled="!checkResultOne && multiple"
|
||||
:disabled="multiple"
|
||||
@click="checkClick"
|
||||
>批量审核</el-button
|
||||
>
|
||||
|
|
@ -152,7 +152,7 @@
|
|||
:data="typeList"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
|
||||
<el-table-column label="序号" sortable align="center" type="index" />
|
||||
<el-table-column
|
||||
label="修试审核单号"
|
||||
|
|
@ -229,8 +229,7 @@
|
|||
size="mini"
|
||||
type="primary"
|
||||
icon="el-icon-zoom-in"
|
||||
@click="handleSee(scope.row, 'see')"
|
||||
v-hasPermi="['store:labelType:edit']"
|
||||
@click="handleSee(scope.row, 'see')"
|
||||
>查看</el-button
|
||||
>
|
||||
<!-- -->
|
||||
|
|
@ -239,8 +238,7 @@
|
|||
type="warning"
|
||||
icon="el-icon-circle-check"
|
||||
:disabled="scope.row.taskStatus !== 46"
|
||||
@click="handleUpdate(scope.row, 'update')"
|
||||
v-hasPermi="['store:labelType:edit']"
|
||||
@click="handleUpdate(scope.row, 'update')"
|
||||
>审核</el-button
|
||||
>
|
||||
</template>
|
||||
|
|
@ -672,6 +670,13 @@ export default {
|
|||
this.open = true;
|
||||
this.title = "新建";
|
||||
},
|
||||
selectable(row){
|
||||
if(row.taskStatus==46){
|
||||
return true
|
||||
}else{
|
||||
return false
|
||||
}
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.selectionList = selection
|
||||
|
|
@ -679,8 +684,8 @@ export default {
|
|||
this.ids = selection.map(item => item.dictId)
|
||||
this.single = selection.length != 1
|
||||
this.multiple = !selection.length
|
||||
console.log(this.single)
|
||||
console.log(this.multiple)
|
||||
// console.log(this.checkResultOne)
|
||||
console.log(this.checkResultOne)
|
||||
},
|
||||
handleSee(row, type) {
|
||||
this.dialogTitle = '查看'
|
||||
|
|
|
|||
|
|
@ -90,8 +90,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['system:role:add']"
|
||||
@click="handleAdd"
|
||||
>新建</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
|
|
@ -101,8 +100,7 @@
|
|||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['system:role:edit']"
|
||||
@click="handleUpdate"
|
||||
>采购验收管理</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
|
|
@ -112,8 +110,7 @@
|
|||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['system:role:remove']"
|
||||
@click="handleDelete"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
|
|
@ -122,8 +119,7 @@
|
|||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['system:role:export']"
|
||||
@click="handleExport"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
|
|
@ -145,15 +141,13 @@
|
|||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['system:role:edit']"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>验收</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['system:role:remove']"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button>
|
||||
<!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">-->
|
||||
<!-- <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>-->
|
||||
|
|
|
|||
|
|
@ -24,8 +24,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAccept"
|
||||
v-hasPermi="['store:labelType:add']"
|
||||
@click="handleAccept"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
|
|
@ -34,8 +33,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['store:labelType:add']"
|
||||
@click="handleAdd"
|
||||
>发布入库</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
|
|
@ -44,8 +42,7 @@
|
|||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['store:labelType:export']"
|
||||
@click="handleExport"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
|
|
@ -74,30 +71,26 @@
|
|||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleView(scope.row)"
|
||||
v-hasPermi="['store:labelType:edit']"
|
||||
@click="handleView(scope.row)"
|
||||
>查看</el-button>
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['store:labelType:edit']"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>编辑</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleBuy(scope.row)"
|
||||
v-hasPermi="['store:labelType:edit']"
|
||||
@click="handleBuy(scope.row)"
|
||||
>采购单</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['store:labelType:remove']"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
|||
|
|
@ -184,8 +184,7 @@
|
|||
size="mini"
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['system:role:remove']"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
|||
|
|
@ -24,8 +24,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['store:labelType:add']"
|
||||
@click="handleAdd"
|
||||
>新增</el-button>
|
||||
</el-col> -->
|
||||
<el-col :span="1.5">
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@
|
|||
<!-- </el-col>-->
|
||||
</el-row>
|
||||
<el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column type="selection" width="55" align="center" :selectable="selectable"/>
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column label="机具类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
|
||||
|
|
@ -490,7 +490,15 @@ export default {
|
|||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
|
||||
//是否可用勾选框
|
||||
selectable(row){
|
||||
console.log(row)
|
||||
if(row.status=='0'){
|
||||
return true
|
||||
}else{
|
||||
return false
|
||||
}
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item)
|
||||
|
|
@ -529,6 +537,7 @@ export default {
|
|||
if(response.code==200){
|
||||
this.$modal.msgSuccess("审批成功");
|
||||
this.getDialogTable();
|
||||
this.getList()
|
||||
}else{
|
||||
this.$modal.msgSuccess("审批失败");
|
||||
}
|
||||
|
|
@ -553,6 +562,7 @@ export default {
|
|||
if(response.code==200){
|
||||
this.$modal.msgSuccess("审批成功");
|
||||
this.getDialogTable();
|
||||
this.getList()
|
||||
}else{
|
||||
this.$modal.msgSuccess("审批失败");
|
||||
}
|
||||
|
|
@ -580,6 +590,7 @@ export default {
|
|||
if(response.code==200){
|
||||
this.$modal.msgSuccess("审批成功");
|
||||
this.getDialogTable();
|
||||
this.getList()
|
||||
}else{
|
||||
this.$modal.msgSuccess("审批失败");
|
||||
}
|
||||
|
|
@ -605,6 +616,7 @@ export default {
|
|||
if(response.code==200){
|
||||
this.$modal.msgSuccess("审批成功");
|
||||
this.getDialogTable();
|
||||
this.getList()
|
||||
}else{
|
||||
this.$modal.msgSuccess("审批失败");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,8 +22,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['system:dept:add']"
|
||||
@click="handleAdd"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
|
|
@ -62,16 +61,14 @@
|
|||
size="mini"
|
||||
type="primary"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['system:dept:edit']"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>编辑</el-button>
|
||||
<el-button
|
||||
v-if="scope.row.parentId != 0"
|
||||
size="mini"
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['system:dept:remove']"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
|
||||
v-hasPermi="['system:dept:add']">新增</el-button>
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px">
|
||||
<template slot-scope="scope">
|
||||
<el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['system:dept:edit']">修改</el-button>
|
||||
>修改</el-button>
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
<!-- v-hasPermi="['system:dept:add']"-->
|
||||
<!-- >新增</el-button>-->
|
||||
<el-button v-if="scope.row.parentId != 0" size="mini" type="danger" icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
|
||||
@click="handleDelete(scope.row)" >删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
|
|||
|
|
@ -59,8 +59,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleSave"
|
||||
v-hasPermi="['system:user:add']"
|
||||
@click="handleSave"
|
||||
>保存</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">-->
|
||||
|
|
|
|||
|
|
@ -59,8 +59,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleSave"
|
||||
v-hasPermi="['system:user:add']"
|
||||
@click="handleSave"
|
||||
>保存</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">-->
|
||||
|
|
|
|||
|
|
@ -24,8 +24,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['store:labelType:add']"
|
||||
@click="handleAdd"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">-->
|
||||
|
|
@ -56,8 +55,7 @@
|
|||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['store:labelType:export']"
|
||||
@click="handleExport"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
|
|
@ -66,8 +64,7 @@
|
|||
plain
|
||||
icon="el-icon-refresh"
|
||||
size="mini"
|
||||
@click="handleRefreshCache"
|
||||
v-hasPermi="['store:labelType:remove']"
|
||||
@click="handleRefreshCache"
|
||||
>刷新缓存</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
|
|
@ -94,15 +91,13 @@
|
|||
size="mini"
|
||||
type="primary"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['store:labelType:edit']"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>编辑</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['store:labelType:remove']"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
|||
|
|
@ -24,8 +24,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['store:labelType:add']"
|
||||
@click="handleAdd"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">-->
|
||||
|
|
@ -101,15 +100,13 @@
|
|||
size="mini"
|
||||
type="primary"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['store:labelType:edit']"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>编辑</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['store:labelType:remove']"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
|
|||
|
|
@ -66,8 +66,7 @@
|
|||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['system:dict:add']"
|
||||
@click="handleAdd"
|
||||
>入库审核</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">-->
|
||||
|
|
@ -139,8 +138,7 @@
|
|||
size="mini"
|
||||
type="primary"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['system:dict:edit']"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>审核</el-button>
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
|
|
@ -233,8 +231,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
v-hasPermi="['system:dict:add']"
|
||||
:disabled="multiple"
|
||||
>批量通过</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
|
|
@ -243,8 +240,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
v-hasPermi="['system:dict:add']"
|
||||
:disabled="multiple"
|
||||
>批量不通过</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">-->
|
||||
|
|
@ -278,15 +274,13 @@
|
|||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
v-hasPermi="['system:dict:edit']"
|
||||
icon="el-icon-edit"
|
||||
>通过</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['system:dict:remove']"
|
||||
@click="handleDelete(scope.row)"
|
||||
>不通过</el-button>
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
|
|
|
|||
|
|
@ -112,9 +112,8 @@
|
|||
<el-table-column label="退料机具类型" align="center" prop="kindName" :show-overflow-tooltip="true"></el-table-column>
|
||||
<el-table-column label="退料设备类型" align="center" prop="typeName" :show-overflow-tooltip="true"></el-table-column>
|
||||
<el-table-column label="退料规格型号" align="center" prop="modelName" :show-overflow-tooltip="true"></el-table-column>
|
||||
<el-table-column label="退料时间" align="center" prop="returnTime" width="180">
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column label="退料数量" align="center" prop="inputNum" :show-overflow-tooltip="true"></el-table-column>
|
||||
<el-table-column label="退料时间" align="center" prop="returnTime" width="180"></el-table-column>
|
||||
<el-table-column label="提交入库人员" align="center" prop="submitToStoragePersonnel" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="提交入库时间" align="center" prop="submitStorageTime" width="180">
|
||||
<!-- <template slot-scope="scope">
|
||||
|
|
@ -221,8 +220,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
v-hasPermi="['system:dict:add']"
|
||||
:disabled="multiple"
|
||||
>批量通过</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
|
|
@ -231,8 +229,7 @@
|
|||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
v-hasPermi="['system:dict:add']"
|
||||
:disabled="multiple"
|
||||
>批量不通过</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">-->
|
||||
|
|
@ -266,15 +263,13 @@
|
|||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
v-hasPermi="['system:dict:edit']"
|
||||
icon="el-icon-edit"
|
||||
>通过</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['system:dict:remove']"
|
||||
@click="handleDelete(scope.row)"
|
||||
>不通过</el-button>
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
|
|
|
|||
|
|
@ -487,6 +487,7 @@ export default {
|
|||
if(response.code==200){
|
||||
this.$modal.msgSuccess("审批成功");
|
||||
this.getDialogTable();
|
||||
this.getList();
|
||||
}else{
|
||||
this.$modal.msgSuccess("审批失败");
|
||||
}
|
||||
|
|
@ -507,6 +508,7 @@ export default {
|
|||
if(response.code==200){
|
||||
this.$modal.msgSuccess("审批成功");
|
||||
this.getDialogTable();
|
||||
this.getList();
|
||||
}else{
|
||||
this.$modal.msgSuccess("审批失败");
|
||||
}
|
||||
|
|
@ -534,6 +536,7 @@ export default {
|
|||
if(response.code==200){
|
||||
this.$modal.msgSuccess("审批成功");
|
||||
this.getDialogTable();
|
||||
this.getList();
|
||||
}else{
|
||||
this.$modal.msgSuccess("审批失败");
|
||||
}
|
||||
|
|
@ -554,6 +557,7 @@ export default {
|
|||
if(response.code==200){
|
||||
this.$modal.msgSuccess("审批成功");
|
||||
this.getDialogTable();
|
||||
this.getList();
|
||||
}else{
|
||||
this.$modal.msgSuccess("审批失败");
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue