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

 Conflicts:
	api/meter/meter-sample.js

api/meter/meter-sample.js

@@ -11,6 +11,8 @@ export default {
   // 个人任务
   pagePersonTask: data =>
     http.post('meter/v1/item/page', data).then(res => res),
+  pageSubpackageSample: data =>
+    http.post('meter/v1/sample/page_subpackage_sample', data).then(res => res),
   pageOutDistribute: data =>
     http.post('meter/v1/sample/page_distribute', data).then(res => res),
   pageOutPersonalTask: data =>

pages/meter-out/personal-task/MeterOutPersonalTask.vue

@@ -98,14 +98,14 @@ export default {
       selectIds: [],
       getPage: {},
       pageColumns: [
-        { title: '委托单位', key: 'client', width: 200 },
-        { title: '联系人', key: 'person', width: 120 },
-        { title: '联系电话', key: 'tel', width: 120 },
-        { title: '详细地址', key: 'address', width: 250 },
         { title: '样品名称', key: 'name', width: 160 },
         { title: '型号规格', key: 'spec' },
         { title: '出厂编号', key: 'factoryNumber' },
         { title: '检测类型', key: 'type' },
+        { title: '委托单位', key: 'client', width: 200 },
+        { title: '联系人', key: 'person', width: 120 },
+        { title: '联系电话', key: 'tel', width: 120 },
+        { title: '详细地址', key: 'address', width: 250 },
         { title: '数量', key: 'quantity' },
         { title: '备注', key: 'remark' }
       ]

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

@@ -90,7 +90,7 @@ export default {
           // meter-review-entrust-pass-btn
           type: 'success',
           id: '',
-          name: '分包'
+          name: '分包信息登记'
         },
         // meter-review-entrust-back-btn
         {
@@ -229,10 +229,10 @@ export default {
     _formSearch() {
       this.$refs.pageTable._pageChange(1)
     },
-    _page: async function(id) {
+    _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await meterSample.page(this.formObj)
+      const result = await meterSample.pageSubpackageSample(this.formObj)
       if (result) {
         this.getPage = result
         this.$refs.pageTable._hideLoading()

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

@@ -59,18 +59,18 @@ export default {
       formId: 'meterSubpackageTaskFormId',
       searchOpen: false,
       btn: [
-        {
-          // meter-review-entrust-pass-btn
-          type: 'success',
-          id: '',
-          name: '通过'
-        },
-        // meter-review-entrust-back-btn
-        {
-          type: 'success',
-          id: '',
-          name: '驳回'
-        }
+        // {
+        //   // meter-review-entrust-pass-btn
+        //   type: 'success',
+        //   id: '',
+        //   name: '通过'
+        // },
+        // // meter-review-entrust-back-btn
+        // {
+        //   type: 'success',
+        //   id: '',
+        //   name: '驳回'
+        // }
       ],
       iconMsg: [
         {