修复

zss

2024-07-18 15228767ddcd4c8c254ac87c527ebcfbd06e68ac

修复

 src/components/do/b3-work-time-management/work-time-management.vue

@@ -363,13 +363,13 @@
      entityCopy1: {},
      upIndex1:100,
      weekList:[
        {label: '周一', value: '1',type:'primary'},
        {label: '周二', value: '2',type:'primary'},
        {label: '周三', value: '3',type:'primary'},
        {label: '周四', value: '4',type:'primary'},
        {label: '周五', value: '5',type:'primary'},
        {label: '周六', value: '6',type:'primary'},
        {label: '周日', value: '7',type:'primary'}
        {label: '周一', value: '周一',type:'primary'},
        {label: '周二', value: '周二',type:'primary'},
        {label: '周三', value: '周三',type:'primary'},
        {label: '周四', value: '周四',type:'primary'},
        {label: '周五', value: '周五',type:'primary'},
        {label: '周六', value: '周六',type:'primary'},
        {label: '周日', value: '周日',type:'primary'}
      ],
      currentTable:'ValueTable0',
      addVisible:false,
@@ -508,6 +508,7 @@
      this.entity.dateTime.push(formattedDate2);
      this.componentData1.entity.dateTime.push(formattedDate1);
      this.componentData1.entity.dateTime.push(formattedDate2);
      this.componentData1.entity.dateTime = JSON.stringify(this.componentData1.entity.dateTime)
      this.refreshTable()
    },
    getPower(){

 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>
@@ -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: {