Merge remote-tracking branch 'origin/master'

Crunchy

2024-04-25 71c4ece010f68a74eeff5e986caecb9a0bb2e36c

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

@@ -100,7 +100,7 @@
               <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
            </ul>
            <ValueTable ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
               :key="upIndex" style="height: calc(100% - 44px)" />
               :key="'b'+upIndex" style="height: calc(100% - 44px)" />
         </div>
         <!-- 审核 -->
         <el-dialog title="下单审核" :visible.sync="verifyDialogVisible" width="30%" :before-close="handleClose">
@@ -157,8 +157,8 @@
                  <el-col class="search_thing" :span="22">
                     <div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>指派人员：</div>
                     <div class="search_input">
                        <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;">
                           <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
                        <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;" clearable>
                           <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value">
                           </el-option>
                        </el-select>
                     </div>
@@ -172,10 +172,10 @@
               </el-row>
            </span>
         </el-dialog>
         <el-dialog title="数据查看" :visible.sync="dataDialogVisible" width="70%" :before-close="handleClose2">
            <div style="height: 70vh;overflow-y: auto;">
               <ValueTable ref="ValueTableDataLook" :url="$api.deviceScope.selectDeviceParameter"
                  :componentData="componentDataDataLook" :key="upIndex" />
         <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"/>
            </div>
         </el-dialog>
      </div>
@@ -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: [],
@@ -298,8 +328,9 @@
            },
            componentDataDataLook: {
               entity: {
                  id: 0,
                  orderBy: {
                     field: 'id',
                     field: 'sampleCode',
                     order: 'asc'
                  }
               },
@@ -308,23 +339,38 @@
               select: false,
               do: [],
               tagField: {
                  deviceStatus: {
                  insState: {
                     select: []
                  },
                  insResult: {
                     select: [{
                        value: 0,
                        type: 'success',
                        label: '正常'
                     }, {
                        value: 1,
                        type: 'warning',
                        label: '报废'
                     }, {
                        value: 2,
                        type: 'danger',
                        label: '保修'
                        label: '合格',
                        type: 'success'
                     },{
                        value: 0,
                        label: '不合格',
                        type: 'danger'
                     }]
                  }
               },
               selectField: {},
          spanConfig:{
            rows:[
              {
                name:'sampleCode',
                index:0
              },
              {
                name:'sample',
                index:1
              },
              {
                name:'model',
                index:2
              }
            ]
          },
               requiredAdd: [],
               requiredUp: []
            },
@@ -362,6 +408,8 @@
         this.getPower()
         this.getUserMenu()
         this.getAuthorizedPerson()
         this.getInsStateDicts()
      this.selectEnumByCategoryForOrderType()
      },
      methods: {
         getAuthorizedPerson() {
@@ -429,10 +477,13 @@
         },
         // 数据查看
         handleDataLook(row) {
            this.componentDataDataLook.entity.id = row.id
            this.dataDialogVisible = true;
         },
         // 下载报告
         download(row) {},
         download(row) {
        console.log(row);
      },
         // 审核
         handleVerify(row) {
            // this.verifyDialogVisible = true;
@@ -447,7 +498,7 @@
         handleIssued(row) {
            this.issuedDialogVisible = true;
            this.$axios.post(this.$api.insOrder.selectOrderManDay, {
               id: row.sampleId
               id: row.id
            }).then(res => {
               this.distributeData.orderId = row.id
               this.distributeData.sampleId = row.sampleId
@@ -513,7 +564,33 @@
               })
               this.componentData.tagField.createUser.select = data
            })
         }
         },
         getInsStateDicts() {
            this.$axios.post(this.$api.enums.selectEnumByCategory, {
               category: "检验任务状态"
            }).then(res => {
               let data = res.data
               this.insStateList = data
               data.forEach(ele => {
                  //0:待检验 1:检验中 2:已检验 3:待复核 4:复核未通过 5:复核通过
                  if (['2', '5'].includes(ele.value)) {
                     ele.type = 'success'
                  } else if (['1', '3'].includes(ele.value)) {
                     ele.type = 'warning'
                  } else if (['0', '4'].includes(ele.value)) {
                     ele.type = 'danger'
                  }
               })
               this.componentDataDataLook.tagField.insState.select = data
            })
         },
      selectEnumByCategoryForOrderType() {
        this.$axios.post(this.$api.enums.selectEnumByCategory, {
          category: "检验类别"
        }).then(res => {
          this.componentData.tagField.orderType.select = res.data
        })
      },
      }
   }
</script>