Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev

spring

2025-02-20 10bd1c0bbba80d86313b86559546557b2bdbc920

 src/views/business/materialOrder/index.vue

@@ -195,7 +195,6 @@
</template>

<script>
import CustomsInspection from "./customsInspection.vue";
import PrintDialog from "@/views/business/materialOrderComponents/materialOrder/printDialog.vue";
import ShowInfo from "@/views/business/materialOrderComponents/materialOrder/showInfo.vue";
import DataLookVisible from "@/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue";
@@ -206,9 +205,7 @@
  concessionRelease,
  getIfsByAll,
  getIfsByOver,
  getIfsByQuarter,
  getIfsByStateOne,
  getPurchaseOrder,
  rawAllExport,
  rawOrderRelease,
  repealEnterRawOrder,
@@ -222,7 +219,7 @@
export default {
  name: "b1-material-inspection-order",
  // import 引入的组件需要注入到对象中才能使用
  components: {limsTable,DownFileDialog, FilesLookVisible, DataLookVisible, ShowInfo, PrintDialog, CustomsInspection},
  components: {limsTable,DownFileDialog, FilesLookVisible, DataLookVisible, ShowInfo, PrintDialog},
  data() {
    // 这里存放数据
    return {
@@ -240,14 +237,14 @@
            if (params == 1) {
              return '过期物料'
            } else {
              return ''
              return null
            }
          },
          formatType: (params) => {
            if (params == 1) {
              return 'info'
            } else {
              return ''
              return null
            }
          }
        },
@@ -309,14 +306,14 @@
            if (params == 1) {
              return '过期物料'
            } else {
              return ''
              return null
            }
          },
          formatType: (params) => {
            if (params == 1) {
              return 'info'
            } else {
              return ''
              return null
            }
          }
        },
@@ -384,14 +381,14 @@
            if (params == 1) {
              return '过期物料'
            } else {
              return ''
              return null
            }
          },
          formatType: (params) => {
            if (params == 1) {
              return 'info'
            } else {
              return ''
              return null
            }
          }
        },
@@ -497,14 +494,14 @@
            if (params == 1) {
              return '过期物料'
            } else {
              return ''
              return null
            }
          },
          formatType: (params) => {
            if (params == 1) {
              return 'info'
            } else {
              return ''
              return null
            }
          }
        },
@@ -563,14 +560,14 @@
            if (params == 1) {
              return '过期物料'
            } else {
              return ''
              return null
            }
          },
          formatType: (params) => {
            if (params == 1) {
              return 'info'
            } else {
              return ''
              return null
            }
          }
        },
@@ -1039,8 +1036,8 @@
    },
    // 数据查看
    handleDataLook(row) {
      this.dataDialogVisible = true;
      this.dataLookInfo = row
      this.dataDialogVisible = true;
    },
    // 关闭数据查看弹框
    closeDataLook () {