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

src/api/system/sample.js

@@ -66,3 +66,11 @@ export function selectDataStatistics(data){
     data: data
   })
 }
+
+export function componentSelect(data){
+  return request({
+    url:'/system/enterprise/list',
+    method: 'post',
+    data: data
+  })
+}

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

@@ -89,7 +89,7 @@
             </div>
             <div class="message-box" style="background-color: #47baba">
               <div class="message-detail">
-                <div class="detail-title">标准条款通过率</div>
+                <div class="detail-title">标准条款通过率(%)</div>
                 <div class="detail-num mt10">
                   {{ model.carReviewTask.standardsPass }}%
                 </div>

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

@@ -89,7 +89,7 @@
             </div>
             <div class="message-box" style="background-color: #47baba">
               <div class="message-detail">
-                <div class="detail-title">标准条款通过率</div>
+                <div class="detail-title">标准条款通过率(%)</div>
                 <div class="detail-num mt10">
                   {{ model.carReviewTask.standardsPass }} %
                 </div>

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

@@ -67,6 +67,7 @@
                 v-model="model.fileName"
                 placeholder="请输入"
                 input="updateFocus"
+                @input="handleUpdateFile"
               ></el-input>
             </el-form-item>
             <el-form-item label="发布日期" prop="publishDate">
@@ -99,6 +100,10 @@ export default {
     enterpriseName: {
       type: String,
       default: ''
+    },
+    fileName: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -148,6 +153,9 @@ export default {
     }
   },
   watch: {
+    fileName(newValue) {
+      this.model.fileName = newValue
+    },
     'dialogManger.dialogEditId'(newValue) {
       this.model.fetch(
         newValue,
@@ -164,6 +172,9 @@ export default {
     this.model.taskId = this.$route.query.taskId
   },
   methods: {
+    handleUpdateFile(newValue) {
+      this.$emit('fileNameUpdate', newValue)
+    },
     /**
      * 失去焦点回调
      */

src/views/processing/carReview/write-check-form/index.vue

@@ -237,6 +237,12 @@
                 v-show="formManger.show"
                 style="margin-left: 125px"
                 :enterprise-name="model.carReviewTask.enterpriseName"
+                :file-name="form.fileName"
+                @fileNameUpdate="
+                  name => {
+                    form.fileName = name
+                  }
+                "
                 @handleUpdate="handleFileUpdate"
                 @handleSave="handleFileSave"
               ></company-file>
@@ -608,11 +614,25 @@ export default {
     handleBack() {
       this.$router.go(-1)
     },
+    // 根据传入的名字去匹配数组内符合的项目并返回该项目
+    getProjectByName(arr, name) {
+      return arr.find(item => item.value === name)
+    },
     // 保存当前条目
     submitQuestionnaire(type) {
       this.$refs.form.validate(valid => {
         if (valid) {
           if (!this.isFileUpdate) {
+            // 根据公司文件和文件名获取特定项目项，并据此更新表单中的审核企业档案ID
+            const files = this.companyFiles // 获取公司文件列表
+            const fileName = this.form.fileName // 获取表单中填写的文件名
+            // 根据文件名在公司文件列表中查找对应项目项
+            const item = this.getProjectByName(files, fileName)
+            if (item) {
+              this.form.reviewEnterpriseArchiveId = item.id // 找到项目项则更新表单的审核企业档案ID
+            } else {
+              this.form.reviewEnterpriseArchiveId = null // 未找到则将审核企业档案ID设为null
+            }
             reviewDetailsSubmit(this.form).then(async res => {
               if (res.code === 200) {
                 await this.getTask()
@@ -641,6 +661,9 @@ export default {
         this.$router.go(-1)
       })
     },
+    /**
+     *确认细则内容变更
+     */
     confirmDetailChange() {
       reviewDetailsConfirm({
         detailsId: this.taskModel.id,

src/views/processing/fileLibrary/index.vue

@@ -138,12 +138,12 @@
         align="left"
       >
         <template slot-scope="scope">
-          <img
+          <el-image
+            style="width: 36px; height: 36px"
             :src="baseUrl + scope.row.photo"
-            alt="文件照片"
-            width="36"
-            height="36"
-          />
+            :preview-src-list="[baseUrl + scope.row.photo]"
+          >
+          </el-image>
         </template>
       </el-table-column>
       <el-table-column

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

@@ -94,7 +94,7 @@
             </div>
             <div class="message-box" style="background-color: #47baba">
               <div class="message-detail">
-                <div class="detail-title">标准条款通过率</div>
+                <div class="detail-title">标准条款通过率(%)</div>
                 <div class="detail-num mt10">
                   {{ model.systemReviewTask.standardsPass }}%
                 </div>

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

@@ -94,7 +94,7 @@
             </div>
             <div class="message-box" style="background-color: #47baba">
               <div class="message-detail">
-                <div class="detail-title">标准条款通过率</div>
+                <div class="detail-title">标准条款通过率(%)</div>
                 <div class="detail-num mt10">
                   {{ model.systemReviewTask.standardsPass }} %
                 </div>

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

@@ -67,6 +67,7 @@
                 v-model="model.fileName"
                 placeholder="请输入"
                 input="updateFocus"
+                @input="handleUpdateFile"
               ></el-input>
             </el-form-item>
             <el-form-item label="发布日期" prop="publishDate">
@@ -99,6 +100,10 @@ export default {
     enterpriseName: {
       type: String,
       default: ''
+    },
+    fileName: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -148,6 +153,9 @@ export default {
     }
   },
   watch: {
+    fileName(newValue) {
+      this.model.fileName = newValue
+    },
     'dialogManger.dialogEditId'(newValue) {
       this.model.fetch(
         newValue,
@@ -164,6 +172,9 @@ export default {
     this.model.taskId = this.$route.query.taskId
   },
   methods: {
+    handleUpdateFile(newValue) {
+      this.$emit('fileNameUpdate', newValue)
+    },
     /**
      * 失去焦点回调
      */

src/views/processing/systemReview/write-check-form/index.vue

@@ -247,6 +247,12 @@
                 v-show="formManger.show"
                 style="margin-left: 125px"
                 :enterprise-name="model.systemReviewTask.enterpriseName"
+                :file-name="form.fileName"
+                @fileNameUpdate="
+                  name => {
+                    form.fileName = name
+                  }
+                "
                 @handleUpdate="handleFileUpdate"
                 @handleSave="handleFileSave"
               ></company-file>
@@ -623,11 +629,25 @@ export default {
     handleBack() {
       this.$router.go(-1)
     },
+    // 根据传入的名字去匹配数组内符合的项目并返回该项目
+    getProjectByName(arr, name) {
+      return arr.find(item => item.value === name)
+    },
     // 保存当前条目
     submitQuestionnaire(type) {
       this.$refs.form.validate(valid => {
         if (valid) {
           if (!this.isFileUpdate) {
+            // 根据公司文件和文件名获取特定项目项，并据此更新表单中的审核企业档案ID
+            const files = this.companyFiles // 获取公司文件列表
+            const fileName = this.form.fileName // 获取表单中填写的文件名
+            // 根据文件名在公司文件列表中查找对应项目项
+            const item = this.getProjectByName(files, fileName)
+            if (item) {
+              this.form.reviewEnterpriseArchiveId = item.id // 找到项目项则更新表单的审核企业档案ID
+            } else {
+              this.form.reviewEnterpriseArchiveId = null // 未找到则将审核企业档案ID设为null
+            }
             reviewDetailsSubmit(this.form).then(async res => {
               if (res.code === 200) {
                 await this.getTask()

src/views/setting/sample/index.vue

@@ -274,14 +274,20 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="生产企业" prop="manufacturingEnterprise">
-          <el-input
-            v-model="editParamsForm.manufacturingEnterprise"
-            placeholder="请输入生产企业"
-            clearable
-            maxlength="50"
+        <el-form-item label="生产企业" prop="manufacturingEnterpriseId">
+          <el-select
+            v-model="editParamsForm.manufacturingEnterpriseId"
+            placeholder="请选择"
             style="width: 90%"
-          />
+          >
+            <el-option
+              v-for="item in componentSelect"
+              :key="item.id"
+              :label="item.enterpriseName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="商标" prop="trademark">
           <image-upload
@@ -390,6 +396,7 @@ import {
 import MaterialLibrary from '@/views/setting/materialLibrary/index.vue'
 import materialLibrary from '@/views/setting/materialLibrary/index.vue'
 import { isExternal } from '@/utils/validate'
+import { componentSelect } from '../../../api/system/sample'
 
 export default {
   components: { MaterialLibrary },
@@ -425,8 +432,8 @@ export default {
         manufactureDate: [
           { required: true, message: '请选择生产日期', trigger: 'change' }
         ],
-        manufacturingEnterprise: [
-          { required: true, message: '请输入生产企业', trigger: 'blur' }
+        manufacturingEnterpriseId: [
+          { required: true, message: '请选择生产企业', trigger: 'change' }
         ]
       },
       editParamsForm: {
@@ -454,7 +461,8 @@ export default {
       dialogVisible: false,
       trademarkDisplay: true,
       dialogTitle: '新建',
-      samplePhotosDisplay: true
+      samplePhotosDisplay: true,
+      componentSelect: []
     }
   },
   computed: {
@@ -484,8 +492,20 @@ export default {
   },
   created() {
     this.getList()
+    this.getComponentSelect()
   },
   methods: {
+    getComponentSelect() {
+      componentSelect({
+        pageNum: 1,
+        pageSize: 9999,
+        isAsc: 'desc',
+        orderByColumn: 'createTime'
+      }).then(res => {
+        this.componentSelect = res.rows
+        console.log('res', res)
+      })
+    },
     closeMaterial(data) {
       this.materialShow = data
     },

src/views/task/edit/index.vue

@@ -4,6 +4,10 @@
       <div class="tip-navigation">
         <div class="tip"></div>
         <div class="tip-title">任务信息</div>
+        <div class="left-back" @click="backPage">
+          <icon-park type="left" size="14" fill="#1a6fd7" />
+          <span class="return-button">取消</span>
+        </div>
       </div>
       <div class="global-left-margin">
         <el-row :gutter="20">
@@ -18,7 +22,7 @@
                   v-for="(item, key) in standardList"
                   :key="key"
                   :value="item.id"
-                  :label="item.name"
+                  :label="item.standardNo + ' ' + item.name"
                 />
               </el-select>
             </el-form-item>
@@ -998,6 +1002,9 @@ export default {
       // 去掉一个数组最后一个对象
       this.tableData.pop()
     },
+    backPage() {
+      this.$router.go(-1)
+    },
     /**
      * 添加小组成员点击按钮
      */
@@ -1232,6 +1239,17 @@ export default {
     font-weight: 700;
     color: #1a6fd7;
   }
+
+  .left-back {
+    position: absolute;
+    right: 2%;
+    display: flex;
+    color: #1a6fd7;
+    cursor: pointer;
+    .return-button {
+      padding-left: 7px;
+    }
+  }
 }
 
 .sortable-handle {

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

@@ -44,7 +44,7 @@
                   v-for="(item, key) in standardList"
                   :key="key"
                   :value="item.id"
-                  :label="item.name"
+                  :label="item.standardNo + ' ' + item.name"
                 />
               </el-select>
             </el-form-item>