成品下单、原材料下单联调

gaoluyang

2025-02-21 86e60a01fdac6af35759d4c05d3271cf3d9807b2

成品下单、原材料下单联调

 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/customsInspection.vue

@@ -97,7 +97,7 @@
          </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-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>
@@ -438,7 +438,7 @@
  delRawMaterOrderTemplate,
  getInsOrder,
  getUserNow,
  notificationRawOrder,
  notificationRawOrder, selectRawMaterOrderTemplate,
  selectRawMaterOrderTemplateById,
  selectsStandardMethodByFLSSM,
  selectStandardMethodEnum,
@@ -641,10 +641,9 @@
    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 () {
@@ -686,7 +685,7 @@
    },
    // 获取数据
    getInfo () {
      if (this.active === 2) {
      if (this.active == 2) {
        let orderId = ''
        if (!this.customsInspection.enterOrderId && this.customsInspection.quarterOrderId) {
          this.isShowTab = false
@@ -746,28 +745,26 @@
        })
        // 报检流程
        selectStandardTreeListByPartNo({partNo:this.customsInspection.partNo}).then(res => {
          if (res.code === 200) {
            this.addObj.sample = res.data.label
            this.codeLevel = res.data.code
            console.log('this.customsInspection---', this.customsInspection)
            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'
            }
            const str = res.data.treeName.split('-')
            this.selectTreeTem = str.join(' - ')
            this.selectTree = str.join(' - ')
            this.addListInfo(this.codeLevel, res.data) // 原材料样品是固定的，就默认赋值一条数据，可拆分
            this.selectInsOrderTemplate() // 原材料模板列表查询
          this.addObj.sample = res.data.label
          this.codeLevel = res.data.code
          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
@@ -828,7 +825,7 @@
    },
    // 查询模板列表
    selectInsOrderTemplate() {
      selectStandardTreeListByPartNo({partNo:this.addObj.partNo}).then(res => {
      selectRawMaterOrderTemplate({partNo:this.addObj.partNo}).then(res => {
        this.templates = res.data
      })
    },
@@ -1048,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

 src/views/business/materialOrder/index.vue

@@ -910,11 +910,7 @@
    },
    // 季度检验下单
    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 } });
      }
      this.$router.push({ path: "/materialOrder/customsInspection", query: { orderType: 1, customsInspection: row, active: 1 } });
    },
    // 点击样品名称查看详情
    selectAllByOne(row) {

 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 => {