bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

前端流程问题修改

This commit is contained in:
zhouzy062 2024-01-14 14:51:21 +08:00
parent 579c0bf5b1
commit dbe3c870af
22 changed files with 121 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
View File

@ -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() {

2
sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
View File

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

10
sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
View File

@ -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=='') {

8
sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
View File

@ -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() {

6
sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
View File

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

14
sgzb-ui/src/views/repairTest/brokenExamine/index.vue
View File

@ -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="报废审核单号"
@ -231,7 +230,6 @@
type="primary"
icon="el-icon-zoom-in"
@click="handleSee(scope.row, 'see')"
v-hasPermi="['store:labelType:edit']"
>查看</el-button
>
<!-- -->
@ -241,7 +239,6 @@
icon="el-icon-circle-check"
:disabled="scope.row.taskStatus !== 58"
@click="handleUpdate(scope.row, 'update')"
v-hasPermi="['store:labelType:edit']"
>审核</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

4
sgzb-ui/src/views/repairTest/repair/index.vue
View File

@ -127,7 +127,7 @@
type="primary"
plain
size="mini"
v-hasPermi="['store:labelType:add']"
@click="complete(1)"
>提交审核</el-button
>
@ -223,7 +223,6 @@
type="primary"
icon="el-icon-zoom-in"
@click="handleSee(scope.row, 'see')"
v-hasPermi="['store:labelType:edit']"
>查看</el-button
>
<el-button
@ -232,7 +231,6 @@
icon="el-icon-edit"
:disabled="scope.row.repairStatusCode !== '43'"
@click="handleUpdate(scope.row, 'update')"
v-hasPermi="['store:labelType:edit']"
>维修</el-button
>
<!-- <el-button

17
sgzb-ui/src/views/repairTest/testExamine/index.vue
View File

@ -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="修试审核单号"
@ -230,7 +230,6 @@
type="primary"
icon="el-icon-zoom-in"
@click="handleSee(scope.row, 'see')"
v-hasPermi="['store:labelType:edit']"
>查看</el-button
>
<!-- -->
@ -240,7 +239,6 @@
icon="el-icon-circle-check"
:disabled="scope.row.taskStatus !== 46"
@click="handleUpdate(scope.row, 'update')"
v-hasPermi="['store:labelType:edit']"
>审核</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 = '查看'

6
sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
View File

@ -91,7 +91,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:role:add']"
>新建</el-button>
</el-col>
<el-col :span="1.5">
@ -102,7 +101,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:role:edit']"
>采购验收管理</el-button>
</el-col>
<el-col :span="1.5">
@ -113,7 +111,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:role:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
@ -123,7 +120,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:role:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -146,14 +142,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>验收</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>删除</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>-->

7
sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryList.vue
View File

@ -25,7 +25,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAccept"
v-hasPermi="['store:labelType:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
@ -35,7 +34,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['store:labelType:add']"
>发布入库</el-button>
</el-col>
<el-col :span="1.5">
@ -45,7 +43,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['store:labelType:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -75,7 +72,6 @@
type="text"
icon="el-icon-edit"
@click="handleView(scope.row)"
v-hasPermi="['store:labelType:edit']"
>查看</el-button>
<template slot-scope="scope">
<el-button
@ -83,21 +79,18 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['store:labelType:edit']"
>编辑</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleBuy(scope.row)"
v-hasPermi="['store:labelType:edit']"
>采购单</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['store:labelType:remove']"
>删除</el-button>
</template>
</el-table-column>

1
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
View File

@ -185,7 +185,6 @@
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>删除</el-button>
</template>
</el-table-column>

1
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
View File

@ -25,7 +25,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['store:labelType:add']"
>新增</el-button>
</el-col> -->
<el-col :span="1.5">

16
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
View File

@ -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("审批失败");
}

3
sgzb-ui/src/views/store/shelves/shelvesList.vue
View File

@ -23,7 +23,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:dept:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
@ -63,7 +62,6 @@
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dept:edit']"
>编辑</el-button>
<el-button
v-if="scope.row.parentId != 0"
@ -71,7 +69,6 @@
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dept:remove']"
>删除</el-button>
</template>
</el-table-column>

6
sgzb-ui/src/views/store/tools/accessory.vue
View File

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

1
sgzb-ui/src/views/store/tools/keeper.vue
View File

@ -60,7 +60,6 @@
icon="el-icon-plus"
size="mini"
@click="handleSave"
v-hasPermi="['system:user:add']"
>保存</el-button>
</el-col>
<!-- <el-col :span="1.5">-->

1
sgzb-ui/src/views/store/tools/repair.vue
View File

@ -60,7 +60,6 @@
icon="el-icon-plus"
size="mini"
@click="handleSave"
v-hasPermi="['system:user:add']"
>保存</el-button>
</el-col>
<!-- <el-col :span="1.5">-->

5
sgzb-ui/src/views/store/tools/safeTools.vue
View File

@ -25,7 +25,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['store:labelType:add']"
>新增</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
@ -57,7 +56,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['store:labelType:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
@ -67,7 +65,6 @@
icon="el-icon-refresh"
size="mini"
@click="handleRefreshCache"
v-hasPermi="['store:labelType:remove']"
>刷新缓存</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -95,14 +92,12 @@
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['store:labelType:edit']"
>编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['store:labelType:remove']"
>删除</el-button>
</template>
</el-table-column>

3
sgzb-ui/src/views/store/tools/toolsSupplier.vue
View File

@ -25,7 +25,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['store:labelType:add']"
>新增</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
@ -102,14 +101,12 @@
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['store:labelType:edit']"
>编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['store:labelType:remove']"
>删除</el-button>
</template>
</el-table-column>

6
sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
View File

@ -67,7 +67,6 @@
size="mini"
:disabled="single"
@click="handleAdd"
v-hasPermi="['system:dict:add']"
>入库审核</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
@ -140,7 +139,6 @@
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']"
>审核</el-button>
<!-- <el-button-->
<!-- size="mini"-->
@ -234,7 +232,6 @@
icon="el-icon-plus"
size="mini"
:disabled="multiple"
v-hasPermi="['system:dict:add']"
>批量通过</el-button>
</el-col>
<el-col :span="1.5">
@ -244,7 +241,6 @@
icon="el-icon-plus"
size="mini"
:disabled="multiple"
v-hasPermi="['system:dict:add']"
>批量不通过</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
@ -279,14 +275,12 @@
size="mini"
type="text"
icon="el-icon-edit"
v-hasPermi="['system:dict:edit']"
>通过</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dict:remove']"
>不通过</el-button>
<!-- <el-button-->
<!-- size="mini"-->

9
sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue
View File

@ -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">
@ -222,7 +221,6 @@
icon="el-icon-plus"
size="mini"
:disabled="multiple"
v-hasPermi="['system:dict:add']"
>批量通过</el-button>
</el-col>
<el-col :span="1.5">
@ -232,7 +230,6 @@
icon="el-icon-plus"
size="mini"
:disabled="multiple"
v-hasPermi="['system:dict:add']"
>批量不通过</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
@ -267,14 +264,12 @@
size="mini"
type="text"
icon="el-icon-edit"
v-hasPermi="['system:dict:edit']"
>通过</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dict:remove']"
>不通过</el-button>
<!-- <el-button-->
<!-- size="mini"-->

4
sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
View File

@ -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("审批失败");
}