Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before in...

licp

2024-05-16 d33acff5eaafe9ab6dc78a01f0b00d43c73833a5

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

 src/components/tool/value-table.vue

@@ -596,6 +596,7 @@
          this.total = res.data.body.total
          this.tableHead = res.data.head
          this.tableData = res.data.body.records
          // console.log(JSON.stringify(this.tableHead)+"---------"+JSON.stringify(this.tableData))
          for (var a in this.data.selectField) {
            if (this.data.selectField[a].choose == true) {
              this.tableData.map(b => {

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

@@ -160,6 +160,7 @@
  import {
    convertToHtml
  } from 'mammoth';
  import axios from "axios";
  export default {
    components: {
      ValueTable,

 src/components/view/b1-unpass.vue

@@ -45,8 +45,8 @@
        <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>
              <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>
@@ -86,23 +86,24 @@
          entity: {
            sample: null,
            model: null,
            orderBy: {
              field: 'id',
              order: 'asc'
            }
          },
          isIndex: true,
          showSelect: false,
          select: false,
          do: [
          ],
          linkEvent: {
            // code: {
            //   method: 'selectAllByOne'
            // }
          },
          
          tagField: [],
          selectField: [],
          requiredAdd: ['model','sample',],
          requiredUp: []
        },
        entityCopy: {},
        upIndex: 0,
        statusList: [],
        
      }
  },
  mounted() {
@@ -124,4 +125,3 @@
  }
}
</script>


 src/components/view/role-manage.vue

@@ -115,7 +115,7 @@
          entity: {
            name: null,
            orderBy: {
              field: 'id',
                field: 'id',
              order: 'asc'
            }
          },

 src/main.js

@@ -13,10 +13,11 @@

//本地
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://10.20.102.168:8001';//张
// const javaApi = 'http://172.20.10.3:8001';//姜
// const javaApi = 'http://192.168.11.2:8001';//柴
 const javaApi = 'http://127.0.0.1:8001';//晏
// const javaApi = 'http://114.132.189.42:1234';//测试服
//胜云服务器
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";