Merge branch 'driver'

src/views/base/device/device.vue

@@ -90,7 +90,7 @@
           <DictTag :type="currentDictType" :value="scope.row.type"/>
         </template>
       </el-table-column>
-      <el-table-column label="校准日期" align="center" prop="equZq"/>
+      <el-table-column label="设备检定周期" align="center" prop="equZq"/>
       <el-table-column label="有效期" align="center" prop="validTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.validTime, '{y}-{m}-{d}') }}</span>
@@ -99,10 +99,10 @@
       <el-table-column label="校准单位" align="center" prop="lastUnit"/>
       <el-table-column label="证书编号" align="center" prop="certificateNumber"/>
       <el-table-column label="制造商" align="center" prop="manufacturer"/>
-      <el-table-column label="电话" align="center" prop="mobile"/>
+      <el-table-column label="制造商电话" align="center" prop="mobile"/>
-      <el-table-column label="邮编" align="center" prop="postcode"/>
+      <el-table-column label="经销商" align="center" prop="dealer"/>
-      <el-table-column label="地址" align="center" prop="address"/>
+      <el-table-column label="经销商电话" align="center" prop="dealerMobile"/>
-      <el-table-column label="邮箱" align="center" prop="email"/>
+      <el-table-column label="经销商地址" align="center" prop="dealerAddr"/>
       <el-table-column label="复校日期" align="center" prop="nextCheckTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextCheckTime, '{y}-{m}-{d}') }}</span>
@@ -120,7 +120,6 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-
           >修改
           </el-button>
           <el-button
@@ -128,7 +127,6 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-
           >删除
           </el-button>
         </template>
@@ -161,6 +159,24 @@
                        :label="item.label"/>
           </el-select>
         </el-form-item>
+        <el-form-item label="制造商" prop="manufacturer">
+          <el-input v-model="form.manufacturer" placeholder="请输入制造商"/>
+        </el-form-item>
+        <el-form-item label="制造商电话" prop="mobile">
+          <el-input v-model="form.mobile" placeholder="请输入制造商电话"/>
+        </el-form-item>
+        <el-form-item label="经销商" prop="dealer">
+          <el-input v-model="form.dealer" placeholder="请输入经销商"/>
+        </el-form-item>
+        <el-form-item label="经销商电话" prop="dealerMobile">
+          <el-input v-model="form.dealerMobile" placeholder="请输入经销商电话"/>
+        </el-form-item>
+        <el-form-item label="经销商地址" prop="dealerAddr">
+          <el-input v-model="form.dealerAddr" placeholder="请输入经销商地址"/>
+        </el-form-item>
+        <el-form-item label="证书编号" prop="certificateNumber">
+          <el-input v-model="form.certificateNumber" placeholder="请输入证书编号"/>
+        </el-form-item>
         <el-form-item label="设备检定周期" prop="equZq">
           <el-input v-model="form.equZq" placeholder="请输入设备检定周期"/>
         </el-form-item>
@@ -362,6 +378,9 @@ export default {
     switch (servicePackageId) {
       case 'jiance':
         this.queryParams.dictType = 'ins_report_role';
+        this.queryParams.defaultKey = 'equipment';
+        this.dictDatas = getDictDatas(DICT_TYPE.INS_EQU_TYPE);
+        this.currentDictType = DICT_TYPE.INS_EQU_TYPE;
         break;
       case 'jiaxiao':
         this.queryParams.dictType = 'drive_file_role';

src/views/base/workReport/index.vue

@@ -60,7 +60,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="workReportView(scope.row.id)">打印
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="workReportView(scope.row.id)">查看<span style="font-weight: bold;font-size: 16px">|</span>打印
           </el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)">修改
           </el-button>

src/views/drivingSchool/workReport/index.vue

@@ -59,7 +59,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="workReportView(scope.row.id)">打印
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="workReportView(scope.row.id)">查看<span style="font-weight: bold;font-size: 16px">|</span>打印
           </el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)">修改
           </el-button>

src/views/partner/device.vue

@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="设备编号" prop="equNumber">
+      <el-form-item label="设备编号1" prop="equNumber">
         <el-input
           v-model="queryParams.equNumber"
           placeholder="请输入设备编号"
@@ -60,11 +60,11 @@
         >新增
         </el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport"
                    v-hasPermi="['system:user:import']">导入
         </el-button>
-      </el-col>
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -99,9 +99,9 @@
       <el-table-column label="证书编号" align="center" prop="certificateNumber"/>
       <el-table-column label="制造商" align="center" prop="manufacturer"/>
       <el-table-column label="电话" align="center" prop="mobile"/>
-      <el-table-column label="邮编" align="center" prop="postcode"/>
+      <el-table-column label="经销商" align="center" prop="dealer"/>
-      <el-table-column label="地址" align="center" prop="address"/>
+      <el-table-column label="经销商电话" align="center" prop="dealerMobile"/>
-      <el-table-column label="邮箱" align="center" prop="email"/>
+      <el-table-column label="经销商地址" align="center" prop="dealerAddr"/>
       <el-table-column label="复校日期" align="center" prop="nextCheckTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nextCheckTime, '{y}-{m}-{d}') }}</span>
@@ -160,6 +160,24 @@
                        :label="item.label"/>
           </el-select>
         </el-form-item>
+        <el-form-item label="制造商" prop="manufacturer">
+          <el-input v-model="form.manufacturer" placeholder="请输入制造商"/>
+        </el-form-item>
+        <el-form-item label="制造商电话" prop="mobile">
+          <el-input v-model="form.mobile" placeholder="请输入制造商电话"/>
+        </el-form-item>
+        <el-form-item label="经销商" prop="dealer">
+          <el-input v-model="form.dealer" placeholder="请输入经销商"/>
+        </el-form-item>
+        <el-form-item label="经销商电话" prop="dealerMobile">
+          <el-input v-model="form.dealerMobile" placeholder="请输入经销商电话"/>
+        </el-form-item>
+        <el-form-item label="经销商地址" prop="dealerAddr">
+          <el-input v-model="form.dealerAddr" placeholder="请输入经销商地址"/>
+        </el-form-item>
+        <el-form-item label="设备编号" prop="certificateNumber">
+          <el-input v-model="form.certificateNumber" placeholder="请输入设备编号"/>
+        </el-form-item>
         <el-form-item label="设备检定周期" prop="equZq">
           <el-input v-model="form.equZq" placeholder="请输入设备检定周期"/>
         </el-form-item>