合并冲突

licp

2024-04-01 976d776e39ec9bb87076fcfa11273af4729f519e

合并冲突

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -241,7 +241,7 @@
                :componentData="componentData" :key="upIndex" />
        </el-drawer>
    <el-dialog title="检验复核" :visible.sync="reviewDia" width="400px">
            <div class="body" style="display: flex;align-items: center;" v-if="reviewDia">
            <div class="body" style="display: flex;" v-if="reviewDia">
                <div class="search_label" style="width: 120px;"><span class="required-span">* </span>不通过原因：</div>
                <div class="search_input">
                    <el-input size="small" clearable v-model="noReason" type="textarea" :autosize="{ minRows: 3, maxRows: 5}"></el-input>
@@ -331,7 +331,8 @@
            id(val) {
                this.loading = true
                this.$axios.post(this.$api.insOrderPlan.doInsOrder, {
                    id: val
                    id: val,
          laboratory: this.sonLaboratory
                }).then(res => {
                    this.insOrder = res.data.insOrder;
                    this.urgentList.forEach(m => {
@@ -820,16 +821,12 @@
            type:1,
            laboratory:this.sonLaboratory,
            tell:null
          }, {
                    headers: {
                        'Content-Type': 'application/json'
                    }
          }).then(res => {
            if (res.code === 200 && res.data) {
              this.reviewLoading = false;
              this.$message.success("复核通过")
              this.$message.success("操作成功")
              this.$emit('goback')
            }
            this.reviewLoading = false;
          }).catch(error => {
            console.error(error)
            this.reviewLoading = false;
@@ -847,16 +844,12 @@
            type:0,
            laboratory:this.sonLaboratory,
            tell:this.noReason
          }, {
                    headers: {
                        'Content-Type': 'application/json'
                    }
          }).then(res => {
            if (res.code === 200 && res.data) {
              this.reviewLoading = false;
              this.$message.success("复核不通过")
              this.$message.success("操作成功")
              this.$emit('goback')
            }
            this.reviewLoading = false;
          }).catch(error => {
            console.error(error)
            this.reviewLoading = false;

 src/components/view/b1-inspect-order-plan.vue

@@ -235,13 +235,19 @@
                            id: '',
                            font: '交接',
                            type: 'text',
                            method: 'handleConnect'
                            method: 'handleConnect',
                            disabFun: (row, index) => {
                                return row.userId == null
                            }
                        },
                        {
                            id: '',
                            font: '复核',
                            type: 'text',
                            method: 'handleReview',
                            // disabFun: (row, index) => {
                            //     return row.userId == null || row.insState != 4
                            // }
                        }, {
                            id: '',
                            font: '认领',
@@ -300,6 +306,7 @@
        connectVisible:false,
        connectPerson:'',
        loading:false,
        currentTime: null
            }
        },
        created() {
@@ -307,6 +314,7 @@
            this.getTypeDicts()
            this.getInsStateDicts()
      this.getAuthorizedPerson()
      this.currentTime = getYearAndMonthAndDays()
        },
        mounted() {
            this.entityCopy = this.HaveJson(this.componentData.entity)
@@ -393,10 +401,9 @@
                row,
                rowIndex
            }) {
                let currentTime = getYearAndMonthAndDays()
                if (currentTime === row.appointed) {
                if (this.currentTime === row.appointed) {
                    return 'highlight-warning-row-border'
                } else if (currentTime > row.appointed) {
                } else if (this.currentTime > row.appointed) {
                    return 'highlight-danger-row-border'
                }
                return ''
@@ -507,9 +514,9 @@
                    if (res.code === 200 && res.data) {
            this.loading = false;
                        this.$message.success("交接成功")
                        this.connectVisible = false
                        this.refreshTable()
                    }
          this.connectVisible = false
                }).catch(error => {
                    console.error(error)
          this.loading = false;

 src/util/date.js

@@ -12,5 +12,10 @@
  }
  year = year + '-'
  let days = date.getDate()
  return year + month + days
  if (days < 10) {
    days = '0' + days + '-'
  } else {
    days = days + '-'
  }
  return (year + month + days)
}