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

Merge remote-tracking branch 'origin/dev-nx' into dev-nx

This commit is contained in:
mashuai 2025-03-27 14:04:58 +08:00
parent 74797e8d62 633dd9a01d
commit 60cee4697a
35 changed files with 78 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,35 +214,35 @@
<el-button <el-button
type="primary" type="primary"
@click="subAuditLeaseByCompany(9)" @click="subAuditLeaseByCompany(9)"
v-if="queryParams.taskStatus == 30" v-show="queryParams.taskStatus == 30"
v-hasPermi="['receive:examine:fgs']" v-hasPermi="['receive:examine:fgs']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="subAuditLeaseByCompany(5)" @click="subAuditLeaseByCompany(5)"
v-if="queryParams.taskStatus == 31" v-show="queryParams.taskStatus == 31"
v-hasPermi="['receive:examine:sgb']" v-hasPermi="['receive:examine:sgb']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="subAuditLeaseByCompany(7)" @click="subAuditLeaseByCompany(7)"
v-if="queryParams.taskStatus == 31" v-show="queryParams.taskStatus == 31"
v-hasPermi="['receive:examine:ajb']" v-hasPermi="['receive:examine:ajb']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="subAuditLeaseByCompany(1)" @click="subAuditLeaseByCompany(1)"
v-if="queryParams.taskStatus == 32" v-show="queryParams.taskStatus == 32"
v-hasPermi="['receive:examine:nbry-jjfgs']" v-hasPermi="['receive:examine:nbry-jjfgs']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="subAuditLeaseByCompany(3)" @click="subAuditLeaseByCompany(3)"
v-if="queryParams.taskStatus == 32" v-show="queryParams.taskStatus == 32"
v-hasPermi="['receive:examine:nbry-sbfgs']" v-hasPermi="['receive:examine:nbry-sbfgs']"
>确 定</el-button >确 定</el-button
> >
@ -267,35 +267,35 @@
<el-button <el-button
type="primary" type="primary"
@click="refuseAuditLeaseByCompany(10)" @click="refuseAuditLeaseByCompany(10)"
v-if="queryParams.taskStatus == 30" v-show="queryParams.taskStatus == 30"
v-hasPermi="['receive:examine:fgs']" v-hasPermi="['receive:examine:fgs']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="refuseAuditLeaseByCompany(6)" @click="refuseAuditLeaseByCompany(6)"
v-if="queryParams.taskStatus == 31" v-show="queryParams.taskStatus == 31"
v-hasPermi="['receive:examine:sgb']" v-hasPermi="['receive:examine:sgb']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="refuseAuditLeaseByCompany(8)" @click="refuseAuditLeaseByCompany(8)"
v-if="queryParams.taskStatus == 31" v-show="queryParams.taskStatus == 31"
v-hasPermi="['receive:examine:ajb']" v-hasPermi="['receive:examine:ajb']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="refuseAuditLeaseByCompany(2)" @click="refuseAuditLeaseByCompany(2)"
v-if="queryParams.taskStatus == 32" v-show="queryParams.taskStatus == 32"
v-hasPermi="['receive:examine:nbry-jjfgs']" v-hasPermi="['receive:examine:nbry-jjfgs']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="refuseAuditLeaseByCompany(4)" @click="refuseAuditLeaseByCompany(4)"
v-if="queryParams.taskStatus == 32" v-show="queryParams.taskStatus == 32"
v-hasPermi="['receive:examine:nbry-sbfgs']" v-hasPermi="['receive:examine:nbry-sbfgs']"
>确 定</el-button >确 定</el-button
> >

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

@ -210,7 +210,7 @@
type="primary" type="primary"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:fgs']" v-hasPermi="['receive:examine:fgs']"
v-if=" v-show="
Number(scope.row.examineStatusId) == 30 && Number(scope.row.examineStatusId) == 30 &&
scope.row.deptId == currentDeptId scope.row.deptId == currentDeptId
" "
@ -221,7 +221,7 @@
type="primary" type="primary"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:sgb']" v-hasPermi="['receive:examine:sgb']"
v-if=" v-show="
Number(scope.row.examineStatusId) == 31 && Number(scope.row.examineStatusId) == 31 &&
(scope.row.leaseApplyInfoList[0].status == '0' || (scope.row.leaseApplyInfoList[0].status == '0' ||
scope.row.leaseApplyInfoList[0].status == '7' || scope.row.leaseApplyInfoList[0].status == '7' ||
@ -235,7 +235,7 @@
type="primary" type="primary"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:ajb']" v-hasPermi="['receive:examine:ajb']"
v-if=" v-show="
Number(scope.row.examineStatusId) == 31 && Number(scope.row.examineStatusId) == 31 &&
(scope.row.leaseApplyInfoList[0].status == '0' || (scope.row.leaseApplyInfoList[0].status == '0' ||
scope.row.leaseApplyInfoList[0].status == '5' || scope.row.leaseApplyInfoList[0].status == '5' ||
@ -249,7 +249,7 @@
type="primary" type="primary"
@click="handleExamine(scope.row, 'jjfgs')" @click="handleExamine(scope.row, 'jjfgs')"
v-hasPermi="['receive:examine:nbry-jjfgs']" v-hasPermi="['receive:examine:nbry-jjfgs']"
v-if=" v-show="
Number(scope.row.examineStatusId) == 32 && Number(scope.row.examineStatusId) == 32 &&
(scope.row.leaseApplyInfoList[0].status == '5' || (scope.row.leaseApplyInfoList[0].status == '5' ||
scope.row.leaseApplyInfoList[0].status == '7' || scope.row.leaseApplyInfoList[0].status == '7' ||
@ -263,7 +263,7 @@
type="primary" type="primary"
@click="handleExamine(scope.row, 'sbfgs')" @click="handleExamine(scope.row, 'sbfgs')"
v-hasPermi="['receive:examine:nbry-sbfgs']" v-hasPermi="['receive:examine:nbry-sbfgs']"
v-if=" v-show="
Number(scope.row.examineStatusId) == 32 && Number(scope.row.examineStatusId) == 32 &&
(scope.row.leaseApplyInfoList[0].status == '5' || (scope.row.leaseApplyInfoList[0].status == '5' ||
scope.row.leaseApplyInfoList[0].status == '7' || scope.row.leaseApplyInfoList[0].status == '7' ||

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

@ -164,7 +164,7 @@
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
v-if="scope.row.taskStatus != 35" v-show="scope.row.taskStatus != 35"
@click="handleOut(scope.row)" @click="handleOut(scope.row)"
v-hasPermi="['picking:outbound']" v-hasPermi="['picking:outbound']"
> >

8
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue
View File

@ -123,9 +123,9 @@
v-model="queryParams.companyAuditRemarks"></el-input> v-model="queryParams.companyAuditRemarks"></el-input>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="examineVisible = false">取 消</el-button> <el-button @click="examineVisible = false">取 消</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(9)" v-if="queryParams.taskStatus == 31" <el-button type="primary" @click="subAuditLeaseByCompany(9)" v-show="queryParams.taskStatus == 31"
v-hasPermi="['receive:examine:fgs']">确 定</el-button> v-hasPermi="['receive:examine:fgs']">确 定</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(1)" v-if="queryParams.taskStatus == 32" <el-button type="primary" @click="subAuditLeaseByCompany(1)" v-show="queryParams.taskStatus == 32"
v-hasPermi="['receive:examine:nbs']">确 定</el-button> v-hasPermi="['receive:examine:nbs']">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -135,9 +135,9 @@
v-model="queryParams.companyAuditRemarks"></el-input> v-model="queryParams.companyAuditRemarks"></el-input>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="refuseVisible = false">取 消</el-button> <el-button @click="refuseVisible = false">取 消</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(10)" v-if="queryParams.taskStatus == 31" <el-button type="primary" @click="refuseAuditLeaseByCompany(10)" v-show="queryParams.taskStatus == 31"
v-hasPermi="['receive:examine:fgs']">确 定</el-button> v-hasPermi="['receive:examine:fgs']">确 定</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus == 32" <el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-show="queryParams.taskStatus == 32"
v-hasPermi="['receive:examine:nbs']">确 定</el-button> v-hasPermi="['receive:examine:nbs']">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>

4
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
View File

@ -232,7 +232,7 @@
type="primary" type="primary"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:fgs']" v-hasPermi="['receive:examine:fgs']"
v-if=" v-show="
Number(scope.row.examineStatusId) == 31 || Number(scope.row.examineStatusId) == 31 ||
Number(scope.row.examineStatusId) == 117 Number(scope.row.examineStatusId) == 117
" "
@ -243,7 +243,7 @@
type="primary" type="primary"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:nbs']" v-hasPermi="['receive:examine:nbs']"
v-if="Number(scope.row.examineStatusId) == 32" v-show="Number(scope.row.examineStatusId) == 32"
>审批</el-button >审批</el-button
> >

2
sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
View File

@ -282,7 +282,7 @@
size="medium" size="medium"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
v-if="scope.row.applyStatus == '0'" v-show="scope.row.applyStatus == '0'"
v-hasPermi="['return:auditing']" v-hasPermi="['return:auditing']"
@click="handleUpdate(scope.row, 'update')" @click="handleUpdate(scope.row, 'update')"
> >

2
sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
View File

@ -221,7 +221,7 @@
@click="handleReturn(scope.row, 'see')" @click="handleReturn(scope.row, 'see')"
icon="el-icon-d-arrow-right" icon="el-icon-d-arrow-right"
v-hasPermi="['return:btn']" v-hasPermi="['return:btn']"
v-if="scope.row.taskStatus != '40'" v-show="scope.row.taskStatus != '40'"
> >
退料 退料
</el-button> </el-button>

8
sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
View File

@ -308,14 +308,14 @@
<el-button <el-button
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
v-if="scope.row.taskStatus == 30" v-show="scope.row.taskStatus == 30"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['picking:apply:edit']" v-hasPermi="['picking:apply:edit']"
>编辑</el-button >编辑</el-button
> >
<el-button <el-button
type="text" type="text"
v-if=" v-show="
(scope.row.taskStatus == 98 || (scope.row.taskStatus == 98 ||
scope.row.taskStatus == 99 || scope.row.taskStatus == 99 ||
scope.row.taskStatus == 100) && scope.row.taskStatus == 100) &&
@ -331,7 +331,7 @@
<el-button <el-button
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
v-if="scope.row.taskStatus == 30" v-show="scope.row.taskStatus == 30"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['picking:apply:del']" v-hasPermi="['picking:apply:del']"
style="color: #f56c6c" style="color: #f56c6c"
@ -382,7 +382,7 @@ export default {
data() { data() {
return { return {
// 遮罩层 // 遮罩层
loading: true, loading: false,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用

3
sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
View File

@ -603,6 +603,9 @@ export default {
{ name: '待出库', id: 33 }, { name: '待出库', id: 33 },
{ name: '出库进行中', id: 34 }, { name: '出库进行中', id: 34 },
{ name: '完成', id: 35 }, { name: '完成', id: 35 },
{ name: '分公司审核驳回', id: 98 },
{ name: '分管审核驳回', id: 99 },
{ name: '内部审核驳回', id: 100 },
], ],
orderStatusList: [ orderStatusList: [
{ name: '申请时间-升序', id: 0 }, { name: '申请时间-升序', id: 0 },

21
sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
View File

@ -168,7 +168,7 @@
icon="el-icon-shopping-cart-2" icon="el-icon-shopping-cart-2"
style="color: #e6a23c" style="color: #e6a23c"
type="text" type="text"
v-if="row.taskStatus != 35" v-show="row.taskStatus != 35"
@click="handleOut(row)" @click="handleOut(row)"
v-hasPermi="['picking:outbound:out']" v-hasPermi="['picking:outbound:out']"
> >
@ -179,7 +179,6 @@
style="color: #67c23a" style="color: #67c23a"
icon="el-icon-tickets" icon="el-icon-tickets"
@click="handleOutboundOrder(row)" @click="handleOutboundOrder(row)"
v-if="row.taskStatus == 35"
> >
出库单 出库单
</el-button> </el-button>
@ -554,7 +553,7 @@
@closeDialogOuter="closeDialogOuter" @closeDialogOuter="closeDialogOuter"
> >
<template slot="outerContent"> <template slot="outerContent">
<VueEasyPrint tableShow ref="remarksPrintRef"> <VueEasyPrint tableShow ref="remarksPrintRef" style="padding: 0 10px; width: 750px;">
<!-- <el-row :gutter="20"> <!-- <el-row :gutter="20">
<el-col span="6">申请人：</el-col> <el-col span="6">申请人：</el-col>
<el-col span="6">领料工程：</el-col> <el-col span="6">领料工程：</el-col>
@ -569,18 +568,19 @@
<li> <li>
领料单位：<span>{{ unitName }}</span> 领料单位：<span>{{ unitName }}</span>
</li> </li>
<li>
领料工程：<span>{{ proName }}</span>
</li>
<li> <li>
领料单号：<span>{{ code }}</span> 领料单号：<span>{{ code }}</span>
</li> </li>
<li>
领料工程：<span>{{ proName }}</span>
</li>
</ul> </ul>
<el-table style="margin: 15px 0" :data="outboundOrderList"> <el-table style="margin: 15px 0; padding: 1px;" :data="outboundOrderList">
<el-table-column <el-table-column
align="center" align="center"
label="序号" label="序号"
type="index" type="index"
width="55"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -601,11 +601,13 @@
align="center" align="center"
label="申请数量" label="申请数量"
prop="preNum" prop="preNum"
width="55"
/> />
<el-table-column <el-table-column
align="center" align="center"
label="出库数量" label="出库数量"
prop="outNum" prop="outNum"
width="55"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -634,7 +636,7 @@
领料申请人：<span>{{ applyFor }}</span> 领料申请人：<span>{{ applyFor }}</span>
</li> </li>
<li> 批注人：<span></span> </li> <li> 批注人：<span></span> </li>
<li style="margin-right: 260px"> <li style="margin-right: 200px">
审批人：<span></span> 审批人：<span></span>
</li> </li>
</ul> </ul>
@ -771,7 +773,7 @@ export default {
}, },
// 出库单 弹框配置项 // 出库单 弹框配置项
dialogConfig: { dialogConfig: {
outerWidth: '80%', outerWidth: '800px',
outerVisible: false, outerVisible: false,
center: true, center: true,
}, },
@ -1120,6 +1122,7 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
list-style: none; list-style: none;
flex-wrap: wrap;
padding: 0; padding: 0;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;

2
sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue
View File

@ -295,7 +295,7 @@
icon="el-icon-edit-outline" icon="el-icon-edit-outline"
style="color: #e6a23c" style="color: #e6a23c"
type="text" type="text"
v-if="scope.row.taskStatus == '101'" v-show="scope.row.taskStatus == '101'"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['return:apply:reject:submit']" v-hasPermi="['return:apply:reject:submit']"
>驳回提交</el-button >驳回提交</el-button

2
sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue
View File

@ -285,7 +285,7 @@
icon="el-icon-finished" icon="el-icon-finished"
style="color: #e6a23c" style="color: #e6a23c"
type="text" type="text"
v-if="scope.row.taskStatus == '37'" v-show="scope.row.taskStatus == '37'"
v-hasPermi="['return:auditing:auditing']" v-hasPermi="['return:auditing:auditing']"
@click="handleUpdate(scope.row, 'update')" @click="handleUpdate(scope.row, 'update')"
> >

2
sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue
View File

@ -224,7 +224,7 @@
@click="handleReturn(scope.row, 'see')" @click="handleReturn(scope.row, 'see')"
icon="el-icon-d-arrow-right" icon="el-icon-d-arrow-right"
v-hasPermi="['return:receive:handler']" v-hasPermi="['return:receive:handler']"
v-if=" v-show="
scope.row.taskStatus == 38 || scope.row.taskStatus == 38 ||
scope.row.taskStatus == 39 scope.row.taskStatus == 39
" "

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

@ -241,7 +241,7 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-setting" icon="el-icon-setting"
v-if="scope.row.repairStatusCode == '43'" v-show="scope.row.repairStatusCode == '43'"
@click="handleUpdate(scope.row, 'update')" @click="handleUpdate(scope.row, 'update')"
v-hasPermi="['service:button']" v-hasPermi="['service:button']"
> >

2
sgzb-ui/src/views/repairTest/repairScrap/index.vue
View File

@ -253,7 +253,7 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-setting" icon="el-icon-setting"
v-if="scope.row.repairStatusCode == '43'" v-show="scope.row.repairStatusCode == '43'"
@click="handleUpdate(scope.row, 'update')" @click="handleUpdate(scope.row, 'update')"
v-hasPermi="['service:button']" v-hasPermi="['service:button']"
> >

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

@ -245,7 +245,7 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-circle-check" icon="el-icon-circle-check"
v-if="scope.row.taskStatus == 46" v-show="scope.row.taskStatus == 46"
@click="handleUpdate(scope.row, 'update')" @click="handleUpdate(scope.row, 'update')"
v-hasPermi="['service:auditing']" v-hasPermi="['service:auditing']"
>审核</el-button >审核</el-button

2
sgzb-ui/src/views/scrapManage/forecastWaste/auditing/index.vue
View File

@ -70,7 +70,7 @@
icon="el-icon-edit-outline" icon="el-icon-edit-outline"
@click="handleAuditing(data)" @click="handleAuditing(data)"
v-hasPermi="['forecast:waste:auditing']" v-hasPermi="['forecast:waste:auditing']"
v-if="data.taskStatus === 121 || data.taskStatus === 120" v-show="data.taskStatus === 121 || data.taskStatus === 120"
>审核</el-button >审核</el-button
> >
</template> </template>

2
sgzb-ui/src/views/scrapManage/forecastWaste/listing/index.vue
View File

@ -78,7 +78,7 @@
style="color: #f56c6c" style="color: #f56c6c"
icon="el-icon-finished" icon="el-icon-finished"
v-hasPermi="['submit:scrap']" v-hasPermi="['submit:scrap']"
v-if="data.taskStatus == 124" v-show="data.taskStatus == 124"
@click="handleSubmitScrap(data)" @click="handleSubmitScrap(data)"
>提交报废</el-button >提交报废</el-button
> >

2
sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
View File

@ -73,7 +73,7 @@
type="text" type="text"
style="color: #e6a23c" style="color: #e6a23c"
icon="el-icon-edit-outline" icon="el-icon-edit-outline"
v-if="data.disposition == 0" v-show="data.disposition == 0"
@click="handleDisposition(data)" @click="handleDisposition(data)"
v-hasPermi="['scrap:disposition']" v-hasPermi="['scrap:disposition']"
> >

2
sgzb-ui/src/views/scrapManage/scrap/scrapAuditing/index.vue
View File

@ -49,7 +49,7 @@
type="text" type="text"
style="color: #e6a23c" style="color: #e6a23c"
icon="el-icon-edit-outline" icon="el-icon-edit-outline"
v-if="auditingIsShow(data)" v-show="auditingIsShow(data)"
v-hasPermi="['scrap:auditing']" v-hasPermi="['scrap:auditing']"
@click="handleAuditing(data)" @click="handleAuditing(data)"
> >

2
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
View File

@ -246,7 +246,7 @@
size="mini" size="mini"
type="warning" type="warning"
icon="el-icon-edit" icon="el-icon-edit"
v-if=" v-show="
(scope.row.purchasingStatus == '验收合格') && (scope.row.purchasingStatus == '验收合格') &&
scope.row.manageType != '1' scope.row.manageType != '1'
" "

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

@ -194,7 +194,7 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
v-if="scope.row.taskStatus == '105'" v-show="scope.row.taskStatus == '105'"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['warehousing:auditing']" v-hasPermi="['warehousing:auditing']"
>审核</el-button >审核</el-button

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

@ -180,7 +180,7 @@
type="primary" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-if="scope.row.taskStatus == '入库进行中'" v-show="scope.row.taskStatus == '入库进行中'"
v-hasPermi="['repairTest:auditing']" v-hasPermi="['repairTest:auditing']"
>审核</el-button >审核</el-button
> >

2
sgzb-ui/src/views/system/dept/index.vue
View File

@ -85,7 +85,7 @@
v-hasPermi="['system:dept:add']" v-hasPermi="['system:dept:add']"
>新增</el-button> >新增</el-button>
<el-button <el-button
v-if="scope.row.parentId != 0" v-show="scope.row.parentId != 0"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"

2
sgzb-ui/src/views/warehouseManage/machinery/keeper/index.vue
View File

@ -220,7 +220,7 @@
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-if="scope.row.userName" v-show="scope.row.userName"
v-hasPermi="['machinery:keeper:unbind']" v-hasPermi="['machinery:keeper:unbind']"
> >
解绑 解绑

2
sgzb-ui/src/views/warehouseManage/machinery/parts/index.vue
View File

@ -128,7 +128,7 @@
<!-- v-hasPermi="['system:dept:add']"--> <!-- v-hasPermi="['system:dept:add']"-->
<!-- >新增</el-button>--> <!-- >新增</el-button>-->
<el-button <el-button
v-if="scope.row.parentId != 0" v-show="scope.row.parentId != 0"
size="mini" size="mini"
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"

2
sgzb-ui/src/views/warehouseManage/machinery/personnel/index.vue
View File

@ -222,7 +222,7 @@
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-if="scope.row.userName" v-show="scope.row.userName"
v-hasPermi="['machinery:personnel:unbind']" v-hasPermi="['machinery:personnel:unbind']"
> >
解绑 解绑

4
sgzb-ui/src/views/warehouseManage/machinery/type/index.vue
View File

@ -1008,6 +1008,7 @@ export default {
handleNodeClick(data) { handleNodeClick(data) {
console.log('🚀 ~ handleNodeClick ~ data:', data) console.log('🚀 ~ handleNodeClick ~ data:', data)
this.queryParams.typeId = data.id this.queryParams.typeId = data.id
this.form.companyId = data.companyId
this.handleQuery() this.handleQuery()
}, },
// 取消按钮 // 取消按钮
@ -1075,6 +1076,7 @@ export default {
} else { } else {
this.field101fileList = [] this.field101fileList = []
} }
this.form.companyId = response.data.companyId
this.imageUrl = this.form.photoUrl this.imageUrl = this.form.photoUrl
this.open = true this.open = true
@ -1232,7 +1234,7 @@ export default {
treeChange(val) { treeChange(val) {
console.log(val, '树节点') console.log(val, '树节点')
this.form.companyId = val.companyId // this.form.companyId = val.companyId
}, },
// 详情 // 详情
handleDetails(row) { handleDetails(row) {

4
sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue
View File

@ -125,7 +125,7 @@
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
v-if="isAccept" v-show="isAccept"
:disabled="multiple" :disabled="multiple"
@click="handleListCheck" @click="handleListCheck"
v-hasPermi="['newPurchase:parts:notice:accept:batch']" v-hasPermi="['newPurchase:parts:notice:accept:batch']"
@ -251,7 +251,7 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
v-if="isAccept && scope.row.status == 0" v-show="isAccept && scope.row.status == 0"
@click="handleCheck(scope.row)" @click="handleCheck(scope.row)"
v-hasPermi="['newPurchase:parts:notice:accept']" v-hasPermi="['newPurchase:parts:notice:accept']"
>验收</el-button >验收</el-button

6
sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
View File

@ -140,7 +140,7 @@
<el-button <el-button
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
v-if="scope.row.taskStatus == 68" v-show="scope.row.taskStatus == 68"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['newPurchase:parts:edit']" v-hasPermi="['newPurchase:parts:edit']"
>编辑</el-button >编辑</el-button
@ -149,7 +149,7 @@
type="text" type="text"
icon="el-icon-circle-check" icon="el-icon-circle-check"
style="color: #e6a23c" style="color: #e6a23c"
v-if="scope.row.taskStatus == 68" v-show="scope.row.taskStatus == 68"
@click="handleCheck(scope.row)" @click="handleCheck(scope.row)"
v-hasPermi="['newPurchase:parts:accept']" v-hasPermi="['newPurchase:parts:accept']"
>验收</el-button >验收</el-button
@ -166,7 +166,7 @@
style="color: #f56c6c" style="color: #f56c6c"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
v-if="scope.row.taskStatus == 68" v-show="scope.row.taskStatus == 68"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['newPurchase:parts:del']" v-hasPermi="['newPurchase:parts:del']"
>删除</el-button >删除</el-button

2
sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
View File

@ -179,7 +179,7 @@
style="color: #e6a23c" style="color: #e6a23c"
type="text" type="text"
icon="el-icon-finished" icon="el-icon-finished"
v-if="scope.row.taskStatus == '122'" v-show="scope.row.taskStatus == '122'"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['newPurchase:service:auditing']" v-hasPermi="['newPurchase:service:auditing']"
>审核</el-button >审核</el-button

8
sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
View File

@ -183,7 +183,7 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-if="scope.row.taskStatus == 24" v-show="scope.row.taskStatus == 24"
v-hasPermi="['newPurchase:tools:edit']" v-hasPermi="['newPurchase:tools:edit']"
>编辑</el-button >编辑</el-button
> >
@ -191,7 +191,7 @@
type="text" type="text"
icon="el-icon-circle-check" icon="el-icon-circle-check"
style="color: #e6a23c" style="color: #e6a23c"
v-if=" v-show="
scope.row.purchasingStatus == '待通知' || scope.row.purchasingStatus == '待通知' ||
scope.row.purchasingStatus == '待验收' scope.row.purchasingStatus == '待验收'
" "
@ -203,7 +203,7 @@
type="text" type="text"
icon="el-icon-edit-outline" icon="el-icon-edit-outline"
style="color: #67c23a" style="color: #67c23a"
v-if=" v-show="
scope.row.purchasingStatus == '验收合格' && scope.row.purchasingStatus == '验收合格' &&
scope.row.manageType != '1' scope.row.manageType != '1'
" "
@ -239,7 +239,7 @@
type="text" type="text"
style="color: #f56c6c" style="color: #f56c6c"
icon="el-icon-delete" icon="el-icon-delete"
v-if=" v-show="
scope.row.purchasingStatus == '待通知' || scope.row.purchasingStatus == '待通知' ||
scope.row.purchasingStatus == '验收未通过' || scope.row.purchasingStatus == '验收未通过' ||
scope.row.purchasingStatus == scope.row.purchasingStatus ==

4
sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
View File

@ -200,7 +200,7 @@
type="primary" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-if="scope.row.taskStatus == 69" v-show="scope.row.taskStatus == 69"
v-hasPermi="['warehousing:newParts:auditing']" v-hasPermi="['warehousing:newParts:auditing']"
> >
审核 审核
@ -209,7 +209,7 @@
size="mini" size="mini"
type="info" type="info"
icon="el-icon-edit" icon="el-icon-edit"
v-if="scope.row.taskStatus == 70" v-show="scope.row.taskStatus == 70"
@click="handlePrint(scope.row)" @click="handlePrint(scope.row)"
v-hasPermi="['warehousing:newParts:list']" v-hasPermi="['warehousing:newParts:list']"
> >

4
sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
View File

@ -196,7 +196,7 @@
style="color: #e6a23c" style="color: #e6a23c"
type="text" type="text"
icon="el-icon-finished" icon="el-icon-finished"
v-if="scope.row.taskStatus == '105'" v-show="scope.row.taskStatus == '105'"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['warehousing:newTools:auditing']" v-hasPermi="['warehousing:newTools:auditing']"
>审核</el-button >审核</el-button
@ -205,7 +205,7 @@
type="text" type="text"
icon="el-icon-tickets" icon="el-icon-tickets"
style="color: #67c23a" style="color: #67c23a"
v-if=" v-show="
scope.row.taskStatus == '28' || scope.row.taskStatus == '28' ||
scope.row.taskStatus == '123' scope.row.taskStatus == '123'
" "

2
sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
View File

@ -183,7 +183,7 @@
type="primary" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-if="scope.row.taskStatus == '入库进行中'" v-show="scope.row.taskStatus == '入库进行中'"
v-hasPermi="['warehousing:repair:auditing']" v-hasPermi="['warehousing:repair:auditing']"
>审核</el-button >审核</el-button
> >