2213980799@qq.com пре 1 година
родитељ
комит
5578d68b44

+ 4 - 1
src/views/inspectionPoint/components/EquipmentDialog.vue

@@ -76,7 +76,10 @@ export default {
         // },
         {
           label: '质检标准',
-          prop: 'inspectionStandard'
+          prop: 'inspectionStandard',
+          formatter: (row, column, cellValue) => {
+            return row.symbol+' '+cellValue+' '+row.unit
+          }
         },
 
         // {

+ 2 - 0
src/views/inspectionPoint/components/inspectionProjectList.vue

@@ -11,6 +11,7 @@
         label="质检标准"
         align="center"
         prop="inspectionStandard"
+        width="300px"
       >
       <template slot-scope="scope">
         <el-form-item label-width="0" prop="inspectionStandard">
@@ -21,6 +22,7 @@
             @change="changeValue"
           >
           <span slot="suffix">  {{ scope.row.unit }}</span>
+          <DictSelection style="width:80px" slot="prepend"  clearable dictName="数学字符" v-model="scope.row.symbol"></DictSelection>
           </el-input>
          
         </el-form-item>

+ 4 - 3
src/views/inspectionProject/components/edit.vue

@@ -23,7 +23,7 @@
         <el-col :span="12">
           <el-form-item label="质检标准:" prop="inspectionStandard">
             <el-input  v-model="form.inspectionStandard">
-              <!-- <DictSelection style="width:100px" slot="prepend"  clearable dictName="数学字符" v-model="form.unit"></DictSelection> -->
+              <DictSelection style="width:100px" slot="prepend"  clearable dictName="数学字符" v-model="form.symbol"></DictSelection>
             </el-input>
           </el-form-item>
 
@@ -31,7 +31,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="单位:" prop="unit">
-            <DictSelection dictName="质检项标准单位" v-model="form.unit"></DictSelection>
+            <DictSelection clearable dictName="质检项标准单位" v-model="form.unit"></DictSelection>
 
           </el-form-item>
         </el-col>
@@ -106,7 +106,8 @@ export default {
         inspectionTool: '',
         isCreateCourse: '',
         description: '',
-        unit:""
+        unit:"",
+        symbol:''
       };
     };
     return {

+ 1 - 1
src/views/inspectionProject/index.vue

@@ -76,7 +76,7 @@ export default {
           label: '质检标准',
           prop: 'inspectionStandard',
           formatter: (row, column, cellValue) => {
-            return cellValue+' '+row.unit
+            return row.symbol+' '+cellValue+' '+row.unit
           }
         },
         // {

+ 41 - 17
src/views/inspectionStandard/components/edit.vue

@@ -75,7 +75,11 @@
             height="40vh"
           >
             <el-table-column :label="form.singleWeightDivision" align="center">
-              <el-table-column label="参数上限" align="center" v-if='form.parameterType==3'>
+              <el-table-column
+                label="参数上限"
+                align="center"
+                v-if="form.parameterType == 3"
+              >
                 <template slot-scope="scope">
                   <el-form-item label-width="0" prop="finalValue">
                     <el-input
@@ -86,7 +90,11 @@
                   </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column label="参数下限" align="center" v-if='form.parameterType==3'>
+              <el-table-column
+                label="参数下限"
+                align="center"
+                v-if="form.parameterType == 3"
+              >
                 <template slot-scope="scope">
                   <el-form-item label-width="0" prop="initialValue">
                     <el-input
@@ -97,7 +105,11 @@
                   </el-form-item>
                 </template>
               </el-table-column>
-              <el-table-column label="默认值" align="center" v-if='form.parameterType!=3'>
+              <el-table-column
+                label="默认值"
+                align="center"
+                v-if="form.parameterType != 3"
+              >
                 <template slot-scope="scope">
                   <el-form-item label-width="0" prop="defaultValue">
                     <el-input
@@ -117,7 +129,16 @@
                       clearable
                       v-model="scope.row.toleranceValue"
                       placeholder="请输入"
-                    />
+                    >
+                    <DictSelection
+                      style="width: 100px"
+                      slot="prepend"
+                      clearable
+                      dictName="数学字符"
+                      v-model="scope.row.symbol"
+                    ></DictSelection>
+                    </el-input>
+                    <!-- </el-form-item> -->
                   </el-form-item>
                 </template>
               </el-table-column>
@@ -178,7 +199,7 @@ export default {
         singleWeightDivision: '',
         tolerance: '',
         parameterStandards: [],
-        parameterType:''
+        parameterType: ''
       };
     };
     return {
@@ -217,12 +238,13 @@ export default {
       if (this.type == 'edit') {
         if (!row.parameterStandards) {
           row.parameterStandards = [];
-        }else{
-          row.singleWeightDivision=row.parameterStandards[0]?.singleWeightDivision
-          row.tolerance=row.parameterStandards[0]?.tolerance
-          row.parameterType=row.parameterStandards[0]?.parameterType
+        } else {
+          row.singleWeightDivision =
+            row.parameterStandards[0]?.singleWeightDivision;
+          row.tolerance = row.parameterStandards[0]?.tolerance;
+          row.parameterType = row.parameterStandards[0]?.parameterType;
         }
-        this.form = JSON.parse(JSON.stringify(row)) ;
+        this.form = JSON.parse(JSON.stringify(row));
       }
       this.visible = true;
     },
@@ -232,14 +254,16 @@ export default {
         finalValue: data.parameter?.maxValue,
         initialValue: data.parameter?.minValue,
         toleranceValue: data.project?.inspectionStandard,
-        singleWeightDivision: data.parameter?.name +' '+ data.parameter?.unitName,
-        tolerance: data.project?.inspectionName+' '+data.project?.unit,
-        parameterType:data.parameter?.textType,
-        defaultValue:data.parameter?.defaultValue,
+        symbol: data.project?.symbol,
+        singleWeightDivision:
+          data.parameter?.name + ' ' + data.parameter?.unitName,
+        tolerance: data.project?.inspectionName + ' ' + data.project?.unit,
+        parameterType: data.parameter?.textType,
+        defaultValue: data.parameter?.defaultValue
       };
-      this.form.singleWeightDivision =obj.singleWeightDivision
-      this.form.tolerance = obj.tolerance
-      this.form.parameterType = obj.parameterType
+      this.form.singleWeightDivision = obj.singleWeightDivision;
+      this.form.tolerance = obj.tolerance;
+      this.form.parameterType = obj.parameterType;
       this.form.parameterStandards.push(obj);
     },
     add() {

+ 4 - 1
src/views/inspectionStandard/components/standardDialog.vue

@@ -145,7 +145,10 @@ export default {
         // },
         {
           label: '质检标准',
-          prop: 'inspectionStandard'
+          prop: 'inspectionStandard',
+          formatter: (row, column, cellValue) => {
+            return row.symbol+' '+cellValue+' '+row.unit
+          }
         },
 
         // {