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

zouyu

2023-08-30 a970199e2417318743ca3f7852dca896906ac574

Merge branch 'master' of http://192.168.110.209: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.110.167:1234/'
VUE_APP_BASE_API = 'http://localhost:1234/'


 .env.staging

@@ -5,6 +5,6 @@

# base api
# VUE_APP_BASE_API = '/stage-api'
VUE_APP_BASE_API = 'http://192.168.110.167:1234/'
VUE_APP_BASE_API = 'http://localhost:1234/'



 src/App.vue

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

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


 src/api/inspection/commisioninspection.js

@@ -65,3 +65,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/components/experiment/checkTheReport/index.vue

@@ -73,6 +73,7 @@
</template>
<script>
export default({
    name: 'Preview',
    data() {
        return {
            logoSrc : require("@/assets/404_images/logo.png"),    

 src/components/experiment/template_testReport/index.vue

ÎļþÃû´Ó src/views/template_testReport/index.vue ÐÞ¸Ä
@@ -30,7 +30,7 @@
          <div class="name">
            <div style="width:140px; text-align-last: justify;">
            <div>委托单位</div>
            <span style="font-size: 14px;display: block;margin: 10px 50px 0px;">Client</span>
            <span style="font-size: 14px;display: block;margin: 10px 45px 0px;">Client</span>
          </div>
            <div class="line"> æµ‹è¯•åç§°</div>
          </div>
@@ -469,9 +469,8 @@

<script>
export default {
  props:{

  },
  name:'TestReport',
  props:["reportData"],
  data(){
    return {
      resultTable:[
@@ -500,15 +499,13 @@

<style lang="scss" scoped>
.content-wrapper{
  background-color: #f0f2f5;
  width: 100%;
  height: 100vh;
  overflow-y: auto;
  // background-color: #f0f2f5;
  // width: 100%;
  // height: 100vh;
  // overflow-y: auto;
  .content-main{
    margin: -50px auto;
    width: 50%;
    // background-color: #fff;
    // background-color: #bfa;
    margin: -100px auto;
    width: 90%;
    .cover{
      margin: 80px 0px;
      padding:0px 50px;

 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 }
        }
      ]
    },
@@ -590,7 +596,7 @@
    Routees = baseRouter
  }
  return new Router({
    // mode: 'history', // require service support
    mode: 'history', // require service support
    scrollBehavior: () => ({ y: 0 }),
    routes: Routees
  })
@@ -602,7 +608,14 @@
  let newRouter = createRouter(getRoutes())
  router.matcher =  newRouter.matcher
}
router.beforeEach(async (to, from, next) => {
router.beforeEach((to, from, next) => {
  /**
   * å§”托新增  æ”¾è¡Œ
   */
  if (to.path.indexOf("/addCommision/") === 0) {
    next()
    return
  }
  // 1. åˆ¤æ–­æ˜¯ä¸æ˜¯ç™»å½•é¡µé¢
  // æ˜¯ç™»å½•é¡µé¢
  if (to.path === '/login') {
@@ -612,7 +625,7 @@
    // 2. åˆ¤æ–­ æ˜¯å¦ç™»å½•è¿‡
    let token = sessionStorage.getItem('user')
    if(token!=null&&token!=undefined){
      await resetRouter()
      resetRouter()
    }
    token ? next() : next('/login')
  }

 src/views/experiment/checkTheReport/index.vue

@@ -60,8 +60,8 @@
          <el-button type="primary" @click="printFun()">打印</el-button>
        </span>
        <div class="printStyle">
          <preview id="printDiv" :reportData="reportData" v-if="reportType===0"></preview>
          <div v-else>成品检测报告</div>
          <Preview id="printRaw" :reportData="reportData" v-if="reportType===0"></Preview>
          <TestReport id="printFinished" :reportData="reportData" v-else></TestReport>
        </div>
      </el-dialog>
      <div class="table-box">
@@ -182,6 +182,7 @@
<script>
import { selectAllReport,getReportData } from "@/api/experiment/checkTheReport";
import Preview from "@/components/experiment/checkTheReport/index.vue";
import TestReport from "@/components/experiment/template_testReport/index.vue"
import PrintJS from 'print-js'
export default {
  data() {
@@ -194,7 +195,26 @@
        application_code: ''
      },
      checkStatus: undefined,
      reportTable: [],
      reportTable: [
        {
          materialCode:'SN23-0517001',
          reportCode: 'SN23-0517001',
          inspectionCode: 'SN23-0517001',
          approver:'黄小明',
          status: '',
          conclusion: 1,
          name: '黄小明'
        },
        {
          materialCode:'SN23-0517001',
          reportCode: 'SN23-0517001',
          inspectionCode: 'SN23-0517001',
          approver:'黄小明',
          status: '',
          conclusion: 1,
          name: '黄小明'
        }
      ],
      page: 1,
      total: 0,
      pageSize: 10,
@@ -203,12 +223,13 @@
    };
  },
  created() {
    this.getData();
    // this.getData();
  },
  mounted(){
  },
  components:{
    Preview
    Preview,
    TestReport
  },
  methods: {
    async queryReportByRCode(code){
@@ -219,6 +240,7 @@
    },
    //查看报告按钮
    previewFun(row){
      console.log(row)
      this.reportType = row.type;
      this.queryReportByRCode(row.reportCode);
    },
@@ -226,7 +248,7 @@
    printFun(){
      this.dialogVisible = false;
      PrintJS({
        printable: "printDiv",
        printable: this.reportType===0 ? "printRaw" : "printFinished",
        type: "html",
        // header: "原材料检测报告",
        targetStyles: ["*"],

 src/views/experiment/inspectionApplication/index.vue

@@ -5,32 +5,20 @@
          <div class="top-bar">
            <el-form ref="form" :inline="true" :model="searchData">
              <el-form-item label="申请单号:">
                <el-input
                  v-model="searchData.applicationnumber"
                  class="input-form"
                  placeholder="请输入申请单号"
                  style="width: 200px; margin-right: 20px;"
                >
                            <el-input v-model="searchData.applicationnumber" class="input-form" placeholder="请输入申请单号"
                                style="width: 200px; margin-right: 20px;">
                <i slot="prefix" class="el-input__icon el-icon-search" />
                </el-input>
              </el-form-item>
              <el-form-item label="检验类型:">
                <el-select v-model="searchData.type" placeholder="全部" style="width: 100px;margin-right: 20px;">
                  <el-option
                    v-for="item in typeoptions"
                    :key="item.value"
                    :label="item.label"
                    :value="item.value">
                                <el-option v-for="item in typeoptions" :key="item.value" :label="item.label" :value="item.value">
                  </el-option>
                </el-select>
              </el-form-item>
              <el-form-item label="检验结果:" style="margin-right: 20px;">
                <el-select v-model="searchData.state" placeholder="全部" style="width: 100px;margin-right: 20px;">
                  <el-option
                    v-for="item in stateoptions"
                    :key="item.value"
                    :label="item.label"
                    :value="item.value">
                                <el-option v-for="item in stateoptions" :key="item.value" :label="item.label" :value="item.value">
                  </el-option>
                </el-select>
              </el-form-item>
@@ -41,10 +29,12 @@
            </el-form>
            <el-form class="rightBtn">
              <el-form-item class="createBtn">
                <el-button type="primary" icon="el-icon-document-add" @click="checkTypeVisible = true" style="background-color: rgb(1, 102, 226);">新增检验单</el-button>
                            <el-button type="primary" icon="el-icon-document-add" @click="checkTypeVisible = true"
                                style="background-color: rgb(1, 102, 226);">新增检验单</el-button>
              </el-form-item>
              <el-form-item class="getDataBtn">
                <el-button type="primary" icon="el-icon-download" style="background-color: rgb(1, 102, 226);">导出检验单</el-button>
                            <el-button type="primary" icon="el-icon-download"
                                style="background-color: rgb(1, 102, 226);">导出检验单</el-button>
              </el-form-item>
            </el-form>
          </div>
@@ -60,98 +50,36 @@
              </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%"
              >
                <el-table-column
                  type="selection"
                  min-width="30px"
                />
                <el-table-column
                  prop="icode"
                  label="申请单号"
                  min-width="100px"
                />
                <el-table-column
                  prop="type"
                  label="检验类型"
                  min-width="80px">
                            :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">
                  <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>
                  </template>
                </el-table-column>
                <el-table-column
                  prop="formTime"
                  label="来料日期"
                  min-width="100px"
                />
                <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"
                />
                <el-table-column
                  prop="specifications"
                  label="规格型号"
                  min-width="160px"
                />
                <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">
                            <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" />
                            <el-table-column prop="specifications" label="规格型号" min-width="160px" />
                            <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="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>
                                        disable-transitions>{{ scope.row.inspection_status === 0 ? '不合格' : '合格' }}</el-tag>
                  </template>
                </el-table-column>
                <el-table-column
                  prop="checkdate"
                  label="检验日期"
                  min-width="150px"
                />
                <el-table-column
                  label="操作"
                  min-width="150"
                  fixed="right"
                >
                            <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">
                    <el-button type="text" size="small" @click="handleClick(scope.row)">查看</el-button>
                    <!-- <el-button type="text" size="small" >提交</el-button> -->
@@ -161,87 +89,82 @@
              </el-table>
              <!-- åˆ†é¡µå™¨ -->
              <div>
                <el-pagination
                  class="pagination"
                  :current-page="currentPage"
                  :page-sizes="[ 10, 20, 30,40]"
                  :page-size="pageSize"
                  layout="total, sizes, prev, pager, next, jumper"
                  :total="total"
                  @size-change="handleSizeChange"
                  @current-change="handleCurrentChange"
                />
                            <el-pagination class="pagination" :current-page="currentPage" :page-sizes="[ 10, 20, 30,40]"
                                :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"
                                @size-change="handleSizeChange" @current-change="handleCurrentChange" />
              </div>
            </div>
          </div>
          <!-- å¯¹è¯æ¡† -->
          <div class="checkType">
            <el-dialog
              title="新增检验单"
              :visible.sync="checkTypeVisible"
              width="50%"
                            top="10vh"
            >
                    <el-dialog title="新增检验单" :visible.sync="checkTypeVisible" width="50%" top="10vh">
              <div class="check-box">
                <el-radio-group v-model="type" @click.native="handleRadioChange">
                  <el-radio :style="`background-color: ${type==0?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="0" border>原材料检验</el-radio>
                  <el-radio :style="`background-color: ${type==1?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="1" border>委托检验</el-radio>
                  <el-radio :style="`background-color: ${type==2?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="2" border>成品检验</el-radio>
                                <el-radio :style="`background-color: ${type==0?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`"
                                    :label="0" border>原材料检验</el-radio>
                                <el-radio :style="`background-color: ${type==1?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`"
                                    :label="1" border>委托检验</el-radio>
                                <el-radio :style="`background-color: ${type==2?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`"
                                    :label="2" border>成品检验</el-radio>
                </el-radio-group>
              </div>
              <div v-if="type === 0">
                <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="medium">
                            <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px"
                                size="medium">
                  <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="来料日期：">
                              <el-input style="width: 300px" type="text" :value="infoForm.startTime" placeholder="请输入来料日期" autocomplete="off" />
                                            <!-- <el-input style="width: 300px" type="text" :value="infoForm.startTime" placeholder="请输入来料日期" autocomplete="off" /> -->
                                            <el-date-picker style="width: 300px" v-model="infoForm.formTime" type="date" placeholder="选择日期">
                                            </el-date-picker>
                          </el-form-item>
                      </el-col>
                      <el-col :span="10">
                          <el-form-item label="供应商名称：">
                              <el-input style="width: 300px" type="text" :value="infoForm.supplierName" placeholder="请输入供应商名称" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" :value="infoForm.supplier" placeholder="请输入供应商名称"
                                                autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      </el-row>
                      <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="原材料编码：">
                              <el-input style="width: 300px"  type="text" :value="infoForm.mcode" placeholder="请输入原材料编码" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" :value="infoForm.mcode" placeholder="请输入原材料编码"
                                                autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      <el-col :span="10">
                          <el-form-item label="原材料名称：">
                              <el-input style="width: 300px" type="text" :value="infoForm.name" placeholder="请输入原材料名称" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" :value="infoForm.name" placeholder="请输入原材料名称"
                                                autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      </el-row>
                      <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="规格型号：">
                              <el-input style="width: 300px" type="text" :value="infoForm.specifications" placeholder="请输入规格型号" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" :value="infoForm.specifications" placeholder="请输入规格型号"
                                                autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      <el-col :span="10">
                          <el-form-item label="单位：">
                              <el-input style="width: 300px" type="text" :value="infoForm.unit" placeholder="请输入单位" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" :value="infoForm.unit" placeholder="请输入单位"
                                                autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      </el-row>
                      <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="数量：">
                              <el-input style="width: 300px" type="text" :value="infoForm.num" placeholder="请输入数量" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" :value="infoForm.num" placeholder="请输入数量"
                                                autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      <el-col :span="10">
                          <el-form-item label="检验时间：">
                              <el-date-picker
                                  v-model="infoForm.endTime"
                                  type="daterange"
                                  range-separator="至"
                                  start-placeholder="开始日期"
                                  end-placeholder="结束日期"
                                  style="width: 300px;">
                                            <el-date-picker v-model="infoForm.endTime" type="daterange" range-separator="至"
                                                start-placeholder="开始日期" end-placeholder="结束日期" style="width: 300px;">
                              </el-date-picker>
                          </el-form-item>
                      </el-col>
@@ -249,58 +172,61 @@
                </el-form>
              </div>
              <div v-if="type === 1">
                <el-form :model="commisionSelection" ref="commisionSelection" class="checkTypeForm" label-position="top" label-width="200px" size="mini">
                            <el-form :model="commisionSelection" ref="commisionSelection" class="checkTypeForm" label-position="top"
                                label-width="200px" size="mini">
                  <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="委托编号">
                              <el-input style="width: 300px" type="text" :value="commisionSelection.entrust_coding" placeholder="请输入来料日期" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" :value="commisionSelection.entrust_coding"
                                                placeholder="请输入来料日期" autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      <el-col :span="10">
                          <el-form-item label="委托单位">
                              <el-input style="width: 300px" type="text" :value="commisionSelection.supplier" placeholder="请输入委托单位" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" :value="commisionSelection.supplier"
                                                placeholder="请输入委托单位" autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      </el-row>
                      <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="样品编号">
                              <el-input style="width: 300px" type="text" :value="commisionSelection.mcode" placeholder="请输入样品编号" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" :value="commisionSelection.mcode" placeholder="请输入样品编号"
                                                autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      <el-col :span="10">
                          <el-form-item label="样品名称">
                              <el-input style="width: 300px" type="text" :value="commisionSelection.name" placeholder="请输入样品名称" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" :value="commisionSelection.name" placeholder="请输入样品名称"
                                                autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      </el-row>
                      <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="规格型号：">
                              <el-input style="width: 300px" type="text" :value="commisionSelection.specifications" placeholder="请输入型号规格" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" :value="commisionSelection.specifications"
                                                placeholder="请输入型号规格" autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      <el-col :span="10">
                          <el-form-item label="送达时间">
                            <el-input style="width: 300px" type="text" :value="commisionSelection.supplier" placeholder="请输入单位" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" :value="commisionSelection.supplier"
                                                placeholder="请输入单位" autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      </el-row>
                      <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="完成期限">
                            <el-input style="width: 300px" type="text" :value="commisionSelection.completionDeadline" placeholder="请输入数量" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" :value="commisionSelection.completionDeadline"
                                                placeholder="请输入数量" autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      <el-col :span="10">
                          <el-form-item label="检验日期：">
                            <el-date-picker
                                  v-model="commisionSelection.checkdate"
                                  type="daterange"
                                  range-separator="至"
                                  start-placeholder="开始日期"
                                  end-placeholder="结束日期"
                                  style="width: 300px;">
                                            <el-date-picker v-model="commisionSelection.checkdate" type="daterange" range-separator="至"
                                                start-placeholder="开始日期" end-placeholder="结束日期" style="width: 300px;">
                            </el-date-picker>
                          </el-form-item>
                      </el-col>
@@ -308,58 +234,61 @@
                </el-form>
              </div>
              <div v-if="type === 2">
                <el-form :model="finishedTable" ref="finishedTable" class="checkTypeForm" label-position="top" label-width="200px" size="mini">
                            <el-form :model="finishedTable" ref="finishedTable" class="checkTypeForm" label-position="top"
                                label-width="200px" size="mini">
                  <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="来料日期：">
                              <el-input style="width: 300px" type="text" v-model="finishedTable.deliverydate" placeholder="请输入来料日期" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.deliverydate"
                                                placeholder="请输入来料日期" autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      <el-col :span="10">
                          <el-form-item label="供应商名称：">
                              <el-input style="width: 300px" type="text" v-model="finishedTable.supplier" placeholder="请输入供应商名称" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.supplier" placeholder="请输入供应商名称"
                                                autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      </el-row>
                      <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="原材料编码：">
                              <el-input style="width: 300px" type="text" v-model="finishedTable.code" placeholder="请输入原材料编码" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.code" placeholder="请输入原材料编码"
                                                autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      <el-col :span="10">
                          <el-form-item label="原材料名称：">
                              <el-input style="width: 300px" type="text" v-model="finishedTable.name" placeholder="请输入原材料名称" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.name" placeholder="请输入原材料名称"
                                                autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      </el-row>
                      <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="规格型号：">
                              <el-input style="width: 300px" type="text" v-model="finishedTable.modelandspecification" placeholder="请输入规格型号" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.modelandspecification"
                                                placeholder="请输入规格型号" autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      <el-col :span="10">
                          <el-form-item label="单位：">
                              <el-input style="width: 300px" type="text" v-model="finishedTable.unit" placeholder="请输入单位" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.unit" placeholder="请输入单位"
                                                autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      </el-row>
                      <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="数量：">
                              <el-input style="width: 300px" type="text" v-model="finishedTable.amount" placeholder="请输入数量" autocomplete="off" />
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.amount" placeholder="请输入数量"
                                                autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      <el-col :span="10">
                          <el-form-item label="检验时间：">
                              <el-date-picker
                                  v-model="finishedTable.checkdate"
                                  type="daterange"
                                  range-separator="至"
                                  start-placeholder="开始日期"
                                  end-placeholder="结束日期"
                                  style="width: 300px;">
                                            <el-date-picker v-model="finishedTable.checkdate" type="daterange" range-separator="至"
                                                start-placeholder="开始日期" end-placeholder="结束日期" style="width: 300px;">
                              </el-date-picker>
                          </el-form-item>
                      </el-col>
@@ -374,77 +303,44 @@
            </el-dialog>
          </div>
        </div>

        <!-- ç¡®å®šè·³è½¬åŸºæœ¬åº“弹窗 -->
        <el-dialog
              title="标准库"
              :visible.sync="Standardframe"
              width="49%"
              >
            <el-dialog title="标准库" :visible.sync="Standardframe" width="49%">
              <el-card>
                  <template slot-scope="scope" >
                    <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-option v-for="item in BANben" :key="item" :label="item" :value="item"></el-option>
                            </el-select>
                  </template>
              </el-card>
                <el-table
                    :data="tableData"
                    style="width: 100%; margin-bottom: 20px"
                    row-key="id"
                    border
                    height="calc(80vh - 250px)"
                    default-expand-all
                    ref="multipleTable"
                    :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
                  >
                <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border
                    height="calc(80vh - 250px)" default-expand-all ref="multipleTable"
                    :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
                    <el-table-column type="selection" label="序号"> </el-table-column>
                    <el-table-column
                      type="index"
                      width="50px"
                      label="序号"
                    ></el-table-column>
                    <el-table-column type="index" width="50px" label="序号"></el-table-column>
                    <el-table-column label="项目名称" sortable>
                      <template scope="scope">
                        <el-tag
                          ><div
                            class="firstDiv"
                            :style="`color: ${
                            <el-tag>
                                <div class="firstDiv" :style="`color: ${
                              scope.row.code == '[1]' ? '#16a7ff' : '#58c173'
                            }`"
                          >
                            }`">
                            {{ scope.row.code == "[1]" ? "01" : "02" }}
                          </div>
                       <span style="color: black">{{ scope.row.name }}</span></el-tag
                        >
                                <span style="color: black">{{ scope.row.name }}</span>
                            </el-tag>
                      </template>
                    </el-table-column>
                    <el-table-column
                      prop="unit"
                      label="单位"
                      sortable
                    ></el-table-column>
                    <el-table-column prop="unit" label="单位" sortable></el-table-column>
                    <el-table-column label="标准值" sortable>
                      <template scope="scope">
                        <el-input
                          v-if="scope.row.edit === true || scope.row.code === '[2]'"
                          @blur="requiredOnfocus(scope)"
                          v-model="scope.row.required"
                          placeholder="请输入标准值"
                        ></el-input>
                            <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'" @blur="requiredOnfocus(scope)"
                                v-model="scope.row.required" placeholder="请输入标准值"></el-input>
                      </template>
                    </el-table-column>
                    <el-table-column prop="internal" label="内控值" sortable>
                      <template scope="scope">
                        <el-input
                          v-if="scope.row.edit === true || scope.row.code === '[2]'"
                          @blur="requiredOnfocus(scope)"
                          v-model="scope.row.internal"
                          placeholder="请输入内控值"
                        ></el-input>
                            <el-input v-if="scope.row.edit === true || scope.row.code === '[2]'" @blur="requiredOnfocus(scope)"
                                v-model="scope.row.internal" placeholder="请输入内控值"></el-input>
                      </template>
                    </el-table-column>
                  </el-table>
@@ -452,90 +348,28 @@
                <el-button @click="Standardframe = false">取 æ¶ˆ</el-button>
                <el-button type="primary" @click="GOfrom">ç¡® å®š</el-button>
            </span>

            </el-dialog>

        <!-- åŽŸææ–™æ£€éªŒæ¨¡æ€æ¡† -->
        <el-dialog
        title="原材料检验"
        :visible.sync="rawmaterialVisible"
        width="60%">
            <el-dialog title="原材料检验" :visible.sync="rawmaterialVisible" width="60%">
          <div class="table-box">
            <el-table
              ref="multipleTable"
              :max-height="800"
              :cell-style="{textAlign: 'center'}"
                    <el-table ref="multipleTable" :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="rawMaterialTable"
              style="width: 100%"
              @selection-change="handleSelectionChange"
            >
            <el-table-column
                type="selection"
                min-width="10%"
              />
              <el-table-column
                type="index"
                label="序号"
                min-width="8%"
              />
              <el-table-column
                prop="startTime"
                label="来料日期"
                min-width="8%"
              />
              <el-table-column
                prop="supplierName"
                label="供应商名称"
                min-width="12%"
              />
              <el-table-column
                prop="mcode"
                label="材料编码"
                min-width="8%"
              />
              <el-table-column
                prop="name"
                label="材料名称"
                min-width="8%"
              />
              <el-table-column
                prop="specifications"
                label="规格型号"
                min-width="12%"
              />
              <el-table-column
                prop="unit"
                label="单位"
                min-width="5%"
              />
              <el-table-column
                prop="num"
                label="数量"
                min-width="5%"
              />
              <el-table-column
                prop="endTime"
                label="报检日期"
                min-width="8%"
              />
              <el-table-column
                prop="supplier"
                label="检验人"
                min-width="8%"
              />
              <el-table-column
                prop="startTime"
                label="检验日期"
                min-width="8%"
              />
              <el-table-column
                prop="condition"
                label="状态"
                min-width="8%"
              >
                        :data="rawMaterialTable" style="width: 100%" @selection-change="handleSelectionChange">
                        <el-table-column type="selection" min-width="10%" />
                        <el-table-column type="index" label="序号" min-width="8%" />
                        <el-table-column prop="formTime" label="来料日期" min-width="8%" />
                        <el-table-column prop="supplier" label="供应商名称" min-width="12%" />
                        <el-table-column prop="mcode" label="材料编码" min-width="8%" />
                        <el-table-column prop="name" label="材料名称" min-width="8%" />
                        <el-table-column prop="specifications" label="规格型号" min-width="12%" />
                        <el-table-column prop="unit" label="单位" min-width="5%" />
                        <el-table-column prop="num" label="数量" min-width="5%" />
                        <el-table-column prop="endTime" label="报检日期" min-width="8%" />
                        <el-table-column prop="surveyor" label="检验人" min-width="8%" />
                        <el-table-column prop="startTime" label="检验日期" min-width="8%" />
                        <el-table-column prop="type" label="状态" min-width="8%">
              <template slot-scope="scope">
                <span :style="{ color: scope.row.state === 1 ? 'green' : 'red' }">
                                <span :style="{ color: scope.row.state === type ? 'green' : 'red' }">
                  {{ scope.row.state===1 ? '已检测':'待检测' }}
                </span>
              </template>
@@ -548,20 +382,11 @@
          </div>
        </el-dialog>
        <!-- å§”托检验模态框 -->
        <el-dialog
        title="委托检验"
        :visible.sync="commisionVisible"
        width="60%">
            <el-dialog title="委托检验" :visible.sync="commisionVisible" width="60%">
          <div class="table-box">
            <el-table
                ref="multipleTable"
                :max-height="800"
                :cell-style="{textAlign: 'center'}"
                    <el-table ref="multipleTable" :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="commisionTable"
                @selection-change="handleSelectionChange"
                style="width: 100%"
              >
                        :data="commisionTable" @selection-change="handleSelectionChange" style="width: 100%">
              <el-table-column type="selection" min-width="10%" />
                            <el-table-column type="index" label="序号" min-width="10%" />
                            <el-table-column prop="entrust_coding" label="委托编号" min-width="10%" />
@@ -603,10 +428,15 @@
  </template>

  <script>
  import { selectInspectsList, selectAll, addInspect,chooseVer,lookProByVer} from '@/api/experiment/planAssignments'
    import {
        selectInspectsList,
        selectAll,
        addInspect,
        chooseVer,
        lookProByVer
    } from '@/api/experiment/planAssignments'
  export default {
    data() {

      return {
        showDetail: false,
        searchData: {
@@ -669,13 +499,13 @@
        }],
        currentPage: 1,
        total: 20, // æ€»æ¡æ•°
        pageSize: 8, // æ¯é¡µçš„数据条数
                pageSize: 10, // æ¯é¡µçš„数据条数
        radioValue: '全部',
        checkTypeVisible: false,
        type: 0, // é»˜è®¤ä¸é€‰ä¸­çš„状态
        rawmaterialVisible: false,
        commisionVisible: false,
        tmp: '',
                tmp: {},
        Standardframe: false,
                tableData: [],
        tableRow:{},
@@ -687,8 +517,6 @@
    watch: {
      $route: {
        handler(val, oldval) {
          console.log(val)// æ–°è·¯ç”±ä¿¡æ¯
          console.log(oldval)// è€è·¯ç”±ä¿¡æ¯
        },
        // æ·±åº¦è§‚察监听
        deep: true
@@ -702,19 +530,26 @@
    },
    methods: {
      async selectAll(){
        const res = selectAll({type:0})
        // console.log(res);
                const res = selectAll({
                    type: 0
                })
        this.rawMaterialTable = res.data
      },
      async selectAll(){
        const res = selectAll({type:2})
        // console.log(res);
                const res = selectAll({
                    type: 2
                })
        this.commisionTable = res.data
      },
      async handleClick(row){
        // this.inspectionTable = row;
                this.inspectionTable = row;
        this.id = row.id
        this.$router.push({name:'Viewdetails',query: {id:row.id}});
                this.$router.push({
                    name: 'Viewdetails',
                    query: {
                        id: row.id
                    }
                });
        this.selectInspectsList()
      },
      // validateInput() {
@@ -726,16 +561,12 @@
     
      //版本库
      async chooseVer() {
        console.log(this.tmp.materialCoding);
        console.log(this.tmp.materialName);
        console.log(this.tmp.specificationsModels);
        const res = await chooseVer ({
          mcode:this.tmp.mcode,
          name:this.tmp.name,
          specifications:this.tmp.specifications
         })
         this.BANben = res.data
         console.log(res.data);
         this.aa = this.BANben[0]
         this.lookProByVer()
      },
@@ -747,19 +578,20 @@
          specifications:this.tmp.specifications,
          version:this.aa
        })
        console.log(res);
        this.tableData = res.data
      },
      ccc(val){
        // console.log(val);
        this.aa = val
        this.lookProByVer()
      },
      async selectInspectsList() {
        // èŽ·å–分页列表
        const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage,message:this.id})
                const res = await selectInspectsList({
                    countSize: this.pageSize,
                    pageSize: this.currentPage,
                    message: this.id
                })
        // this.inspectionTable = data
        // console.log(res.data.row)
        const data = res.data.row
        data.forEach((item) => {
          var formTime = item["DATE_FORMAT(`form_time`,'%Y-%m-%d')"]
@@ -775,7 +607,11 @@
        this.total = res.data.total
      },
      async searchInspections(){
        const res = await selectInspectsList({countSize:this.pageSize,pageSize:this.currentPage,message:this.searchData.applicationnumber})
                const res = await selectInspectsList({
                    countSize: this.pageSize,
                    pageSize: this.currentPage,
                    message: this.searchData.applicationnumber
                })
        var data = res.data.row
        data.forEach((item) => {
          var formTime = item["DATE_FORMAT(`form_time`,'%Y-%m-%d')"]
@@ -820,7 +656,6 @@
        this.$refs.multipleTable.toggleRowSelection(val.pop())
      }
      this.tmp = val[0]
      // console.log(this.tmp);
    },
    handleCommisionSelection(){
      this.commisionSelection = this.tmp
@@ -828,8 +663,6 @@
    },
    handleRawMaterialSelection(){
      this.infoForm = this.tmp
      // console.log(this.infoForm);

      this.rawmaterialVisible = false
    },
    handleRadioChange(){
@@ -837,8 +670,9 @@
                if(this.type === 0){
        // åŽŸææ–™æŠ¥æ£€
        this.rawmaterialVisible = true
        selectAll({type:0}).then(res=>{
          // console.log(res);
                        selectAll({
                            type: 0
                        }).then(res => {
        //   var data = res.data
        // data.forEach((item)=>{
        //   var checkdate = []
@@ -846,7 +680,6 @@
        //   checkdate.push(item['updateTime'])
        //   item['checkdate'] = checkdate // æ£€éªŒæ—¥æœŸ
        // })
        console.log(res);
        this.rawMaterialTable = res.data
        })
        
@@ -854,7 +687,9 @@
        // this.$router.push({ name: 'ReportForInspection' });
      }else if(this.type === 1){
                  this.commisionVisible = true
          selectAll({type:2}).then(res=>{
                        selectAll({
                            type: 2
                        }).then(res => {

          this.commisionTable = res.data
                  })
@@ -864,7 +699,8 @@
    // æ–°å¢žæ£€éªŒ
    async addInspection(){
      if(this.type === 0){
        await addInspect({endTime: this.infoForm.checkdate[1],
                    await addInspect({
                        endTime: this.infoForm.checkdate[1],
          formTime: this.infoForm.dateSurvey,
          mcode: this.infoForm.materialCoding,
          name: this.infoForm.materialName,
@@ -873,11 +709,12 @@
          startTime: this.infoForm.checkdate[0] ,
          supplier: this.infoForm.supplierName,
          type: this.type,
          unit: this.infoForm.unit})
                        unit: this.infoForm.unit
                    })
      }
      if(this.type === 1){
        console.log(this.commisionSelection)
        const res = await addInspect({endTime: this.commisionSelection.checkdate[1],
                    const res = await addInspect({
                        endTime: this.commisionSelection.checkdate[1],
          formTime: this.commisionSelection.formTime,
          mcode: this.commisionSelection.mcode,
          name: this.commisionSelection.name,
@@ -886,12 +723,12 @@
          startTime: this.commisionSelection.checkdate[0] ,
          supplier: this.commisionSelection.supplier,
          type: this.type,
          unit: this.commisionSelection.unit})
          console.log('res',res)
                        unit: this.commisionSelection.unit
                    })
      }
      if(this.type === 2){
        console.log(this.finishedTable)
        const res = await addInspect({ endTime: '2023-08-15',
                    const res = await addInspect({
                        endTime: '2023-08-15',
          formTime: this.finishedTable.deliverydate,
          mcode: this.finishedTable.code,
          name: this.finishedTable.name,
@@ -900,7 +737,8 @@
          startTime: '2023-08-14',
          supplier: this.finishedTable.supplier,
          type: this.type,
          unit: this.finishedTable.unit })
                        unit: this.finishedTable.unit
                    })
      }
      this.type = 0
      this.checkTypeVisible = false
@@ -911,14 +749,12 @@
    },
      // æ¯é¡µæ¡æ•°æ”¹å˜æ—¶è§¦å‘ é€‰æ‹©ä¸€é¡µæ˜¾ç¤ºå¤šå°‘è¡Œ
      handleSizeChange(val) {
        console.log(`每页 ${val} æ¡`)
        // this.currentPage = 1
        this.pageSize = val
        this.selectInspectsList()
      },
      // å½“前页改变时触发 è·³è½¬å…¶ä»–页
      handleCurrentChange(val) {
        console.log(`当前页: ${val}`)
        this.currentPage = val
        this.selectInspectsList()
      },
@@ -934,10 +770,6 @@
      //確定詳情頁
      GOfrom( ){
        this.Standardframe = false
        // console.log(this.tmp.materialCoding);
        // console.log(this.tmp.materialName);
        // console.log(this.tmp.specificationsModels);
        // console.log(this.aa)
        // const data = {
        //   // mcode : this.tmp.mcode,
        //   // name:this.tmp.name,
@@ -945,7 +777,12 @@
        //   version:this.tmp.id
        // }
          
        this.$router.push({name:'Viewdetails',query:{id:this.tmp.id}})
                this.$router.push({
                    name: 'Viewdetails',
                    query: {
                        id: this.tmp.id
                    }
                })

      },
    }
@@ -958,24 +795,30 @@
      .el-radio-group{
        display: flex;
        justify-content: space-around;

        .el-radio{

          // display: flex;
          // align-items: center;
          &.is-checked{
            background: #ecf5ff;
            border-color: #b3d8ff;

           ::v-deep  .el-radio__label{
              color: #333 !important;

            }
          }

          height: auto;
          font-size: 22px !important;
          padding: 40px 50px !important;

          ::v-deep  .el-radio__label{
            font-size: 22px !important;
            padding-left: 0px !important;
          }

          ::v-deep  .el-radio__input{
          display: none !important;
        }
@@ -983,12 +826,14 @@
   }
    }
  }

   .content-main{
      width: 100%;
      height: 100%;
      display: flex;
      flex-direction: column;
    }

    .top-bar{
      margin: -25px -15px;
      background: #fff;
@@ -996,23 +841,29 @@
      justify-content: space-between;
      padding: 5px 24px 0px 24px;
    }

    .input-form{
      width: 500px;
    }

    .retrieval{
    float: right;
    font-size: 14px;
    color: rgb(0, 120, 255);
    line-height: 40px;
   }

   .rightBtn {
    display: flex;
    justify-content: flex-end;
  }

  .getDataBtn, .createBtn {
    margin-left: 10px; /* Optional: Add some space between the buttons */
    .getDataBtn,
    .createBtn {
        margin-left: 10px;
        /* Optional: Add some space between the buttons */
  }

  .library-table{
        background-color: #fff;
        flex: 1;
@@ -1021,14 +872,17 @@
        margin-top: 50px;
        display: flex;
        flex-direction: column;

        .table-header{
          padding: 20px;
          display: flex;
          justify-content: space-between;

          .el-form-item{
            margin-bottom: 30px !important;
          }
        }

        .table-box{
            padding: 0px 20px;
            margin-top: 20px;
@@ -1037,12 +891,15 @@
            // padding: 20px 20px 10px 20px;
            display: flex;
            flex-direction: column;

            .el-table {
              flex: 1;

              .tag{
                width: 80px;
              }
            }

            >div:nth-child(2){
              display: flex;
              justify-content: end;
@@ -1051,18 +908,22 @@
            }
        }
      }

.checkTypeForm{
    margin-top: 30px;
    margin-left: 50px;

    .el-row{
        margin-bottom: 10px;
    }
}

.pagination{
  display: flex;
  margin-top: 20px;
  justify-content: end;
}

.dialog-footer{
  display: flex;
  margin-top: 20px;

 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,41 +173,39 @@
                            </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_spe_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" />
                                </el-form-item>
                            </el-col>

                            <el-col :span="11">
                                <el-form-item label="样品数量：">
                                    <el-input type="text" v-model="addPointerForm.samplesNumber" placeholder="请输入数量" autocomplete="off" />
                                </el-form-item>
                            </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" />
                                    <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 20}" style="width: 200px;"
                                        v-model="addPointerForm.remarks" placeholder="请输入备注" autocomplete="off" />
                                </el-form-item>
                            </el-col>
                        </el-row>
@@ -231,7 +226,9 @@
        getModelSpecification,
        getlink,
        addInspection,
        isIfViewUUID
        isIfViewUUID,
        getProductList,
        getContractsSampleInfo
    } from '@/api/inspection/commisioninspection'
    export default {
        data() {
@@ -276,18 +273,11 @@
                    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: [],
                sampleDeliveryMode: [{
                    key: '1',
                    value: '送样'
@@ -297,7 +287,28 @@
                }],
                dialogueFormVisible: false,
                showDetail: false,
                viewId: null
                viewId: null,
                productList: []
            }
        },
        watch: {
            addPointerForm: {
                handler: function(val) {
                    if (val.addway != "") {
                        this.model_sta_options = []
                        this.model_options.forEach(a => {
                            if (a.specificationsName == val.addway) {
                                this.model_sta_options = a.children.map(item => {
                                    return {
                                        key: item.modelId,
                                        value: item.modelName
                                    }
                                })
                            }
                        })
                    }
                },
                deep: true
            }
        },
        created() {
@@ -321,6 +332,8 @@
                    if (!res.data) {
                        this.$message.error('当前链接不在有效期内,系统自动关闭')
                        this.$router.push('/404')
                    } else {
                        this.getContractsSampleInfo()
                    }
                })
            },
@@ -338,6 +351,7 @@
                const res = await getModelSpecification({
                    materialId: val
                })
                this.model_options = res.data
                this.model_spe_options = res.data.map((item) => {
                    return {
                        key: item.specificationsId,
@@ -351,8 +365,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)
@@ -392,11 +404,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)
@@ -408,8 +418,8 @@
            handleCurrentChange(pageNo) {
                this.pageParams.pageNo = pageNo
            },
            deleteRow(row) {

            deleteRow(index, rows) {
                rows.splice(index, 1);
            },
            upMaterialName(val) {
                this.sampleoptions.forEach(a => {
@@ -418,6 +428,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,6 +327,9 @@
                if (document.execCommand('copy')) {
                    this.$message.success('已复制到剪贴板')
                }
            },
            handleClick(row){
                console.log(row);
            }
        }
    }
@@ -338,7 +341,7 @@
        background: #fff;
        display: flex;
        justify-content: space-between;
        padding: 5px 24px 0px 24px;
        padding: 24px 24px 0px 24px;

        .sermargin {
            margin-right: 60px;

 src/views/inspectionManagement/reportForInspection/index.vue

@@ -428,10 +428,8 @@
    // èŽ·å–分页列表数据
    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(){
@@ -443,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
@@ -459,7 +456,6 @@
    },
    radioclick(){
      this.searchData.state = this.radioValue
      // console.log(this.radioValue)
      this.inspectionTable = this.data.filter((item)=>{
        return item.condition === this.radioValue
      })
@@ -470,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})
    }

 src/views/laboratory/ledger/index.vue

@@ -54,7 +54,7 @@
        <div class="table-box">
          <el-table ref="equipmentTable" node-key="father_name" :cell-style="{ textAlign: 'center' }"
            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
            :data="equipmentTable" style="width: 100%">
            :data="equipmentTable" style="width: 100%;">
            <el-table-column type="index" label="序号" min-width="90" />
            <el-table-column prop="equipment_code" label="仪器设备编号" min-width="200" />
            <el-table-column prop="equipment_name" label="仪器设备名称" min-width="150" />
@@ -68,7 +68,6 @@
              </template>
            </el-table-column>
            <el-table-column prop="storage_place" label="存放地" min-width="200" />

            <el-table-column label="操作" min-width="120" fixed="right">
              <template slot-scope="scope">
                <el-button type="text" size="small" @click="openDetail(scope.row)">编辑</el-button>
@@ -250,7 +249,7 @@
              <el-form-item label="所属分类：" prop="classifyId" label-width="80" :rules="[
                { required: true, message: '请选择所属分类', trigger: 'change' }
              ]">
                <el-cascader v-model="equipmentform.classifyId" :options="classTree" :show-all-levels="false" />
                <el-cascader style="width: 100%;" v-model="equipmentform.classifyId" :options="classTree" :show-all-levels="false" />
              </el-form-item>
            </el-col>
            <el-col :span="11">
@@ -1052,7 +1051,7 @@
    background: #fff;
    display: flex;
    justify-content: space-between;
    padding: 0 24px 12px 24px;
    padding: 15px 24px 12px 24px;

    .search-bar {
      .el-radio-button.is-active {
@@ -1088,6 +1087,7 @@
    .library-bom {
      flex: 2;
      margin-right: 12px;
            height: 80vh;

      .bom-item-search {
        margin-bottom: 12px;
@@ -1119,6 +1119,7 @@
      margin-left: 12px;
      display: flex;
      flex-direction: column;
            height: 80vh;

      .table-box {
        margin-top: 30px;

 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>