ysy 1 rok temu
rodzic
commit
5f7e6d11b6

+ 8 - 6
src/views/inspectionWork/components/edit.vue

@@ -198,11 +198,7 @@
         :name="item.id"
         :key="index"
       >
-
-      <term :qualityParam="item.qualityParam" ref="qualityParamRef"></term>
-
-  
-
+        <term :qualityParam="item.qualityParam" ref="qualityParamRef"></term>
       </el-tab-pane>
     </el-tabs>
 
@@ -266,7 +262,13 @@
   import term from './term';
 
   export default {
-    components: { ProductionVersion, EquipmentDialog, deptSelect, fileUpload, term },
+    components: {
+      ProductionVersion,
+      EquipmentDialog,
+      deptSelect,
+      fileUpload,
+      term
+    },
     mixins: [dictMixins],
 
     data() {

+ 16 - 23
src/views/inspectionWork/components/term.vue

@@ -46,7 +46,7 @@
             <el-table-column
               :label="
                 item.qualityStandard &&
-                item.qualityStandard.singleWeightDivision
+                item.qualityStandard.singleWeightDivision == 'undefined undefined'? '' :  item.qualityStandard.singleWeightDivision 
               "
               align="center"
             >
@@ -98,43 +98,36 @@
               >
                 <template slot-scope="scope">
                   <el-form-item label-width="0" prop="defaultValue">
-                    <el-input
-                      clearable
-                      disabled
-                      v-model="scope.row.defaultValue"
-                      placeholder="请输入"
-                    />
+                    {{ scope.row.defaultValue }}
                   </el-form-item>
                 </template>
               </el-table-column>
             </el-table-column>
 
             <el-table-column
-              :label="item.qualityStandard && item.qualityStandard.tolerance"
+              :label="item.qualityStandard && item.qualityStandard.tolerance == 'undefined undefined' ? '' :  item.qualityStandard.tolerance "
               align="center"
             >
               <el-table-column label="质检标准" align="center">
                 <template slot-scope="scope">
                   <el-form-item label-width="0" prop="inspectionStandard">
-                    <el-input
-                    disabled
-                      clearable
-                      v-model="scope.row.toleranceValue"
-                      placeholder="请输入"
-                    >
-                      <DictSelection
-                        style="width: 100px"
-                        disabled
-                        slot="prepend"
-                        clearable
-                        dictName="数学字符"
-                        v-model="scope.row.symbol"
-                      ></DictSelection>
-                    </el-input>
+                    {{ scope.row.symbol }}
+                    {{ scope.row.toleranceValue }}
                   </el-form-item>
                 </template>
               </el-table-column>
             </el-table-column>
+
+            <el-table-column label="质检结果" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  clearable
+                  v-model="scope.row.qualityResults"
+                  placeholder="请输入质检结果"
+                >
+                </el-input>
+              </template>
+            </el-table-column>
           </el-table>
         </el-form>
       </div>