前端

src/views/profitable/cashout.vue

@@ -79,7 +79,7 @@
             <el-input v-if='deptBudgetList.purpose != "合同费用"||deptBudgetList.purpose == "合同费用"&&deptBudgetList.type!="非粮款"' class='input50 input_css' placeholder="输入费用名称，1-15个字"
               v-model="deptBudgetList.expenseName"></el-input>
             <el-select v-else v-model="deptBudgetList.expenseName" filterable placeholder="选择费用名称" class="typeselect">
-              <el-option v-for="item in expenseNameList" :key="item.value" :label="item.vlaue" :value="item.value"
+              <el-option v-for="item in expenseNameList" :key="item.constValue" :label="item.constValue" :value="item.constValue"
                 style="color: #8890b1" />
             </el-select>
           </el-form-item>
@@ -103,7 +103,7 @@
             </el-input>
           </el-form-item>
           <el-form-item label-width='100px' label="附件">
-            <ws-upload ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId"
+            <ws-upload ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx, .zip" :comp-id="compId"
               :appendix-ids="deptBudgetList.addressUrl" :size-limit="size" :limit="99" @onChange="onChange" />
             <!-- <el-upload ref='uploadfiles' :file-list='dataList' :action="global.uploadPath" :on-preview="Previewf"
             :on-success="handlefujian" :on-remove="handleRemove" class="photo2" >
@@ -262,6 +262,9 @@
 </template>
 <script>
 import WsUpload from '@/components/WsUpload'
+import {
+    packList,
+  } from '@/model/contarct/index'
 import { setexpense, getcontract, getwarehouse, addexenseinfo, getwarehousingorder, getexpensecount, getpayeeinfo, getwarehousingorderList } from '@/model/profitable/index'
 export default {
   components: {
@@ -272,13 +275,7 @@ export default {
       selected:false,
       lixiSelected:true,
       customerList: [],
-      expenseNameList:[{value:'仓储费',},{value:'超期保管费',},
-      {value:'堆天堆存费',},{value:'保险费',},{value:'利息费',},{value:'滞纳金',}
-      ,{value:'违约金',},{value:'报港费',},{value:'港杂费',},{value:'袋装费',},
-      {value:'平仓费',},{value:'装卸费',},{value:'出库费',},{value:'入库费',},
-      {value:'通风笼费',},{value:'煤款',},{value:'电费',},{value:'水电费',},
-      {value:'移库费',},{value:'汽运费',},{value:'火运费',},{value:'海运费',},
-      {value:'平仓费',},{value:'贴水费',}],
+      expenseNameList:[],
       goodsSource: '',
       value2: '',
       endDate: '',
@@ -431,6 +428,11 @@ export default {
         this.Num = str.substr(-4)
         console.log(this.Num)
       })
+      packList({ constId: 'EX1' }).toPromise()
+      .then(response => {
+        // this.Num=response
+        this.expenseNameList =response
+      })
     // this.makeWordData = this.getData(2)
     // this.initCharts()
     // this.getPassYearFormatDate()

src/views/profitable/cashoutedit.vue

@@ -52,7 +52,7 @@
             <el-input v-if='deptBudgetList.purpose != "合同费用"||deptBudgetList.purpose == "合同费用"&&deptBudgetList.type!="非粮款"' class='input50 input_css' placeholder="输入费用名称，1-15个字"
               v-model="deptBudgetList.expenseName"></el-input>
             <el-select v-else v-model="deptBudgetList.expenseName" filterable placeholder="选择费用名称" class="typeselect">
-              <el-option v-for="item in expenseNameList" :key="item.value" :label="item.vlaue" :value="item.value"
+              <el-option v-for="item in expenseNameList" :key="item.constValue" :label="item.constValue" :value="item.constValue"
                 style="color: #8890b1" />
             </el-select>
           </el-form-item>
@@ -163,6 +163,9 @@
 </template>
 <script>
   import WsUpload from '@/components/WsUpload'
+  import {
+    packList,
+  } from '@/model/contarct/index'
   import {setexpense,getcontract,getwarehouse,editexenseinfo,getwarehousingorder,lookexenseinfo,} from '@/model/profitable/index'
   export default {
     components: {
@@ -173,13 +176,7 @@
         selected:false,
         lixiSelected:true,
         value: [],
-        expenseNameList:[{value:'仓储费',},{value:'超期保管费',},
-      {value:'堆天堆存费',},{value:'保险费',},{value:'利息费',},{value:'滞纳金',}
-      ,{value:'违约金',},{value:'报港费',},{value:'港杂费',},{value:'袋装费',},
-      {value:'平仓费',},{value:'装卸费',},{value:'出库费',},{value:'入库费',},
-      {value:'通风笼费',},{value:'煤款',},{value:'电费',},{value:'水电费',},
-      {value:'移库费',},{value:'汽运费',},{value:'火运费',},{value:'海运费',},
-      {value:'平仓费',},{value:'贴水费',}],
+        expenseNameList:[],
         profitList: [{
           name: '玉米',
           count: 2000,
@@ -224,6 +221,11 @@
       // this.makeWordData = this.getData(2)
       // this.initCharts()
       // this.getPassYearFormatDate()
+      packList({ constId: 'EX1' }).toPromise()
+      .then(response => {
+        // this.Num=response
+        this.expenseNameList =response
+      })
       this.getList()
     },
      computed: {

src/views/profitable/receipt.vue

@@ -46,8 +46,8 @@
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
             <el-input v-if='deptBudgetList.purpose != "合同费用"||deptBudgetList.purpose == "合同费用"&&deptBudgetList.type!="非粮款"' class='input50 input_css' placeholder="输入费用名称，1-15个字"
               v-model="deptBudgetList.expenseName"></el-input>
-            <el-select v-else v-model="deptBudgetList.expenseName" filterable placeholder="选择费用名称" class="typeselect">
-              <el-option v-for="item in expenseNameList" :key="item.value" :label="item.vlaue" :value="item.value"
+              <el-select v-else v-model="deptBudgetList.expenseName" filterable placeholder="选择费用名称" class="typeselect">
+              <el-option v-for="item in expenseNameList" :key="item.constValue" :label="item.constValue" :value="item.constValue"
                 style="color: #8890b1" />
             </el-select>
           </el-form-item>
@@ -78,6 +78,9 @@
 </template>
 <script>
     import WsUpload from '@/components/WsUpload'
+    import {
+    packList,
+  } from '@/model/contarct/index'
   import {setexpense,getcontract,getwarehouse,addexenseinfo,getwarehousingorder} from '@/model/profitable/index'
   export default {
     components: {
@@ -90,13 +93,7 @@
           name: '玉米',
           count: 2000,
         }],
-        expenseNameList:[{value:'仓储费',},{value:'超期保管费',},
-      {value:'堆天堆存费',},{value:'保险费',},{value:'利息费',},{value:'滞纳金',}
-      ,{value:'违约金',},{value:'报港费',},{value:'港杂费',},{value:'袋装费',},
-      {value:'平仓费',},{value:'装卸费',},{value:'出库费',},{value:'入库费',},
-      {value:'通风笼费',},{value:'煤款',},{value:'电费',},{value:'水电费',},
-      {value:'移库费',},{value:'汽运费',},{value:'火运费',},{value:'海运费',},
-      {value:'平仓费',},{value:'贴水费',}],
+        expenseNameList:[],
         mode:'全部分配',
         ware:'指定仓库',
         dates:'固定日期',
@@ -130,6 +127,11 @@
       }
     },
     activated() {
+      packList({ constId: 'EX1' }).toPromise()
+      .then(response => {
+        // this.Num=response
+        this.expenseNameList =response
+      })
       this.getList()
     },
     methods: {