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

licp

2024-09-26 8c9a6b5a627b04e329bfccf2b1f5f192432a650d

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

 src/assets/api/controller.js

@@ -217,6 +217,7 @@
  scanInsOrderState: "/insOrderPlan/scanInsOrderState", // 扫码报检接口
  getInsOrderUserList: "/insOrderPlan/getInsOrderUserList", // 查看检验历史列表
  preview: "/insOrderPlan/preview", // csv文件预览
  outInsOrderState: "/insOrderPlan/outInsOrderState", // 检验任务扫码出库
}

const systemLog = {

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

@@ -3187,7 +3187,16 @@
        }
      },
      handleSubmit(){
        this.experimentDia = true
        if (this.sonLaboratory === '电路试验') {
          this.experimentDia = true
        } else {
          if(this.insOrder.orderType=='C'){
            this.verifyUser = this.insOrder.prepareUserId
            this.submit()
          }else{
            this.addVerifyDia = true
          }
        }
      },
      submit() {
        if (this.verifyUser === null || this.verifyUser === '') {

 src/components/tool/excel.vue

@@ -33,6 +33,16 @@
    #luckysheet .save:active {
        opacity: .7;
    }
  #luckysheet .returnView {
    width: 50px;
    height: 26px;
    background-color: #fff;
    border: 1px solid #DCDFE6;
    color: #606266;
    border-radius: 4px;
    margin-right: 12px;
    cursor: pointer;
  }
</style>
<template>
    <div id="luckysheet"></div>
@@ -120,7 +130,7 @@
                },
                option.myFolderUrl = this.LOCATIONVUE + '/',
                // option.functionButton = '<i class="save_i el-icon-info" title="系统支持的变量：&#10样品编号&#10样品型号&#10序号&#10检验项&#10检验子项&#10设备名称&#10设备编码&#10单位&#10要求值&#10试验方法 | 检测方法&#10最终值&#10结论&#10计算值&#10检验值"></i><button onClick="excelExport()" class="save">导出</button><button onClick="excelClosed()" class="save">保存</button>'
                option.functionButton = '<i class="save_i el-icon-info" title="系统支持的变量：&#10样品编号&#10样品型号&#10序号&#10检验项&#10检验子项&#10设备名称&#10设备编码&#10单位&#10要求值&#10试验方法 | 检测方法&#10最终值&#10结论&#10计算值&#10检验值"></i><button onClick="excelClosed()" class="save">保存</button>'
                option.functionButton = '<i class="save_i el-icon-info" title="系统支持的变量：&#10样品编号&#10样品型号&#10序号&#10检验项&#10检验子项&#10设备名称&#10设备编码&#10单位&#10要求值&#10试验方法 | 检测方法&#10最终值&#10结论&#10计算值&#10检验值"></i><button onClick="returnView()" class="returnView">取消</button><button onClick="excelClosed()" class="save">保存</button>'
        console.log(luckysheet)
                luckysheet.create(option)
            },

 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{
@@ -152,7 +166,8 @@
                        </el-col>
                        <el-col :span="6">
                            <div class="center-title">
                <el-button size="small" type="primary" @click="handleCode" style="margin-right: 16px;">扫码报检</el-button>
                <el-button size="small" type="primary" @click="qrCodeVisible=true">扫码报检</el-button>
                <el-button size="small" type="primary" @click="exportVisible=true" style="margin-right: 16px;">出库</el-button>
                                <span>总计任务数量:</span>
                                <span>{{total}}</span>
                            </div>
@@ -348,6 +363,48 @@
        </el-table>
            </el-dialog>
      <input type="text" id="ScanCodeInfo" v-model="codeInfo" @keyup.enter="keyup" style="opacity: 0;height: 0px;margin: 0px;padding: 0px;position: absolute;top: 0;"  autocomplete="off"></input>
    <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"></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"></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>

@@ -589,7 +646,15 @@
        num1:null,
        codeInfo:null,
        startTime:null,
        scanInsOrderState:false
        scanInsOrderState:false,
        qrCodeVisible: false,
        sampleCode: '',
        storageList:[],
        expandedKeys: [],
        selectTree: [],
        upLoadStorage: false,
        exportVisible: false,
        upLoadExport: false,
            }
        },
        created() {
@@ -597,6 +662,7 @@
            this.getTypeDicts()
            this.getInsStateDicts()
      this.getAuthorizedPerson()
      this.selectList()
      this.currentTime = getYearAndMonthAndDays()
        },
        mounted() {
@@ -606,40 +672,138 @@
        this.initializeSortable();
      }
        },
        methods: {
      // 扫码报检
      handleCode(){
        let input = document.getElementById('ScanCodeInfo');
        // console.log(1234567,input,this.startTime)
        input.focus();
        this.startTime&&clearInterval(this.startTime)
        this.startTime = setInterval(()=>{
    watch:{
      qrCodeVisible(newVal){
        if(newVal){
          // this.$message.success('扫码：打开')
          let input = document.getElementById('ScanCodeInfo');
          input.focus();
          this.startTime = setInterval(()=>{
            input.focus()
        },1000)
          },1000)
        }else{
          // this.$message.warning('扫码：关闭')
          clearInterval(this.startTime)
          this.sampleCode = ''
        }
      },
      exportVisible(newVal){
        if(newVal){
          // this.$message.success('扫码：打开')
          let input = document.getElementById('ScanCodeInfo');
          input.focus();
          this.startTime = setInterval(()=>{
            input.focus()
          },1000)
        }else{
          // this.$message.warning('扫码：关闭')
          clearInterval(this.startTime)
          this.sampleCode = ''
        }
      },
    },
        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 = ''
        console.log(3333,this.codeInfo)
        try{
          code = JSON.parse(this.codeInfo)
          if(code==null||code==undefined||code==''){
            this.$message.error('该二维码有误')
          }else{
            this.$axios.post(this.$api.insOrderPlan.scanInsOrderState,
              {
                sonLaboratory: this.componentData.entity.sonLaboratory,
                sampleCode: code
              }
            ).then(res => {
              if(res.code==200){
                this.$message({
                  type: 'success',
                  message: '报检成功'
                })
              }
              this.refreshTable()
            })
            this.sampleCode = code
            console.log(3333,this.sampleCode)
          }
        }catch(e){
          this.$message.error('该二维码有误')

 src/components/view/b2-standard-template.vue

@@ -132,6 +132,7 @@
            this.entityCopy = this.HaveJson(this.componentData.entity)
            this.getPower()
            window.excelClosed = this.closed
      window.returnView = this.returnView
            // window.excelExport = this.excelExport
        },
        methods: {
@@ -181,6 +182,9 @@
                    this.isShow = true
                })
            },
      returnView () {
        this.isShow = false
      },
            closed() {
                this.loading = true
                let data = luckysheet.toJson()

 src/components/view/custom_manage.vue

@@ -61,7 +61,7 @@
            <ValueTable ref="ValueTable" :url="$api.user.selectCustomPageList" :delUrl="$api.user.delCustomById"
                :componentData="componentData" :key="upIndex" :upUrl="$api.user.upCustom"/>
        </div>
        <el-dialog title="新增客户" :visible.sync="addDia" width="450px">
        <el-dialog title="新增客户" :visible.sync="addDia" width="450px" @close="resetUser">
            <div style="margin-bottom: 15px;">
                <el-row style="line-height: 50px;">
                    <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
@@ -296,6 +296,9 @@
                    this.addDia = false
                })
            },
      resetUser () {
        this.user = {}
      },
            // 权限分配
            getPower() {
                let power = JSON.parse(sessionStorage.getItem('power'))