Merge remote-tracking branch 'origin/master'

src/views/plan/whiteOrder/index.vue

@@ -61,6 +61,18 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['plan:whiteOrder:add']"
+          >新增
+          </el-button>
+        </el-col>
+
       <el-col :span="1.5">
         <el-button
           type="success"

src/views/wms/bpprocure/index.vue

@@ -82,7 +82,7 @@
 
     <el-table v-loading="loading" :data="bpprocureList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" v-if="false" />
+<!--      <el-table-column label="id" align="center" prop="id" v-if="false" />-->
       <el-table-column label="采购单号" align="center" prop="procureCode" />
       <el-table-column label="物料编码" align="center" prop="materialCode" />
       <el-table-column label="物料名称" align="center" prop="materialName" />
@@ -90,8 +90,32 @@
       <el-table-column label="计划数量" align="center" prop="planNumber" />
       <el-table-column label="已入库数量" align="center" prop="realityNumber" />
       <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="价格" align="center" prop="price" />
+      <el-table-column label="单价" align="center" prop="price" />
 
+      <el-table-column label="计划时间" align="center" prop="attr1" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.attr1, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['wms:bpprocure:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['wms:bpprocure:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -105,9 +129,9 @@
     <!-- 添加或修改白坯原材料采购单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="采购单号" prop="procureCode">
-          <el-input v-model="form.procureCode" placeholder="请输入采购单号" />
-        </el-form-item>
+<!--        <el-form-item label="采购单号" prop="procureCode">-->
+<!--          <el-input v-model="form.procureCode" placeholder="请输入采购单号" />-->
+<!--        </el-form-item>-->
 <!--        <el-form-item label="物料编码" prop="materialCode">-->
 <!--          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />-->
 <!--        </el-form-item>-->