fix: 70944 70893 70949 70963 70954

src/assets/styles/index.scss

@@ -392,3 +392,6 @@ aside {
 .el-input__inner {
   font-family: 微软雅黑;
 }
+.el-tabs__item{
+  font-size: 16px;
+}

src/assets/styles/process.scss

@@ -83,24 +83,19 @@
 .standard-box {
   display: flex;
   justify-content: space-between;
-  align-items: center;
+  align-items: start;
   width: calc(100% - 40px);
   .standard-left {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    width: 60vw;
+    flex: 1;
+    padding-left: 10px;
   }
   .standard-title {
-    width: calc(70% - 40px);
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    // width: calc(70% - 40px);
+    line-height: 18px;
   }
   .standard {
     color: #1a6fd7;
-    margin: 0 10px;
-    white-space: nowrap;
+    display: inline;
   }
   .iconfont {
     width: 24px;

src/components/Collapse/collapse-item.vue

@@ -123,8 +123,12 @@ export default {
 }
 .el-collapse-item__header {
   background-color: #f2f2f2 !important;
-  height: 40px;
+  height: auto;
   padding-left:13px;
+  display: flex;
+  align-items: flex-start;
+  padding: 10px;
+  line-height: 18px;
 }
 .el-collapse-item__content {
   padding: 0 !important;

src/main.js

@@ -3,6 +3,7 @@ import Vue from 'vue'
 import Cookies from 'js-cookie'
 
 import Element from 'element-ui'
+import "@/utils/el-components.js"
 import './assets/styles/element-variables.scss'
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
@@ -17,6 +18,7 @@ import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from '@/api/system/dict/data'
 import { getConfigKey } from '@/api/system/config'
+
 import {
   getDictData,
   parseTime,

src/utils/el-components.js

+import Vue from 'vue'
+import ElementUI from 'element-ui';
+
+Vue.component('el-input', {
+  extends: ElementUI.Input,
+  created() {
+    this.$on('change', (value) => {
+      this.$emit('input', value.replace(/\s+/g,""))
+    })
+  }
+})

src/views/processing/carReview/review-form/index.vue

@@ -46,8 +46,8 @@
       <div>
         <div class="form-review-questionnaire">
           <div class="title-display">
-            <span class="title-i"></span>
-            <span class="title-content">审查表单概要</span>
+            <!-- <span class="title-i"></span>
+            <span class="title-content">审查表单概要</span> -->
             <div class="control-btns">
               <div class="control-btn" @click="openAll()">
                 <!-- <svg-icon class="iconfont" icon-class="tag_zhankai"></svg-icon> -->
@@ -82,8 +82,8 @@
               <span slot="title" style="width: 100%">
                 <div class="standard-box">
                   <div class="standard-left">
-                    <div class="standard">标准：</div>
                     <div class="standard-title">
+                      <div class="standard">标准：</div>
                       {{ item.chapter + item.text }}
                     </div>
                   </div>

src/views/processing/carReview/source-record/index.vue

@@ -158,8 +158,8 @@
               <span slot="title" style="width: 100%">
                 <div class="standard-box">
                   <div class="standard-left">
-                    <div class="standard">标准：</div>
                     <div class="standard-title">
+                      <div class="standard">标准：</div>
                       {{ item.chapter + item.text }}
                     </div>
                   </div>

src/views/processing/carReview/vehicle-type/index.vue

@@ -451,6 +451,7 @@ export default {
         this.selectedScenario.length === 0
       ) {
         this.$message.error('请至少选择一个场景!')
+        return
       }
       carTaskSubmit(formData).then(res => {
         if (res.code === 200) {

src/views/processing/carReview/write-check-form/components/previewView.vue

@@ -47,8 +47,8 @@
           <span slot="title" style="width: 100%">
             <div class="standard-box">
               <div class="standard-left">
-                <div class="standard">标准：</div>
                 <div class="standard-title">
+                  <div class="standard">标准：</div>
                   {{ item.chapter + item.text }}
                 </div>
               </div>

src/views/processing/carTest/confirmation-test/index.vue

@@ -153,8 +153,8 @@
               <span slot="title" style="width: 100%">
                 <div class="standard-box">
                   <div class="standard-left">
-                    <div class="standard">标准要求：</div>
                     <div class="standard-title">
+                      <div class="standard">标准：</div>
                       {{ item.chapter + item.text }}
                     </div>
                   </div>

src/views/processing/carTest/execution-test-plan/components/SchemeView.vue

@@ -125,8 +125,8 @@
             <span slot="title" style="width: 100%">
               <div class="standard-box">
                 <div class="standard-left">
-                  <div class="standard">标准要求:</div>
                   <div class="standard-title">
+                    <div class="standard">标准要求：</div>
                     {{ item.chapter + item.text }}
                   </div>
                 </div>

src/views/processing/carTest/review-form/index.vue

@@ -46,8 +46,8 @@
       <div>
         <div class="form-review-questionnaire">
           <div class="title-display">
-            <span class="title-i"></span>
-            <span class="title-content">审查表单概要</span>
+            <!-- <span class="title-i"></span>
+            <span class="title-content">审查表单概要</span> -->
             <div class="control-btns">
               <div class="control-btn" @click="openAll()">
                 <icon-park

src/views/processing/checkFileLibrary/index.vue

@@ -64,6 +64,7 @@
       :scroll-x="'1500px'"
       :default-sort="{ prop: 'createTime', order: 'descending' }"
       :data="tableData"
+      @sort-change="sort_change"
     >
       <el-table-column type="index" width="55" label="序号" align="center">
         <template slot-scope="scope">
@@ -99,6 +100,7 @@
         prop="publishDate"
         label="发布日期"
         min-width="100"
+        show-overflow-tooltip
         align="left"
       >
         <template slot-scope="scope">
@@ -157,6 +159,7 @@
         prop="createBy"
         label="创建人员"
         min-width="130"
+        show-overflow-tooltip
         align="left"
       >
       </el-table-column>
@@ -171,23 +174,6 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        v-if="view == 1"
-        label="操作"
-        align="center"
-        min-width="90"
-        fixed="right"
-        class-name="fixed-width"
-      >
-        <template slot-scope="scope">
-          <page-button
-            style="margin: 0 auto"
-            icon="edit"
-            title="修改"
-            @click.native="handleUpdate(scope.row.id)"
-          ></page-button>
-        </template>
-      </el-table-column>
     </el-table>
     <yan-dialog
       :dialog-manger="dialogManger"
@@ -223,14 +209,20 @@ export default {
         refreshList: false,
         dialogEditId: 0
       },
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        taskId: this.$route.query.id,
+        isAsc: 'desc',
+        orderByColumn: 'createTime'
+      },
       refreshList: false,
       baseUrl: process.env.VUE_APP_IMAGE_API,
       listUrl: '/review/enterprise/archive/findEnterpriseArchiveByTaskId',
       // 表格loading状态
       tableLoading: false,
       // 表格数据
-      tableData: [],
-      view: ''
+      tableData: []
     }
   },
   watch: {
@@ -243,15 +235,24 @@ export default {
   },
   created() {
     this.queryParams.taskId = this.$route.query.id
-    this.view = this.$route.query.view
   },
   methods: {
+    sort_change(column, prop, order) {
+      this.queryParams.pageNum = 1 // 排序后返回第一页
+      if (column.order) {
+        this.queryParams.isAsc = column.order === 'ascending' ? 'asc' : 'desc'
+        this.queryParams.orderByColumn = column.prop
+        this.loadData()
+      }
+    },
     resetQuery() {
       // this.refs.queryForm.restForm()      this.resetForm("queryForm");
       this.queryParams = {
         pageNum: this.queryParams.pageNum,
         pageSize: this.queryParams.pageSize,
-        taskId: this.$route.query.id
+        taskId: this.$route.query.id,
+        isAsc: this.queryParams.isAsc,
+        orderByColumn: this.queryParams.orderByColumn
       }
       this.handleQuery()
     },

src/views/processing/systemReview/confirm-result/index.vue

@@ -163,8 +163,8 @@
               <span slot="title" style="width: 100%">
                 <div class="standard-box">
                   <div class="standard-left">
-                    <div class="standard">标准：</div>
                     <div class="standard-title">
+                      <div class="standard">标准：</div>
                       {{ item.chapter + item.text }}
                     </div>
                   </div>

src/views/processing/systemReview/review-form/index.vue

@@ -51,8 +51,8 @@
       <div>
         <div class="form-review-questionnaire">
           <div class="title-display">
-            <span class="title-i"></span>
-            <span class="title-content">审查表单概要</span>
+            <!-- <span class="title-i"></span>
+            <span class="title-content">审查表单概要</span> -->
             <div class="control-btns">
               <div class="control-btn" @click="openAll()">
                 <icon-park

src/views/processing/systemReview/source-record/index.vue

@@ -163,8 +163,8 @@
               <span slot="title" style="width: 100%">
                 <div class="standard-box">
                   <div class="standard-left">
-                    <div class="standard">标准：</div>
                     <div class="standard-title">
+                      <div class="standard">标准：</div>
                       {{ item.chapter + item.text }}
                     </div>
                   </div>

src/views/processing/systemReview/write-check-form/components/previewView.vue

@@ -47,8 +47,8 @@
           <span slot="title" style="width: 100%">
             <div class="standard-box">
               <div class="standard-left">
-                <div class="standard">标准：</div>
                 <div class="standard-title">
+                  <div class="standard">标准：</div>
                   {{ item.chapter + item.text }}
                 </div>
               </div>

src/views/setting/company/components/dialog.vue

@@ -42,7 +42,7 @@
           placeholder="请输入企业联系人"
         />
       </el-form-item>
-      <el-form-item label="联系电话：" prop="contactNumber">
+      <el-form-item label="联系电话" prop="contactNumber">
         <el-input v-model="model.contactNumber" placeholder="请输入联系电话" />
       </el-form-item>
     </el-form>

src/views/setting/sample/taskDetails/index.vue

@@ -21,9 +21,9 @@
         <el-row :gutter="41">
           <el-col :span="8">
             <el-form-item label="检验依据：">
-              <sapn class="card-contnet">{{
+              <span class="card-contnet">{{
                 taskForm.standardNo + '  ' + taskForm.name
-              }}</sapn>
+              }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="8" class="card-title">
@@ -50,32 +50,60 @@
         <el-row :gutter="41">
           <el-col :span="8" class="card-title">
             <el-form-item label="产品名称：">
-              <sapn class="card-contnet">{{ taskForm.productName }}</sapn>
+              <span class="card-contnet">{{ taskForm.productName }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="8" class="card-title">
-            <el-form-item label="小组成员：">
-              <sapn class="card-contnet">
-                <div v-for="(item, index) in taskForm.auditors" :key="index">
+            <el-form-item label="检验小组：">
+              <span class="card-contnet">
+                <template v-for="(item, index) in taskForm.auditors">
                   {{ item.name }}
-                  <span v-show="index === 0">(组长)</span>
-                  <span v-show="index + 1 != taskForm.auditors.length">
+
+                  <template v-if="index === 0">(组长) </template>
+
+                  <template v-if="index + 1 != taskForm.auditors.length">
                     、
-                  </span>
-                </div>
-              </sapn>
+                  </template>
+                </template>
+              </span>
             </el-form-item>
           </el-col>
           <el-col :span="8" class="card-title">
             <el-form-item label="委托单位：">
-              <sapn class="card-contnet">{{ taskForm.entrustedUnit }}</sapn>
+              <el-link @click="dialogVisible = true">{{
+                taskForm.entrustedUnit
+              }}</el-link>
             </el-form-item>
+
+            <el-dialog
+              :title="taskForm.entrustedUnit"
+              :visible.sync="dialogVisible"
+              width="30%"
+              :before-close="
+                () => {
+                  dialogVisible = false
+                }
+              "
+            >
+              <div class="messsage-item">
+                <span class="messsage-title">委托单位地址:</span>
+                {{ taskForm.entrustedUnitAddress }}
+              </div>
+              <div class="messsage-item">
+                <span class="messsage-title">委托单位电话:</span>
+                {{ taskForm.entrustedUnitPhone }}
+              </div>
+              <div class="messsage-item">
+                <span class="messsage-title">委托单位邮政编码:</span>
+                {{ taskForm.entrustedUnitCode }}
+              </div>
+            </el-dialog>
           </el-col>
         </el-row>
         <el-row :gutter="41">
           <el-col :span="8" class="card-title">
             <el-form-item label="车辆型号：">
-              <sapn class="card-contnet">{{ taskForm.productModel }}</sapn>
+              <span class="card-contnet">{{ taskForm.productModel }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -847,6 +875,7 @@ export default {
     return {
       taskList: [],
       taskId: '',
+      dialogVisible: false,
       taskForm: {},
       dataStatistic: {
         systemDetailsPass: 0
@@ -860,6 +889,7 @@ export default {
     this.getDataStatistics()
   },
   methods: {
+    toEntrustedUnit() {},
     dict,
     dictValueReturn(item) {
       if (item === 'sraifv') {
@@ -1117,4 +1147,13 @@ export default {
 ::v-deep .el-progress-bar__inner {
   border-radius: 0px !important;
 }
+
+.messsage-item {
+  margin: 15px 0;
+
+  color: #333;
+  .messsage-title {
+    color: #999;
+  }
+}
 </style>

src/views/setting/useCaseLibrary/index.vue

@@ -88,7 +88,11 @@
           <span>{{ scope.row.input || '--' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="用例描述" align="left" prop="description" />
+      <el-table-column label="用例描述" align="left" prop="description">
+        <template slot-scope="scope">
+          <span>{{ scope.row.description || '--' }}</span>
+        </template>
+      </el-table-column>
       <!--      <el-table-column label="更新人员" align="left" prop="updateBy" />-->
       <!--      <el-table-column-->
       <!--        label="更新时间"-->

src/views/system/dept/index.vue

@@ -225,6 +225,19 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮政编码" prop="postcode">
+              <el-input v-model="form.postcode" placeholder="请输入邮政编码" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -280,6 +293,10 @@ export default {
         parentId: [
           { required: true, message: '上级部门不能为空', trigger: 'blur' }
         ],
+        address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
+        postcode: [
+          { required: true, message: '邮政编码不能为空', trigger: 'blur' }
+        ],
         deptName: [
           { required: true, message: '部门名称不能为空', trigger: 'blur' }
         ],
@@ -341,6 +358,8 @@ export default {
         leader: undefined,
         phone: undefined,
         email: undefined,
+        address: undefined,
+        postcode: undefined,
         status: '0'
       }
       this.resetForm('form')