diff --git a/components/applyCard.vue b/components/applyCard.vue
index 0e572e8..b09ef24 100644
--- a/components/applyCard.vue
+++ b/components/applyCard.vue
@@ -11,11 +11,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/pages-home/home/home.vue b/pages-home/home/home.vue
index e14e7cb..3d22112 100644
--- a/pages-home/home/home.vue
+++ b/pages-home/home/home.vue
@@ -12,7 +12,7 @@
{{ userInfo.nickname }}
{{ userInfo.roleNames }}
- 班组长
+
@@ -32,19 +32,19 @@
-
- 审批单处理全部
+
+ 单据查看全部
- 已提交
+ 配件申请单
{{ workerNumObj.submitNum }}
-
- 未通过
- {{ workerNumObj.noAllowNum }}
-
-
+
+
+
+
+
diff --git a/pages-order/addOrder/addOrder.vue b/pages-order/addOrder/addOrder.vue
index 98a5207..2985326 100644
--- a/pages-order/addOrder/addOrder.vue
+++ b/pages-order/addOrder/addOrder.vue
@@ -405,6 +405,10 @@ export default {
return
}
})
+ }else{
+ //默认选中第一个
+ this.repairTypeIndex = 0
+ this.formData.repairType = this.repairTypes[0].value;
}
},
afterRead(file) {
diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index f008cb3..141c28d 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -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
//判断当前角色及工单状态显示操作按钮
diff --git a/pages-order/orderList/orderList.vue b/pages-order/orderList/orderList.vue
index b5c51e7..9e6b5e2 100644
--- a/pages-order/orderList/orderList.vue
+++ b/pages-order/orderList/orderList.vue
@@ -402,7 +402,7 @@ export default {
color: #333333;
.header {
- padding: 40rpx 32rpx 20rpx;
+ padding: 100rpx 32rpx 20rpx;
background-color: #fff;
.searchBox {
diff --git a/pages-repair/applyList/applyList.vue b/pages-repair/applyList/applyList.vue
index c70c558..1e215c0 100644
--- a/pages-repair/applyList/applyList.vue
+++ b/pages-repair/applyList/applyList.vue
@@ -45,11 +45,7 @@
tabList: [
{
id: 0,
- title: '已提交'
- },
- {
- id: 1,
- title: '未通过'
+ title: '配件申请单'
},
{
id: 2,
diff --git a/pages-repair/applyList/todoDetail.vue b/pages-repair/applyList/todoDetail.vue
index 8a6ec7f..deb8210 100644
--- a/pages-repair/applyList/todoDetail.vue
+++ b/pages-repair/applyList/todoDetail.vue
@@ -6,27 +6,44 @@
-
- {{ item.waresName }} ×{{item.waresCount}}
-
-
- 配件分类
- {{ item.typeName }}
+
+
+
+
+ {{ item.waresName }}×{{ item.waresCount }}{{ item.unitText }}
+
+
+ 当前库存
+ {{ item.stock }}
+
+
+ 状态
+ {{ getWaresStatus(item.waresStatus) }}
+
+
+ 审核人
+ {{ item.handleName }}
+
+
+ 审核时间
+ {{ item.approvalTime }}
+
+
+
-
- 当前库存
- {{ item.wares.stock }}
+
+
+
+
+
+
+ {{ item.goodsName }}×{{ item.goodsCount }}{{ item.unitText }}
+
-
- 单位
- {{ item.wares.unit }}
-
-
- 编码
- {{ item.wares.code || ""}}
-
-
-
+
+
@@ -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;
diff --git a/pages-warehouse/home/home.vue b/pages-warehouse/home/home.vue
index 80671fd..2574a42 100644
--- a/pages-warehouse/home/home.vue
+++ b/pages-warehouse/home/home.vue
@@ -127,7 +127,7 @@ export default {
name: '退配件'
},
{
- name: '待审核'
+ name: '配件单'
},
{
name: '进行中工单'