Merge remote-tracking branch 'origin/dev' into dev

chenrui

2025-03-13 c4cfd5c566d137fb60781b8b2e0057d11cf4b051

 src/views/standard/standardLibrary/index.vue

@@ -206,7 +206,8 @@
          height: calc(100% - 30px);
          overflow-y: scroll;
          scrollbar-width: none;
        " @node-click="handleNodeClick" @node-expand="nodeOpen" @node-collapse="nodeClose" @node-drop="handleDrop">
        " @node-click="handleNodeClick"
               @node-drop="handleDrop">
        <div slot-scope="{ node, data }" class="custom-tree-node">
          <el-row style="width: 100%">
            <el-col :class="{ sort: node.level > 3 }" :span="19" :title="data.label" style="text-align: left">
@@ -254,6 +255,7 @@
      </el-row>
      <el-row v-loading="tableLoad" class="standard_table">
        <el-table ref="standard" :data="standardList" class="el-table" header-row-class-name="header-class" height="220"
                  :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
          highlight-current-row style="width: 100%; height: 220px !important" tooltip-effect="dark"
          @row-click="rowClick">
          <el-table-column label="标准编号" prop="code" show-overflow-tooltip width="200">
@@ -269,7 +271,8 @@
      </el-row>
      <el-row v-loading="tableLoad2" class="product_table">
        <el-table id="templateParamTable" ref="productTable" v-loading="productTableLoading" :data="productList"
          :fit="true" :row-class-name="tableRowClassName" border class="productTable"
                  :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
          :fit="true" :row-class-name="tableRowClassName" class="productTable"
          header-row-class-name="header-class" height="100%" row-key="id" stripe style="width: 100%"
          tooltip-effect="dark" @select="upProductSelect" @selection-change="handleSelectionChange"
          @select-all="handleAll">
@@ -410,7 +413,8 @@
    </el-dialog>
    <el-dialog :close-on-click-modal="false" :visible.sync="sectionUpDia" title="区间设置" width="80%">
      <div class="body" style="padding: 5px 0">
        <el-table :data="sectionList" border height="350px" style="width: 100%">
        <el-table :data="sectionList" border height="350px" style="width: 100%"
                  :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
          <el-table-column align="center" label="序号" type="index" width="70">
          </el-table-column>
          <el-table-column align="center" label="区间">
@@ -777,7 +781,6 @@
          }
          this.selectTree = data2.replace(" - ", "");
          delStandardTree({ tree: this.selectTree }).then((res) => {
            if (res.code == 201) return;
            this.$message.success("已删除");
            let arr = this.selectTree.split(" - ");
            this.deleteStandard(this.list, arr[arr.length - 1]);
@@ -796,15 +799,6 @@
          item.children && this.deleteStandard(item.children, label);
        }
      });
    },
    nodeOpen(data, node, el) {
      $($(el.$el).find(".node_i")[0]).attr(
        "class",
        "node_i el-icon-folder-opened"
      );
    },
    nodeClose(data, node, el) {
      $($(el.$el).find(".node_i")[0]).attr("class", "node_i el-icon-folder");
    },
    selectEnumByCategoryForFactory() {
      this.getConfigKey("sys_factory").then((response) => {
@@ -887,10 +881,6 @@
      this.addLoad = true;
      addStandardTree(this.addOb)
        .then((res) => {
          if (res.code === 201) {
            this.addLoad = false;
            return;
          }
          this.$message.success("添加成功");
          this.addDia = false;
          this.list
@@ -924,10 +914,6 @@
      this.updateLoad = true;
      updateStandardTree(this.addOb)
        .then((res) => {
          if (res.code === 201) {
            this.updateLoad = false;
            return;
          }
          this.$message.success("添加成功");
          this.$tab.refreshPage();
          // this.selectStandardTreeList();
@@ -961,10 +947,6 @@
          ask: value,
        }),
      }).then((res) => {
        if (res.code == 201) {
          this.$message.error("未保存");
          return;
        }
        this.$message.success("已保存");
      });
    },
@@ -975,10 +957,6 @@
          tell: value,
        }),
      }).then((res) => {
        if (res.code == 201) {
          this.$message.error("未保存");
          return;
        }
        this.$message.success("已保存");
      });
    },
@@ -990,10 +968,6 @@
          methodS: value,
        }),
      }).then((res) => {
        if (res.code == 201) {
          this.$message.error("未保存");
          return;
        }
        this.$message.success("已保存");
      });
    },
@@ -1005,10 +979,6 @@
          radius: value,
        }),
      }).then((res) => {
        if (res.code == 201) {
          this.$message.error("未保存");
          return;
        }
        this.$message.success("已保存");
      });
    },
@@ -1019,10 +989,6 @@
          price: value,
        }),
      }).then((res) => {
        if (res.code == 201) {
          this.$message.error("未保存");
          return;
        }
        this.$message.success("已保存");
      });
    },
@@ -1033,10 +999,6 @@
          manHour: value,
        }),
      }).then((res) => {
        if (res.code == 201) {
          this.$message.error("未保存");
          return;
        }
        this.$message.success("已保存");
      });
    },
@@ -1047,10 +1009,6 @@
          templateId: value,
        }),
      }).then((res) => {
        if (res.code == 201) {
          this.$message.error("未保存");
          return;
        }
        this.$message.success("已保存");
      });
    },
@@ -1131,11 +1089,7 @@
          state: row.state,
        }),
      }).then((res) => {
        if (res.code == 201) {
          this.$message.error("未保存");
          return;
        }
        // this.$message.success('已保存')
        this.$message.success('已保存')
      });
    },
    filterHandler(value) {
@@ -1285,10 +1239,6 @@
          }),
        }).then((res) => {
          this.sectionLoad = false;
          if (res.code == 201) {
            this.$message.error("未保存");
            return;
          }
          this.$message.success("已保存");
          this.sectionUpDia = false;
        });
@@ -1307,10 +1257,6 @@
          },
        }).then((res) => {
          this.sectionLoad = false;
          if (res.code == 201) {
            this.$message.error("未保存");
            return;
          }
          this.$message.success("已保存");
          this.sectionUpDia = false;
          this.currentPage0 = 1;