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

src/views/inspectionPlan/components/entrustedDialog.vue

@@ -137,7 +137,7 @@
             minWidth: 140
           },
           {
-            prop: 'orderTotalCount',
+            prop: 'totalCount',
             label: '订单总数量',
             align: 'center',
             showOverflowTooltip: true,

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: '仓库',
@@ -884,6 +912,14 @@
         const res = await outInRecordsPage(params);
         this.sourceList = res.list || [];
         console.log(res, 'list333');
+        
+        // 在获取数据后执行后续操作：处理来源清单并设置样品清单
+        if (this.sourceList && this.sourceList.length > 0) {
+          // 处理来源清单数据
+          const processedData = this.proceSources([...this.sourceList]);
+          // 更新样品清单
+          await this.updatePackingList(processedData);
+        }
       },
 
       //成品类型检验类型，计划来源库存台账, 生成来源清单

src/views/inspectionTemplate/AddorUpdate.vue

@@ -80,12 +80,58 @@
           </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  style="width: 370px;">
+          <el-form-item label="取样数量" prop="sampleProportion">
+            <el-input
+              type="number"
+              v-model="dataForm.sampleProportion"
+              placeholder="请输入"
+              style="width:200px"
+            ></el-input>
+            <DictSelection
+              style="width: 85px"
+              dictName="计量单位"
+              placeholder=" "
+              v-model="dataForm.sampleProportionUnit"
+            ></DictSelection>
+          </el-form-item>
+        </el-col>
+        <el-col style="width: 450px;">
+          <el-form-item
+            label="质检报告有效期"
+            prop="validityPeriod"
+            label-width="150px"
+          >
+            <el-input
+              type="number"
+              v-model="dataForm.validityPeriod"
+              placeholder="请输入"
+              style="width: 200px"
+            ></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"
           :columns="columns"
           :datasource="list"
           height="400px"
+           full-height="calc(100vh - 76px)"
           tool-class="ele-toolbar-form"
           cache-key="inspectionClassify"
           row-key="qualityLevelId"
@@ -125,7 +171,7 @@
             <div>
               <el-input
                 v-model="row.inspectionName"
-                style="width: 160px"
+               
               ></el-input
             ></div>
           </template>
@@ -138,17 +184,17 @@
                 dictName="数学字符"
                 v-model="row.symbol"
               ></DictSelection>
-              <div v-if="row.textType == 3">
+              <div v-if="row.textType == 3" >
                 <el-input v-model="row.minValue" style="width: 80px"></el-input
                 >-
                 <el-input v-model="row.maxValue" style="width: 80px">
                 </el-input>
               </div>
 
-              <div v-else>
+              <div v-else  style="width: 100%">
                 <el-input
                   v-model="row.defaultValue"
-                  style="width: 170px"
+                 
                 ></el-input>
               </div>
 
@@ -184,6 +230,7 @@
           :columns="categoryColumns"
           :datasource="templateCategoryList"
           height="300px"
+           full-height="calc(100vh - 76px)"
           tool-class="ele-toolbar-form"
           cache-key="inspectionClassify"
           row-key="qualityLevelId"
@@ -254,7 +301,11 @@
           qualitySchemeTemplateCode: '',
           inspectionItemVOList: [],
           status: 1,
-          templateRemark: ''
+          templateRemark: '',
+          sampleProportion: '',
+          sampleProportionUnit: '%',
+          validityPeriod:'',
+          validityPeriodUnit:''
         },
         columns: [
           {
@@ -299,7 +350,7 @@
             slot: 'defaultValue',
             label: '工艺参数',
             align: 'center',
-            width: 400,
+            minWidth: 400,
             columnKey: 'defaultValue'
           },
 
@@ -533,3 +584,10 @@
     }
   };
 </script>
+<style lang="scss" scoped>
+  .title {
+    font-weight: bold;
+    padding-bottom: 20px;
+    padding-top: 20px;
+  }
+</style>

src/views/inspectionTemplate/inspectionClassify/components/user-search.vue

@@ -22,15 +22,11 @@
           <el-input clearable v-model="where.defaultValue" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="组织机构:">
-          <auth-selection
-            data-type="Array"
-            v-model="where.deptIds"
-            style="width: 100%"
-          ></auth-selection>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="标准名称:">
+          <el-input clearable v-model="where.qualityStandardName" placeholder="请输入" />
         </el-form-item>
-      </el-col>-->
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label-width="5px">
           <el-button
@@ -55,7 +51,8 @@ export default {
       name: '',
       inspectionName: '',
       status: 1,
-      defaultValue:''
+      defaultValue:'',
+      qualityStandardName:''
     };
 
     return {

src/views/inspectionTemplate/inspectionClassify/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog
+  <ele-modal
     title="质检"
     :visible.sync="visible"
     v-if="visible"
@@ -8,6 +8,8 @@
     :close-on-press-escape="false"
     append-to-body
     width="80%"
+    :maxable="true"
+
   >
     <div class="ele-body">
       <el-card shadow="never" v-loading="loading">
@@ -108,7 +110,7 @@
       <el-button type="primary" @click="handleSave"> 选择 </el-button>
       <el-button @click="handleClose"> 取消 </el-button>
     </div>
-  </el-dialog>
+  </ele-modal>
 </template>
 
 <script>

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/components/sampleListDialog.vue

@@ -19,6 +19,7 @@
                 label="质检方案编码"
                 prop="qualitySchemeTemplateCode"
                 align="center"
+                show-overflow-tooltip
               >
                 <template slot-scope="scope">
                   <span :class="scope.row.qualityResults === 2 ? 'warn' : ''">
@@ -30,6 +31,7 @@
                 label="质检方案名称"
                 prop="qualitySchemeTemplateName"
                 align="center"
+                show-overflow-tooltip
               >
                 <template slot-scope="scope">
                   <span :class="scope.row.qualityResults === 2 ? 'warn' : ''">
@@ -41,6 +43,7 @@
                 label="质检类型"
                 prop="categoryLevelClassName"
                 align="center"
+                show-overflow-tooltip
               >
                 <template slot-scope="scope">
                   <span :class="scope.row.qualityResults === 2 ? 'warn' : ''">
@@ -52,6 +55,7 @@
                 label="质检项编码"
                 prop="inspectionCode"
                 align="center"
+                show-overflow-tooltip
               >
                 <template slot-scope="scope">
                   <span :class="scope.row.qualityResults === 2 ? 'warn' : ''">
@@ -63,6 +67,7 @@
                 label="质检项名称"
                 prop="inspectionName"
                 align="center"
+                show-overflow-tooltip
               >
                 <template slot-scope="scope">
                   <span :class="scope.row.qualityResults === 2 ? 'warn' : ''">
@@ -233,6 +238,7 @@
           { label: '批次号', prop: 'batchNo', align: 'center' },
           // { label: '发货条码', prop: 'barcodes', align: 'center' },
           { label: '包装编码', prop: 'packageNo', align: 'center' },
+          { label: '样品编码', prop: 'sampleCode', align: 'center' },
           { label: '包装数量', prop: 'packingQuantity', align: 'center' },
           // { label: '包装单位', prop: 'packingUnit', align: 'center' },
           { label: '计量数量', prop: 'measureQuantity', 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',