Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into m...

licp

2024-10-28 3845f43c43252185a134566a63670de9d1c2d253

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

@@ -101,6 +101,20 @@
    cursor: move;
    position: relative;
  }
  .node_i {
    color: orange;
    font-size: 18px;
  }
  .custom-tree-node .el-button {
    opacity: 0;
  }

  .custom-tree-node:hover .el-button {
    opacity: 1;
  }
  .el-dialog {
    position: relative;
  }
</style>
<style>
   .ins-order-plan-main .el-form-item__label{
@@ -138,7 +152,7 @@
         <div class="center">
            <div class="center-options">
               <el-row>
                  <el-col :span="21">
                  <el-col :span="18">
                     <div style="display: flex;align-items: center;margin-bottom: 10px;">
                        <ul class="tab">
                           <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label.replace('试验室','')}}
@@ -150,8 +164,10 @@
                        </div>
                     </div>
                  </el-col>
                  <el-col :span="3">
                  <el-col :span="6">
                     <div class="center-title">
                <el-button size="small" type="primary" @click="qrCodeVisible=true" v-if="selectWarehouse">扫码报检</el-button>
                <el-button size="small" type="primary" @click="exportVisible=true" style="margin-right: 16px;" v-if="selectWarehouse">出库</el-button>
                        <span>总计任务数量:</span>
                        <span>{{total}}</span>
                     </div>
@@ -229,6 +245,11 @@
            width="160px"
          ></el-table-column>
          <el-table-column
            prop="submitTime"
            label="检验结束时间"
            width="160px"
          ></el-table-column>
          <el-table-column
            prop="verifyTell"
            label="理由"
            width="150px"
@@ -244,7 +265,7 @@
            <el-button @click="handleConnect(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState == 5  || scope.row.insState == 3||scope.row.insState == 6||(scope.row.userName&&!scope.row.userName.includes(userName))" v-if="connect">交接</el-button>
            <el-button @click="handleReview(scope.row)" type="text" size="small" :disabled="scope.row.userName == null || scope.row.insState != 3 ||(scope.row.checkName&&!scope.row.checkName.includes(userName))" v-if="review">复核</el-button>
            <el-button @click="claimFun(scope.row)" type="text" size="small" :disabled="scope.row.userName != null || scope.row.checkName!=null" v-if="claim">认领</el-button>
            <el-button @click="lookHistory(scope.row)" type="text" size="small" :disabled="!scope.row.num1 || scope.row.num1<1" v-if="getInsProduct2">查看记录</el-button>
            <el-button @click="lookHistory0(scope.row)" type="text" size="small">查看记录</el-button>
          </template>
          </el-table-column>
        </el-table>
@@ -306,12 +327,94 @@
                  :componentData="componentDataDataLook"/>
            </div>
         </el-dialog>
      <el-dialog title="查看记录" :visible.sync="historyDialogVisible" width="50%">
        <el-table
          :data="historyList"
          border
          style="width: 100%">
          <el-table-column
            prop="submitTime"
            label="提交日期"
            min-width="150">
          </el-table-column>
          <el-table-column
            prop="submitUserName"
            label="提交人"
            min-width="90">
          </el-table-column>
          <el-table-column
            prop="term"
            label="实验阶段"
            min-width="120">
          </el-table-column>
          <el-table-column
            prop="note"
            label="实验操作"
            min-width="120">
          </el-table-column>
          <el-table-column
            prop="tell"
            label="再次检验原因"
            min-width="120">
          </el-table-column>
          <el-table-column
            fixed="right"
            label="操作"
            min-width="100">
            <template slot-scope="scope">
              <el-button @click="lookHistory(scope.row)" type="text" size="small">查看</el-button>
            </template>
          </el-table-column>
        </el-table>
         </el-dialog>
    <el-dialog title="扫码检验" :visible.sync="qrCodeVisible" width="350px">
      <el-row>
        <el-col class="search_thing" :span="24">
          <div class="search_label" style="width: 90px"><span class="required-span">* </span>样品编号：</div>
          <div class="search_input">
            <el-input v-model="sampleCode" size="small" clearable></el-input>
          </div>
        </el-col>
      </el-row>
      <el-tree :data="storageList" ref="tree" :props="{ children: 'warehouseShelfList', label: 'name' }" node-key="id"
               :filter-node-method="filterNode" @node-click="handleNodeClick" highlight-current @node-expand="nodeOpen"
               @node-collapse="nodeClose" :default-expanded-keys="expandedKeys" v-if="qrCodeVisible"
               empty-text="暂无数据">
        <div class="custom-tree-node" slot-scope="{ node, data }">
          <el-row>
            <el-col :span="24">
              <span><i
                :class="`node_i ${data.warehouseShelfList != undefined ? 'el-icon-folder-opened' : 'el-icon-tickets'}`"></i>
                {{ data.name }}</span>
            </el-col>
          </el-row>
        </div>
      </el-tree>
      <span slot="footer" class="dialog-footer">
        <el-button @click="qrCodeVisible = false">取 消</el-button>
        <el-button type="primary" @click="confirmStorage" :loading="upLoadStorage">确 定</el-button>
      </span>
    </el-dialog>
    <el-dialog title="出库" :visible.sync="exportVisible" width="350px">
      <el-row>
        <el-col class="search_thing" :span="24">
          <div class="search_label" style="width: 90px"><span class="required-span">* </span>样品编号：</div>
          <div class="search_input">
            <el-input v-model="sampleCode" size="small" clearable></el-input>
          </div>
        </el-col>
      </el-row>
      <span slot="footer" class="dialog-footer">
        <el-button @click="exportVisible = false">取 消</el-button>
        <el-button type="primary" @click="confirmExport" :loading="upLoadExport">确 定</el-button>
      </span>
    </el-dialog>
  </div>
</template>

<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'
@@ -325,6 +428,9 @@
      },
      data() {
         return {
        currentHistory:{},
        historyDialogVisible:false,
        historyList:[],
        orderStateId:null,
        version:null,
            examine: null,
@@ -542,6 +648,18 @@
        inspection:false,
        isLook:false,//是否是查看历史页面
        num1:null,
        codeInfo:null,
        startTime:null,
        scanInsOrderState:false,
        qrCodeVisible: false,
        sampleCode: '',
        storageList:[],
        expandedKeys: [],
        selectTree: [],
        upLoadStorage: false,
        exportVisible: false,
        upLoadExport: false,
        selectWarehouse:false
         }
      },
      created() {
@@ -559,6 +677,114 @@
      }
      },
      methods: {
      selectList () {
        this.$axios.get(this.$api.warehouse.selectWarehouse).then(res => {
          this.warehouse = res.data
          this.storageList = this.HaveJson(res.data).map(item=>{
            item.warehouseShelfList&&item.warehouseShelfList.length>0&&item.warehouseShelfList.map(m=>{
              let warehouseShelfList = [];
              for (let i=1;i<m.row+1;i++){
                let warehouseShelfList0 = []
                for (let j=1;j<m.col+1;j++){
                  warehouseShelfList0.push({
                    name:j+' 列',
                    id:j,
                  })
                }
                warehouseShelfList.push({
                  name:i+' 层',
                  id:i,
                  warehouseShelfList:warehouseShelfList0
                })
              }
              m.warehouseShelfList = warehouseShelfList;
              return m;
            })
            return item;
          })
        })
      },
      filterNode(value, data) {
        if (!value) return true;
        return data.label.indexOf(value) !== -1;
      },
      handleNodeClick(val, node, el) { //树的值
        this.selectTree[node.level-1] = val.id;
      },
      nodeOpen(data, node, el) {
        $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
        this.selectTree[node.level-1] = data.id;
      },
      nodeClose(data, node, el) {
        $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder')
      },
      // 扫码报检
      confirmStorage() {
        if (!this.sampleCode) {
          this.$message.error('请填写样品编号')
          return
        }
        if (this.selectTree.length < 4) {
          this.$message.error('请选择样品入库位置')
          return
        }
        this.upLoadStorage = true;
        this.$axios.post(this.$api.insOrderPlan.scanInsOrderState, {
          trees: this.selectTree.join('-'),
          sampleCode:this.sampleCode,
          sonLaboratory: this.componentData.entity.sonLaboratory
        }).then(res => {
          this.upLoadStorage = false;
          this.qrCodeVisible = false
          this.sampleCode = '';
          this.selectTree = []
          if (res.code == 201) {
            this.$message.error('添加失败')
            return
          }
          this.$message.success('添加成功')
          this.refreshTable()
        })
      },
      // 确认出库
      confirmExport () {
        if (!this.sampleCode) {
          this.$message.error('请填写样品编号')
          return
        }
        this.upLoadExport = true;
        this.$axios.post(this.$api.insOrderPlan.outInsOrderState, {
          sampleCode:this.sampleCode,
          sonLaboratory: this.componentData.entity.sonLaboratory
        }).then(res => {
          this.upLoadExport = false;
          this.exportVisible = false
          this.sampleCode = '';
          if (res.code == 201) {
            this.$message.error('出库失败')
            return
          }
          this.$message.success('出库成功')
          this.handleShelf(this.entity.shelfId)
        })
      },
      // 扫码枪按下
      keyup(e){
        var code = ''
        try{
          // console.log(2222,this.codeInfo)
          code = this.codeInfo.substring()
          if(code==null||code==undefined||code==''){
            this.$message.error('该二维码有误')
          }else{
            this.sampleCode = code
          }
        }catch(e){
          this.$message.error('请调至英文键盘')
          console.log(e)
        }
        this.codeInfo = null
      },
      // 拖拽
      initializeSortable() {
        const tableBody = this.$refs.table0.$el.querySelector('.el-table__body-wrapper > table > tbody');
@@ -611,7 +837,8 @@
            let review = false
        let claim = false
        let jumpTeam = false
        let getInsProduct2 = false
        // let getInsProduct2 = false
        // let getInsOrderUserList = false
            for (var i = 0; i < power.length; i++) {
               if (power[i].menuMethod == 'doInsOrder') {
                  inspection = true
@@ -628,13 +855,20 @@
          if (power[i].menuMethod == 'jumpTeam') {
                  jumpTeam = true
               }
          if (power[i].menuMethod == 'getInsProduct2') {
                  getInsProduct2 = true
          // if (power[i].menuMethod == 'getInsProduct2') {
               //    getInsProduct2 = true
               // }
          if (power[i].menuMethod == 'scanInsOrderState') {
                  this.scanInsOrderState = true
               }
          if (power[i].menuMethod == 'scanInsOrderState') {
                  this.selectWarehouse = true
            this.selectList()
               }
            }
        if (!getInsProduct2) {
               this.componentData.do.splice(5, 1)
            }
        // if (!getInsProduct2) {
            //    this.componentData.do.splice(5, 1)
            // }
            if (!claim) {
               this.componentData.do.splice(4, 1)
            }
@@ -647,7 +881,7 @@
            if (!inspection) {
               this.componentData.do.splice(1, 1)
            }
        this.getInsProduct2 = getInsProduct2
        // this.getInsProduct2 = getInsProduct2
        this.claim = claim
        this.review = review
        this.connect = connect
@@ -671,7 +905,7 @@
               this.sampleUserForm = {
                  entrustCode: row.entrustCode,
                  insSampleId: row.id,
                     sonLaboratory: row.sonLaboratory,
            sonLaboratory: row.sonLaboratory,
               }
               this.claimVisible = true
            }
@@ -890,13 +1124,23 @@
               this.personList = data
            })
         },
      lookHistory0(row){
        this.currentHistory = row
        this.$axios.post(this.$api.insOrderPlan.getInsOrderUserList, {
          insOrderStateId:row.orderStateId,
        }).then(res => {
          this.historyList = res.data
          this.historyDialogVisible = true
        })
      },
      lookHistory(row){
        this.isLook = true
        this.state = 2;
        this.orderId = row.id
        this.version = row.version
        this.orderStateId = row.orderStateId
        this.num1 = row.num1
        this.orderId = this.currentHistory.id
        this.version = this.currentHistory.version
        this.orderStateId = this.currentHistory.orderStateId
        this.num1 = row.num
        this.historyDialogVisible = false
      }
      }
   }