value
2024-04-29 86fb74eab9bae7ab636c180a7cc5e24ba808e65f
Merge remote-tracking branch 'origin/master'
已修改4个文件
75 ■■■■ 文件已修改
src/components/tool/value-table.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b1-inspection-order.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b2-standard.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/tool/value-table.vue
@@ -105,7 +105,7 @@
        @row-click="rowClick" :show-summary="data.countFleid!=undefined && data.countFleid.length > 0"
        :summary-method="getSummaries" :row-class-name="tableRowClassName" :row-key="record=>record.id"
        :current-row-key="data.currentId" :highlight-current-row="data.highlight===undefined||data.highlight"
        :span-method="spanMethod">
        :span-method="spanMethod" :key="specialKey">
        <el-table-column type="selection" width="65" v-if="data.showSelect" :key="Math.random()">
        </el-table-column>
        <el-table-column type="index" align="center" label="序号" width="65" v-if="data.isIndex" :key="Math.random()">
@@ -448,7 +448,8 @@
          //   position:0
          // }
        ],
        param: {}
        param: {},
        specialKey:'table-'
      }
    },
    beforeUpdate() {
@@ -465,6 +466,7 @@
      this.token = {
        'token': sessionStorage.getItem('token')
      }
      this.specialKey = this.specialKey+Math.random()*100;
    },
    methods: {
      rowspan(spanArr, position, spanName) {
src/components/view/b1-inspection-order.vue
@@ -15,16 +15,17 @@
        display: flex;
        align-items: center;
        height: 50px;
    width: 230px;
    }
    .search_label {
        width: 120px;
        width: 90px;
        font-size: 14px;
        text-align: right;
    }
    .search_input {
        width: calc(100% - 120px);
        width: calc(100% - 90px);
    }
    .table {
@@ -89,6 +90,29 @@
                    <div class="search_label">样品名称:</div>
                    <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                            v-model="componentData.entity.sampleType" @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.sampleType" @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.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
                </div>
        <div class="search_thing">
                    <div class="search_label">下单时间:</div>
                    <div class="search_input">
            <el-date-picker style="width:100%" v-model="componentData.entity.createTime"
            type="datetime"
            size="small"
            format="yyyy-MM-dd"
            value-format="yyyy-MM-dd"
            clearable
            placeholder="选择日期">
            </el-date-picker>
          </div>
                </div>
                <div class="search_thing" style="padding-left: 30px;">
                    <el-button size="small" @click="refresh()">重 置</el-button>
@@ -482,7 +506,13 @@
            },
            // 下载报告
            download(row) {
        console.log(row);
        // console.log(row);
        let url = row.url;
        const link = document.createElement('a');
        link.href = this.javaApi + url;
        link.target = '_blank';
        document.body.appendChild(link);
        link.click();
      },
            // 审核
            handleVerify(row) {
src/components/view/b2-standard.vue
@@ -142,8 +142,8 @@
        <!-- </el-col> -->
      </el-row>
      <el-row class="standard_table" v-loading="tableLoad">
        <el-table class="el-table" :data="standardList" style="width: 100%;" height="220px" tooltip-effect="dark"
          :highlight-current-row="true" @row-click="rowClick" ref="standard">
        <el-table class="el-table" :data="standardList" style="width: 100%;height: 220px !important;overflow-y: auto;" tooltip-effect="dark"
          highlight-current-row @row-click="rowClick" ref="standard">
          <el-table-column prop="code" label="标准编号" show-overflow-tooltip width="180">
            <template slot-scope="scope">
              <span style="color: red;font-size: 14px;">{{scope.row['code']}}</span>
@@ -407,7 +407,7 @@
        this.$confirm("是否删除该层级", "提示", {
          type: "error"
        }).then(() => {
          this.treeLoad = true
          // this.treeLoad = true
          this.selectTree = ''
          this.getNodeParent(node)
          this.selectTree = this.selectTree.replace(' - ', '')
@@ -422,12 +422,23 @@
          }).then(res => {
            if (res.code == 201) return
            this.$message.success('已删除')
            this.selectStandardTreeList()
            let arr = this.selectTree.split(' - ');
            this.deleteStandard(this.list, arr[arr.length - 1])
            // this.selectStandardTreeList()
            this.selectTree = ''
            this.standardList = []
            this.productList = []
          })
        }).catch(e => {})
      },
      deleteStandard(arr, label) {
        arr.forEach((item, index) => {
          if(item.label == label){
            arr.splice(index, 1);
          }else{
            item.children&&this.deleteStandard(item.children, label);
          }
        })
      },
      nodeOpen(data, node, el) {
        $($(el.$el).find('.node_i')[0]).attr('class', 'node_i el-icon-folder-opened')
@@ -581,7 +592,15 @@
          }
          this.$message.success('添加成功')
          this.addDia = false
          this.selectStandardTreeList()
          this.list
          .find(a => a.label == this.addOb.factory).children
          .find(a => a.label == this.addOb.laboratory).children
          .find(a => a.label == this.addOb.sampleType).children
          .find(a => a.label == this.addOb.sample).children.push({
            code:'[5]',
            label: this.addOb.model,
            value: this.addOb.model,
          })
          this.addLoad = false
        }).catch(e => {
          this.addDia = false
src/main.js
@@ -13,9 +13,9 @@
//本地
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://192.168.11.200:8001';//李
const javaApi = 'http://192.168.11.200:8001';//李
// const javaApi = 'http://192.168.11.249:8001';//张
const javaApi = 'http://192.168.11.50:8001';//姜
// const javaApi = 'http://192.168.11.50:8001';//姜
// const javaApi = 'http://192.168.11.2:8001';//柴
// const javaApi = 'http://114.132.189.42:9006';//测试服
//胜云服务器