bug修复

value

2023-08-31 a750f21d3be0da35b3a1ef47905b4bbbeac117e8

bug修复

 .env.development

@@ -2,4 +2,4 @@
ENV = 'development'

# base api
VUE_APP_BASE_API =  'http://192.168.110.107:1234/'
VUE_APP_BASE_API =  'http://localhost:1234/'

 src/views/experiment/inspectionApplication/Viewdetails/index.vue

@@ -86,20 +86,20 @@
                        </el-table-column>
                        <el-table-column prop="required" label="内控值">
                        </el-table-column>
                        <el-table-column prop="userName" label="责任人" width="220px">
                        <el-table-column prop="userId" label="责任人" width="220px">
                            <template slot-scope="scope">
                                <el-select v-model="scope.row.username" slot="append"
                                <el-select v-model="scope.row.userId" slot="append"
                                    @change="(val)=>chooseUseProId(val, scope.row)">
                                    <el-option v-for="(item,indxe) in ZERENren" :key="indxe" :label="item.name"
                                        :value="item.id"></el-option>
                                </el-select>
                            </template>
                        </el-table-column>
                        <el-table-column prop="inspectionMaterialId" label="实验设备" width="220px">
                        <el-table-column prop="instrumentId" label="实验设备" width="300px">
                            <template slot-scope="scope">
                                <el-cascader v-model="scope.row.instrumentName" :options="devices"
                                <el-cascader v-model="scope.row.instrumentId" :options="devices"
                                    :props="{label: 'Name',value: 'Id',children: 'childrenList'}"
                                    @change="(val)=>chooseEquipment(val, scope.row)"></el-cascader>
                                    @change="(val)=>chooseEquipment(val, scope.row)" style="width: 100%;"></el-cascader>
                            </template>
                        </el-table-column>
                    </el-table>

 src/views/experiment/inspectionApplication/index.vue

@@ -56,11 +56,11 @@
                            :data="inspectionTable">
                            <el-table-column type="selection" min-width="30px" />
                            <el-table-column prop="icode" label="申请单号" min-width="150px" />
                            <el-table-column prop="type" label="检验类型" min-width="80px">
                            <el-table-column prop="type" label="检验类型" min-width="100px">
                                <template slot-scope="scope">
                                    <div v-if="scope.row.type === 0"><span>原材料检验</span></div>
                                    <div v-if="scope.row.type === 1"><span>委托检验</span></div>
                                    <div v-if="scope.row.type === 2"><span>成品检验</span></div>
                                    <div v-if="scope.row.type === 0"><el-tag type="success">原材料检验</el-tag></div>
                                    <div v-if="scope.row.type === 2"><el-tag>委托检验</el-tag></div>
                                    <div v-if="scope.row.type === 1"><el-tag type="warning">成品检验</el-tag></div>
                                </template>
                            </el-table-column>
                            <el-table-column prop="formTime" label="来料日期" min-width="90px" />

 src/views/experiment/planAssignments/plan.vue

@@ -139,7 +139,7 @@
                <el-button @click="upDia = false">取 消</el-button>
            </span>
        </el-dialog>
        <el-dialog title="检验" :visible.sync="upInsDia" width="500px">
        <el-dialog title="检验" :visible.sync="upInsDia" width="600px">
            <div class="body" style="max-height: 50vh;overflow-y: auto;">
                <el-row style="line-height: 46px;">
                    <el-col :span="5" style="font-size: 14px;text-align: right;">申请单编码：</el-col>
@@ -355,7 +355,7 @@
                    this.upInsDia = false
                    this.selectDataList()
                    this.$confirm(
                        `<p style="line-height: 80px">您的项目(${this.upData.name})检验结果为：<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'合格':'不合格'}</span></p>`,
                        `<p style="line-height: 80px">您的项目（${this.upData.name}）检验结果为：<span class="${res.data==1?'ins_state_success':'ins_state_error'}">${res.data==1?'合格':'不合格'}</span></p>`,
                        '提交成功', {
                            confirmButtonText: '确定',
                            cancelButtonText: '关闭',