Merge remote-tracking branch 'origin/master'

k94314517

2025-04-11 4d4394311a96e15ea204e2cae03dda00750d0fdd

 admin/src/components/business/OperaWorkorderDetailDcaWindow.vue

@@ -29,6 +29,10 @@
              <div class="value">{{ info.companyName }} </div>
            </div>
            <div class="item">
              <div class="label">观察主题</div>
              <div class="value">{{ info.typeName }}</div>
            </div>
            <div class="item">
              <div class="label">上报时间</div>
              <div class="value">{{ info.submitDate }}</div>
            </div>
@@ -37,11 +41,7 @@
              <div class="value">{{ info.happenTime}}</div>
            </div>
            <div class="item">
              <div class="label">观察主题</div>
              <div class="value">{{ info.typeName }}</div>
            </div>
            <div class="item">
              <div class="label">发生地点</div>
              <div class="label">位置</div>
              <div class="value">{{ info.locationName }}</div>
            </div>
            <div class="item">
@@ -79,15 +79,20 @@
        <div class="table_info">
          <div class="title">不符合项工单列表</div>
          <el-table :data="info.dcaChildList" border fit>
            <el-table-column label="一级主题" prop="typeName" min-width="150"> </el-table-column>
            <el-table-column label="二级主题" prop="categoryName" min-width="150"> </el-table-column>
            <el-table-column label="观察项" prop="problemTitle" min-width="150"> </el-table-column>
            <el-table-column label="工单号" prop="code" min-width="100">
              <template slot-scope="{row}">
                <span style="color: #2E68EC;cursor: pointer" @click="$refs.OperaWorkorderDetailDcaInfoWindow.open('DCA不符合项工单详情', row)" >{{ row.code || '-'}}</span>
              </template>
            </el-table-column>
            <el-table-column label="一级主题" prop="typeName" min-width="60"> </el-table-column>
            <el-table-column label="二级主题" prop="categoryName" min-width="60"> </el-table-column>
            <el-table-column label="观察项" prop="problemTitle" min-width="100"> </el-table-column>
            <el-table-column label="不符合原因" prop="eventInfo" min-width="120" />
            <el-table-column label="处理状态" prop="status" min-width="80">
              <template slot-scope="{row}">
                <span v-if="row.status ==0">待处理</span>
                <span v-else-if="row.status ==3 ||row.status ==4||row.status ==5">已处理</span>
                <span v-else>处理中</span>
                <span :class="'statusInfo'+row.status" v-if="row.status ==0">待处理</span>
                <span :class="'statusInfo'+row.status" v-else-if="row.status ==3 ||row.status ==4||row.status ==5">已处理</span>
                <span :class="'statusInfo'+row.status" v-else>处理中</span>
              </template>
            </el-table-column>
            <el-table-column label="操作" prop="status" min-width="80">