555

src/views/produce/components/jobBooking/components/oneJobQualityBomPL.vue

@@ -225,7 +225,7 @@
                     <div class="item ww33 rx-cc">
                       <div v-if="isDetails">{{ it.taskName }}</div>
                       <el-select
-                      v-else
+                        v-else
                         size="mini"
                         class="content_num"
                         filterable
@@ -253,7 +253,7 @@
             :key="$index"
             v-if="row.extInfo.batchReportInfo.length == 0"
           >
-            <div style="display: flex; align-items: center;">
+            <div style="display: flex; align-items: center">
               质检结果: &nbsp;&nbsp;&nbsp;
               <el-select
                 size="mini"
@@ -261,7 +261,7 @@
                 filterable
                 v-model="row.extInfo.appearance"
                 placeholder="请选择"
-                style="width: 300px;"
+                style="width: 300px"
                 :disabled="isDetails"
               >
                 <el-option
@@ -273,83 +273,100 @@
                 </el-option>
               </el-select>
 
-              &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
-              处置: &nbsp;&nbsp;&nbsp;
+              <span style="display: inline-block; margin-left: 26px">
+                处置:
+              </span>
               <el-select
                 size="mini"
                 class="content_num"
                 filterable
                 v-model="row.extInfo.taskId"
                 placeholder="请选择"
-                style="width: 300px;"
+                style="width: 300px"
                 @change="(e) => selectName2(e, $index)"
                 :disabled="isDetails"
               >
-              <el-option
-                 v-for="item in stepsList"
-                :label="item.taskTypeName"
-                :value="item.taskId"
-                :key="item.taskId"
+                <el-option
+                  v-for="item in stepsList"
+                  :label="item.taskTypeName"
+                  :value="item.taskId"
+                  :key="item.taskId"
                 >
-                 </el-option>
+                </el-option>
               </el-select>
-
             </div>
 
-            <div
-              class="btn_start"
-              v-for="(qua, qudIdx) in row.extInfo.qualityParam"
-              :key="qudIdx"
-            >
-              <el-tag size="mini">质检类型：{{ qua.categoryLevelName }}</el-tag>
+            <div class="btn_start" v-if="row.extInfo.qualityParam.length > 0">
               <div class="content_table2" style="margin-top: 6px">
-                <div
-                  class="head row rx-sc"
-                  v-if="qua.parameterStandards.length > 0"
-                >
-                  <div class="item ww33">
-                    {{
-                      qua.parameterStandards[0].singleWeightDivision !=
-                      'undefined undefined'
-                        ? qua.parameterStandards[0].singleWeightDivision
-                        : '默认值'
-                    }}
-                  </div>
-                  <div class="item ww33">
-                    {{
-                      qua.parameterStandards[0].tolerance !=
-                      'undefined undefined'
-                        ? qua.parameterStandards[0].tolerance
-                        : '质检标准'
-                    }}
-                  </div>
-                  <div class="item ww33">质检结果参数</div>
+                <div class="head row rx-sc">
+                  <div class="item ww15"> 质检类型</div>
+                  <div class="item ww15"> 质检名称</div>
+                  <div class="item ww20"> 工艺参数</div>
+                  <div class="item ww20"> 工艺要求</div>
+                  <div class="item ww20">质检结果参数</div>
+                  <div class="item ww10">质检结果</div>
                 </div>
 
-                <div class="table" v-if="qua.parameterStandards.length > 0">
+                <div class="table">
                   <div
                     class="tr row rx-sc"
-                    v-for="(quaItem, quaItemIdx) in qua.parameterStandards"
+                    v-for="(quaItem, quaItemIdx) in  row.extInfo.qualityParam"
                     :key="quaItemIdx"
                   >
-                    <div class="item ww33">
-                      <div>{{ quaItem.defaultValue }}</div>
+                    <div class="item ww15">
+                      {{ quaItem.categoryLevelName }}</div
+                    >
+                    <div class="item ww15"> {{ quaItem.inspectionName }}</div>
+                    <div class="item ww20">
+                      <div style="display: flex">
+                        <div
+                          v-if="quaItem.textType == 3"
+                          style="display: flex; align-items: center"
+                        >
+                          {{ quaItem.minValue }} {{ quaItem.unit }}
+                          <span>&nbsp;&nbsp;-&nbsp;&nbsp;</span>
+                          {{ quaItem.maxValue }} {{ quaItem.unit }}
+                        </div>
+
+                        <div v-else>
+                          {{ quaItem.defaultValue }} {{ quaItem.unit }}
+                        </div>
+                      </div>
                     </div>
+                    <div class="item ww20">
+                      {{ quaItem.symbol }}{{ quaItem.inspectionStandard
+                      }}{{ quaItem.unit }}</div
+                    >
 
-                    <div class="item ww33">
-                      <div
-                        >{{ quaItem.symbol }}{{ quaItem.toleranceValue }}</div
-                      >
-                    </div>
-                    <div class="item ww33 rx-cc">
-                      <div v-if="isDetails">{{ quaItem.remark }}</div>
+                    <div class="item ww20 rx-cc">
+                      <div v-if="isDetails">{{ quaItem.qualityResultValue }}</div>
                       <el-input
                         v-else
                         class="content_num"
                         size="mini"
-                        v-model="quaItem.remark"
+                        v-model="quaItem.qualityResultValue"
                       ></el-input>
                     </div>
+
+                    <div class="item ww10">
+                      <el-select
+                        size="mini"
+                        class="content_num"
+                        filterable
+                        v-model="quaItem.qualityResult"
+                        placeholder="请选择"
+                        style="width: 95%"
+                        :disabled="isDetails"
+                      >
+                        <el-option
+                          v-for="item in qualityList"
+                          :label="item.name"
+                          :value="item.value"
+                          :key="item.value"
+                        >
+                        </el-option>
+                      </el-select>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -429,8 +446,7 @@
       isDetails: {
         type: Boolean,
         default: false
-      },
-
+      }
     },
 
     data() {
@@ -443,8 +459,12 @@
             value: 1
           },
           {
-            name: '不合格',
+            name: '不合格', 
             value: 2
+          },
+          {
+            name: '让步接受',
+            value: 3
           }
         ]
       };
@@ -513,8 +533,9 @@
           taskObj.taskTypeName
         );
         this.$forceUpdate();
+      },
 
-      }
+   
     },
 
     created() {
@@ -599,6 +620,9 @@
       .ww10 {
         width: 10%;
       }
+      .ww15 {
+        width: 15%;
+      }
     }
 
     .head {
@@ -621,6 +645,7 @@
 
       .item {
         font-size: 12px;
+        height: 100%;
         min-height: 32px;
         display: flex;
         align-items: center;
@@ -628,6 +653,7 @@
         box-sizing: border-box;
         white-space: normal;
         word-break: break-all;
+        position: relative;
       }
 
       &:last-child {