完成检验审核功能优化

licp

2024-04-17 716b89768ab6b8a9146bfe2a27d35ca8522ba7b6

完成检验审核功能优化

 package-lock.json

@@ -473,7 +473,7 @@
    },
    "@xmldom/xmldom": {
      "version": "0.8.10",
      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
      "resolved": "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="
    },
    "JSV": {
@@ -3583,7 +3583,7 @@
    },
    "dingbat-to-unicode": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/dingbat-to-unicode/-/dingbat-to-unicode-1.0.1.tgz",
      "resolved": "https://registry.npmmirror.com/dingbat-to-unicode/-/dingbat-to-unicode-1.0.1.tgz",
      "integrity": "sha512-98l0sW87ZT58pU4i61wa2OHwxbiYSbuxsCBozaVnYX2iCnr3bLM3fIes1/ej7h1YdOKuKt/MLs706TVnALA65w=="
    },
    "dir-glob": {
@@ -3697,7 +3697,7 @@
    },
    "duck": {
      "version": "0.1.12",
      "resolved": "https://registry.npmjs.org/duck/-/duck-0.1.12.tgz",
      "resolved": "https://registry.npmmirror.com/duck/-/duck-0.1.12.tgz",
      "integrity": "sha512-wkctla1O6VfP89gQ+J/yDesM0S7B7XLXjKGzXxMDVFg7uEn706niAtyYovKbyq1oT9YwDcly721/iUWoc8MVRg==",
      "requires": {
        "underscore": "^1.13.1"
@@ -3705,7 +3705,7 @@
      "dependencies": {
        "underscore": {
          "version": "1.13.6",
          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
          "resolved": "https://registry.npmmirror.com/underscore/-/underscore-1.13.6.tgz",
          "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="
        }
      }
@@ -6292,7 +6292,7 @@
    },
    "lop": {
      "version": "0.4.1",
      "resolved": "https://registry.npmjs.org/lop/-/lop-0.4.1.tgz",
      "resolved": "https://registry.npmmirror.com/lop/-/lop-0.4.1.tgz",
      "integrity": "sha512-9xyho9why2A2tzm5aIcMWKvzqKsnxrf9B5I+8O30olh6lQU8PH978LqZoI4++37RBgS1Em5i54v1TFs/3wnmXQ==",
      "requires": {
        "duck": "^0.1.12",
@@ -6302,7 +6302,7 @@
      "dependencies": {
        "underscore": {
          "version": "1.13.6",
          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
          "resolved": "https://registry.npmmirror.com/underscore/-/underscore-1.13.6.tgz",
          "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="
        }
      }
@@ -6385,7 +6385,7 @@
    },
    "mammoth": {
      "version": "1.7.1",
      "resolved": "https://registry.npmjs.org/mammoth/-/mammoth-1.7.1.tgz",
      "resolved": "https://registry.npmmirror.com/mammoth/-/mammoth-1.7.1.tgz",
      "integrity": "sha512-ckxfvNH5sUaJh+SbYbxpvB7urZTGS02jA91rFCNiL928CgE9FXXMyXxcJBY0n+CpmKE/eWh7qaV0+v+Dbwun3Q==",
      "requires": {
        "@xmldom/xmldom": "^0.8.6",
@@ -6402,12 +6402,12 @@
      "dependencies": {
        "bluebird": {
          "version": "3.4.7",
          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
          "resolved": "https://registry.npmmirror.com/bluebird/-/bluebird-3.4.7.tgz",
          "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA=="
        },
        "jszip": {
          "version": "3.10.1",
          "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
          "resolved": "https://registry.npmmirror.com/jszip/-/jszip-3.10.1.tgz",
          "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
          "requires": {
            "lie": "~3.3.0",
@@ -6418,7 +6418,7 @@
        },
        "underscore": {
          "version": "1.13.6",
          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
          "resolved": "https://registry.npmmirror.com/underscore/-/underscore-1.13.6.tgz",
          "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="
        }
      }
@@ -7894,7 +7894,7 @@
    },
    "option": {
      "version": "0.2.4",
      "resolved": "https://registry.npmjs.org/option/-/option-0.2.4.tgz",
      "resolved": "https://registry.npmmirror.com/option/-/option-0.2.4.tgz",
      "integrity": "sha512-pkEqbDyl8ou5cpq+VsnQbe/WlEy5qS7xPzMS1U55OCG9KPvwFD46zDbxQIj3egJSFc3D+XhYOPUzz49zQAVy7A=="
    },
    "ora": {
@@ -13829,7 +13829,7 @@
    },
    "xmlbuilder": {
      "version": "10.1.1",
      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-10.1.1.tgz",
      "resolved": "https://registry.npmmirror.com/xmlbuilder/-/xmlbuilder-10.1.1.tgz",
      "integrity": "sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg=="
    },
    "xmlchars": {

 src/App.vue

@@ -292,4 +292,12 @@

    /* 全局输入框样式 */
    /* 全局按钮样式 */
  /* 全局换行溢出样式 */
  .ellipsis-multiline {
    display: -webkit-box;
    -webkit-box-orient: vertical;
    -webkit-line-clamp: 2; /* 定义文本的行数 */
    overflow: hidden;
    text-overflow: ellipsis;
  }
</style>

 src/assets/api/controller.js

@@ -18,6 +18,7 @@
    insReport,
    warehouse,
    department,
    report,
    }
}

@@ -214,3 +215,7 @@
  delDepartment: "/department/delDepartment", //删除部门
  showUserById: "/department/showUserById", //根据选择的树展示相关的人员
}

const report = {
  businessStatisticsByDay: "/report/businessStatisticsByDay", //每日业务统计
}

 src/components/do/b1-ins-order/add.vue

@@ -442,7 +442,7 @@
                        </div>
                    </el-col>
                    <el-col class="search_thing" :span="22">
                        <div class="search_label"><span class="required-span">* </span>指派人员：</div>
                        <div class="search_label"><span class="required-span" v-if="addObj.type == 2">* </span>指派人员：</div>
                        <div class="search_input">
                            <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;">
                                <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
@@ -459,7 +459,24 @@
                </el-row>
            </span>
        </el-dialog>

    <el-dialog title="不通过原因" :visible.sync="noDialogVisible" width="400px">
            <div class="body" style="max-height: 60vh;">
                <el-row>
                    <el-col class="search_thing" :span="22">
                        <div class="search_label"><span class="required-span">* </span>不通过原因：</div>
                        <div class="search_input">
                            <el-input v-model="tell" size="small" placeholder="请输入不通过原因"></el-input>
                        </div>
                    </el-col>
                </el-row>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-row>
                    <el-button @click="noDialogVisible=false,tell=''">取 消</el-button>
                    <el-button type="primary" @click="submitTell" :loading="noLoading">确 定</el-button>
                </el-row>
            </span>
        </el-dialog>
    </div>
</template>

@@ -569,7 +586,10 @@
                units: [],
                models: [],
                methods: [],
                methodLoad: false
                methodLoad: false,
        noDialogVisible:false,
        tell:'',
        noLoading:false
            }
        },
        watch: {
@@ -674,31 +694,43 @@
                }
            },
            upInsOrderOfState(state) {
                this.saveLoad = true
                this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
                    state,
                    id: this.currentId
                }, {
                    headers: {
                        'Content-Type': 'application/json'
                    }
                }).then(res => {
                    this.saveLoad = false
                    if (res.code == 201) return
                    this.$message.success('提交成功')
                    // 如果紧急程度为紧急，需要直接下发人员
                    if (this.addObj.type == 2) {
                        this.issuedDialogVisible = true;
                        this.$axios.post(this.$api.insOrder.selectOrderManDay, {
                            id: this.currentId
                        }).then(ress => {
                            this.distributeData.orderId = this.currentId
                            this.distributeData.appointed = ress.data
                        })
                    } else {
                        this.$parent.playOrder(0)
                    }
                })
        if(state == 1){
          this.saveLoad = true
          this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
            state,
            id: this.currentId
          }, {
            headers: {
              'Content-Type': 'application/json'
            }
          }).then(res => {
            this.saveLoad = false
            if (res.code == 201) return
            this.$message.success('提交成功')
            // 如果紧急程度为紧急，需要直接下发人员
            // if (this.addObj.type == 2) {
            //     this.issuedDialogVisible = true;
            //     this.$axios.post(this.$api.insOrder.selectOrderManDay, {
            //         id: this.currentId
            //     }).then(ress => {
            //         this.distributeData.orderId = this.currentId
            //         this.distributeData.appointed = ress.data
            //     })
            // } else {
            //     this.$parent.playOrder(0)
            // }
            this.issuedDialogVisible = true;
            this.$axios.post(this.$api.insOrder.selectOrderManDay, {
              id: this.currentId
            }).then(ress => {
              this.distributeData.orderId = this.currentId
              this.distributeData.appointed = ress.data
            })
          })
        }else{
          // 不通过
          this.noDialogVisible = true
        }
            },
            // 下发
            submitForm2() {
@@ -706,7 +738,7 @@
                    this.$message.error('约定时间未填写')
                    return
                }
                if (this.distributeData.userId == null || this.distributeData.userId == '') {
                if (this.addObj.type == 2&&(this.distributeData.userId == null || this.distributeData.userId == '')) {
                    this.$message.error('指派人员未填写')
                    return
                }
@@ -725,7 +757,7 @@
                    this.issuedDialogVisible = false
                    this.$parent.playOrder(0)
                }).catch(e => {
                    this.$message.error('修改失败')
                    this.$message.error('提交失败')
                    this.upLoad = false
                })
            },
@@ -1126,6 +1158,29 @@
          this.$refs.productTable.doLayout()
        })
      },
      submitTell(){
        if (!this.tell) {
                    this.$message.error('请输入不通过原因')
          return
                }
        this.noLoading = true;
        this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
            state:2,
            id: this.currentId,
            tell:this.tell
          }, {
            headers: {
              'Content-Type': 'application/json'
            }
          }).then(res => {
            this.noLoading = false;
            this.tell = '';
            if (res.code == 201) return
            this.$message.success('提交成功')
            this.issuedDialogVisible = false;
            this.$parent.playOrder(0)
          })
      }
        }
    }
</script>

 src/components/view/b4-daily-business-statistics.vue

@@ -146,6 +146,17 @@
        ]
      }
    }
  },
  mounted(){
    this.init()
  },
  methods:{
    init(){
      this.$axios.get(this.$api.report.businessStatisticsByDay).then(res => {
        if (res.code == 201) return
        console.log(res)
      })
    }
  }
}
</script>

 src/components/view/index-index.vue

@@ -10,7 +10,8 @@
        background-image: url("../../../static/img/首页图片1.png");
        background-size: 100% 100%;
        height: 118px;
        margin-bottom: 10px;
        margin-bottom: 16px;
    border-radius: 16px;
    }

    .left-1 .say {
@@ -55,6 +56,7 @@
    display: flex;
    align-items: center;
    justify-content: space-between;
    margin-bottom: 16px;
  }

  .right-1-item{
@@ -69,6 +71,155 @@
    color: #0166E2;
  }

  .right-2{
    padding: 13px 20px;
    margin-bottom: 16px;
  }

  .right-2-title{
    display: flex;
    align-items: center;
    justify-content: space-between;
  }

  .right-2-body{
    width: 100%;
    margin-top: 20px;
    display: flex;
    align-items: start;
    justify-content: space-between;
  }
  >>>.el-calendar__header {
    display: none;
  }
  >>>.el-calendar__body{
    padding: 0;
  }
  >>>.el-calendar-table:not(.is-range) td.next {
    /*隐藏下个月的日期*/
    display: none;
  }
  >>>.el-calendar-day{
    height: 40px;
  }
  >>>.el-calendar-table td{
    border: 0;
    font-size: 14px;
  }
  >>>.el-calendar-table tr td:first-child{
    border-left: 0;
  }
  .control{
    display: flex;
    align-items: center;
    justify-content: space-between;
    box-sizing: border-box;
    padding: 0px 0 10px;
  }
  .control .el-button{
    width: 32px;
    height: 32px;
    border-radius: 8px;
    border: 1px solid #E8E8E8;
    background: #fff;
    padding: 0;
    color: #0166E2;
    font-size: 20px;
  }
  .list2-item{
    line-height: 22px;
    display: flex;
    margin-bottom: 13px;
    font-size: 14px;
  }
  .right-3{
  }
  .right-3-tab{
    display: flex;
    align-items: center;
    margin-bottom: 16px;
  }
  .tab-item{
    width: 50%;
    box-sizing: border-box;
    text-align: center;
    padding: 16px 0;
    font-size: 20px;
    background: #F5F7FB;
    color: #333333;
  }
  .tab-item.active{
    background: #fff;
    color: #FF3838;
  }
  .right-3-list{
    padding: 0 12px 16px;
  }
  .list3-item{
    padding: 6px 4px;
    margin: 8px 0;
  }
  .list3-item:hover{
    background: rgba(58, 123, 250,0.05);
  }
  .list3-item-title{
    display: flex;
    align-items: start;
    margin-bottom: 10px;
  }
  .list3-item-info{
    display: flex;
    align-items: center;
    justify-content: space-between;
    color: #666666;
    font-size: 14px;
  }
  .left-2{
    display: flex;
    align-items: flex-start;
    margin-bottom: 16px;
  }
  .left-2-item{
    width: 14.1%;
    border-right: 1px solid #F1F1F1;
  }
  .left-2-item:nth-last-child(1){
    border-right: 0;
  }
  .left-2-item:hover{
    background: rgba(58,123,250,0.05);
  }
  .left-2-item:hover .left-item-title span{
    color: #3A7BFA !important;
  }
  .left-item-title{
    border-bottom: 1px solid #F1F1F1;
    display: flex;
    flex-direction: column;
    align-items: center;
    justify-content: center;
    padding: 20px 0;
  }
  .left-item-body{
    box-sizing: border-box;
    padding: 5px;
    max-height: 711px;
    overflow-y: auto;
  }
  .body-item{
    background: #70A090;
    border-radius: 16px;
    overflow: hidden;
    margin-bottom: 8px;
  }
  .body-item>div{
    height: calc(100% - 16px);
    margin-top: 16px;
    background: rgba(255, 255, 255,0.9);
    padding: 8px 8px 16px;
    display: flex;
    flex-direction: column;
  }
</style>

<template>
@@ -83,7 +234,26 @@
                        </div>
                    </div>
                </div>
        <div class="left-2 card"></div>
        <div class="left-2 card">
          <div class="left-2-item" v-for="(item,index) in 7" :key="index">
            <div class="left-item-title">
              <span style="font-size: 18px;">25</span>
              <span style="font-size: 14px;color: #999999;">星期四</span>
            </div>
            <div class="left-item-body">
              <div class="body-item" v-for="(m,i) in 8" :key="i">
                <div>
                  <span style="font-size: 12px;margin-bottom: 17px;">委托订单WT20230101 -001检测</span>
                  <el-image style="height: 24px;width: 24px;border-radius: 50%;">
                    <div slot="error" class="image-slot">
                      <i class="el-icon-picture-outline"></i>
                    </div>
                  </el-image>
                </div>
              </div>
            </div>
          </div>
        </div>
      </el-col>
      <el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="10">
        <div class="right-1 card">
@@ -125,8 +295,57 @@
          </div>
        </div>
        <div class="right-2 card">
          <div class="right-2-title">
            <span style="color: #333333;font-size: 16px;">我的日程</span>
            <span style="cursor: pointer;font-size: 12px;
color: #3A7BFA;">添加我的日程</span>
          </div>
          <div class="right-2-body">
            <div class="calendar" style="width: 49%;">
              <div class="control">
                <el-button class="prevm" @click="prevMonth(calendarValue)" icon="el-icon-arrow-left"></el-button>
                <span>{{ calendarValue.getFullYear()+'年'+(calendarValue.getMonth() + 1)+'月' }}</span>
                <el-button class="nextm" @click="nextMonth(calendarValue)" icon="el-icon-arrow-right"></el-button>
              </div>
              <el-calendar v-model="calendarValue">
                <template
                    slot="dateCell"
                    slot-scope="{date, data}">
                        <span>
                            {{ data.day.split('-').slice(2)+'' }}
                        </span>
                    <el-badge v-if="data.isSelected" is-dot class="item">
                    </el-badge>
                </template>
              </el-calendar>
            </div>
            <div class="right-2-list" style="width: 49%;">
              <div class="list2-item" v-for="(m,i) in 5" :key="i">
                <span>14:00</span>
                <el-tooltip style="margin-left: 10px;" effect="dark" content="参加LIMS系统培训会议，并签上线上线上线上线上线上线" placement="top">
                  <p class="ellipsis-multiline" >参加LIMS系统培训会议，并签上线上线上线上线上线上线</p>
                </el-tooltip>
              </div>
            </div>
          </div>
        </div>
        <div class="right-3 card">
        <div class="right-3 card" style="overflow: hidden;">
          <div class="right-3-tab">
            <div class="tab-item" style="cursor: pointer;" :class="{active:currentIndex==0}" @click="currentIndex=0">预警提醒 10</div>
            <div class="tab-item" style="cursor: pointer;" :class="{active:currentIndex==1}" @click="currentIndex=1">通知通告 12</div>
          </div>
          <div class="right-3-list">
            <div class="list3-item" v-for="(m,i) in 5" :key="i">
              <div class="list3-item-title">
                <img src="../../../static/img/index-tip.svg" alt="">
                <p>设备到期提醒</p>
              </div>
              <div class="list3-item-info">
                <p>编号<span style="color:#3A7BFA;"> SB20240101-001 </span>的设备将于2023-09-09 11:11:11过期</p>
                <p>2023-09-09 09:09:09</p>
              </div>
            </div>
          </div>
        </div>
      </el-col>
    </el-row>
@@ -139,12 +358,14 @@
            return {
                user: {},
                now: null,
        calendarValue: new Date(),
        currentIndex:0,
            }
        },
        mounted() {
            this.user = JSON.parse(localStorage.getItem('user'))
            this.nowTime()
            this.getDataList()
            // this.getDataList()
            setInterval(() => {
                this.nowTime()
            }, 1000)
@@ -180,7 +401,63 @@
                this.$axios.get(this.$api.dataReporting.getDataList).then(res => {
                    this.data = res.data
                })
            }
            },
      nextMonth(value) {
        let year = this.calendarValue.getFullYear();// 当前年份
        let month = this.calendarValue.getMonth() + 1;// 当前月份
        let day = this.calendarValue.getDate();// 当前天数
        let nextyear = year;
        let nextmonth = parseInt(month) + 1;
        // 判断下一月是否会进入下一年
        if (nextmonth === 13) {
          nextyear = parseInt(year) + 1;
          nextmonth = 1;
        }
        // 计算下一年下一个月有多少天
        let nextday = new Date(nextyear, nextmonth, 0);
        let nextdays = nextday.getDate();
        if (day > nextdays) {
          day = nextdays;
          if (day < 10) {
            day = '0' + day;
          }
        }
        if (nextmonth < 10) {
          nextmonth = '0' + nextmonth;
        }
        let nexttime = nextyear + '-' + nextmonth + '-' + day;

        // 将得到的年月日格式转换为标准时间，与饿了么时间格式相同才能联动
        this.calendarValue = new Date(nexttime);
      },
      prevMonth(time) {
        let year = this.calendarValue.getFullYear();// 当前年份
        let month = this.calendarValue.getMonth() + 1;// 当前月份
        let day = this.calendarValue.getDate();// 当前天数
        let prevyear = year;
        let prevmonth = parseInt(month) - 1;
        // 判断上一月是否会进入上一年
        if (prevmonth === 0) {
          prevyear = parseInt(year) - 1;
          prevmonth = 12;
        }
        // 计算上一年上一个月有多少天
        let prevday = new Date(prevyear, prevmonth, 0);
        let prevdays = prevday.getDate();
        if (day > prevdays) {
          day = prevdays;
          if (day < 10) {
            day = '0' + day;
          }
        }
        if (prevmonth < 10) {
          prevmonth = '0' + prevmonth;
        }
        let prevtime = prevyear + '-' + prevmonth + '-' + day;

        // 将得到的年月日格式转换为标准时间，与饿了么时间格式相同才能联动
        this.calendarValue = new Date(prevtime);
      },
        }
    }
</script>