Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/wms/bpprocure/index.vue

src/views/plan/whiteOrder/index.vue

@@ -61,46 +61,24 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :disabled="isButtonDisabled"
+          @click="handleSyncSAP"
+          v-hasPermi="['plan:whiteOrder:sapSync']"
+        >SAP同步
+        </el-button>
+      </el-col>
       <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="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleSyncSAP"
-          v-hasPermi="['plan:whiteOrder:add']"
-        >SAP白坯订单同步</el-button>
-      </el-col>
-      <!--
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['plan:whiteOrder:import']"
-        >导入
-        </el-button>
-      </el-col>
-      -->
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
           @click="handleExport"
           v-hasPermi="['plan:whiteOrder:export']"
         >导出

src/views/wms/bpprocure/index.vue

@@ -142,6 +142,17 @@
 <!--        <el-form-item label="用户自定义1" prop="attr1">-->
 <!--          <el-input v-model="form.attr1" placeholder="请输入用户自定义1" />-->
 <!--        </el-form-item>-->
+
+
+        <el-form-item label="计划时间" prop="attr1">
+          <el-date-picker clearable
+                          v-model="form.attr1"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择计划时间">
+          </el-date-picker>
+        </el-form-item>
+
 <!--        <el-form-item label="用户自定义2" prop="attr2">-->
 <!--          <el-input v-model="form.attr2" placeholder="请输入用户自定义2" />-->
 <!--        </el-form-item>-->