Merge remote-tracking branch 'origin/master'

src/views/jhzx/ydjhzxCX.vue

@@ -500,7 +500,7 @@ export default {
         },
         {
           field: 'pwfkrq',
-          title: '抛丸反馈日期',
+          title: '抛丸报工日期',
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
@@ -549,14 +549,14 @@ export default {
         },
         {
           field: 'llfkry',
-          title: '理料反馈人',
+          title: '理料报工人',
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
           field: 'llfkrq',
-          title: '理料反馈日期',
+          title: '理料报工日期',
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
@@ -598,14 +598,14 @@ export default {
         },
         {
           field: 'hxfkrq',
-          title: '划线反馈日期',
+          title: '划线报工日期',
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
           field: 'hxfkry',
-          title: '划线反馈人员',
+          title: '划线报工人员',
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
@@ -647,14 +647,14 @@ export default {
         },
         {
           field: 'qgfkry',
-          title: '切割反馈人',
+          title: '切割报工人',
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }
         },
         {
           field: 'qgfkrq',
-          title: '切割反馈日期',
+          title: '切割报工日期',
           width: 100,
           filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
           filterRender: { name: 'FilterCombination' }

src/views/jhzxgl/components/SljhPrint.vue

@@ -245,7 +245,7 @@ export default {
 
 .ewm{
   position: absolute;
-  left: 10px;
+  right: -60px;
   top:-0px;
 
 }