Merge remote-tracking branch 'origin/master'

王震

2023-09-09 172c09e3c59dccd870a0e464f045ca33789cd107

Merge remote-tracking branch 'origin/master'

 src/assets/api/controller.js

@@ -23,6 +23,7 @@
    updateRawInspectsById: "/rawInspect/updateRawInspectsById/", //上报,
    rawSelectDevice: "/rawInsProduct/selectDevice", //查询设备信息
    addRawInspects: "/rawInspect/addRawInspects", // 添加
    updateDevByRpId: "/rawInsProduct/updateDevByRpId", // 更改设备
}
//不合格原材料
const unqualifiedaa ={

 src/components/view/rawInsDetail.vue

@@ -51,7 +51,7 @@
              <el-input
                v-if="detailId !== null"
                :disabled="detailId !== null"
                v-model="detailInfo.rname"
                v-model="detailInfo.name"
              ></el-input>
              <el-input
                v-else
@@ -64,7 +64,7 @@
              <el-input
                v-if="detailId !== null"
                :disabled="detailId !== null"
                v-model="detailInfo.rcode"
                v-model="detailInfo.code"
              ></el-input>
              <el-input
                v-else
@@ -190,9 +190,10 @@
            <el-input v-else v-model="scope.row.rpUnit" disabled></el-input>
          </template>
        </el-table-column>
        <el-table-column prop="required" label="标准" min-width="150">
        <el-table-column prop="required" label="标准值" min-width="150">
          <template slot-scope="scope">
            <el-input
              :disabled="detailId != null"
              v-model="scope.row.required"
              placeholder="请输入标准值"
            ></el-input>
@@ -201,6 +202,7 @@
        <el-table-column prop="internal" label="内控值" min-width="150">
          <template slot-scope="scope">
            <el-input
              :disabled="detailId != null"
              v-model="scope.row.internal"
              placeholder="请输入内控值"
            ></el-input>
@@ -272,11 +274,11 @@
      <el-table :data="conclusionTable" style="100%">
        <el-table-column prop="code" label="物料编号"> </el-table-column>
        <el-table-column prop="name" label="物料名称"> </el-table-column>
        <el-table-column prop="names" label="检验员">
        <el-table-column prop="uName" label="检验员">
          <template slot-scope="scope">
            <span
              v-for="item in scope.row.names"
              :key="item && item.userName"
              v-for="item in scope.row.uName"
              :key="item && item.uName"
              :style="{ marginRight: '8px' }"
              >{{ item }}</span
            >
@@ -357,9 +359,8 @@
    this.detailInfo = {};
    if (this.detailId) {
      this.getDetailInfo();
    } else {
      this.getOptions();
    }
    this.getOptions();
  },
  mounted() {},
  computed: {
@@ -367,8 +368,8 @@
      const conclusion = {};
      conclusion.name = this.detailInfo.name;
      conclusion.code = this.detailInfo.code;
      conclusion.names = [
        ...new Set(this.projectTable.map(item => item.userName))
      conclusion.uName = [
        ...new Set(this.projectTable.map(item => item.uName))
      ];
      if (
        this.projectTable.filter(item => item.testState === null).length ===
@@ -409,7 +410,10 @@
        label: "name"
      },
      nodeData: "", // node点击保存当前点击数据
      clickSelectSaveIndex: "" // 点击选择存储列表索引
      clickSelectDevice: {
        index: "", // 点击选择存储当前行索引
        rpId: "" // 点击选择存储当前行项目Id
      }
    };
  },
  watch: {
@@ -434,7 +438,8 @@
          this.detailInfo = res.data;
          this.projectTable = res.data.children;
          this.projectTable.forEach(i => {
            i.testValueList = i.testValue.split(",");
            // 解决重新赋值无法编辑操作
            this.$set(i, "testValueList", i.testValue.split(","));
            // 取最长的列表数
            if (i.testValueList.length > this.empiricalValueAdd) {
              this.empiricalValueAdd = i.testValueList.length;
@@ -465,8 +470,8 @@
      if (this.detailId !== null) {
        const res = await this.$axios.post(this.$api.url.updaterawInsProduct, {
          DevId: row.deviceId,
          rpId: this.detailId,
          testValue: row.testValueList[index]
          rpId: row.rpId,
          testValue: row.testValueList.join(",")
        });
        this.$message.success("提交成功");
        this.getDetailInfo(); //重新刷新信息数据
@@ -510,15 +515,30 @@
    // 点击表格选择触发
    clickTableSelect(scope) {
      this.centerDialogVisible = true;
      this.clickSelectSaveIndex = scope.$index;
      this.clickSelectDevice.index = scope.$index;
      this.clickSelectDevice.rpId = scope.row.rpId;
    },
    // 点击树里面的确定
    clickNodeSure() {
      this.projectTable[this.clickSelectSaveIndex].deviceId = this.nodeData.id;
      this.projectTable[
        this.clickSelectSaveIndex
      ].deviceName = this.nodeData.name;
      this.centerDialogVisible = false;
      if (this.detailId == null) {
        this.projectTable[
          this.clickSelectDevice.index
        ].deviceId = this.nodeData.id;
        this.projectTable[
          this.clickSelectDevice.index
        ].deviceName = this.nodeData.name;
        this.centerDialogVisible = false;
      } else {
        this.$axios
          .post(this.$api.url.updateDevByRpId, {
            rpId: this.clickSelectDevice.rpId,
            devId: this.nodeData.id
          })
          .then(res => {
            this.getDetailInfo();
            this.centerDialogVisible = false;
          });
      }
    },
    // 删除检验值列
    clickDeleteInspectionColumn() {

 src/main.js

@@ -23,7 +23,7 @@
Vue.use(qs);
Vue.use(api);

const javaApi = 'http://192.168.0.23:8001'
const javaApi = 'http://192.168.0.25:8001'

// const javaApi = '192.168.0.6'