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

zhuo

2025-03-17 f05b9e79dbbcc423087e3b6930880dc25945118c

 src/views/business/productOrder/components/add.vue

@@ -298,8 +298,7 @@
        </el-table>
        <el-table ref="productTable" v-loading="getProductLoad" :data="productList"
                  :row-class-name="tableRowClassName" border class="el-table"
                  :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
                  :key="upIndex"
                  :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
          max-height="400px" style="margin-bottom: 10px;" tooltip-effect="dark"
          @select="selectOne" @selection-change="selectProduct" @select-all="handleAll">
          <el-table-column v-if="active==1" :selectable="selectable0" type="selection" width="65"></el-table-column>
@@ -902,7 +901,6 @@
        this.isSpecial = true
        this.$nextTick(() => {
          this.$refs.productTable.doLayout();
          this.upIndex++
        });
      },
      getQuarterOnOrderList () {
@@ -983,7 +981,7 @@
      },
      // 获取用户列表
      getAuthorizedPerson() {
        selectUserCondition().then(res => {
        selectUserCondition({ type: 1 }).then(res => {
          let data = []
          res.data.forEach(a => {
            data.push({
@@ -1650,14 +1648,13 @@
        backtrack([], nums);
        return result;
      },
      tableRowClassName({
        row,
        rowIndex
      }) {
        if (row.state === 0) {
      tableRowClassName({row, rowIndex}) {
        if (row.state == 1) {
          console.log('row.state---', row.state)
          return 'warning-row';
        } else {
          return '';
        }
        return 'warning-row';
      },
      selectInsOrderTemplate() {
        selectInsOrderTemplate({company: this.addObj.company}).then(res => {
@@ -2216,7 +2213,7 @@
</script>

<style scoped>
.el-table .warning-row .cell {
  color: #3A7BFA;
>>>.warning-row {
  color: #1890FF;
}
</style>