Merge remote-tracking branch 'origin/master'

Crunchy

2024-04-25 71c4ece010f68a74eeff5e986caecb9a0bb2e36c

 src/components/view/b1-inspection-order.vue

@@ -172,7 +172,7 @@
               </el-row>
            </span>
         </el-dialog>
         <el-dialog title="数据查看" :visible.sync="dataDialogVisible" width="70%">
         <el-dialog title="数据查看" :visible.sync="dataDialogVisible" width="80%">
            <div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible">
               <ValueTable ref="ValueTableDataLook" :url="$api.insOrder.selectSampleAndProductByOrderId"
                  :componentData="componentDataDataLook"/>
@@ -233,7 +233,7 @@
                  type: 'text',
                  method: 'handleDataLook',
                  disabFun: (row, index) => {
                     return row.state != 1
                     return row.state != 1 && row.state != 4
                  }
               }, {
                  id: 'download',
@@ -241,7 +241,7 @@
                  type: 'text',
                  method: 'download',
                  disabFun: (row, index) => {
                     return row.state != 1 || row.reportId == null
                     return row.state != 4 || row.reportId == null
                  }
               }, {
                  id: 'verify',
@@ -257,7 +257,7 @@
                  type: 'text',
                  method: 'handlEquash',
                  disabFun: (row, index) => {
                     return row.state == 2 || row.state == 3
                     return row.state != 1 && row.state != 0
                  }
               }, {
                  font: '分配',
@@ -290,7 +290,37 @@
                  },
                  createUser: {
                     select: []
                  }
                  },
            orderType: {
              select: []
            },
            processing: {
              select: [{
                value: 1,
                label: '实验室处理'
              },{
                value: 0,
                label: '委托单位取回'
              }]
            },
            isLeave: {
              select: [{
                value: 1,
                label: '留样'
              },{
                value: 0,
                label: '不留样'
              }]
            },
            send: {
              select: [{
                value: 1,
                label: '自取'
              },{
                value: 0,
                label: '其他'
              }]
            }
               },
               selectField: {},
               requiredAdd: [],
@@ -322,10 +352,25 @@
                        label: '不合格',
                        type: 'danger'
                     }]
                  },
                  inspectionValueType: {select: []}
                  }
               },
               selectField: {},
          spanConfig:{
            rows:[
              {
                name:'sampleCode',
                index:0
              },
              {
                name:'sample',
                index:1
              },
              {
                name:'model',
                index:2
              }
            ]
          },
               requiredAdd: [],
               requiredUp: []
            },
@@ -364,7 +409,7 @@
         this.getUserMenu()
         this.getAuthorizedPerson()
         this.getInsStateDicts()
         this.selectEnumByCategoryForInspectionValueType()
      this.selectEnumByCategoryForOrderType()
      },
      methods: {
         getAuthorizedPerson() {
@@ -436,7 +481,9 @@
            this.dataDialogVisible = true;
         },
         // 下载报告
         download(row) {},
         download(row) {
        console.log(row);
      },
         // 审核
         handleVerify(row) {
            // this.verifyDialogVisible = true;
@@ -537,13 +584,13 @@
               this.componentDataDataLook.tagField.insState.select = data
            })
         },
         selectEnumByCategoryForInspectionValueType() {
            this.$axios.post(this.$api.enums.selectEnumByCategory, {
               category: "检验值类型"
            }).then(res => {
               this.componentDataDataLook.tagField.inspectionValueType.select = res.data
            })
         },
      selectEnumByCategoryForOrderType() {
        this.$axios.post(this.$api.enums.selectEnumByCategory, {
          category: "检验类别"
        }).then(res => {
          this.componentData.tagField.orderType.select = res.data
        })
      },
      }
   }
</script>