Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-qms

src/views/inspectionWork/components/newQualityContentTabs.vue

@@ -472,6 +472,8 @@
     queryQualityInventory
   } from '@/api/inspectionWork';
   import { getQualityTemplateByIds } from '@/api/inspectionTemplate';
+  import { getCodeList } from '@/api/login';
+
   export default {
     components: {
       inspectionTemplateDialog
@@ -883,7 +885,7 @@
     },
     methods: {
       //合格数量变化设置样品清单 全减并且不拆包才执行
-      setSampleList(val, total) {
+      async setSampleList(val, total) {
         this.$set(this.sampleList[0], 'measureQuantity', val);
         let weight = this.form.totalWeight / total;
 
@@ -896,6 +898,8 @@
           data['qualitySampleTemplateList'] = [];
           data['id'] = '';
           data['weight'] = parseFloat(weight).toFixed(2);
+          let code=await getCodeList('sample_code',{count:1});
+          data['sampleCode'] = code[0]
           arr.push(data);
         }
         this.$set(