整体优化

pages/meter-aptitude/manage/MeterAptitudeManageEdit.vue

@@ -137,8 +137,8 @@ export default {
       ],
       btn: [{ type: 'success', id: '', name: '添加' }],
       iconMsg: [
-        { type: 'ios-clock', id: '', name: '编辑' },
-        { type: 'ios-clock', id: '', name: '删除' }
+        { type: 'md-create', id: '', name: '编辑' },
+        { type: 'md-trash', id: '', name: '删除' }
       ],
       currentRow: {},
       currentIndex: 0,

pages/meter-aptitude/manage/SampleItemList.vue

@@ -13,17 +13,17 @@
         <Col span="24" />
         <Form v-model="formObj" :label-width="90" inline onsubmit="return false">
           <Form-item class="search-item" label="检测项目:" style="margin-left: -25px">
-            <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable />
+            <Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch" />
             <input v-model="formObj.catalogueId" type="hidden">
           </Form-item>
           <Form-item class="search-item" label="检测依据:">
-            <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入检测依据" clearable />
+            <Input v-model="formObj.code" placeholder="请输入检测依据" clearable @on-enter="_formSearch" />
           </Form-item>
           <Form-item class="search-item" label="检测依据名称:">
-            <Input v-model="formObj.standardName" @on-enter="_formSearch" placeholder="请输入检测依据名称" clearable />
+            <Input v-model="formObj.standardName" placeholder="请输入检测依据名称" clearable @on-enter="_formSearch" />
           </Form-item>
           <Form-item class="search-btn">
-            <Button @click="_formSearch" type="primary">
+            <Button type="primary" @click="_formSearch">
               搜索
             </Button>
           </Form-item>
@@ -31,16 +31,16 @@
         </Col>
         <!--正常界面-->
         <Col span="24" />
-          <Button @click="_importItem" type="primary" style="margin-bottom: 5px">导入检测项目</Button>
+          <Button type="primary" style="margin-bottom: 5px" @click="_importItem">导入检测项目</Button>
         </Col>
         <!-- 表格 -->
         <Col span="24">
           <PTVXETable
             ref="pageTable"
             :form-id="formId"
-            :tableHeight="500"
-            :getPage="getPage"
-            :iconMsg="iconMsg"
+            :table-height="500"
+            :get-page="getPage"
+            :icon-msg="iconMsg"
             @on-result-change="_tableResultChange">
             <vxe-table-column
               v-for="item in pageColumns"
@@ -60,23 +60,24 @@
           </PTVXETable>
         </Col>
         <div slot="footer">
-          <ModalFooter ref="footerModal" @on-result-change="_footerResult" :footer="footerList"></ModalFooter>
+          <ModalFooter ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></ModalFooter>
         </div>
       </Row>
 
     </Modal>
-    <!--导入项目  左右关联的modal   单个导入项目-->
-<!--    <SampleItemSelect ref="relItemModal" @on-result-change="_formSearch" />-->
+    <DownloadTemplateImport ref="importModal" @on-result-change="_page" />
   </div>
 </template>
 <script>
 // import { drugCatalogueItem } from '../../api'
 // import SampleItemSelect from './SampleItemSelect'
+import DownloadTemplateImport from '../../../components/import/DownloadTemplateImport'
 import ModalFooter from '../../../components/base/modalFooter'
 import { meterManageItem } from '../../../api'
 export default {
   components: {
-    ModalFooter
+    ModalFooter,
+    DownloadTemplateImport
     // SampleItemSelect
   },
   data() {
@@ -162,8 +163,16 @@ export default {
           break
       }
     },
+
     _importItem() {
-      this.$refs.relItemModal._open(this.catalogueId)
+      const data = {
+        importUrl:
+          '/meter/v1/aptitude_item/import_aptitude_item?aptitudeId=' +
+          this.formObj.aptitudeId,
+        downloadUrl: '/meter/v1/excel/template/MeterAptitudeItemImport',
+        title: '导入'
+      }
+      this.$refs.importModal._open(data, '授权资质项目导入')
     },
     // 操作列操作
     _iconClick(res, data) {

pages/meter-business/quote-register/MeterQuoteRegisterEdit.vue

@@ -674,6 +674,17 @@ export default {
           result[0].city,
           result[0].area
         ]
+        if (result[0].province) {
+          this.formObj.province = result[0].province
+        }
+
+        if (result[0].city) {
+          this.formObj.city = result[0].city
+        }
+
+        if (result[0].area) {
+          this.formObj.county = result[0].area
+        }
       }
     },
     _getAptitudeList: async function() {