Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev

spring

2025-03-05 0c285153bdee6074d321f6cb1e49d8650222f984

Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev

 src/api/business/rawMaterialOrder.js

@@ -272,7 +272,7 @@
  })
}
// 检验单下的附件列表-删除
export function delfile(query) {
export function delFile(query) {
  return request({
    url: '/insOrderPlan/delfile',
    method: 'delete',

 src/layout/components/Navbar.vue

@@ -10,7 +10,7 @@
    </div>
    <div class="right-menu">
      <div class="avatar-wrapper">
        <img :src="avatar" class="user-avatar" />
        <el-avatar shape="square" :size="30">{{ nickName.substring(0, 1) }}</el-avatar>
        <span class="userName">{{ nickName }}</span>
        <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
          <div class="avatar-wrapper">
@@ -88,7 +88,7 @@
    RuoYiDoc,
  },
  computed: {
    ...mapGetters(["avatar", "device", "nickName"]),
    ...mapGetters(["device", "nickName"]),
    setting: {
      get() {
        return this.$store.state.settings.showSettings;

 src/views/business/inspectionReview/index.vue

@@ -343,14 +343,14 @@
        },
      })
    },
    // 上传报告
    handleUpload(row) {

    },
    // 下载报告
    download(row) {
      let url = this.javaApi + '/word/' + (row.urlS === null || row.urlS === '') ? row.url : row.urlS
      this.$download.saveAs(url, row.fileName);
      let url = (row.urlS===null||row.urlS==='')?row.url:row.urlS
      const link = document.createElement('a');
      link.href = this.javaApi + url;
      link.target = '_blank';
      document.body.appendChild(link);
      link.click();
    },
    // 还原操作
    handleRestore(row) {

 src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue

@@ -46,13 +46,27 @@
  methods: {
    // 进厂检验报告下载
    downLoad0 () {
      let url = this.javaApi+'/word/' + this.downLoadInfo.enterUrlS ? this.downLoadInfo.enterUrlS : this.downLoadInfo.enterUrl
      this.$download.saveAs(url, this.downLoadInfo.fileName);
      let url = this.downLoadInfo.enterUrlS ? this.downLoadInfo.enterUrlS : this.downLoadInfo.enterUrl
      if(url){
        url = url.split('.')[0]+'.pdf'
        const link = document.createElement('a');
        link.href = this.javaApi + url;
        link.target = '_blank';
        document.body.appendChild(link);
        link.click();
      }
    },
    // 季度检验报告下载
    downLoad1 () {
      let url = this.javaApi+'/word/' + this.downLoadInfo.quarterUrlS ? this.downLoadInfo.quarterUrlS : this.downLoadInfo.quarterUrl
      this.$download.saveAs(url, this.downLoadInfo.fileName);
      let url = this.downLoadInfo.quarterUrlS ? this.downLoadInfo.quarterUrlS : this.downLoadInfo.quarterUrl
      if(url){
        url = url.split('.')[0]+'.pdf'
        const link = document.createElement('a');
        link.href = this.javaApi + url;
        link.target = '_blank';
        document.body.appendChild(link);
        link.click();
      }
    }
  },
}

 src/views/business/reportPreparation/index.vue

@@ -85,7 +85,7 @@
          @click="fullscreen = true;"></i>
        <img v-else alt="" src="@/assets/images/no-full.svg" style="cursor: pointer;" @click="fullscreen = false;">
      </div>
      <div v-if="issuedVisible" style="height: 80vh;">
      <div v-if="issuedVisible" style="height: 70vh;">
        <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
      </div>
      <span slot="footer" class="dialog-footer">
@@ -110,7 +110,7 @@
          @click="fullscreen = true;"></i>
        <img v-else alt="" src="@/assets/images/no-full.svg" style="cursor: pointer;" @click="fullscreen = false;">
      </div>
      <div v-if="approveVisible" style="height: 80vh;">
      <div v-if="approveVisible" style="height: 70vh;">
        <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
      </div>
      <span slot="footer" class="dialog-footer">
@@ -184,8 +184,8 @@
          <el-button size="small" style="height: 38px" type="primary">附件上传</el-button>
        </el-upload>
      </div>
      <lims-table :tableData="tableDataFile" :column="columnFile" @pagination="paginationFile" height="500px"
        key="tableDataFile" :page="pageFile" :tableLoading="tableLoadingFile"></lims-table>
      <lims-table :tableData="tableDataFile" :column="columnFile" height="500px"
        key="tableDataFile" :tableLoading="tableLoadingFile"></lims-table>
    </el-dialog>
  </div>
</template>
@@ -193,7 +193,6 @@
<script>
import onlyoffice from "@/components/Onlyoffice/onlyoffice.vue";
// import ShowInfo from "../do/b1-material-ins-order/showInfo.vue";
import file from "@/utils/file";
import {
  downAll,
  examineReport,
@@ -206,7 +205,7 @@
import { mapGetters } from "vuex";
import { selectUserCondition } from "@/api/business/inspectionTask";
import limsTable from "@/components/Table/lims-table.vue";
import { delfile, downFile, getFileList } from "@/api/business/rawMaterialOrder";
import {delFile, downFile, getFileList} from "@/api/business/rawMaterialOrder";
export default {
  components: { limsTable, onlyoffice },
  data() {
@@ -329,11 +328,6 @@
          ]
        }
      ],
      pageFile: {
        total: 0,
        size: 10,
        current: 1
      },
      isCopper: null,
      tableLoading: false,
      valueTableData: [],
@@ -464,7 +458,7 @@
      return this.javaApi + '/insReport/upAll'
    },
    fileAction() {
      return this.javaApi + '/unqualifiedHandler/uploadFileByUnqualified'
      return this.javaApi + '/insOrderPlan/uploadFile'
    },
    fileAction1() {
      return this.javaApi + '/insReport/inReport'
@@ -528,15 +522,10 @@
        this.tableLoadingFile = false
        if (res.code === 200) {
          this.tableDataFile = res.data.records
          this.pageFile.total = res.data.total
        }
      }).catch(err => {
        this.tableLoadingFile = false
      })
    },
    paginationFile(page) {
      this.pageFile.size = page.limit
      this.getFileList()
    },
    closeFilesLook() {
      this.filesDialogVisible = false
@@ -574,21 +563,26 @@
    },
    // 删除附件文件
    delete(row) {
      this.$confirm('是否删除当前数据?', "警告", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
      this.$confirm('此操作将删除该数据, 是否继续?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        delfile({ id: row.id }).then(res => {
          if (res.code === 500) {
            return
          }
        this.tableLoadingFile = true
        delFile({ id: row.id }).then(res => {
          this.tableLoadingFile = false
          this.$message.success('删除成功')
          this.getList()
        }).catch(e => {
          this.$message.error('删除失败')
          this.getFileList()
        }).catch(err => {
          this.tableLoadingFile = false
          console.log('err---', err);
        })
      }).catch(() => { })
      }).catch(() => {
        this.$message({
          type: 'info',
          message: '已取消删除'
        });
      })
    },
    // 查看产业链信息
    openInfoDialog(row) {
@@ -871,6 +865,8 @@
        this.refreshTable('page')
        this.currentInfo = null;
        this.approveVisible = false;
      }).catch(() => {
        this.loadingApprove = false;
      })
    },
    handle(row) {

 src/views/index.vue

@@ -130,7 +130,6 @@
          radius: ['40%', '60%'],
          avoidLabelOverlap: false,
          itemStyle: {
            borderRadius: 5,
            borderColor: '#fff',
            borderWidth: 2
          },

 src/views/statisticalCharts/qualificationRateStatistics/index.vue

@@ -216,7 +216,6 @@
          right: '22%',
          avoidLabelOverlap: false,
          itemStyle: {
            borderRadius: 5,
            borderColor: '#fff',
            borderWidth: 2
          },
@@ -250,7 +249,6 @@
          right: '22%',
          avoidLabelOverlap: false,
          itemStyle: {
            borderRadius: 5,
            borderColor: '#fff',
            borderWidth: 2
          },

 src/views/system/user/profile/index.vue

@@ -7,9 +7,9 @@
            <span>个人信息</span>
          </div>
          <div>
            <div class="text-center">
              <userAvatar />
            </div>
<!--            <div class="text-center">-->
<!--              <userAvatar />-->
<!--            </div>-->
            <ul class="list-group list-group-striped">
              <li class="list-group-item">
                <svg-icon icon-class="user" />用户名称