Merge branch 'master' of http://192.168.110.209:9001/r/lims-before

yuyu

2023-08-25 3b3513a1b653af76231ed053cb0d22a362d36876

 src/views/inspectionManagement/commissionInspection/index.vue

@@ -1,32 +1,20 @@
<template>
  <div>
    <div>
      <div v-if="!showDetail">
      <div class="content-main">
          <div class="top-bar">
              <el-form ref="form" :inline="true" :model="searchData">
              <el-form-item label="委托编号:" class="sermargin">
                <el-input
                  v-model="searchData.code"
                  class="input-form"
                  placeholder="请输入"
                >
                     <el-input v-model="searchData.code" class="input-form" placeholder="请输入">
                </el-input>
              </el-form-item>
              <el-form-item label="样品名称:" class="sermargin">
                <el-input
                  v-model="searchData.name"
                  class="input-form"
                  placeholder="请输入"
                >
                     <el-input v-model="searchData.name" class="input-form" placeholder="请输入">
                </el-input>
              </el-form-item>
              <el-form-item label="委托单位:" style="margin-right: 20px;">
                <el-select v-model="searchData.department" placeholder="全部">
                  <el-option
                    v-for="item in options"
                    :key="item.value"
                    :label="item.label"
                    :value="item.value">
                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                  </el-option>
                </el-select>
              </el-form-item>
@@ -35,13 +23,24 @@
                <el-button type="primary" plain @click="reset">重置</el-button>
              </el-form-item>
              </el-form>
              <el-form class="rightForm">
                  <!-- 显示新增委托的网址链接 -->
                <div v-show="showlinkDiv === true">
                  <span style="font-size: 12px;">{{ textToCopy }}</span>
                  <el-button type="text" @click="copyText" style="margin-left: 30px;">{{ copied ===false?'复制':'已复制' }}</el-button>
               <el-form>
                  <el-popover placement="left" width="350" trigger="click">
                     <div class="vue_qr_div">
                        <el-row>
                           <el-col>
                              <el-input v-model="view" readonly size="medium" style="width: 250px;margin-right: 10px;"></el-input>
                              <el-button size="small" type="primary" v-if="viewId==null" @click="viewDia=true">生成</el-button>
                              <el-button size="small" type="primary" v-else-if="viewId!=null" @click="copy">复制</el-button>
                           </el-col>
                        </el-row>
                        <el-row style="margin-top: 10px;">
                           <el-col v-if="viewId==null">当前链接已过期，请点击生成按钮重新生成</el-col>
                           <el-col
                              v-else-if="viewId!=null">当前链接将在{{(parseInt(viewTime)/60/60)>1?(parseInt(viewTime)/60/60).toFixed(1)+'小时':Math.round(parseInt(viewTime)/60)+'分钟'}}后过期</el-col>
                        </el-row>
                </div>
                <el-button class="rightBtn" type="primary" @click="showLink">新增委托</el-button>
                     <el-button slot="reference" class="rightBtn" type="primary" @click="goToaddCommision">新增委托</el-button>
                  </el-popover>
              </el-form>
          </div>
          <div class="library-table">
@@ -54,76 +53,26 @@
              </el-radio-group>
              </div>
              <div class="generateInsp">
                <el-button type="primary" size="mini" icon="el-icon-document" style="background-color: rgb(1, 102, 226);">生成报检单</el-button>
                     <el-button type="primary" size="mini" icon="el-icon-document"
                        style="background-color: rgb(1, 102, 226);">生成报检单</el-button>
              </div>
            </div>
            <div class="table-box">
              <el-table
                ref="commisionTable"
                :max-height="800"
                :cell-style="{textAlign: 'center'}"
                  <el-table ref="commisionTable" :max-height="800" :cell-style="{textAlign: 'center'}"
                :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                :data="commisionTable"
                style="width: 100%"
              >
                <el-table-column
                  type="selection"
                  min-width="10%"
                />
                <el-table-column
                  type="index"
                  label="序号"
                  min-width="10%"
                />
                <el-table-column
                  prop="entrust_coding"
                  label="委托编号"
                  min-width="10%"
                />
                <el-table-column
                  prop="entrusted"
                  label="委托单位"
                  min-width="12%"
                />
                <el-table-column
                  prop="samples_number"
                  label="样品编号"
                  min-width="8%"
                />
                <el-table-column
                  prop="sample_name"
                  label="样品名称"
                  min-width="8%"
                />
                <el-table-column
                  prop="specifications_models"
                  label="规格型号"
                  min-width="12%"
                />
                <el-table-column
                  prop="dateSurvey"
                  label="送达时间"
                  min-width="8%"
                />
                <el-table-column
                  prop="completionDeadline"
                  label="完成期限"
                  min-width="8%"
                />
                <el-table-column
                  prop="contacts"
                  label="委托编制人"
                  min-width="8%"
                />
                <el-table-column
                  prop="inspectionTime"
                  label="检验日期"
                  min-width="8%"
                />
                <el-table-column
                  prop="inspection_status"
                  label="状态"
                  min-width="8%">
                     :data="commisionTable" style="width: 100%">
                     <el-table-column type="selection" min-width="10%" />
                     <el-table-column type="index" label="序号" min-width="10%" />
                     <el-table-column prop="entrust_coding" label="委托编号" min-width="10%" />
                     <el-table-column prop="entrusted" label="委托单位" min-width="12%" />
                     <el-table-column prop="samples_number" label="样品编号" min-width="8%" />
                     <el-table-column prop="sample_name" label="样品名称" min-width="8%" />
                     <el-table-column prop="specifications_models" label="规格型号" min-width="12%" />
                     <el-table-column prop="dateSurvey" label="送达时间" min-width="8%" />
                     <el-table-column prop="completionDeadline" label="完成期限" min-width="8%" />
                     <el-table-column prop="contacts" label="委托编制人" min-width="8%" />
                     <el-table-column prop="inspectionTime" label="检验日期" min-width="8%" />
                     <el-table-column prop="inspection_status" label="状态" min-width="8%">
                  <template slot-scope="scope">
                    <div v-if="scope.row.inspection_status === 1">
                      <span style="color: green;">已检测</span>
@@ -133,10 +82,7 @@
                    </div>
                  </template>
                </el-table-column>
                <el-table-column
                  label="操作"
                  min-width="8%"
                >
                     <el-table-column label="操作" min-width="8%">
                  <template slot-scope="scope">
                    <el-button type="text" size="small" @click="handleClick(scope.row)">删除</el-button>
                  </template>
@@ -144,25 +90,51 @@
              </el-table>
              <!-- 分页器 -->
              <div>
                <el-pagination
                  @size-change="handleSizeChange"
                  @current-change="handleCurrentChange"
                  :current-page="currentPage"
                  :page-sizes="[5, 10, 20]"
                  :page-size="pageSize"
                  layout="total, sizes, prev, pager, next, jumper"
                  :total="total">
                     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
                        :current-page="currentPage" :page-sizes="[5, 10, 20]" :page-size="pageSize"
                        layout="total, sizes, prev, pager, next, jumper" :total="total">
                </el-pagination>
              </div>
            </div>
          </div>
      </div>
  </div>
      <div v-else>
         <router-view />
      </div>
      <el-dialog title="链接时长设置" :visible.sync="viewDia" width="30%">
         <div>
            <el-row style="line-height: 46px;">
               <el-col :span="6" style="font-size: 14px;text-align: right;">时长设置：</el-col>
               <el-col :span="14" :offset="1">
                  <el-select v-model="viewTime" size="medium">
                     <el-option label="1 天" :value="1"></el-option>
                     <el-option label="2 天" :value="2"></el-option>
                     <el-option label="3 天" :value="3"></el-option>
                     <el-option label="4 天" :value="4"></el-option>
                     <el-option label="5 天" :value="5"></el-option>
                     <el-option label="6 天" :value="6"></el-option>
                     <el-option label="1 周" :value="7"></el-option>
                  </el-select>
               </el-col>
            </el-row>
         </div>
         <span slot="footer" class="dialog-footer">
            <el-button type="primary" @click="getViewId()">提 交</el-button>
            <el-button @click="viewDia = false">取 消</el-button>
         </span>
      </el-dialog>
      <!-- 隐藏域输入框用来复制 -->
      <input id="copyContext" style="position: absolute;top: 0;left: 0;opacity: 0;z-index: -10;" />
  </div>
</template>

<script>
import { getCommisionList } from '@/api/inspection/commisioninspection'
   import {
      getCommisionList,
      getViewUUID,
      selectViewUUID
   } from '@/api/inspection/commisioninspection'
export default {
  data() {
    return {
@@ -190,8 +162,7 @@
        sample_name: "发动机",
        inspection_status: 1
      }],
      conditionsOptions: [
        {
            conditionsOptions: [{
          label: '全部',
          value: 0
        },
@@ -207,42 +178,39 @@
      currentPage: 1,
      pageSize: 5,
      total: 100,
      showlinkDiv: false,
      copied: false,
      textToCopy: 'http://localhost:8080/#/addCommision'
            showDetail: false,
            day: 1,
            view: null,
            viewId: null,
            viewTime: 1,
            viewDia: false
    }
  },
  created() {
    this.getCommisionList()
  },
  // updated() {
  //   if (this.$router.currentRoute.name === 'AddCommision') {
  //     // console.log(this.$router.currentRoute.name)
  //     this.showDetail = true
  //   }
  // },
  methods: {
    copyText() {
      this.$copyText(this.textToCopy)
        .then(() => {
          this.copied = true;
          // setTimeout(() => {
          //   this.copied = false;
          // }, 2000);
        })
        .catch(error => {
          console.log('复制失败',error);
        });
      updated() {
         if (this.$router.currentRoute.name === 'AddCommision') {
            // console.log(this.$router.currentRoute.name)
            this.showDetail = true
         }
    },
      methods: {
    async getCommisionList(){
      const res = await getCommisionList({pageNo:this.currentPage, pageSize:this.pageSize})
            const res = await getCommisionList({
               pageNo: this.currentPage,
               pageSize: this.pageSize
            })
      this.commisionTable = res.data.row
      this.total = res.data.total
      // console.log(res)
       // 获取所有的委托单位名称
      const allDepartmentNames = [...new Set(this.commisionTable.map(item => item.entrusted))]
      // 将allDepartmentNames转换为options需要的格式
      this.options = allDepartmentNames.map(name => ({ value: name, label: name }))
            this.options = allDepartmentNames.map(name => ({
               value: name,
               label: name
            }))

         },
         // 查询方法
@@ -288,7 +256,11 @@
      if(this.radioValue === 0){
        this.getCommisionList() 
      }else{
        const res = await getCommisionList({pageNo:this.currentPage, pageSize:this.pageSize, inspectionStatus: this.radioValue})
               const res = await getCommisionList({
                  pageNo: this.currentPage,
                  pageSize: this.pageSize,
                  inspectionStatus: this.radioValue
               })
        // console.log(res)
        this.commisionTable = res.data.row
        this.total = res.data.total
@@ -303,7 +275,11 @@
      if(this.radioValue === 0){
        this.getCommisionList()
      }else{
        const res = await getCommisionList({pageNo:this.currentPage, pageSize:this.pageSize, inspectionStatus: this.radioValue})
               const res = await getCommisionList({
                  pageNo: this.currentPage,
                  pageSize: this.pageSize,
                  inspectionStatus: this.radioValue
               })
        this.commisionTable = res.data.row
        this.total = res.data.total
      }
@@ -315,13 +291,42 @@
      if(this.radioValue === 0){
        this.getCommisionList()
      }else{
        const res = await getCommisionList({pageNo:this.currentPage, pageSize:this.pageSize, inspectionStatus: this.radioValue})
               const res = await getCommisionList({
                  pageNo: this.currentPage,
                  pageSize: this.pageSize,
                  inspectionStatus: this.radioValue
               })
        this.commisionTable = res.data.row
        this.total = res.data.total
      }
    },
    showLink() {
      this.showlinkDiv = true
         goToaddCommision() {
            // this.showDetail = true
            selectViewUUID({
               day: this.day
            }).then(res => {
               this.view = `${this.vueIp}addCommision/${res.data.id}`
               this.viewId = res.data.id
               this.viewTime = res.data.time
            })
         },
         getViewId() {
            getViewUUID({
               day: this.viewTime == null ? 1 : this.viewTime
            }).then(res => {
               this.viewId = res.data
               this.view = `${this.vueIp}addCommision/${res.data.id}`
               this.viewDia = false
               this.$message.success('链接已生成，点击复制按钮进行复制')
            })
         },
         copy() {
            document.getElementById('copyContext').value = this.view
            const input = document.querySelector('#copyContext');
            input.select()
            if (document.execCommand('copy')) {
               this.$message.success('已复制到剪贴板')
            }
    }
  }
}
@@ -334,23 +339,18 @@
      display: flex;
      justify-content: space-between;
      padding: 5px 24px 0px 24px;
    }

.top-bar{
    margin: -25px -15px;
    background: #fff;
    display: flex;
    justify-content: space-between;
    padding: 5px 24px 0px 24px;
    .sermargin{
      margin-right: 60px;
    }

    .rightForm{
      display: flex;
      justify-content: space-between;
      /* background-color: #bfa; */
      height: 40px;
      line-height: 40px;

      >div{
        padding: 0px 10px;
        padding-bottom: 10px;
@@ -359,6 +359,7 @@
        /* height: 40px;
        line-height: 40px; */
      }

      .rightBtn{
        background-color: rgb(1, 102, 226);
      }
@@ -372,14 +373,17 @@
      margin-top: 40px;
      display: flex;
      flex-direction: column;

      .table-header{
        padding: 20px;
        display: flex;
        justify-content: space-between;

        .el-form-item{
          margin-bottom: 30px !important;
        }
      }

      .table-box{
          padding: 0px 20px;
          margin-top: 0px;
@@ -388,9 +392,11 @@
          /* padding: 20px 20px 10px 20px; */
          display: flex;
          flex-direction: column;

          .el-table {
            flex: 1;
          }

          >div:nth-child(2){
            display: flex;
            justify-content: end;
@@ -444,5 +450,6 @@
   
   .vue_qr_div{
      text-align: center;
      color: #0166e2;
   }
</style>