Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/aps/planSheet/PlanDetailForm.vue

@@ -174,6 +174,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="序号" prop="bizSeqNo">
+              <el-input v-model="formData.bizSeqNo" placeholder="请输入序号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注信息" />
             </el-form-item>

klp-ui/src/views/aps/planSheet/detail.vue

@@ -28,6 +28,7 @@
 
     <el-table v-loading="loading" :data="planDetailList" @selection-change="handleSelectionChange"
       @row-click="handleRowClick">
+      <el-table-column label="序号" align="center" prop="bizSeqNo" width="50" />
       <el-table-column label="订单号" align="center" prop="orderCode" />
       <!-- <el-table-column label="客户" align="center" prop="customerName" /> -->
       <!-- <el-table-column label="业务员" align="center" prop="salesman" /> -->
@@ -53,12 +54,6 @@
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!readonly">
         <template slot-scope="scope">
-          <!-- <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button> -->
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>