1

src/components/CommodityMan/goodsListEdit.vue

@@ -91,6 +91,17 @@
                     >
                     </el-input>
                   </el-form-item>
+                  <el-form-item label="供应商" prop="SupplierId">
+                    <el-select class="w150"  style="margin-right: 10px;" v-model="SupplierId" size="small" placeholder="请选择" @change='changeSupplier'>
+                      <el-option
+                        v-for="item in options"
+                        :key="item.ID"
+                        :label="item.Name"
+                        :value="item.ID">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+
                   <el-form-item label="商品轮播图(多张)">
                     <el-tooltip
                       class="item"
@@ -1879,8 +1890,10 @@
           SeparateSetMember: 2,
           IsQuickBuy: 1,
           FullNumPinkage: 0,
-          FullMoneyPinkage: 0
+          FullMoneyPinkage: 0,
+          SupplierId:'',
         },
+        SupplierId:'',
         fenleiData: [],
         checkList: [],
         childList2: [],
@@ -1983,7 +1996,8 @@
         hpState: 0,
         SuggestPriceInfo: {},
         shareSettings: [],
-        companyCommission:0
+        companyCommission:0,
+        options:[],
       };
     },
     created() {
@@ -1996,6 +2010,7 @@
       this.getSpeciList();
       this.getDistributor();
       this.gethuiyList();
+      this.getSupplierList()
     },
     mounted() {
       this.$refs.ue.loadUe();
@@ -2428,6 +2443,12 @@
             ) {
               this.addMsg.MemberPriceList = this.memberList2;
             }
+            if(this.SupplierId==''){
+              this.Error('请选择供应商');
+              return false
+            }else {
+              this.addMsg.SupplierId = this.SupplierId
+            }
             this.addMsg.SpecificationPriceList = this.SpecificationPriceList;
             this.addMsg.SpecificationList = this.SpecificationList;
             this.apipost("/api/product/SetProductGoodsInfo", this.addMsg, res => {
@@ -2638,6 +2659,10 @@
           res => {
             this.addMsg = res.data.data;
             console.log("this.addMsg",this.addMsg)
+            if(this.addMsg.SupplierId!=0){
+              this.SupplierId = this.addMsg.SupplierId;
+
+            }
             this.initShareSettings();
             this.SpecificationPriceList = this.addMsg.SpecificationPriceList;
             this.SpecificationList = this.addMsg.SpecificationList;
@@ -2803,7 +2828,18 @@
             this.getSkuData([], 0, this.SpecificationList);
           }
         });
-      }
+      },
+      changeSupplier(val){
+        console.log(val)
+      },
+      getSupplierList(){
+        this.apipost("/api/Supplier/GetSupplierAllList", {}, res => {
+          this.loading = false;
+          if (res.data.resultCode == 1) {
+            this.options = res.data.data;
+          }
+        });
+      },
     }
   };
 </script>

src/components/orderMan/afterSalesOrder.vue

@@ -129,7 +129,7 @@
                             <div flex="main:center cross:center" class="app-order-info" style="border-right:1px solid #EBEEF5; width: 8%;">
                                 <div flex="dir:top">
                                     <div>实付金额:￥{{item.Income}}</div>
-                                    <div v-if="item.ReOrderStatus==3">申请退款:￥{{item.Refund}}</div>
+                                    <div v-if="item.Type==1">申请退款:￥{{item.Refund}}</div>
                                 </div>
 
                             </div>