ysy пре 1 година
родитељ
комит
f935dd2256

+ 3 - 2
src/views/pick/pickApply/components/addPick.vue

@@ -89,7 +89,7 @@
                 width="80"
               >
                 <template slot-scope="{ row, $index }">
-                  <el-tag>{{
+                  <el-tag size="mini">{{
                     typeName[Number(row.rootCategoryLevelId)]
                   }}</el-tag>
                 </template>
@@ -144,7 +144,7 @@
                       "
                       size="mini"
                     >
-                      <template slot="append">{{ row.unit }}</template>
+                      <template slot="append">{{ row.measuringUnit }}</template>
                     </el-input>
                   </el-form-item>
                 </template>
@@ -168,6 +168,7 @@
                       v-model="row.warehouseId"
                       placeholder="请选择"
                       filterable
+                        size="mini"
                     >
                       <el-option
                         v-for="item in row.warehouseList"

+ 2 - 2
src/views/pick/pickApply/components/selfBuildPick.vue

@@ -48,7 +48,7 @@
 
           <el-table-column label="类型" prop="rootCategoryLevelId" width="80">
             <template slot-scope="{ row, $index }">
-              <el-tag>{{ typeName[Number(row.rootCategoryLevelId)] }}</el-tag>
+              <el-tag size="mini">{{ typeName[Number(row.rootCategoryLevelId)] }}</el-tag>
             </template>
           </el-table-column>
 
@@ -100,7 +100,7 @@
                   "
                   size="mini"
                 >
-                  <template slot="append">{{ row.unit }}</template>
+                  <template slot="append">{{ row.measuringUnit }}</template>
                 </el-input>
               </el-form-item>
             </template>

+ 2 - 2
src/views/produce/components/picking/index.vue

@@ -80,7 +80,7 @@
 
             <el-table-column label="类型"  prop="rootCategoryLevelId"  width="80">
               <template slot-scope="{ row, $index }">
-                <el-tag>{{ typeName[Number(row.rootCategoryLevelId)] }}</el-tag>
+                <el-tag   size="mini">{{ typeName[Number(row.rootCategoryLevelId)] }}</el-tag>
               </template>
             </el-table-column>
 
@@ -136,7 +136,7 @@
                     "
                     size="mini"
                   >
-                    <template slot="append">{{ row.unit }}</template>
+                    <template slot="append">{{ row.measuringUnit }}</template>
                   </el-input>
                 </el-form-item>
               </template>

+ 8 - 4
src/views/produce/components/produceOrder.vue

@@ -36,7 +36,7 @@
       </template>
 
       <template v-slot:singleReport="{ row }">
-        <el-tag> {{ row.singleReport == 1 ? '单个报工' : '批量报工' }}</el-tag>
+        <el-tag size="mini"> {{ row.singleReport == 1 ? '单个报工' : '批量报工' }}</el-tag>
       </template>
 
       <template v-slot:formingNum="{ row }">
@@ -105,13 +105,15 @@
             slot: 'code',
             label: '生产工单号',
             align: 'center',
-            minWidth: '110'
+            minWidth: '160'
           },
 
           {
             prop: 'productCode',
             label: '产品编码',
             align: 'center',
+                 minWidth: '160',
+            showOverflowTooltip: true,
         
           },
           {
@@ -132,12 +134,14 @@
           {
             prop: 'brandNo',
             label: '牌号',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true,
           },
           {
             prop: 'model',
             label: '型号',
-            align: 'center'
+            align: 'center',
+            showOverflowTooltip: true,
           },
 
           {

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

@@ -224,7 +224,7 @@
 
   .c_title {
     color: #157a2c;
-    font-size: 18px;
+    font-size: 16px;
     font-weight: bold;
   }