|  | @@ -234,7 +234,6 @@
 | 
	
		
			
				|  |  |          stripe
 | 
	
		
			
				|  |  |          show-summary
 | 
	
		
			
				|  |  |          :disabled="disabled"
 | 
	
		
			
				|  |  | -        @selection-change="Collectionoptions"
 | 
	
		
			
				|  |  |          :summary-method="warehouseDrSummaries"
 | 
	
		
			
				|  |  |        >
 | 
	
		
			
				|  |  |          <el-table-column type="selection" width="55" align="center"/>
 | 
	
	
		
			
				|  | @@ -286,6 +285,31 @@
 | 
	
		
			
				|  |  |              </el-select>
 | 
	
		
			
				|  |  |            </template>
 | 
	
		
			
				|  |  |          </el-table-column>
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +        <el-table-column
 | 
	
		
			
				|  |  | +          prop="fFeeid"
 | 
	
		
			
				|  |  | +          header-align="center"
 | 
	
		
			
				|  |  | +          align="center"
 | 
	
		
			
				|  |  | +          width="180px"
 | 
	
		
			
				|  |  | +          label="费用名称"
 | 
	
		
			
				|  |  | +        >
 | 
	
		
			
				|  |  | +          <template slot-scope="scope">
 | 
	
		
			
				|  |  | +            <el-select
 | 
	
		
			
				|  |  | +              style="width: 80%"
 | 
	
		
			
				|  |  | +              v-model="scope.row.fFeeid"
 | 
	
		
			
				|  |  | +              filterable
 | 
	
		
			
				|  |  | +            >
 | 
	
		
			
				|  |  | +              <el-option
 | 
	
		
			
				|  |  | +                v-for="(dict, index) in fFeeid_s"
 | 
	
		
			
				|  |  | +                :key="index.fId"
 | 
	
		
			
				|  |  | +                :label="dict.fName"
 | 
	
		
			
				|  |  | +                :value="dict.fId"
 | 
	
		
			
				|  |  | +              ></el-option>
 | 
	
		
			
				|  |  | +            </el-select>
 | 
	
		
			
				|  |  | +          </template>
 | 
	
		
			
				|  |  | +        </el-table-column>
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          <el-table-column
 | 
	
		
			
				|  |  |            prop="fInventoryDays"
 | 
	
		
			
				|  |  |            header-align="center"
 | 
	
	
		
			
				|  | @@ -453,6 +477,28 @@
 | 
	
		
			
				|  |  |            </template>
 | 
	
		
			
				|  |  |          </el-table-column>
 | 
	
		
			
				|  |  |          <el-table-column
 | 
	
		
			
				|  |  | +          prop="fFeeid"
 | 
	
		
			
				|  |  | +          header-align="center"
 | 
	
		
			
				|  |  | +          align="center"
 | 
	
		
			
				|  |  | +          width="180px"
 | 
	
		
			
				|  |  | +          label="费用名称"
 | 
	
		
			
				|  |  | +        >
 | 
	
		
			
				|  |  | +          <template slot-scope="scope">
 | 
	
		
			
				|  |  | +            <el-select
 | 
	
		
			
				|  |  | +              style="width: 80%"
 | 
	
		
			
				|  |  | +              v-model="scope.row.fFeeid"
 | 
	
		
			
				|  |  | +              filterable
 | 
	
		
			
				|  |  | +            >
 | 
	
		
			
				|  |  | +              <el-option
 | 
	
		
			
				|  |  | +                v-for="(dict, index) in fFeeid_s"
 | 
	
		
			
				|  |  | +                :key="index.fId"
 | 
	
		
			
				|  |  | +                :label="dict.fName"
 | 
	
		
			
				|  |  | +                :value="dict.fId"
 | 
	
		
			
				|  |  | +              ></el-option>
 | 
	
		
			
				|  |  | +            </el-select>
 | 
	
		
			
				|  |  | +          </template>
 | 
	
		
			
				|  |  | +        </el-table-column>
 | 
	
		
			
				|  |  | +        <el-table-column
 | 
	
		
			
				|  |  |            prop="fInventoryDays"
 | 
	
		
			
				|  |  |            header-align="center"
 | 
	
		
			
				|  |  |            align="center"
 | 
	
	
		
			
				|  | @@ -559,6 +605,7 @@ export default {
 | 
	
		
			
				|  |  |        agreementList: [],
 | 
	
		
			
				|  |  |        warehouseCrList: [],
 | 
	
		
			
				|  |  |        fCNameOptions: [],
 | 
	
		
			
				|  |  | +      fFeeid_s:[],
 | 
	
		
			
				|  |  |        fStltypeOptions: [],
 | 
	
		
			
				|  |  |        jFeetunitOptions: [],
 | 
	
		
			
				|  |  |        KHblnoOptions: [],
 | 
	
	
		
			
				|  | @@ -581,9 +628,18 @@ export default {
 | 
	
		
			
				|  |  |    created() {
 | 
	
		
			
				|  |  |      allInformation().then(res => {
 | 
	
		
			
				|  |  |        console.log(res)
 | 
	
		
			
				|  |  | -      this.jFeetunitOptions = res.data.cntrList
 | 
	
		
			
				|  |  | -      this.businessTypeOption = res.data.pierList
 | 
	
		
			
				|  |  | -      this.KHblnoOptions = res.data.corpList
 | 
	
		
			
				|  |  | +      if(res.data.corpList){
 | 
	
		
			
				|  |  | +        this.KHblnoOptions = res.data.corpList
 | 
	
		
			
				|  |  | +      }
 | 
	
		
			
				|  |  | +      if(res.data.pierList){
 | 
	
		
			
				|  |  | +        this.businessTypeOption = res.data.pierList
 | 
	
		
			
				|  |  | +      }
 | 
	
		
			
				|  |  | +      if(res.data.cntrList){
 | 
	
		
			
				|  |  | +        this.jFeetunitOptions = res.data.cntrList
 | 
	
		
			
				|  |  | +      }
 | 
	
		
			
				|  |  | +      if(res.data.fees){
 | 
	
		
			
				|  |  | +        this.fFeeid_s = res.data.fees
 | 
	
		
			
				|  |  | +      }
 | 
	
		
			
				|  |  |      })
 | 
	
		
			
				|  |  |      this.getList()
 | 
	
		
			
				|  |  |    },
 | 
	
	
		
			
				|  | @@ -687,23 +743,13 @@ export default {
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      addpayment() {
 | 
	
		
			
				|  |  |        this.warehouseCrList.push({
 | 
	
		
			
				|  |  | -        fCorpid: null,
 | 
	
		
			
				|  |  | -        fFeeid: null,
 | 
	
		
			
				|  |  | +        fCorpid: '',
 | 
	
		
			
				|  |  |          fFeeUnitid: '',
 | 
	
		
			
				|  |  | -        fQty: null,
 | 
	
		
			
				|  |  | -        fUnitprice: null,
 | 
	
		
			
				|  |  | -        fAmount: null,
 | 
	
		
			
				|  |  | -        fCurrency: 'RMB',
 | 
	
		
			
				|  |  | -        fExrate: '1',
 | 
	
		
			
				|  |  | -        fTaxrate: '',
 | 
	
		
			
				|  |  | -        fCxrate: null,
 | 
	
		
			
				|  |  | -        fRate: null,
 | 
	
		
			
				|  |  | -        remarks: null,
 | 
	
		
			
				|  |  | -        fMblno: '',
 | 
	
		
			
				|  |  | -        fProductName: '',
 | 
	
		
			
				|  |  | -        fMarks: '',
 | 
	
		
			
				|  |  | -        fBusinessType: '',
 | 
	
		
			
				|  |  | -        fSrcTypeId: 0
 | 
	
		
			
				|  |  | +        fInventoryDays: '',
 | 
	
		
			
				|  |  | +        fQty: '',
 | 
	
		
			
				|  |  | +        fUnitprice: '',
 | 
	
		
			
				|  |  | +        fAmt: '',
 | 
	
		
			
				|  |  | +        fFeeid:''
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  |        this.fWbuOptions = []
 | 
	
		
			
				|  |  |        let queryParams = { pageNum: 1, fDc: 'C' }
 | 
	
	
		
			
				|  | @@ -760,7 +806,8 @@ export default {
 | 
	
		
			
				|  |  |          fInventoryDays: '',
 | 
	
		
			
				|  |  |          fQty: '',
 | 
	
		
			
				|  |  |          fUnitprice: '',
 | 
	
		
			
				|  |  | -        fAmt: ''
 | 
	
		
			
				|  |  | +        fAmt: '',
 | 
	
		
			
				|  |  | +        fFeeid:''
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  |        this.fWbuOptions = []
 | 
	
		
			
				|  |  |        let queryParams = { pageNum: 1, fDc: 'D' }
 | 
	
	
		
			
				|  | @@ -768,19 +815,6 @@ export default {
 | 
	
		
			
				|  |  |          this.fDNameOptions = response.rows
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | -    fWRemoteMethod(name) {
 | 
	
		
			
				|  |  | -      if (name == null || name === '') {
 | 
	
		
			
				|  |  | -        return false
 | 
	
		
			
				|  |  | -      }
 | 
	
		
			
				|  |  | -      let queryParams = { pageNum: 1, fDc: 'C', fName: name }
 | 
	
		
			
				|  |  | -      listFees(queryParams).then((response) => {
 | 
	
		
			
				|  |  | -        this.fCNameOptions = response.rows
 | 
	
		
			
				|  |  | -      })
 | 
	
		
			
				|  |  | -      let query = { pageNum: 1, fDc: 'D', fName: name }
 | 
	
		
			
				|  |  | -      listFees(query).then((response) => {
 | 
	
		
			
				|  |  | -        this.fDNameOptions = response.rows
 | 
	
		
			
				|  |  | -      })
 | 
	
		
			
				|  |  | -    },
 | 
	
		
			
				|  |  |      // 付款合计
 | 
	
		
			
				|  |  |      warehouseDrSummaries(param) {
 | 
	
		
			
				|  |  |        const { columns, data } = param
 | 
	
	
		
			
				|  | @@ -810,22 +844,6 @@ export default {
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  |        return sums
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | -    Collectionoptions(selection) {
 | 
	
		
			
				|  |  | -      this.Collectionoptionss = selection
 | 
	
		
			
				|  |  | -      for (let lest in this.fWbuOptions) {
 | 
	
		
			
				|  |  | -        for (let li in this.Collectionoptionss) {
 | 
	
		
			
				|  |  | -          if (
 | 
	
		
			
				|  |  | -            this.fWbuOptions[lest].fId === this.Collectionoptionss[li].fFeeid
 | 
	
		
			
				|  |  | -          ) {
 | 
	
		
			
				|  |  | -            this.$set(
 | 
	
		
			
				|  |  | -              this.Collectionoptionss[li],
 | 
	
		
			
				|  |  | -              'fFeeids',
 | 
	
		
			
				|  |  | -              this.fWbuOptions[lest].fName
 | 
	
		
			
				|  |  | -            )
 | 
	
		
			
				|  |  | -          }
 | 
	
		
			
				|  |  | -        }
 | 
	
		
			
				|  |  | -      }
 | 
	
		
			
				|  |  | -    }
 | 
	
		
			
				|  |  |    }
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  </script>
 |