Merge remote-tracking branch 'origin/master'

gear-ui3/src/views/oms/order/panels/pay.vue

@@ -45,6 +45,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="应付ID" align="center" prop="payableId" v-if="false"/>
       <el-table-column label="供应商" align="center" prop="supplierName" />
+      <el-table-column label="关联采购单" align="center" prop="detailCode" />
       <el-table-column label="到期日" align="center" prop="dueDate" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.dueDate, '{y}-{m}-{d}') }}</span>
@@ -93,9 +94,14 @@
     <!-- 添加或修改应付款管理（宽松版）对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="供应商ID" prop="supplierId">
+        <el-form-item label="供应商" prop="supplierId">
           <VendorSelect v-model="form.supplierId" />
         </el-form-item>
+        <el-form-item label="关联采购单" prop="detailId">
+          <el-select v-model="form.detailId" placeholder="请选择采购单">
+            <el-option v-for="item in purchaseOrderList" :key="item.detailId" :label="item.detailCode" :value="item.detailId" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="到期日" prop="dueDate">
           <el-date-picker clearable
             v-model="form.dueDate"
@@ -139,6 +145,7 @@
 <script>
 import { listPayable, getPayable, delPayable, addPayable, updatePayable, updatePaidAmount } from "@/api/finance/payable";
 import VendorSelect from '@/components/VendorSelect/index.vue';
+import { listPurchasePlanDetail } from '@/api/oa/purchasePlanDetail';
 
 export default {
   name: "Payable",
@@ -193,11 +200,14 @@ export default {
       // 付款表单参数
       payForm: {},
       // 是否显示付款弹出层
-      payOpen: false
+      payOpen: false,
+      // 采购单列表
+      purchaseOrderList: []
     };
   },
   created() {
     this.getList();
+    this.getPurchaseOrderList();
   },
   watch: {
     orderId(newVal) {
@@ -236,7 +246,8 @@ export default {
         createTime: undefined,
         createBy: undefined,
         updateTime: undefined,
-        updateBy: undefined
+        updateBy: undefined,
+        detailId: undefined
       };
       this.resetForm("form");
     },
@@ -348,6 +359,12 @@ export default {
       }).finally(() => {
         this.buttonLoading = false;
       });
+    },
+    // 获取采购单列表
+    getPurchaseOrderList() {
+      listPurchasePlanDetail({ pageNum: 1, pageSize: 1000 }).then(response => {
+        this.purchaseOrderList = response.rows;
+      });
     }
   }
 };

gear-ui3/src/views/oms/pay/index.vue

@@ -73,6 +73,7 @@
       <el-table-column label="应付ID" align="center" prop="payableId" v-if="false"/>
       <el-table-column label="供应商" align="center" prop="supplierName" />
       <el-table-column label="订单ID" align="center" prop="orderId" />
+      <el-table-column label="关联采购单" align="center" prop="detailCode" />
       <el-table-column label="到期日" align="center" prop="dueDate" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.dueDate, '{y}-{m}-{d}') }}</span>
@@ -121,12 +122,17 @@
     <!-- 添加或修改应付款管理（宽松版）对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="供应商ID" prop="supplierId">
+        <el-form-item label="供应商" prop="supplierId">
           <VendorSelect v-model="form.supplierId" />
         </el-form-item>
         <el-form-item label="订单ID" prop="orderId">
           <el-input v-model="form.orderId" placeholder="请输入订单ID" />
         </el-form-item>
+        <el-form-item label="关联采购单">
+          <el-select v-model="form.detailId" placeholder="请选择采购单">
+            <el-option v-for="item in purchaseOrderList" :key="item.detailId" :label="item.detailCode" :value="item.detailId" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="到期日" prop="dueDate">
           <el-date-picker clearable
             v-model="form.dueDate"
@@ -171,6 +177,7 @@
 <script>
 import { listPayable, getPayable, delPayable, addPayable, updatePayable, updatePaidAmount } from "@/api/finance/payable";
 import VendorSelect from '@/components/VendorSelect/index.vue';
+import { listPurchasePlanDetail } from '@/api/oa/purchasePlanDetail';
 
 export default {
   name: "Payable",
@@ -219,11 +226,14 @@ export default {
       // 付款表单参数
       payForm: {},
       // 是否显示付款弹出层
-      payOpen: false
+      payOpen: false,
+      // 采购单列表
+      purchaseOrderList: []
     };
   },
   created() {
     this.getList();
+    this.getPurchaseOrderList();
   },
   methods: {
     /** 查询应付款管理（宽松版）列表 */
@@ -256,7 +266,8 @@ export default {
         createTime: undefined,
         createBy: undefined,
         updateTime: undefined,
-        updateBy: undefined
+        updateBy: undefined,
+        detailId: undefined
       };
       this.resetForm("form");
     },
@@ -368,6 +379,12 @@ export default {
       }).finally(() => {
         this.buttonLoading = false;
       });
+    },
+    // 获取采购单列表
+    getPurchaseOrderList() {
+      listPurchasePlanDetail({ pageNum: 1, pageSize: 1000 }).then(response => {
+        this.purchaseOrderList = response.rows;
+      });
     }
   }
 };