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

spring

2025-02-21 d6e3826610b518a97c3622c61ffa4cafc3f0cd36

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

 src/api/business/productOrder.js

@@ -89,3 +89,11 @@
    params: query
  })
}
// 查询成品标签打印信息
export function labelOrderPrinting(query) {
  return request({
    url: '/insOrder/labelOrderPrinting',
    method: 'post',
    data: query
  })
}

 src/api/business/rawMaterialOrder.js

@@ -95,6 +95,14 @@
    params: query
  })
}
// 原材料模板列表查询
export function selectRawMaterOrderTemplate(query) {
  return request({
    url: '/rawMaterialOrder/selectRawMaterOrderTemplate',
    method: 'get',
    params: query
  })
}
// 原材料新增模板
export function addRawMaterOrderTemplate(query) {
  return request({

 src/api/structural/capability.js

@@ -28,7 +28,7 @@
export function delItemParameter(query) {
  return request({
    url: '/capacityScope/delItemParameter',
    method: 'get',
    method: 'delete',
    params: query
  })
}

 src/views/business/materialOrder/copperOrder.vue

@@ -99,7 +99,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item class="addObj-form-item" label="备注:">
                <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :placeholder="active>1 ? '' : '请输入'" :readonly="active>1" clearable
                <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :placeholder="active>1 ? '' : '请输入'" :disabled="active>1" clearable
                          size="small" type="textarea"></el-input>
              </el-form-item>
            </el-col>
@@ -423,15 +423,10 @@
export default {
  components: {},
  dicts: ['check_type', 'urgency_level'],
  props: {
    currentId: {
      type: Number,
      default: () => 0
    }
  },
  data() {
    return {
      active: '',
      currentId: '',
      sampleSelectionList: [],//样品表格选中数据
      editTable:[],
      noNeedCheckLoad: false, // 免检按钮loading
@@ -620,6 +615,7 @@
  },
  mounted() {
    this.active = this.$route.query.active
    this.currentId = this.$route.query.currentId
    this.getUserNowInfo()
    this.selectStandardTreeList()
    this.selectStandardMethods()

 src/views/business/materialOrder/customsInspection.vue

@@ -97,8 +97,8 @@
          </el-col>
          <el-col :span="6">
            <el-form-item class="addObj-form-item" label="检验类别:" prop="orderType">
              <el-select v-model="addObj.orderType" :disabled="active>1 || orderType===1" clearable size="small" style="width: 100%">
                <el-option v-for="(a, ai) in dict.type.check_type" :key="ai" :label="a.label" :value="a.value"></el-option>
              <el-select v-model="addObj.orderType" :disabled="active>1 || orderType==1" clearable size="small" style="width: 100%">
                <el-option v-for="a in dict.type.check_type" :key="a.value" :label="a.label" :value="a.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@@ -114,7 +114,7 @@
          <el-col :span="6">
            <el-form-item class="addObj-form-item" label="紧急程度:" placeholder="请选择" prop="type">
              <el-select v-model="addObj.type" :disabled="active>1" class="addObj-info" clearable size="small" style="width: 100%">
                <el-option v-for="(a, ai) in dict.type.urgency_level" :key="ai" :label="a.label" :value="a.value"></el-option>
                <el-option v-for="a in dict.type.urgency_level" :key="a.value" :label="a.label" :value="a.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@@ -434,10 +434,15 @@
import {
  addExemptionOrder,
  addInsOrder,
  addRawMaterOrderTemplate, delRawMaterOrderTemplate,
  addRawMaterOrderTemplate,
  delRawMaterOrderTemplate,
  getInsOrder,
  getUserNow,
  notificationRawOrder, selectRawMaterOrderTemplateById, selectStandardMethodEnum, selectStandardProductList,
  notificationRawOrder, selectRawMaterOrderTemplate,
  selectRawMaterOrderTemplateById,
  selectsStandardMethodByFLSSM,
  selectStandardMethodEnum,
  selectStandardProductList,
  selectStandardTreeListByPartNo
} from "@/api/business/rawMaterialOrder";

@@ -446,10 +451,6 @@
  dicts: ['check_type', 'urgency_level'],
  components: {},
  props: {
    currentId: {
      type: Number,
      default: () => 0
    },
    isReport: {
      type: Number,
      default: () => null
@@ -460,6 +461,7 @@
      customsInspection: {},
      orderType: '',
      active: 0,
      currentId: 0,
      editTable:[], // 区间特殊值填写
      template: null,
      saveLoad: false, // 保存按钮loading
@@ -637,11 +639,11 @@
  mounted() {
    this.active = this.$route.query.active
    this.orderType = this.$route.query.orderType
    this.currentId = this.$route.query.currentId
    this.customsInspection = this.$route.query.customsInspection
    // this.getUserNowList() // 获取当前用户信息
    this.getUserNowList() // 获取当前用户信息
    this.selectStandardMethods() // 获取检验标准下拉框数据
    this.getInfo() // 获取数据

  },
  methods: {
    save1 () {
@@ -683,7 +685,7 @@
    },
    // 获取数据
    getInfo () {
      if (this.active === 2) {
      if (this.active == 2) {
        let orderId = ''
        if (!this.customsInspection.enterOrderId && this.customsInspection.quarterOrderId) {
          this.isShowTab = false
@@ -743,27 +745,26 @@
        })
        // 报检流程
        selectStandardTreeListByPartNo({partNo:this.customsInspection.partNo}).then(res => {
          if (res.code === 200) {
            this.addObj.sample = res.data.label
            this.codeLevel = res.data.code
            this.addObj.qtyArrived = this.customsInspection.qtyArrived
            this.addObj.partNo = this.customsInspection.partNo
            this.addObj.partDetail = this.customsInspection.partDesc
            this.addObj.receiverDate = this.customsInspection.receiverDate
            this.addObj.orderNo = this.customsInspection.orderNo
            this.addObj.declareUser = this.customsInspection.declareUser
            this.addObj.testQuantity = this.customsInspection.testQuantity
            this.addObj.buyUnitMeas = this.customsInspection.buyUnitMeas
            this.addObj.updateBatchNo = this.customsInspection.updateBatchNo
            if (this.orderType === 1) {
              this.addObj.orderType = 'Quarterly inspection'
          this.$set(this.addObj, 'qtyArrived', this.customsInspection.qtyArrived)
          this.$set(this.addObj, 'partNo', this.customsInspection.partNo)
          this.$set(this.addObj, 'receiverDate', this.customsInspection.receiverDate)
          this.$set(this.addObj, 'orderNo', this.customsInspection.orderNo)
          this.$set(this.addObj, 'declareUser', this.customsInspection.declareUser)
          this.$set(this.addObj, 'testQuantity', this.customsInspection.testQuantity)
          this.$set(this.addObj, 'buyUnitMeas', this.customsInspection.buyUnitMeas)
          this.$set(this.addObj, 'updateBatchNo', this.customsInspection.updateBatchNo)
          this.$set(this.addObj, 'partDetail', this.customsInspection.partDesc)
          console.log('this.orderType----', this.orderType)
          if (this.orderType == 1) {
            this.$set(this.addObj, 'orderType', 'Quarterly inspection')
            }
            const str = res.data.treeName.split('-')
            this.selectTreeTem = str.join(' - ')
            this.selectTree = str.join(' - ')
            this.addListInfo(this.codeLevel, res.data) // 原材料样品是固定的，就默认赋值一条数据，可拆分
            this.selectInsOrderTemplate() // 原材料模板列表查询
          }
        }).catch(err => {
          this.dialogVisible = true
          this.dialogMessage = err.message
@@ -824,7 +825,7 @@
    },
    // 查询模板列表
    selectInsOrderTemplate() {
      selectStandardTreeListByPartNo({partNo:this.addObj.partNo}).then(res => {
      selectRawMaterOrderTemplate({partNo:this.addObj.partNo}).then(res => {
        this.templates = res.data
      })
    },
@@ -1044,6 +1045,11 @@
      addInsOrder({
        insOrder: this.addObj,
        sampleList: sampleList.map(a => {
          if (a.insProduct.length > 0) {
            a.insProduct.forEach(c => {
              delete c.id
            })
          }
          if (a.modelNum) {
            // 根据x号判断型号参数与样品型号的拼接位置
            // 例如×4，就为500ML×4；4×，就为4×500ML
@@ -1585,7 +1591,6 @@
        ifsInventoryId: this.customsInspection.id
      }).then(res => {
        this.getProductLoad = false
        if (res.code === 200) {
          res.data.forEach(a => {
            a.state = 0
          })
@@ -1597,7 +1602,6 @@
              if (a.state == 1) this.toggleSelection(a)
            })
          }, 200)
        }
      }).catch(err => {
        console.log('err-',err)
      })

 src/views/business/materialOrder/index.vue

@@ -273,10 +273,22 @@
      tableLoading1: false,
      column1: [
        { label: '批号', prop: 'updateBatchNo' },
        { label: '委托编号', prop: 'entrustCode' },
        {
          label: '委托编号',
          prop: 'entrustCode',
          width: "160px",
          dataType: "link",
          linkMethod: "changeEntrustCode",
        },
        { label: '零件号', prop: 'partNo' },
        { label: '零件描述', prop: 'partDesc' },
        { label: '样品名称', prop: 'sampleName' },
        {
          label: '样品名称',
          prop: 'sampleName',
          width: "160px",
          dataType: "link",
          linkMethod: "selectAllByOne",
        },
        { label: '样品型号', prop: 'sampleModel' },
        { label: '检验人', prop: 'userName' },
        { label: '下发时间', prop: 'sendTime' },
@@ -898,10 +910,16 @@
    },
    // 季度检验下单
    playOrderSec(row) {
      if (typeof row !== "object") {
        this.$router.push({ path: "/materialOrder/customsInspection", query: { active: row } });
      } else {
        this.$router.push({ path: "/materialOrder/customsInspection", query: { orderType: 1, customsInspection: row, active: 1 } });
    },
    // 点击样品名称查看详情
    selectAllByOne(row) {
      if (row.isCopper == 1) {
        this.currentId = row.enterOrderId
        this.$router.push({ path: "/materialOrder/copperOrder", query: { customsInspection: row, active: 2, currentId: this.currentId } });
      } else {
        this.currentId = row.insOrderId
        this.$router.push({ path: "/materialOrder/customsInspection", query: { customsInspection: row, active: 2, currentId: this.currentId } });
      }
    },
    // 打开免检弹框
@@ -1007,15 +1025,6 @@
        }).catch(() => { })
      }
    },
    // 点击样品名称查看详情
    selectAllByOne(row) {
      this.currentId = row.insOrderId
      if (row.isCopper == 1) {
        this.currentId = row.enterOrderId
      }
      this.customsInspection = row
      this.active = 2;
    },
    // 数据查看
    handleDataLook(row) {
      this.dataLookInfo = row
@@ -1085,6 +1094,7 @@
            this.entrustCodeVisible = false
            this.$message.success('修改成功')
          }
          this.refreshTable()
          this.submitCodeLoading = false
        })
      } catch (e) {

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

@@ -547,7 +547,7 @@
  selectStandardTreeList2
} from "@/api/business/rawMaterialOrder";
import {
  addInsOrder, delInsOrderTemplate,
  addInsOrder, addInsOrderTemplate, delInsOrderTemplate,
  getQuarterOnOrder,
  selectOrderManDay,
  updateInsOrder,
@@ -1634,17 +1634,14 @@
              sampleList: this.sampleList,
              selectTree:this.selectTree
            })
          }, {
            headers: {
              'Content-Type': 'application/json'
            }
          }).then(res => {
            if (res.code == 201) return
            this.templateLoading = false;
            this.templateDia = false;
            this.$message.success('保存成功')
            this.selectInsOrderTemplate()
            this.templateName = ''
          }).catch(e => {
            this.templateLoading = false;
          })
        } else {
          this.$message.error('请填写模板名称')
@@ -1947,7 +1944,7 @@
      },
      // 辅助线芯配置
      openAuxiliaryCore () {
        if (this.active === 1) {
        if (this.active == 1) {
          if (this.sampleIds.length === 0) {
            this.$message.error("未选择样品")
          } else if (this.sampleIds.length === 1) {
@@ -1975,7 +1972,7 @@
        }
      },
      openCableConfig() {
        if (this.active === 1) {
        if (this.active == 1) {
          if (this.sampleIds.length === 0) {
            this.$message.error("未选择样品")
          } else if (this.sampleIds.length === 1) {

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

@@ -123,6 +123,7 @@

<script>
import PrintJS from "print-js";
import {labelOrderPrinting} from "@/api/business/productOrder";

export default {
  name: "printDialog",
@@ -157,13 +158,8 @@
        selection.map(m => {
          ids.push(m.id)
        })
        this.$axios.post(this.$api.insOrder.labelOrderPrinting, {
        labelOrderPrinting({
          ids: ids
        }, {
          headers: {
            'Content-Type': 'application/json'
          },
          noQs: true
        }).then(res => {
          if (res.code === 200 && res.data.length > 0) {
            res.data.forEach(item => {