Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into developer/gaixiankang

src/views/setting/materialLibrary/index.vue

@@ -2,7 +2,7 @@
   <el-drawer
     title="素材库"
     :visible.sync="drawerDisplay"
-    size="20%"
+    size="30%"
     :wrapper-closable="false"
     @close="closeMaterial"
   >
@@ -13,10 +13,11 @@
         top: 22px;
         left: 90px;
         cursor: pointer;
+        display: flex;
       "
       @click="refresh"
     >
-      <i class="el-icon-refresh"></i>刷新
+      <icon-park type="refresh" theme="outline" size="16" fill="#1a6fd7" />刷新
     </div>
     <div
       v-for="(item, index) in materialList"

src/views/setting/sample/index.vue

@@ -101,6 +101,7 @@
           <el-link
             type="primary"
             :underline="false"
+            class="custom-link"
             @click="clickSampleName(scope.row)"
             >{{ scope.row.sampleName }}</el-link
           >
@@ -145,8 +146,9 @@
               :key="index"
               type="primary"
               :underline="false"
+              class="custom-link"
               @click="goTaskDetails(item.taskId)"
-              >{{ item.taskName }}
+              >{{ item.taskName ? item.taskName : '--' }}
               <span v-show="index + 1 != scope.row.taskSampleRelation.length">
                 ,
               </span></el-link
@@ -188,6 +190,7 @@
       :visible.sync="dialogVisible"
       :title="dialogTitle"
       wrapper-closable="false"
+      size="40%"
       @close="cancleSubmit"
     >
       <el-form
@@ -207,7 +210,7 @@
             v-model="editParamsForm.identificationCode"
             placeholder="请输入车辆识别码"
             clearable
-            style="width: 250px"
+            style="width: 90%"
           />
         </el-form-item>
         <el-form-item label="样品编号" prop="sampleNumber">
@@ -215,7 +218,7 @@
             v-model="editParamsForm.sampleNumber"
             placeholder="请输入样品编号"
             clearable
-            style="width: 250px"
+            style="width: 90%"
           />
         </el-form-item>
         <el-form-item label="样品名称" prop="sampleName">
@@ -223,7 +226,7 @@
             v-model="editParamsForm.sampleName"
             placeholder="请输入样品名称"
             clearable
-            style="width: 250px"
+            style="width: 90%"
           />
         </el-form-item>
         <el-form-item label="送样者" prop="sampleSender">
@@ -231,7 +234,7 @@
             v-model="editParamsForm.sampleSender"
             placeholder="请输入送样者"
             clearable
-            style="width: 250px"
+            style="width: 90%"
           />
         </el-form-item>
         <el-form-item label="样品数量" prop="numberOfSamples">
@@ -239,7 +242,7 @@
             v-model="editParamsForm.numberOfSamples"
             placeholder="请输入样品数量"
             clearable
-            style="width: 250px"
+            style="width: 90%"
           />
         </el-form-item>
         <el-form-item label="送样日期" prop="deliveryDate">
@@ -248,7 +251,7 @@
             type="date"
             placeholder="请选择送样日期"
             value-format="yyyy-MM-dd"
-            style="width: 250px"
+            style="width: 90%"
           >
           </el-date-picker>
         </el-form-item>
@@ -258,7 +261,7 @@
             type="date"
             placeholder="请选择生产日期"
             value-format="yyyy-MM-dd"
-            style="width: 250px"
+            style="width: 90%"
           >
           </el-date-picker>
         </el-form-item>
@@ -267,7 +270,7 @@
             v-model="editParamsForm.manufacturingEnterprise"
             placeholder="请输入生产企业"
             clearable
-            style="width: 250px"
+            style="width: 90%"
           />
         </el-form-item>
         <el-form-item label="商标" prop="trademark">
@@ -296,7 +299,7 @@
             placeholder="请输入备注"
             maxlength="200"
             show-word-limit
-            style="width: 250px"
+            style="width: 90%"
           >
           </el-input>
         </el-form-item>
@@ -608,4 +611,7 @@ export default {
   justify-content: flex-end;
   margin-right: 20px;
 }
+.custom-link:hover {
+  text-decoration: underline;
+}
 </style>

src/views/setting/standard/index.vue

@@ -97,15 +97,14 @@
         class-name="fixed-width"
       >
         <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['setting:standard:update']"
-            plain
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            >修改</el-button
-          >
+          <div class="button-bar">
+            <page-button
+              v-hasPermi="['setting:standard:update']"
+              icon="edit"
+              title="修改"
+              @click.native="handleUpdate(scope.row)"
+            ></page-button>
+          </div>
         </template>
       </el-table-column>
     </el-table>

src/views/setting/standardTerms/index.vue

@@ -93,14 +93,14 @@
         class-name="fixed-width"
       >
         <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['setting:standard:update']"
-            plain
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-            >检验内容</el-button
-          >
+          <div class="button-bar">
+            <page-button
+              v-hasPermi="['setting:standard:update']"
+              icon="doc-search"
+              title="检验内容"
+              @click.native="handleUpdate(scope.row)"
+            ></page-button>
+          </div>
         </template>
       </el-table-column>
     </el-table>