Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-r...

spring

2025-03-26 1997d52296ee89f4b7833c19e2e37ea2b5408e22

 src/views/business/rawMaterialInspection/index.vue

@@ -21,7 +21,7 @@
            <el-select v-model="componentData.inspectionType" clearable placeholder="请选择" size="small"
              @change="refreshTable" style="width: 100%">
              <el-option label="原辅料" value="原辅料"></el-option>
              <el-option label="包采" value="包采"></el-option>
              <el-option label="包材" value="包材"></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="供应商" prop="supplierName" v-if="(tabIndex === 3 || tabIndex === 4)">
@@ -71,7 +71,7 @@
          <el-button v-show="tabIndex === 4" :loading="outLoading" size="small" type="primary"
            @click="handleDown">导出</el-button>
          <el-button v-if="tabIndex === 0" :loading="btnLoading" size="small" type="primary"
            @click="openIFS">获取IFS订单</el-button>
            @click="openIFS">获取订单</el-button>
          <el-button v-if="tabIndex === 0" size="small" type="primary" @click="declareS">报检</el-button>
          <el-button v-if="tabIndex === 0" size="small" type="primary" @click="addDeclare">新增报检信息</el-button>
        </div>
@@ -156,7 +156,7 @@
          <el-select v-model="declareObj.inspectionType" :disabled="declareType !== 'add'" clearable class="addObj-info"
            size="small" placeholder="请选择报检类型">
            <el-option label="原辅料" value="原辅料"></el-option>
            <el-option label="包采" value="包采"></el-option>
            <el-option label="包材" value="包材"></el-option>
          </el-select>
        </el-form-item>
      </el-form>
@@ -191,8 +191,10 @@
    <!-- IFS 选择弹框 -->
    <el-dialog title="选择类型" :visible.sync="ifsDialogVisible" width="30%" append-to-body>
      <div style="text-align: center;">
        <el-button type="primary" size="medium" style="margin: 0 10px;" @click="handleIfsSelect('原辅料')">获取MES原辅料数据</el-button>
        <el-button type="primary" size="medium" style="margin: 0 10px;" @click="handleIfsSelect('包采')">获取MES包采数据</el-button>
        <el-button type="primary" size="medium" style="margin: 0 10px;"
          @click="handleIfsSelect('原辅料')">获取MES原辅料订单</el-button>
        <el-button type="primary" size="medium" style="margin: 0 10px;"
          @click="handleIfsSelect('包材')">获取MES包材订单</el-button>
      </div>
    </el-dialog>
    <!--数据查看弹框-->
@@ -260,7 +262,16 @@
            }
          }
        },
        { label: '报检类型', prop: 'inspectionType' },
        {
          label: '报检类型', prop: 'inspectionType', dataType: 'tag',
          formatType: (params) => {
            if (params == '原辅料') {
              return 'success'
            } else {
              return 'warning'
            }
          }
        },
        { label: '订单号', prop: 'orderNo' },
        { label: '抵达的采购数量', prop: 'qtyArrived', width: '140px', },
        { label: '批号', prop: 'updateBatchNo' },
@@ -292,6 +303,7 @@
        {
          dataType: 'action',
          label: '操作',
          fixed: 'right',
          operation: [
            {
              name: '报检',
@@ -313,16 +325,16 @@
                return this.tabIndex === 0
              },
            },
            {
              name: '撤销报检',
              type: 'text',
              clickFun: (row) => {
                this.cancelDeclare(row);
              },
              showHide: (row) => {
                return this.tabIndex === 1
              },
            },
            // {
            //   name: '撤销报检',
            //   type: 'text',
            //   clickFun: (row) => {
            //     this.cancelDeclare(row);
            //   },
            //   showHide: (row) => {
            //     return this.tabIndex === 1
            //   },
            // },
          ]
        }
      ],
@@ -532,6 +544,9 @@
        buyUnitMeas: [
          { required: false, message: '请填写单位', trigger: 'blur' }
        ],
        inspectionType: [
          { required: true, message: '请填写报检类型', trigger: 'change' }
        ],
      },
      tabList: [
        {