Merge remote-tracking branch 'origin/dev' into dev

src/views/inventory/inner/innerOrderEditDialog.vue

@@ -49,6 +49,7 @@
           <el-table-column label="规格型号" prop="spec"  show-overflow-tooltip></el-table-column>
           <el-table-column label="计量单位" prop="measname"  show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业"  prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="最小销售产品标识" prop="nameCode" width="140" v-if="showColumn"></el-table-column>
           <el-table-column label="单据数量">
             <template slot-scope="scope">
               <el-input size="small" v-model="scope.row.count"
@@ -160,6 +161,7 @@ export default {
   },
   data() {
     return {
+      showColumn: false,
       code: "",
       query: {
         orderIdFk: "",
@@ -174,6 +176,7 @@ export default {
         deptCode: null,
         locStorageCode: null,
         invWarehouseCode: null,
+        packLevel:null,
       },
       formRules: {},
       codeArray: [],
@@ -437,6 +440,7 @@ export default {
         deptCode: null,
         locStorageCode: null,
         invWarehouseCode: null,
+        nameCode:null,
       };
       this.orderEditor = false;
     }

src/views/inventory/inner/innerOrderSelectProduct.vue

@@ -224,6 +224,8 @@ export default {
       certList: [],
       dialogFormVisible: false,
       multipleSelection: null,
+      nameCode:null,
+
     };
   },
   methods: {
@@ -339,6 +341,7 @@ export default {
       let tQuery = {
         productId: this.multipleSelection.rlId,
         productName: this.multipleSelection.cpmctymc,
+        nameCode: this.multipleSelection.nameCode,
         count: 1,
         orderIdFk: this.billNo,
         supId: this.multipleSelection.customerId,