Merge remote-tracking branch 'origin/dev' into dev

pages/meter-entrust/MeterSampleEdit.vue

@@ -5,7 +5,9 @@
       <div>
         <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100">
           <Form-item label="样品名称" prop="name">
-            <Input v-model="formObj.name" name="name" placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange" />
+<!--            <Input v-model="formObj.name" name="name" placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange" />-->
+            <el-input v-model="formObj.name" name="name" blur placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange"  @click.native="_selectjudgeBasis()"
+            ></el-input>
           </Form-item>
           <Form-item label="检定依据" prop="verification">
             <Input v-model="formObj.verification" name="verification" placeholder="请选择检定依据" />
@@ -21,7 +23,11 @@
           </Form-item>
 
           <Form-item label="检测类型" prop="type">
-            <Input v-model="formObj.type" name="quantity" placeholder="请选择检测类型" />
+            <Select v-model="formObj.type" name="type">
+              <Option v-for="(item,index) in options" :key="item.name" :value="index" placeholder="请选择检测类型">
+                {{ item.name }}
+              </Option>
+            </Select>
           </Form-item>
 
           <Form-item label="备注" prop="remark">
@@ -33,6 +39,7 @@
         <ModalFooter ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></ModalFooter>
       </div>
     </Modal>
+    <EditModal ref="EditModal" is-change @on-result-change="_backData" />
   </div>
 </template>
 <script>
@@ -41,9 +48,11 @@
  */
 import ModalFooter from '../../components/base/modalFooter'
 import { meterAptitude } from '../../api'
+import EditModal from './go-out-test/EditModal'
 
 export default {
   components: {
+    EditModal,
     ModalFooter
     // autoComplete
   },
@@ -71,6 +80,17 @@ export default {
         quantity: 1,
         entrustId: ''
       },
+      options: [
+        {
+          name: '检定'
+        },
+        {
+          name: '校准'
+        },
+        {
+          name: '外观检查'
+        }
+      ],
       showModal: false,
       aptitudeData: [],
       ruleValidate: {
@@ -85,6 +105,15 @@ export default {
     }
   },
   methods: {
+    _selectjudgeBasis() {
+      this.$refs.EditModal._open()
+    },
+    _backData(data) {
+      this.formObj.name = data.name
+      this.formObj.verification = data.code + data.basis
+      console.log('返回的数据')
+      console.log(data)
+    },
     _save: async function(data) {
       const result = await meterAptitude.save(data)
       console.log(result)
@@ -119,7 +148,9 @@ export default {
           const data = this.$serialize('edit-form')
           if (this.$string(this.id).isEmpty()) {
             // 添加
-            this._save(data)
+            const saveData = this.formObj
+            console.log(saveData)
+            // this._save(saveData)
           } else {
             // 编辑
             this._edit({ id: this.formObj.id, obj: data })