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

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

This commit is contained in:
csyue 2024-06-19 14:41:34 +08:00
parent 8e18c4c351 4186260ef5
commit afa141b7c6
38 changed files with 139 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java
View File

@ -41,6 +41,9 @@ public class BackApplyDto {
@ApiModelProperty(value = "任务状态")
private String taskStatus;
@ApiModelProperty(value = "类型id")
private String typeId;
private List<BackApplyListDto> backApplyList;

1
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
View File

@ -492,6 +492,7 @@ public class BackApplyServiceImpl implements BackApplyService {
for (BackApplyInfo backApplyDetail : backApplyListDto.getBackApplyDetails()) {
dto.setInnerId(backApplyListDto.getId());
dto.setAuditNum(backApplyDetail.getPreNum());
dto.setTypeId(backApplyDetail.getTypeId());
re = backApplyMapper.auditAll(dto);
}
}

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
View File

@ -312,7 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW()
WHERE
bai.id = #{id}
bai.id = #{id} and bad.type_id = #{typeId}
<if test="companyId != null and companyId != ''">
and bai.company_id = #{companyId}
</if>
@ -348,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW()
WHERE
bai.id = #{innerId}
bai.id = #{innerId} and bad.type_id = #{typeId}
<if test="companyId != null and companyId != ''">
and bai.company_id = #{companyId}
</if>

2
sgzb-ui/src/components/HoldingpoleDialog/index.vue
View File

@ -16,7 +16,7 @@
</el-form-item>
</el-form>
<el-table :data="maTypeDetails" style="width: 100%">
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="序号" align="center" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)" />
<el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
<el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />

9
sgzb-ui/src/utils/globalUrl.js
View File

@ -4,7 +4,14 @@
// const qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='; //宁夏
// const qrUrl = 'https://z.csgmall.com.cn/gl/qrCode/qrCodePage?qrCode='; //南网
const qrUrl = process.env.NODE_ENV === 'production' ? 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
// const qrUrl = process.env.NODE_ENV === 'production' ? 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
let qrUrl = ''
const origin = window.location.origin
if (origin == 'http://112.29.103.165:21626') {
qrUrl = 'http://112.29.103.165:21626/qrCode/qrCodePage?qrCode='
} else {
qrUrl = 'http://192.168.0.14:18866/qrCode/qrCodePage?qrCode='
}
export default {
qrUrl,

7
sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
View File

@ -114,12 +114,13 @@
align="center"
width="100"
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="类型名称"

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

@ -104,12 +104,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="领料单号"
@ -399,12 +400,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(outQuery.pageNum, outQuery.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(outQuery.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="类型名称"

7
sgzb-ui/src/views/claimAndRefund/return/returnFinshed.vue
View File

@ -128,12 +128,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="退料单号"

12
sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
View File

@ -87,12 +87,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="类型名称"
@ -316,12 +317,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(codeQuery.pageNum, codeQuery.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(codeQuery.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="设备类型"

5
sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
View File

@ -460,12 +460,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(dialogQuery.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="类型名称"

12
sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage1.vue
View File

@ -542,12 +542,12 @@ export default {
async refuseAuditLeaseByCompany(type) {
const params = JSON.parse(JSON.stringify(this.queryParams))
if (params.taskStatus == 31) {
params.taskStatus = 99
params.examineStatusId = 99
params.taskStatus = 98
params.examineStatusId = 98
}
if (params.taskStatus == 32) {
params.taskStatus = 100
params.examineStatusId = 100
params.taskStatus = 99
params.examineStatusId = 99
}
params.updateTime = params.updateTimes
params.createTime = params.createTimes
@ -620,7 +620,7 @@ export default {
this.flowPath[2].icon = 'el-icon-check'
}
// console.log(this.flowPath)
if (this.queryParams.examineStatusId == 99) {
if (this.queryParams.examineStatusId == 98) {
this.flowPath[0].color = 'red'
this.flowPath[0].icon = 'el-icon-close'
this.flowPath[1].color = ''
@ -629,7 +629,7 @@ export default {
this.flowPath[2].color = ''
this.flowPath[2].icon = ''
}
if (this.queryParams.examineStatusId == 100) {
if (this.queryParams.examineStatusId == 99) {
this.flowPath[1].color = 'red'
this.flowPath[1].icon = 'el-icon-close'
this.flowPath[2].color = ''

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

@ -389,12 +389,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(outQuery.pageNum, outQuery.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(outQuery.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="类型名称"

10
sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue
View File

@ -88,12 +88,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="类型名称"
@ -317,12 +318,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(codeQuery.pageNum, codeQuery.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(codeQuery.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="设备类型"

9
sgzb-ui/src/views/dashboard.vue
View File

@ -8,16 +8,23 @@ export default {
data() {
return {
// url: '/new-page' // 目标页面的路径
jumpUrl: '',
}
},
created() {
const origin = window.location.origin
if (origin == 'http://112.29.103.165:21626') {
this.jumpUrl = origin
} else {
this.jumpUrl = 'http://192.168.0.14:18866'
}
this.openNewWindow()
this.$tab.closePage().then(() => {})
},
methods: {
openNewWindow() {
window.open(
'http://192.168.0.14:18866/index01.html?token=' +
`${this.jumpUrl}/index01.html?token=` +
localStorage.getItem('token'),
'_blank',
)

5
sgzb-ui/src/views/index.vue
View File

@ -134,12 +134,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="任务单号"

5
sgzb-ui/src/views/monitor/online/index.vue
View File

@ -49,10 +49,11 @@
align="center"
width="80"
type="index"
:index="indexContinuation(pageNum, pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{ (pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="会话编号"

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

@ -498,9 +498,9 @@
width="80"
type="index"
>
<template scope="scope">
<template slot-scope="scope">
<span>{{
(scrapRecordParams.pageNum - 1) * 10 +
(scrapRecordParams.pageNum - 1) * scrapRecordParams.pageSize +
scope.$index +
1
}}</span>

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

@ -172,12 +172,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="修试审核单号"

5
sgzb-ui/src/views/store/label/labelType.vue
View File

@ -105,12 +105,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="标签种类名称"

5
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesServiceCenterList.vue
View File

@ -291,12 +291,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(query.pageNum, query.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(query.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="机具类型"

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

@ -301,12 +301,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(query.pageNum, query.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(query.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="机具类型"

5
sgzb-ui/src/views/store/newBuy/newTools/newToolsArrival.vue
View File

@ -176,12 +176,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="工器具类型名称"

6
sgzb-ui/src/views/store/newBuy/newTools/newToolsCode.vue
View File

@ -75,10 +75,10 @@
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)">
<!-- <template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</template> -->
</el-table-column>
<el-table-column label="工器具名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />

6
sgzb-ui/src/views/store/newBuy/newTools/newToolsList.vue
View File

@ -85,10 +85,10 @@
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)">
<!-- <template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</template> -->
</el-table-column>
<el-table-column label="采购单号" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="采购日期" align="center" prop="dictName" :show-overflow-tooltip="true" />

12
sgzb-ui/src/views/store/newBuy/newTools/newToolsWarehousing.vue
View File

@ -43,10 +43,10 @@
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)">
<!-- <template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</template> -->
</el-table-column>
<el-table-column label="采购单号" align="center" prop="dictId" />
<el-table-column label="采购日期" align="center" prop="createTime" width="180">
@ -158,10 +158,10 @@
</el-row>
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)">
<!-- <template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</template> -->
</el-table-column>
<el-table-column label="工器具类型" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />

5
sgzb-ui/src/views/store/newBuy/plan.vue
View File

@ -71,12 +71,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="基层单位"

10
sgzb-ui/src/views/store/newBuy/planSecond.vue
View File

@ -73,12 +73,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="物资名称"
@ -272,12 +273,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(dialogParams.pageNum, dialogParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(dialogParams.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="物资名称"

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

@ -36,10 +36,10 @@
<!-- 列表 -->
<el-table :data="houseList">
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)">
<!-- <template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</template> -->
</el-table-column>
<el-table-column prop="typeName" label="机具名称" min-width="280" align="center" />
<el-table-column prop="typeModelName" label="规格型号" min-width="280" align="center" />

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

@ -72,10 +72,10 @@
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)">
<!-- <template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</template> -->
</el-table-column>
<el-table-column label="工器具类型" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />

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

@ -248,10 +248,10 @@
</el-row>
<el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400">
<el-table-column type="selection" width="55" align="center" :selectable="selectable" />
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(query.pageNum, query.pageSize)">
<!-- <template scope="scope">
<span>{{ (query.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</template> -->
</el-table-column>
<el-table-column label="配件类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />

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

@ -331,10 +331,10 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)">
<!-- <template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="设备类型"

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

@ -197,10 +197,10 @@
</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 label="序号" align="center" width="80" type="index">
<template scope="scope">
<el-table-column label="序号" align="center" width="80" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)">
<!-- <template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</template> -->
</el-table-column>
<el-table-column label="设备类型" align="center" prop="typeName2" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />

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

@ -282,12 +282,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(query.pageNum, query.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(query.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="机具类型"

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

@ -379,12 +379,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(query.pageNum, query.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(query.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="配件类型"

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

@ -293,12 +293,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(query.pageNum, query.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(query.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="机具类型"

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

@ -349,12 +349,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="设备类型"

5
sgzb-ui/src/views/warehouseManage/warehousing/return/index.vue
View File

@ -338,12 +338,13 @@
align="center"
width="80"
type="index"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
>
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="设备类型"

4
sgzb-ui/vue.config.js
View File

@ -42,10 +42,10 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`,
// target: `http://10.40.92.52:28080`, //超
target: `http://10.40.92.60:28080`, //超
// target: `http://10.40.92.81:8080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/
target: `http://10.40.92.138:28080`, //帅
// target: `http://10.40.92.138:28080`, //帅
// target: `http://10.40.92.253:28080`, //福
//******** 注意事项 ********* */