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

zouyu

2023-09-07 db582914c36d92de14098fff2274811a2696114d

 src/views/inspectionManagement/commissionInspection/addCommision.vue

@@ -15,44 +15,41 @@
          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%">
                  :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="speName" label="规格型号" min-width="10%">
                  </el-table-column>
                  <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>
                           <el-tag type="success" disable-transitions>扫描</el-tag>
                        </div>
                        <div v-if="scope.row.addway === 1">
                           <el-tag :type='primary' disable-transitions>录入</el-tag>
                           <el-tag type="primary" disable-transitions>录入</el-tag>
                        </div>
                        <div v-else></div>
                     </template>
                  </el-table-column>
                  <el-table-column prop="experiment" label="试验" min-width="8%" />
                  </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>
            </div>
            <div class="secondBox">
               <el-row class="header">
                  <el-col :span="12">基本信息</el-col>
                  <el-col :span="12" style="font-size: 16px;margin-bottom: 5px;">基本信息</el-col>
                  <el-col :span="12" style="text-align: right;">
                     <!-- 点击返回，当前页面值为false -->
                     <!-- <el-button type="primary" size="mini" style="background-color: rgb(1, 102, 226); ">打印委托单</el-button> -->
                  </el-col>
               </el-row>
               <el-form :model="infoForm" ref="infoForm" class="infoForm" label-position="right" label-width="100px"
@@ -61,50 +58,51 @@
                     <el-row :gutter="200">
                        <el-col :span="5">
                           <el-form-item label="委托编号：">
                              <el-input style="width: 160px" type="text" :value="infoForm.commisioncode" readonly disabled
                                 autocomplete="off" />
                              <el-input style="width: 200px" type="text" :value="infoForm.commisioncode" readonly disabled
                                 autocomplete="off" size="small" />
                           </el-form-item>
                        </el-col>
                        <el-col :span="5">
                           <el-form-item label="委托单位：">
                              <el-input style="width: 160px" v-model="infoForm.department" placeholder="请输入委托单位" />
                              <el-input style="width: 200px" v-model="infoForm.department" placeholder="请输入委托单位" size="small" />
                           </el-form-item>
                        </el-col>
                        <el-col :span="5">
                           <el-form-item label="联系人：">
                              <el-input style="width: 160px" v-model="infoForm.contacter" placeholder="请输入委托单位" />
                              <el-input style="width: 200px" v-model="infoForm.contacter" placeholder="请输入委托单位" size="small" />
                           </el-form-item>
                        </el-col>
                        <el-col :span="5">
                           <el-form-item label="联系电话：">
                              <el-input style="width: 160px" v-model="infoForm.tel" placeholder="请输入联系电话" />
                              <el-input style="width: 200px" v-model="infoForm.tel" placeholder="请输入联系电话" size="small" />
                           </el-form-item>
                        </el-col>
                     </el-row>
                     <el-row :gutter="200">
                        <el-col :span="5">
                           <el-form-item label="联系地址：">
                              <el-input style="width: 160px;" v-model="infoForm.address" placeholder="请输入联系地址"
                                 autocomplete="off" />
                              <el-input style="width: 200px;" v-model="infoForm.address" placeholder="请输入联系地址" autocomplete="off"
                                 size="small" />
                           </el-form-item>
                        </el-col>
                        <el-col :span="5">
                           <el-form-item label="完成期限：">
                              <el-date-picker v-model="infoForm.deadline" type="date" placeholder="选择日期" style="width: 160px;">
                              <el-date-picker v-model="infoForm.deadline" type="date" placeholder="选择日期" style="width: 200px;"
                                 size="small">
                              </el-date-picker>
                           </el-form-item>
                        </el-col>
                        <el-col :span="5">
                           <el-form-item label="送样时间：">
                              <el-date-picker v-model="infoForm.time" type="date" placeholder="选择日期" style="width: 160px;">
                              <el-date-picker v-model="infoForm.time" type="date" placeholder="选择日期" style="width: 200px;">
                              </el-date-picker>
                           </el-form-item>
                        </el-col>
                        <el-col :span="5">
                           <el-form-item label="送样方式：">
                              <el-select style="width: 160px;" 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-select style="width: 200px;" v-model="infoForm.way" size="small" placeholder="送样">
                                 <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>
@@ -112,23 +110,26 @@
                     <el-row :gutter="200">
                        <el-col :span="5">
                           <el-form-item label="送样人：">
                              <el-input style="width: 160px;" v-model="infoForm.sender" placeholder="请输入送样人" autocomplete="off" />
                              <el-input style="width: 200px;" v-model="infoForm.sender" placeholder="请输入送样人" autocomplete="off"
                                 size="small" />
                           </el-form-item>
                        </el-col>
                        <el-col :span="5">
                           <el-form-item label="送样人电话：">
                              <el-input style="width: 160px;" v-model="infoForm.sendertel" placeholder="请输入送样人电话"
                                 autocomplete="off" />
                              <el-input style="width: 200px;" v-model="infoForm.sendertel" placeholder="请输入送样人电话"
                                 autocomplete="off" size="small" />
                           </el-form-item>
                        </el-col>
                        <el-col :span="5">
                           <el-form-item label="报告数：">
                              <el-input style="width: 160px;" v-model="infoForm.num" placeholder="请输入报告数" autocomplete="off" />
                              <el-input type="number" min="0" style="width: 200px;" v-model="infoForm.num" placeholder="请输入报告数" autocomplete="off"
                                 size="small" />
                           </el-form-item>
                        </el-col>
                        <el-col :span="5">
                           <el-form-item label="委托备注：">
                              <el-input style="width: 160px;" v-model="infoForm.other" placeholder="备注" autocomplete="off" />
                              <el-input style="width: 200px;" v-model="infoForm.other" placeholder="备注" autocomplete="off"
                                 size="small" />
                           </el-form-item>
                        </el-col>
                     </el-row>
@@ -143,64 +144,69 @@
            </div>
         </div>
         <div class="checkType">
            <el-dialog title="添加指标" :visible.sync="dialogueFormVisible" width="40%">
            <el-dialog title="添加样品" :visible.sync="dialogueFormVisible" width="40%" top="30vh">
               <el-form :model="addPointerForm" ref="addPointerForm" class="addPointerForm" label-position="right"
                  label-width="100px" size="mini">
                  <el-row :gutter="50">
                     <el-col :span="10">
                     <el-col :span="11">
                        <el-form-item label="样品编号：">
                           <el-input style="width: 160px;" v-model="addPointerForm.sampleNumber" size="small" disabled>
                           <el-input v-model="addPointerForm.sampleNumber" size="small" disabled>
                           </el-input>
                        </el-form-item>
                     </el-col>
                     <el-col :span="10">
                     <el-col :span="11">
                        <el-form-item label="样品名称：">
                           <el-select style="width: 160px;" v-model="addPointerForm.sampleName" size="small"
                              placeholder="请选择样品名称" @change="upMaterialName">
                              <el-option v-for="options in sampleoptions" :value="options.key"
                                 :label="options.value"></el-option>
                           <el-select v-model="addPointerForm.sampleName" size="small" placeholder="请选择样品名称"
                              @change="upMaterialName">
                              <el-option v-for="(options,index) in sampleoptions" :key="index" :value="options.key" :label="options.value"></el-option>
                           </el-select>
                        </el-form-item>
                     </el-col>
                  </el-row>
                  <el-row :gutter="50">
                     <el-col :span="10">
                        <el-form-item label="规格型号：">
                           <el-select style="width: 160px;" v-model="addPointerForm.specificationsModels" size="small"
                              placeholder="请先选择样品名称">
                     <el-col :span="11">
                        <el-form-item label="评定标准：">
                           <el-select v-model="addPointerForm.addway" size="small" placeholder="请选择评定标准">
                              <el-option v-for="options in model_spe_options" :value="options.value"
                                 :key="options.key">{{ options.value }}</el-option>
                           </el-select>
                        </el-form-item>
                     </el-col>
                     <el-col :span="10">
                     <el-col :span="11">
                        <el-form-item label="规格型号：">
                           <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 style="width: 160px" type="text" v-model="addPointerForm.unit" placeholder="请输入单位"
                              autocomplete="off" />
                           <el-input type="text" v-model="addPointerForm.unit" placeholder="请输入单位" autocomplete="off" />
                        </el-form-item>
                     </el-col>
                  </el-row>
                  <el-row :gutter="50">
                     <el-col :span="10">
                     <el-col :span="11">
                        <el-form-item label="样品数量：">
                           <el-input style="width: 160px" type="text" v-model="addPointerForm.samplesNumber" placeholder="请输入数量"
                              autocomplete="off" />
                        </el-form-item>
                     </el-col>
                     <el-col :span="10">
                        <el-form-item label="备注：">
                           <el-input style="width: 160px" type="text" v-model="addPointerForm.remarks" placeholder="请输入备注"
                              autocomplete="off" />
                           <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="10">
                        <el-form-item label="添加实验：">
                     <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="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-form-item>
                     </el-col>
                  </el-row>
@@ -221,7 +227,10 @@
      getModelSpecification,
      getlink,
      addInspection,
      isIfViewUUID
      isIfViewUUID,
      getProductList,
      getContractsSampleInfo,
      getSpecificationsName
   } from '@/api/inspection/commisioninspection'
   export default {
      data() {
@@ -253,31 +262,12 @@
               experiment: [],
               addway: ''
            },
            experList: [{
               key: '1',
               label: '外观检查'
            }, {
               key: '2',
               label: '动作电压试验'
            }, {
               key: '3',
               label: '电阻管泄漏电流试验'
            }, {
               key: '4',
               label: '绝缘部分交流耐压试验'
            }],
            sampleoptions: [{
               key: '1',
               value: '选项1'
            }, {
               key: '2',
               value: '选项2'
            }],
            samplecodeoptions: [{
               key: '1',
               value: ''
            }],
            experList: [],
            sampleoptions: [],
            samplecodeoptions: [],
            model_spe_options: [],
            model_sta_options: [],
            model_options: [],
            sampleDeliveryMode: [{
               key: '1',
               value: '送样'
@@ -287,13 +277,35 @@
            }],
            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() {
         this.viewId = this.$route.params.viewId
         this.$store.commit('settings/SAVE_LINK',this.viewId)
         this.$store.commit('settings/SAVE_LINK', this.viewId)
         this.getlink(this.$route.params.viewId)
         this.getContractsSampleInfo(this.$route.params.viewId)
      },
      mounted() {
         this.getSampleName()
@@ -311,7 +323,14 @@
               if (!res.data) {
                  this.$message.error('当前链接不在有效期内,系统自动关闭')
                  this.$router.push('/404')
               } else {
                  this.getContractsSampleInfo()
               }
            })
         },
         async getContractsSampleInfo(viewId) {
            let res = await getContractsSampleInfo({
               viewId
            })
         },
         async getSampleName() {
@@ -319,7 +338,8 @@
            this.sampleoptions = res.data.map((item) => {
               return {
                  key: item.id.toString(),
                  value: item.name
                  value: item.name,
                  code: item.code
               }
            })
         },
@@ -327,6 +347,7 @@
            const res = await getModelSpecification({
               materialId: val
            })
            this.model_options = res.data
            this.model_spe_options = res.data.map((item) => {
               return {
                  key: item.specificationsId,
@@ -336,13 +357,16 @@
         },
         addInspection() {
            let exper = this.addPointerForm.experiment[0]
            this.addPointerForm.addway = 1
            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.sampleoptions.forEach(a => {
               if (a.key == tmp.sampleName) tmp.sampleName = a.value
            })
            tmp.speName = tmp.addway + '-' + tmp.speName
            tmp.addway = 1
            this.detectionInfo.push(tmp)
            this.dialogueFormVisible = false
            this.addPointerForm = {
@@ -353,7 +377,8 @@
               samplesNumber: '',
               remarks: '',
               experiment: [],
               addway: ''
               addway: '',
               speName: ''
            }
         },
         async submitInspection() {
@@ -375,41 +400,15 @@
               reportNumber: parseInt(this.infoForm.num),
               sampleDeliveryMode: sampledeliveryway,
               sampleDeliveryPhone: this.infoForm.sendertel,
               sampleSender: this.infoForm.sender
               sampleSender: this.infoForm.sender,
               speName: this.infoForm.speName
            })
            //       const res = await addInspection({
            //   completionDeadline: "2023-08-03",
            //   contactAddress: "江苏南通",
            //   contactNumber: "12321423432",
            //   contacts: "小黑",
            //   entrustRemarks: "委托备注YPBH123456789YPBH123456789YPBH123456789",
            //   entrusted: "阿里巴巴",
            //   inspectionTime: "2023-08-03",
            //   linkDetectionList: [
            //     {
            //       "experiment": "做梦",
            //       "remarks": "通过了",
            //       "sampleName": "发动机",
            //       "sampleNumber": "YPBH123456789",
            //       "samplesNumber": 20,
            //       "specificationsModels": "GGXH-AAAAA",
            //       "unit": "百度"
            //     }
            //   ],
            //   reportNumber: 23,
            //   sampleDeliveryMode: 1,
            //   sampleDeliveryPhone: "123456789676",
            //   sampleSender: "小白"
            // })
            // console.log(res)
            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)
@@ -421,14 +420,54 @@
         handleCurrentChange(pageNo) {
            this.pageParams.pageNo = pageNo
         },
         deleteRow(row) {
            console.log(row)
            row = null
         deleteRow(index, rows) {
            rows.splice(index, 1);
         },
         upMaterialName(val){
            console.log(val);
         upMaterialName(val) {
            this.sampleoptions.forEach(a => {
               if (a.key == val) {
                  this.addPointerForm.sampleNumber = a.code
               }
            })
            this.getModelSpecification(val)
         }
         },
         getProductList(val) {
            getProductList({
               modelId: val
            }).then(res => {
               this.productList = res.data.map(item => {
                  return item.name
               })
            })
            this.model_sta_options.forEach(a => {
               if (a.key == val) {
                  this.addPointerForm.speName = a.value
               }
            })
         },
         getContractsSampleInfo() {
            getContractsSampleInfo({
               viewId: this.viewId
            }).then(res => {
               if (res.data == null) return
               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
            })
         },
      }
   }
</script>
@@ -439,6 +478,10 @@
      background-color: #f0f2f5;
      width: 100%;
      height: 100vh;
      display: flex;
      flex-direction: column;
      justify-content: space-between;
      // align-items: center;

      .firstBox {
         .title {