Merge branch 'master' of http://47.99.244.21:9999/qinjianhui/factory_front into wq

df5972b5 · wuqian · c85f75d9 · 82c2eed0 · df5972b5 · df5972b5
Commit df5972b5 authored Nov 12, 2024 by wuqian
Showing with 53 additions and 17 deletions

src/components/UploadImage.vue
+2 -3

src/views/typesetting/TypesettingManagement.vue
+2 -2

src/views/typesetting/reviewModel.vue
+28 -8

src/views/typesetting/submitReviewModal.vue
+21 -4

No files found.
--- a/src/components/UploadImage.vue
+++ b/src/components/UploadImage.vue
@@ -42,7 +42,6 @@
 import { computed, ref, watch } from 'vue'
 import { Plus, Close } from '@element-plus/icons-vue'
 import { uploadImageApi, uploadFileApi } from '@/api/common'
-import { getFilePath } from '@/api/axios'
 const props = defineProps({
  modelValue: String,
  disabled: Boolean,
@@ -87,7 +86,7 @@ const onChange = async (e: Event) => {
  const files = (e.target as HTMLInputElement).files
  if (!files) return
  const file = files[0]
-  let isLtTenM = file.size / 1024 / 1024 < 100;
+  const isLtTenM = file.size / 1024 / 1024 < 200;
      if (!isLtTenM) {
        ElMessage.error("上传文件大小不能超过 200MB!");
        return isLtTenM;
@@ -146,7 +145,7 @@ const filename = (path: string) => {
 }
 const downloadFile = (item: FileItem) => {
-  window.open(getFilePath() + item.path)
+  window.open(item.path)
 }
 const removeFile = (i: number) => {
  files.value.splice(i, 1)

--- a/src/views/typesetting/TypesettingManagement.vue
+++ b/src/views/typesetting/TypesettingManagement.vue
@@ -329,9 +329,9 @@ const submitReview = async (data: TypesettingListData, isDetail = false) => {
  detailable.value = isDetail
  try {
    submitReviewModelRef.value?.getExamineInfo(data)
-    // if (data.state === '701' || data.state === '901') {
+    if (data.state === '601' ||data.state === '701' || data.state === '901') {
    submitReviewModelRef.value?.getPriceDetail(data)
-    // }
+    }
    const res = await getTypesettingDetail(data.id)
    row.value = res.data
    nextTick(() => {

--- a/src/views/typesetting/reviewModel.vue
+++ b/src/views/typesetting/reviewModel.vue
@@ -13,6 +13,7 @@
            v-for="(val, index) in imageList"
            :key="index"
            class="color-image-item"
+            @mouseover="setMainImage(val.imagePath)"
          >
            <!-- <button class="remove" type="button">
              <i class="el-icon-close"></i>
@@ -26,10 +27,11 @@
          </li> -->
        </ul>
        <div class="main-image">
-          <img :src="row?.mainImage" />
+          <img :src="mainImageUrl || row?.mainImage" />
        </div>
      </div>
      <div class="review-from">
+        <div>
          <ElForm
            ref="reviewFormRef"
            :model="reviewForm"
@@ -116,13 +118,10 @@
                placeholder="承诺完成日期"
              ></ElDatePicker>
            </ElFormItem>
-          <p
-            v-dompurify-html="reviewForm.requirement"
-            style="height: 470px"
-            class="requirement"
-          ></p>
          </ElForm>
        </div>
+        <p v-dompurify-html="reviewForm.requirement" class="requirement"></p>
+      </div>
    </div>
    <template #footer>
      <div class="dialog-footer">
@@ -136,7 +135,11 @@
 </template>
 <script setup lang="ts">
-import { TypesettingListData, EmergencyLevel,ImageListData } from '@/types/api/typesetting'
+import {
+  TypesettingListData,
+  EmergencyLevel,
+  ImageListData,
+} from '@/types/api/typesetting'
 import {
  computed,
  defineEmits,
@@ -144,6 +147,7 @@ import {
  PropType,
  ref,
  onMounted,
+  watch,
 } from 'vue'
 import { saveTypesettingReviewApi } from '@/api/typesetting'
 import { getUserListApi } from '@/api/common'
@@ -167,6 +171,11 @@ const visible = computed({
    emit('update:modelValue', val)
  },
 })
+watch(visible, (val) => {
+  if (val) {
+    mainImageUrl.value = reviewForm.value?.mainImage || ''
+  }
+})
 const reviewForm = computed({
  get() {
    return props.row
@@ -175,6 +184,7 @@ const reviewForm = computed({
    emit('update:modelValue', val)
  },
 })
+const mainImageUrl = ref('')
 const emergencyLevel = ref<EmergencyLevel[]>([])
 emergencyLevel.value = [
  {
@@ -251,6 +261,9 @@ const getUserList = async () => {
    console.error(e)
  }
 }
+const setMainImage = (url: string | undefined) => {
+  mainImageUrl.value = url || ''
+}
 onMounted(() => {
  getUserList()
 })
@@ -265,7 +278,8 @@ const imageList = computed<ImageListData[]>(() => {
 </script>
 <style lang="scss" scoped>
-ul,li {
+ul,
+li {
  margin: 0;
  padding: 0;
 }
@@ -284,6 +298,7 @@ ul,li {
 .detail-info {
  display: flex;
  gap: 10px;
+  height: 600px;
 }
 .review-image {
  width: 40%;
@@ -292,10 +307,15 @@ ul,li {
 }
 .review-from {
  width: 60%;
+  display: flex;
+  flex-direction: column;
 }
 .requirement {
  border: 1px solid #ddd;
+  overflow: auto;
+  flex: 1;
+  margin: 0;
 }
 .main-image {

--- a/src/views/typesetting/submitReviewModal.vue
+++ b/src/views/typesetting/submitReviewModal.vue
@@ -19,12 +19,17 @@
                  v-for="(item, index) of row?.imageList"
                  :key="index"
                  class="color-image-item"
+                  @mouseover="onMouseover(item.imagePath)"
                >
                  <img :src="item.imagePath" alt="" class="img-sign" />
                </div>
              </div>
              <div class="modals-image-big">
-                <img :src="row?.mainImage" alt="" class="img-sign" />
+                <img
+                  :src="mainImageUrl || row?.imageList[0]?.imagePath"
+                  alt=""
+                  class="img-sign"
+                />
              </div>
            </div>
          </div>
@@ -113,6 +118,7 @@
                    v-for="(item, index) of versionImageList"
                    :key="index"
                    class="color-image-item"
+                    @mousemove="onRightMouseover(item?.imagePath)"
                  >
                    <img :src="item.imagePath" alt="" class="img-sign" />
                    <span
@@ -311,7 +317,7 @@
            <ElCol :span="12">
              <div class="detail-info-item">
                <span class="label">样板要求</span>
-                <p v-dompurify-html="row?.remark"></p>
+                <p v-dompurify-html="row?.requirement"></p>
              </div>
            </ElCol>
          </ElRow>
@@ -429,6 +435,7 @@ watch(visible, (val) => {
    } else {
      activeName.value = 'first'
    }
+    mainImageUrl.value = props.row?.mainImage
  }
 })
 const opinion = ref('')
@@ -547,12 +554,12 @@ const getExamineInfo = async (data: TypesettingListData) => {
    const res = await getExamineInfoByIdApi(data.id)
    if (!res.data) return
    versionList.value = res.data
-    if (data?.state === '301' || data?.state === '401') {
+    // if (data?.state === '301' || data?.state === '401') {
    versionList.value.push({
      version: versionList.value.length + 1,
      examineImages: [],
    })
-    }
+    // }
    if (res.data.length > 0) {
      version.value = res.data[res.data.length - 1].version ?? 1
      lastVersion.value = res.data[res.data.length - 1].version ?? 1
@@ -676,6 +683,13 @@ const getPriceDetail = async (data: TypesettingListData) => {
    console.error(e)
  }
 }
+const mainImageUrl = ref<string>('')
+const onMouseover = (url: string) => {
+  mainImageUrl.value = url
+}
+const onRightMouseover = (url: string | undefined) => {
+  versionImageUrl.value = url || ''
+}
 defineExpose({ getExamineInfo, reset, getPriceDetail })
 </script>
@@ -696,6 +710,8 @@ defineExpose({ getExamineInfo, reset, getPriceDetail })
    width: 60px;
    height: 60px;
    border: 1px solid #eee;
+    margin-bottom: 5px;
+    cursor: pointer;
    img {
      width: 100%;
      height: 100%;
@@ -775,6 +791,7 @@ defineExpose({ getExamineInfo, reset, getPriceDetail })
 }
 .detail-info {
  height: 600px;
+  overflow-y: auto;
  :deep(.el-row) {
    height: 30px;
    line-height: 30px;