Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-31 3f4362c22608464d251936b9bc4feabe3286aa5e

Merge remote-tracking branch 'origin/master'

 src/components/do/b3-personnel-evaluation/evaluation.vue

@@ -36,6 +36,7 @@
        selectField: {},
        requiredAdd: [],
        requiredUp: [],
        needSort: ['name'],
      },
      upIndex:0,
    }

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

@@ -48,56 +48,57 @@
  data () {
    return{
      componentData: {
                    entity: {
                        number: null,
                        department: null,
                        laboratory: null,
                        orderBy: {
                            field: 'id',
                            order: 'desc'
                        }
                    },
                    isIndex: true,
                    showSelect: false,
                    select: true,
                    do: [{
                        id: 'delete',
                        font: '删除',
                        type: 'text',
                        method: 'doDiy'
                    }, {
                        id: 'update',
                        font: '编辑',
                        type: 'text',
                        method: 'doDiy',
            field: ['department']
                    }],
                    tagField: {
                        laboratory: {
                            select: []
                        },
                        unit: {
                            select: []
                        },
                        // department: {
                        //     select: []
                        // },
                    },
                    linkEvent: {
                    },
                    selectField: {
                        laboratory: {
                            select: []
                        },
                        unit: {
                            select: []
                        },
                        // department: {
                        //     select: []
                        // },
                    },
                    requiredAdd: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour'],
                    requiredUp: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour']
        entity: {
          number: null,
          department: null,
          laboratory: null,
          orderBy: {
            field: 'id',
            order: 'desc'
          }
        },
        isIndex: true,
        showSelect: false,
        select: true,
        do: [{
          id: 'delete',
          font: '删除',
          type: 'text',
          method: 'doDiy'
        }, {
          id: 'update',
          font: '编辑',
          type: 'text',
          method: 'doDiy',
          field: ['department']
        }],
        tagField: {
          laboratory: {
            select: []
          },
          unit: {
            select: []
          },
          // department: {
          //     select: []
          // },
        },
        linkEvent: {
        },
        selectField: {
          laboratory: {
            select: []
          },
          unit: {
            select: []
          },
          // department: {
          //     select: []
          // },
        },
        needSort: ['auxiliaryProject'],
        requiredAdd: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour'],
        requiredUp: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour']
            },
      entityCopy: {},
            upIndex: 0,

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

@@ -332,7 +332,8 @@
          }
        },
        requiredAdd: [],
        requiredUp: []
        requiredUp: [],
        needSort: ['createTime', 'name']
            },
      entityCopy: {},
            upIndex: 0,

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

@@ -84,50 +84,48 @@
      down:false,
      up:false,
      componentData: {
                    entity: {
                        month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
                        name: null,
                        departLims: null,
                    },
                    isIndex: true,
                    showSelect: false,
                    select: false,
                    do: [],
                    tagField: {},
                    linkEvent: {},
                    selectField: {},
                    requiredAdd: [],
                    requiredUp: [],
          accept: '.xlsx',
        sort: false,
          inputType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
          cellSpecialStyle:{
            redColorByKey:'Hours'
          }
        entity: {
          month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
          name: null,
          departLims: null,
        },
        isIndex: true,
        showSelect: false,
        select: false,
        do: [],
        tagField: {},
        linkEvent: {},
        selectField: {},
        requiredAdd: [],
        requiredUp: [],
        accept: '.xlsx',
        inputType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
        cellSpecialStyle:{
          redColorByKey:'Hours'
        },
            },
      componentData0: {
                    entity: {
                        month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
                        name: null,
                        departLims: null,
                        orderBy: {
                            field: 'id',
                            order: 'desc'
                        }
                    },
        sort: false,
                    isIndex: true,
                    showSelect: false,
                    select: false,
                    do: [],
                    tagField: {},
                    linkEvent: {
                        },
                    selectField: {},
                    requiredAdd: [],
                    requiredUp: [],
          accept: '.xlsx',
          inputType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
        entity: {
          month: getYearAndMonthAndDays().split('-')[0]+'-'+getYearAndMonthAndDays().split('-')[1],
          name: null,
          departLims: null,
          orderBy: {
            field: 'id',
            order: 'desc'
          }
        },
        isIndex: true,
        showSelect: false,
        select: false,
        do: [],
        tagField: {},
        linkEvent: {
        },
        selectField: {},
        requiredAdd: [],
        requiredUp: [],
        accept: '.xlsx',
        inputType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
            },
      entity:{
        month:getYearAndMonthAndDays(),

 src/components/tool/value-table.vue

@@ -123,7 +123,7 @@
        </el-table-column>
        <el-table-column type="index" align="center" label="序号" :width="selectionWidth" v-if="data.isIndex" :key="Math.random()">
        </el-table-column>
        <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'" :isColumnWidth="isColumnWidth" :width="a.width" :isShowZero="isShowZero"
        <el-table-column :prop="a.label" :label="a.value" :sortable="a.sort === 'custom' ? 'custom' : false" :isColumnWidth="isColumnWidth" :width="a.width" :isShowZero="isShowZero"
          v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))">
          <template slot-scope="scope">
            <div v-if="showType(a.label, data.tagField) != null">
@@ -624,6 +624,15 @@
          this.total = res.data.body.total
          this.tableHead = res.data.head
          this.tableData = res.data.body.records
          if (this.data.needSort !== undefined) {
            for (var i = 0; i < this.data.needSort.length; i++) {
              this.tableHead.forEach(item => {
                if (item.label === this.data.needSort[i]) {
                  item.sort = 'custom'
                }
              })
            }
          }
          if (this.isShowZero) {
            this.tableData.map(item => {
              Object.keys(item).forEach(val => {
@@ -641,7 +650,7 @@
              if (item.value.length === 4) {
                item.width = 120
              } else if (item.value.length === 3){
                item.width = this.data.sort === false && item.label.includes('Hours') ? 50 : 100
                item.width = item.label.includes('Hours') ? 50 : 100
              } else if (item.value.length === 5){
                item.width = 130
              } else if (item.value.length === 7){
@@ -649,12 +658,13 @@
              } else if (item.value.length === 6){
                item.width = 150
              }  else if (item.value.length === 2){
                item.width = this.data.sort === false && item.label.includes('Hours') ? 52 : 86
                item.width = item.label.includes('Hours') ? 52 : 86
              } else {
                item.width = this.data.sort === false && item.label.includes('Hours') ? 46 : 86
                item.width = item.label.includes('Hours') ? 46 : 86
              }
            })
          }

          // console.log(JSON.stringify(this.tableHead)+"---------"+JSON.stringify(this.tableData))
          for (var a in this.data.selectField) {
            if (this.data.selectField[a].choose == true) {

 src/components/view/a5-capacity-scope.vue

@@ -265,7 +265,8 @@
            'unit', 'method', 'manDay', 'templateId'
          ],
          accept: '.xlsx',
          inputType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
          inputType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
          needSort: ['createTime', 'updateTime', 'inspectionItem', 'inspectionItemSubclass', 'sample'],
        },
        testObjectData: {
          entity: {
@@ -305,7 +306,8 @@
            }
          },
          requiredAdd: ['specimenName', 'code', 'laboratoryId'],
          requiredUp: ['specimenName', 'code', 'laboratoryId']
          requiredUp: ['specimenName', 'code', 'laboratoryId'],
          needSort: ['createTime', 'updateTime', 'specimenName'],
        },
        itemParameterEntityCopy: {},
        testObjectDataEntityCopy: {},

 src/components/view/a5-laboratory-management.vue

@@ -199,7 +199,8 @@
                    },
                    selectField: {},
                    requiredAdd: ['laboratoryName', 'laboratoryNumber', 'head', 'phoneNumber'],
                    requiredUp: ['laboratoryName', 'laboratoryNumber', 'head', 'phoneNumber']
                    requiredUp: ['laboratoryName', 'laboratoryNumber', 'head', 'phoneNumber'],
          needSort: ['laboratoryName', 'createTime'],
                },
        fileComponentData: {
                    entity: {

 src/components/view/a5-laboratory-qualifications.vue

@@ -305,7 +305,8 @@
                        },
                    },
                    requiredAdd: [],
                    requiredUp: []
                    requiredUp: [],
          needSort: ['firstIssuanceDate', 'latestIssuanceDate', 'expireTime', 'name'],
                },
                itemParameterEntityCopy: {},
                upIndex: 0,

 src/components/view/a6-device-management.vue

@@ -529,7 +529,8 @@
            }
                    },
                    requiredAdd: [],
                    requiredUp: []
                    requiredUp: [],
          needSort: ['deviceName', 'acquisitionDate', 'activationDate', 'lastCalibrationDate', 'nextCalibrationDate', 'deviceStatus'],
                },
                entityCopy: {},
                upIndex: 0,

 src/components/view/a6-standard-material-list.vue

@@ -109,7 +109,8 @@
          tagField: [],
          selectField: [],
          requiredAdd: ['model','sample',],
          requiredUp: []
          requiredUp: [],
          needSort: ['sample'],
        },
        entityCopy: {},
        upIndex: 0,

 src/components/view/a7-standard-method.vue

@@ -170,6 +170,7 @@
          requiredAdd: ['code', 'name', 'isProduct', 'isUse', 'nameEn'],
          requiredUp: ['code', 'name', 'isProduct', 'isUse', 'nameEn'],
          accept: '.xlsx',
          needSort: ['createTime', 'updateTime', 'field'],
          inputType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
        },
        entityCopy: {},

 src/components/view/b1-expenses.vue

@@ -88,7 +88,8 @@
        </div>
      </div>
      <div class="table">
        <ValueTable ref="ValueTable" :url="$api.insOrder.costStatistics" :componentData="componentData" :key="upIndex"
        <ValueTable ref="ValueTable" :url="$api.insOrder.costStatistics"
                    :componentData="componentData" :key="upIndex"
          @handleWeave="handleWeave" :column-min-width="'140'"/>
      </div>
    </div>
@@ -197,7 +198,8 @@
          },
          selectField: {},
          requiredAdd: [],
          requiredUp: []
          requiredUp: [],
          needSort: ['createTime', 'sample'],
        },
        entityCopy: {},
        upIndex: 0,

 src/components/view/b1-inspect-order-plan.vue

@@ -155,6 +155,7 @@
                    </el-row>
                </div>
                <ValueTable :tableRowClassName="changeRowClass" class="value-table" ref="insOrderPlan"
                    :isColumnWidth="true"
                    :url="$api.insOrderPlan.selectInsOrderPlanList" :upUrl="$api.user.updateUser" :componentData="componentData" @handleInspection="handleInspection"
                    :key="upIndex"/>
            </div>
@@ -239,8 +240,8 @@
                    isIndex: true,
                    showSelect: false,
                    select: false,
                    sort: false,
                    init: false,
          needSort: ['createTime', 'sendTime', 'type', 'appointed', 'insState'],
                    do: [{
                            id: '',
                            font: '检验',

 src/components/view/b1-inspection-order.vue

@@ -231,7 +231,9 @@
                <ul class="tab">
                    <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
                </ul>
                <ValueTable :style="getStyle()" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
                <ValueTable :style="getStyle()" ref="ValueTable"
                    :isColumnWidth="true"
                    :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
                    :key="'b'+upIndex"  />
            </div>
            <!-- 审核 -->
@@ -583,7 +585,8 @@
                    },
                    selectField: {},
                    requiredAdd: [],
                    requiredUp: []
                    requiredUp: [],
          needSort: ['createTime', 'sendTime', 'type', 'appointed']
                },
                componentDataDataLook: {
                    entity: {

 src/components/view/b1-report-preparation.vue

@@ -84,7 +84,9 @@
      </div>
      <!-- <input id="input" type="file" accept=".doc,.docx"></input> -->
      <div class="table">
        <ValueTable ref="ValueTable" :url="$api.insReport.pageInsReport" :componentData="componentData"
        <ValueTable ref="ValueTable" :url="$api.insReport.pageInsReport"
                    :isColumnWidth="true"
                    :componentData="componentData"
          :key="upIndex" />
      </div>
    </div>
@@ -277,6 +279,7 @@
          },
          selectField: {},
          requiredAdd: [],
          needSort: ['createTime', 'state', 'writeTime', 'isExamine', 'examineTime', 'ratifyTime'],
          requiredUp: []
        },
        entityCopy: {},

 src/components/view/b1-unpass.vue

@@ -103,7 +103,8 @@
          tagField: [],
          selectField: [],
          requiredAdd: ['model','sample',],
          requiredUp: []
          requiredUp: [],
          needSort: ['sample'],
        },
        entityCopy: {},
        upIndex: 0,

 src/components/view/b2-standard-template.vue

@@ -112,7 +112,8 @@
                    tagField: {},
                    selectField: {},
                    requiredAdd: ['name'],
                    requiredUp: ['name']
                    requiredUp: ['name'],
          needSort: ['createTime', 'updateTime', 'name'],
                },
                entityCopy: {},
                upIndex: 0,

 src/components/view/custom_manage.vue

@@ -247,6 +247,7 @@
                        }
                    },
                    selectField: {},
          needSort: ['company'],
                }
            }
        },

 src/components/view/enums.vue

@@ -170,7 +170,8 @@
            ],
          },
                    requiredAdd:['category','label','value'],
                    requiredUp:['category','label','value']
                    requiredUp:['category','label','value'],
          needSort: ['createTime', 'updateTime', 'type'],
                },
                entityCopy: {},
                upIndex: 0,

 src/components/view/person-manage.vue

@@ -329,6 +329,7 @@
            accept: '.png, .jpg, .jpeg, .gif',
            url: this.$api.deviceScope.uploadFile
          },
          needSort: ['name', 'state'],
        },
        entityCopy: {},
        upIndex: 0,

 src/components/view/role-manage.vue

@@ -150,7 +150,8 @@
              select: []
            }
          },
          selectField: {}
          selectField: {},
          needSort: ['createTime', 'updateTime', 'name'],
        },
        entityCopy: {},
        upIndex: 0,

 src/components/view/system-log.vue

@@ -87,7 +87,8 @@
                    tagField: {},
                    selectField: {},
                    requiredAdd:[],
                    requiredUp:[]
                    requiredUp:[],
          needSort: ['createTime'],
                },
                entityCopy: {},
                upIndex: 0