@@ -194,11 +215,13 @@ export default {
INVESTMENT_FUNDS: '', // 投入资金
RECTIFICATIONTIME: ''// 整改时间
},
+ imgUrl: '',
rectify_files: [],
hideUpload: false, // 整改照片
dialogImageVisible: false, // 放大照片的显示和隐藏
dialogImageUrl: '', // 照片的地址
scheme_files: [], // 整改方案图片
+ temporaryFilePath: [],
formRule: {
RECTIFICATIONDEPT: [{ required: true, message: '请选择整改部门', trigger: 'blur' }],
RECTIFICATIONOR: [{ required: true, message: '请选择整改人', trigger: 'blur' }],
@@ -252,6 +275,53 @@ export default {
this.getEditMyInfo()
},
methods: {
+ uploadFiles(file) {
+ // 调用文件大小校验方法
+ if (this.beforeUpload(file.file)) {
+ this.formData = new FormData()
+ this.formData.append('FFILE', file.file)
+ // 请求接口
+ upload(
+ '/mfolder/upLoadTemporary',
+ this.formData
+ ).then((data) => {
+ if (data.result == 'success') {
+ this.$message({
+ message: '保存成功',
+ type: 'success'
+ })
+ this.loading = false
+ this.temporaryFilePath.push(data.temporaryFilePath)
+ console.info('this.temporaryFilePath========' + this.temporaryFilePath)
+ } else {
+ this.$message({
+ message: data.exception,
+ type: 'error'
+ })
+ this.loading = false
+ }
+ }).catch((e) => {
+ this.listLoading = false
+ this.loading = false
+ })
+ }
+ },
+ // 文件大小校验
+ beforeUpload(file) {
+ if (file.size > 10 * 1024 * 1024) {
+ this.$message('文件过大，请上传小于10MB的文件〜')
+ return false
+ }
+ return true
+ },
+ // 删除图片
+ imageRemove() {
+ this.imgUrl = ''
+ this.$message({
+ message: '删除图片成功',
+ type: 'success'
+ })
+ },
getEditMyInfo: function() {
requestFN(
'/user/goEditMyInfo',
@@ -414,7 +484,8 @@ export default {
},
saveRectify() { // 正常整改
this.loading = true
- if (this.$refs.zhenggaiupload.uploadFiles.length < 1) {
+ // if (this.$refs.zhenggaiupload.uploadFiles.length < 1) {
+ if (this.temporaryFilePath.length < 1) {
this.$message({
message: '请上传整改后照片',
type: 'error'
@@ -541,16 +612,24 @@ export default {
text: '加载中......',
background: 'rgba(0,0,0,0.5)'
})
- this.$refs.zhenggaiupload.submit()
+ // this.$refs.zhenggaiupload.submit()
var todata = new FormData()
- for (var i = 0; i < _this.rectify_files.length; i++) {
- if (_this.rectify_files[i]) {
- todata.append('FFILE', _this.rectify_files[i])
+ for (var i = 0; i < _this.temporaryFilePath.length; i++) {
+ if (_this.temporaryFilePath[i]) {
+ todata.append('temporaryFilePath', _this.temporaryFilePath[i])
}
}
- if (!todata.get('FFILE')) {
+ if (!todata.get('temporaryFilePath')) {
return
}
+ // for (var i = 0; i < _this.rectify_files.length; i++) {
+ // if (_this.rectify_files[i]) {
+ // todata.append('FFILE', _this.rectify_files[i])
+ // }
+ // }
+ // if (!todata.get('FFILE')) {f
+ // return
+ // }
todata.append('FOREIGN_KEY', this.HIDDEN_ID)
todata.append('TYPE', 4)
upload(
@@ -603,6 +682,7 @@ export default {
}
todata.append('FOREIGN_KEY', this.HIDDEN_ID)
todata.append('TYPE', 8)
+ todata.append('temporaryFilePath', this.temporaryFilePath)
upload(
'/imgfiles/add',
todata
@@ -684,6 +764,39 @@ export default {
this.scheme_files.push(file)
}
},
+ submitUpload() {
+ var _this = this
+ this.$refs.zhenggaiupload.submit()
+ var todata = new FormData()
+ for (var i = 0; i < _this.rectify_files.length; i++) {
+ if (_this.rectify_files[i]) {
+ todata.append('FFILE', _this.rectify_files[i])
+ }
+ }
+ console.log(todata)
+ upload(
+ '/mfolder/upLoadTemporary',
+ todata
+ ).then((data) => {
+ if (data.result == 'success') {
+ this.$message({
+ message: '保存成功',
+ type: 'success'
+ })
+ this.loading = false
+ this.temporaryFilePath = data.temporaryFilePath
+ } else {
+ this.$message({
+ message: data.exception,
+ type: 'error'
+ })
+ this.loading = false
+ }
+ }).catch((e) => {
+ this.listLoading = false
+ this.loading = false
+ })
+ },
back() {
this.$parent.activeName = 'List'
}
diff --git a/src/views/hotwork/hotwork/components/list.vue b/src/views/hotwork/hotwork/components/list.vue
index c5ec33c..c1444c7 100644
--- a/src/views/hotwork/hotwork/components/list.vue
+++ b/src/views/hotwork/hotwork/components/list.vue
@@ -350,7 +350,7 @@ export default {
})
this.listLoading = false
this.varList = []
- this.listQuery.page = 1
+ // this.listQuery.page = 1
this.getList()
}).catch((e) => {
this.listLoading = false
@@ -379,7 +379,7 @@ export default {
})
this.listLoading = false
this.varList = []
- this.listQuery.page = 1
+ // this.listQuery.page = 1
this.getList()
}).catch((e) => {
this.listLoading = false
diff --git a/src/views/keyprojects/outsourced/components/edit.vue b/src/views/keyprojects/outsourced/components/edit.vue
index bb39f05..7d1fbc6 100644
--- a/src/views/keyprojects/outsourced/components/edit.vue
+++ b/src/views/keyprojects/outsourced/components/edit.vue
@@ -27,20 +27,23 @@
-
{
})
},
+ pullSelectedSuperviseNodes(selectedItems) {
+ if (selectedItems.nodes && selectedItems.nodes.length > 0) {
+ for (let i = 0; i < selectedItems.nodes.length; i++) {
+ if (!this.form.DEPARTMENT_ID.includes(selectedItems.nodes[i].id)) {
+ this.form.DEPARTMENT_ID.push(selectedItems.nodes[i].id)
+ }
+ this.pullSelectedSuperviseNodes(selectedItems.nodes[i])
+ }
+ }
+ console.log('this.form.DEPARTMENT_ID====' + this.form.DEPARTMENT_ID)
+ },
+ handleSuperviseSelect(selectedItems) {
+ // 选择父节点时同时勾选全部子节点
+ if (!this.form.DEPARTMENT_ID.includes(selectedItems.id)) {
+ this.form.DEPARTMENT_ID.push(selectedItems.id)
+ }
+ this.pullSelectedSuperviseNodes(selectedItems)
+ this.onClickSupervise()
+ console.log('this.form.DEPARTMENT_ID==2==' + this.form.DEPARTMENT_ID)
+ },
+
+ // 将选中项的子节点全部移除
+ removeSuperviseSelectedNodes(selectedItems) {
+ if (selectedItems.nodes && selectedItems.nodes.length > 0) {
+ for (let i = 0; i < selectedItems.nodes.length; i++) {
+ if (this.form.DEPARTMENT_ID.includes(selectedItems.nodes[i].id)) {
+ this.form.DEPARTMENT_ID.splice(this.form.DEPARTMENT_ID.indexOf(selectedItems.nodes[i].id), 1)
+ }
+ this.removeSuperviseSelectedNodes(selectedItems.nodes[i])
+ }
+ }
+ },
+ // 移除选中项时触发的事件
+ handleSuperviseRemove(selectedItems) {
+ // 移除选中项时同时移除全部子节点
+ if (this.form.DEPARTMENT_ID.includes(selectedItems.id)) {
+ this.form.DEPARTMENT_ID.splice(this.form.DEPARTMENT_ID.indexOf(selectedItems.id), 1)
+ }
+ this.removeSuperviseSelectedNodes(selectedItems)
+ this.onClickSupervise()
+ },
+
// 将树节点的子节点全部添加到数组中
pullSelectedNodes(selectedItems) {
+ console.log(selectedItems)
if (selectedItems.nodes && selectedItems.nodes.length > 0) {
for (let i = 0; i < selectedItems.nodes.length; i++) {
if (!this.form.INVOLVING_CORPS_DEPART_ID.includes(selectedItems.nodes[i].id)) {
@@ -1215,6 +1262,7 @@ export default {
this.pullSelectedNodes(selectedItems.nodes[i])
}
}
+ console.info('this.form.INVOLVING_CORPS_DEPART_ID========' + this.form.INVOLVING_CORPS_DEPART_ID)
},
// 选择项时触发的事件
handleSelect(selectedItems) {
@@ -1250,6 +1298,12 @@ export default {
this.$nextTick(() => {
this.updateValue = true
})
+ },
+ onClickSupervise() {
+ this.updateSuperviseValue = false
+ this.$nextTick(() => {
+ this.updateSuperviseValue = true
+ })
}
}
}
diff --git a/src/views/safetyenvironmental/archive/components/info.vue b/src/views/safetyenvironmental/archive/components/info.vue
index cdc7b26..c0c30af 100644
--- a/src/views/safetyenvironmental/archive/components/info.vue
+++ b/src/views/safetyenvironmental/archive/components/info.vue
@@ -243,7 +243,7 @@ export default {
getData() {
return new Promise((resolve) => {
requestFN(
- '/safetyenvironmental/goShow',
+ '/safetyenvironmental/V2/goShow',
{
INSPECTION_ID: this.$parent.INSPECTION_ID
}
diff --git a/src/views/safetyenvironmental/inspection/components/info.vue b/src/views/safetyenvironmental/inspection/components/info.vue
index 2414b31..a0d65fd 100644
--- a/src/views/safetyenvironmental/inspection/components/info.vue
+++ b/src/views/safetyenvironmental/inspection/components/info.vue
@@ -306,7 +306,7 @@ export default {
getData() {
return new Promise((resolve) => {
requestFN(
- '/safetyenvironmental/goShow',
+ '/safetyenvironmental/V2/goShow',
{
INSPECTION_ID: this.$parent.INSPECTION_ID
}
diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue
index 7d38400..3077154 100644
--- a/src/views/safetyenvironmental/inspection/components/list.vue
+++ b/src/views/safetyenvironmental/inspection/components/list.vue
@@ -357,7 +357,7 @@ export default {
getList() {
this.listLoading = true
requestFN(
- '/safetyenvironmental/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
+ '/safetyenvironmental/V2/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
{
...this.search,
INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],