소스 검색

Merge branch 'develop_yh17_fencang' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh17_fencang

lilei 2 년 전
부모
커밋
34ebb82e31
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      src/views/productManagement/priceChangeRecord/list.vue
  2. 1 1
      src/views/salesReturnManagement/billOfLading/add.vue

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

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

+ 1 - 1
src/views/salesReturnManagement/billOfLading/add.vue

@@ -268,7 +268,7 @@ export default {
   },
   methods: {
     loadWarehouseVal (con) {
-      this.form.warehouseSn = con || undefined
+      this.$set(this.form, 'warehouseSn', con || undefined)
     },
     // 选择退货仓库
     handleWarehouse (val) {