|
|
@@ -216,8 +216,8 @@ import situationPreviewVue from '../creatingSituations/components/situationPrevi
|
|
|
deductPoint: 0, //本次扣分
|
|
|
currentCheckedTab: null, //当前选中的查核tab
|
|
|
moreDeduction: false, //缺陷项是否多选
|
|
|
- ifInputScore: false, //是否手动干预分值
|
|
|
- iOrder:1, //查核项明细中，下一步顺序是否按要点结束，1:按要点结束；2:按顺序结束
|
|
|
+ ifInputScore: false, //是否手动干预分值
|
|
|
+ iOrder:1, //查核项明细中，下一步顺序是否按要点结束，1:按要点结束；2:按顺序结束
|
|
|
situationType:0,
|
|
|
};
|
|
|
},
|
|
|
@@ -331,7 +331,7 @@ import situationPreviewVue from '../creatingSituations/components/situationPrevi
|
|
|
toSelectResponsible() {
|
|
|
|
|
|
uni.navigateTo({
|
|
|
- url: `/pages/responsibleList/responsibleList?deptId=${this.isZichaDucha?this.departmentId:this.deptId}&checkId=${this.id}&isZichaDucha=${this.isZichaDucha}`,
|
|
|
+ url: `/pages/responsibleList/responsibleList?deptId=${this.deptId}&checkId=${this.id}`,
|
|
|
});
|
|
|
},
|
|
|
selectResultHandle(item) {
|
|
|
@@ -450,15 +450,15 @@ import situationPreviewVue from '../creatingSituations/components/situationPrevi
|
|
|
this.id = id;
|
|
|
this.deptId = res.deptId;
|
|
|
//再次编辑回显
|
|
|
-
|
|
|
- this.Index = this.isZichaDucha?res.checkResultName:res.checkResult;
|
|
|
-
|
|
|
- this.totalScore = this.isZichaDucha ? res.itemTotalScore : res.totalScore;
|
|
|
- this.currentScore = this.isZichaDucha ? (res.checkResult ? res.checkScore : res
|
|
|
- .itemTotalScore) : (res.checkResult ? res.score : res.totalScore);
|
|
|
+ const filePath = res.checkResultTxt ? JSON.parse(res.checkResultTxt) : [];
|
|
|
+ this.filePath = filePath[0] && filePath[0].checkResultUrl != '' ? filePath[0].checkResultUrl
|
|
|
+ .split(',') : [];
|
|
|
+ this.Index = res.checkResult;
|
|
|
+ this.totalScore = res.totalScore;
|
|
|
+ this.currentScore = res.checkResult?res.score:res.totalScore;
|
|
|
this.deductPoint = res.deductPoint;
|
|
|
this.moreDeduction = res.moreDeduction;
|
|
|
- //this.iOrder=res.checkOrder;
|
|
|
+ //this.iOrder=res.checkOrder;
|
|
|
|
|
|
if (res.checkResultRequestList && res.checkResultRequestList.length > 0) {
|
|
|
if (res.checkModelName == '访谈') {
|
|
|
@@ -556,8 +556,8 @@ import situationPreviewVue from '../creatingSituations/components/situationPrevi
|
|
|
...res,
|
|
|
lastResult: res.lastResultName,
|
|
|
checkResult: res.checkResultName
|
|
|
- } : res;
|
|
|
-
|
|
|
+ } : res;
|
|
|
+
|
|
|
console.log('this.data',this.data);
|
|
|
|
|
|
if (res && res.lastResult == "不适用") {
|
|
|
@@ -757,7 +757,7 @@ import situationPreviewVue from '../creatingSituations/components/situationPrevi
|
|
|
},
|
|
|
},
|
|
|
}).then((res) => {
|
|
|
- if (res) {
|
|
|
+ if (res) {
|
|
|
|
|
|
resolve(true);
|
|
|
|
|
|
@@ -774,22 +774,22 @@ import situationPreviewVue from '../creatingSituations/components/situationPrevi
|
|
|
name = this.resultConfigList[index].name
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- // if (
|
|
|
- // checkConfiglist[i].attr == (this.isZichaDucha ? name :
|
|
|
- // params.checkResult) &&
|
|
|
- // (checkConfiglist[i].resultType == 2 ||
|
|
|
- // checkConfiglist[i].resultType == 3)
|
|
|
- // )
|
|
|
- let configResultType=false;
|
|
|
- //if (this.isZichaDucha){
|
|
|
- if (this.resultConfigList[resultIndex].resultType==2||this.resultConfigList[resultIndex].resultType==3)
|
|
|
- configResultType=true;
|
|
|
- // }else{
|
|
|
- // if (checkConfiglist[i].resultType == 2 ||
|
|
|
- // checkConfiglist[i].resultType == 3)
|
|
|
- // configResultType=true;
|
|
|
- // }
|
|
|
+
|
|
|
+ // if (
|
|
|
+ // checkConfiglist[i].attr == (this.isZichaDucha ? name :
|
|
|
+ // params.checkResult) &&
|
|
|
+ // (checkConfiglist[i].resultType == 2 ||
|
|
|
+ // checkConfiglist[i].resultType == 3)
|
|
|
+ // )
|
|
|
+ let configResultType=false;
|
|
|
+ //if (this.isZichaDucha){
|
|
|
+ if (this.resultConfigList[resultIndex].resultType==2||this.resultConfigList[resultIndex].resultType==3)
|
|
|
+ configResultType=true;
|
|
|
+ // }else{
|
|
|
+ // if (checkConfiglist[i].resultType == 2 ||
|
|
|
+ // checkConfiglist[i].resultType == 3)
|
|
|
+ // configResultType=true;
|
|
|
+ // }
|
|
|
|
|
|
if (
|
|
|
checkConfiglist[i].attr == (this.isZichaDucha ? this.resultConfigList[index].name:
|
|
|
@@ -827,7 +827,7 @@ import situationPreviewVue from '../creatingSituations/components/situationPrevi
|
|
|
checkResult: 0,
|
|
|
// newResultType: Number(resultIndex != -1 ? this
|
|
|
// .resultConfigList[resultIndex].code : 0
|
|
|
- // ),
|
|
|
+ // ),
|
|
|
newResultType:checkConfiglist[i].resultType,
|
|
|
receiveEmpId: this.data.receiveEmpId,
|
|
|
receiveEmpName: this.data.receiveEmpName,
|
|
|
@@ -969,7 +969,7 @@ import situationPreviewVue from '../creatingSituations/components/situationPrevi
|
|
|
}
|
|
|
this.checkedSelectResultListIds = [];
|
|
|
this.checkedSelectResultList = [];
|
|
|
- this.checkedSelectResultListData = [];
|
|
|
+ this.checkedSelectResultListData = [];
|
|
|
this.filePath=[];
|
|
|
},
|
|
|
goToPrevPage() {
|
|
|
@@ -1012,7 +1012,7 @@ import situationPreviewVue from '../creatingSituations/components/situationPrevi
|
|
|
}
|
|
|
let needItemIndex = num > 0 ? current[0].index + 1 : current[0].index - 1;
|
|
|
let needItemId = this.itemBelongGroup[needItemIndex].id;
|
|
|
- let needItemCheckId = this.itemBelongGroup[needItemIndex].checkItemId;
|
|
|
+ let needItemCheckId = this.itemBelongGroup[needItemIndex].checkItemId;
|
|
|
|
|
|
this.clearForm();
|
|
|
this.clearResult();
|
|
|
@@ -1052,8 +1052,8 @@ import situationPreviewVue from '../creatingSituations/components/situationPrevi
|
|
|
situationType,
|
|
|
isZichaDucha,
|
|
|
departmentId,
|
|
|
- checkGroupName,
|
|
|
- checkOrder,
|
|
|
+ checkGroupName,
|
|
|
+ checkOrder,
|
|
|
systemSituationType,
|
|
|
}) {
|
|
|
this.iOrder= checkOrder;
|
|
|
@@ -1065,14 +1065,14 @@ import situationPreviewVue from '../creatingSituations/components/situationPrevi
|
|
|
|
|
|
this.getCheckConfigList(checkItemId);
|
|
|
this.getCheckItemResultList(checkItemId);
|
|
|
- this.isZichaDucha = isZichaDucha? JSON.parse(isZichaDucha) : false; //是否为自查督查
|
|
|
-
|
|
|
+ this.isZichaDucha = isZichaDucha? JSON.parse(isZichaDucha) : false; //是否为自查督查
|
|
|
+
|
|
|
this.systemSituationType=systemSituationType;
|
|
|
//console.log('2023062604 situationType',this.systemSituationType);
|
|
|
//接收来自上个页面所传过来的数据
|
|
|
- const eventChannel = this.getOpenerEventChannel();
|
|
|
+ const eventChannel = this.getOpenerEventChannel();
|
|
|
|
|
|
- eventChannel.on('acceptDataFromOpenerPage', (data) => {
|
|
|
+ eventChannel.on('acceptDataFromOpenerPage', (data) => {
|
|
|
if (this.iOrder==1){
|
|
|
this.itemBelongGroup = data.data[0].responseList.map((item, index) => {
|
|
|
|
|
|
@@ -1081,22 +1081,22 @@ import situationPreviewVue from '../creatingSituations/components/situationPrevi
|
|
|
id: item['id'],
|
|
|
checkItemId: item['checkItemId']
|
|
|
})
|
|
|
- });
|
|
|
- }else if (this.iOrder==2){
|
|
|
- var Tindex=0;
|
|
|
- let itemList=[];
|
|
|
- data.data.filter(parentItem=>{
|
|
|
+ });
|
|
|
+ }else if (this.iOrder==2){
|
|
|
+ var Tindex=0;
|
|
|
+ let itemList=[];
|
|
|
+ data.data.filter(parentItem=>{
|
|
|
var tmp =parentItem.responseList.map((item) => {
|
|
|
|
|
|
return ({
|
|
|
index: Tindex++,
|
|
|
id: item['id'],
|
|
|
checkItemId: item['checkItemId']
|
|
|
- })
|
|
|
- });
|
|
|
- itemList=itemList.concat(tmp);
|
|
|
- });
|
|
|
- this.itemBelongGroup=itemList;
|
|
|
+ })
|
|
|
+ });
|
|
|
+ itemList=itemList.concat(tmp);
|
|
|
+ });
|
|
|
+ this.itemBelongGroup=itemList;
|
|
|
}
|
|
|
//重新导航进页面，删除缓存并设置最新数据
|
|
|
uni.removeStorageSync('itemBelongGroup');
|
|
|
@@ -1719,4 +1719,4 @@ import situationPreviewVue from '../creatingSituations/components/situationPrevi
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
