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 2024-06-19 11:34:54 +08:00
parent f072ab95b8 35922d044d
commit f507727924
42 changed files with 280 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
View File

@ -1,20 +1,12 @@
package com.bonus.sgzb.app.mapper;
import com.bonus.sgzb.app.domain.*;
import com.bonus.sgzb.base.domain.MaintenanceGang;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
* Description:
* @Author 阮世耀
* @Create 2023/12/13 15:14
* @Version 1.0
*/
@Mapper
public interface TmTaskMapper {
@ -151,4 +143,6 @@ public interface TmTaskMapper {
List<LeaseApplyDetails> getleaseDetailsStatus(TmTask task);
List<TmTask> getUserByParenntId(TmTask tmTask);
}

32
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -17,6 +17,7 @@ import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.common.core.utils.StringUtils;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.system.api.RemoteUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -68,6 +69,9 @@ public class TmTaskServiceImpl implements TmTaskService {
@Resource
private BmFlowRecordService bmFlowRecordService;
@Resource
private RemoteUserService remoteUserService;
private final static String STRING_ADMIN = "admin";
private final static String STRING_SGB = "sgb";
private final static String STRING_AJB = "sgb";
@ -135,6 +139,12 @@ public class TmTaskServiceImpl implements TmTaskService {
}
}
}
//短信通知人员进行出库
for (LeaseApplyDetails details:leaseApplyDetails) {
//内部审核以后通知机具管理人进行出库
smsNotification(details,record.getCode());
}
} else if (record.getTaskStatus() == 32 && companyId != null) {
// 再审核领料任务信息表
List<LeaseApplyInfo> leaseApplyInfoList = record.getLeaseApplyInfoList();
@ -212,6 +222,28 @@ public class TmTaskServiceImpl implements TmTaskService {
}
private void smsNotification(LeaseApplyDetails details,String code) {
TmTask tmTask = new TmTask();
tmTask.setId(details.getParenntId().toString());
//获取机具所属人员
List<TmTask> leaseDetailByParent = tmTaskMapper.getUserByParenntId(tmTask);
for (TmTask tmTaskNew: leaseDetailByParent) {
//对手机号进行处理，因为存在一种类型的机具归属多个人的情况
log.info("短信通知人为：{}",tmTaskNew.getUserName());
if (tmTaskNew.getPhoneNumber()!=null){
String[] phoneNumberList = tmTaskNew.getPhoneNumber().split(",");
String message ="尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:"+code+"的领料申请待处理，请及时查看";
for (int i = 0; i < phoneNumberList.length; i++) {
try {
remoteUserService.send(phoneNumberList[i], message);
}catch (Exception e){
log.info("手机号为：{}发送短信失败",phoneNumberList[i]);
}
}
}
}
}
@Override
public int updateLeaseTaskAuditInfoCq(TmTask record) {
int result = 0;

16
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -1249,4 +1249,20 @@
WHERE
lai.id = #{id}
</select>
<select id="getUserByParenntId" resultType="com.bonus.sgzb.app.domain.TmTask">
SELECT
lad.id as id,
lad.parennt_id as parentId,
GROUP_CONCAT(su.user_name) as userName,
GROUP_CONCAT(su.phonenumber) as phoneNumber,
lad.status as status,
lad.type_id as typeId
FROM
lease_apply_details lad
LEFT JOIN ma_type_keeper mtk on lad.type_id = mtk.type_id
LEFT JOIN sys_user su on mtk.user_id = su.user_id
WHERE
lad.parennt_id = #{id}
GROUP BY lad.type_id
</select>
</mapper>

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://112.29.103.165:21624/qrCode/qrCodePage?qrCode=' : 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
// const qrUrl = process.env.NODE_ENV === 'production' ? 'http://112.29.103.165:21624/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:21624') {
qrUrl = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='
} else {
qrUrl = 'http://192.168.0.14:21624/qrCode/qrCodePage?qrCode='
}
export default {
qrUrl,

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

@ -97,10 +97,10 @@
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" width="100" type="index">
<template scope="scope">
<el-table-column label="序号" align="center" width="100" type="index" :index="indexContinuation(queryParams.pageNum, queryParams.pageSize)">
<!-- <template slot-scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
</template>
</template> -->
</el-table-column>
<el-table-column label="类型名称" prop="roleName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" prop="roleKey" :show-overflow-tooltip="true" />

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

@ -386,12 +386,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="类型名称"

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

@ -131,12 +131,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/claimAndRefund/receiveByCq/receiveManage.vue
View File

@ -126,12 +126,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/claimAndRefund/return/returnApplyByCq.vue
View File

@ -163,12 +163,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/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
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="退料单号"

10
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
}}</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/returnAbnormal/returnAbnormal.vue
View File

@ -125,12 +125,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/claimAndRefund/secondStore/secondStore.vue
View File

@ -450,12 +450,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="类型名称"

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

@ -396,12 +396,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="设备类型"

5
sgzb-ui/src/views/cost/csotSettlement/costApplyList.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="协议编号"

5
sgzb-ui/src/views/cost/csotSettlement/costList.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
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column
label="结算单编号"

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

@ -12,28 +12,23 @@
}
},
created() {
if (process.env.NODE_ENV === 'production') {
this.jumpUrl = 'http://112.29.103.165:21624/'
const origin = window.location.origin
if (origin == 'http://112.29.103.165:21624') {
this.jumpUrl = origin
} else {
this.jumpUrl = 'http://192.168.0.14:21624/'
this.jumpUrl = 'http://192.168.0.14:21624'
}
this.openNewWindow()
this.$tab.closePage().then(() => {})
},
methods: {
openNewWindow() {
// window.open(
// 'http://192.168.0.14:21624/index01.html?token=' +
// localStorage.getItem('token'),
// '_blank',
// )
window.open(
`${this.jumpUrl}index01.html?token=${localStorage.getItem(
`${this.jumpUrl}/index01.html?token=${localStorage.getItem(
'token',
)}`,
'_blank',
)
// window.open('http://112.29.103.165:21624/index01.html?token='+localStorage.getItem('token'), '_blank'); // 产线
},
},
}

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="会话编号"

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

@ -171,12 +171,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

@ -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/store/newBuy/newDevices/newDevicesWarehousing.vue
View File

@ -309,12 +309,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="工器具类型名称"

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

@ -108,12 +108,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/newTools/newToolsList.vue
View File

@ -119,12 +119,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/newTools/newToolsWarehousing.vue
View File

@ -75,12 +75,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="采购单号" align="center" prop="dictId" />
<el-table-column
@ -265,12 +266,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/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="物资名称"

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

@ -62,12 +62,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
prop="typeName"

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

@ -106,12 +106,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/warehousing/accessoryWarehousing.vue
View File

@ -374,12 +374,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/warehousing/devicesWarehousing.vue
View File

@ -336,12 +336,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/warehousing/repairWarehousing.vue
View File

@ -343,12 +343,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="设备类型"

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

@ -7,6 +7,7 @@
size="small"
:inline="true"
label-width="80px"
:disabled="isView || isAccept"
>
<el-form-item label="采购日期" prop="purchaseTime">
<el-date-picker
@ -14,7 +15,6 @@
style="width: 240px"
value-format="yyyy-MM-dd"
type="date"
:disabled="isDisabled"
placeholder="请选择采购日期"
></el-date-picker>
</el-form-item>
@ -24,7 +24,6 @@
style="width: 240px"
value-format="yyyy-MM-dd"
type="date"
:disabled="isDisabled"
:picker-options="pickerOptions"
placeholder="请选择到货日期"
></el-date-picker>
@ -35,7 +34,6 @@
filterable
placeholder="请选择采购员"
style="width: 240px"
:disabled="isDisabled"
>
<el-option label="请选择" :value="0"></el-option>
<el-option
@ -51,7 +49,6 @@
v-model="maForm.remark"
placeholder="请输入备注"
clearable
:disabled="isDisabled"
type="textarea"
maxlength="150"
rows="1"
@ -67,6 +64,7 @@
:inline="true"
v-show="showSearch"
label-width="80px"
:disabled="isView || isAccept"
>
<el-form-item label="配件类型" prop="equipmentId">
<treeselect
@ -76,7 +74,7 @@
:disable-branch-nodes="true"
placeholder="请选择机具类型"
@select="select"
:disabled="isDisabled"
:disabled="isView || isAccept"
style="width: 240px"
/>
</el-form-item>
@ -86,7 +84,6 @@
placeholder="配件厂家"
clearable
filterable
:disabled="isDisabled"
style="width: 240px"
@change="changeSupplier"
>
@ -117,7 +114,7 @@
plain
icon="el-icon-plus"
size="mini"
v-if="!isDisabled"
v-if="isAdd || isEdit"
@click="handleSave"
>保存</el-button
>
@ -128,7 +125,7 @@
plain
icon="el-icon-plus"
size="mini"
v-if="isCheck"
v-if="isAccept"
:disabled="multiple"
@click="handleListCheck"
v-hasPermi="['newPurchase:parts:notice:accept:batch']"
@ -195,7 +192,7 @@
<el-input-number
v-model="scope.row.purchasePrice"
controls-position="right"
:disabled="isCheck || isView"
:disabled="isView || isAccept"
style="width: 100%"
:min="0"
></el-input-number>
@ -207,7 +204,7 @@
<el-input-number
v-model="scope.row.purchaseNum"
controls-position="right"
:disabled="isCheck || isView"
:disabled="isView || isAccept"
style="width: 100%"
:min="1"
></el-input-number>
@ -227,7 +224,7 @@
placeholder="厂家"
clearable
style="width: 180px"
:disabled="isCheck || isView"
:disabled="isView || isAccept"
>
<el-option
v-for="item in supplierList"
@ -247,14 +244,14 @@
label="操作"
align="center"
class-name="small-padding fixed-width"
v-if="!isView"
v-if="!isView || isAccept"
>
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
v-if="isCheck && scope.row.status == 0"
v-if="isAccept && scope.row.status == 0"
@click="handleCheck(scope.row)"
v-hasPermi="['newPurchase:parts:notice:accept']"
>验收</el-button
@ -263,7 +260,7 @@
size="mini"
type="text"
icon="el-icon-delete"
v-if="!isCheck && scope.row.status == 0"
v-if="isEdit && scope.row.status == 0"
@click="handleDelete(scope.row)"
>删除</el-button
>
@ -271,7 +268,7 @@
size="mini"
type="text"
icon="el-icon-delete"
v-if="isShow"
v-if="isAdd"
@click="handleDelete(scope.row)"
>删除</el-button
>
@ -414,13 +411,13 @@ export default {
return false
},
},
isCheck: {
isAdd: {
type: Boolean,
default: () => {
return false
},
},
isDisabled: {
isAccept: {
type: Boolean,
default: () => {
return false
@ -428,6 +425,7 @@ export default {
},
partsTaskId: {
type: [String, Number],
default: () => null,
},
},
data() {
@ -587,15 +585,20 @@ export default {
// }
this.taskId = this.partsTaskId
// 如果传入了 taskId 则需要查询详情
if (this.partsTaskId) {
this.getTaskInfo()
}
},
mounted() {
this.getUserList()
this.supplierInfoList()
this.getAccessoryTree()
if (this.isView) {
this.getTaskInfo()
}
// if (this.isView) {
// this.getTaskInfo()
// }
},
methods: {
/** 查询用户列表--采购员 */

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

@ -534,7 +534,9 @@ export default {
// path: '/store/newBuy/newAccessoryAccept',
// query,
// })
this.$emit('editParts', row.taskId)
// this.$emit('editParts', row.taskId)
this.$emit('handleParts', 2, row.taskId)
},
/** 查看按钮操作 */
handleView(row) {
@ -544,7 +546,8 @@ export default {
// query,
// })
this.$emit('queryParts', row.taskId)
// this.$emit('queryParts', row.taskId)
this.$emit('handleParts', 3, row.taskId)
},
/** 验收按钮操作 */
handleCheck(row) {
@ -553,7 +556,8 @@ export default {
// path: '/store/newBuy/newAccessoryAccept',
// query,
// })
this.$emit('acceptParts', row.taskId)
// this.$emit('acceptParts', row.taskId)
this.$emit('handleParts', 4, row.taskId)
},
/** 提交按钮 */
submitForm: function () {
@ -600,7 +604,9 @@ export default {
// path: '/store/newBuy/newAccessoryAccept',
// query,
// })
this.$emit('addParts')
// this.$emit('addParts')
this.$emit('handleParts', 1)
},
/** 删除按钮操作 */
handleDelete(row) {

102
sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/index.vue
View File

@ -11,13 +11,10 @@
:partsTaskId="partsTaskId"
:isView="isView"
:isEdit="isEdit"
:isCheck="isCheck"
:isDisabled="isDisabled"
@addParts="addParts"
@queryParts="queryParts"
@editParts="editParts"
@acceptParts="acceptParts"
:isAdd="isAdd"
:isAccept="isAccept"
@partsSaveSuccess="partsSaveSuccess"
@handleParts="handleParts"
/>
</div>
</template>
@ -39,40 +36,81 @@ export default {
partsTaskId: '',
isView: false,
isEdit: false,
isCheck: false,
isDisabled: false,
isAdd: false,
isAccept: false,
// isCheck: false,
// isDisabled: false,
}
},
methods: {
/* 新增配件 */
addParts() {
this.pageContent = '新增配件'
this.isShowComponent = 'AddParts'
},
/* 查询配件 */
queryParts(taskId) {
this.partsTaskId = taskId
this.isView = true
this.isDisabled = true
this.isShowComponent = 'AddParts'
},
// addParts() {
// this.pageContent = '新增配件'
// this.isShowComponent = 'AddParts'
// },
// /* 查询配件 */
// queryParts(taskId) {
// this.partsTaskId = taskId
// this.isView = true
// this.isDisabled = true
// this.isShowComponent = 'AddParts'
// },
/* 新增 修改保存成功 */
partsSaveSuccess() {
this.isShowComponent = 'Home'
},
/* 编辑配件 */
editParts(taskId) {
this.partsTaskId = taskId
this.isView = true
this.isEdit = true
this.isShowComponent = 'AddParts'
},
/* 验收配件 */
acceptParts(taskId) {
this.partsTaskId = taskId
this.isView = true
this.isDisabled = true
this.isCheck = true
// /* 编辑配件 */
// editParts(taskId) {
// this.partsTaskId = taskId
// this.isView = true
// this.isEdit = true
// this.isShowComponent = 'AddParts'
// },
// /* 验收配件 */
// acceptParts(taskId) {
// this.partsTaskId = taskId
// this.isView = true
// this.isDisabled = true
// this.isCheck = true
// this.isShowComponent = 'AddParts'
// },
// 新增 编辑 查看 验收事件
handleParts(type, taskId) {
switch (type) {
case 1:
this.pageContent = '新增配件'
this.partsTaskId = null
this.isAdd = true
this.isEdit = false
this.isView = false
this.isAccept = false
break
case 2:
this.pageContent = '编辑配件'
this.partsTaskId = taskId
this.isEdit = true
this.isAdd = false
this.isView = false
this.isAccept = false
break
case 3:
this.pageContent = '配件详情'
this.partsTaskId = taskId
this.isEdit = false
this.isAdd = false
this.isView = true
this.isAccept = false
break
case 4:
this.pageContent = '配件验收'
this.partsTaskId = taskId
this.isEdit = false
this.isAdd = false
this.isAccept = true
break
}
this.isShowComponent = 'AddParts'
},
/* 返回按钮 */

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

@ -286,12 +286,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

@ -312,12 +312,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

@ -346,12 +346,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="设备类型"