费用

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -44,7 +44,7 @@
           :on-change="importClick" :show-file-list="false"
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
           :auto-upload="false">
-          <ws-button type="primary">导入</ws-button>
+          <ws-button type="primary">导入(移库)</ws-button>
         </el-upload>
       <el-table class="forData" :data="weighingRecordList" style="width: 100%; margin-top: 20px" height="780"
         @selection-change="handleSelectionChange">

src/views/profitable/cashout.vue

@@ -12,7 +12,7 @@
     <div class="center">
      
       <div>
-        <el-form label-position="left"><div style='margin:30px 0 30px;'>基本信息</div>
+        <el-form label-position="left"><div style='margin:20px -30px;font-weight:bold'>基本信息</div>
           <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
             <ws-select v-model="deptBudgetList.purpose" placeholder="" class="typeselect" >
               <ws-option label="合同费用" value="合同费用"

src/views/profitable/expensemanagementdetails.vue

@@ -44,7 +44,7 @@
               <span v-else>{{ scope.$index + 1 }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="costNo" label="编号">
+          <el-table-column prop="costNo" label="编号" width="100px">
           </el-table-column>
           <el-table-column prop="feeType" label="类型">
             <template slot-scope="scope">
@@ -52,7 +52,7 @@
               <div v-if='scope.row.expensesType==2'>支出</div>
             </template>
           </el-table-column>
-          <el-table-column prop="purpose" label="用途">
+          <el-table-column prop="purpose" label="用途" width="150px">
             <template slot-scope="scope">
               <div v-if='scope.row.expensesPurpose==1'>合同费用
                 <span v-if='scope.row.costType==1'>-粮款</span>
@@ -71,6 +71,18 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column prop="purpose" label="流向" width="200px">
+            <template slot-scope="scope">
+              <div v-if='scope.row.expensesPurpose==1'>
+                <span>{{ scope.row.contractNo }}</span>
+              </div>
+              <div v-if='scope.row.expensesPurpose==3'>
+                <span>{{scope.row.warehouseName}}</span>
+              </div>
+              <div v-if='scope.row.expensesPurpose==5'>中天昊元
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column prop="expenseName" label="费用名称"></el-table-column>
           <el-table-column prop="amountMoney" width="120" label="费用金额（元）"></el-table-column>
           <el-table-column prop="unallocatedAmount" width="100" label="未分配（元）"></el-table-column>

src/views/profitable/expensemanagentlook.vue

@@ -10,28 +10,21 @@
         </el-button></el-col>
     </el-row>
     <div class="center">
-     <div style='margin:0 auto 10px;width:90%;'>基本信息</div>
+     <div style='margin:0 50px 10px;width:90%;font-weight:bold'>基本信息</div>
       <div>
         <el-form label-position="left">
-          <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
-            <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect" >
-              <ws-option label="合同费用" value="1"
-                style="color: #8890b1" />
-                <ws-option label="库点费用" value="3"
-                style="color: #8890b1" />
-                <ws-option label="经营性费用" value="5"
-                style="color: #8890b1" />
-            </ws-select>
+          <el-form-item label-width='100px' label="用途" span="1" prop="expensesPurpose">
+              <span v-if='deptBudgetList.expensesPurpose==1'>合同费用</span>
+              <span v-if='deptBudgetList.expensesPurpose==3'>库点费用</span>
+              <span v-if='deptBudgetList.expensesPurpose==5'>经营性费用</span>
           </el-form-item>
-          <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="contractNo" class="readonly">
-            <ws-select disabled v-model="deptBudgetList.costType" placeholder="" class="typeselect" >
-                <ws-option label="粮款" value="1" style="color: #8890b1" />
-                <ws-option label="非粮款" value="3" style="color: #8890b1" />
-                <ws-option label="保证金" value="5" style="color: #8890b1" />
-            </ws-select>
+          <el-form-item label-width='100px' label="类型" span="1" prop="costType">
+              <span v-if='deptBudgetList.costType==1'>粮款</span>
+              <span v-if='deptBudgetList.costType==3'>非粮款</span>
+              <span v-if='deptBudgetList.costType==5'>保证金</span>
           </el-form-item>
-          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
-          {{deptBudgetList.warehouse}}
+          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouseName" class="readonly">
+          {{deptBudgetList.warehouseName}}
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==1' label-width='100px' label="合同编号" span="1" prop="contractNo" class="readonly">
           {{deptBudgetList.contractNo}}

src/views/profitable/receipt.vue

@@ -11,7 +11,7 @@
     </el-row>
     <div class="center">
       <div>
-        <el-form label-position='left'><div style='margin:30px 0;'>基本信息</div>
+        <el-form label-position='left'><div style='margin:20px -30px;font-weight:bold'>基本信息</div>
           <el-form-item  label-width='100px' label="用途" span="1" prop="contractNo" class="readonly">
             <ws-select v-model="deptBudgetList.purpose" placeholder="" class="typeselect" >
               <ws-option label="合同费用" value="1"