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

api/meter/meter-entrust.js

@@ -6,13 +6,13 @@ import http from '../http'
 
 export default {
   // page
-  page: data => http.post('meter/v1/subcontractor/page', data).then(res => res),
-  getById: data => http.get('meter/v1/subcontractor/' + data).then(res => res),
+  page: data => http.post('meter/v1/entrust/page', data).then(res => res),
+  getById: data => http.get('meter/v1/entrust/' + data).then(res => res),
   deleteById: data =>
-    http.delete('meter/v1/subcontractor/?ids=' + data).then(res => res),
+    http.delete('meter/v1/entrust/?ids=' + data).then(res => res),
   // 保存
-  save: data => http.post('meter/v1/subcontractor/', data).then(res => res),
+  save: data => http.post('meter/v1/entrust/', data).then(res => res),
   // 编辑
   edit: data =>
-    http.put('meter/v1/subcontractor/' + data.id, data.obj).then(res => res)
+    http.put('meter/v1/entrust/' + data.id, data.obj).then(res => res)
 }

pages/meter-entrust/send-test/MeterSendEntrust.vue

@@ -50,7 +50,7 @@
   </div>
 </template>
 <script>
-import { meterSubcontractor } from '../../../api'
+import { meterEntrust, meterSubcontractor } from '../../../api'
 import MeterSubcontractorEdit from './MeterSendTestEdit'
 export default {
   components: { MeterSubcontractorEdit },
@@ -178,7 +178,7 @@ export default {
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
       console.log('this.formObj', this.formObj)
-      const result = await meterSubcontractor.page(this.formObj)
+      const result = await meterEntrust.page(this.formObj)
       if (result) {
         this.getPage = result
       }

pages/meter-entrust/send-test/MeterSendTestEdit.vue

@@ -5,8 +5,8 @@
       <div>
         <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
 
-          <Form-item label="委托方是否第一次送检" prop="name" class="width-48">
-            <Input v-model="formObj.name" name="name" placeholder="请输入实验室名称"/>
+          <Form-item label="委托方是否第一次送检" prop="firsted" class="width-48">
+            <Input v-model="formObj.firsted" name="firsted" placeholder="委托方是否第一次送检"/>
           </Form-item>
           <Form-item label="委托单位" prop="name" class="width-48">
             <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>