成本修改

src/components/director/directorOrderDetails.vue

@@ -305,10 +305,8 @@
           </el-table-column>
           <el-table-column prop="name" label="信息" width="300" align="center">
             <template slot-scope="scope">
-
-                <div>类型：{{scope.row.CarTypeName}}，{{scope.row.CarType==5? (scope.row.IsSpell==1?'拼车':'不拼车'):''}}</div>
-                <div>车牌号：{{scope.row.CarNumber}}，{{scope.row.CarName}},{{scope.row.CarColorName}}</div>
-                <div>导游：{{scope.row.GuideName}}</div>
+                <div>车辆：{{scope.row.CarName}}、{{scope.row.CarColorName}}、{{scope.row.CarNumber}}</div>
+                <div>导游：{{scope.row.GuideName}}、服务类型：{{scope.row.CarTypeName}}、{{scope.row.CarType==5? (scope.row.IsSpell==1?'拼车':'不拼车'):''}}</div>
 
             </template>
           </el-table-column>
@@ -337,7 +335,7 @@
           <el-form-item label="商品小计">
             ￥{{dataInfo.PreferPrice}}
           </el-form-item>
-          <el-form-item label="保险成本">
+          <el-form-item label="其中保险金额">
             ￥{{dataInfo.InsuranceMoney}}
           </el-form-item>
           <el-form-item label="实付款">

src/components/director/directorOrderList.vue

@@ -167,17 +167,17 @@
                       </div>
                       <div style="margin-bottom: 5px;">
                         <span style="margin-right: 10px;">
-                          {{list.CarName}}、{{list.CarColorName}},车牌号:{{list.CarNumber}}
-
+                         车辆:{{list.CarName}}、{{list.CarColorName}}、{{list.CarNumber}}
                         </span>
 
                       </div>
                       <div style="margin-bottom: 5px;">
+
                         <span style="margin-right: 10px;">
-                         类型:{{list.CarTypeName}}，{{list.CarType==5? (list.IsSpell==1?'拼车':'不拼车'):''}}
+                         导游:{{list.GuideName}}
                         </span>
                         <span style="margin-right: 10px;">
-                         导游:{{list.GuideName}}
+                         服务类型：{{list.CarTypeName}}、{{list.CarType==5? (list.IsSpell==1?'拼车':'不拼车'):''}}
                         </span>
                       </div>
 

src/components/orderMan/CostManagement.vue

@@ -7,6 +7,13 @@
     </div>
     <div class="content">
       <div >
+
+        <span>商品分类</span>
+        <el-select style="margin:0 10px" class="w100" @change="msg.pageIndex=1,getList()" v-model="msg.OrderClassify" size="small"
+                   placeholder="请选择">
+          <el-option v-for="item in OrderClass" :key="item.Id" :label="item.Name" :value="item.Id">
+          </el-option>
+        </el-select>
         <span>供应商</span>
         <el-select style="margin:0 10px" class="w100" @change="msg.pageIndex=1,getList()" v-model="msg.SupplierId" size="small"
           placeholder="请选择">
@@ -69,12 +76,17 @@
         </el-table-column>
         <el-table-column prop="CostMoney" label="成本" width="80">
         </el-table-column>
-        <el-table-column prop="FreightCostMoney" label="快递成本" width="80">
+        <el-table-column prop="CostFinanceId" label="成本单据" width="100">
         </el-table-column>
-        <el-table-column prop="FreightFinanceId" label="运费成本单据" width="120">
+        <el-table-column prop="FreightCostMoney" label="快递成本" width="80" v-if="msg.OrderClassify==0">
         </el-table-column>
-        <el-table-column prop="CostFinanceId" label="成本单据" width="100">
+        <el-table-column prop="FreightFinanceId" label="运费成本单据" width="120" v-if="msg.OrderClassify==0">
         </el-table-column>
+        <el-table-column prop="InsuranceCostMoney" label="保险成本" width="80" v-if="msg.OrderClassify==1">
+        </el-table-column>
+        <el-table-column prop="InsuranceFinanceId" label="保险成本单据" width="120" v-if="msg.OrderClassify==1">
+        </el-table-column>
+
       </el-table>
       <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize" :current-page.sync="msg.pageIndex"
                      :page-sizes="[15, 30, 45, 60,75,90]"
@@ -112,12 +124,19 @@
           IsSelectAll:0,
           GoodsName:'',
           OrderNo:'',
+          OrderClassify:0,
         },
         SupplierData: [], //供应商data
         MakingType:[
           {Id:0,Name:'全部'},
           {Id:1,Name:'成本'},
           {Id:2,Name:'运费'},
+          {Id:3,Name:'保险'},
+        ],
+        OrderClass:[
+          {Id:0,Name:'商品订单'},
+          {Id:1,Name:'司导订单'},
+
         ],
         dateList: [], //日期
         total: 0,