Merge branch 'dev' into dev_tides

Crunchy

2025-04-29 e5454b769d44a34af423bf87ac8a740bf8c20341

 src/views/business/materialOrder/customsInspectionView.vue

copy from src/views/business/materialOrder/customsInspection.vue
copy to src/views/business/materialOrder/customsInspectionView.vue
Îļþ´Ó src/views/business/materialOrder/customsInspection.vue ¸´ÖÆ
@@ -32,17 +32,17 @@
      <el-form ref="addObj" :inline="true" :model="addObj" :rules="addObjRules" label-width="90px">
        <el-row>
          <el-col :span="6">
            <el-form-item class="addObj-form-item" label="采购订单号:">
            <el-form-item class="addObj-form-item" label="采购订单号:" prop="orderNo">
              <el-input v-model="addObj.orderNo" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item class="addObj-form-item" label="委托单位:">
            <el-form-item class="addObj-form-item" label="委托单位:" prop="company">
              <el-input v-model="addObj.company" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item class="addObj-form-item" label="接收时间:">
            <el-form-item class="addObj-form-item" label="接收时间:" prop="receiverDate">
              <el-date-picker
                v-model="addObj.receiverDate"
                disabled
@@ -55,29 +55,29 @@
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item class="addObj-form-item" label="零件号:">
            <el-form-item class="addObj-form-item" label="零件号:" prop="partNo">
              <el-input v-model="addObj.partNo" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="6">
            <el-form-item class="addObj-form-item" label="样品名称:">
            <el-form-item class="addObj-form-item" label="样品名称:" prop="sample">
              <el-input v-model="addObj.sample" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item class="addObj-form-item" label="样品总数:">
            <el-form-item class="addObj-form-item" label="样品总数:" prop="qtyArrived">
              <el-input v-model="addObj.qtyArrived" class="addObj-info" clearable disabled placeholder="" size="small"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item class="addObj-form-item" label="报检人:">
            <el-form-item class="addObj-form-item" label="报检人:" prop="declareUser">
              <el-input v-model="addObj.declareUser" class="addObj-info" clearable disabled size="small"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item class="addObj-form-item" label="批次号:">
            <el-form-item class="addObj-form-item" label="批次号:" prop="updateBatchNo">
              <el-input v-model="addObj.updateBatchNo" class="addObj-info" clearable disabled size="small"></el-input>
            </el-form-item>
          </el-col>
@@ -133,7 +133,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item class="addObj-form-item" label="备注:">
            <el-form-item class="addObj-form-item" label="备注:" prop="remark">
              <el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2}" :disabled="active>1" :placeholder="active>1 ? '' : '请输入'" clearable
                        size="small" type="textarea"></el-input>
            </el-form-item>
@@ -356,10 +356,9 @@
      </span>
    </el-dialog>
    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false"
               :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
               :show-close="false" :visible.sync="bsm3Dia"
               title="区间值填写" width="800px">
      <el-table :data="editTable" height="80vh" style="width: 100%">
      <el-table :data="editTable" height="80vh" style="width: 100%" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
        <!-- inspectionItemList -->
        <el-table-column label="检验项" prop="inspectionItemList" width="180">
        </el-table-column>
@@ -450,7 +449,7 @@
} from "@/api/business/rawMaterialOrder";

export default {
  name: "CustomsInspection",
  name: "CustomsInspectionView",
  dicts: ['check_type', 'urgency_level'],
  components: {},
  props: {
@@ -609,6 +608,7 @@
  watch: {
    sampleList() {
      this.addObj.method = null
      this.productList = []
    },
    productList: {
      deep: true,
@@ -652,11 +652,9 @@
    this.customsInspection = this.$route.query.customsInspection
    this.getInfo();
  },
  getInfo() {
    this.getUserNowList() // èŽ·å–当前用户信息
    this.selectStandardMethods() // èŽ·å–检验标准下拉框数据
    this.getInfo() // èŽ·å–数据
  },
  // getInfo() {
  //   this.getInfo() // èŽ·å–数据
  // },
  methods: {
    save1 () {
      if (this.bsm1DiaList.length > 0) {
@@ -697,6 +695,8 @@
    },
    // èŽ·å–数据
    getInfo () {
      this.getUserNowList() // èŽ·å–当前用户信息
      this.selectStandardMethods() // èŽ·å–检验标准下拉框数据
      if (this.active == 2) {
        let orderId = ''
        if (!this.customsInspection.enterOrderId && this.customsInspection.quarterOrderId) {