合并冲突

licp

2024-05-10 3a4041f3eef38f38fa03d6305bea9faead06c133

合并冲突

 src/assets/api/controller.js

@@ -24,6 +24,7 @@
    informationNotification,
    performanceShift,
    auxiliaryWorkingHours,
      unPass,
    }
}

@@ -271,3 +272,6 @@
  insertAuxiliaryWorkingHours:"/auxiliaryWorkingHours/insertAuxiliaryWorkingHours",//新增辅助工时
}

const unPass = {
    pageInsUnPass:"/unPass/pageInsUnPass", // æŸ¥è¯¢ä¸åˆæ ¼æ ·å“æ•°æ®
}

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

@@ -189,7 +189,7 @@

<script>
    import ValueTable from '../tool/value-table.vue'
  import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
      import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
    import {
        getYearAndMonthAndDays
    } from '../../util/date'
@@ -245,9 +245,9 @@
                            font: '复核',
                            type: 'text',
                            method: 'handleReview',
                            /* disabFun: (row, index) => {
                            disabFun: (row, index) => {
                                return row.userId == null || row.insState != 3
                            } */
                            }
                        }, {
                            id: '',
                            font: '认领',

 src/components/view/b1-report-preparation.vue

@@ -356,7 +356,6 @@
              .replace(/&nbsp;/g, "&nbsp;&nbsp;");
            this.claimVisible = true;
          }

        }).catch(error => {
          console.error(error)
        })

 src/components/view/b1-unpass.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,127 @@
<style scoped>
  .title {
    height: 60px;
    line-height: 60px;
  }

  .search {
    background-color: #fff;
    height: 80px;
    display: flex;
    align-items: center;
  }
  .search_thing {
    display: flex;
    align-items: center;
    height: 50px;
  }
  .search_label {
    width: 120px;
    font-size: 14px;
    text-align: right;
  }

  .search_input {
    width: calc(100% - 120px);
  }
  .table {
    margin-top: 10px;
    background-color: #fff;
    width: calc(100% - 40px);
    height: calc(100% - 60px - 80px - 10px - 40px);
    padding: 20px;
  }

</style>
<template>
  <div class="below-standard-main">
    <div style="width: 100%;height: 100%;">
      <div>
        <el-row class="title">
          <el-col :span="12" style="padding-left: 20px;">不合格管理</el-col>
        </el-row>
      </div>
      <div class="search">
        <div class="search_thing">
          <div class="search_label">规格型号：</div>
          <div class="search_input">
              <el-input size="small" placeholder="请输入" clearable
              v-model="componentData.entity.model" @keyup.enter.native="refreshTable()"></el-input></div>
        </div>
        <div class="search_thing">
          <div class="search_label">样品名称：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="componentData.entity.sample"
              @keyup.enter.native="refreshTable()"></el-input>
          </div>
        </div>
        <div class="search_thing" style="padding-left: 30px;">
          <el-button size="small" @click="refresh()">重 ç½®</el-button>
          <el-button size="small" type="primary" @click="refreshTable()">查 è¯¢</el-button>
        </div>
      </div>
      <div class="table">
          <ValueTable ref="ValueTable" :url="$api.unPass.pageInsUnPass" :componentData="componentData"
          :key="upIndex" />
      </div>
    </div>
  </div>
</template>

<script>
  import ValueTable from '../tool/value-table.vue'
  import Word from '../tool/word.vue'
  import file from '../../util/file';
  import {
    convertToHtml
  } from 'mammoth';
export default {
  components: {
    ValueTable,
    Word,
  },
  data() {
    return {
        componentData: {
          entity: {
            sample: null,
            model: null,
          },
          isIndex: true,
          showSelect: false,
          select: false,
          do: [
          ],
          linkEvent: {
            // code: {
            //   method: 'selectAllByOne'
            // }
          },
          
        },
        entityCopy: {},
        upIndex: 0,
        statusList: [],
        
      }
  },
  mounted() {
    this.entityCopy = this.HaveJson(this.componentData.entity)
    this.getPower()
  },
  methods :{
    refreshTable() {
        this.$refs['ValueTable'].selectList()
      },
    refresh() {
        this.componentData.entity = this.HaveJson(this.entityCopy)
        this.upIndex++
      },
    // æƒé™åˆ†é…
    getPower(radio) {
        let power = JSON.parse(sessionStorage.getItem('power'))
      },
  }
}
</script>


 static/js/menu.js

@@ -13,7 +13,7 @@
    {
        v: "业务管理",
        i: "font icon-kexueyanjiuheshiyankaifa",
        p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport",
        p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport pageInsUnPass",
        c: [{
            v: "检验下单",
            i: "font icon-erjidaohang",
@@ -39,12 +39,13 @@
            i: "font icon-erjidaohang",
            u: "b1-sample",
            p: "selectWarehouse"
        }, {
        },{
            v: "不合格管理",
            i: "font icon-erjidaohang",
            u: "",
            u: "b1-unpass",
            p: ""
        }]
        }
    ]
    },
    {
        v: "标准集",