Forráskód Böngészése

采购订单优化:新增采购物品历史单价查询功能,调整单价输入框为带历史价格弹窗的交互形式

yusheng 10 hónapja
szülő
commit
eef52887bf

+ 12 - 1
src/api/purchasingManage/purchaseOrder.js

@@ -134,4 +134,15 @@ export async function applyoutsource(id) {
     return res.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}
+
+/**
+ * 获取采购物品清单历史单价
+ */
+export async function queryHistoricalUnitPrice(productId) {
+  const res = await request.post(`/eom/purchaseorder/queryHistoricalUnitPrice/${productId}`);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

+ 24 - 13
src/views/purchasingManage/purchaseOrder/components/inventoryTable.vue

@@ -260,29 +260,33 @@
             trigger: 'change'
           }"
         >
-          <el-input
+          <!-- <el-input
             v-model="scope.row.singlePrice"
             placeholder="请输入"
             @input="changeCount(scope.row, scope.$index)"
           >
             <template slot="append">元</template>
-          </el-input>
-          <!-- <el-popover placement="right" width="600" trigger="click">
-            <el-table >
+          </el-input> -->
+          <el-popover
+            placement="right"
+            width="600"
+            trigger="click"
+            @show="getPurchaseSinglePrice(scope.row)"
+          >
+            <el-table :data="purchaseSinglePriceData">
               <el-table-column
                 width="300"
-                property="date"
+                property="supplierName"
                 label="供应商"
               ></el-table-column>
               <el-table-column
-                width="150"
-                property="name"
-                label="最近采购价格"
+                  width="160"
+                property="purchaseDate"
+                label="	采购日期"
               ></el-table-column>
               <el-table-column
-                width="150"
-                property="address"
-                label="历史采购价格"
+                property="singlePrice"
+                label="采购价格"
               ></el-table-column>
             </el-table>
             <el-input
@@ -293,7 +297,7 @@
             >
               <template slot="append">元</template>
             </el-input>
-          </el-popover> -->
+          </el-popover>
         </el-form-item>
       </template>
       <template v-slot:goodsPriceType="{ row, $index }">
@@ -564,7 +568,7 @@
   import { levelList } from '@/enum/dict.js';
   import { getGoodsPriceByCondition } from '@/api/goodsManage/index';
   import { changeCount, getAllPrice } from '@/BIZComponents/setProduct.js';
-
+  import { queryHistoricalUnitPrice } from '@/api/purchasingManage/purchaseOrder';
   const dayjs = require('dayjs');
 
   export default {
@@ -615,6 +619,7 @@
       };
       return {
         levelList,
+        purchaseSinglePriceData: [],
         cacheKeyUrl: 'eos-purchasingManage-purchaseOrder-inventoryTable',
         pricingWayList,
         discountTotalPrice: 0.0,
@@ -1001,6 +1006,12 @@
         });
       },
 
+      async getPurchaseSinglePrice(row) {
+        this.purchaseSinglePriceData = [];
+        this.purchaseSinglePriceData = await queryHistoricalUnitPrice(
+          row.productId
+        );
+      },
       downloadFile(file) {
         getFile({ objectName: file.storePath }, file.name);
       },

+ 1 - 1
src/views/purchasingManage/purchaseOrder/invoice/components/inventoryTable.vue

@@ -747,7 +747,7 @@
             label: '是否来料检验',
             align: 'center',
             formatter: (_row, _column, cellValue) => {
-              return _row.isComeCheck == 1 ? '是' : '否';
+              return _row.isComeCheck == 1 ? '是' :_row.isComeCheck === 0 ? '否':'';
             }
           },