Ver Fonte

修改bug

695593266@qq.com há 4 meses atrás
pai
commit
773b5c2e14

+ 1 - 1
src/views/material/BOMmanage/components/workingProcedure.vue

@@ -6,7 +6,7 @@
     :title="title"
     :title="title"
     append-to-body
     append-to-body
     :close-on-click-modal="false"
     :close-on-click-modal="false"
-    width="85%"
+    width="90%"
     :maxable="true"
     :maxable="true"
   >
   >
     <el-card shadow="never">
     <el-card shadow="never">

+ 32 - 23
src/views/material/BOMmanage/qualityTesting/term.vue

@@ -54,9 +54,8 @@
 
 
       <template v-slot:defaultValue="{ row }">
       <template v-slot:defaultValue="{ row }">
         <div style="width: 100%; display: flex; justify-content: space-between">
         <div style="width: 100%; display: flex; justify-content: space-between">
-          <div style="width: 8%">
+          <div style="width: 13%">
             <DictSelection
             <DictSelection
-              style="width: 100px"
               clearable
               clearable
               dictName="数学字符"
               dictName="数学字符"
               v-model="row.symbol"
               v-model="row.symbol"
@@ -87,7 +86,7 @@
             ></el-input>
             ></el-input>
           </div>
           </div>
 
 
-          <div v-else style="width: 75%">
+          <div v-else style="width: 70%">
             <el-input
             <el-input
               v-model="row.defaultValue"
               v-model="row.defaultValue"
               placeholder="请输入"
               placeholder="请输入"
@@ -96,7 +95,7 @@
             </el-input>
             </el-input>
           </div>
           </div>
 
 
-          <div style="width: 15%">
+          <div style="width: 13%">
             <DictSelection
             <DictSelection
               dictName="工艺参数单位"
               dictName="工艺参数单位"
               clearable
               clearable
@@ -192,25 +191,44 @@
             align: 'center',
             align: 'center',
             fixed: true
             fixed: true
           },
           },
+          {
+            prop: 'qualitySchemeTemplateCode',
+            label: '质检方案编码',
+            showOverflowTooltip: true,
+            align: 'center',
+            minWidth: 150
+          },
+          {
+            prop: 'qualitySchemeTemplateName',
+            label: '质检方案名称',
+            showOverflowTooltip: true,
+            align: 'center',
+            minWidth: 130,
+            showOverflowTooltip: true
+          },
+
           {
           {
             prop: 'categoryLevelClassName',
             prop: 'categoryLevelClassName',
             label: '质检类型',
             label: '质检类型',
             align: 'center',
             align: 'center',
-            minWidth: 110
+            minWidth: 100,
+            showOverflowTooltip: true
+          },
+
+          {
+            prop: 'inspectionCode',
+            label: '质检项编码',
+            align: 'center',
+            minWidth: 100,
+            showOverflowTooltip: true
           },
           },
-          // {
-          //   prop: 'categoryLevelName',
-          //   label: '质检类型',
-          //   align: 'center',
-          //   minWidth: 110
-          // },
 
 
           {
           {
             prop: 'inspectionName',
             prop: 'inspectionName',
-            label: '质检名称',
-            showOverflowTooltip: true,
+            label: '质检项名称',
             align: 'center',
             align: 'center',
-            minWidth: 110
+            minWidth: 100,
+            showOverflowTooltip: true
           },
           },
 
 
           {
           {
@@ -221,15 +239,6 @@
             width: 700
             width: 700
           },
           },
 
 
-          // {
-          //   label: '工艺要求',
-          //   prop: 'inspectionStandard',
-          //   formatter: (row, column, cellValue) => {
-          //     return row.symbol + ' ' + cellValue + ' ' + row.unit;
-          //   },
-          //   minWidth: 350
-          // },
-
           {
           {
             columnKey: 'action',
             columnKey: 'action',
             label: '操作',
             label: '操作',