purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给商品增加图片上传功能，单据增加附件，优化付款收款单

Browse Source
This commit is contained in:
季圣华
2021-07-02 00:52:30 +08:00
parent 9af01678a7
commit ae00d062b2
31 changed files with 566 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-web/src/api/manage.js
View File

@@ -171,7 +171,7 @@ export function getFileAccessHttpUrl(avatar,subStr) {
return avatar; return avatar;
}else{ }else{
if(avatar &&　avatar.length>0 && avatar.indexOf('[')==-1){ if(avatar &&　avatar.length>0 && avatar.indexOf('[')==-1){
return window._CONFIG['staticDomainURL'] + "/" + avatar; return window._CONFIG['domianURL'] + "/" + avatar;
} }
} }
} }

401
jshERP-web/src/components/jeecg/JImageUpload.vue
View File

@@ -1,201 +1,202 @@
<template> <template>
<a-upload <a-upload
name="file" name="file"
listType="picture-card" listType="picture-card"
:multiple="isMultiple" :multiple="isMultiple"
:action="uploadAction" :action="uploadAction"
:headers="headers" :headers="headers"
:data="{biz:bizPath}" :data="{biz:bizPath}"
:fileList="fileList" :fileList="fileList"
:beforeUpload="beforeUpload" :beforeUpload="beforeUpload"
:disabled="disabled" :disabled="disabled"
:isMultiple="isMultiple" :isMultiple="isMultiple"
:showUploadList="isMultiple" :showUploadList="isMultiple"
@change="handleChange" @change="handleChange"
@preview="handlePreview"> @preview="handlePreview">
<img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="height:104px;max-width:300px"/> <img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="height:104px;max-width:300px"/>
<div v-else > <div v-else >
<a-icon :type="uploadLoading ? 'loading' : 'plus'" /> <a-icon :type="uploadLoading ? 'loading' : 'plus'" />
<div class="ant-upload-text">{{ text }}</div> <div class="ant-upload-text">{{ text }}</div>
</div> </div>
<a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel()"> <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel()">
<img alt="example" style="width: 100%" :src="previewImage"/> <img alt="example" style="width: 100%" :src="previewImage"/>
</a-modal> </a-modal>
</a-upload> </a-upload>
</template> </template>
<script> <script>
import Vue from 'vue' import Vue from 'vue'
import { ACCESS_TOKEN } from "@/store/mutation-types" import { ACCESS_TOKEN } from "@/store/mutation-types"
import { getFileAccessHttpUrl } from '@/api/manage' import { getFileAccessHttpUrl } from '@/api/manage'
const uidGenerator=()=>{ const uidGenerator=()=>{
return '-'+parseInt(Math.random()*10000+1,10); return '-'+parseInt(Math.random()*10000+1,10);
} }
const getFileName=(path)=>{ const getFileName=(path)=>{
if(path.lastIndexOf("\\")>=0){ if(path.lastIndexOf("\\")>=0){
let reg=new RegExp("\\\\","g"); let reg=new RegExp("\\\\","g");
path = path.replace(reg,"/"); path = path.replace(reg,"/");
} }
return path.substring(path.lastIndexOf("/")+1); return path.substring(path.lastIndexOf("/")+1);
} }
export default { export default {
name: 'JImageUpload', name: 'JImageUpload',
data(){ data(){
return { return {
uploadAction:window._CONFIG['domianURL']+"/sys/common/upload", uploadAction:window._CONFIG['domianURL']+"/systemConfig/upload",
uploadLoading:false, uploadLoading:false,
picUrl:false, picUrl:false,
headers:{}, headers:{},
fileList: [], fileList: [],
previewImage:"", previewImage:"",
previewVisible: false, previewVisible: false,
} }
}, },
props:{ props:{
text:{ text:{
type:String, type:String,
required:false, required:false,
default:"上传" default:"上传"
}, },
/*这个属性用于控制文件上传的业务路径*/ /*这个属性用于控制文件上传的业务路径*/
bizPath:{ bizPath:{
type:String, type:String,
required:false, required:false,
default:"temp" default:"temp"
}, },
value:{ value:{
type:[String,Array], type:[String,Array],
required:false required:false
}, },
disabled:{ disabled:{
type:Boolean, type:Boolean,
required:false, required:false,
default: false default: false
}, },
isMultiple:{ isMultiple:{
type:Boolean, type:Boolean,
required:false, required:false,
default: false default: false
} }
}, },
watch:{ watch:{
value(val){ value(val){
if (val instanceof Array) { if (val instanceof Array) {
this.initFileList(val.join(',')) this.initFileList(val.join(','))
} else { } else {
this.initFileList(val) this.initFileList(val)
} }
} }
}, },
created(){ created(){
const token = Vue.ls.get(ACCESS_TOKEN); const token = Vue.ls.get(ACCESS_TOKEN);
this.headers = {"X-Access-Token":token} this.headers = {"X-Access-Token":token}
}, },
methods:{ methods:{
initFileList(paths){ initFileList(paths){
if(!paths || paths.length==0){ if(!paths || paths.length==0){
this.fileList = []; this.fileList = [];
return; this.picUrl = false;
} return;
this.picUrl = true; }
let fileList = []; this.picUrl = true;
let arr = paths.split(",") let fileList = [];
for(var a=0;a<arr.length;a++){ let arr = paths.split(",")
let url = getFileAccessHttpUrl(arr[a]); for(var a=0;a<arr.length;a++){
fileList.push({ let url = getFileAccessHttpUrl('systemConfig/static/' + arr[a]);
uid: uidGenerator(), fileList.push({
name: getFileName(arr[a]), uid: uidGenerator(),
status: 'done', name: getFileName(arr[a]),
url: url, status: 'done',
response:{ url: url,
status:"history", response:{
message:arr[a] code:"history",
} data:arr[a]
}) }
} })
this.fileList = fileList }
}, this.fileList = fileList
beforeUpload: function(file){ },
var fileType = file.type; beforeUpload: function(file){
if(fileType.indexOf('image')<0){ var fileType = file.type;
this.$message.warning('请上传图片'); if(fileType.indexOf('image')<0){
return false; this.$message.warning('请上传图片');
} return false;
}, }
handleChange(info) { },
this.picUrl = false; handleChange(info) {
let fileList = info.fileList this.picUrl = false;
if(info.file.status==='done'){ let fileList = info.fileList
if(info.file.response.success){ if(info.file.status==='done'){
this.picUrl = true; if(info.file.response.code === 200){
fileList = fileList.map((file) => { this.picUrl = true;
if (file.response) { fileList = fileList.map((file) => {
file.url = file.response.message; if (file.response) {
} file.url = file.response.data;
return file; }
}); return file;
} });
//this.$message.success(`${info.file.name} 上传成功!`); }
}else if (info.file.status === 'error') { //this.$message.success(`${info.file.name} 上传成功!`);
this.$message.error(`${info.file.name} 上传失败.`); }else if (info.file.status === 'error') {
}else if(info.file.status === 'removed'){ this.$message.error(`${info.file.name} 上传失败.`);
this.handleDelete(info.file) }else if(info.file.status === 'removed'){
} this.handleDelete(info.file)
this.fileList = fileList }
if(info.file.status==='done' || info.file.status === 'removed'){ this.fileList = fileList
this.handlePathChange() if(info.file.status==='done' || info.file.status === 'removed'){
} this.handlePathChange()
}, }
// 预览 },
handlePreview (file) { // 预览
this.previewImage = file.url || file.thumbUrl handlePreview (file) {
this.previewVisible = true this.previewImage = file.url || file.thumbUrl
}, this.previewVisible = true
getAvatarView(){ },
if(this.fileList.length>0){ getAvatarView(){
let url = this.fileList[0].url if(this.fileList.length>0){
return getFileAccessHttpUrl(url) let url = this.fileList[0].url
} return url
}, }
handlePathChange(){ },
let uploadFiles = this.fileList handlePathChange(){
let path = '' let uploadFiles = this.fileList
if(!uploadFiles || uploadFiles.length==0){ let path = ''
path = '' if(!uploadFiles || uploadFiles.length==0){
} path = ''
let arr = []; }
if(!this.isMultiple){ let arr = [];
arr.push(uploadFiles[uploadFiles.length-1].response.message) if(!this.isMultiple){
}else{ arr.push(uploadFiles[uploadFiles.length-1].response.data)
for(var a=0;a<uploadFiles.length;a++){ }else{
arr.push(uploadFiles[a].response.message) for(var a=0;a<uploadFiles.length;a++){
} arr.push(uploadFiles[a].response.data)
} }
if(arr.length>0){ }
path = arr.join(",") if(arr.length>0){
} path = arr.join(",")
this.$emit('change', path); }
}, this.$emit('change', path);
handleDelete(file){ },
//如有需要新增 删除逻辑 handleDelete(file){
console.log(file) //如有需要新增 删除逻辑
}, console.log(file)
handleCancel() { },
this.close(); handleCancel() {
this.previewVisible = false; this.close();
}, this.previewVisible = false;
close () { },
close () {
},
}, },
model: { },
prop: 'value', model: {
event: 'change' prop: 'value',
} event: 'change'
} }
</script> }
</script>
<style scoped>
<style scoped>
</style> </style>

1
jshERP-web/src/components/jeecg/JUpload.vue
View File

@@ -247,7 +247,6 @@
}, },
handleChange(info) { handleChange(info) {
console.log("--文件列表改变--") console.log("--文件列表改变--")
debugger
if(!info.file.status && this.uploadGoOn === false){ if(!info.file.status && this.uploadGoOn === false){
info.fileList.pop(); info.fileList.pop();
} }

29
jshERP-web/src/views/bill/dialog/BillDetail.vue
View File

@@ -795,6 +795,20 @@
</a-row> </a-row>
</section> </section>
</template> </template>
<template v-if="fileList.length>0">
<a-row class="form-row" :gutter="24">
<a-col :span="8">
<a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="附件">
<ul style="list-style-type:none">
<li v-for="(item,index) in fileList" :key="index">
<a :href="item.url" target="_blank">{{item.name}}</a>
</li>
</ul>
</a-form-item>
</a-col>
<a-col :span="16"></a-col>
</a-row>
</template>
</a-form> </a-form>
</j-modal> </j-modal>
</a-card> </a-card>
@@ -814,6 +828,7 @@
visible: false, visible: false,
model: {}, model: {},
billType: '', billType: '',
fileList: [],
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 5 }, sm: { span: 5 },
@@ -1036,6 +1051,20 @@
methods: { methods: {
show(record, type) { show(record, type) {
this.billType = type this.billType = type
//附件下载
let fileName = record.fileName
if(fileName) {
let fileArr = fileName.split(",")
this.fileList = []
for(let i=0; i<fileArr.length; i++) {
let fileInfo = {}
fileInfo.name= fileArr[i].replace("bill/","")
fileInfo.url= window._CONFIG['domianURL'] + '/systemConfig/static/' + fileArr[i]
this.fileList.push(fileInfo)
}
} else {
this.fileList = []
}
this.visible = true; this.visible = true;
this.model = Object.assign({}, record); this.model = Object.assign({}, record);
this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2) this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)

15
jshERP-web/src/views/bill/modules/AllocationOutModal.vue
View File

@@ -47,6 +47,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="bill"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -57,12 +64,14 @@
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
import { getMpListShort } from "@/utils/util" import { getMpListShort } from "@/utils/util"
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
name: "AllocationOutModal", name: "AllocationOutModal",
mixins: [JEditableTableMixin, BillModalMixin], mixins: [JEditableTableMixin, BillModalMixin],
components: { components: {
JUpload,
JDate JDate
}, },
data () { data () {
@@ -75,6 +84,7 @@
visible: false, visible: false,
operTimeStr: '', operTimeStr: '',
prefixNo: 'DBCK', prefixNo: 'DBCK',
fileList:[],
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -138,8 +148,10 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit(this.prefixNo) this.addInit(this.prefixNo)
this.fileList = []
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.fileList = this.model.fileName
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount')) 'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount'))
@@ -165,6 +177,9 @@
totalPrice += item.allPrice-0 totalPrice += item.allPrice-0
} }
billMain.totalPrice = totalPrice billMain.totalPrice = totalPrice
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

15
jshERP-web/src/views/bill/modules/AssembleModal.vue
View File

@@ -47,6 +47,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="bill"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -58,12 +65,14 @@
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import { getMpListShort } from "@/utils/util" import { getMpListShort } from "@/utils/util"
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
name: "AssembleModal", name: "AssembleModal",
mixins: [JEditableTableMixin, BillModalMixin], mixins: [JEditableTableMixin, BillModalMixin],
components: { components: {
JUpload,
JDate JDate
}, },
data () { data () {
@@ -76,6 +85,7 @@
visible: false, visible: false,
operTimeStr: '', operTimeStr: '',
prefixNo: 'ZZD', prefixNo: 'ZZD',
fileList:[],
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -139,9 +149,11 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit(this.prefixNo) this.addInit(this.prefixNo)
this.fileList = []
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.model.debt = (this.model.discountLastMoney - this.model.changeAmount).toFixed(2) this.model.debt = (this.model.discountLastMoney - this.model.changeAmount).toFixed(2)
this.fileList = this.model.fileName
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt')) 'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt'))
@@ -167,6 +179,9 @@
totalPrice += item.allPrice-0 totalPrice += item.allPrice-0
} }
billMain.totalPrice = totalPrice billMain.totalPrice = totalPrice
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

15
jshERP-web/src/views/bill/modules/DisassembleModal.vue
View File

@@ -47,6 +47,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="bill"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -58,12 +65,14 @@
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import { getMpListShort } from "@/utils/util" import { getMpListShort } from "@/utils/util"
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
name: "DisassembleModal", name: "DisassembleModal",
mixins: [JEditableTableMixin, BillModalMixin], mixins: [JEditableTableMixin, BillModalMixin],
components: { components: {
JUpload,
JDate JDate
}, },
data () { data () {
@@ -76,6 +85,7 @@
visible: false, visible: false,
operTimeStr: '', operTimeStr: '',
prefixNo: 'CXD', prefixNo: 'CXD',
fileList:[],
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -139,8 +149,10 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit(this.prefixNo) this.addInit(this.prefixNo)
this.fileList = []
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.fileList = this.model.fileName
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount')) 'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount'))
@@ -166,6 +178,9 @@
totalPrice += item.allPrice-0 totalPrice += item.allPrice-0
} }
billMain.totalPrice = totalPrice billMain.totalPrice = totalPrice
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

15
jshERP-web/src/views/bill/modules/OtherInModal.vue
View File

@@ -55,6 +55,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="bill"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -65,12 +72,14 @@
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
import { getMpListShort } from "@/utils/util" import { getMpListShort } from "@/utils/util"
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
name: "OtherInModal", name: "OtherInModal",
mixins: [JEditableTableMixin, BillModalMixin], mixins: [JEditableTableMixin, BillModalMixin],
components: { components: {
JUpload,
JDate JDate
}, },
data () { data () {
@@ -83,6 +92,7 @@
visible: false, visible: false,
operTimeStr: '', operTimeStr: '',
prefixNo: 'QTRK', prefixNo: 'QTRK',
fileList:[],
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -145,8 +155,10 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit(this.prefixNo) this.addInit(this.prefixNo)
this.fileList = []
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.fileList = this.model.fileName
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount')) 'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount'))
@@ -172,6 +184,9 @@
totalPrice += item.allPrice-0 totalPrice += item.allPrice-0
} }
billMain.totalPrice = totalPrice billMain.totalPrice = totalPrice
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

15
jshERP-web/src/views/bill/modules/OtherOutModal.vue
View File

@@ -55,6 +55,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="bill"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -65,12 +72,14 @@
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
import { getMpListShort } from "@/utils/util" import { getMpListShort } from "@/utils/util"
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
name: "OtherOutModal", name: "OtherOutModal",
mixins: [JEditableTableMixin, BillModalMixin], mixins: [JEditableTableMixin, BillModalMixin],
components: { components: {
JUpload,
JDate JDate
}, },
data () { data () {
@@ -83,6 +92,7 @@
visible: false, visible: false,
operTimeStr: '', operTimeStr: '',
prefixNo: 'QTCK', prefixNo: 'QTCK',
fileList:[],
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -145,8 +155,10 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit(this.prefixNo) this.addInit(this.prefixNo)
this.fileList = []
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.fileList = this.model.fileName
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount')) 'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount'))
@@ -172,6 +184,9 @@
totalPrice += item.allPrice-0 totalPrice += item.allPrice-0
} }
billMain.totalPrice = totalPrice billMain.totalPrice = totalPrice
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

15
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View File

@@ -109,6 +109,13 @@
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="bill"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -125,6 +132,7 @@
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
import { getMpListShort, changeListFmtMinus} from "@/utils/util" import { getMpListShort, changeListFmtMinus} from "@/utils/util"
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
@@ -133,6 +141,7 @@
components: { components: {
ManyAccountModal, ManyAccountModal,
LinkBillList, LinkBillList,
JUpload,
JDate JDate
}, },
data () { data () {
@@ -145,6 +154,7 @@
visible: false, visible: false,
operTimeStr: '', operTimeStr: '',
prefixNo: 'CGTH', prefixNo: 'CGTH',
fileList:[],
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -216,6 +226,7 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit(this.prefixNo) this.addInit(this.prefixNo)
this.fileList = []
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2) this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)
@@ -227,6 +238,7 @@
} else { } else {
this.manyAccountBtnStatus = false this.manyAccountBtnStatus = false
} }
this.fileList = this.model.fileName
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark',
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt')) 'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt'))
@@ -252,6 +264,9 @@
totalPrice += item.allPrice-0 totalPrice += item.allPrice-0
} }
billMain.totalPrice = totalPrice billMain.totalPrice = totalPrice
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

16
jshERP-web/src/views/bill/modules/PurchaseInModal.vue
View File

@@ -109,6 +109,13 @@
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="bill"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -126,6 +133,7 @@
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
import { getMpListShort, changeListFmtMinus} from "@/utils/util" import { getMpListShort, changeListFmtMinus} from "@/utils/util"
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
@@ -134,6 +142,7 @@
components: { components: {
ManyAccountModal, ManyAccountModal,
LinkBillList, LinkBillList,
JUpload,
JDate JDate
}, },
data () { data () {
@@ -146,6 +155,7 @@
visible: false, visible: false,
operTimeStr: '', operTimeStr: '',
prefixNo: 'CGRK', prefixNo: 'CGRK',
fileList:[],
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -216,8 +226,8 @@
//调用完edit()方法之后会自动调用此方法 //调用完edit()方法之后会自动调用此方法
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
let that = this
this.addInit(this.prefixNo) this.addInit(this.prefixNo)
this.fileList = []
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2) this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)
@@ -229,6 +239,7 @@
} else { } else {
this.manyAccountBtnStatus = false this.manyAccountBtnStatus = false
} }
this.fileList = this.model.fileName
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark',
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt')) 'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt'))
@@ -260,6 +271,9 @@
} }
billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : "" billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : ""
billMain.accountMoneyList = this.accountMoneyList.length>0 ? JSON.stringify(this.accountMoneyList) : "" billMain.accountMoneyList = this.accountMoneyList.length>0 ? JSON.stringify(this.accountMoneyList) : ""
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

15
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
View File

@@ -55,6 +55,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="bill"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -65,12 +72,14 @@
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
import { getMpListShort } from "@/utils/util" import { getMpListShort } from "@/utils/util"
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
name: "PurchaseOrderModal", name: "PurchaseOrderModal",
mixins: [JEditableTableMixin,BillModalMixin], mixins: [JEditableTableMixin,BillModalMixin],
components: { components: {
JUpload,
JDate JDate
}, },
data () { data () {
@@ -85,6 +94,7 @@
depotList: [], depotList: [],
operTimeStr: '', operTimeStr: '',
prefixNo: 'CGDD', prefixNo: 'CGDD',
fileList:[],
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -148,8 +158,10 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit(this.prefixNo) this.addInit(this.prefixNo)
this.fileList = []
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.fileList = this.model.fileName
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark')) this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark'))
}); });
@@ -174,6 +186,9 @@
totalPrice += item.allPrice-0 totalPrice += item.allPrice-0
} }
billMain.totalPrice = 0-totalPrice billMain.totalPrice = 0-totalPrice
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

15
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View File

@@ -93,6 +93,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="bill"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -107,6 +114,7 @@
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
import { getMpListShort } from "@/utils/util" import { getMpListShort } from "@/utils/util"
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
@@ -114,6 +122,7 @@
mixins: [JEditableTableMixin, BillModalMixin], mixins: [JEditableTableMixin, BillModalMixin],
components: { components: {
LinkBillList, LinkBillList,
JUpload,
JDate JDate
}, },
data () { data () {
@@ -126,6 +135,7 @@
visible: false, visible: false,
operTimeStr: '', operTimeStr: '',
prefixNo: 'LSTH', prefixNo: 'LSTH',
fileList:[],
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -188,10 +198,12 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit(this.prefixNo) this.addInit(this.prefixNo)
this.fileList = []
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.model.getAmount = this.model.changeAmount this.model.getAmount = this.model.changeAmount
this.model.backAmount = 0 this.model.backAmount = 0
this.fileList = this.model.fileName
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark',
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','getAmount','backAmount')) 'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','getAmount','backAmount'))
@@ -218,6 +230,9 @@
} }
billMain.totalPrice = 0-totalPrice billMain.totalPrice = 0-totalPrice
billMain.changeAmount = 0-billMain.changeAmount billMain.changeAmount = 0-billMain.changeAmount
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

15
jshERP-web/src/views/bill/modules/RetailOutModal.vue
View File

@@ -95,6 +95,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="bill"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -105,12 +112,14 @@
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
import { getMpListShort } from "@/utils/util" import { getMpListShort } from "@/utils/util"
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
name: "RetailOutModal", name: "RetailOutModal",
mixins: [JEditableTableMixin, BillModalMixin], mixins: [JEditableTableMixin, BillModalMixin],
components: { components: {
JUpload,
JDate JDate
}, },
data () { data () {
@@ -123,6 +132,7 @@
visible: false, visible: false,
operTimeStr: '', operTimeStr: '',
prefixNo: 'LSCK', prefixNo: 'LSCK',
fileList:[],
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -185,12 +195,14 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit(this.prefixNo) this.addInit(this.prefixNo)
this.fileList = []
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue({'payType': '现付'}) this.form.setFieldsValue({'payType': '现付'})
}) })
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.model.getAmount = this.model.changeAmount this.model.getAmount = this.model.changeAmount
this.fileList = this.model.fileName
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'payType', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'payType', 'remark',
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','getAmount')) 'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','getAmount'))
@@ -216,6 +228,9 @@
totalPrice += item.allPrice-0 totalPrice += item.allPrice-0
} }
billMain.totalPrice = totalPrice billMain.totalPrice = totalPrice
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

15
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View File

@@ -112,6 +112,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="bill"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -129,6 +136,7 @@
import { getMpListShort, changeListFmtMinus } from "@/utils/util" import { getMpListShort, changeListFmtMinus } from "@/utils/util"
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import JSelectMultiple from '@/components/jeecg/JSelectMultiple' import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
@@ -137,6 +145,7 @@
components: { components: {
ManyAccountModal, ManyAccountModal,
LinkBillList, LinkBillList,
JUpload,
JDate, JDate,
JSelectMultiple JSelectMultiple
}, },
@@ -150,6 +159,7 @@
visible: false, visible: false,
operTimeStr: '', operTimeStr: '',
prefixNo: 'XSTH', prefixNo: 'XSTH',
fileList:[],
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -222,6 +232,7 @@
if (this.action === 'add') { if (this.action === 'add') {
this.addInit(this.prefixNo) this.addInit(this.prefixNo)
this.personList.value = '' this.personList.value = ''
this.fileList = []
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2) this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)
@@ -234,6 +245,7 @@
this.manyAccountBtnStatus = false this.manyAccountBtnStatus = false
} }
this.personList.value = this.model.salesMan this.personList.value = this.model.salesMan
this.fileList = this.model.fileName
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark',
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt','salesMan')) 'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt','salesMan'))
@@ -265,6 +277,9 @@
} }
billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : "" billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : ""
billMain.accountMoneyList = this.accountMoneyList.length>0 ? JSON.stringify(this.accountMoneyList) : "" billMain.accountMoneyList = this.accountMoneyList.length>0 ? JSON.stringify(this.accountMoneyList) : ""
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

15
jshERP-web/src/views/bill/modules/SaleOrderModal.vue
View File

@@ -59,6 +59,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="bill"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -70,12 +77,14 @@
import { BillModalMixin } from '../mixins/BillModalMixin' import { BillModalMixin } from '../mixins/BillModalMixin'
import { getMpListShort } from "@/utils/util" import { getMpListShort } from "@/utils/util"
import JSelectMultiple from '@/components/jeecg/JSelectMultiple' import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
name: "SaleOrderModal", name: "SaleOrderModal",
mixins: [JEditableTableMixin, BillModalMixin], mixins: [JEditableTableMixin, BillModalMixin],
components: { components: {
JUpload,
JDate, JDate,
JSelectMultiple JSelectMultiple
}, },
@@ -89,6 +98,7 @@
visible: false, visible: false,
operTimeStr: '', operTimeStr: '',
prefixNo: 'XSDD', prefixNo: 'XSDD',
fileList:[],
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -152,9 +162,11 @@
if (this.action === 'add') { if (this.action === 'add') {
this.addInit(this.prefixNo) this.addInit(this.prefixNo)
this.personList.value = '' this.personList.value = ''
this.fileList = []
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.personList.value = this.model.salesMan this.personList.value = this.model.salesMan
this.fileList = this.model.fileName
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','salesMan')) 'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','salesMan'))
@@ -180,6 +192,9 @@
totalPrice += item.allPrice-0 totalPrice += item.allPrice-0
} }
billMain.totalPrice = totalPrice billMain.totalPrice = totalPrice
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

15
jshERP-web/src/views/bill/modules/SaleOutModal.vue
View File

@@ -112,6 +112,13 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="bill"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -129,6 +136,7 @@
import { getMpListShort } from "@/utils/util" import { getMpListShort } from "@/utils/util"
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import JSelectMultiple from '@/components/jeecg/JSelectMultiple' import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
@@ -137,6 +145,7 @@
components: { components: {
ManyAccountModal, ManyAccountModal,
LinkBillList, LinkBillList,
JUpload,
JDate, JDate,
JSelectMultiple JSelectMultiple
}, },
@@ -150,6 +159,7 @@
visible: false, visible: false,
operTimeStr: '', operTimeStr: '',
prefixNo: 'XSCK', prefixNo: 'XSCK',
fileList:[],
model: {}, model: {},
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
@@ -222,6 +232,7 @@
if (this.action === 'add') { if (this.action === 'add') {
this.addInit(this.prefixNo) this.addInit(this.prefixNo)
this.personList.value = '' this.personList.value = ''
this.fileList = []
} else { } else {
this.model.operTime = this.model.operTimeStr this.model.operTime = this.model.operTimeStr
this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2) this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)
@@ -234,6 +245,7 @@
this.manyAccountBtnStatus = false this.manyAccountBtnStatus = false
} }
this.personList.value = this.model.salesMan this.personList.value = this.model.salesMan
this.fileList = this.model.fileName
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark',
'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt','salesMan')) 'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt','salesMan'))
@@ -264,6 +276,9 @@
} }
billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : "" billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : ""
billMain.accountMoneyList = this.accountMoneyList.length>0 ? JSON.stringify(this.accountMoneyList) : "" billMain.accountMoneyList = this.accountMoneyList.length>0 ? JSON.stringify(this.accountMoneyList) : ""
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

4
jshERP-web/src/views/financial/AdvanceInList.vue
View File

@@ -123,7 +123,9 @@
{ title: '单据编号', dataIndex: 'billNo',width:160}, { title: '单据编号', dataIndex: 'billNo',width:160},
{ title: '操作员', dataIndex: 'userName',width:80}, { title: '操作员', dataIndex: 'userName',width:80},
{ title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
{ title: '合计', dataIndex: 'totalPrice',width:80}, { title: '合计金额', dataIndex: 'totalPrice',width:80},
{ title: '优惠金额', dataIndex: 'discountMoney',width:80},
{ title: '收款金额', dataIndex: 'changeAmount',width:80},
{ title: '备注', dataIndex: 'remark',width:200}, { title: '备注', dataIndex: 'remark',width:200},
{ {
title: '操作', title: '操作',

2
jshERP-web/src/views/financial/GiroList.vue
View File

@@ -122,7 +122,7 @@
{ title: '单据编号', dataIndex: 'billNo',width:160}, { title: '单据编号', dataIndex: 'billNo',width:160},
{ title: '操作员', dataIndex: 'userName',width:80}, { title: '操作员', dataIndex: 'userName',width:80},
{ title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
{ title: '合计', dataIndex: 'totalPrice',width:80}, { title: '实付金额', dataIndex: 'changeAmount',width:80},
{ title: '备注', dataIndex: 'remark',width:200}, { title: '备注', dataIndex: 'remark',width:200},
{ {
title: '操作', title: '操作',

2
jshERP-web/src/views/financial/ItemInList.vue
View File

@@ -123,7 +123,7 @@
{ title: '单据编号', dataIndex: 'billNo',width:160}, { title: '单据编号', dataIndex: 'billNo',width:160},
{ title: '操作员', dataIndex: 'userName',width:80}, { title: '操作员', dataIndex: 'userName',width:80},
{ title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
{ title: '合计', dataIndex: 'totalPrice',width:80}, { title: '收入金额', dataIndex: 'changeAmount',width:80},
{ title: '备注', dataIndex: 'remark',width:200}, { title: '备注', dataIndex: 'remark',width:200},
{ {
title: '操作', title: '操作',

2
jshERP-web/src/views/financial/ItemOutList.vue
View File

@@ -123,7 +123,7 @@
{ title: '单据编号', dataIndex: 'billNo',width:160}, { title: '单据编号', dataIndex: 'billNo',width:160},
{ title: '操作员', dataIndex: 'userName',width:80}, { title: '操作员', dataIndex: 'userName',width:80},
{ title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
{ title: '合计', dataIndex: 'totalPrice',width:80}, { title: '支出金额', dataIndex: 'changeAmount',width:80},
{ title: '备注', dataIndex: 'remark',width:200}, { title: '备注', dataIndex: 'remark',width:200},
{ {
title: '操作', title: '操作',

4
jshERP-web/src/views/financial/MoneyInList.vue
View File

@@ -123,7 +123,9 @@
{ title: '单据编号', dataIndex: 'billNo',width:160}, { title: '单据编号', dataIndex: 'billNo',width:160},
{ title: '操作员', dataIndex: 'userName',width:80}, { title: '操作员', dataIndex: 'userName',width:80},
{ title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
{ title: '合计', dataIndex: 'totalPrice',width:80}, { title: '合计收款', dataIndex: 'totalPrice',width:80},
{ title: '优惠金额', dataIndex: 'discountMoney',width:80},
{ title: '实际收款', dataIndex: 'changeAmount',width:80},
{ title: '备注', dataIndex: 'remark',width:200}, { title: '备注', dataIndex: 'remark',width:200},
{ {
title: '操作', title: '操作',

4
jshERP-web/src/views/financial/MoneyOutList.vue
View File

@@ -123,7 +123,9 @@
{ title: '单据编号', dataIndex: 'billNo',width:160}, { title: '单据编号', dataIndex: 'billNo',width:160},
{ title: '操作员', dataIndex: 'userName',width:80}, { title: '操作员', dataIndex: 'userName',width:80},
{ title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
{ title: '合计', dataIndex: 'totalPrice',width:80}, { title: '合计付款', dataIndex: 'totalPrice',width:80},
{ title: '优惠金额', dataIndex: 'discountMoney',width:80},
{ title: '实际付款', dataIndex: 'changeAmount',width:80},
{ title: '备注', dataIndex: 'remark',width:200}, { title: '备注', dataIndex: 'remark',width:200},
{ {
title: '操作', title: '操作',

9
jshERP-web/src/views/financial/dialog/DebtBillList.vue
View File

@@ -115,7 +115,7 @@
}, },
{ title: '单据日期', dataIndex: 'operTimeStr',width:130}, { title: '单据日期', dataIndex: 'operTimeStr',width:130},
{ title: '操作员', dataIndex: 'userName',width:60}, { title: '操作员', dataIndex: 'userName',width:60},
{ title: '应收欠款', dataIndex: 'needDebt',width:70, { title: '欠款', dataIndex: 'needDebt',width:70,
customRender:function (text,record,index) { customRender:function (text,record,index) {
return (record.discountLastMoney - record.changeAmount).toFixed(2); return (record.discountLastMoney - record.changeAmount).toFixed(2);
} }
@@ -146,6 +146,13 @@
this.queryParam.subType = subType this.queryParam.subType = subType
this.queryParam.status = status this.queryParam.status = status
this.columns[1].title = organType this.columns[1].title = organType
if(type === '入库') {
this.columns[7].title = '已付欠款'
this.columns[8].title = '待付欠款'
} else if(type === '出库') {
this.columns[7].title = '已收欠款'
this.columns[8].title = '待收欠款'
}
this.model = Object.assign({}, {}); this.model = Object.assign({}, {});
this.visible = true; this.visible = true;
this.loadData(1) this.loadData(1)

54
jshERP-web/src/views/financial/dialog/FinancialDetail.vue
View File

@@ -182,12 +182,12 @@
</a-row> </a-row>
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入账户">
{{model.accountName}} {{model.accountName}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款金额"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入金额">
{{model.changeAmount}} {{model.changeAmount}}
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -240,12 +240,12 @@
</a-row> </a-row>
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支出账户">
{{model.accountName}} {{model.accountName}}
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="6"> <a-col :span="6">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支出金额">
{{model.changeAmount}} {{model.changeAmount}}
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -318,18 +318,6 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="8">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<ul style="list-style-type:none">
<li v-for="(item,index) in fileList" :key="index">
<a :href="item.url" target="_blank">{{item.name}}</a>
</li>
</ul>
</a-form-item>
</a-col>
<a-col :span="16"></a-col>
</a-row>
</section> </section>
</template> </template>
<!--付款--> <!--付款-->
@@ -396,20 +384,22 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="8">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<ul style="list-style-type:none">
<li v-for="(item,index) in fileList" :key="index">
<a :href="item.url" target="_blank">{{item.name}}</a>
</li>
</ul>
</a-form-item>
</a-col>
<a-col :span="16"></a-col>
</a-row>
</section> </section>
</template> </template>
<template v-if="fileList.length>0">
<a-row class="form-row" :gutter="24">
<a-col :span="8">
<a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="附件">
<ul style="list-style-type:none">
<li v-for="(item,index) in fileList" :key="index">
<a :href="item.url" target="_blank">{{item.name}}</a>
</li>
</ul>
</a-form-item>
</a-col>
<a-col :span="16"></a-col>
</a-row>
</template>
</a-form> </a-form>
</j-modal> </j-modal>
</a-card> </a-card>
@@ -470,9 +460,9 @@
], ],
moneyOutColumns: [ moneyOutColumns: [
{ title: '采购单据编号',dataIndex: 'billNumber',width: '20%'}, { title: '采购单据编号',dataIndex: 'billNumber',width: '20%'},
{ title: '应收欠款',dataIndex: 'needDebt', width: '10%'}, { title: '应付欠款',dataIndex: 'needDebt', width: '10%'},
{ title: '已收欠款',dataIndex: 'finishDebt', width: '10%'}, { title: '已付欠款',dataIndex: 'finishDebt', width: '10%'},
{ title: '本次收款',dataIndex: 'eachAmount', width: '10%'}, { title: '本次付款',dataIndex: 'eachAmount', width: '10%'},
{ title: '备注',dataIndex: 'remark', width: '20%'} { title: '备注',dataIndex: 'remark', width: '20%'}
], ],
} }
@@ -493,6 +483,8 @@
fileInfo.url= window._CONFIG['domianURL'] + '/systemConfig/static/' + fileArr[i] fileInfo.url= window._CONFIG['domianURL'] + '/systemConfig/static/' + fileArr[i]
this.fileList.push(fileInfo) this.fileList.push(fileInfo)
} }
} else {
this.fileList = []
} }
this.visible = true; this.visible = true;
this.model = Object.assign({}, record); this.model = Object.assign({}, record);

15
jshERP-web/src/views/financial/modules/AdvanceInModal.vue
View File

@@ -80,6 +80,13 @@
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="financial"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -89,11 +96,13 @@
import { FormTypes } from '@/utils/JEditableTableUtil' import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { FinancialModalMixin } from '../mixins/FinancialModalMixin' import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
export default { export default {
name: "AdvanceInModal", name: "AdvanceInModal",
mixins: [JEditableTableMixin, FinancialModalMixin], mixins: [JEditableTableMixin, FinancialModalMixin],
components: { components: {
JUpload,
JDate JDate
}, },
data () { data () {
@@ -105,6 +114,7 @@
addDefaultRowNum: 1, addDefaultRowNum: 1,
visible: false, visible: false,
model: {}, model: {},
fileList:[],
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 8 }, sm: { span: 8 },
@@ -156,12 +166,14 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit("SYF") this.addInit("SYF")
this.fileList = []
} else { } else {
this.model.billTime = this.model.billTimeStr this.model.billTime = this.model.billTimeStr
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark',
'totalPrice', 'discountMoney', 'changeAmount')) 'totalPrice', 'discountMoney', 'changeAmount'))
}); });
this.fileList = this.model.fileName
// 加载子表数据 // 加载子表数据
let params = { let params = {
headerId: this.model.id headerId: this.model.id
@@ -180,6 +192,9 @@
totalPrice += item.eachAmount-0 totalPrice += item.eachAmount-0
} }
billMain.totalPrice = totalPrice billMain.totalPrice = totalPrice
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

15
jshERP-web/src/views/financial/modules/GiroModal.vue
View File

@@ -74,6 +74,13 @@
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="financial"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -83,11 +90,13 @@
import { FormTypes } from '@/utils/JEditableTableUtil' import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { FinancialModalMixin } from '../mixins/FinancialModalMixin' import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
export default { export default {
name: "GiroModal", name: "GiroModal",
mixins: [JEditableTableMixin, FinancialModalMixin], mixins: [JEditableTableMixin, FinancialModalMixin],
components: { components: {
JUpload,
JDate JDate
}, },
data () { data () {
@@ -99,6 +108,7 @@
addDefaultRowNum: 1, addDefaultRowNum: 1,
visible: false, visible: false,
model: {}, model: {},
fileList:[],
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 8 }, sm: { span: 8 },
@@ -156,12 +166,14 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit("ZZ") this.addInit("ZZ")
this.fileList = []
} else { } else {
this.model.billTime = this.model.billTimeStr this.model.billTime = this.model.billTimeStr
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark',
'accountId', 'changeAmount')) 'accountId', 'changeAmount'))
}); });
this.fileList = this.model.fileName
// 加载子表数据 // 加载子表数据
let params = { let params = {
headerId: this.model.id headerId: this.model.id
@@ -181,6 +193,9 @@
} }
billMain.totalPrice = 0-totalPrice billMain.totalPrice = 0-totalPrice
billMain.changeAmount = 0-billMain.changeAmount billMain.changeAmount = 0-billMain.changeAmount
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

27
jshERP-web/src/views/financial/modules/ItemInModal.vue
View File

@@ -63,8 +63,8 @@
</a-row> </a-row>
<a-row class="form-row" :gutter="24"> <a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入账户">
<a-select placeholder="选择收款账户" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false"> <a-select placeholder="选择收入账户" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
<a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id"> <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
{{ item.name }} {{ item.name }}
</a-select-option> </a-select-option>
@@ -72,8 +72,8 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款金额"> <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入金额">
<a-input placeholder="请输入收款金额" v-decorator.trim="[ 'changeAmount', validatorRules.changeAmount ]" /> <a-input placeholder="请输入收入金额" v-decorator.trim="[ 'changeAmount', validatorRules.changeAmount ]" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
@@ -81,6 +81,13 @@
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="financial"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -90,11 +97,13 @@
import { FormTypes } from '@/utils/JEditableTableUtil' import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { FinancialModalMixin } from '../mixins/FinancialModalMixin' import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
export default { export default {
name: "ItemInModal", name: "ItemInModal",
mixins: [JEditableTableMixin, FinancialModalMixin], mixins: [JEditableTableMixin, FinancialModalMixin],
components: { components: {
JUpload,
JDate JDate
}, },
data () { data () {
@@ -106,6 +115,7 @@
addDefaultRowNum: 1, addDefaultRowNum: 1,
visible: false, visible: false,
model: {}, model: {},
fileList:[],
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 8 }, sm: { span: 8 },
@@ -143,12 +153,12 @@
}, },
accountId:{ accountId:{
rules: [ rules: [
{ required: true, message: '请选择收款账户!' } { required: true, message: '请选择收入账户!' }
] ]
}, },
changeAmount:{ changeAmount:{
rules: [ rules: [
{ required: true, message: '请输入收款金额!' } { required: true, message: '请输入收入金额!' }
] ]
} }
}, },
@@ -168,12 +178,14 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit("SR") this.addInit("SR")
this.fileList = []
} else { } else {
this.model.billTime = this.model.billTimeStr this.model.billTime = this.model.billTimeStr
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark',
'accountId','changeAmount')) 'accountId','changeAmount'))
}); });
this.fileList = this.model.fileName
// 加载子表数据 // 加载子表数据
let params = { let params = {
headerId: this.model.id headerId: this.model.id
@@ -192,6 +204,9 @@
totalPrice += item.eachAmount-0 totalPrice += item.eachAmount-0
} }
billMain.totalPrice = totalPrice billMain.totalPrice = totalPrice
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

15
jshERP-web/src/views/financial/modules/ItemOutModal.vue
View File

@@ -81,6 +81,13 @@
<a-col :lg="6" :md="12" :sm="24"> <a-col :lg="6" :md="12" :sm="24">
</a-col> </a-col>
</a-row> </a-row>
<a-row class="form-row" :gutter="24">
<a-col :lg="6" :md="12" :sm="24">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
<j-upload v-model="fileList" bizPath="financial"></j-upload>
</a-form-item>
</a-col>
</a-row>
</a-form> </a-form>
</a-spin> </a-spin>
</j-modal> </j-modal>
@@ -90,11 +97,13 @@
import { FormTypes } from '@/utils/JEditableTableUtil' import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { FinancialModalMixin } from '../mixins/FinancialModalMixin' import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
import JUpload from '@/components/jeecg/JUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
export default { export default {
name: "ItemOutModal", name: "ItemOutModal",
mixins: [JEditableTableMixin, FinancialModalMixin], mixins: [JEditableTableMixin, FinancialModalMixin],
components: { components: {
JUpload,
JDate JDate
}, },
data () { data () {
@@ -106,6 +115,7 @@
addDefaultRowNum: 1, addDefaultRowNum: 1,
visible: false, visible: false,
model: {}, model: {},
fileList:[],
labelCol: { labelCol: {
xs: { span: 24 }, xs: { span: 24 },
sm: { span: 8 }, sm: { span: 8 },
@@ -168,12 +178,14 @@
editAfter() { editAfter() {
if (this.action === 'add') { if (this.action === 'add') {
this.addInit("ZC") this.addInit("ZC")
this.fileList = []
} else { } else {
this.model.billTime = this.model.billTimeStr this.model.billTime = this.model.billTimeStr
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark', this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark',
'accountId','changeAmount')) 'accountId','changeAmount'))
}); });
this.fileList = this.model.fileName
// 加载子表数据 // 加载子表数据
let params = { let params = {
headerId: this.model.id headerId: this.model.id
@@ -193,6 +205,9 @@
} }
billMain.totalPrice = 0-totalPrice billMain.totalPrice = 0-totalPrice
billMain.changeAmount = 0-billMain.changeAmount billMain.changeAmount = 0-billMain.changeAmount
if(this.fileList && this.fileList.length > 0) {
billMain.fileName = this.fileList
}
if(this.model.id){ if(this.model.id){
billMain.id = this.model.id billMain.id = this.model.id
} }

8
jshERP-web/src/views/financial/modules/MoneyOutModal.vue
View File

@@ -155,10 +155,10 @@
loading: false, loading: false,
dataSource: [], dataSource: [],
columns: [ columns: [
{ title: '销售单据编号',key: 'billNumber',width: '20%', type: FormTypes.input, readonly: true }, { title: '采购单据编号',key: 'billNumber',width: '20%', type: FormTypes.input, readonly: true },
{ title: '应收欠款',key: 'needDebt', width: '10%', type: FormTypes.inputNumber, statistics: true, readonly: true }, { title: '应付欠款',key: 'needDebt', width: '10%', type: FormTypes.inputNumber, statistics: true, readonly: true },
{ title: '已收欠款', key: 'finishDebt', width: '10%', type: FormTypes.inputNumber, statistics: true, readonly: true }, { title: '已付欠款', key: 'finishDebt', width: '10%', type: FormTypes.inputNumber, statistics: true, readonly: true },
{ title: '本次收款',key: 'eachAmount', width: '10%', type: FormTypes.inputNumber, statistics: true, placeholder: '请输入${title}', { title: '本次付款',key: 'eachAmount', width: '10%', type: FormTypes.inputNumber, statistics: true, placeholder: '请输入${title}',
validateRules: [{ required: true, message: '${title}不能为空' }] validateRules: [{ required: true, message: '${title}不能为空' }]
}, },
{ title: '备注',key: 'remark', width: '20%', type: FormTypes.input, placeholder: '请输入${title}'} { title: '备注',key: 'remark', width: '20%', type: FormTypes.input, placeholder: '请输入${title}'}

28
jshERP-web/src/views/material/modules/MaterialModal.vue
View File

@@ -139,6 +139,16 @@
:rowSelection="false" :rowSelection="false"
:actionButton="false"/> :actionButton="false"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane key="4" tab="图片信息" forceRender>
<a-row class="form-row" :gutter="24">
<a-col :lg="12" :md="12" :sm="24">
<a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="图片">
<j-image-upload v-model="fileList" bizPath="material" isMultiple="true"></j-image-upload>
</a-form-item>
</a-col>
<a-col :lg="12" :md="12" :sm="24"></a-col>
</a-row>
</a-tab-pane>
</a-tabs> </a-tabs>
</a-form> </a-form>
</a-spin> </a-spin>
@@ -150,12 +160,15 @@
import { FormTypes, VALIDATE_NO_PASSED, getRefPromise, validateFormAndTables } from '@/utils/JEditableTableUtil' import { FormTypes, VALIDATE_NO_PASSED, getRefPromise, validateFormAndTables } from '@/utils/JEditableTableUtil'
import {queryMaterialCategoryTreeList,checkMaterial,checkMaterialBarCode} from '@/api/api' import {queryMaterialCategoryTreeList,checkMaterial,checkMaterialBarCode} from '@/api/api'
import { httpAction, getAction } from '@/api/manage' import { httpAction, getAction } from '@/api/manage'
import JImageUpload from '@/components/jeecg/JImageUpload'
import JDate from '@/components/jeecg/JDate' import JDate from '@/components/jeecg/JDate'
import Vue from 'vue' import Vue from 'vue'
export default { export default {
name: "MaterialModal", name: "MaterialModal",
components: { components: {
JDate, JEditableTable JImageUpload,
JDate,
JEditableTable
}, },
data () { data () {
return { return {
@@ -164,6 +177,7 @@
categoryTree: [], categoryTree: [],
unitList: [], unitList: [],
depotList: [], depotList: [],
fileList:[],
unitStatus: false, unitStatus: false,
manyUnitStatus: true, manyUnitStatus: true,
unitChecked: false, unitChecked: false,
@@ -272,6 +286,13 @@
this.model = Object.assign({}, record); this.model = Object.assign({}, record);
this.activeKey = '1' this.activeKey = '1'
this.visible = true; this.visible = true;
if(JSON.stringify(record) === '{}') {
this.fileList = []
} else {
setTimeout(() => {
this.fileList = record.imgName
}, 5)
}
this.$nextTick(() => { this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model, 'name', 'standard', 'unit', 'unitId', 'model', 'color', this.form.setFieldsValue(pick(this.model, 'name', 'standard', 'unit', 'unitId', 'model', 'color',
'categoryId','enableSerialNumber','safetyStock','remark','mfrs','otherField1','otherField2','otherField3')) 'categoryId','enableSerialNumber','safetyStock','remark','mfrs','otherField1','otherField2','otherField3'))
@@ -436,6 +457,11 @@
} }
} }
} }
if(this.fileList && this.fileList.length > 0) {
formData.imgName = this.fileList
} else {
formData.imgName = ''
}
//接口调用 //接口调用
let url = this.url.add, method = 'post' let url = this.url.add, method = 'post'
if (this.model.id) { if (this.model.id) {