dianliang/lanan-repair-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
Vinjor 2024-11-21 11:52:03 +08:00
parent bdd4df2890
commit 38b75c0c54
8 changed files with 96 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/applyCard.vue
View File

@ -11,11 +11,11 @@
<!-- 原因：{{ order.remark }}-->
<!-- </view>-->
<!-- </view>-->
<view v-if="'配件申请单'==titleText">
<image v-if="order.status=='05'" class="stateImg" src="@/pages-repair/static/weitongguo.png" ></image>
<image v-else-if="order.status=='01'" class="stateImg" src="@/pages-repair/static/daishenhe.png" ></image>
<image v-else class="stateImg" src="@/pages-repair/static/yitongguo.png" ></image>
</view>
<!-- <view v-if="'配件申请单'==titleText">-->
<!-- <image v-if="order.status=='05'" class="stateImg" src="@/pages-repair/static/weitongguo.png" ></image>-->
<!-- <image v-else-if="order.status=='01'" class="stateImg" src="@/pages-repair/static/daishenhe.png" ></image>-->
<!-- <image v-else class="stateImg" src="@/pages-repair/static/yitongguo.png" ></image>-->
<!-- </view>-->
</view>
</template>

18
pages-home/home/home.vue
View File

@ -12,7 +12,7 @@
<view class="userInfo" @click="showUserDetail">
<text class="userName">{{ userInfo.nickname }}</text>
<text class="userType">{{ userInfo.roleNames }}</text>
<text class="userType" v-if="ifLeader">班组长</text>
<!-- <text class="userType" v-if="ifLeader">班组长</text>-->
</view>
<view class="msg-box" @click="gotoMsg">
<image mode="aspectFita" src="@/pages-home/static/msg.png" style="width: 48rpx;height: 48rpx"></image>
@ -32,19 +32,19 @@
</view>
</view>
<!-- 维修工角色-->
<view class="body-card" v-if="userInfo.roleCodes.includes('repair_staff')">
<view class="title">审批单处理<text class="formValue" @click="workerTodo">全部</text><u-icon color="#999" name="arrow-right" size="12"></u-icon></view>
<view class="body-card" v-if="userInfo.roleCodes.includes('repair_staff')" @click="workerTodo">
<view class="title">单据查看<text class="formValue" >全部</text><u-icon color="#999" name="arrow-right" size="12"></u-icon></view>
<view class="title-box">
<view class="title-box-item">
<view class="titleDesc">已提交</view>
<view class="titleDesc">配件申请单</view>
<view class="titleNumber">{{ workerNumObj.submitNum }}</view>
<image class="titleImg" src="@/pages-home/static/up.png" ></image>
</view>
<view class="title-box-item">
<view class="titleDesc">未通过</view>
<view class="titleNumber">{{ workerNumObj.noAllowNum }}</view>
<image class="titleImg" src="@/pages-home/static/no.png" ></image>
</view>
<!-- <view class="title-box-item">-->
<!-- <view class="titleDesc">未通过</view>-->
<!-- <view class="titleNumber">{{ workerNumObj.noAllowNum }}</view>-->
<!-- <image class="titleImg" src="@/pages-home/static/no.png" ></image>-->
<!-- </view>-->
<!-- <view class="title-box-item">-->
<!-- <view class="titleDesc">已通过</view>-->
<!-- <view class="titleNumber">{{ workerNumObj.allowNum }}</view>-->

4
pages-order/addOrder/addOrder.vue
View File

@ -405,6 +405,10 @@ export default {
return
}
})
}else{
//默认选中第一个
this.repairTypeIndex = 0
this.formData.repairType = this.repairTypes[0].value;
}
},
afterRead(file) {

10
pages-order/orderDetail/orderDetail.vue
View File

@ -1030,6 +1030,16 @@ export default {
})
}
}
let newProArray = []
if(this.delProjId.length>0){
//有删除的项目，需要比对删掉
resultObj.projects.map((item)=>{
if(this.delProjId.indexOf(item.id)==-1){
newProArray.push(item)
}
})
resultObj.projects =newProArray
}
this.$nextTick(()=>{
this.ticketInfo = resultObj
//判断当前角色及工单状态显示操作按钮

2
pages-order/orderList/orderList.vue
View File

@ -402,7 +402,7 @@ export default {
color: #333333;
.header {
padding: 40rpx 32rpx 20rpx;
padding: 100rpx 32rpx 20rpx;
background-color: #fff;
.searchBox {

6
pages-repair/applyList/applyList.vue
View File

@ -45,11 +45,7 @@
tabList: [
{
id: 0,
title: '已提交'
},
{
id: 1,
title: '未通过'
title: '配件申请单'
},
{
id: 2,

118
pages-repair/applyList/todoDetail.vue
View File

@ -6,27 +6,44 @@
<view class="header">
配件信息
</view>
<view class="repairItem" v-for="(item, index) in repairList" :key="index">
<view class="repairName">{{ item.waresName }} <text class="repairNum">×{{item.waresCount}}</text></view>
<view class="grid">
<view style="grid-area: a" class="girdItem">
<text class="label">配件分类</text>
<text class="value">{{ item.typeName }}</text>
<uni-collapse ref="collapse" v-if="'apply'==viewType">
<uni-collapse-item v-for="groupItem in repairList" :key="groupItem.groupId"
:title="groupItem.groupName+'('+groupItem.allowNum+'个通过，'+groupItem.noNum+'个驳回，'+groupItem.waitingNum+'个待定)'">
<view class="content">
<view class="repairItem" v-for="(item, index) in groupItem.twItemList" :key="index">
<view class="repairName">{{ item.waresName }}×{{ item.waresCount }}{{ item.unitText }}</view>
<view class="grid">
<view style="grid-area: a" class="girdItem">
<text class="label">当前库存</text>
<text class="value">{{ item.stock }}</text>
</view>
<view style="grid-area: b" class="girdItem">
<text class="label">状态</text>
<text :class="getWaresStatusClass(item.waresStatus)">{{ getWaresStatus(item.waresStatus) }}</text>
</view>
<view v-if="item.handleName" style="grid-area: c" class="girdItem">
<text class="label">审核人</text>
<text class="value">{{ item.handleName }}</text>
</view>
<view v-if="item.approvalTime" style="grid-area: d" class="girdItem">
<text class="label">审核时间</text>
<text class="value">{{ item.approvalTime }}</text>
</view>
</view>
</view>
</view>
<view style="grid-area: b" class="girdItem">
<text class="label">当前库存</text>
<text class="value">{{ item.wares.stock }}</text>
</uni-collapse-item>
</uni-collapse>
<uni-collapse ref="collapse" v-else>
<uni-collapse-item v-for="groupItem in repairList" :key="groupItem.groupId"
:title="groupItem.groupName+'(合计'+groupItem.nums+'个配件)'">
<view class="content" >
<view class="repairItem" v-for="(item, index) in groupItem.soiRespVOList" :key="index">
<view class="repairName">{{ item.goodsName }}×{{ item.goodsCount }}{{ item.unitText }}</view>
</view>
</view>
<view style="grid-area: c" class="girdItem">
<text class="label">单位</text>
<text class="value">{{ item.wares.unit }}</text>
</view>
<view style="grid-area: d" class="girdItem">
<text class="label">编码</text>
<text class="value">{{ item.wares.code || ""}}</text>
</view>
</view>
</view>
</uni-collapse-item>
</uni-collapse>
</view>
</view>
<!-- 普通弹窗---拍照上传 -->
@ -80,6 +97,26 @@ export default {
this.getDetail()
},
methods:{
getWaresStatus(val) {
switch (val) {
case "1":
return "通过";
case "0":
return "不通过";
default:
return "待定"
}
},
getWaresStatusClass(val) {
switch (val) {
case "1":
return "pass";
case "0":
return "no_pass";
default:
return ""
}
},
/**
* 接单上传附件
@ -115,7 +152,7 @@ export default {
if("apply"==this.viewType){
this.title = "配件申请单详情"
//配件申请单
url = "/admin-api/repair/twi/list"
url = "/admin-api/repair/twi/listApp"
params.twId = this.id
}else{
if("receive"==this.viewType){
@ -129,7 +166,7 @@ export default {
this.backText="未退料（拒绝）"
}
//领料单、退料单
url = "/admin-api/repair/so/get"
url = "/admin-api/repair/so/getApp"
params.id = this.id
}
request({
@ -138,38 +175,7 @@ export default {
params:params
}).then((res) => {
if (res.code == 200) {
if("apply"==this.viewType){
//配件申请单
res.data.map((item)=>{
getDictTextByCodeAndValue("repair_unit",item.wares.unit).then(value => {
item.wares.unit = value
}).catch(error => {
item.wares.unit = "未知"
console.error(error);
});
})
this.repairList = res.data
}else{
//领料单、退料单
let goodsList = res.data.goodsList
let thisRepairList = []
goodsList.map((item)=>{
getDictTextByCodeAndValue("repair_unit",item.wares.unit).then(value => {
item.wares.unit = value
}).catch(error => {
item.wares.unit = "未知"
console.error(error);
});
thisRepairList.push({
waresName:item.wares.name,
waresCount:item.goodsCount,
typeName:item.typeName,
wares:item.wares
})
})
this.repairList = thisRepairList
console.log(this.repairList,"this.repairList")
}
this.repairList = res.data
}
})
},
@ -300,7 +306,13 @@ export default {
}
}
}
.pass {
color: #2979FF;
}
.no_pass {
color: #E8A321;
}
.repairInfo {
margin: 20rpx 32rpx;
background-color: #fff;

2
pages-warehouse/home/home.vue
View File

@ -127,7 +127,7 @@ export default {
name: '退配件'
},
{
name: '待审核'
name: '配件单'
},
{
name: '进行中工单'