Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev

pages/meter-aptitude/item-manage/ExperimentItemManage.vue

@@ -84,9 +84,9 @@ export default {
       pageColumns: [
         { title: '试验名称', key: 'name' },
         { title: '英文名称', key: 'elName', width: 160 },
+        { title: '检测科室', key: 'groupName', width: 160 },
         { title: '试验项目英文简写', key: 'shortName' },
         { title: '大类', key: 'mainType' },
-        // {title: '限制范围或说明', key: 'limitDescription'},
         { title: '小类', key: 'smallType' },
         { title: '试验方法', key: 'testMethod' }
       ],

pages/meter-entrust/SoilSampleItemManage.vue

@@ -142,6 +142,7 @@ export default {
       pageColumns: [
         { title: '试验名称', key: 'name', width: 160 },
         { title: '试验项目英文简写', key: 'shortName', width: 140 },
+        { title: '试验科室', key: 'groupName', width: 140 },
         { title: '大类', key: 'mainType', width: 140 },
         { title: '小类', key: 'smallType' },
         { title: '检测依据', key: 'testBasis', width: 180 },

pages/meter-entrust/SoilSampleManage.vue

@@ -119,10 +119,10 @@ export default {
       pageColumns: [
         { title: '试样编号', key: 'sampleCode', width: 160, fixed: 'left' },
         { title: '试样深度', key: 'sampleDepth', width: 160 },
-        { title: '土质描述', key: 'sampleDescribe', width: 160 },
-        { title: '样品包装类型', key: 'samplePack', width: 160 },
         { title: '现场编号', key: 'siteNo', width: 130 },
-        { title: '试验项目', key: 'experimentNames', width: 330 }
+        { title: '试验项目', key: 'experimentNames', width: 330 },
+        { title: '土质描述', key: 'sampleDescribe', width: 160 },
+        { title: '样品包装类型', key: 'samplePack', width: 160 }
       ],
       sampleId: '',
       dateList: [],

pages/meter-entrust/entrust-register/EntrustRegisterEdit.vue

@@ -214,7 +214,7 @@ export default {
       pageColumns: [
         { title: '试样编号', key: 'sampleCode', width: 140 },
         { title: '现场编号', key: 'siteNo', width: 140 },
-        { title: '试验项目', key: 'itemNames', width: 140 },
+        { title: '试验项目', key: 'experiments', width: 140 },
         { title: '试样深度', key: 'sampleDepth', width: 140 },
         { title: '样品包装类型', key: 'samplePack', width: 150 },
         { title: '土质描述', key: 'sampleDescribe' }