|
|
@@ -282,7 +282,7 @@
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label="商品类别" prop="tPackages">
|
|
|
- <el-select v-model="form.tPackages" :disabled="notChange" placeholder="请选择商品类别">
|
|
|
+ <el-select v-model="form.tPackages" :disabled="notChange" placeholder="请选择商品类别" multiple>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in fTypeidOptions"
|
|
|
:key="index.dictValue"
|
|
|
@@ -421,6 +421,112 @@
|
|
|
</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"-->
|
|
|
+<!-- >-->
|
|
|
+<!-- <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 slot="footer" class="dialog-footer">
|
|
|
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
|
|
|
<approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
|
|
|
@@ -462,6 +568,7 @@ import ApprovalComments from '@/views/startApproval'
|
|
|
import Global from '@/layout/components/global'
|
|
|
import Vue from 'vue'
|
|
|
// import { listUser, queryUserVal } from '@/api/system/user'
|
|
|
+import { getToken } from "@/utils/auth";
|
|
|
Vue.directive('dialogDrag', {
|
|
|
bind(el, binding, vnode, oldVnode) {
|
|
|
const dialogHeaderEl = el.querySelector('.el-dialog__header')
|
|
|
@@ -621,7 +728,13 @@ export default {
|
|
|
fEnddate:[
|
|
|
{ required: true, message: ' ', trigger: 'blur' }
|
|
|
]
|
|
|
- }
|
|
|
+ },
|
|
|
+ // 附件上传数组
|
|
|
+ relevantAttachments: [],
|
|
|
+ headers: {
|
|
|
+ Authorization: "Bearer " + getToken(),
|
|
|
+ },
|
|
|
+ uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -768,6 +881,12 @@ export default {
|
|
|
// this.$set(this,'fMblnoOptions',response.data.corps)
|
|
|
this.deptName = response.data.dept.deptName
|
|
|
this.form = response.data.tWarehouseAgreement
|
|
|
+ if (response.data.tWarehouseAgreement.tPackages) {
|
|
|
+ this.form.tPackages = this.form.tPackages
|
|
|
+ .replace(/\[|]/g, "")
|
|
|
+ .replace(/\"/g, "")
|
|
|
+ .split(",");
|
|
|
+ }
|
|
|
this.operator = this.form.createBy
|
|
|
this.agreementitemsList = response.data.tWarehouseAgreementitems
|
|
|
for (let item in this.agreementitemsList) {
|
|
|
@@ -1077,6 +1196,12 @@ export default {
|
|
|
this.form = response.data.tWarehouseAgreement
|
|
|
this.form.fId = null
|
|
|
this.form.fBillstatus = ''
|
|
|
+ if (response.data.tWarehouseAgreement.tPackages) {
|
|
|
+ this.form.tPackages = this.form.tPackages
|
|
|
+ .replace(/\[|]/g, "")
|
|
|
+ .replace(/\"/g, "")
|
|
|
+ .split(",");
|
|
|
+ }
|
|
|
// this.fMblnoOptions = response.data.corps
|
|
|
this.agreementitemsList = response.data.tWarehouseAgreementitems
|
|
|
for (let item in this.agreementitemsList) {
|
|
|
@@ -1095,6 +1220,12 @@ export default {
|
|
|
getAgreement(fId).then(response => {
|
|
|
this.deptName = response.data.dept.deptName
|
|
|
this.form = response.data.tWarehouseAgreement
|
|
|
+ if (response.data.tWarehouseAgreement.tPackages) {
|
|
|
+ this.form.tPackages = this.form.tPackages
|
|
|
+ .replace(/\[|]/g, "")
|
|
|
+ .replace(/\"/g, "")
|
|
|
+ .split(",");
|
|
|
+ }
|
|
|
// this.fMblnoOptions = response.data.corps
|
|
|
this.agreementitemsList = response.data.tWarehouseAgreementitems
|
|
|
for (let item in this.agreementitemsList) {
|
|
|
@@ -1117,11 +1248,11 @@ export default {
|
|
|
if (name == null || name === '') {
|
|
|
return false
|
|
|
}
|
|
|
- // let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 }
|
|
|
- // listCorps(queryParams).then((response) => {
|
|
|
- // this.fMblnoOptions = response.rows
|
|
|
- // this.KHblnoOptions = response.rows
|
|
|
- // })
|
|
|
+ let queryParams = { pageNum: 1, fName: name, type: 1 }
|
|
|
+ listCorps(queryParams).then((response) => {
|
|
|
+ this.fMblnoOptions = response.rows
|
|
|
+ this.KHblnoOptions = response.rows
|
|
|
+ })
|
|
|
},
|
|
|
debounce(fn, delay) {
|
|
|
let timerId = null;
|
|
|
@@ -1181,7 +1312,38 @@ export default {
|
|
|
},
|
|
|
deleteRow(index, rows) {
|
|
|
rows.splice(index, 1)
|
|
|
- }
|
|
|
+ },
|
|
|
+ // 新增附件明细数据
|
|
|
+ addRelevt() {
|
|
|
+ console.log(123)
|
|
|
+ this.relevantAttachments.push({
|
|
|
+ fUrl: null,
|
|
|
+ fName: null,
|
|
|
+ createBy: this.createBy,
|
|
|
+ createTime: Date.parse(new Date()),
|
|
|
+ });
|
|
|
+ console.log(this.relevantAttachments)
|
|
|
+ },
|
|
|
+ //附件上传
|
|
|
+ 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("上传成功");
|
|
|
+ // }
|
|
|
+ },
|
|
|
+ //附件查看
|
|
|
+ checkFile(scope) {
|
|
|
+ if (this.relevantAttachments[scope.$index].fUrl) {
|
|
|
+ window.open(this.relevantAttachments[scope.$index].fUrl);
|
|
|
+ } else {
|
|
|
+ this.$message.error("请上传附件");
|
|
|
+ }
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|
caojunjie