瀏覽代碼

部分功能更新

cz 2 年之前
父節點
當前提交
7f33535f31

+ 8 - 2
src/api/inventory-management/query.js

@@ -21,5 +21,11 @@ export function byProductList(data = {}) {
 }
 
 
-
-
+// 库存查询按产品列表 
+export function badToGood(data = {}) {
+  return request({
+    url: '/api/victoriatourist/stock/defectiveToQualified',
+    method: 'post',
+    data: data,
+  })
+}

+ 10 - 0
src/api/order-management/JDReturnGoods/index.js

@@ -84,3 +84,13 @@ export function editLogistics(data = {}) {
     data: data,
   })
 }
+
+
+//京东退货质检
+export function JDtest(data = {}) {
+  return request({
+    url: '/api/victoriatourist/newJdBack/quality',
+    method: 'post',
+    data: data,
+  })
+}

+ 1 - 1
src/components/inbound-outbound/addOutbound.vue

@@ -168,7 +168,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="物流/快递单号" prop="logisticsCode" required>
+            <el-form-item label="物流/快递单号" prop="logisticsCode">
               <el-input
                 v-model="form.logisticsCode"
                 placeholder="请输入"

+ 14 - 7
src/views/inventory-management/query/index.vue

@@ -39,7 +39,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        aa: [
+        quantity: [
           {
             required: true,
             message: "请输入数量",
@@ -121,15 +121,21 @@ export default {
     },
     handleTurn({ row }) {
       const arr = row.defectiveQuantity.split(".");
-      this.form = { ...row, canSum: arr[0] };
+      this.form = { id: row.stockId, canSum: arr[0], quantity: "" };
       this.open = true;
     },
     handleSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          if (Number(this.form.aa) > this.form.canSum) {
+          if (Number(this.form.quantity) > this.form.canSum) {
             return this.msgInfo("数量不可大于次品数量");
           }
+          const data = { ...this.form };
+          API.badToGood(data).then((res) => {
+            this.msgSuccess("操作成功!");
+            this.getList();
+            this.open = false;
+          });
         }
       });
     },
@@ -225,12 +231,12 @@ export default {
 
           <el-table-column label="操作" align="center" width="100">
             <template slot-scope="scope">
-              <el-button
+              <!-- <el-button
                 type="text"
                 v-if="scope.row.defectiveQuantity !== '0.00'"
                 @click="handleTurn(scope)"
                 >次品转良品</el-button
-              >
+              > -->
             </template>
           </el-table-column>
         </el-table>
@@ -292,8 +298,9 @@ export default {
           label-width="50px"
           label-position="right"
         >
-          <el-form-item label="数量" prop="aa">
-            <el-input v-model="form.aa" placeholder="请输入数量"> </el-input>
+          <el-form-item label="数量" prop="quantity">
+            <el-input v-model="form.quantity" placeholder="请输入数量">
+            </el-input>
           </el-form-item>
         </el-form>
         <div style="text-align: center; margin-top: 15px">

+ 1 - 1
src/views/order-management/JDReturnGoods/index.vue

@@ -3,7 +3,7 @@
 <script>
 import test from "@/components/form-test/index.vue";
 import query from "@/components/query/index.vue";
-import addReturnGoods from "./addReturnGoods.vue";
+import addReturnGoods from "../addReturnGoods.vue";
 import * as API from "@/api/order-management/JDReturnGoods/index.js";
 
 import { warehouseSelectList } from "@/api/product-material/warehouse/index.js";

+ 27 - 13
src/views/order-management/JDReturnGoods/logisticsList.vue

@@ -9,7 +9,10 @@ import sendGoods from "@/components/purchase/sendGoods.vue";
 import addLogistics from "../addLogistics.vue";
 // import addReturnGoods from "./addReturnGoods.vue";
 import * as API from "@/api/order-management/JDReturnGoods/index.js";
-import { logisticsSelectData } from "@/api/purchase-management/deliver-goods/index.js";
+import {
+  logisticsSelectData,
+  arrivalNotice,
+} from "@/api/purchase-management/deliver-goods/index.js";
 
 export default {
   components: {
@@ -46,10 +49,24 @@ export default {
           data: [],
         },
         {
-          label: "状态",
+          label: "物流状态",
           prop: "type",
           data: [],
         },
+        {
+          label: "完成状态",
+          prop: "notComplete",
+          data: [
+            {
+              value: "1",
+              label: "已完成",
+            },
+            {
+              value: "0",
+              label: "未完成",
+            },
+          ],
+        },
       ],
       queryParams: {
         pageNum: 1,
@@ -57,6 +74,7 @@ export default {
         keyword: "",
         businessType: "",
         type: "",
+        notComplete: "",
       },
       tableList: [],
       total: 0,
@@ -276,7 +294,7 @@ export default {
         code: row.businessCode,
         supplierName: row.supplierName,
         purchaseId: row.businessId,
-        id: "",
+        id: row.id,
       };
       logisticsSelectData({ businessId: row.businessId }).then(
         (res) => {
@@ -409,7 +427,9 @@ export default {
             <el-button
               type="text"
               @click="handleArrive(scope.row)"
-              v-if="scope.row.businessType === 1"
+              v-if="
+                scope.row.businessType === 1 && scope.row.logisticsStatus !== 15
+              "
             >
               到货通知
             </el-button>
@@ -499,22 +519,16 @@ export default {
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-form-item label="供应商" prop="supplierName">
-          <el-input
-            v-model="arriveForm.supplierName"
-            placeholder="请输入"
-            disabled
-          ></el-input>
-        </el-form-item> -->
+
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item label="物流/快递单号" prop="id">
               <el-select
                 v-model="arriveForm.id"
+                disabled
                 placeholder="请选择"
                 style="width: 100%"
               >
-                <!-- :disabled="logisticsData.length === 0" -->
                 <el-option
                   v-for="item in logisticsData"
                   :key="item.id"

+ 0 - 204
src/views/order-management/JDinspection/addInspection.vue

@@ -1,204 +0,0 @@
-<template>
-  <div v-loading="loading">
-    <div class="form-box">
-      <el-form
-        label-position="top"
-        :model="form"
-        ref="form"
-        :rules="formRules"
-        label-width="100px"
-      >
-        <el-row :gutter="10">
-          <el-col :span="4">
-            <el-form-item label="采购单号" prop="purchaseCode">
-              <el-input v-model="form.purchaseCode" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="供应商" prop="supplierName">
-              <el-input v-model="form.supplierName" disabled></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10">
-          <el-col :span="4">
-            <el-form-item label="物流公司" prop="logisticsCompanyName">
-              <el-input v-model="form.logisticsCompanyName" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="物流/快递单号" prop="code">
-              <el-input v-model="form.code" disabled></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div style="margin-bottom: 20px">
-          <labelTitle content="质检明细"></labelTitle>
-        </div>
-
-        <el-form-item>
-          <el-table :data="form.changeProductList">
-            <el-table-column label="物品编码" prop="productCode">
-            </el-table-column>
-            <el-table-column label="物品名称" prop="productName">
-            </el-table-column>
-            <el-table-column label="待质检数量" prop="totalQuantity">
-            </el-table-column>
-            <el-table-column label="质检合格" prop="qualifiedQuantity">
-              <template slot-scope="scope">
-                <el-form-item
-                  :prop="
-                    'changeProductList.' + scope.$index + '.qualifiedQuantity'
-                  "
-                  :rules="formRules.qualifiedQuantity"
-                  :inline-message="true"
-                  label-width="0"
-                >
-                  <el-input
-                    v-model="scope.row.qualifiedQuantity"
-                    placeholder="请输入"
-                    size="mini"
-                  >
-                  </el-input>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="质检不合格" prop="disqualificationQuantity">
-              <template slot-scope="scope">
-                <el-form-item
-                  :prop="
-                    'changeProductList.' +
-                    scope.$index +
-                    '.disqualificationQuantity'
-                  "
-                  :rules="formRules.disqualificationQuantity"
-                  :inline-message="true"
-                  label-width="0"
-                >
-                  <el-input
-                    v-model="scope.row.disqualificationQuantity"
-                    placeholder="请输入"
-                    size="mini"
-                  >
-                  </el-input>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column label="备注" prop="remark">
-              <template slot-scope="scope">
-                <el-form-item
-                  :prop="'changeProductList.' + scope.$index + '.remark'"
-                  :rules="formRules.remark"
-                  :inline-message="true"
-                  label-width="0"
-                >
-                  <el-input
-                    v-model="scope.row.remark"
-                    placeholder="请输入"
-                    size="mini"
-                  >
-                  </el-input>
-                </el-form-item>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form-item>
-      </el-form>
-    </div>
-    <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel">取消 </el-button>
-      <el-button type="primary" size="small" @click="handleSubmit">
-        确定</el-button
-      >
-    </div>
-  </div>
-</template>
-
-<script>
-import labelTitle from "@/components/label-title/index.vue";
-
-import { getToken } from "@/util/auth";
-
-export default {
-  name: "addInspection",
-  components: { labelTitle },
-  props: {
-    form: {
-      type: Object,
-      default: () => {},
-    },
-    warehouseSelectList: {
-      type: Array,
-      default: () => [],
-    },
-  },
-  data() {
-    return {
-      uploadHeader: {
-        Authorization: "Basic c2FiZXI6c2FiZXJfc2VjcmV0",
-        "Blade-Auth": "bearer " + getToken(),
-      },
-      loading: false,
-      selectDialog: false,
-      formRules: {
-        qualifiedQuantity: [
-          {
-            required: true,
-            message: "请输入质检合格数量",
-            trigger: "blur",
-          },
-        ],
-        disqualificationQuantity: [
-          {
-            required: true,
-            message: "请输入质检不合格数量",
-            trigger: "blur",
-          },
-        ],
-      },
-    };
-  },
-  created() {},
-  methods: {
-    handleSubmit() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          for (let i = 0; i < this.form.changeProductList.length; i++) {
-            if (
-              Number(this.form.changeProductList[i].qualifiedQuantity) +
-                Number(
-                  this.form.changeProductList[i].disqualificationQuantity
-                ) >
-              Number(this.form.changeProductList[i].totalQuantity)
-            ) {
-              return this.msgInfo("质检合格和质检不合格总合不能大于待质检数量");
-            }
-          }
-          this.loading = true;
-          this.$emit("submit");
-        }
-      });
-    },
-    handleCancel() {
-      this.$emit("cancel");
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.form-box {
-  height: calc(100vh - 280px);
-  overflow: auto;
-  box-sizing: border-box;
-  padding: 10px;
-}
-::v-deep {
-  .el-form-item {
-    margin-bottom: 3px;
-  }
-  .el-form--label-top .el-form-item__label {
-    padding: 8px 0 0 0;
-  }
-}
-</style>

+ 57 - 126
src/views/order-management/JDinspection/index.vue

@@ -1,49 +1,36 @@
-vbase
+
 
 <script>
 import test from "@/components/form-test/index.vue";
 import query from "@/components/query/index.vue";
-
-import * as API from "@/api/inbound-outbound/arrivalInspection.js";
-
-import { warehouseSelectList } from "@/api/product-material/warehouse/index.js";
-import addInspection from "./addInspection.vue";
+import {
+  JDreGoodsList,
+  JDreGoodsDetails,
+  JDtest,
+} from "@/api/order-management/JDReturnGoods/index.js";
+import addReturnGoods from "../addReturnGoods.vue";
 
 export default {
   components: {
     test,
     query,
-    addInspection,
+    addReturnGoods,
   },
   data() {
     return {
       warehouseSelectList: [],
       warehouseTypeList: [],
       qualityStatusList: [],
-      btnForm: {
-        otherButton: {
-          list: [
-            {
-              name: "发起调仓",
-              methodsText: "send",
-              type: "primary",
-              send: () => {
-                this.handleSend();
-              },
-            },
-          ],
-        },
-      },
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         keyword: "",
-        status: "",
+        qualityStatus: "",
       },
       selectConfig: [
         {
           label: "质检状态",
-          prop: "status",
+          prop: "qualityStatus",
           data: [],
         },
       ],
@@ -71,30 +58,19 @@ export default {
       label: item.dictValue,
       value: item.dictKey,
     }));
-    // warehouseSelectList().then((res) => {
-    //   this.warehouseSelectList = res.data.data;
-    //   this.selectConfig[0].data = this.warehouseSelectList.map((item) => ({
-    //     label: item.name,
-    //     value: item.id,
-    //   }));
-    //   this.selectConfig[1].data = this.warehouseSelectList.map((item) => ({
-    //     label: item.name,
-    //     value: item.id,
-    //   }));
-    // });
     this.getList();
   },
   methods: {
     getList() {
       this.loading = true;
-      API.qualityTestingList(this.queryParams).then(
+      JDreGoodsList(this.queryParams).then(
         (res) => {
           this.tableList = res.data.data.records;
           this.total = res.data.data.total;
           this.loading = false;
         },
         (err) => {
-          console.log("qualityTestingList: " + err);
+          console.log("JDreGoodsList: " + err);
           this.loading = false;
         }
       );
@@ -102,65 +78,46 @@ export default {
     handleQuery() {
       this.getList();
     },
-    handleSend() {
-      this.form = {
-        outWarehouseId: "",
-        inWarehouseId: "",
-        remark: "",
-        changeProductList: [],
-      };
+    handleReceive(row) {
       this.open = true;
+      this.$nextTick(() => {
+        this.$refs.addReturnGoods.loading = true;
+        JDreGoodsDetails({ id: row.id }).then((res) => {
+          this.form = res.data.data;
+          this.form = {
+            id: row.qualityId,
+            resultType: "",
+            warehouseId: row.warehouseId,
+            code: row.waybill,
+            logisticsDetailsList: res.data.data,
+          };
+          this.$refs.addReturnGoods.loading = false;
+        });
+      });
     },
+
     handleCancel() {
       this.open = false;
     },
 
     handleSubmit() {
-      const arr = this.form.changeProductList.map((x) => {
-        return {
-          id: x.id,
-          qualifiedQuantity: x.qualifiedQuantity,
-          disqualificationQuantity: x.disqualificationQuantity,
-          warehouseId: x.warehouseId,
-        };
-      });
-      API.addInspection(arr).then(
+      const data = {
+        id: this.form.id,
+        resultType: this.form.resultType,
+      };
+      JDtest(data).then(
         () => {
-          this.msgSuccess("添加成功");
-          this.$refs.addInspection.loading = false;
+          this.msgSuccess("质检成功");
+          this.$refs.addReturnGoods.loading = false;
           this.open = false;
           this.getList();
         },
         (err) => {
-          console.log("addInspection: " + err);
-          this.$refs.addInspection.loading = false;
+          console.log("addReturnGoods: " + err);
+          this.$refs.addReturnGoods.loading = false;
         }
       );
     },
-    handleReceive(row) {
-      this.open = true;
-      this.$nextTick(() => {
-        this.$refs.addInspection.loading = true;
-        API.qualityTestingDetails({ qualityInfoId: row.id }).then(
-          (res) => {
-            let list = res.data.data;
-
-            this.form = {
-              purchaseCode: row.code,
-              supplierName: row.supplierName,
-              logisticsCompanyName: row.logisticsCompanyName,
-              code: row.logisticsInfoCode,
-              changeProductList: list,
-            };
-            this.$refs.addInspection.loading = false;
-          },
-          (err) => {
-            console.log("qualityTestingDetails: " + err);
-            this.$refs.addInspection.loading = false;
-          }
-        );
-      });
-    },
   },
 };
 </script>
@@ -181,59 +138,31 @@ export default {
         "
       ></query>
       <el-table :data="tableList" v-loading="loading">
-        <!-- <el-table-column
-          label="采购单号"
-          align="left"
-          prop="code"
-          width="150"
-        /> -->
-        <!-- <el-table-column label="供应商" align="left" prop="supplierName" /> -->
-
-        <el-table-column
-          label="产品名称"
-          align="left"
-          prop="productName"
-          width="100"
-        />
-        <el-table-column label="退货数量" align="left" prop="sum" width="100" />
-        <el-table-column label="仓库名称" align="left" prop="sum" width="100" />
-        <el-table-column
-          label="物流公司"
-          align="left"
-          prop="logisticsCompanyName"
-          width="100"
-        />
-        <el-table-column
-          label="物流/快递单号"
-          align="left"
-          prop="logisticsInfoCode"
-        />
-        <!-- <el-table-column
-          label="采购员"
-          align="left"
-          prop="createUserName"
-          width="100"
-        /> -->
-        <el-table-column
-          label="采购时间"
-          align="left"
-          prop="createTime"
-          width="150"
-        />
-        <!-- <el-table-column label="调入仓库" align="left" prop="warehouseName" /> -->
+        <el-table-column label="仓库名称" align="left" prop="warehouseName" />
+        <el-table-column label="退货时间" align="left" prop="createTime" />
+        <el-table-column label="物流单号" align="left" prop="waybill">
+          <template slot-scope="scope">
+            <!-- class="show_underline" -->
+            <div>
+              {{ scope.row.waybill }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column
           label="状态"
           align="left"
-          prop="status"
+          prop="qualityStatus"
           width="100"
-          :formatter="(row) => dictDataEcho(row.status, qualityStatusList)"
+          :formatter="
+            (row) => dictDataEcho(row.qualityStatus, qualityStatusList)
+          "
         />
         <el-table-column label="操作" align="center" width="120">
           <template slot-scope="scope">
             <el-button
               type="text"
               @click="handleReceive(scope.row)"
-              v-if="scope.row.status < 3"
+              v-if="scope.row.qualityStatus < 3"
               >质检
             </el-button>
           </template>
@@ -255,12 +184,14 @@ export default {
       width="80%"
       top="60px"
     >
-      <add-inspection
+      <add-return-goods
         :form="form"
+        showType="details"
+        :isTest="true"
         @submit="handleSubmit"
         @cancel="handleCancel"
-        ref="addInspection"
-      ></add-inspection>
+        ref="addReturnGoods"
+      ></add-return-goods>
     </el-dialog>
   </div>
 </template>

+ 34 - 11
src/views/order-management/JDReturnGoods/addReturnGoods.vue → src/views/order-management/addReturnGoods.vue

@@ -146,11 +146,21 @@
             <!-- <el-table-column label="备注" prop="remark" /> -->
           </el-table>
         </el-form-item>
+
+        <!-- <div style="margin-bottom: 20px" v-if="isTest">
+          <labelTitle content="质检结果"></labelTitle>
+        </div> -->
+        <el-form-item label="质检结果" prop="resultType" v-if="isTest">
+          <el-radio-group v-model="form.resultType">
+            <el-radio label="1">合格</el-radio>
+            <el-radio label="0">不合格</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
     </div>
     <div
       style="text-align: center; margin-top: 15px"
-      v-if="showType !== 'details'"
+      v-if="showType !== 'details' || isTest"
     >
       <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
@@ -188,6 +198,10 @@ export default {
     showType: {
       type: String,
     },
+    isTest: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -221,6 +235,13 @@ export default {
             trigger: "blur",
           },
         ],
+        resultType: [
+          {
+            required: true,
+            message: "请选择质检结果",
+            trigger: "change",
+          },
+        ],
       },
       selectDialog: false,
       logisticsData: [],
@@ -260,17 +281,19 @@ export default {
     handleSubmit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          if (this.form.logisticsDetailsList.length < 1) {
-            return this.msgInfo("请添加退货明细!");
+          if (this.showType !== "details") {
+            if (this.form.logisticsDetailsList.length < 1) {
+              return this.msgInfo("请添加退货明细!");
+            }
+            this.loading = true;
+            this.form.logisticsDetailsList = this.form.logisticsDetailsList.map(
+              (x) => ({
+                jdBackProductId: x.jdBackProductId,
+                shipmentQuantity: x.shipmentQuantity,
+                id: x.id,
+              })
+            );
           }
-          this.loading = true;
-          this.form.logisticsDetailsList = this.form.logisticsDetailsList.map(
-            (x) => ({
-              jdBackProductId: x.jdBackProductId,
-              shipmentQuantity: x.shipmentQuantity,
-              id: x.id,
-            })
-          );
           this.$emit("submit");
         }
       });

+ 0 - 1
src/views/purchase-management/deliver-goods/index.vue

@@ -240,7 +240,6 @@ export default {
     },
     handleCancel1() {
       this.openArrive = false;
-      this.getList();
     },
     isSelectable(row) {
       if (row.status != 30) {

+ 12 - 10
src/views/purchase-management/purchase/addPurchase.vue

@@ -62,8 +62,10 @@
             >
             </el-table-column>
             <el-table-column label="单位" prop="goodsUnit"> </el-table-column>
-            <el-table-column label="采购数量" prop="assq"> </el-table-column>
-            <el-table-column label="已采购数量" prop="assw"> </el-table-column>
+            <el-table-column label="采购数量" prop="quantityOne">
+            </el-table-column>
+            <el-table-column label="已采购数量" prop="purchaseQuantity">
+            </el-table-column>
             <el-table-column label="此次采购数量" prop="quantity">
               <template slot-scope="scope">
                 <el-form-item
@@ -204,14 +206,14 @@ export default {
     };
   },
   created() {
-    supplyPriceList(this.queryParams).then(
-      (res) => {
-        this.tableList = res.data.data.records;
-      },
-      (err) => {
-        console.log("supplyPriceList: " + err);
-      }
-    );
+    // supplyPriceList(this.queryParams).then(
+    //   (res) => {
+    //     this.tableList = res.data.data.records;
+    //   },
+    //   (err) => {
+    //     console.log("supplyPriceList: " + err);
+    //   }
+    // );
   },
   methods: {
     handleSubmit() {

+ 38 - 3
src/views/purchase-management/purchase/index.vue

@@ -139,7 +139,21 @@ export default {
       this.selectData = arr;
     },
     handlePurchase(row) {
-      const goodsList = [{ ...row, unitPrice: "", sum: "" }];
+      const data = { ...row };
+      // 取出已采购数量
+      const purchaseQuantity = Number(data.purchaseQuantity);
+      // 默认赋值此次采购数量
+      const nowQuantity = Number(data.quantity) - Number(purchaseQuantity);
+      const goodsList = [
+        {
+          ...data,
+          unitPrice: "",
+          sum: "",
+          quantityOne: data.quantity,
+          quantity: nowQuantity,
+          purchaseQuantity,
+        },
+      ];
       this.form = {
         flowId: "",
         flowRemark: "",
@@ -154,14 +168,25 @@ export default {
     handlePurchases() {
       if (!this.selectData.length > 0)
         return this.msgInfo("请先选择要采购的数据");
-      const goodsList = this.selectData.map((x) => ({ ...x, unitPrice: "" }));
+      const arr = [...this.selectData];
+      for (let i = 0; i < arr.length; i++) {
+        const e = arr[i];
+        e.unitPrice = "";
+        e.quantityOne = e.quantity;
+        // 取出已采购数量
+        let purchaseQuantity = Number(e.purchaseQuantity);
+        // 默认赋值此次采购数量
+        let nowQuantity = Number(e.quantity) - Number(purchaseQuantity);
+        e.quantity = nowQuantity;
+        e.purchaseQuantity = purchaseQuantity;
+      }
       this.form = {
         flowId: "",
         flowRemark: "",
         id: "",
         code: "",
         supplierId: "",
-        goodsList: goodsList,
+        goodsList: arr,
       };
       this.titleText = "add";
       this.open = true;
@@ -297,6 +322,16 @@ export default {
           prop="quantity"
           width="120"
         />
+        <el-table-column
+          label="已采购数量"
+          align="left"
+          prop="purchaseQuantity"
+          width="120"
+          :formatter="
+            (row) => (row.purchaseQuantity === -1 ? 0 : row.purchaseQuantity)
+          "
+        />
+
         <el-table-column label="收货仓库" align="left" prop="warehouseName" />
 
         <el-table-column