From ff981a9b3e959ac52b52b2a88ee17442cd75dbe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com>
Date: Mon, 11 Nov 2024 13:45:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E5=8E=9F=E6=9D=90?=
 =?UTF-8?q?=E6=96=99=E9=87=87=E8=B4=AD=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/bpprocure/index.vue | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/views/wms/bpprocure/index.vue b/src/views/wms/bpprocure/index.vue
index cc629c9..53d76ae 100644
--- a/src/views/wms/bpprocure/index.vue
+++ b/src/views/wms/bpprocure/index.vue
@@ -91,6 +91,12 @@
       <el-table-column label="单位" align="center" prop="unit" />
       <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
@@ -159,6 +165,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>-->

From 33647943e921d5d9dca15e6c364cdf38ef6faf92 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Mon, 11 Nov 2024 15:11:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/whiteOrder/index.vue | 46 ++++++++---------------------
 1 file changed, 12 insertions(+), 34 deletions(-)

diff --git a/src/views/plan/whiteOrder/index.vue b/src/views/plan/whiteOrder/index.vue
index 878ddae..d4cf82c 100644
--- a/src/views/plan/whiteOrder/index.vue
+++ b/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']"
         >导出