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

Fixiaobai

2023-08-30 a2c4dc4fbd62ac4e05b9318a1e05d147c8ae4d8c

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

 src/App.vue

@@ -6,7 +6,10 @@

<script>
export default {
  name: 'App'
  name: 'App',
    mounted() {
        document.title = "装备电缆 lims 系统"
    }
}
</script>


 src/api/inspection/commisioninspection.js

@@ -73,3 +73,19 @@
        params
  })
}

export function getProductList(params){
  return request({
    url: '/link-basic/chooseProject',
    method: 'get',
        params
  })
}

export function getContractsSampleInfo(params){
  return request({
    url: '/link-basic/getContractsSampleInfo',
    method: 'get',
        params
  })
}

 src/api/inspection/rawmaterial.js

@@ -8,3 +8,19 @@
    params
  })
}

export function addInspect(data){
  return request({
    url: '/inspection/addInspect',
    method: 'post',
    data
  })
}

export function selectInspectsListById(params){
  return request({
    url: '/inspection/selectInspectsListById',
    method: 'get',
    params
  })
}

 src/layout/components/Sidebar/SidebarItem.vue

@@ -4,10 +4,6 @@
      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">

        <el-menu-item v-if="onlyOneChild.meta.show==false ?onlyOneChild.meta.show: true" :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
          <!-- <el-menu-item :style="{width:'0px',height:'0px'}" v-if="onlyOneChild.meta.show==false ?onlyOneChild.meta.show: true" :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}"> -->
          <!-- <template slot="title">
            <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
          </template> -->
          <item :show="onlyOneChild.meta.show" :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
          <span v-if="onlyOneChild.meta.title==='主页'">主页</span>
        </el-menu-item>

 src/router/index.js

@@ -472,6 +472,12 @@
          name: 'BasicDataMessage',
          component: () => import('@/views/basicData/index'),
          meta: { title: '基础数据', icon: 'el-icon-s-tools' }
        },
                {
                  path: 'myBusiness',
                  name: 'MyBusiness',
                  component: () => import('@/views/personal/myBusiness/index'),
                  meta: { title: '我的企业', icon: 'tree', show: false }
        }
      ]
    },

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

@@ -1,7 +1,7 @@
<template>
<div> 
    <div style="overflow: hidden;">
        <el-card style="margin: 10px;" v-model="searchData" >
        <el-card style="margin: 10px;" >
        <div slot="header" class="clearfix">
            <span>
                <i slot="prefix" class="el-icon-s-home" />               
@@ -116,7 +116,7 @@
                    <el-table-column prop="userName" label="经验人">
                        <template slot-scope="scope">
                            <el-select v-model="value" size="small" slot="append" style="width: 220px;">
                            <el-option v-for="item in ZERENren" :key="item.id" :label="item.name"  :value="item.name"></el-option>
                            <el-option v-for="(item,indxe) in ZERENren" :key="indxe" :label="item.name"  :value="item.name"></el-option>
                            </el-select>
                        </template>
                    </el-table-column>
@@ -125,7 +125,7 @@
                        label="实验设备">
                        <template slot-scope="scope">
                            <el-select v-model="SHEbei" size="small" slot="append" style="width: 220px;">
                            <el-option v-for="item in getDevices" :key="item.id" :label="item.name"></el-option>
                            <el-option v-for="(item,index) in getDevices" :key="index" :label="item.name"></el-option>
                            </el-select>
                        </template>
                    </el-table-column>
@@ -141,10 +141,20 @@
export default {
    data(){
        return {
            searchData:{ },
            searchData:{
                formTime: '',
                supplier: '',
                code: '',
                name: '',
                specifications: '',
                unit: '',
                num: '',
                endTime: '',
                userName: '',
            },
            insProducts:[],
            value:'',
            SHEbei:'',
            SHEbei:[],
            aaa:{},
            ZERENren:[],
            // getDevices:[]

 src/views/experiment/inspectionApplication/index.vue

@@ -50,11 +50,12 @@
                        </div>
                    </div>
                    <div class="table-box">
                        <el-table ref="inspectionTable" :max-height="800" :cell-style="{textAlign: 'center'}"
                        <el-table ref="inspectionTable" style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
                            max-height="calc(100% - 50px)" :cell-style="{textAlign: 'center'}"
                            :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                            :data="inspectionTable" style="width: 100%">
                            :data="inspectionTable">
                            <el-table-column type="selection" min-width="30px" />
                            <el-table-column prop="icode" label="申请单号" min-width="100px" />
                            <el-table-column prop="icode" label="申请单号" min-width="150px" />
                            <el-table-column prop="type" label="检验类型" min-width="80px">
                                <template slot-scope="scope">
                                    <div v-if="scope.row.type === 0"><span>原材料检验</span></div>
@@ -62,7 +63,7 @@
                                    <div v-if="scope.row.type === 2"><span>成品检验</span></div>
                                </template>
                            </el-table-column>
                            <el-table-column prop="formTime" label="来料日期" min-width="100px" />
                            <el-table-column prop="formTime" label="来料日期" min-width="80px" />
                            <el-table-column prop="supplier" label="供应商名称" min-width="150px" />
                            <el-table-column prop="mcode" label="原材料编码" min-width="150px" />
                            <el-table-column prop="name" label="原材料名称" min-width="80px" />
@@ -70,13 +71,13 @@
                            <el-table-column prop="unit" label="单位" min-width="50px" />
                            <el-table-column prop="num" label="数量" min-width="50px" />
                            <el-table-column prop="createTime" label="登记日期" min-width="80px" />
                            <el-table-column prop="userName" label="登记人" min-width="80px" />
                            <el-table-column prop="inspection_status" label="检验结果" min-width="80px">
                                <template slot-scope="scope">
                                    <el-tag class="tag" :type="scope.row.inspection_status === 0 ? 'danger' : 'success'"
                                        disable-transitions>{{ scope.row.inspection_status === 0 ? '不合格' : '合格' }}</el-tag>
                                </template>
                            </el-table-column>
                            <el-table-column prop="userName" label="登记人" min-width="80px" />
                            <el-table-column prop="checkdate" label="检验日期" min-width="150px" />
                            <el-table-column label="操作" min-width="150" fixed="right">
                                <template slot-scope="scope">
@@ -302,7 +303,6 @@
                    </el-dialog>
                </div>
            </div>

            <!-- 确定跳转基本库弹窗 -->
            <el-dialog title="标准库" :visible.sync="Standardframe" width="49%">
                <el-card>
@@ -310,7 +310,6 @@
                        <span>版本选择：</span>
                        <el-select @change="ccc" v-model="selectedValue" size="small" slot="append" style="width: 220px;">
                            <el-option v-for="item in BANben" :key="item" :label="item" :value="item"></el-option>

                        </el-select>
                    </template>
                </el-card>
@@ -438,7 +437,6 @@
    } from '@/api/experiment/planAssignments'
    export default {
        data() {

            return {
                showDetail: false,
                searchData: {
@@ -501,7 +499,7 @@
                }],
                currentPage: 1,
                total: 20, // 总条数
                pageSize: 8, // 每页的数据条数
                pageSize: 10, // 每页的数据条数
                radioValue: '全部',
                checkTypeVisible: false,
                type: 0, // 默认不选中的状态
@@ -519,8 +517,6 @@
        watch: {
            $route: {
                handler(val, oldval) {
                    console.log(val) // 新路由信息
                    console.log(oldval) // 老路由信息
                },
                // 深度观察监听
                deep: true

 src/views/home/index.vue

 src/views/inspectionManagement/commissionInspection/addCommision.vue

@@ -15,20 +15,17 @@
          style="width: 200px;"
        >
        </el-input>-->
                        <el-button type="primary" size="small" style="background-color: rgb(1, 102, 226);">重置</el-button>
                    </div>
                    <el-table ref="detectionInfo" :max-height="800" :cell-style="{textAlign: 'center'}"
                        :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                        :data="detectionInfo" style="width: 100%;margin-bottom: 20px;">
                        <el-table-column type="index" label="序号" min-width="10%" />
                        <el-table-column prop="sampleNumber" label="样品编号" min-width="8%" />

                        <el-table-column prop="sampleName" label="样品名称" min-width="10%" />

                        <el-table-column prop="specificationsModels" label="规格型号" min-width="10%" />
                        <el-table-column prop="unit" label="单位" min-width="8%" />
                        <el-table-column prop="samplesNumber" label="数量" min-width="8%" />
                        <el-table-column prop="addway" label="添加方式" min-width="8%">
                        <!-- <el-table-column prop="addway" label="添加方式" min-width="8%">
                            <template slot-scope="scope">
                                <div v-if="scope.row.addway === 0">
                                    <el-tag type="success" disable-transitions>扫描</el-tag>
@@ -38,12 +35,12 @@
                                </div>
                                <div v-else></div>
                            </template>
                        </el-table-column>
                        </el-table-column> -->
                        <el-table-column prop="remarks" label="备注" min-width="8%" />
                        <el-table-column label="操作" min-width="8%">
                            <template slot-scope="scope">
                                <el-button type="text" size="small">修改</el-button>
                                <el-button type="text" size="small" @click="deleteRow(scope.row)">删除</el-button>
                                <el-button type="text" size="small"
                                    @click.native.prevent="deleteRow(scope.$index, detectionInfo)">删除</el-button>
                            </template>
                        </el-table-column>
                    </el-table>
@@ -103,8 +100,8 @@
                                <el-col :span="5">
                                    <el-form-item label="送样方式：">
                                        <el-select style="width: 200px;" v-model="infoForm.way" size="small" placeholder="送样">
                                            <el-option v-for="options in sampleDeliveryMode" :key="options.key"
                                                :value="options.value">{{ options.value }}</el-option>
                                            <el-option v-for="options in sampleDeliveryMode" :key="options.key" :value="options.key"
                                                :label="options.value">{{ options.value }}</el-option>
                                        </el-select>
                                    </el-form-item>
                                </el-col>
@@ -176,15 +173,15 @@
                            </el-col>
                            <el-col :span="11">
                                <el-form-item label="规格型号：">
                                    <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="请先选择样品名称">
                                        <el-option v-for="options in model_sta_options" :value="options.value"
                                    <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="请先选择样品名称"
                                        @change="getProductList">
                                        <el-option v-for="options in model_sta_options" :value="options.key" :label="options.value"
                                            :key="options.key">{{ options.value }}</el-option>
                                    </el-select>
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row :gutter="50">

                            <el-col :span="11">
                                <el-form-item label="样品单位：">
                                    <el-input type="text" v-model="addPointerForm.unit" placeholder="请输入单位" autocomplete="off" />
@@ -197,15 +194,15 @@
                            </el-col>
                        </el-row>
                        <el-row :gutter="50">
                            <el-col :span="9">
                            <el-col :span="11">
                                <el-form-item label="添加项目：">
                                    <el-checkbox-group v-model="addPointerForm.experiment" style="display: flex; flex-direction: column;">
                                        <el-checkbox v-for="expers in experList" :label="expers.label"
                                            :key="expers.key">{{ expers.label }}</el-checkbox>
                                        <el-checkbox v-for="(expers, ai) in productList" :label="expers"
                                            :key="ai">{{ expers }}</el-checkbox>
                                    </el-checkbox-group>
                                </el-form-item>
                            </el-col>
                            <el-col :span="41">
                            <el-col :span="11">
                                <el-form-item label="备注：">
                                    <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 20}" style="width: 200px;"
                                        v-model="addPointerForm.remarks" placeholder="请输入备注" autocomplete="off" />
@@ -230,6 +227,7 @@
        getlink,
        addInspection,
        isIfViewUUID,
        getProductList,
        getContractsSampleInfo
    } from '@/api/inspection/commisioninspection'
    export default {
@@ -275,17 +273,8 @@
                    key: '4',
                    label: '绝缘部分交流耐压试验'
                }],
                sampleoptions: [{
                    key: '1',
                    value: '选项1'
                }, {
                    key: '2',
                    value: '选项2'
                }],
                samplecodeoptions: [{
                    key: '1',
                    value: ''
                }],
                sampleoptions: [],
                samplecodeoptions: [],
                model_spe_options: [],
                model_sta_options: [],
                model_options: [],
@@ -298,7 +287,8 @@
                }],
                dialogueFormVisible: false,
                showDetail: false,
                viewId: null
                viewId: null,
                productList: []
            }
        },
        watch: {
@@ -343,6 +333,8 @@
                    if (!res.data) {
                        this.$message.error('当前链接不在有效期内,系统自动关闭')
                        this.$router.push('/404')
                    } else {
                        this.getContractsSampleInfo()
                    }
                })
            },
@@ -378,8 +370,6 @@
                for (let i = 1; i < this.addPointerForm.experiment.length; i++) {
                    exper += ',' + this.addPointerForm.experiment[i]
                }

                // console.log(exper)
                this.addPointerForm.experiment = exper
                let tmp = this.addPointerForm
                this.detectionInfo.push(tmp)
@@ -419,11 +409,9 @@
                this.infoForm.commisioncode = res.data
                if (res.data) {
                    this.$message({
                        message: '恭喜你!',
                        message: '添加成功!',
                        type: 'success'
                    })
                    // 跳转页面
                    this.$router.push('/inspectionManagement/commissionInspection')
                    this.showDetail = true
                } else {
                    this.$message.error(res.message)
@@ -435,8 +423,8 @@
            handleCurrentChange(pageNo) {
                this.pageParams.pageNo = pageNo
            },
            deleteRow(row) {

            deleteRow(index, rows) {
                rows.splice(index, 1);
            },
            upMaterialName(val) {
                this.sampleoptions.forEach(a => {
@@ -445,6 +433,37 @@
                    }
                })
                this.getModelSpecification(val)
            },
            getProductList(val) {
                getProductList({
                    modelId: val
                }).then(res => {
                    this.productList = res.data.map(item => {
                        return item.name
                    })
                })
            },
            getContractsSampleInfo() {
                getContractsSampleInfo({
                    viewId: this.viewId
                }).then(res => {
                    this.infoForm = {
                        commisioncode: res.data.entrustCoding,
                        deadline: res.data.completionDeadline,
                        address: res.data.contactAddress,
                        tel: res.data.contactNumber,
                        contacter: res.data.contacts,
                        other: res.data.entrustRemarks,
                        department: res.data.entrusted,
                        time: res.data.inspectionTime,
                        detectionInfo: res.data.linkDetectionList,
                        num: res.data.reportNumber,
                        way: '' + res.data.sampleDeliveryMode,
                        sendertel: res.data.sampleDeliveryPhone,
                        sender: res.data.sampleSender
                    }
                    this.detectionInfo = res.data.linkDetectionList
                })
            }
        }
    }

 src/views/inspectionManagement/commissionInspection/index.vue

@@ -65,20 +65,20 @@
                            <el-table-column type="index" label="序号" min-width="10%" />
                            <el-table-column prop="entrust_coding" label="委托编号" min-width="10%" />
                            <el-table-column prop="entrusted" label="委托单位" min-width="12%" />
                            <el-table-column prop="samples_number" label="样品编号" min-width="8%" />
                            <el-table-column prop="samples_number" label="样品数量" min-width="8%" />
                            <el-table-column prop="sample_name" label="样品名称" min-width="8%" />
                            <el-table-column prop="specifications_models" label="规格型号" min-width="12%" />
                            <el-table-column prop="dateSurvey" label="送达时间" min-width="8%" />
                            <el-table-column prop="inspectionTime" label="送样时间" min-width="8%" />
                            <el-table-column prop="completionDeadline" label="完成期限" min-width="8%" />
                            <el-table-column prop="contacts" label="委托编制人" min-width="8%" />
                            <el-table-column prop="inspectionTime" label="检验日期" min-width="8%" />
                            <el-table-column prop="insTime" label="检验日期" min-width="8%" />
                            <el-table-column prop="inspection_status" label="状态" min-width="8%">
                                <template slot-scope="scope">
                                    <div v-if="scope.row.inspection_status === 1">
                                        <span style="color: green;">已检测</span>
                                    <div v-if="scope.row.inspection_status === 0">
                                        <span style="color: green;">已报检</span>
                                    </div>
                                    <div v-else>
                                        <span style="color: red;">待检测</span>
                                        <span style="color: red;">未报检</span>
                                    </div>
                                </template>
                            </el-table-column>
@@ -327,12 +327,15 @@
                if (document.execCommand('copy')) {
                    this.$message.success('已复制到剪贴板')
                }
            },
            handleClick(row){
                console.log(row);
            }
        }
    }
</script>

<style scoped>
<style scoped lang="scss">
    .top-bar {
        margin: -25px -15px;
        background: #fff;

 src/views/inspectionManagement/reportForInspection/index.vue

@@ -40,9 +40,33 @@
            <el-form-item>
              <el-button type="primary" @click="search">查询</el-button>
              <el-button type="primary" plain @click="reset">重置</el-button>
              <el-button type="primary" icon="el-icon-plus" @click="addReportVisible = true">新增</el-button>
            </el-form-item>
            </el-form>
        </div>
        <el-dialog
          title="新增原材料报检"
          :visible.sync="addReportVisible"
          width="40%">
          <el-form v-model="insertData" label-position="left" label-width="80px">
            <el-form-item label="标准类型">
              <el-input v-model="insertData.materialName" />
            </el-form-item>
            <el-form-item label="物料名称">
              <el-input v-model="insertData.materialName" />
            </el-form-item>
            <el-form-item label="执行标准">
              <el-input v-model="insertData.standardName" />
            </el-form-item>
            <el-form-item label="规格型号">
              <el-input v-model="insertData.specificationsName" />
            </el-form-item>
          </el-form>
          <span slot="footer" class="dialog-footer">
            <el-button @click="addReportVisible = false">取 消</el-button>
            <el-button type="primary" @click="insert()">确 定</el-button>
          </span>
        </el-dialog>
        <div class="library-table">
          <div class="table-header">
            <div class="search-bar">
@@ -51,8 +75,9 @@
              </el-radio-group>
            </div>
            <div class="generateInsp">
              <el-button @click="showNewPage = true" type="primary" size="mini" icon="el-icon-document" style="background-color: rgb(1, 102, 226);">生成报检单</el-button>
              <el-button @click="addReportBtn" type="primary" size="mini" icon="el-icon-document" style="background-color: rgb(1, 102, 226);">生成报检单</el-button>
            </div>

          </div>
          <div class="table-box">
            <el-table
@@ -62,11 +87,13 @@
              :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
              :data="inspectionTable"
              style="width: 100%"
              @selection-change="handleSelectionChange"
            >
              <el-table-column
                type="selection"
                min-width="10%"
              /> 
                :selectable="checkSelect"
                min-width="5%">
              </el-table-column> 
              <el-table-column
                type="index"
                label="序号"
@@ -129,8 +156,15 @@
              >
              <template slot-scope="scope">
                <span :style="{ color: scope.row.type === 1 ? 'green' : 'red' }">
                  {{ scope.row.type === 1 ? '已检测':'未检测' }}
                  {{ scope.row.type === 1 ? '已报检':'未报检' }}
                </span>
              </template>
              </el-table-column>
              <el-table-column
                label="操作"
                min-width="8%">
                <template slot-scope="scope">
                  <el-button type="text" size="small" @click="removeFun(scope.row)">删除</el-button>
              </template>
              </el-table-column>
            </el-table>
@@ -159,28 +193,28 @@
              <el-row>
                <el-col  :span="8">
                  <el-form-item label="来料日期：">
                    <el-input  style="width: 180px;" :value="inspectionForm.createTime" disabled autocomplete="off" />  
                    <el-input  style="width: 180px;" :value="inspectionForm.formTime" disabled autocomplete="off" />  
                  </el-form-item>
                </el-col>
                <el-col  :span="8">
                  <el-form-item label="供应商名称：">
                    <el-input style="width: 180px;" :value="inspectionForm.supplier_name" disabled autocomplete="off" />                  </el-form-item>
                    <el-input style="width: 180px;" :value="inspectionForm.supplier" disabled autocomplete="off" />                  </el-form-item>
                </el-col>
                <el-col  :span="8">
                  <el-form-item label="样品编号：">
                    <el-input style="width: 180px;" :value="inspectionForm.materialCoding" disabled autocomplete="off" />
                    <el-input style="width: 180px;" :value="inspectionForm.code" disabled autocomplete="off" />
                  </el-form-item>
                </el-col>
              </el-row>
              <el-row >
                <el-col  :span="8">
                  <el-form-item label="样品名称：" >
                    <el-input style="width: 180px;" :value="inspectionForm.materialName" disabled autocomplete="off" />
                    <el-input style="width: 180px;" :value="inspectionForm.name" disabled autocomplete="off" />
                  </el-form-item>
                </el-col>
                <el-col  :span="8">
                  <el-form-item label="规格型号：">
                    <el-input style="width: 180px;" :value="inspectionForm.specificationsModels" disabled autocomplete="off" />                       
                    <el-input style="width: 180px;" :value="inspectionForm.specifications" disabled autocomplete="off" />                       
                  </el-form-item>
                </el-col>
                <el-col  :span="8">
@@ -192,17 +226,17 @@
              <el-row >
                <el-col  :span="8">
                  <el-form-item label="数量：" >
                    <el-input style="width: 180px;" :value="inspectionForm.quantity" disabled autocomplete="off" />                       
                    <el-input style="width: 180px;" :value="inspectionForm.num" disabled autocomplete="off" />                       
                  </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="报检日期：" >
                      <el-input style="width: 180px;" :value="inspectionForm.dateSurvey" disabled autocomplete="off" />                       
                      <el-input style="width: 180px;" :value="inspectionForm.endTime" disabled autocomplete="off" />                       
                    </el-form-item>
                  </el-col>
                  <el-col :span="8">
                    <el-form-item label="报检人：">
                        <el-input style="width: 180px;" :value="inspectionForm.surveyor" disabled autocomplete="off" />
                        <el-input style="width: 180px;" :value="inspectionForm.userName" disabled autocomplete="off" />
                    </el-form-item>
                  </el-col>
                </el-row>
@@ -213,7 +247,7 @@
          <div class="header">
            <span style="font-size: 14px">检验项目</span>
            <div>
            <el-button  type="primary" plain size="mini">保存</el-button>
            <!-- <el-button  type="primary" plain size="mini">保存</el-button> -->
            <el-button @click="showNewPage = false" type="primary" plain size="mini" icon="el-icon-back">返回</el-button>
          </div>
          </div>
@@ -223,22 +257,22 @@
              :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
              :data="inspectionItems">
            <el-table-column type="index" label="序号" width="60"></el-table-column>
            <el-table-column prop="project" label="项目" width="250"></el-table-column>
            <el-table-column prop="name" label="项目" width="250"></el-table-column>
            <el-table-column prop="unit" label="单位" width="125"></el-table-column>
            <el-table-column prop="standardVal" label="标准值" width="125"></el-table-column>
            <el-table-column prop="controlVal" label="内测值" width="125"></el-table-column>
            <el-table-column prop="detectionVal" label="检验值" width="125"></el-table-column>
            <el-table-column prop="checker" label="检验人">
            <el-table-column prop="required" label="标准值" width="125"></el-table-column>
            <el-table-column prop="internal" label="内测值" width="125"></el-table-column>
            <el-table-column prop="testValue" label="检验值" width="125"></el-table-column>
            <el-table-column prop="userName" label="检验人">
              <template slot-scope="scope">
                <el-select v-model="scope.row.checker" size="small" slot="append" style="width: 260px;">
                    <el-option v-for="item in checkeroptions" :key="item.value" :label="item.label">{{ item.label }}</el-option>
                    <el-option v-for="(item,index) in checkeroptions" :key="index" :value="item.value" :label="item.label">{{ item.label }}</el-option>
                </el-select>
              </template>
            </el-table-column>
            <el-table-column prop="device" label="试验设备">
                <template slot-scope="scope">
                <el-select v-model="scope.row.device" size="small" slot="append" style="width: 260px;">
                    <el-option v-for="item in deviceoptions" :key="item.value" :label="item.label">{{ item.label }}</el-option>
                    <el-option v-for="(item,index) in deviceoptions" :key="index" :value="item.value" :label="item.label">{{ item.label }}</el-option>
                </el-select>
            </template>
            </el-table-column>
@@ -249,10 +283,17 @@
</template>

<script>
import { getRawMaterialList } from '@/api/inspection/rawmaterial'
import { getRawMaterialList,addInspect,selectInspectsListById } from '@/api/inspection/rawmaterial'
export default {
  data() {
    return {
      insertData:{
        
      },
      addReportVisible: false,
      checked: false,
      resultData : {},
      checkData:[],
      form: [],
      searchData: {
        code: '',
@@ -313,80 +354,82 @@
      total:20,
      data: '',
      showNewPage: false,
      inspectionForm:{
        createTime: '2023-07-28',
        supplier_name: '国网山东省电力有限公司',
        materialCoding: 'BP214274',
        materialName: '铝包钢绞线',
        specificationsModels: 'JLHA/G1A-185/30-26/7',
        unit: '吨',
        quantity: 21,
        dateSurvey: '2023-08-02',
        surveyor: '黄小明',
        inspectionDate: '2023-12-09',
      },
      inspectionItems:[{
        project:'导线外径',
        unit: 'mm',
        standardVal: '30.0',
        controlVal: '30.0',
        detectionVal: '30.0',
        device:'',
        checker: '',
      },{
        project:'导线外径',
        unit: 'mm',
        standardVal: '30.0',
        controlVal: '30.0',
        detectionVal: '30.0',
        device:'',
        checker: ''
      },{
        project:'导线外径',
        unit: 'mm',
        standardVal: '30.0',
        controlVal: '30.0',
        detectionVal: '30.0',
        device:'',
        checker: ''
      },{
        project:'导线外径',
        unit: 'mm',
        standardVal: '30.0',
        controlVal: '30.0',
        detectionVal: '30.0',
        device:'',
        checker: ''
      },{
        project:'导线外径',
        unit: 'mm',
        standardVal: '30.0',
        controlVal: '30.0',
        detectionVal: '30.0',
        device:'',
        checker: ''
      },{
        project:'导线外径',
        unit: 'mm',
        standardVal: '30.0',
        controlVal: '30.0',
        detectionVal: '30.0',
        device:'',
        checker: ''
      }]
      inspectionForm:{},
      inspectionItems:[]
    }
  },
  created(){
    this.getRawMaterialList()
  },
  methods: {
    removeFun(row){
      this.$confirm('确认删除该数据吗?', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
          this.$message({
            type: 'success',
            message: '删除成功!'
          });
        }).catch(() => {});
    },
    checkSelect(row,index){
      if(row.type === 1){
        return false;
      }else{
        return true;
      }
    },
    handleSelectionChange(val){
      this.checkData = val;
      console.log(val);
    },
    //生成报检单按钮
    addReportBtn(){
      let arr = this.checkData;
      if(arr.length < 1){
        this.$message.error("请选择一条数据!");
      }else{
        if(arr.length > 1){
          this.$message.error("最多选择一条数据!");
        }else{
          //添加报检单
          let val = arr[0];
          let obj = {
            "endTime": val.dateSurvey,
            "experiment": "",
            "formTime": val.createTime,
            "id": val.id,
            "mcode": val.materialCoding,
            "name": val.materialName,
            "num": val.quantity,
            "specifications": val.specificationsModels,
            "startTime": val.inspectionDate,
            "supplier": val.supplierName,
            "type": val.type,
            "unit": val.unit,
            "version": val.version
          }
          this.createReport(obj);
          this.showNewPage = true;
        }
      }
    },
    //生成报价单
    async createReport(param){
      await addInspect(param);
      const res2 = await selectInspectsListById({ id : 59});
      this.resultData = res2.data;
      this.inspectionForm = res2.data;
      this.inspectionItems = res2.data.insProducts;

    },
    // 获取分页列表数据
    async getRawMaterialList(){
      const res = await getRawMaterialList({pageNo: this.currentPage,pageSize:this.pageSize})
      // console.log(res)
      this.inspectionTable = res.data.row
      this.data = res.data.row
      console.log(res.data.row);
      this.total = res.data.total
    },
    async search(){
@@ -398,7 +441,6 @@
        pageNo: this.currentPage,
        pageSize: this.pageSize
      })
      // console.log(res)
      this.inspectionTable = res.data.row
      this.data = res.data.row
      this.total = res.data.total
@@ -414,7 +456,6 @@
    },
    radioclick(){
      this.searchData.state = this.radioValue
      // console.log(this.radioValue)
      this.inspectionTable = this.data.filter((item)=>{
        return item.condition === this.radioValue
      })
@@ -425,13 +466,11 @@
    },
    // 每页条数改变时触发 选择一页显示多少行
    handleSizeChange(val) {
      console.log(`每页 ${val} 条`)
      this.pageSize = val
      this.getRawMaterialList({pageNo: this.currentPage,pageSize:this.pageSize})
    },
    // 当前页改变时触发 跳转其他页
    handleCurrentChange(val) {
      console.log(`当前页: ${val}`)
      this.currentPage = val
      this.getRawMaterialList({pageNo: this.currentPage,pageSize:this.pageSize})
    }
@@ -439,7 +478,7 @@
}
</script>

<style scoped>
<style scoped lang="scss">
.content-main{
  height: 100%;
  .top-bar{

 src/views/login/index.vue

@@ -135,9 +135,9 @@
        </el-form>
        <div class="sao">微信扫码登录</div>
        <div class="copyright">
          <p>江东金具设备有限公司</p>
          <p>版权所有Copyright ©️ 2012-2021 ZTT.All Rights Reserved.</p>
          <p>[苏ICP备10047815号-1]</p>
          <!-- <p>有限公司</p>
          <p>版权所有Copyright ©️ </p>
          <p>[苏ICP备10047815号-1]</p> -->
        </div>
      </div>
    </div>