Merge remote-tracking branch 'origin/fix_foton' into fix_foton

This commit is contained in:
CD
2023-01-11 17:34:52 +08:00
77 changed files with 102 additions and 90 deletions
@@ -321,7 +321,7 @@ export default {
this.imageUrl = URL.createObjectURL(file.raw)
this.sarStandardsInfoEO.icon = res.data.attId
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -551,7 +551,7 @@ export default {
this.spinShow = false
this.importModalshowflag = false
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
+1 -1
View File
@@ -575,7 +575,7 @@ export default {
this.fileListData.files = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -516,7 +516,7 @@
})
this.form.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -536,7 +536,7 @@
})
this.form.fjNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -311,7 +311,7 @@ export default {
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -501,7 +501,7 @@ export default {
})
this.form.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -523,7 +523,7 @@ export default {
})
this.form.fjNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -373,7 +373,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -368,7 +368,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -367,7 +367,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -368,7 +368,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -415,7 +415,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -667,7 +667,7 @@ export default {
}
this.rh_pageData.infoSources = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -578,7 +578,7 @@ export default {
}
this.rh_pageData.fillFile = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -583,7 +583,7 @@ export default {
this.fileListData.fillFile = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -423,7 +423,7 @@ export default {
this.fileListData.material = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -511,7 +511,7 @@ export default {
}
this.themeDataList.meetingFile = this.newThemeFile
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -588,7 +588,7 @@ export default {
}
this.hh_pageData.otherFileList = this.newOtherFile
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -600,7 +600,7 @@ export default {
}
this.ch_pageData.fileTextList = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -1296,7 +1296,7 @@ export default {
this.listForm.model = response.data.id;
this.listForm.modelName = response.data.name;
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: "success"
});
@@ -1232,7 +1232,7 @@ export default {
this.listForm.model = response.data.id;
this.listForm.modelName = response.data.name;
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: "success"
});
@@ -3262,7 +3262,7 @@
;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2410,7 +2410,7 @@ export default {
}
// console.log("caNmae",this.form.caName);
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -572,7 +572,7 @@ export default {
})
this.form.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -597,7 +597,7 @@ export default {
})
this.form.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2747,7 +2747,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2756,7 +2756,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2726,7 +2726,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1927,7 +1927,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1927,7 +1927,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1927,7 +1927,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2160,7 +2160,7 @@
}
this.formKey++
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2043,7 +2043,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1951,7 +1951,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2212,7 +2212,7 @@
// }
this.formKey++
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1926,7 +1926,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2370,7 +2370,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2264,7 +2264,7 @@
}
this.formKey++
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2005,7 +2005,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1927,7 +1927,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1927,7 +1927,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2167,7 +2167,7 @@
}
this.formKey++
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2275,7 +2275,7 @@
}
this.formKey++
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1869,7 +1869,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2755,7 +2755,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2771,7 +2771,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2152,7 +2152,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1963,7 +1963,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -83,7 +83,12 @@
<el-input :disabled="disabledXX" v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"
@click.native="choiceLeader"></el-input>
</el-form-item>
<el-form-item label="计划标准初稿完成时间" style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
<el-form-item style="width: 100%; margin-right:10px" prop="draftTime" class="add-form-item form-item-disabled">
<template v-slot:label>
<el-tooltip content="计划标准初稿完成时间" placement="top">
<span>计划标准初稿完成时间</span>
</el-tooltip>
</template>
<el-date-picker :disabled="disabledXX"
v-model="qbfsForm.draftTime"
value-format="yyyy-MM-dd"
@@ -91,7 +96,12 @@
placeholder="请选择计划标准初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="计划标准发布时间" style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled">
<el-form-item style="width: 100%; margin-right:10px" prop="releaseTime" class="add-form-item form-item-disabled">
<template slot="label">
<el-tooltip content="计划标准发布时间" placement="top">
<span>计划标准发布时间</span>
</el-tooltip>
</template>
<el-date-picker :disabled="disabledXX"
v-model="qbfsForm.releaseTime"
value-format="yyyy-MM-dd"
@@ -140,9 +140,11 @@
</el-form-item>
<el-form-item label="引用标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
type="textarea"
autosize
resize="none"
disabled
v-model="qbfsForm.esMatingRelations"
placeholder="请输入引用标准"
:maxlength="500"/>
</el-form-item>
<!-- <el-form-item v-if="type === '5'" label="立项原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">-->
@@ -331,7 +331,7 @@ export default {
}
this.fileListData.fileText = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -639,7 +639,7 @@
})
this.rhform.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -675,7 +675,7 @@
})
this.data2[this.fileIndex].dataName = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -594,7 +594,7 @@
})
this.rhform.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -630,7 +630,7 @@
})
this.data2[this.fileIndex].dataName = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -476,7 +476,7 @@
})
this.hhform.modelNameList2 = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -617,7 +617,7 @@
})
this.rhform.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -653,7 +653,7 @@
})
this.data2[this.fileIndex].dataName = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -573,7 +573,7 @@
})
this.rhform.modelNameList = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -609,7 +609,7 @@
})
this.data2[this.fileIndex].dataName = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2015,7 +2015,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2146,7 +2146,7 @@
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -275,7 +275,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -234,7 +234,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -233,7 +233,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -260,7 +260,7 @@
this.form.hzfileId = response.data.id
this.form.hzfileName = response.data.name
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1612,7 +1612,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1612,7 +1612,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1610,7 +1610,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1688,7 +1688,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1612,7 +1612,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1611,7 +1611,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1610,7 +1610,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1956,7 +1956,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1649,7 +1649,7 @@ export default {
default : ;
}
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -489,7 +489,7 @@ export default {
}
this.annexList = this.newDataList
this.$message({
showClose: true,
// showClose: true,
message: res.message,
type: 'success'
})
@@ -4411,7 +4411,7 @@ export default {
handleAddFormatError(file) {
// this.$message.error('' + file.name + 'pdfdocdocxpptpptx')
this.$message({
showClose: true,
// showClose: true,
message: '文件' + file.name + '格式不正确,请上传pdf、doc、docx、ppt、pptx文件',
type: 'error'
})
@@ -4419,7 +4419,7 @@ export default {
//
handleSizeError(file) {
this.$message({
showClose: true,
// showClose: true,
message: '文件' + file.name + '大小不超过200M',
type: 'error'
})
@@ -5273,7 +5273,7 @@ export default {
this.showUploadlist = true
this.importModalshowflag = false
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -3685,7 +3685,7 @@ export default {
this.spinShow = false
this.importModalshowflag = false
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1051,7 +1051,7 @@ export default {
this.importModalshowflag = false
this.tableData()
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -2815,7 +2815,7 @@
this.spinShow = false
this.importModalshowflag = false
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -3708,7 +3708,7 @@ export default {
handleAddFormatError(file) {
// this.$message.error('' + file.name + 'pdfdocdocxpptpptx')
this.$message({
showClose: true,
// showClose: true,
message: '文件' + file.name + '格式不正确,请上传pdf、doc、docx、ppt、pptx文件',
type: 'error'
})
@@ -3716,7 +3716,7 @@ export default {
//
handleSizeError(file) {
this.$message({
showClose: true,
// showClose: true,
message: '文件' + file.name + '大小不超过200M',
type: 'error'
})
@@ -4669,7 +4669,7 @@ export default {
this.showUploadlist = true
this.importModalshowflag = false
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1516,7 +1516,7 @@ export default {
this.spinShow = false
this.importModalshowflag = false
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1133,7 +1133,7 @@
})
data[this.fileIndex].joinfileName = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})
@@ -1002,7 +1002,7 @@
})
data[this.fileIndex].joinfileName = list
this.$message({
showClose: true,
// showClose: true,
message: response.message,
type: 'success'
})