gaoluyang
2024-07-19 d38a28af8dd63fc7cf6008fae5a078bdccdf8025
src/components/view/b1-expenses.vue
@@ -73,7 +73,7 @@
            <el-select @focus="getCompanyOptions" @change="refreshTable()" clearable
                       size="small" v-model="componentData.entity.company" style="width: 100%">
              <el-option v-for="item in companyOptions" :key="item.value"
                         :label="item.label" :value="item.value">
                         :label="item.label" :value="item.label">
              </el-option>
            </el-select>
          </div>
@@ -86,7 +86,7 @@
      </div>
      <div class="table">
        <ValueTable ref="ValueTable" :url="$api.insOrder.costStatistics" :componentData="componentData" :key="upIndex"
          @handleWeave="handleWeave" />
          @handleWeave="handleWeave" :column-min-width="'140'"/>
      </div>
    </div>
    <el-dialog title="在线编制" :visible.sync="claimVisible" width="70%" :modal-append-to-body="false">
@@ -114,7 +114,7 @@
            company: null,
            dates: null,
            orderBy: {
              field: 'id,ins_sample_id',
              field: 'id',
              order: 'asc'
            }
          },
@@ -135,6 +135,14 @@
                name: 'entrustCode',
                index: 2
              },
              /* {
                name: 'sample',
                index: 3
              },
              {
                name: 'model',
                index: 4
              }, */
              {
                name: 'company',
                index: 8
@@ -145,8 +153,8 @@
              },
            ],
            // 特殊的合并行,根据main和rows的name来合并
            special: {
              main: 'insSampleId',
            /* special: {
              main: 'entrustCode',
              rows: [{
                  name: 'sample',
                  index: 3
@@ -164,7 +172,7 @@
                  index: 6
                },
              ]
            }
            } */
          },
          tagField: {
            type: {