diff --git a/config.js b/config.js
index 4471211..fc1ed5e 100644
--- a/config.js
+++ b/config.js
@@ -1,7 +1,7 @@
// 应用全局配置
module.exports = {
// baseUrl: 'https://vue.ruoyi.vip/prod-api',
- baseUrl: 'http://192.168.0.115:9102',
+ baseUrl: 'http://192.168.0.112:9102',
// 应用信息
appInfo: {
// 应用名称
diff --git a/views/jiashicangshenhe/jiashicangshenhe.vue b/views/jiashicangshenhe/jiashicangshenhe.vue
index cc43ae3..f68b4c3 100644
--- a/views/jiashicangshenhe/jiashicangshenhe.vue
+++ b/views/jiashicangshenhe/jiashicangshenhe.vue
@@ -43,7 +43,7 @@
-
+
事件来源:
@@ -77,7 +77,7 @@
-
+
@@ -99,7 +99,7 @@
事件逐条审核{{"("+listtotle+")"}}条
-
+
@@ -178,7 +178,7 @@
nextblack(item) {
console.log(item);
uni.navigateTo({
- url: `/views/yemianxianqging/yemianxianqging?innerEventId=${this.innerEventId}&tabscurrent=${this.tabscurrent}`
+ url: `/views/yemianxianqging/yemianxianqging?innerEventId=${this.innerEventId}&tabscurrent=${this.tabscurrent}&navbarValue=${this.navbarValue}`
})
},
// 查看修改标题
@@ -248,21 +248,34 @@
},
// 退回或者提交
Chongxinshangbao(isReport) {
- if(this.Objitem.msgTypeName == "紧急事件"){
- this.$store.state.tijiaoList.shijianList = [this.ObjitemTow.caseSerial]
- }
- if(this.$store.state.tijiaoList.shijianList.length == 0){
+ if (this.Objitem.msgTypeName == "紧急事件") {
+ let mykey = this.ObjitemTow.caseSerial
+ this.$store.state.tijiaoList.shijianList = [mykey]
+ }
+ if (this.$store.state.tijiaoList.shijianList.length == 0) {
uni.showToast({
- title:"请选择工单上报!",
+ title: "请选择工单上报!",
icon: 'none',
duration: 1000
});
return
}
+ let caseSerialData = {}
+ if (this.navbarValue == "同人同诉") {
+ this.$store.state.tijiaoList.shijianList.forEach(res => {
+ caseSerialData[res.key] = res.value
+ })
+ } else {
+ this.$store.state.tijiaoList.shijianList.forEach(res => {
+ caseSerialData[res] = 1
+ })
+ }
+
let obj = {
- caseSerial: this.$store.state.tijiaoList.shijianList,
+ caseSerial: caseSerialData,
innerEventId: this.innerEventId,
- isReport
+ isReport,
+ msgType: this.Objitem.msgType
}
eventChangeIsReport(obj).then(res => {
if (res.code == 200) {
diff --git a/views/yemianxianqging/yemianxianqging.vue b/views/yemianxianqging/yemianxianqging.vue
index 45af716..23c93b5 100644
--- a/views/yemianxianqging/yemianxianqging.vue
+++ b/views/yemianxianqging/yemianxianqging.vue
@@ -36,15 +36,50 @@
-
- 非同一事件
+
+
+
+ 同人同诉事件
+
+
+ 非同人事件
+
+
+ 非同诉事件
+
+
+
+
+
+
+
+ 非同人事件
+
+
+
+
+ 非同诉事件
+
+
+
-
-
- 同一事件
+
+
+ {{navbarValue=='重点人员'?'非重点事件':navbarValue=='一人多诉'?'非同一人事件':'非同一事件'}}
+
+
+
+
+ {{navbarValue=='重点人员'?'重点事件':navbarValue=='一人多诉'?'同一人事件':'同一事件'}}
+
+
@@ -71,24 +106,68 @@
},
shijianList: [],
innerEventId: "",
- tabscurrent:""
+ // 判断从哪里来 0 是 待审核 1 是已上报 2是重训练
+ tabscurrent: "",
+ navbarValue: ""
}
},
methods: {
- nextblack(item) {
- if(this.tabscurrent != 0) return
- item.caseSerialShow = !item.caseSerialShow
- if (!item.caseSerialShow) {
- this.shijianList = this.shijianList.filter((obj) => {
- return obj != item.caseSerial;
- });
+ nextblack(item, type) {
+ if (this.tabscurrent != 0) return
+
+ //判断是否为同人同诉，如果为，那么判断点击时的状态 2 为非同人 ，对应字段caseSerialShowleft
+ //3 为 非同诉，对应字段caseSerialShowRight
+ if (this.navbarValue == '同人同诉') {
+ let obj = {
+ key: item.caseSerial,
+ value: type
+ }
+ if (type == 2) {
+
+ item.caseSerialShowleft = !item.caseSerialShowleft
+ item.caseSerialShowRight = false
+ if (!item.caseSerialShowleft) {
+ //删除操作
+ this.shijianList = this.shijianList.filter((obj) => {
+ return obj.key != item.caseSerial;
+ });
+ } else {
+ this.shijianList = this.shijianList.filter((obj) => {
+ return obj.key != item.caseSerial;
+ });
+ this.shijianList.push(obj)
+ }
+ } else if (type == 3) {
+ item.caseSerialShowRight = !item.caseSerialShowRight
+ item.caseSerialShowleft = false
+ if (!item.caseSerialShowRight) {
+ // 删除操作
+ this.shijianList = this.shijianList.filter((obj) => {
+ return obj.key != item.caseSerial;
+ });
+ } else {
+ this.shijianList = this.shijianList.filter((obj) => {
+ return obj.key != item.caseSerial;
+ });
+ this.shijianList.push(obj)
+ }
+ }
} else {
- this.shijianList.push(item.caseSerial)
+ item.caseSerialShow = !item.caseSerialShow
+ if (!item.caseSerialShow) {
+ this.shijianList = this.shijianList.filter((obj) => {
+ return obj != item.caseSerial;
+ });
+ } else {
+ this.shijianList.push(item.caseSerial)
+ }
+
}
this.$store.dispatch("setstate", this.shijianList)
console.log(this.shijianList);
console.log(this.$store.state.tijiaoList.shijianList);
+
},
getList() {
massEventsinfoTow(this.innerEventId, this.massEventsObj).then(res => {
@@ -96,14 +175,30 @@
this.shijianList = storeList
this.tiaoshu = res.data.total
this.contentList = res.data.records
-
- this.contentList = this.contentList.map((obj) => {
- const caseSerialShow = storeList.includes(obj.caseSerial);
- return {
- ...obj,
- caseSerialShow
- };
- });
+
+ if (this.navbarValue == '同人同诉') {
+ this.contentList = this.contentList.map((obj) => {
+
+ const caseSerialShowleft = storeList.some(res => res.key == obj.caseSerial &&
+ res.value == 2);
+ const caseSerialShowRight = storeList.some(res => res.key == obj.caseSerial &&
+ res.value == 3);
+ return {
+ ...obj,
+ caseSerialShowleft,
+ caseSerialShowRight
+ };
+ });
+ } else {
+ this.contentList = this.contentList.map((obj) => {
+ const caseSerialShow = storeList.includes(obj.caseSerial);
+ return {
+ ...obj,
+ caseSerialShow
+ };
+ });
+ }
+
})
},
@@ -111,6 +206,7 @@
onLoad(opent) {
this.innerEventId = opent.innerEventId
this.tabscurrent = opent.tabscurrent
+ this.navbarValue = opent.navbarValue
this.getList()
}
}
@@ -196,6 +292,29 @@
color: #2baa04;
}
+ .indexcontentbttom-item-bottom-bottomTRTS {
+ background: #ffffff;
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ grid-column-gap: 20rpx;
+
+ view {
+ background: rgba(0, 170, 0, .1);
+ border-radius: 10rpx;
+ text-align: center;
+ line-height: 69rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ .icon {
+ background: rgba(0, 170, 0, 0);
+ }
+
+ }
+
+ }
+
}
}
}