Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev

pages/contract-tab/ContractLeftList.vue

@@ -87,7 +87,7 @@ export default {
       getPage: {},
       pageColumns: [
         { title: '委托名称', key: 'name', width: 160 },
-        { title: '委托编号', key: 'code', width: 180, detail: true },
+        { title: '委托编号', key: 'code', width: 180 },
         { title: '委托单位', key: 'cname', width: 200 },
         { title: '服务类型', key: 'serviceType', width: 120 },
         { title: '应出报告日期', key: 'reportDueDate', width: 140, date: true }

pages/meter-entrust/MeterSampleManage.vue

@@ -130,7 +130,7 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', detail: true, width: 120 },
+        { title: '样品编号', key: 'code', width: 120 },
         { title: '样品名称', key: 'name', width: 140 },
         { title: '型号规格', key: 'spec', width: 140 },
         { title: '出厂编号', key: 'factoryNumber', width: 140 },

pages/meter-entrust/MeterSampleManageRead.vue

@@ -135,7 +135,7 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', detail: true, width: 120 },
+        { title: '样品编号', key: 'code', width: 120 },
         { title: '样品名称', key: 'name', width: 140 },
         { title: '型号规格', key: 'spec', width: 140 },
         { title: '出厂编号', key: 'factoryNumber', width: 140 },

pages/meter-entrust/client-online/MeterSampleManage.vue

@@ -122,7 +122,7 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', detail: true, width: 120 },
+        { title: '样品编号', key: 'code', width: 120 },
         { title: '样品名称', key: 'name', width: 140 },
         { title: '型号规格', key: 'spec', width: 140 },
         { title: '出厂编号', key: 'factoryNumber', width: 140 },

pages/meter-out/task-distribute/MeterOutTaskAlloca.vue

@@ -105,7 +105,7 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', detail: true, width: 120 },
+        { title: '样品编号', key: 'code', width: 120 },
         { title: '样品名称', key: 'name', width: 140 },
         { title: '型号规格', key: 'spec', width: 140 },
         { title: '出厂编号', key: 'factoryNumber', width: 140 },

pages/meter-review/MeterSampleManage.vue

@@ -126,7 +126,7 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', detail: true, width: 120 },
+        { title: '样品编号', key: 'code', width: 120 },
         { title: '样品名称', key: 'name', width: 140 },
         { title: '型号规格', key: 'spec', width: 140 },
         { title: '出厂编号', key: 'factoryNumber', width: 140 },

pages/meter-review/contract-tab/ContractLeftList.vue

@@ -93,7 +93,7 @@ export default {
       getPage: {},
       pageColumns: [
         { title: '委托名称', key: 'name', width: 160 },
-        { title: '委托编号', key: 'code', width: 180, detail: true },
+        { title: '委托编号', key: 'code', width: 180 },
         { title: '委托单位', key: 'cname', width: 200 },
         { title: '服务类型', key: 'serviceType', width: 120 },
         { title: '应出报告日期', key: 'reportDueDate', width: 140, date: true }

pages/meter-send/receive-sample/MeterSampleManage.vue

@@ -118,8 +118,9 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', detail: true, width: 120 },
+        { title: '样品编号', key: 'code', width: 120 },
         { title: '样品名称', key: 'name', width: 140 },
+        { title: '检测项目', key: 'itemNames', width: 140 },
         { title: '型号规格', key: 'spec', width: 140 },
         { title: '出厂编号', key: 'factoryNumber', width: 140 },
         { title: '是否分包', key: 'jobOut', width: 110 },

pages/meter-send/task-distribute/MeterTaskAlloca.vue

@@ -120,7 +120,7 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', detail: true, width: 120 },
+        { title: '样品编号', key: 'code', width: 120 },
         { title: '样品名称', key: 'name', width: 140 },
         { title: '型号规格', key: 'spec', width: 140 },
         { title: '出厂编号', key: 'factoryNumber', width: 140 },

pages/meter-subcontract/subpackage-input/MeterSubSampleManage.vue

@@ -129,7 +129,7 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', detail: true, width: 120 },
+        { title: '样品编号', key: 'code', width: 120 },
         { title: '样品名称', key: 'name', width: 140 },
         { title: '型号规格', key: 'spec', width: 140 },
         { title: '出厂编号', key: 'factoryNumber', width: 140 },

pages/meter-subcontract/subpackage-task/MeterSubSampleManage.vue

@@ -128,7 +128,7 @@ export default {
       selectData: [],
       getPage: {},
       pageColumns: [
-        { title: '样品编号', key: 'code', detail: true, width: 120 },
+        { title: '样品编号', key: 'code', width: 120 },
         { title: '样品名称', key: 'name', width: 140 },
         { title: '型号规格', key: 'spec', width: 140 },
         { title: '出厂编号', key: 'factoryNumber', width: 140 },
@@ -311,14 +311,6 @@ export default {
         this._deleteByIds(ids, '确定删除 ' + ids.length + ' 条记录？')
       }
     },
-    _detailModal(id) {
-      this.currentComponent = 'FoodSampleGovernDetail'
-      this.$nextTick(function() {
-        this.$store.dispatch('FoodSample/getByGovernId', id).then(() => {
-          this.$refs.refModal._open(this.$store.state.FoodSample.governModel)
-        })
-      })
-    },
     _editModal(edit, id) {
       this.currentComponent = 'FoodSampleGovernEdit'
       this.$nextTick(function() {