From 443f0fa7039fdb9a11d39f68b953c4715993ab15 Mon Sep 17 00:00:00 2001
From: mhsnet <mhsnet@163.com>
Date: Fri, 9 Aug 2024 13:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yys/yysmaterialprocurementplan/form.vue   | 46 +++++++++++++++----
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue
index 3bcd0e3..d3ab1d2 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue
@@ -452,21 +452,20 @@
                       </template>
                       <template slot-scope="scope">
                         <JnpfPopupSelect
-                          v-model="dataForm.planNumber"
-                          @change="changeData('planNumber', -1)"
+                          v-model="scope.row.supplier"
                           :rowIndex="null"
-                          :formData="dataForm"
-                          :templateJson="interfaceRes.planNumber"
+                          :formData="scope.row"
+                          :templateJson="[]"
                           placeholder="请选择"
-                          propsValue="plan_number"
+                          propsValue="supplier_cname"
                           popupWidth="800px"
                           popupTitle="选择数据"
                           popupType="dialog"
-                          relationField="plan_number"
-                          field="planNumber"
-                          interfaceId="591169965881556997"
+                          relationField="supplier_cname"
+                          field="supplier"
+                          interfaceId="591554794397630469"
                           :pageSize="20"
-                          :columnOptions="planNumbercolumnOptions"
+                          :columnOptions="suppliercolumnOptions"
                           clearable
                           :style="{ width: '100%' }"
                         >
@@ -505,6 +504,19 @@
                         </JnpfDatePicker>
                       </template>
                     </el-table-column>
+                    <el-table-column label="操作" width="200">
+                      <template slot-scope="scope">
+                        <el-button
+                          size="mini"
+                          type="text"
+                          class="JNPF-table-delBtn"
+                          @click="
+                            fnProcurementOrderItemDel(scope.$index)
+                          "
+                          >删除</el-button
+                        >
+                      </template>
+                    </el-table-column>
                   </el-table>
                   <div
                     class="table-actions"
@@ -636,6 +648,12 @@ export default {
         { label: "单据日期", value: "order_date" },
         { label: "备注", value: "reamrk" }
       ],
+      suppliercolumnOptions: [
+        { label: "物料需求计划单", value: "supplier_id" },
+        { label: "物料信息", value: "supplier_sname" },
+        { label: "年月", value: "supplier_cname" },
+        { label: "单据日期", value: "supplier_classification" }
+      ],
       childIndex: -1,
       isEdit: false,
       interfaceRes: {
@@ -716,6 +734,7 @@ export default {
       this.procurementOrderItem.materialType = row.materialType;
       this.procurementOrderItem.lackNumber = row.lackNumber;
       this.procurementOrderItem.unit = row.unit;
+      this.procurementOrderItem.procurementNumber = this.dataForm.procurementNumber;
       this.procurementOrderList = [];
       this.procurementOrderList.push({ ...this.procurementOrderItem });
       this.isOrdering = true;
@@ -723,6 +742,15 @@ export default {
     fnProcurementOrderItemAdd() {
       this.procurementOrderList.push({ ...this.procurementOrderItem });
     },
+    fnProcurementOrderItemDel(index) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          this.procurementOrderList.splice(index, 1);
+        })
+        .catch(() => {});
+    },
     fnProcurementOrderCancel() {
       this.procurementOrderList = [];
       this.isOrdering = false;