Merge branch 'master' of http://192.168.73.113:9001/r/lims-before

zouyu

2023-09-04 a6e40623481eb57531439d4a93eadae280278acd

Merge branch 'master' of http://192.168.73.113:9001/r/lims-before

 .env.production

@@ -3,5 +3,5 @@

# base api
# VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_API = 'http://192.168.137.138:1234/'
VUE_APP_BASE_API = 'http://localhost:1234/'


 src/views/experiment/passRateStatistics/index.vue

@@ -29,7 +29,7 @@
        </el-form-item>
        <div class="rightBtn">
          <el-form-item>
            <el-button type="primary" plain size="mini">清空</el-button>
            <el-button type="primary" @click="clear" plain size="mini">清空</el-button>
            <el-button type="primary" @click="search" size="mini">查询</el-button>
          </el-form-item>
        </div>
@@ -160,6 +160,12 @@
        console.log("主线程"+index);
      }
    },
    clear(){
       this.searchData.date=[]
       this.searchData.type=null
       this.searchData.supplier=null
       this.searchData.code=null 
    },
    async search() {
      this.testSampleStatistics = null
      this.supplierNoPassStatistics = null

 src/views/inspectionManagement/reportForInspection/index.vue

@@ -48,7 +48,7 @@
                    </el-form-item>
                    <el-form-item label="规格型号:" prop="specificationsNumber">
                        <el-cascader v-model="insertData.specificationsNumber" :options="childrenOptions"
                            :props="{label: 'Name', value: 'Name'}" separator="-"></el-cascader>
                            :props="{label: 'Name', value: 'Id'}" separator="-"></el-cascader>
                    </el-form-item>
                    <el-form-item label="单位:" prop="unit">
                        <el-input type="text" v-model="insertData.unit" />
@@ -156,6 +156,7 @@
    getChooseVersion,
    lookProByVer
    } from '@/api/inspection/rawmaterial'
import ItemVue from '@/layout/components/Sidebar/Item.vue'
    export default {
        data() {
            return {
@@ -480,13 +481,25 @@
            insert() {
                this.$refs['addMaterialForm'].validate((valid) => {
                    if (valid) {
                        console.log(this.childrenOptions);
                        console.log(this.insertData);
                        let f=this.childrenOptions.filter(item=>{
                            return item.Id===this.insertData.specificationsNumber[0]
                        })[0]
                        console.log(f);
                        let fatherName=f.Name;
                        let c=f.children.filter(item=>{
                            return item.Id===this.insertData.specificationsNumber[1]
                        })[0]
                        let sonName=c.Name
                        let specificationsId=c.Id;
                        var str = {
                            "dateSurvey": this.insertData.fromDate,
                            "materialCoding": this.insertData.mCode,
                            "materialName": this.insertData.mName,
                            "quantity": this.insertData.num,
                            "specificationsModels": this.insertData.specificationsNumber[0] + '-' + this.insertData
                                .specificationsNumber[1],
                            "specificationsModels": fatherName+ '-' + sonName,
                            "specificationsId": specificationsId,	
                            "supplierName": this.insertData.supplierName,
                            "type": 0,
                            "unit": this.insertData.unit

 src/views/laboratory/measure/index.vue

@@ -42,7 +42,7 @@
          </div>
        </div>
        <div class="table-box">
          <el-table v-if="this.radioValue == 0" :max-height="800" :cell-style="{ textAlign: 'left' }"
          <el-table v-if="this.radioValue == 0" :max-height="500" :cell-style="{ textAlign: 'left' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
            :data="measureLedgerTable" style="width: 100%">
            <el-table-column type="index" min-width="10%" />
@@ -81,7 +81,7 @@
              </template>
            </el-table-column>
          </el-table>
          <el-table v-show="this.radioValue == 1" :max-height="800" :cell-style="{ textAlign: 'center' }"
          <el-table v-show="this.radioValue == 1" :max-height="500" :cell-style="{ textAlign: 'center' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
            :data="measurePlanTable" style="width: 100%">
            <el-table-column type="index" min-width="10%" />
@@ -114,7 +114,7 @@
          <!-- 分页器 -->
          <div style="display: flex;justify-content: end;padding: 10px 0;">
            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
              :current-page="currentPage" :page-sizes="[5, 10, 20]" :page-size="pageSize"
              :current-page="currentPage" :page-sizes="[10, 20, 30]" :page-size="pageSize"
              layout="total, sizes, prev, pager, next, jumper" :total="total">
            </el-pagination>
          </div>
@@ -328,10 +328,10 @@
      measureLedgerTable: [],
      measurePlanTable: [],
      currentPage: 1,
      pageSize: 5,
      pageSize: 10,
      total: 0,
      currentPagePlan: 1,
      pageSizePlan: 5,
      pageSizePlan: 10,
      totalPlan: 0,
      direction: 'rtl',
      lookVisible: false,
@@ -396,7 +396,7 @@
      });
      this.lookVisible = false
      this.addBtn = false
      this.getPlanPageList()
      this.limitGetPlanMeasureInstrument()
    },
    async handleSizeChangePlan(num) {
      this.pageSizePlan = num
@@ -520,6 +520,7 @@
      this.reset()
    },
    async getPlanPageList() {
      console.log(111);
      let param = {
        currentPage: this.currentPage,
        pageSize: this.pageSize,
@@ -531,6 +532,7 @@
      })
      this.measurePlanTable = res.data.list
      this.total = res.data.total
      console.log(333);
    },
    async lookMeasurement(code) {
    },

 src/views/laboratory/role/index.vue

@@ -10,7 +10,7 @@
          <el-form-item class="rightBtn">
            <el-col>
              <el-button type="primary" @click="searchRole">查询</el-button>
              <el-button type="primary" plain>重置</el-button>
              <el-button type="primary" @click="clear()" plain>重置</el-button>
            </el-col>
          </el-form-item>
        </el-form>
@@ -287,6 +287,10 @@
    searchRole() {
      this.start()
    },
    clear(){
      this.searchData.roleName=''
      this.start()
    },
    clearUPAll() {
      this.updateRole = {
        roleId: null,

 src/views/standardLibrary/index.vue

@@ -360,6 +360,8 @@
                this.addTreeFormVisible = false;
                this.getStandardTree();
                this.getTableByClick(this.selectData, this.versionValue);
                this.addTreeForm=null
                this.addTreeForm.addTypeArr=[]
            },
            changeCascader(data) {
                this.addTreeForm.addTypeArr = data;
@@ -380,14 +382,18 @@
                });
            },
            selectDataList() {
                let i=0
                this.tableData.forEach((a) => {
                    a.id="0"+i
                    a.code = "[1]";
                    i++;
                    if (a.children != undefined) {
                        a.children.forEach((b) => {
                            b.code = "[2]";
                        });
                    }
                });
                console.log(this.tableData);
            },
            // 表格树全部选中配置
            // 全选/取消选操作