|
@@ -561,110 +561,98 @@
|
|
|
<!-- </el-table-column>-->
|
|
|
<!-- </el-table>-->
|
|
|
|
|
|
-<!-- <div class="dialogTableTitle flex a-center jlr">-->
|
|
|
-<!-- <h2>附件明细</h2>-->
|
|
|
-<!-- <el-button @click="addRelevt()" :disabled="notChange">新增</el-button>-->
|
|
|
-<!-- </div>-->
|
|
|
-<!-- <el-table-->
|
|
|
-<!-- :data="relevantAttachments"-->
|
|
|
-<!-- >-->
|
|
|
-<!-- <el-table-column label="序号" type="index" width="80"> </el-table-column>-->
|
|
|
-<!-- <el-table-column-->
|
|
|
-<!-- prop="fName"-->
|
|
|
-<!-- header-align="center"-->
|
|
|
-<!-- align="center"-->
|
|
|
-<!-- label="附件名称"-->
|
|
|
-<!-- >-->
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
-<!-- <el-input-->
|
|
|
-<!-- v-model="scope.row.fName"-->
|
|
|
-<!-- :disabled="browseStatus"-->
|
|
|
-<!-- placeholder="附件名称"-->
|
|
|
-<!-- show-word-limit-->
|
|
|
-<!-- />-->
|
|
|
-<!-- </template>-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
-<!-- <el-table-column-->
|
|
|
-<!-- prop="createBy"-->
|
|
|
-<!-- header-align="center"-->
|
|
|
-<!-- align="center"-->
|
|
|
-<!-- label="上传人"-->
|
|
|
-<!-- >-->
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
-<!-- <el-input-->
|
|
|
-<!-- v-model="scope.row.createBy"-->
|
|
|
-<!-- disabled-->
|
|
|
-<!-- placeholder="上传人"-->
|
|
|
-<!-- show-word-limit-->
|
|
|
-<!-- />-->
|
|
|
-<!-- </template>-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
-<!-- <el-table-column-->
|
|
|
-<!-- prop="createTime"-->
|
|
|
-<!-- header-align="center"-->
|
|
|
-<!-- align="center"-->
|
|
|
-<!-- label="上传时间"-->
|
|
|
-<!-- >-->
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
-<!-- <el-date-picker-->
|
|
|
-<!-- v-model="scope.row.createTime"-->
|
|
|
-<!-- type="date"-->
|
|
|
-<!-- disabled-->
|
|
|
-<!-- placeholder="上传时间"-->
|
|
|
-<!-- format="yyyy-MM-dd HH:mm"-->
|
|
|
-<!-- value-format="timestamp"-->
|
|
|
-<!-- ></el-date-picker>-->
|
|
|
-<!-- </template>-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
-<!-- <el-table-column-->
|
|
|
-<!-- prop="fUrl"-->
|
|
|
-<!-- header-align="center"-->
|
|
|
-<!-- align="center"-->
|
|
|
-<!-- label="上传附件"-->
|
|
|
-<!-- >-->
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
-<!-- <div style="display: flex; justify-content: center">-->
|
|
|
-<!-- <el-upload-->
|
|
|
-<!-- :multiple="true"-->
|
|
|
-<!-- class="upload-demo"-->
|
|
|
-<!-- :action="uploadImgUrl"-->
|
|
|
-<!-- :on-success="-->
|
|
|
-<!-- (res, file) => {-->
|
|
|
-<!-- handleSucces(scope, res, file);-->
|
|
|
-<!-- }-->
|
|
|
-<!-- "-->
|
|
|
-<!-- :headers="headers"-->
|
|
|
-<!-- :disabled="browseStatus"-->
|
|
|
-<!-- :show-file-list="false"-->
|
|
|
-<!-- >-->
|
|
|
-<!-- <el-button size="small" type="text" :disabled="browseStatus"-->
|
|
|
-<!-- >点击上传</el-button-->
|
|
|
-<!-- >-->
|
|
|
-<!-- </el-upload>-->
|
|
|
-<!-- <el-button size="small" type="text" @click="checkFile(scope)"-->
|
|
|
-<!-- >查看</el-button-->
|
|
|
-<!-- >-->
|
|
|
-<!-- </div>-->
|
|
|
-<!-- </template>-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
-<!-- <el-table-column-->
|
|
|
-<!-- header-align="center"-->
|
|
|
-<!-- align="center"-->
|
|
|
-<!-- label="操作"-->
|
|
|
-<!-- width="130PX"-->
|
|
|
-<!-- fixed="right"-->
|
|
|
-<!-- >-->
|
|
|
-<!-- <template slot-scope="scope">-->
|
|
|
-<!-- <el-button-->
|
|
|
-<!-- @click.native.prevent="deleteRow(scope.$index, relevantAttachments)"-->
|
|
|
-<!-- :disabled="browseStatus"-->
|
|
|
-<!-- size="small"-->
|
|
|
-<!-- type="text"-->
|
|
|
-<!-- >删除-->
|
|
|
-<!-- </el-button>-->
|
|
|
-<!-- </template>-->
|
|
|
-<!-- </el-table-column>-->
|
|
|
-<!-- </el-table>-->
|
|
|
+<!-- 附件明细-->
|
|
|
+ <div class="dialogTableTitle flex a-center jlr">
|
|
|
+ <h2>附件明细</h2>
|
|
|
+ <el-button @click="addRelevt" :disabled="notChange">新增</el-button>
|
|
|
+ </div>
|
|
|
+ <el-table
|
|
|
+ :data="relevantAttachments"
|
|
|
+ ref="table"
|
|
|
+ tooltip-effect="dark"
|
|
|
+ stripe
|
|
|
+ style="width: 100%"
|
|
|
+ >
|
|
|
+ <el-table-column label="序号" type="index" width="80"></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fName"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ label="附件名称"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fName"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ placeholder="附件名称"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fDesc"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ label="附件描述"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fDesc"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ placeholder="附件描述"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="fUrl"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ label="上传附件"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div style="display: flex; justify-content: center">
|
|
|
+ <el-upload
|
|
|
+ class="upload-demo"
|
|
|
+ :action="uploadImgUrl"
|
|
|
+ :on-success="
|
|
|
+ (res, file) => {
|
|
|
+ handleSucces(scope, res, file);
|
|
|
+ }
|
|
|
+ "
|
|
|
+ :headers="headers"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ :show-file-list="false"
|
|
|
+ :limit="1"
|
|
|
+ >
|
|
|
+ <el-button size="small" type="text" :disabled="browseStatus"
|
|
|
+ >点击上传</el-button
|
|
|
+ >
|
|
|
+ </el-upload>
|
|
|
+ <el-button size="small" type="text" @click="checkFile(scope)"
|
|
|
+ >查看</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ label="操作"
|
|
|
+ width="130PX"
|
|
|
+ fixed="right"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button
|
|
|
+ @click.native.prevent="deleteUploadRow(scope.$index, relevantAttachments)"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ size="small"
|
|
|
+ type="text"
|
|
|
+ >删除
|
|
|
+ </el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
|
|
@@ -1035,6 +1023,7 @@ export default {
|
|
|
// this.$set(this,'fMblnoOptions',response.data.corps)
|
|
|
this.deptName = response.data.dept.deptName
|
|
|
this.form = response.data.tWarehouseAgreement
|
|
|
+ this.relevantAttachments = response.data.attachList
|
|
|
if (response.data.tWarehouseAgreement.tPackages) {
|
|
|
// this.form.tPackages = this.form.tPackages
|
|
|
// .replace(/\[|]/g, "")
|
|
@@ -1416,6 +1405,7 @@ export default {
|
|
|
}
|
|
|
// this.fMblnoOptions = response.data.corps
|
|
|
this.agreementitemsList = response.data.tWarehouseAgreementitems
|
|
|
+ this.relevantAttachments = response.data.attachList
|
|
|
for (let item in this.agreementitemsList) {
|
|
|
this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
|
|
|
// this.fWRemoteMethod(this.agreementitemsList[item].fFeeid)
|
|
@@ -1463,6 +1453,7 @@ export default {
|
|
|
let formData = new window.FormData()
|
|
|
formData.append('agreement', JSON.stringify(this.form))
|
|
|
formData.append('agreementitems', JSON.stringify(this.agreementitemsList))
|
|
|
+ formData.append('attachments', JSON.stringify(this.relevantAttachments))
|
|
|
addAgreement(formData).then(response => {
|
|
|
this.msgSuccess('操作成功')
|
|
|
this.$set(this.form, 'fId', response.data.tWarehouseAgreement.fId)
|
|
@@ -1503,7 +1494,6 @@ export default {
|
|
|
},
|
|
|
// 新增附件明细数据
|
|
|
addRelevt() {
|
|
|
- console.log(123)
|
|
|
this.relevantAttachments.push({
|
|
|
fUrl: null,
|
|
|
fName: null,
|
|
@@ -1514,24 +1504,26 @@ export default {
|
|
|
},
|
|
|
//附件上传
|
|
|
handleSucces(scope, res, file) {
|
|
|
- console.log(scope)
|
|
|
- console.log(res)
|
|
|
this.relevantAttachments[scope.$index].fName = res.fileName;
|
|
|
this.relevantAttachments[scope.$index].fUrl = res.url;
|
|
|
- // if (!this.relevantAttachments[scope.$index].fUrl) {
|
|
|
- // this.$message.error("上传失败");
|
|
|
- // } else {
|
|
|
- // this.$message.success("上传成功");
|
|
|
- // }
|
|
|
+ if (!this.relevantAttachments[scope.$index].fUrl) {
|
|
|
+ this.$message.error("上传失败");
|
|
|
+ } else {
|
|
|
+ this.$message.success("上传成功");
|
|
|
+ }
|
|
|
},
|
|
|
//附件查看
|
|
|
checkFile(scope) {
|
|
|
if (this.relevantAttachments[scope.$index].fUrl) {
|
|
|
+ console.log(this.relevantAttachments[scope.$index].fUrl)
|
|
|
window.open(this.relevantAttachments[scope.$index].fUrl);
|
|
|
} else {
|
|
|
this.$message.error("请上传附件");
|
|
|
}
|
|
|
},
|
|
|
+ deleteUploadRow(index, rows) {
|
|
|
+ rows.splice(index, 1);
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|