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

api/meter/meter-sample.js

@@ -54,10 +54,15 @@ export default {
     http.post('meter/v1/sample/page_distribute_his', data).then(res => res),
   pageOutPersonalTask: data =>
     http.post('meter/v1/sample/page_out_personal_task', data).then(res => res),
-
+  pageOutPersonalTaskHis: data =>
+    http
+      .post('meter/v1/sample/page_out_personal_task_his', data)
+      .then(res => res),
   pageSampleInput: data =>
     http.post('meter/v1/sample/page_sample_input', data).then(res => res),
 
+  pageSampleInputHis: data =>
+    http.post('meter/v1/sample/page_sample_input_his', data).then(res => res),
   pageSampleInStock: data =>
     http.post('meter/v1/sample/page_sample_in_stock', data).then(res => res),
   pageSampleInStockHis: data =>

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

@@ -37,7 +37,7 @@
                 :min-width="item.width?item.width:200"
                 :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
-                   <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
+                  <span v-if="item.key==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
                   </span>
                   <span v-else>{{scope.row[item.key]}}</span>
                 </template>
@@ -73,17 +73,17 @@ export default {
         //   id: '',
         //   name: '编辑'
         // },
-        // {
-        //   type: 'ios-contact',
-        //   id: '',
-        //   name: '任务分配'
-        // },
-        // { type: 'md-cloud', id: '', name: '附件' },
-        // {
-        //   type: 'ios-clock',
-        //   id: '',
-        //   name: '操作日志'
-        // }
+        {
+          type: 'ios-contact',
+          id: '',
+          name: '任务分配'
+        },
+        { type: 'md-cloud', id: '', name: '附件' },
+        {
+          type: 'ios-clock',
+          id: '',
+          name: '操作日志'
+        }
       ],
       formObj: {
         client: undefined,
@@ -98,7 +98,7 @@ export default {
         { title: '联系电话', key: 'tel', width: 120 },
         { title: '传真', key: 'fax', width: 120 },
         { title: '详细地址', key: 'address', width: 250 },
-        { title: '邮编', key: 'postcode' },
+        { title: '邮编', key: 'postcode', width: 110 },
         { title: 'E-mail', key: 'email', width: 120 },
         { title: '委托日期', key: 'edate', width: 120 },
         { title: '费用合计', key: 'fee', width: 120 },

pages/meter-send/sample-flow/MeterSampleFlow.vue

@@ -82,11 +82,6 @@ export default {
         {
           type: 'success',
           id: '',
-          name: '任务转发'
-        },
-        {
-          type: 'success',
-          id: '',
           name: '流转'
         }
       ],