暂存

src/components/search-good-modal/main.vue

@@ -190,7 +190,7 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
   },
-  props: ["showModel", "once", "isonline"],
+  props: ["showModel", "once", "isonline", "is_stock"],
 
   /**
    * 属性集合
@@ -226,6 +226,7 @@ export default {
         company: "",
         supplier: "",
         isonline: "",
+        is_stock: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -288,6 +289,7 @@ export default {
         brandid: [],
         good_name: "", // 商品名称
         status: "1", //
+        is_stock: "",
         company: "",
         supplier: "",
         isonline: "",
@@ -322,12 +324,13 @@ export default {
       this.parmValue.company = this.select === "3" ? this.sinput : "";
       this.parmValue.supplier = this.select === "4" ? this.sinput : "";
       this.parmValue.isonline = this.isonline || "";
+       this.parmValue.is_stock = this.is_stock || "";
       let model = JSON.parse(JSON.stringify(this.parmValue));
       model.cat_id =
         model.cat_id.length > 0 ? model.cat_id[model.cat_id.length - 1] : "";
       model.brandid =
         model.brandid.length > 0 ? model.brandid[model.brandid.length - 1] : "";
-
+     
       const res = await asyncRequest.list(model);
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;

src/config/env.development.js

@@ -7,8 +7,10 @@ module.exports = {
     // userApi: 'http://www.invoice.com/',
     // baseApi: 'http://www.stock.com/',
 
-    userApi: 'http://inv.test241.wanyuhengtong.com/',
-    baseApi: 'http://stock.test241.wanyuhengtong.com/',
+    // userApi: 'http://inv.test241.wanyuhengtong.com/',
+    // baseApi: 'http://stock.test241.wanyuhengtong.com/',
+    userApi: 'http://inv.sitw.wanyuhengtong.com/',
+    baseApi: 'http://stock.api.wanyuhengtong.com/',
   },
   fileURL: `https://api2.edusit.zretchome.com`,
   appId: 'wx5ac3a2c2d72b6f26',

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -117,7 +117,8 @@
               name="4"
               v-if="
                 sitem.sendtype === '1' &&
-                (status === '2' ||
+                (status === '1' ||
+                  status === '2' ||
                   status === '3' ||
                   status === '4' ||
                   status === '5' ||

src/views/sellOut/stockApply/components/addEdit.vue

@@ -161,6 +161,7 @@
     <search-good-modal
       :once="true"
       :cat_id="cat_id"
+      :is_stock="'1'"
       :show-model="showGoodsModel"
       :isonline="'1'"
       @cancel="showGoodsModel = false"