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

zouyu

2023-08-30 a970199e2417318743ca3f7852dca896906ac574

 src/views/inspectionManagement/commissionInspection/addCommision.vue

@@ -21,13 +21,11 @@
                  :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>
@@ -37,11 +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" @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>
@@ -101,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>
@@ -174,7 +173,8 @@
                     </el-col>
                     <el-col :span="11">
                        <el-form-item label="规格型号：">
                           <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="请先选择样品名称" @change="getProductList">
                           <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>
@@ -194,7 +194,7 @@
                     </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, ai) in productList" :label="expers"
@@ -202,7 +202,7 @@
                           </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" />
@@ -227,7 +227,8 @@
      getlink,
      addInspection,
      isIfViewUUID,
      getProductList
      getProductList,
      getContractsSampleInfo
   } from '@/api/inspection/commisioninspection'
   export default {
      data() {
@@ -272,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: [],
@@ -302,12 +294,12 @@
      watch: {
         addPointerForm: {
            handler: function(val) {
               if(val.addway!=""){
               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{
                  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
                           }
@@ -340,6 +332,8 @@
               if (!res.data) {
                  this.$message.error('当前链接不在有效期内,系统自动关闭')
                  this.$router.push('/404')
               } else {
                  this.getContractsSampleInfo()
               }
            })
         },
@@ -371,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)
@@ -412,7 +404,7 @@
            this.infoForm.commisioncode = res.data
            if (res.data) {
               this.$message({
                  message: '恭喜你!',
                  message: '添加成功!',
                  type: 'success'
               })
               this.showDetail = true
@@ -426,8 +418,8 @@
         handleCurrentChange(pageNo) {
            this.pageParams.pageNo = pageNo
         },
         deleteRow(row) {

         deleteRow(index, rows) {
            rows.splice(index, 1);
         },
         upMaterialName(val) {
            this.sampleoptions.forEach(a => {
@@ -437,12 +429,36 @@
            })
            this.getModelSpecification(val)
         },
         getProductList(val){
            getProductList({modelId: val}).then(res=>{
               this.productList = res.data.map(item=>{
         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
            })
         }
      }
   }