ykx/lm-safe-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

检查项目分类 去除

Browse Source 
检查任务制定 新增无新行问题修复
This commit is contained in:
wyw 2024-07-17 15:04:00 +08:00
parent 2e41387812
commit f5c05688d7
6 changed files with 101 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pages/apply/subPages/BS/checkPlanNotice.vue
View File

@ -34,12 +34,12 @@
<u--textarea disabled disabledColor="#ffffff" autoHeight v-model="model.CheckProjectNAME"
placeholder="检查项目" border="surround"></u--textarea>
</u-form-item>
<view class="label-title">检查项目分类</view>
<!-- <view class="label-title">检查项目分类</view>
<u-form-item prop="CheckProjectCategoryNAME" borderBottom>
<u--textarea disabled disabledColor="#ffffff" autoHeight
v-model="model.CheckProjectCategoryNAME" placeholder="检查项目分类"
border="surround"></u--textarea>
</u-form-item>
</u-form-item> -->
<view class="label-title">检查人员</view>
<u-form-item prop="CheckUsers" borderBottom>
<u--textarea disabled disabledColor="#ffffff" autoHeight v-model="model.CheckUsers"
@ -226,7 +226,7 @@
extendInclude(json, 'Nav_CheckTypeLevel.Nav_Enums');
extendInclude(json, 'Nav_ListCheckRiskArea.Nav_RiskArea');
extendInclude(json, 'Nav_ListCheckProject.Nav_CheckProject');
extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory');
// extendInclude(json, 'Nav_ListCheckProjectCategory.Nav_CheckProjectCategory');
extendInclude(json, 'Nav_Files.Nav_ImgFile.Nav_File');
extendInclude(json,
"Nav_Approve.Nav_ApproveDetails.Nav_ApproveUser.Nav_UserSignFiles.Nav_ImgFile.Nav_File");
@ -254,16 +254,16 @@
}
}
let CheckProjectCategoryNAME = ''
if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) {
for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) {
CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? " " : "") + res
.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME;
}
}
// let CheckProjectCategoryNAME = ''
// if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) {
// for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) {
// CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? " " : "") + res
// .Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME;
// }
// }
this.model.RiskAreaNAME = strRiskAreaNAME
this.model.CheckProjectNAME = strCheckProjectNAME
this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
// this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
// Nav_ListSafeCheckDetail: [{

98
pages/apply/subPages/BS/plan.vue
View File

@ -64,12 +64,12 @@
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item class="subRequired" required label="项目分类" prop="CheckProjectCategoryNAME" borderBottom
<!-- <u-form-item class="subRequired" required label="项目分类" prop="CheckProjectCategoryNAME" borderBottom
@click="handleShowSheet({title: '检查项目分类', name: 'CheckProjectCategoryNAME'})">
<u--textarea disabled autoHeight disabledColor="#fff" v-model="model.CheckProjectCategoryNAME"
placeholder="检查项目分类" border="none"></u--textarea>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down"></u-icon>
</u-form-item>
</u-form-item> -->
<u-form-item label="检查时间" required prop="CHECKTIME" borderBottom @click="showCheckDate()">
<u--input disabledColor="#fff" v-model="model.CHECKTIME" placeholder="请选择检查时间" border="none"
@ -140,7 +140,7 @@
border="none" inputAlign="right"></u--input>
</u-form-item>
<u-form-item v-if="isDIY||!item.CREATE_TIME" class="subRequired" required
<!-- <u-form-item v-if="isDIY||!item.CREATE_TIME" class="subRequired" required
label="项目分类" prop="Nav_CheckProjectCategory.NAME" borderBottom
@click="handleShowSheet({title: '项目分类', name: 'SubCheckProjectCategoryNAME',itemData:item})">
<u--input disabledColor="#fff" v-model="item.Nav_CheckProjectCategory.NAME"
@ -152,7 +152,7 @@
<u--input disabled disabledColor="#fff"
v-model="item.Nav_CheckProjectCategory.NAME" border="none"
inputAlign="right"></u--input>
</u-form-item>
</u-form-item> -->
<u-form-item class="subRequired" v-if="isDIY||!item.CREATE_TIME" required
label="检查内容" prop="SubCheckContent" borderBottom
@ -287,12 +287,12 @@
CHECK_PROJECT_ID: '',
Nav_CheckProject: {}
}],
Nav_ListCheckProjectCategory: [{
ORG_ID: '',
SAFE_CHECK_ID: '',
CHECK_PROJECT_CATEGORY_ID: '',
Nav_CheckProjectCategory: {}
}],
// Nav_ListCheckProjectCategory: [{
// ORG_ID: '',
// SAFE_CHECK_ID: '',
// CHECK_PROJECT_CATEGORY_ID: '',
// Nav_CheckProjectCategory: {}
// }],
//操作需要同时操作 Nav_ListSafeCheckDetailShow
Nav_ListSafeCheckDetail: [{
SAFE_CHECK_ID: '',
@ -304,9 +304,9 @@
Nav_CheckProject: {
NAME: ''
},
Nav_CheckProjectCategory: {
NAME: ''
},
// Nav_CheckProjectCategory: {
// NAME: ''
// },
CHECKCONTENT: '',
CHECKPROOF: '',
Nav_ListCheckDetailUser: [],
@ -355,7 +355,7 @@
trigger: ['blur', 'change']
}
},
//供显示 类似 懒加载
Nav_ListSafeCheckDetailShow: [{
SAFE_CHECK_ID: '',
@ -367,9 +367,9 @@
Nav_CheckProject: {
NAME: ''
},
Nav_CheckProjectCategory: {
NAME: ''
},
// Nav_CheckProjectCategory: {
// NAME: ''
// },
CHECKCONTENT: '',
CHECKPROOF: '',
Nav_ListCheckDetailUser: [],
@ -406,10 +406,14 @@
if (this.model.Nav_ListSafeCheckDetail == null) {
this.model.Nav_ListSafeCheckDetail = []
}
this.model.Nav_ListSafeCheckDetail.unshift({
if (this.Nav_ListSafeCheckDetailShow == null) {
this.Nav_ListSafeCheckDetailShow = []
}
var ROW_NO = this.model.Nav_ListSafeCheckDetail.length + 1
var modelAdd = {
ID: guid(),
ORG_ID: this.ORG_ID,
ROW_NO: 1,
ROW_NO: ROW_NO,
CHECKRESULT: 0,
SAFE_CHECK_ID: this.model.ID,
Nav_CheckArea: {
@ -418,13 +422,16 @@
Nav_CheckProject: {
NAME: ''
},
Nav_CheckProjectCategory: {
NAME: ''
},
// Nav_CheckProjectCategory: {
// NAME: ''
// },
CHECKCONTENT: '',
CHECKPROOF: '',
Nav_ListCheckDetailUser: []
})
}
this.model.Nav_ListSafeCheckDetail.unshift(modelAdd)
this.Nav_ListSafeCheckDetailShow.unshift(modelAdd)
// this.$forceUpdate()
},
//手动删除信息 编号修改
@ -507,9 +514,9 @@
this.modelEdit.Nav_ListCheckProject.forEach(e => {
e.Nav_CheckProject = null
})
this.modelEdit.Nav_ListCheckProjectCategory.forEach(e => {
e.Nav_CheckProjectCategory = null
})
// this.modelEdit.Nav_ListCheckProjectCategory.forEach(e => {
// e.Nav_CheckProjectCategory = null
// })
// 行数据处理 把选择人 分别插入 每行的人员信息
this.modelEdit.Nav_ListSafeCheckDetail.forEach(e => {
@ -565,8 +572,8 @@
extendInclude(json, "Nav_ListCheckRiskArea.Nav_RiskArea");
extendInclude(json, "Nav_ListCheckProject");
extendInclude(json, "Nav_ListCheckProject.Nav_CheckProject");
extendInclude(json, "Nav_ListCheckProjectCategory");
extendInclude(json, "Nav_ListCheckProjectCategory.Nav_CheckProjectCategory");
// extendInclude(json, "Nav_ListCheckProjectCategory");
// extendInclude(json, "Nav_ListCheckProjectCategory.Nav_CheckProjectCategory");
extendInclude(json, "Nav_Files.Nav_ImgFile.Nav_File");
extendInclude(json, "Nav_ListSafeCheckDetail");
extendInclude(json, "Nav_ListSafeCheckDetail.Nav_CheckArea");
@ -609,18 +616,18 @@
}
let CheckProjectCategoryNAME = ''
if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) {
for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) {
if (idCheck.indexOf(res.Nav_ListCheckProjectCategory[i]
.CHECK_PROJECT_CATEGORY_ID) == -
1) {
idCheck.push(res.Nav_ListCheckProjectCategory[i].CHECK_PROJECT_CATEGORY_ID)
CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? "," : "") +
res
.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME;
}
}
}
// if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) {
// for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) {
// if (idCheck.indexOf(res.Nav_ListCheckProjectCategory[i]
// .CHECK_PROJECT_CATEGORY_ID) == -
// 1) {
// idCheck.push(res.Nav_ListCheckProjectCategory[i].CHECK_PROJECT_CATEGORY_ID)
// CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? "," : "") +
// res
// .Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME;
// }
// }
// }
let CheckProjectNAME = ''
if (res.Nav_ListCheckProject && res.Nav_ListCheckProject.length > 0) {
@ -641,12 +648,12 @@
.total)
}
this.model.RiskAreaNAME = strRiskAreaNAME
this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
// this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
this.model.CheckProjectNAME = CheckProjectNAME
} else {
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail
this.model.RiskAreaNAME = strRiskAreaNAME
this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
// this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
this.model.CheckProjectNAME = CheckProjectNAME
this.total = 0
}
@ -882,7 +889,7 @@
extendRule(json, 'NAME', 9, p.val);
}
json.Sort = 'NAME'
// if (this.model.CHECKOBJECT != 0) {
// json.FilterGroup.Rules.push({
// 'Field': "MineType",
@ -1175,12 +1182,13 @@
OrderPagedSafeCheckDetail(json).then(res => {
this.model.Nav_ListSafeCheckDetail = []
this.model.Nav_ListSafeCheckDetail = res
this.total = this.model.Nav_ListSafeCheckDetail.length
if (this.total > 10) {
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, 10)
} else {
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this.total)
this.Nav_ListSafeCheckDetailShow = this.model.Nav_ListSafeCheckDetail.slice(0, this
.total)
}
})
}

20
pages/apply/subPages/BS/safeCheckAudit.vue
View File

@ -40,11 +40,11 @@
border="surround"></u--textarea>
</u-form-item>
<view class="label-title">检查项目分类</view>
<!-- <view class="label-title">检查项目分类</view>
<u-form-item prop="CheckProjectCategoryNAME" borderBottom>
<u--textarea disabled autoHeight v-model="model.CheckProjectCategoryNAME" placeholder="检查项目分类"
border="surround"></u--textarea>
</u-form-item>
</u-form-item> -->
<u-form-item label="检查人员" prop="CheckUsers" borderBottom>
<u--input v-model="model.CheckUsers" border="none" slot="right" inputAlign="right"></u--input>
@ -228,17 +228,17 @@
}
}
let CheckProjectCategoryNAME = ''
if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) {
for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) {
CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? "," : "") + res
.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME;
}
}
// let CheckProjectCategoryNAME = ''
// if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) {
// for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) {
// CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? "," : "") + res
// .Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME;
// }
// }
this.model.RiskAreaNAME = strRiskAreaNAME
this.model.CheckProjectNAME = strCheckProjectNAME
this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
// this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
// this.isLoadOK = true
if (this.model.Nav_ListSafeCheckDetail != null && this.model.Nav_ListSafeCheckDetail.length >

26
pages/apply/subPages/BS/safeCheckCheck.vue
View File

@ -24,11 +24,11 @@
<u--textarea disabled autoHeight v-model="model.RiskAreaNAME" placeholder="请输入检查内容"
border="surround"></u--textarea>
</u-form-item>
<view class="label-title">检查项目分类</view>
<!-- <view class="label-title">检查项目分类</view>
<u-form-item prop="CheckProjectCategoryNAME" borderBottom>
<u--textarea disabled autoHeight v-model="model.CheckProjectCategoryNAME" placeholder="请输入检查内容"
border="surround"></u--textarea>
</u-form-item>
</u-form-item> -->
<view class="upload-title">附件</view>
<full-upload v-model="model.Nav_Files" :isShowBtn='false'></full-upload>
</u--form>
@ -186,7 +186,7 @@
}],
CHECKTIME: '',
RiskAreaNAME: '',
CheckProjectCategoryNAME: '',
// CheckProjectCategoryNAME: '',
Nav_ListSafeCheckDetail: {
ID: '',
SAFE_CHECK_ID: '',
@ -289,8 +289,8 @@
extendInclude(json, "Nav_ListCheckRiskArea.Nav_RiskArea");
// extendInclude(json, "Nav_ListCheckProject");
// extendInclude(json, "Nav_ListCheckProject.Nav_CheckProject");
extendInclude(json, "Nav_ListCheckProjectCategory");
extendInclude(json, "Nav_ListCheckProjectCategory.Nav_CheckProjectCategory");
// extendInclude(json, "Nav_ListCheckProjectCategory");
// extendInclude(json, "Nav_ListCheckProjectCategory.Nav_CheckProjectCategory");
extendInclude(json, "Nav_Files.Nav_ImgFile.Nav_File");
extendInclude(json, "Nav_ListSafeCheckDetail");
extendInclude(json, "Nav_ListSafeCheckDetail.Nav_CheckArea");
@ -364,16 +364,16 @@
i].Nav_RiskArea.NAME;
}
}
let CheckProjectCategoryNAME = ''
if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) {
for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) {
CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? " " : "") + res
.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME;
}
}
// let CheckProjectCategoryNAME = ''
// if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) {
// for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) {
// CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? " " : "") + res
// .Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME;
// }
// }
this.model.RiskAreaNAME = strRiskAreaNAME
this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
// this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
this.isLoadOK = true
})
},

24
pages/apply/subPages/BS/safeCheckSign.vue
View File

@ -38,11 +38,11 @@
<u--textarea disabled autoHeight v-model="model.RiskAreaNAME" placeholder="请输入检查内容"
border="surround"></u--textarea>
</u-form-item>
<view class="label-title">检查项目分类</view>
<!-- <view class="label-title">检查项目分类</view>
<u-form-item prop="CheckProjectCategoryNAME" borderBottom>
<u--textarea disabled autoHeight v-model="model.CheckProjectCategoryNAME" placeholder="请输入检查内容"
border="surround"></u--textarea>
</u-form-item>
</u-form-item> -->
<!--
<view class="upload-title">附件</view>
@ -393,8 +393,8 @@
extendInclude(json, "Nav_ListCheckRiskArea.Nav_RiskArea");
extendInclude(json, "Nav_ListCheckProject");
extendInclude(json, "Nav_ListCheckProject.Nav_CheckProject");
extendInclude(json, "Nav_ListCheckProjectCategory");
extendInclude(json, "Nav_ListCheckProjectCategory.Nav_CheckProjectCategory");
// extendInclude(json, "Nav_ListCheckProjectCategory");
// extendInclude(json, "Nav_ListCheckProjectCategory.Nav_CheckProjectCategory");
extendInclude(json, "Nav_Files.Nav_ImgFile.Nav_File");
extendInclude(json, "Nav_ListSafeCheckDetail");
extendInclude(json, "Nav_ListSafeCheckDetail.Nav_CheckArea");
@ -523,15 +523,15 @@
}
}
let CheckProjectCategoryNAME = ''
if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) {
for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) {
CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? "," : "") + res
.Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME;
}
}
// let CheckProjectCategoryNAME = ''
// if (res.Nav_ListCheckProjectCategory && res.Nav_ListCheckProjectCategory.length > 0) {
// for (let i = 0; i < res.Nav_ListCheckProjectCategory.length; i++) {
// CheckProjectCategoryNAME += (CheckProjectCategoryNAME.length > 0 ? "," : "") + res
// .Nav_ListCheckProjectCategory[i].Nav_CheckProjectCategory.NAME;
// }
// }
this.model.RiskAreaNAME = strRiskAreaNAME
this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
// this.model.CheckProjectCategoryNAME = CheckProjectCategoryNAME
this.isLoadOK = true
})
},

4
pages/apply/subPages/BS/safeCheckSignDIY.vue
View File

@ -40,14 +40,14 @@
border="none" inputAlign="right"></u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item class="subRequired" required label="检查项目分类"
<!-- <u-form-item class="subRequired" required label="检查项目分类"
prop="Nav_CheckProjectCategory.NAME"
@click="handleShowSheet({title: '检查项目分类', name: 'CheckProjectCategoryNAME',itemData:item})"
borderBottom>
<u--input disabledColor="#fff" v-model="item['Nav_CheckProjectCategory'].NAME"
border="none" inputAlign="right"></u--input>
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down"></u-icon>
</u-form-item>
</u-form-item> -->
<u-form-item class="subRequired" required label="检查问题描述" prop="DESCREPTION"
borderBottom>
<u--textarea autoHeight v-model="item.DESCREPTION" placeholder="检查问题描述"