Merge remote-tracking branch 'origin/master'

src/api/basic/udiRlSuptRelevance.js

@@ -1,43 +1,54 @@
 import axios from "@/utils/request";
 
 export function filterCompanyProductRelevance(query) {
-  return axios(
+    return axios(
-    {
+        {
-      url: "/sale/info/company/product/relevance/filter",
+            url: "/sale/info/company/product/relevance/filter",
-      method: "get",
+            method: "get",
-      params: query
+            params: query
-    }
+        }
-  )
+    )
 }
+
+export function filterCompanyProductplanRelevance(query) {
+    return axios(
+        {
+            url: "/sale/info/company/product/plan/relevance/filter",
+            method: "get",
+            params: query
+        }
+    )
+}
+
 export function insertFilter(query) {
-  return axios(
+    return axios(
-    {
+        {
-      url: "/sale/info/insertFilter",
+            url: "/sale/info/insertFilter",
-      method: "post",
+            method: "post",
-      data: query
+            data: query
-    }
+        }
-  );
+    );
 }
 
 export function insertCompanyProductRelevance(query) {
-  return axios(
+    return axios(
-    {
+        {
-      url: "/sale/info/insertCompanyProductRelevance",
+            url: "/sale/info/insertCompanyProductRelevance",
-      method: "post",
+            method: "post",
-      data: query
+            data: query
-    }
+        }
-  );
+    );
 }
 
 
 export function deleteCompanyProductRelevance(query) {
-  return axios(
+    return axios(
-    {
+        {
-      url: "/sale/info/deleteCompanyProductRelevance",
+            url: "/sale/info/deleteCompanyProductRelevance",
-      method: "post",
+            method: "post",
-      data: query
+            data: query
-    }
+        }
-  );
+    );
 }
 
 

src/views/purchase/purApply/purOrderSelectProduct.vue

@@ -138,7 +138,7 @@
 </template>
 
 <script>
-import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevance";
+import {filterCompanyProductplanRelevance, filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevance";
 import {addApplyDetail, addApply} from "../../../api/purchase/purApply";
 import store from "../../../store";
 import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
@@ -297,7 +297,7 @@ export default {
     getList() {
       this.loading = true;
       this.listQuery.customerId = store.getters.customerId;
-      filterCompanyProductRelevance(this.listQuery)
+      filterCompanyProductplanRelevance(this.listQuery)
         .then((response) => {
           this.loading = false;
           if (response.code === 20000) {
@@ -328,17 +328,14 @@ export default {
 
       if (this.ids.length > 0) {
         for (var i = 0; i < this.ids.length; i++) {
-          if (this.ids[i] == this.multipleSelection.rlId) {
+          if (this.ids[i] == this.multipleSelection.id) {
             this.$message.error("该产品已录入！");
             return
           }
         }
       }
 
-      if (!this.multipleSelection.companyName) {
+
-        this.$message.error("配送企业为空！请重新选择！");
-        return;
-      }
       let str = this.multipleSelection.zczbhhzbapzbh;
       if (str.search(",") != -1) {
         this.currentCert = null;
@@ -352,7 +349,7 @@ export default {
     combine() {
       this.loading = true;
       let tQuery = {
-        productId: this.multipleSelection.rlId,
+        productId: this.multipleSelection.id,
         productName: this.multipleSelection.cpmctymc,
         count: 1,
         orderIdFk: this.pId,

src/views/purchase/purOrder/purOrderEditDialog.vue

@@ -165,7 +165,7 @@
                 <el-option v-for="item in suppliers"
                            :key="item.erpId"
                            :label="item.name"
-                           :value="item.name">
+                           :value="item.erpId">
                 </el-option>
               </el-select>
             </template>
@@ -441,7 +441,7 @@ export default {
       this.selectedIndex = val.index;
       filterSupList({productId:val.productId}) //查找该单号下的所有条码
           .then((response) => {
-            this.suppliers = response.data.list || [];
+            this.suppliers = response.data || [];
           })
           .catch(() => {