Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/basicdata/corps/index.vue

@@ -397,31 +397,31 @@
       <el-table v-loading="loading" :data="contactList" @selection-change="handleSelectionChange">
 
         <el-table-column label="编号" align="center" prop="fNo" >
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.fNo"  placeholder="编号" />
           </template>
         </el-table-column>
 
         <el-table-column label="名称" align="center" prop="fName" >
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.fName"  placeholder="名称" />
           </template>
         </el-table-column>
 
         <el-table-column label="英文名称" align="center" prop="fEname">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.fEname"  placeholder="英文名称" />
           </template>
         </el-table-column>
 
         <el-table-column label="电话" align="center" prop="fTel" >
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.fTel"  placeholder="电话" />
           </template>
         </el-table-column>
 
         <el-table-column label="状态" align="center" prop="fStatus" >
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-select
               v-model="scope.row.fStatus"
               placeholder="状态"
@@ -439,7 +439,7 @@
         </el-table-column>
 
         <el-table-column label="备注" align="center" prop="remark" >
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.remark"  placeholder="备注" />
           </template>
         </el-table-column>

src/views/fleet/plans/edit.vue

@@ -280,34 +280,34 @@
       </div>
       <el-table :data="planList">
         <el-table-column label="箱型" align="center" prop="cntrId">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.cntrId" placeholder="箱型" />
           </template>
         </el-table-column>
 
         <el-table-column label="计费方式" align="center" prop="priceType">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.priceType" placeholder="计费方式" />
           </template>
         </el-table-column>
 
         <el-table-column label="应收运价" align="center" prop="priceDr">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.priceDr" placeholder="应收运价" />
           </template>
         </el-table-column>
         <el-table-column label="应付运价" align="center" prop="priceCr">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.priceCr" placeholder="应付运价" />
           </template>
         </el-table-column>
         <el-table-column label="计划货量" align="center" prop="cntrQty">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.cntrQty" placeholder="计划货量" />
           </template>
         </el-table-column>
         <el-table-column label="已调度货量" align="center" prop="cntrPlanQty">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input
               v-model="scope.row.cntrPlanQty"
               placeholder="已调度货量"
@@ -315,12 +315,12 @@
           </template>
         </el-table-column>
         <el-table-column label="已派车货量" align="center" prop="cntrBlcQty">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.cntrBlcQty" placeholder="已派车货量" />
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remarks">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.remarks" placeholder="备注" />
           </template>
         </el-table-column>
@@ -453,59 +453,59 @@
       </div>
       <el-table :data="detailList">
         <el-table-column label="结算单位" align="center" prop="cntrId">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.cntrId" placeholder="结算单位" />
           </template>
         </el-table-column>
 
         <el-table-column label="费用名称" align="center" prop="priceType">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.priceType" placeholder="费用名称" />
           </template>
         </el-table-column>
 
         <el-table-column label="收付" align="center" prop="dc">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.dc" placeholder="收付" />
           </template>
         </el-table-column>
         <el-table-column label="计费单位" align="center" prop="priceCr">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.priceCr" placeholder="计费单位" />
           </template>
         </el-table-column>
         <el-table-column label="计费数量" align="center" prop="qty">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.qty" placeholder="计费数量" />
           </template>
         </el-table-column>
         <el-table-column label="单价" align="center" prop="price">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.price" placeholder="单价" />
           </template>
         </el-table-column>
         <el-table-column label="币种" align="center" prop="cntrBlcQty">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.cntrBlcQty" placeholder="币种" />
           </template>
         </el-table-column>
         <el-table-column label="税率" align="center" prop="cntrBlcQty">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.cntrBlcQty" placeholder="税率" />
           </template>
         </el-table-column>
         <el-table-column label="金额" align="center" prop="amt">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.amt" placeholder="金额" />
           </template>
         </el-table-column>
         <el-table-column label="税率" align="center" prop="cntrBlcQty">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.cntrBlcQty" placeholder="税率" />
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remarks">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.remarks" placeholder="备注" />
           </template>
         </el-table-column>
@@ -543,29 +543,29 @@
       </div>
       <el-table :data="schedulingList">
         <el-table-column label="箱型" align="center" prop="cntrId">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.cntrId" placeholder="箱型" />
           </template>
         </el-table-column>
 
         <el-table-column label="车队名称" align="center" prop="carcorPid">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.carcorPid" placeholder="车队名称" />
           </template>
         </el-table-column>
 
         <el-table-column label="调度安排货量" align="center" prop="cntrQty">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.cntrQty" placeholder="调度安排货量" />
           </template>
         </el-table-column>
         <el-table-column label="已派车货量" align="center" prop="carQty">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.carQty" placeholder="已派车货量" />
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remarks">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input v-model="scope.row.remarks" placeholder="备注" />
           </template>
         </el-table-column>