Merge branch 'dev' of git.echepei.com:zhujiawei/Warehouse_management_ui into dev

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -545,8 +545,8 @@
                     <el-option
                       v-for="(item, index) in fMblnoOptions"
                       :key="index.fId"
-                      :label="item.fName"
-                      :value="item.fName"
+                      :label="item.fCname"
+                      :value="item.fCname"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -7282,7 +7282,7 @@ export default {
               e.fStltypeid ? e.fStltypeid.toString() : null
           );
           // 选完客户带入发货方
-          this.$set(this.form, 'fShipper', e.fName)
+          this.$set(this.form, 'fShipper', e.fCname)
         }
       });
     },