质检工单和质检模板新增机型和颜色字段

src/views/inspectionPlan/components/new-edit.vue

@@ -529,6 +529,18 @@
           { label: '物料代号', prop: 'materielDesignation', align: 'center' },
           { label: '客户代号', prop: 'clientCode', align: 'center' },
           { label: '刻码', prop: 'engrave', align: 'center' },
+                    {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           // { prop: 'specification', label: '规格', align: 'center', width: 100, showOverflowTooltip: true },
           // { prop: 'brandNum', label: '牌号', align: 'center', width: 100, showOverflowTooltip: true },
           // { prop: 'modelType', label: '型号', align: 'center', width: 100, showOverflowTooltip: true },
@@ -733,7 +745,23 @@
             showOverflowTooltip: true
           },
           { label: '刻码', prop: 'engrave', align: 'center' },
-          { label: '重量', prop: 'weight', align: 'center' },
+          {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '重量',
+            prop: 'weight',
+            align: 'center'
+          },
           { label: '重量单位', prop: 'weightUnit', align: 'center' },
           {
             label: '仓库',

src/views/inspectionTemplate/AddorUpdate.vue

@@ -80,6 +80,51 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="24">
+          <div class="title"> 质检参数标准</div>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="取样数量" prop="sampleProportion">
+            <el-input
+              type="number"
+              v-model="dataForm.sampleProportion"
+              placeholder="请输入"
+              style="width: calc(100% - 85px)"
+            ></el-input>
+            <DictSelection
+              style="width: 85px"
+              dictName="计量单位"
+              placeholder=" "
+              v-model="dataForm.sampleProportionUnit"
+            ></DictSelection>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item
+            label="质检报告有效期"
+            prop="validityPeriod"
+            label-width="150px"
+          >
+            <el-input
+              type="number"
+              v-model="dataForm.validityPeriod"
+              placeholder="请输入"
+              style="width: calc(100% - 85px)"
+            ></el-input>
+            <el-select
+              style="width: 85px"
+              v-model="dataForm.validityPeriodUnit"
+              placeholder=" "
+            >
+              <el-option label="年" value="年" />
+              <el-option label="月" value="月" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <ele-pro-table
           ref="table"
@@ -254,7 +299,11 @@
           qualitySchemeTemplateCode: '',
           inspectionItemVOList: [],
           status: 1,
-          templateRemark: ''
+          templateRemark: '',
+          sampleProportion: '',
+          sampleProportionUnit: '%',
+          validityPeriod:'',
+          validityPeriodUnit:''
         },
         columns: [
           {
@@ -533,3 +582,10 @@
     }
   };
 </script>
+<style lang="scss" scoped>
+  .title {
+    font-weight: bold;
+    padding-bottom: 20px;
+    padding-top: 20px;
+  }
+</style>

src/views/inspectionWork/components/newQualityContentTabs.vue

@@ -599,6 +599,18 @@
             slot: 'engrave',
             width: '120'
           },
+          {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             label: '重量',
             prop: 'weight',
@@ -751,6 +763,18 @@
             showOverflowTooltip: true
           },
           { label: '刻码', prop: 'engrave', align: 'center' },
+          {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           { label: '重量', prop: 'weight', align: 'center' },
           { label: '重量单位', prop: 'weightUnit', align: 'center' },
           {

src/views/inspectionWork/mixins/detailMixins.js

@@ -184,6 +184,18 @@ export default {
           showOverflowTooltip: true
         },
         { label: '刻码', prop: 'engrave', align: 'center' },
+        {
+          label: '机型',
+          prop: 'modelKey',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          label: '颜色',
+          prop: 'colorKey',
+          align: 'center',
+          showOverflowTooltip: true
+        },
         { label: '重量', prop: 'weight', align: 'center' },
         { label: '重量单位', prop: 'weightUnit', align: 'center' },
         {
@@ -304,6 +316,18 @@ export default {
           width: '120',
           showOverflowTooltip: true
         },
+        {
+          label: '机型',
+          prop: 'modelKey',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          label: '颜色',
+          prop: 'colorKey',
+          align: 'center',
+          showOverflowTooltip: true
+        },
         {
           label: '重量',
           prop: 'weight',
@@ -482,6 +506,18 @@ export default {
           align: 'center',
           width: '120',
           showOverflowTooltip: true
+        },
+             {
+          label: '机型',
+          prop: 'modelKey',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          label: '颜色',
+          prop: 'colorKey',
+          align: 'center',
+          showOverflowTooltip: true
         },
         {
           prop: 'measureQuantity',
@@ -592,6 +628,18 @@ export default {
           align: 'center',
           width: '120',
           showOverflowTooltip: true
+        },
+             {
+          label: '机型',
+          prop: 'modelKey',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+        {
+          label: '颜色',
+          prop: 'colorKey',
+          align: 'center',
+          showOverflowTooltip: true
         },
         {
           prop: 'batchNo',

src/views/sample/samplemanagement/detailList.vue

@@ -345,6 +345,18 @@
             width: '120',
             showOverflowTooltip: true
           },
+          {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             prop: 'measureQuantity',
             label: '计量数量',
@@ -464,7 +476,7 @@
         ];
       },
       qualityResultList() {
-        return { 1: '合格', 2: '不合格',3:'让步接收' };
+        return { 1: '合格', 2: '不合格', 3: '让步接收' };
       },
       disposalStatustList() {
         return { 0: '待处置', 1: '处置中', 2: '处置完成' };
@@ -564,7 +576,7 @@
         });
       },
       close() {
-        this.$refs.disposeForm.resetFields()
+        this.$refs.disposeForm.resetFields();
         this.dialogVisible = false;
         this.disposeType = '';
       },

src/views/unqualifiedProduct/unqualifiedList/concessionacceptance/index.vue

@@ -135,6 +135,18 @@
             align: 'center',
             width: 160,
             showOverflowTooltip: true
+          },
+                  {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'measureQuantity',

src/views/unqualifiedProduct/unqualifiedList/consumeproducts/index.vue

@@ -165,13 +165,18 @@
             width: 100,
             showOverflowTooltip: true
           },
-          // {
-          //   prop: 'disposeTime',
-          //   label: '处置时间',
-          //   align: 'center',
-          //   width: 180,
-          //   showOverflowTooltip: true
-          // },
+               {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             prop: 'produceRoutingName',
             label: '工艺路线',

src/views/unqualifiedProduct/unqualifiedList/detailList.vue

@@ -402,6 +402,18 @@
             width: '120',
             showOverflowTooltip: true
           },
+          {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             prop: 'batchNo',
             label: '批次号',

src/views/unqualifiedProduct/unqualifiedList/downgradeuse/index.vue

@@ -135,6 +135,18 @@
             align: 'center',
             width: 160,
             showOverflowTooltip: true
+          },
+                  {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'measureQuantity',

src/views/unqualifiedProduct/unqualifiedList/keepsample/index.vue

@@ -135,6 +135,18 @@
             align: 'center',
             width: 160,
             showOverflowTooltip: true
+          },
+                  {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'measureQuantity',

src/views/unqualifiedProduct/unqualifiedList/probationalGoods/index.vue

@@ -135,6 +135,18 @@
             align: 'center',
             width: 160,
             showOverflowTooltip: true
+          },
+                  {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'measureQuantity',

src/views/unqualifiedProduct/unqualifiedList/refuseManagement/index.vue

@@ -136,6 +136,18 @@
             width: 160,
             showOverflowTooltip: true
           },
+          {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             prop: 'measureQuantity',
             label: '计量数量',

src/views/unqualifiedProduct/unqualifiedList/returngoods/index.vue

@@ -135,6 +135,18 @@
             align: 'center',
             width: 160,
             showOverflowTooltip: true
+          },
+                  {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'measureQuantity',

src/views/unqualifiedProduct/unqualifiedList/rework/index.vue

@@ -197,6 +197,18 @@
             align: 'center',
             width: 160,
             showOverflowTooltip: true
+          },
+                  {
+            label: '机型',
+            prop: 'modelKey',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            label: '颜色',
+            prop: 'colorKey',
+            align: 'center',
+            showOverflowTooltip: true
           },
           {
             prop: 'measureQuantity',