Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuguanli.vue

@@ -18,7 +18,7 @@
                 </div>
               </el-form-item>
               <el-form-item label="车架号">
-                <el-input v-model="listQuery.params.mainSid" placeholder="请输入车型" clearable/>
+                <el-input v-model="listQuery.params.mainSid" placeholder="请输入车架号" clearable/>
               </el-form-item>
               <el-form-item label="存放地点">
                 <el-select v-model="listQuery.params.locationSid" filterable placeholder="请选择" clearable>

anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue

@@ -38,8 +38,8 @@
         <!--Start 项目列表-->
         <div class="listcon">
           <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
-            <el-table-column width="50" type="selection" align="center"/>
             <el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column width="50" type="selection" align="center"/>
             <el-table-column width="150" label="操作" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="small" :disabled="scope.row.nodeState =='排产申请' ? false : scope.row.nodeState == '待提交' ? false : true" @click="handleEdit(scope.row)">办理</el-button>
@@ -51,6 +51,7 @@
             <el-table-column width="200" prop="applicationCode" label="申请编号" align="center"/>
             <el-table-column width="150" prop="applicationDate" label="申请日期" align="center"/>
             <el-table-column width="150" prop="createByName" label="申请人" align="center"/>
+            <el-table-column width="150" prop="applyForDeposit" label="申请人" align="center"/>
             <el-table-column prop="remarks" fit label="备注" align="left" header-align="center"/>
           </el-table>
         </div>