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

src/views/system/user/index.vue

@@ -142,17 +142,17 @@
               >删除</el-button
             >
           </el-col>
-          <el-col :span="1.5">
-            <el-button
-              v-hasPermi="['system:user:import']"
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              >导入</el-button
-            >
-          </el-col>
+          <!--          <el-col :span="1.5">-->
+          <!--            <el-button-->
+          <!--              v-hasPermi="['system:user:import']"-->
+          <!--              type="info"-->
+          <!--              plain-->
+          <!--              icon="el-icon-upload2"-->
+          <!--              size="mini"-->
+          <!--              @click="handleImport"-->
+          <!--              >导入</el-button-->
+          <!--            >-->
+          <!--          </el-col>-->
           <!-- <el-col :span="1.5">
             <el-button
               v-hasPermi="['system:user:export']"
@@ -245,7 +245,7 @@
           <el-table-column
             label="操作"
             align="center"
-            width="160"
+            min-width="200"
             class-name="small-padding fixed-width"
           >
             <template v-if="scope.row.userId !== 1" slot-scope="scope">
@@ -779,8 +779,8 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: '用户密码长度必须介于 5 和 20 之间'
+        inputPattern: /^.{6,20}$/,
+        inputErrorMessage: '用户密码长度必须介于 6 和 20 之间'
       })
         .then(({ value }) => {
           resetUserPwd(row.userId, value).then(response => {

src/views/task/edit/index.vue

@@ -39,7 +39,11 @@
                     'test-scenario': item.check === false,
                     'check-test-scenario': item.check === true
                   }"
-                  @click="handleInspectionItem(item)"
+                  @click="
+                    taskDetail.taskStatus === 'NEW'
+                      ? handleInspectionItem(item)
+                      : ''
+                  "
                 >
                   <div>{{ item.label }}</div>
                 </div>

src/views/task/new/components/PartInfo.vue

@@ -19,6 +19,7 @@
           <el-select
             v-model="card.sampleNumber"
             :disabled="!isEdit"
+            :placeholder="isDetail ? '--' : '请选择'"
             @change="handleSampleNumberChange(card, $event)"
           >
             <el-option
@@ -31,7 +32,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="样品名称">
-          <el-input v-model="card.sampleName" disabled />
+          <el-input
+            v-model="card.sampleName"
+            disabled
+            :placeholder="isDetail ? '--' : ''"
+          />
         </el-form-item>
       </el-form>
     </el-card>
@@ -61,6 +66,10 @@ export default {
     isEdit: {
       type: Boolean,
       default: true
+    },
+    isDetail: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {

src/views/task/task-detail/index.vue

@@ -245,6 +245,7 @@
         v-model="partInfoArr"
         class="global-left-margin"
         :is-edit="false"
+        :is-detail="true"
         :part-sample-information="partSampleInformationList"
         @change="handleModChange"
       />