Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/profitable/expensemanagementdetails.vue

@@ -59,16 +59,18 @@
                 <span v-if='scope.row.costType==3'>-非粮款</span>
                 <span v-if='scope.row.costType==5'>-保证金</span>
               </div>
-              <div v-if='scope.row.expensesPurpose==3'>库点费用
+              <div v-else-if='scope.row.expensesPurpose==3'>库点费用
                 <span v-if='scope.row.costType==1'>-粮款</span>
                 <span v-if='scope.row.costType==3'>-非粮款</span>
                 <span v-if='scope.row.costType==5'>-保证金</span>
               </div>
-              <div v-if='scope.row.expensesPurpose==5'>经营性费用
+              <div v-else-if='scope.row.expensesPurpose==5'>经营性费用
                 <span v-if='scope.row.costType==1'>-粮款</span>
                 <span v-if='scope.row.costType==3'>-非粮款</span>
                 <span v-if='scope.row.costType==5'>-保证金</span>
               </div>
+               <div v-else>{{scope.row.costType}}
+              </div>
             </template>
           </el-table-column>
           <el-table-column prop="purpose" label="流向" width="200px">
@@ -76,10 +78,12 @@
               <div v-if='scope.row.expensesPurpose==1'>
                 <span>{{ scope.row.contractNo }}</span>
               </div>
-              <div v-if='scope.row.expensesPurpose==3'>
+              <div v-else-if='scope.row.expensesPurpose==3'>
                 <span>{{scope.row.warehouseName}}</span>
               </div>
-              <div v-if='scope.row.expensesPurpose==5'>中天昊元
+              <div v-else-if='scope.row.expensesPurpose==5'>中天昊元
+              </div>
+              <div v-else>{{scope.row.expensesPurpose}}
               </div>
             </template>
           </el-table-column>