diff --git a/jshERP-web/src/api/manage.js b/jshERP-web/src/api/manage.js
index 2087b228..903107bb 100644
--- a/jshERP-web/src/api/manage.js
+++ b/jshERP-web/src/api/manage.js
@@ -171,7 +171,7 @@ export function getFileAccessHttpUrl(avatar,subStr) {
     return avatar;
   }else{
     if(avatar &&　avatar.length>0 && avatar.indexOf('[')==-1){
-      return window._CONFIG['staticDomainURL'] + "/" + avatar;
+      return window._CONFIG['domianURL'] + "/" + avatar;
     }
   }
 }
diff --git a/jshERP-web/src/components/jeecg/JImageUpload.vue b/jshERP-web/src/components/jeecg/JImageUpload.vue
index 91f51318..2f3163a6 100644
--- a/jshERP-web/src/components/jeecg/JImageUpload.vue
+++ b/jshERP-web/src/components/jeecg/JImageUpload.vue
@@ -1,201 +1,202 @@
-<template>
-  <a-upload
-    name="file"
-    listType="picture-card"
-    :multiple="isMultiple"
-    :action="uploadAction"
-    :headers="headers"
-    :data="{biz:bizPath}"
-    :fileList="fileList"
-    :beforeUpload="beforeUpload"
-    :disabled="disabled"
-    :isMultiple="isMultiple"
-    :showUploadList="isMultiple"
-    @change="handleChange"
-    @preview="handlePreview">
-    <img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="height:104px;max-width:300px"/>
-    <div v-else >
-      <a-icon :type="uploadLoading ? 'loading' : 'plus'" />
-      <div class="ant-upload-text">{{ text }}</div>
-    </div>
-    <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel()">
-      <img alt="example" style="width: 100%" :src="previewImage"/>
-    </a-modal>
-  </a-upload>
-</template>
-
-<script>
-  import Vue from 'vue'
-  import { ACCESS_TOKEN } from "@/store/mutation-types"
-  import { getFileAccessHttpUrl } from '@/api/manage'
-
-  const uidGenerator=()=>{
-    return '-'+parseInt(Math.random()*10000+1,10);
-  }
-  const getFileName=(path)=>{
-    if(path.lastIndexOf("\\")>=0){
-      let reg=new RegExp("\\\\","g");
-      path = path.replace(reg,"/");
-    }
-    return path.substring(path.lastIndexOf("/")+1);
-  }
-  export default {
-    name: 'JImageUpload',
-    data(){
-      return {
-        uploadAction:window._CONFIG['domianURL']+"/sys/common/upload",
-        uploadLoading:false,
-        picUrl:false,
-        headers:{},
-        fileList: [],
-        previewImage:"",
-        previewVisible: false,
-      }
-    },
-    props:{
-      text:{
-        type:String,
-        required:false,
-        default:"上传"
-      },
-      /*这个属性用于控制文件上传的业务路径*/
-      bizPath:{
-        type:String,
-        required:false,
-        default:"temp"
-      },
-      value:{
-        type:[String,Array],
-        required:false
-      },
-      disabled:{
-        type:Boolean,
-        required:false,
-        default: false
-      },
-      isMultiple:{
-        type:Boolean,
-        required:false,
-        default: false
-      }
-    },
-    watch:{
-      value(val){
-        if (val instanceof Array) {
-          this.initFileList(val.join(','))
-        } else {
-          this.initFileList(val)
-        }
-      }
-    },
-    created(){
-      const token = Vue.ls.get(ACCESS_TOKEN);
-      this.headers = {"X-Access-Token":token}
-    },
-    methods:{
-      initFileList(paths){
-        if(!paths || paths.length==0){
-          this.fileList = [];
-          return;
-        }
-        this.picUrl = true;
-        let fileList = [];
-        let arr = paths.split(",")
-        for(var a=0;a<arr.length;a++){
-          let url = getFileAccessHttpUrl(arr[a]);
-          fileList.push({
-            uid: uidGenerator(),
-            name: getFileName(arr[a]),
-            status: 'done',
-            url: url,
-            response:{
-              status:"history",
-              message:arr[a]
-            }
-          })
-        }
-        this.fileList = fileList
-      },
-      beforeUpload: function(file){
-        var fileType = file.type;
-        if(fileType.indexOf('image')<0){
-          this.$message.warning('请上传图片');
-          return false;
-        }
-      },
-      handleChange(info) {
-        this.picUrl = false;
-        let fileList = info.fileList
-        if(info.file.status==='done'){
-          if(info.file.response.success){
-            this.picUrl = true;
-            fileList = fileList.map((file) => {
-              if (file.response) {
-                file.url = file.response.message;
-              }
-              return file;
-            });
-          }
-          //this.$message.success(`${info.file.name} 上传成功!`);
-        }else if (info.file.status === 'error') {
-          this.$message.error(`${info.file.name} 上传失败.`);
-        }else if(info.file.status === 'removed'){
-          this.handleDelete(info.file)
-        }
-        this.fileList = fileList
-        if(info.file.status==='done' || info.file.status === 'removed'){
-          this.handlePathChange()
-        }
-      },
-      // 预览
-      handlePreview (file) {
-        this.previewImage = file.url || file.thumbUrl
-        this.previewVisible = true
-      },
-      getAvatarView(){
-        if(this.fileList.length>0){
-          let url = this.fileList[0].url
-          return getFileAccessHttpUrl(url)
-        }
-      },
-      handlePathChange(){
-        let uploadFiles = this.fileList
-        let path = ''
-        if(!uploadFiles || uploadFiles.length==0){
-          path = ''
-        }
-        let arr = [];
-        if(!this.isMultiple){
-          arr.push(uploadFiles[uploadFiles.length-1].response.message)
-        }else{
-          for(var a=0;a<uploadFiles.length;a++){
-            arr.push(uploadFiles[a].response.message)
-          }
-        }
-        if(arr.length>0){
-          path = arr.join(",")
-        }
-        this.$emit('change', path);
-      },
-      handleDelete(file){
-        //如有需要新增 删除逻辑
-        console.log(file)
-      },
-      handleCancel() {
-        this.close();
-        this.previewVisible = false;
-      },
-      close () {
-
-      },
-    },
-    model: {
-      prop: 'value',
-      event: 'change'
-    }
-  }
-</script>
-
-<style scoped>
-
+<template>
+  <a-upload
+    name="file"
+    listType="picture-card"
+    :multiple="isMultiple"
+    :action="uploadAction"
+    :headers="headers"
+    :data="{biz:bizPath}"
+    :fileList="fileList"
+    :beforeUpload="beforeUpload"
+    :disabled="disabled"
+    :isMultiple="isMultiple"
+    :showUploadList="isMultiple"
+    @change="handleChange"
+    @preview="handlePreview">
+    <img v-if="!isMultiple && picUrl" :src="getAvatarView()" style="height:104px;max-width:300px"/>
+    <div v-else >
+      <a-icon :type="uploadLoading ? 'loading' : 'plus'" />
+      <div class="ant-upload-text">{{ text }}</div>
+    </div>
+    <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel()">
+      <img alt="example" style="width: 100%" :src="previewImage"/>
+    </a-modal>
+  </a-upload>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import { ACCESS_TOKEN } from "@/store/mutation-types"
+  import { getFileAccessHttpUrl } from '@/api/manage'
+
+  const uidGenerator=()=>{
+    return '-'+parseInt(Math.random()*10000+1,10);
+  }
+  const getFileName=(path)=>{
+    if(path.lastIndexOf("\\")>=0){
+      let reg=new RegExp("\\\\","g");
+      path = path.replace(reg,"/");
+    }
+    return path.substring(path.lastIndexOf("/")+1);
+  }
+  export default {
+    name: 'JImageUpload',
+    data(){
+      return {
+        uploadAction:window._CONFIG['domianURL']+"/systemConfig/upload",
+        uploadLoading:false,
+        picUrl:false,
+        headers:{},
+        fileList: [],
+        previewImage:"",
+        previewVisible: false,
+      }
+    },
+    props:{
+      text:{
+        type:String,
+        required:false,
+        default:"上传"
+      },
+      /*这个属性用于控制文件上传的业务路径*/
+      bizPath:{
+        type:String,
+        required:false,
+        default:"temp"
+      },
+      value:{
+        type:[String,Array],
+        required:false
+      },
+      disabled:{
+        type:Boolean,
+        required:false,
+        default: false
+      },
+      isMultiple:{
+        type:Boolean,
+        required:false,
+        default: false
+      }
+    },
+    watch:{
+      value(val){
+        if (val instanceof Array) {
+          this.initFileList(val.join(','))
+        } else {
+          this.initFileList(val)
+        }
+      }
+    },
+    created(){
+      const token = Vue.ls.get(ACCESS_TOKEN);
+      this.headers = {"X-Access-Token":token}
+    },
+    methods:{
+      initFileList(paths){
+        if(!paths || paths.length==0){
+          this.fileList = [];
+          this.picUrl = false;
+          return;
+        }
+        this.picUrl = true;
+        let fileList = [];
+        let arr = paths.split(",")
+        for(var a=0;a<arr.length;a++){
+          let url = getFileAccessHttpUrl('systemConfig/static/' + arr[a]);
+          fileList.push({
+            uid: uidGenerator(),
+            name: getFileName(arr[a]),
+            status: 'done',
+            url: url,
+            response:{
+              code:"history",
+              data:arr[a]
+            }
+          })
+        }
+        this.fileList = fileList
+      },
+      beforeUpload: function(file){
+        var fileType = file.type;
+        if(fileType.indexOf('image')<0){
+          this.$message.warning('请上传图片');
+          return false;
+        }
+      },
+      handleChange(info) {
+        this.picUrl = false;
+        let fileList = info.fileList
+        if(info.file.status==='done'){
+          if(info.file.response.code === 200){
+            this.picUrl = true;
+            fileList = fileList.map((file) => {
+              if (file.response) {
+                file.url = file.response.data;
+              }
+              return file;
+            });
+          }
+          //this.$message.success(`${info.file.name} 上传成功!`);
+        }else if (info.file.status === 'error') {
+          this.$message.error(`${info.file.name} 上传失败.`);
+        }else if(info.file.status === 'removed'){
+          this.handleDelete(info.file)
+        }
+        this.fileList = fileList
+        if(info.file.status==='done' || info.file.status === 'removed'){
+          this.handlePathChange()
+        }
+      },
+      // 预览
+      handlePreview (file) {
+        this.previewImage = file.url || file.thumbUrl
+        this.previewVisible = true
+      },
+      getAvatarView(){
+        if(this.fileList.length>0){
+          let url = this.fileList[0].url
+          return url
+        }
+      },
+      handlePathChange(){
+        let uploadFiles = this.fileList
+        let path = ''
+        if(!uploadFiles || uploadFiles.length==0){
+          path = ''
+        }
+        let arr = [];
+        if(!this.isMultiple){
+          arr.push(uploadFiles[uploadFiles.length-1].response.data)
+        }else{
+          for(var a=0;a<uploadFiles.length;a++){
+            arr.push(uploadFiles[a].response.data)
+          }
+        }
+        if(arr.length>0){
+          path = arr.join(",")
+        }
+        this.$emit('change', path);
+      },
+      handleDelete(file){
+        //如有需要新增 删除逻辑
+        console.log(file)
+      },
+      handleCancel() {
+        this.close();
+        this.previewVisible = false;
+      },
+      close () {
+
+      },
+    },
+    model: {
+      prop: 'value',
+      event: 'change'
+    }
+  }
+</script>
+
+<style scoped>
+
 </style>
\ No newline at end of file
diff --git a/jshERP-web/src/components/jeecg/JUpload.vue b/jshERP-web/src/components/jeecg/JUpload.vue
index 796cd517..240ba0eb 100644
--- a/jshERP-web/src/components/jeecg/JUpload.vue
+++ b/jshERP-web/src/components/jeecg/JUpload.vue
@@ -247,7 +247,6 @@
       },
       handleChange(info) {
         console.log("--文件列表改变--")
-        debugger
         if(!info.file.status && this.uploadGoOn === false){
           info.fileList.pop();
         }
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index bb5716ea..3e6a2a73 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -795,6 +795,20 @@
               </a-row>
             </section>
           </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>
     </j-modal>
   </a-card>
@@ -814,6 +828,7 @@
         visible: false,
         model: {},
         billType: '',
+        fileList: [],
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -1036,6 +1051,20 @@
     methods: {
       show(record, 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.model = Object.assign({}, record);
         this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index db0baa9f..564b437f 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -47,6 +47,13 @@
             </a-form-item>
           </a-col>
         </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-spin>
   </j-modal>
@@ -57,12 +64,14 @@
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort } from "@/utils/util"
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
     name: "AllocationOutModal",
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
+      JUpload,
       JDate
     },
     data () {
@@ -75,6 +84,7 @@
         visible: false,
         operTimeStr: '',
         prefixNo: 'DBCK',
+        fileList:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -138,8 +148,10 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
+          this.fileList = []
         } else {
           this.model.operTime = this.model.operTimeStr
+          this.fileList = this.model.fileName
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
               'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount'))
@@ -165,6 +177,9 @@
           totalPrice += item.allPrice-0
         }
         billMain.totalPrice = totalPrice
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue
index a68dcf25..90800201 100644
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -47,6 +47,13 @@
             </a-form-item>
           </a-col>
         </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-spin>
   </j-modal>
@@ -58,12 +65,14 @@
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getAction } from '@/api/manage'
   import { getMpListShort } from "@/utils/util"
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
     name: "AssembleModal",
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
+      JUpload,
       JDate
     },
     data () {
@@ -76,6 +85,7 @@
         visible: false,
         operTimeStr: '',
         prefixNo: 'ZZD',
+        fileList:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -139,9 +149,11 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
+          this.fileList = []
         } else {
           this.model.operTime = this.model.operTimeStr
           this.model.debt = (this.model.discountLastMoney - this.model.changeAmount).toFixed(2)
+          this.fileList = this.model.fileName
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
               'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt'))
@@ -167,6 +179,9 @@
           totalPrice += item.allPrice-0
         }
         billMain.totalPrice = totalPrice
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
index 369311e3..5a132049 100644
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -47,6 +47,13 @@
             </a-form-item>
           </a-col>
         </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-spin>
   </j-modal>
@@ -58,12 +65,14 @@
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getAction } from '@/api/manage'
   import { getMpListShort } from "@/utils/util"
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
     name: "DisassembleModal",
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
+      JUpload,
       JDate
     },
     data () {
@@ -76,6 +85,7 @@
         visible: false,
         operTimeStr: '',
         prefixNo: 'CXD',
+        fileList:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -139,8 +149,10 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
+          this.fileList = []
         } else {
           this.model.operTime = this.model.operTimeStr
+          this.fileList = this.model.fileName
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
               'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount'))
@@ -166,6 +178,9 @@
           totalPrice += item.allPrice-0
         }
         billMain.totalPrice = totalPrice
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index de86effd..cfaac708 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -55,6 +55,13 @@
             </a-form-item>
           </a-col>
         </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-spin>
   </j-modal>
@@ -65,12 +72,14 @@
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort } from "@/utils/util"
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
     name: "OtherInModal",
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
+      JUpload,
       JDate
     },
     data () {
@@ -83,6 +92,7 @@
         visible: false,
         operTimeStr: '',
         prefixNo: 'QTRK',
+        fileList:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -145,8 +155,10 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
+          this.fileList = []
         } else {
           this.model.operTime = this.model.operTimeStr
+          this.fileList = this.model.fileName
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
               'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount'))
@@ -172,6 +184,9 @@
           totalPrice += item.allPrice-0
         }
         billMain.totalPrice = totalPrice
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
index 955b7166..4d8bd3e0 100644
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -55,6 +55,13 @@
             </a-form-item>
           </a-col>
         </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-spin>
   </j-modal>
@@ -65,12 +72,14 @@
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort } from "@/utils/util"
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
     name: "OtherOutModal",
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
+      JUpload,
       JDate
     },
     data () {
@@ -83,6 +92,7 @@
         visible: false,
         operTimeStr: '',
         prefixNo: 'QTCK',
+        fileList:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -145,8 +155,10 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
+          this.fileList = []
         } else {
           this.model.operTime = this.model.operTimeStr
+          this.fileList = this.model.fileName
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
               'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount'))
@@ -172,6 +184,9 @@
           totalPrice += item.allPrice-0
         }
         billMain.totalPrice = totalPrice
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 825545d2..248b54a7 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -109,6 +109,13 @@
             <a-col :lg="6" :md="12" :sm="24">
             </a-col>
           </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-spin>
     </j-modal>
@@ -125,6 +132,7 @@
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort, changeListFmtMinus} from "@/utils/util"
   import { getAction } from '@/api/manage'
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -133,6 +141,7 @@
     components: {
       ManyAccountModal,
       LinkBillList,
+      JUpload,
       JDate
     },
     data () {
@@ -145,6 +154,7 @@
         visible: false,
         operTimeStr: '',
         prefixNo: 'CGTH',
+        fileList:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -216,6 +226,7 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
+          this.fileList = []
         } else {
           this.model.operTime = this.model.operTimeStr
           this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)
@@ -227,6 +238,7 @@
           } else {
             this.manyAccountBtnStatus = false
           }
+          this.fileList = this.model.fileName
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark',
               'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt'))
@@ -252,6 +264,9 @@
           totalPrice += item.allPrice-0
         }
         billMain.totalPrice = totalPrice
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 9bb435ed..1e7fdf59 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -109,6 +109,13 @@
             <a-col :lg="6" :md="12" :sm="24">
             </a-col>
           </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-spin>
     </j-modal>
@@ -126,6 +133,7 @@
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort, changeListFmtMinus} from "@/utils/util"
   import { getAction } from '@/api/manage'
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -134,6 +142,7 @@
     components: {
       ManyAccountModal,
       LinkBillList,
+      JUpload,
       JDate
     },
     data () {
@@ -146,6 +155,7 @@
         visible: false,
         operTimeStr: '',
         prefixNo: 'CGRK',
+        fileList:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -216,8 +226,8 @@
       //调用完edit()方法之后会自动调用此方法
       editAfter() {
         if (this.action === 'add') {
-          let that = this
           this.addInit(this.prefixNo)
+          this.fileList = []
         } else {
           this.model.operTime = this.model.operTimeStr
           this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)
@@ -229,6 +239,7 @@
           } else {
             this.manyAccountBtnStatus = false
           }
+          this.fileList = this.model.fileName
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark',
             'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt'))
@@ -260,6 +271,9 @@
         }
         billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : ""
         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){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 97c37fc5..f77f2abd 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -55,6 +55,13 @@
             </a-form-item>
           </a-col>
         </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-spin>
   </j-modal>
@@ -65,12 +72,14 @@
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort } from "@/utils/util"
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
     name: "PurchaseOrderModal",
     mixins: [JEditableTableMixin,BillModalMixin],
     components: {
+      JUpload,
       JDate
     },
     data () {
@@ -85,6 +94,7 @@
         depotList: [],
         operTimeStr: '',
         prefixNo: 'CGDD',
+        fileList:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -148,8 +158,10 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
+          this.fileList = []
         } else {
           this.model.operTime = this.model.operTimeStr
+          this.fileList = this.model.fileName
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark'))
           });
@@ -174,6 +186,9 @@
           totalPrice += item.allPrice-0
         }
         billMain.totalPrice = 0-totalPrice
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index ea511b82..253d0888 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -93,6 +93,13 @@
               </a-form-item>
             </a-col>
           </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-spin>
     </j-modal>
@@ -107,6 +114,7 @@
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort } from "@/utils/util"
   import { getAction } from '@/api/manage'
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -114,6 +122,7 @@
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
       LinkBillList,
+      JUpload,
       JDate
     },
     data () {
@@ -126,6 +135,7 @@
         visible: false,
         operTimeStr: '',
         prefixNo: 'LSTH',
+        fileList:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -188,10 +198,12 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
+          this.fileList = []
         } else {
           this.model.operTime = this.model.operTimeStr
           this.model.getAmount = this.model.changeAmount
           this.model.backAmount = 0
+          this.fileList = this.model.fileName
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark',
               'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','getAmount','backAmount'))
@@ -218,6 +230,9 @@
         }
         billMain.totalPrice = 0-totalPrice
         billMain.changeAmount = 0-billMain.changeAmount
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index cc15f416..369c6304 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -95,6 +95,13 @@
             </a-form-item>
           </a-col>
         </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-spin>
   </j-modal>
@@ -105,12 +112,14 @@
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort } from "@/utils/util"
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
     name: "RetailOutModal",
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
+      JUpload,
       JDate
     },
     data () {
@@ -123,6 +132,7 @@
         visible: false,
         operTimeStr: '',
         prefixNo: 'LSCK',
+        fileList:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -185,12 +195,14 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
+          this.fileList = []
           this.$nextTick(() => {
             this.form.setFieldsValue({'payType': '现付'})
           })
         } else {
           this.model.operTime = this.model.operTimeStr
           this.model.getAmount = this.model.changeAmount
+          this.fileList = this.model.fileName
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'payType', 'remark',
               'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','getAmount'))
@@ -216,6 +228,9 @@
           totalPrice += item.allPrice-0
         }
         billMain.totalPrice = totalPrice
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 850cc226..fc620415 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -112,6 +112,13 @@
               </a-form-item>
             </a-col>
           </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-spin>
     </j-modal>
@@ -129,6 +136,7 @@
   import { getMpListShort, changeListFmtMinus } from "@/utils/util"
   import { getAction } from '@/api/manage'
   import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -137,6 +145,7 @@
     components: {
       ManyAccountModal,
       LinkBillList,
+      JUpload,
       JDate,
       JSelectMultiple
     },
@@ -150,6 +159,7 @@
         visible: false,
         operTimeStr: '',
         prefixNo: 'XSTH',
+        fileList:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -222,6 +232,7 @@
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
           this.personList.value = ''
+          this.fileList = []
         } else {
           this.model.operTime = this.model.operTimeStr
           this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)
@@ -234,6 +245,7 @@
             this.manyAccountBtnStatus = false
           }
           this.personList.value = this.model.salesMan
+          this.fileList = this.model.fileName
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark',
               'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt','salesMan'))
@@ -265,6 +277,9 @@
         }
         billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : ""
         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){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index 47b1cc31..85e18dc8 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -59,6 +59,13 @@
             </a-form-item>
           </a-col>
         </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-spin>
   </j-modal>
@@ -70,12 +77,14 @@
   import { BillModalMixin } from '../mixins/BillModalMixin'
   import { getMpListShort } from "@/utils/util"
   import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
     name: "SaleOrderModal",
     mixins: [JEditableTableMixin, BillModalMixin],
     components: {
+      JUpload,
       JDate,
       JSelectMultiple
     },
@@ -89,6 +98,7 @@
         visible: false,
         operTimeStr: '',
         prefixNo: 'XSDD',
+        fileList:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -152,9 +162,11 @@
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
           this.personList.value = ''
+          this.fileList = []
         } else {
           this.model.operTime = this.model.operTimeStr
           this.personList.value = this.model.salesMan
+          this.fileList = this.model.fileName
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'remark',
               'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','salesMan'))
@@ -180,6 +192,9 @@
           totalPrice += item.allPrice-0
         }
         billMain.totalPrice = totalPrice
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index f8be6dff..017e84c5 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -112,6 +112,13 @@
               </a-form-item>
             </a-col>
           </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-spin>
     </j-modal>
@@ -129,6 +136,7 @@
   import { getMpListShort } from "@/utils/util"
   import { getAction } from '@/api/manage'
   import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
@@ -137,6 +145,7 @@
     components: {
       ManyAccountModal,
       LinkBillList,
+      JUpload,
       JDate,
       JSelectMultiple
     },
@@ -150,6 +159,7 @@
         visible: false,
         operTimeStr: '',
         prefixNo: 'XSCK',
+        fileList:[],
         model: {},
         labelCol: {
           xs: { span: 24 },
@@ -222,6 +232,7 @@
         if (this.action === 'add') {
           this.addInit(this.prefixNo)
           this.personList.value = ''
+          this.fileList = []
         } else {
           this.model.operTime = this.model.operTimeStr
           this.model.debt = (this.model.discountLastMoney + this.model.otherMoney - this.model.changeAmount).toFixed(2)
@@ -234,6 +245,7 @@
             this.manyAccountBtnStatus = false
           }
           this.personList.value = this.model.salesMan
+          this.fileList = this.model.fileName
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'operTime', 'number', 'linkNumber', 'remark',
               'discount','discountMoney','discountLastMoney','otherMoney','accountId','changeAmount','debt','salesMan'))
@@ -264,6 +276,9 @@
         }
         billMain.accountIdList = this.accountIdList.length>0 ? JSON.stringify(this.accountIdList) : ""
         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){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue
index bc5e09c8..849077a3 100644
--- a/jshERP-web/src/views/financial/AdvanceInList.vue
+++ b/jshERP-web/src/views/financial/AdvanceInList.vue
@@ -123,7 +123,9 @@
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '操作员', dataIndex: 'userName',width:80},
           { 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: '操作',
diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue
index 5801380b..84dab1fc 100644
--- a/jshERP-web/src/views/financial/GiroList.vue
+++ b/jshERP-web/src/views/financial/GiroList.vue
@@ -122,7 +122,7 @@
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '操作员', dataIndex: 'userName',width:80},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
-          { title: '合计', dataIndex: 'totalPrice',width:80},
+          { title: '实付金额', dataIndex: 'changeAmount',width:80},
           { title: '备注', dataIndex: 'remark',width:200},
           {
             title: '操作',
diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue
index abc73333..a3f6af7e 100644
--- a/jshERP-web/src/views/financial/ItemInList.vue
+++ b/jshERP-web/src/views/financial/ItemInList.vue
@@ -123,7 +123,7 @@
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '操作员', dataIndex: 'userName',width:80},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
-          { title: '合计', dataIndex: 'totalPrice',width:80},
+          { title: '收入金额', dataIndex: 'changeAmount',width:80},
           { title: '备注', dataIndex: 'remark',width:200},
           {
             title: '操作',
diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue
index 751e0658..f7910e2e 100644
--- a/jshERP-web/src/views/financial/ItemOutList.vue
+++ b/jshERP-web/src/views/financial/ItemOutList.vue
@@ -123,7 +123,7 @@
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '操作员', dataIndex: 'userName',width:80},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
-          { title: '合计', dataIndex: 'totalPrice',width:80},
+          { title: '支出金额', dataIndex: 'changeAmount',width:80},
           { title: '备注', dataIndex: 'remark',width:200},
           {
             title: '操作',
diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue
index e2d86e0f..8f343aaa 100644
--- a/jshERP-web/src/views/financial/MoneyInList.vue
+++ b/jshERP-web/src/views/financial/MoneyInList.vue
@@ -123,7 +123,9 @@
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '操作员', dataIndex: 'userName',width:80},
           { 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: '操作',
diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue
index bb23d8db..47851eba 100644
--- a/jshERP-web/src/views/financial/MoneyOutList.vue
+++ b/jshERP-web/src/views/financial/MoneyOutList.vue
@@ -123,7 +123,9 @@
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '操作员', dataIndex: 'userName',width:80},
           { 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: '操作',
diff --git a/jshERP-web/src/views/financial/dialog/DebtBillList.vue b/jshERP-web/src/views/financial/dialog/DebtBillList.vue
index cfb1bf74..ab7e4f71 100644
--- a/jshERP-web/src/views/financial/dialog/DebtBillList.vue
+++ b/jshERP-web/src/views/financial/dialog/DebtBillList.vue
@@ -115,7 +115,7 @@
           },
           { title: '单据日期', dataIndex: 'operTimeStr',width:130},
           { title: '操作员', dataIndex: 'userName',width:60},
-          { title: '应收欠款', dataIndex: 'needDebt',width:70,
+          { title: '欠款', dataIndex: 'needDebt',width:70,
             customRender:function (text,record,index) {
               return (record.discountLastMoney - record.changeAmount).toFixed(2);
             }
@@ -146,6 +146,13 @@
         this.queryParam.subType = subType
         this.queryParam.status = status
         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.visible = true;
         this.loadData(1)
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index f12e256f..d74d312d 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -182,12 +182,12 @@
             </a-row>
             <a-row class="form-row" :gutter="24">
               <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款账户">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入账户">
                   {{model.accountName}}
                 </a-form-item>
               </a-col>
               <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款金额">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入金额">
                   {{model.changeAmount}}
                 </a-form-item>
               </a-col>
@@ -240,12 +240,12 @@
             </a-row>
             <a-row class="form-row" :gutter="24">
               <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款账户">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支出账户">
                   {{model.accountName}}
                 </a-form-item>
               </a-col>
               <a-col :span="6">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款金额">
+                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="支出金额">
                   {{model.changeAmount}}
                 </a-form-item>
               </a-col>
@@ -318,18 +318,6 @@
                 </a-form-item>
               </a-col>
             </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>
         </template>
         <!--付款-->
@@ -396,20 +384,22 @@
                 </a-form-item>
               </a-col>
             </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>
         </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>
     </j-modal>
   </a-card>
@@ -470,9 +460,9 @@
         ],
         moneyOutColumns: [
           { title: '采购单据编号',dataIndex: 'billNumber',width: '20%'},
-          { title: '应收欠款',dataIndex: 'needDebt', width: '10%'},
-          { title: '已收欠款',dataIndex: 'finishDebt', width: '10%'},
-          { title: '本次收款',dataIndex: 'eachAmount', width: '10%'},
+          { title: '应付欠款',dataIndex: 'needDebt', width: '10%'},
+          { title: '已付欠款',dataIndex: 'finishDebt', width: '10%'},
+          { title: '本次付款',dataIndex: 'eachAmount', width: '10%'},
           { title: '备注',dataIndex: 'remark', width: '20%'}
         ],
       }
@@ -493,6 +483,8 @@
             fileInfo.url= window._CONFIG['domianURL'] + '/systemConfig/static/' + fileArr[i]
             this.fileList.push(fileInfo)
           }
+        } else {
+          this.fileList = []
         }
         this.visible = true;
         this.model = Object.assign({}, record);
diff --git a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
index 3c1ff87b..ac71cac6 100644
--- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
+++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
@@ -80,6 +80,13 @@
           <a-col :lg="6" :md="12" :sm="24">
           </a-col>
         </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-spin>
   </j-modal>
@@ -89,11 +96,13 @@
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   export default {
     name: "AdvanceInModal",
     mixins: [JEditableTableMixin, FinancialModalMixin],
     components: {
+      JUpload,
       JDate
     },
     data () {
@@ -105,6 +114,7 @@
         addDefaultRowNum: 1,
         visible: false,
         model: {},
+        fileList:[],
         labelCol: {
           xs: { span: 24 },
           sm: { span: 8 },
@@ -156,12 +166,14 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit("SYF")
+          this.fileList = []
         } else {
           this.model.billTime = this.model.billTimeStr
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark',
                   'totalPrice', 'discountMoney', 'changeAmount'))
           });
+          this.fileList = this.model.fileName
           // 加载子表数据
           let params = {
             headerId: this.model.id
@@ -180,6 +192,9 @@
           totalPrice += item.eachAmount-0
         }
         billMain.totalPrice = totalPrice
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/financial/modules/GiroModal.vue b/jshERP-web/src/views/financial/modules/GiroModal.vue
index 9f980a3e..d4b8d8cd 100644
--- a/jshERP-web/src/views/financial/modules/GiroModal.vue
+++ b/jshERP-web/src/views/financial/modules/GiroModal.vue
@@ -74,6 +74,13 @@
           <a-col :lg="6" :md="12" :sm="24">
           </a-col>
         </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-spin>
   </j-modal>
@@ -83,11 +90,13 @@
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   export default {
     name: "GiroModal",
     mixins: [JEditableTableMixin, FinancialModalMixin],
     components: {
+      JUpload,
       JDate
     },
     data () {
@@ -99,6 +108,7 @@
         addDefaultRowNum: 1,
         visible: false,
         model: {},
+        fileList:[],
         labelCol: {
           xs: { span: 24 },
           sm: { span: 8 },
@@ -156,12 +166,14 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit("ZZ")
+          this.fileList = []
         } else {
           this.model.billTime = this.model.billTimeStr
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark',
               'accountId', 'changeAmount'))
           });
+          this.fileList = this.model.fileName
           // 加载子表数据
           let params = {
             headerId: this.model.id
@@ -181,6 +193,9 @@
         }
         billMain.totalPrice = 0-totalPrice
         billMain.changeAmount = 0-billMain.changeAmount
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue
index 1bcab58b..9b140cf6 100644
--- a/jshERP-web/src/views/financial/modules/ItemInModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue
@@ -63,8 +63,8 @@
         </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="收款账户">
-              <a-select placeholder="选择收款账户" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入账户">
+              <a-select placeholder="选择收入账户" v-decorator="[ 'accountId', validatorRules.accountId ]" :dropdownMatchSelectWidth="false">
                 <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
@@ -72,8 +72,8 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款金额">
-              <a-input placeholder="请输入收款金额" v-decorator.trim="[ 'changeAmount', validatorRules.changeAmount ]" />
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收入金额">
+              <a-input placeholder="请输入收入金额" v-decorator.trim="[ 'changeAmount', validatorRules.changeAmount ]" />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
@@ -81,6 +81,13 @@
           <a-col :lg="6" :md="12" :sm="24">
           </a-col>
         </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-spin>
   </j-modal>
@@ -90,11 +97,13 @@
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   export default {
     name: "ItemInModal",
     mixins: [JEditableTableMixin, FinancialModalMixin],
     components: {
+      JUpload,
       JDate
     },
     data () {
@@ -106,6 +115,7 @@
         addDefaultRowNum: 1,
         visible: false,
         model: {},
+        fileList:[],
         labelCol: {
           xs: { span: 24 },
           sm: { span: 8 },
@@ -143,12 +153,12 @@
           },
           accountId:{
             rules: [
-              { required: true, message: '请选择收款账户!' }
+              { required: true, message: '请选择收入账户!' }
             ]
           },
           changeAmount:{
             rules: [
-              { required: true, message: '请输入收款金额!' }
+              { required: true, message: '请输入收入金额!' }
             ]
           }
         },
@@ -168,12 +178,14 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit("SR")
+          this.fileList = []
         } else {
           this.model.billTime = this.model.billTimeStr
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark',
                    'accountId','changeAmount'))
           });
+          this.fileList = this.model.fileName
           // 加载子表数据
           let params = {
             headerId: this.model.id
@@ -192,6 +204,9 @@
           totalPrice += item.eachAmount-0
         }
         billMain.totalPrice = totalPrice
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
index 41c5ec28..8b302a3e 100644
--- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
@@ -81,6 +81,13 @@
           <a-col :lg="6" :md="12" :sm="24">
           </a-col>
         </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-spin>
   </j-modal>
@@ -90,11 +97,13 @@
   import { FormTypes } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { FinancialModalMixin } from '../mixins/FinancialModalMixin'
+  import JUpload from '@/components/jeecg/JUpload'
   import JDate from '@/components/jeecg/JDate'
   export default {
     name: "ItemOutModal",
     mixins: [JEditableTableMixin, FinancialModalMixin],
     components: {
+      JUpload,
       JDate
     },
     data () {
@@ -106,6 +115,7 @@
         addDefaultRowNum: 1,
         visible: false,
         model: {},
+        fileList:[],
         labelCol: {
           xs: { span: 24 },
           sm: { span: 8 },
@@ -168,12 +178,14 @@
       editAfter() {
         if (this.action === 'add') {
           this.addInit("ZC")
+          this.fileList = []
         } else {
           this.model.billTime = this.model.billTimeStr
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model,'organId', 'handsPersonId', 'billTime', 'billNo', 'remark',
               'accountId','changeAmount'))
           });
+          this.fileList = this.model.fileName
           // 加载子表数据
           let params = {
             headerId: this.model.id
@@ -193,6 +205,9 @@
         }
         billMain.totalPrice = 0-totalPrice
         billMain.changeAmount = 0-billMain.changeAmount
+        if(this.fileList && this.fileList.length > 0) {
+          billMain.fileName = this.fileList
+        }
         if(this.model.id){
           billMain.id = this.model.id
         }
diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
index 40d134c7..62527594 100644
--- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
@@ -155,10 +155,10 @@
           loading: false,
           dataSource: [],
           columns: [
-            { title: '销售单据编号',key: 'billNumber',width: '20%', type: FormTypes.input, 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: 'eachAmount', width: '10%', type: FormTypes.inputNumber, statistics: true, placeholder: '请输入${title}',
+            { title: '采购单据编号',key: 'billNumber',width: '20%', type: FormTypes.input, 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: 'eachAmount', width: '10%', type: FormTypes.inputNumber, statistics: true, placeholder: '请输入${title}',
               validateRules: [{ required: true, message: '${title}不能为空' }]
             },
             { title: '备注',key: 'remark', width: '20%', type: FormTypes.input, placeholder: '请输入${title}'}
diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index b3c47ac1..a7e09a58 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -139,6 +139,16 @@
               :rowSelection="false"
               :actionButton="false"/>
           </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-form>
     </a-spin>
@@ -150,12 +160,15 @@
   import { FormTypes, VALIDATE_NO_PASSED, getRefPromise, validateFormAndTables } from '@/utils/JEditableTableUtil'
   import {queryMaterialCategoryTreeList,checkMaterial,checkMaterialBarCode} from '@/api/api'
   import { httpAction, getAction } from '@/api/manage'
+  import JImageUpload from '@/components/jeecg/JImageUpload'
   import JDate from '@/components/jeecg/JDate'
   import Vue from 'vue'
   export default {
     name: "MaterialModal",
     components: {
-      JDate, JEditableTable
+      JImageUpload,
+      JDate,
+      JEditableTable
     },
     data () {
       return {
@@ -164,6 +177,7 @@
         categoryTree: [],
         unitList: [],
         depotList: [],
+        fileList:[],
         unitStatus: false,
         manyUnitStatus: true,
         unitChecked: false,
@@ -272,6 +286,13 @@
         this.model = Object.assign({}, record);
         this.activeKey = '1'
         this.visible = true;
+        if(JSON.stringify(record) === '{}') {
+          this.fileList = []
+        } else {
+          setTimeout(() => {
+            this.fileList = record.imgName
+          }, 5)
+        }
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model, 'name', 'standard', 'unit', 'unitId', 'model', 'color',
             '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'
               if (this.model.id) {