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

spring

2025-03-03 2aed532b09e606229dff5aec0164aa94131c2fbd

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

 src/views/business/inspectionTask/index.vue

@@ -573,11 +573,13 @@
      this.inspectionTaskState = this.dictToValue(response.data);
    });
    this.refreshTable();

  },
  mounted() {
    this.queryParams.userId = this.userId;
  },
  activated() {
    this.refreshTable();
  },
  methods: {
    getList() {
      this.tableLoading = true;

 src/views/business/materialOrder/copperOrder.vue

@@ -617,12 +617,19 @@
  mounted() {
    this.active = this.$route.query.active
    this.currentId = this.$route.query.currentId
    this.getUserNowInfo()
    this.selectStandardTreeList()
    this.selectStandardMethods()
    this.getInfo() // 获取数据
  },
  activated() {
    if (this.active==1) {
      this.getInfoRow();
    }
  },
  methods: {
    getInfoRow() {
      this.getUserNowInfo()
      this.selectStandardTreeList()
      this.selectStandardMethods()
      this.getInfo() // 获取数据
    },
    // 拆分
    handleSplitCountNum () {
      this.sample.joinName = null

 src/views/business/materialOrder/customsInspection.vue

@@ -639,6 +639,13 @@
    this.currentId = this.$route.query.currentId
    this.isReport = this.$route.query.isReport
    this.customsInspection = this.$route.query.customsInspection
  },
  activated() {
    if (this.active==1) {
      this.getInfo();
    }
  },
  getInfo() {
    this.getUserNowList() // 获取当前用户信息
    this.selectStandardMethods() // 获取检验标准下拉框数据
    this.getInfo() // 获取数据

 src/views/business/productOrder/components/add.vue

@@ -566,235 +566,244 @@
    AuxiliaryWireCore
  },
  dicts: ['check_type1', 'urgency_level', 'form_type', 'sample_status_list'],
    data() {
      return {
        active: '',
        tabIndex: '',
        currentId: '',
        sampleSelectionList: [],//样品表格选中数据
        editTable:[],
        template: null,
        templates: [],
        addObj: {
          entrustCode: null,
          custom: null,
          company: null,
          userId: null,
          type: '0',
          code: null,
          appointed: null,
          remark: null, // 备注
          remarkEn: null, // 备注英文
          sample: null,
          factory: null,
          laboratory: null,
          sampleType: null,
          sampleNum: 1,
          unit: null,
          model: null,
          method: null,
          phone: null,
          processing: 1,
          isLeave: 0,
          orderType: null,
          send: 1,
          formType: '送检', //  来样方式
          sampleStatus: 'In good condition', // 样品状态
          testQuantity: '', // 样品状态
          production: null,
          productionEn: null,
          companyId: null,
          prepareUser:null, // 委托人
          prepareUserEn:null, // 委托人英文
          prepareCode: '', // 委托人工号
          quarterItemId: '',
          sampleView: '', // 样品名称（报告展示字段）
          sampleViewEn: '', // 样品名称英文（报告展示字段）
        },
        addObjRules: { // 表单校验规则
          orderType: [
            { required: true, message: '请选择检验类别', trigger: 'change' }
          ],
          company: [
            { required: true, message: '请选择委托单位', trigger: 'change' }
          ],
          phone: [
            { required: true, message: '请填写联系方式', trigger: 'blur' }
          ],
          type: [
            { required: true, message: '请选择紧急程度', trigger: 'change' }
          ],
          sample: [
            { required: true, message: '请选择样品名称', trigger: 'change' }
          ],
          sampleNum: [
            { required: true, message: '请填写样品数量', trigger: 'blur' }
          ],
          sampleStatus: [
            { required: true, message: '请选择样品状态', trigger: 'change' }
          ],
          formType: [
            { required: true, message: '请选择来样方式', trigger: 'change' }
          ],
          testQuantity: [
            { required: true, message: '请填写抽检数量', trigger: 'blur' }
          ],
          production: [
            { required: true, message: '请填写生产单位', trigger: 'blur' }
          ],
          productionEn: [
            { required: true, message: '请填写生产单位EN', trigger: 'blur' }
          ],
        },
        sample: {
          sampleCode: null,
          laboratory: null,
          factory: null,
          sampleType: null,
          sample: null,
          model: null,
          modelNum: null,
          sampleNum: 1,
          isLeave: 0,
          unit: null
        },
        type: [],
        selectUserDia: false,
        tableData1: [],
        tableLoading1: false,
        multipleSelection: [],
        column1: [
          {label: '客户名称', prop: 'company'},
          {label: '客户单位EN', prop: 'companyEn'},
          {label: '单位地址', prop: 'address'},
          {label: '单位地址EN', prop: 'addressEn'},
          {label: '单位电话', prop: 'phone'},
          {label: '加急额度', prop: 'num'},
          {label: '客户编号', prop: 'code2'},
          {label: '工厂域', prop: 'code'}
        ],
        page1: {
          total:0,
          size:10,
          current:1
        },
        selectStandardTree: false,
        search: null,
        list: [],
        selectStandardTreeLoading: false,
        selectTree: null,
        sampleViewEn: null,
        expandedKeys: [],
        sampleList: [],
        sampleIds: [],
        methodList: [],
        addSampleDia: false,
        count: 1,
        productList: [],
        productList0: [],
        bsm1DiaList: [],
        productIds: [],
        getProductLoad: false,
        saveLoad: false,
        templateDia: false,
        templateLoading: false,
        templateName: '',
        issuedDialogVisible: false,
        distributeData: {
          appointed: '',
          userId: '',
          sonLaboratory:''
        },
        personList: [],
        upLoad: false,
        models: [],
        methods: [],
        methodLoad: false,
        noDialogVisible: false,
        tell: '',
        noLoading: false,
        orderType: [],
        filters: [],
        formType: [],
        currentMethod: null,
        isAskOnlyRead: false,
        sampleId: null,
        bsmRow: null,
        bsm1: false,
        bsm1Val: null,
        bsm1DiaAll: false,
        cableConfigShow: false,
        auxiliaryShow: false,
        bsm3Dia: false,
        // total: 0,
        RTS: '',
        totalArr: [],
        addObj1: {},
  data() {
    return {
      active: '',
      tabIndex: '',
      currentId: '',
      sampleSelectionList: [],//样品表格选中数据
      editTable:[],
      template: null,
      templates: [],
      addObj: {
        entrustCode: null,
        custom: null,
        company: null,
        userId: null,
        type: '0',
        code: null,
        appointed: null,
        remark: null, // 备注
        remarkEn: null, // 备注英文
        sample: null,
        factory: null,
        laboratory: null,
        sampleType: null,
        sampleNum: 1,
        unit: null,
        model: null,
        standardMethodListId: null,
        symbolList:['RTS'],
        inspectionItem:null,
        inspectionItemSubclass:null,
        methodS:null,
        isBsm2Val2:false,
        temperatureEngList: [],
        isShowInput: false,
        temId: '',
        sonLaboratoryList:[],
        selectiveEcho: [], // 检验下单的时候勾选检验项目,如果使用筛选提交显示检验项目为空 回显列表
        quarterItemOptions: [], // 查询季度信息
        specialStandardMethod: '',
        isSpecial: false,
      }
        method: null,
        phone: null,
        processing: 1,
        isLeave: 0,
        orderType: null,
        send: 1,
        formType: '送检', //  来样方式
        sampleStatus: 'In good condition', // 样品状态
        testQuantity: '', // 样品状态
        production: null,
        productionEn: null,
        companyId: null,
        prepareUser:null, // 委托人
        prepareUserEn:null, // 委托人英文
        prepareCode: '', // 委托人工号
        quarterItemId: '',
        sampleView: '', // 样品名称（报告展示字段）
        sampleViewEn: '', // 样品名称英文（报告展示字段）
      },
      addObjRules: { // 表单校验规则
        orderType: [
          { required: true, message: '请选择检验类别', trigger: 'change' }
        ],
        company: [
          { required: true, message: '请选择委托单位', trigger: 'change' }
        ],
        phone: [
          { required: true, message: '请填写联系方式', trigger: 'blur' }
        ],
        type: [
          { required: true, message: '请选择紧急程度', trigger: 'change' }
        ],
        sample: [
          { required: true, message: '请选择样品名称', trigger: 'change' }
        ],
        sampleNum: [
          { required: true, message: '请填写样品数量', trigger: 'blur' }
        ],
        sampleStatus: [
          { required: true, message: '请选择样品状态', trigger: 'change' }
        ],
        formType: [
          { required: true, message: '请选择来样方式', trigger: 'change' }
        ],
        testQuantity: [
          { required: true, message: '请填写抽检数量', trigger: 'blur' }
        ],
        production: [
          { required: true, message: '请填写生产单位', trigger: 'blur' }
        ],
        productionEn: [
          { required: true, message: '请填写生产单位EN', trigger: 'blur' }
        ],
      },
      sample: {
        sampleCode: null,
        laboratory: null,
        factory: null,
        sampleType: null,
        sample: null,
        model: null,
        modelNum: null,
        sampleNum: 1,
        isLeave: 0,
        unit: null
      },
      type: [],
      selectUserDia: false,
      tableData1: [],
      tableLoading1: false,
      multipleSelection: [],
      column1: [
        {label: '客户名称', prop: 'company'},
        {label: '客户单位EN', prop: 'companyEn'},
        {label: '单位地址', prop: 'address'},
        {label: '单位地址EN', prop: 'addressEn'},
        {label: '单位电话', prop: 'phone'},
        {label: '加急额度', prop: 'num'},
        {label: '客户编号', prop: 'code2'},
        {label: '工厂域', prop: 'code'}
      ],
      page1: {
        total:0,
        size:10,
        current:1
      },
      selectStandardTree: false,
      search: null,
      list: [],
      selectStandardTreeLoading: false,
      selectTree: null,
      sampleViewEn: null,
      expandedKeys: [],
      sampleList: [],
      sampleIds: [],
      methodList: [],
      addSampleDia: false,
      count: 1,
      productList: [],
      productList0: [],
      bsm1DiaList: [],
      productIds: [],
      getProductLoad: false,
      saveLoad: false,
      templateDia: false,
      templateLoading: false,
      templateName: '',
      issuedDialogVisible: false,
      distributeData: {
        appointed: '',
        userId: '',
        sonLaboratory:''
      },
      personList: [],
      upLoad: false,
      models: [],
      methods: [],
      methodLoad: false,
      noDialogVisible: false,
      tell: '',
      noLoading: false,
      orderType: [],
      filters: [],
      formType: [],
      currentMethod: null,
      isAskOnlyRead: false,
      sampleId: null,
      bsmRow: null,
      bsm1: false,
      bsm1Val: null,
      bsm1DiaAll: false,
      cableConfigShow: false,
      auxiliaryShow: false,
      bsm3Dia: false,
      // total: 0,
      RTS: '',
      totalArr: [],
      addObj1: {},
      model: null,
      standardMethodListId: null,
      symbolList:['RTS'],
      inspectionItem:null,
      inspectionItemSubclass:null,
      methodS:null,
      isBsm2Val2:false,
      temperatureEngList: [],
      isShowInput: false,
      temId: '',
      sonLaboratoryList:[],
      selectiveEcho: [], // 检验下单的时候勾选检验项目,如果使用筛选提交显示检验项目为空 回显列表
      quarterItemOptions: [], // 查询季度信息
      specialStandardMethod: '',
      isSpecial: false,
    }
  },
  watch: {
    sampleList() {
      this.addObj.method = null
      this.productList = []
    },
    watch: {
      sampleList() {
        this.addObj.method = null
        this.productList = []
      },
      productList: {
        deep: true,
        handler(val) {
          if (val && val.length > 0) {
            let arr = [];
            val.forEach(item => {
              if (item.sonLaboratory && !arr.find(a => a.value == item.sonLaboratory)) {
                arr.push({
                  text: item.sonLaboratory,
                  value: item.sonLaboratory
                })
              }
            })
            this.filters = arr
          }
        }
      },
      sampleList: {
        deep: true,
        handler(val) {
          this.getTotal()
        }
      },
      'addObj.sample'(val) {
        this.model = null
        this.standardMethodListId = null
      },
      'addObj.sampleNum'(val) {
        this.model = null
        this.standardMethodListId = null
      },
      tabIndex(val){
        if(val==4&&this.active==2){
          this.isSpecial = true
        }else{
          this.isSpecial = false
    productList: {
      deep: true,
      handler(val) {
        if (val && val.length > 0) {
          let arr = [];
          val.forEach(item => {
            if (item.sonLaboratory && !arr.find(a => a.value == item.sonLaboratory)) {
              arr.push({
                text: item.sonLaboratory,
                value: item.sonLaboratory
              })
            }
          })
          this.filters = arr
        }
      }
    },
    mounted() {
      this.active = this.$route.query.active
      this.tabIndex = this.$route.query.tabIndex
      this.currentId = this.$route.query.currentId
    sampleList: {
      deep: true,
      handler(val) {
        this.getTotal()
      }
    },
    'addObj.sample'(val) {
      this.model = null
      this.standardMethodListId = null
    },
    'addObj.sampleNum'(val) {
      this.model = null
      this.standardMethodListId = null
    },
    tabIndex(val){
      if(val==4&&this.active==2){
        this.isSpecial = true
      }else{
        this.isSpecial = false
      }
    }
  },
  mounted() {
    this.active = this.$route.query.active
    this.tabIndex = this.$route.query.tabIndex
    this.currentId = this.$route.query.currentId
    this.getInfo()
  },
  activated() {
    if (this.active==1) {
      this.getInfo();
    }
  },
  methods: {
    getInfo() {
      this.getUserNowData()
      this.selectStandardTreeList()
      this.getAuthorizedPerson();
@@ -829,12 +838,11 @@
        this.isSpecial = false
      }
    },
    methods: {
      getPrepareUser () {
    getPrepareUser () {
        // this.addObj.prepareUser = JSON.parse(localStorage.getItem("user")).name;
        // this.addObj.prepareUserEn = JSON.parse(localStorage.getItem("user")).nameEn
        // this.addObj.prepareCode = JSON.parse(localStorage.getItem("user")).account
      },
    },
      // 编辑要求值表格
      editSpecial () {
        this.isSpecial = true