委托单

api/meter/meter-entrust.js

@@ -3,15 +3,23 @@
  */
 
 import http from '../http'
+import { https } from '../https'
 
 export default {
   // page
   page: data => http.post('meter/v1/entrust/page', data).then(res => res),
+  pageSendEntrust: data =>
+    http
+      .post('meter/v1/entrust/page_send_draft_entrust', data)
+      .then(res => res),
   getById: data => http.get('meter/v1/entrust/' + data).then(res => res),
   deleteById: data =>
     http.delete('meter/v1/entrust/?ids=' + data).then(res => res),
   // 保存
-  save: data => http.post('meter/v1/entrust/', data).then(res => res),
+  save: data =>
+    https
+      .post('meter/v1/entrust/add_send_entrust', JSON.stringify(data))
+      .then(res => res),
   // 编辑
   edit: data =>
     http.put('meter/v1/entrust/' + data.id, data.obj).then(res => res)

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

@@ -93,10 +93,10 @@ export default {
       getPage: {},
       pageColumns: [
         { title: '委托单位', key: 'client', width: 200 },
-        { title: '联系人', key: 'person', width: 200 },
-        { title: '联系电话', key: 'tel', width: 90 },
+        { title: '联系人', key: 'person', width: 120 },
+        { title: '联系电话', key: 'tel', width: 120 },
         { title: '传真', key: 'fax', width: 120 },
-        { title: '详细地址', key: 'address', width: 150 },
+        { title: '详细地址', key: 'address', width: 250 },
         { title: '邮编', key: 'postcode' },
         { title: 'E-mail', key: 'email', width: 120 },
         { title: '委托日期', key: 'edate', width: 120 },
@@ -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 meterEntrust.page(this.formObj)
+      const result = await meterEntrust.pageSendEntrust(this.formObj)
       if (result) {
         this.getPage = result
       }

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

@@ -8,36 +8,36 @@
           <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="请输入委托单位"/>
+          <Form-item label="委托单位" prop="client" class="width-48">
+            <Input v-model="formObj.client" name="client" placeholder="请输入委托单位"/>
           </Form-item>
-          <Form-item label="联系人" prop="name" class="width-48">
-            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>
+          <Form-item label="联系人" prop="operation.person" class="width-48">
+            <Input v-model="formObj.operation.person" name="operation.person" placeholder="请输入委托单位"/>
           </Form-item>
-          <Form-item label="联系电话" prop="name" class="width-48">
-            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>
+          <Form-item label="联系电话" prop="operation.tel" class="width-48">
+            <Input v-model="formObj.operation.tel" name="operation.tel" placeholder="请输入委托单位"/>
           </Form-item>
-          <Form-item label="传真" prop="name" class="width-48">
-            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>
+          <Form-item label="传真" prop="operation.fax" class="width-48">
+            <Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入委托单位"/>
           </Form-item>
           <Form-item label="省、市、区" prop="name" class="width-48">
             <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>
           </Form-item>
-          <Form-item label="街道" prop="name" class="width-48">
-            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>
+          <Form-item label="街道" prop="street" class="width-48">
+            <Input v-model="formObj.street" name="street" placeholder="请输入委托单位"/>
           </Form-item>
-          <Form-item label="邮编" prop="name" class="width-48">
-            <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>
+          <Form-item label="邮编" prop="operation.postcode" class="width-48">
+            <Input v-model="formObj.operation.postcode" name="operation.postcode" placeholder="请输入委托单位"/>
           </Form-item>
 
-          <Form-item label="E-mail" prop="name" class="width-48">
-            <Input v-model="formObj.name" name="name" placeholder="请输入实验室名称"/>
+          <Form-item label="E-mail" prop="operation.email" class="width-48">
+            <Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入实验室名称"/>
           </Form-item>
-          <Form-item label="委托日期：" prop="linkman" class="width-48">
-            <Input v-model="formObj.linkman" name="linkman" placeholder="请输入联系人"/>
+          <Form-item label="委托日期：" prop="edate" class="width-48">
+            <Input v-model="formObj.edate" name="edate" placeholder="请输入联系人"/>
           </Form-item>
-          <Form-item label="合同号：" prop="linkman" class="width-48">
-            <Input v-model="formObj.linkman" name="linkman" placeholder="请输入联系人"/>
+          <Form-item label="合同号：" prop="contractCode" class="width-48">
+            <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入联系人"/>
           </Form-item>
           <Form-item label="备注：" prop="remark" style="width: 99.8%">
             <Input v-model="formObj.remark" name="remark" type="textarea" :rows="3"
@@ -55,7 +55,7 @@
 /**
  * 添加编辑分包商
  */
-import { lmsBaseDict, meterSubcontractor } from '../../../api'
+import { lmsBaseDict, meterEntrust } from '../../../api'
 
 export default {
   components: {},
@@ -65,22 +65,31 @@ export default {
       modalTitle: '',
       subcontractorId: '',
       formObj: {
-        name: '',
+        client: '',
         linkman: '',
         tel: '',
         email: '',
         address: '',
         remark: '',
-        clearingWay: '',
+        street: '',
         aptitude: [],
         assessFormSn: '',
         subArea: '',
         personCondition: '',
-        assessPerson: ''
+        edate: '',
+        contractCode: '',
+        operation: {
+          person: '',
+          tel: '',
+          fax: '',
+          postcode: '',
+          email: '',
+          fee: ''
+        }
       },
       ruleValidate: {
-        name: [
-          { required: true, message: '实验室名称不能为空', trigger: 'blur' }
+        client: [
+          { required: true, message: '委托单位不能为空', trigger: 'blur' }
         ]
       },
       clearingWayList: ['款到后测试', '先测试后付款', '其他情况（）'],
@@ -118,10 +127,12 @@ export default {
       this.$refs.formObj.validate(valid => {
         if (valid) {
           const data = this.$serialize('edit-form')
-          this.$extend(data, { aptitude: this.formObj.aptitude.toString() })
+          Object.assign(this.formObj, data)
           if (this.$string(this.id).isEmpty()) {
             // 添加
-            this._save(data)
+            console.log('data', data)
+            console.log('this.formObj', this.formObj)
+            this._save(this.formObj)
           } else {
             // 编辑
             this._edit({ id: this.formObj.id, obj: data })
@@ -186,14 +197,14 @@ export default {
       }
     },
     _save: async function(data) {
-      const result = await meterSubcontractor.save(data)
+      const result = await meterEntrust.save(data)
       console.log(result)
       if (result) {
         this._resultChange('添加成功!')
       }
     },
     _edit: async function(data) {
-      const result = await meterSubcontractor.edit(data)
+      const result = await meterEntrust.edit(data)
       if (result) {
         this._resultChange('编辑成功!')
       }