Browse Source

修改bug

chenrui 2 years ago
parent
commit
98e8f94d81

+ 1 - 1
src/views/productManagement/priceChangeRecord/list.vue

@@ -32,7 +32,7 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品状态">
+                <a-form-item label="变更状态">
                   <v-select code="ENABLE_FLAG" id="productChangeRecordList-productStatus" v-model="queryParam.enabledFlag" allowClear placeholder="请选择产品状态"></v-select>
                 </a-form-item>
               </a-col>

+ 6 - 5
src/views/salesReturnManagement/billOfLading/add.vue

@@ -273,11 +273,13 @@ export default {
     // 选择退货仓库
     handleWarehouse (val) {
       this.form.warehouseSn = val
-      if (val && this.$route.query.path && this.$route.query.path == 'salerReturn') {
-        this.chooseData = []
-        if (this.salerReturnWsn && this.salerReturnWsn == val) {
-          const cd = this.$store.state.app.tempBillOfData
+      this.chooseData = []
+      if (this.salerReturnWsn && this.salerReturnWsn == val) {
+        const cd = this.$store.state.app.tempBillOfData
+        if (cd && this.$route.query.path == 'salerReturn') {
           this.chooseData.push(cd)
+        } else {
+          this.getReturnOrderList(this.salerReturnWsn)
         }
       }
     },
@@ -431,7 +433,6 @@ export default {
     },
     pageInit () {
       this.resetForm()
-      console.log('----')
       //  编辑页
       if (this.$route.params.sn) {
         this.form.theme = ''