zouyu
2 天以前 3d61c610c0aa2276ad838f5906bf0b25492ab211
数采调整
已修改5个文件
34 ■■■■ 文件已修改
src/api/business/rawMaterialOrder.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/inspection.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/materialOrder/index.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/login.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/business/rawMaterialOrder.js
@@ -295,3 +295,10 @@
    data: query
  })
}
// 根据ifsId查询下单数量
export function getOrderCountByIfsId(ifsId) {
  return request({
    url: '/rawMaterialOrder/getOrderCountByIfsId/'+ifsId,
    method: 'get',
  })
}
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -471,8 +471,8 @@
        deviceId: this.deviceId,
        inspectionItem: row.inspectionItem.trim(),
        isDevice: true,
        inspectionItemSubclass: row.inspectionItemSubclass.trim(),
        inspectionItemClass: row.inspectionItemClass.trim(),
        inspectionItemSubclass: row.inspectionItemSubclass?row.inspectionItemSubclass.trim():"",
        inspectionItemClass: row.inspectionItemClass?row.inspectionItemClass.trim():"",
        structureItemParameterId: row.structureItemParameterId
      }).then(res => {
        const data = res.data;
src/views/business/inspectionTask/inspection.vue
@@ -20,7 +20,7 @@
        <el-button v-if="insOrder.ifsOrderType && insOrder.ifsOrderType==='02wg'" size="small" type="primary" @click="showMaterialPropsDialog">IFS物料属性更新</el-button>
        <el-button size="small" type="primary" @click="refreshView">刷新</el-button>
        <el-button v-if="typeSource == 1" size="small" type="primary" @click="openPurchase">进货验证</el-button>
        <el-button v-if="state == 1 && [0,1].includes(typeSource)" size="small" type="primary"
        <el-button v-if="state == 1 && [0,1].includes(Number(typeSource))" size="small" type="primary"
          @click="openUnPassDialog('add')">不合格处理</el-button>
        <el-button size="small" type="primary" @click="sampleVisible = true; uploadSample();">样品切换</el-button>
        <!--        <el-button v-if="state == 1" size="small" type="primary" @click="taskVisible = true">任务切换</el-button>-->
@@ -1167,7 +1167,7 @@
        laboratory: this.sonLaboratory,
      }).then(async (res) => {
        this.insOrder = res.data.insOrder;
        if(res.data.insOrder.ifsOrderType){
        if(res.data.insOrder.ifsOrderType==='02wg'){
          //查询零件属性
          this.getPartProps(res.data.insOrder.ifsInventoryId)
        }
src/views/business/materialOrder/index.vue
@@ -201,7 +201,8 @@
  repealEnterRawOrder,
  repealQuarterRawOrder,
  revokeInspectionReport,
  updateEntrustCode
  updateEntrustCode,
  getOrderCountByIfsId
} from "@/api/business/rawMaterialOrder";
import { getWarehouseSubmit } from "@/api/business/materialInspection";
import {mapGetters} from "vuex";
@@ -1190,7 +1191,17 @@
    },
    // 下单
    playOrder(row) {
      this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: {isOutsourcing:'f', orderType: 0, customsInspection: row, active: 1 } });
      //查询当前批次是否已经下单
      getOrderCountByIfsId(row.id).then(res=>{
        if(res.code===200 && res.data>0){
          this.$message.warning('该批次已下单,请勿重复下单')
          this.refreshTable('page')
          return
        }
        this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: {isOutsourcing:'f', orderType: 0, customsInspection: row, active: 1 } });
      }).catch(error=>{
        console.error(error)
      })
    },
    // 季度检验下单
    playOrderSec(row) {
src/views/login.vue
@@ -58,8 +58,8 @@
    return {
      codeUrl: "",
      loginForm: {
        username: "admin",
        password: "zttZTT123!",
        username: "ZT-",
        password: "",
        rememberMe: false,
        code: "",
        uuid: ""