Merge remote-tracking branch 'origin/master'

zhaowei

昨天 5ec150affc0fc777b2a645a888d377f65501e08b

Merge remote-tracking branch 'origin/master'

 src/views/eam/base/EamMaintenanceStandardList.vue

@@ -96,6 +96,12 @@
               :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :customRow='clickThenSelect'
               @change="handleTableChange">

        <!--使用部门-->
        <template slot="factoryOrgCode" slot-scope="text,record">
          {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
        </template>

        <span slot="action" slot-scope="text, record">
          <a v-has="'standard:upgrade'" v-if="record.standardStatus === 'START'"
             @click.stop="handleUpgrade(record)">升版</a>
@@ -230,6 +236,11 @@
            dataIndex: 'equipmentModel',
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
          },
          {
            title: '规范状态',
            align: 'center',
            dataIndex: 'standardStatus_dictText',

 src/views/eam/maintenance/EamInspectionOrderList.vue

@@ -83,6 +83,12 @@
               :dataSource="dataSource" :pagination="ipagination" :loading="loading"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" class="j-table-force-nowrap"
               @change="handleTableChange">

        <!--使用部门-->
        <template slot="factoryOrgCode" slot-scope="text,record">
          {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
        </template>

        <span slot="action" slot-scope="text, record">
          <template v-if=" record.inspectionStatus === 'WAIT_INSPECTION'">
            <a @click="handleEdit(record)">编辑</a>
@@ -193,6 +199,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '点检状态',
            align: 'center',
            dataIndex: 'inspectionStatus_dictText',

 src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue

@@ -93,6 +93,12 @@
      <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
               :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" :scroll="{x:'max-content'}"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange">

        <!--使用部门-->
        <template slot="factoryOrgCode" slot-scope="text,record">
          {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
        </template>

        <span slot="action" slot-scope="text, record">
          <template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE'">
            <a v-has="'secondMaintenanceOrder:edit'" @click="handleEdit(record)">编辑</a>
@@ -220,6 +226,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '保养状态',
            align: 'center',
            dataIndex: 'maintenanceStatus_dictText',

 src/views/eam/maintenance/EamThirdMaintenanceChangeList.vue

@@ -40,6 +40,12 @@
    <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
             :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
             @change="handleTableChange">

      <!--使用部门-->
      <template slot="factoryCode" slot-scope="text,record">
        {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
      </template>

        <span slot="action" slot-scope="text, record">
          <template v-if="record.changeStatus=='WAIT_SUBMIT'">
            <a @click="handleEdit(record)">编辑</a>
@@ -131,6 +137,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryCode' },
            fixed: 'left'
          },
          {
            title: '变更状态',
            align: 'center',
            dataIndex: 'changeStatus_dictText',

 src/views/eam/maintenance/EamThirdMaintenanceFurnaceList.vue

@@ -74,6 +74,11 @@
          <a-switch v-if="text" checked-children="是" un-checked-children="否" :checked="Boolean(+text)" disabled/>
        </template>

        <!--使用部门-->
        <template slot="factoryOrgCode" slot-scope="text,record">
          {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
        </template>

        <span slot="action" slot-scope="text, record">
          <template v-if="record.maintenanceStatus==='WAIT_MAINTENANCE'">
             <a @click="handleEdit(record)">编辑</a>
@@ -159,6 +164,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '保养状态',
            align: 'center',
            dataIndex: 'maintenanceStatus_dictText',

 src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue

@@ -63,6 +63,12 @@
             :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">

      <!--使用部门-->
      <template slot="factoryOrgCode" slot-scope="text,record">
        {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
      </template>

        <span slot="action" slot-scope="text, record">
          <template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE'">
            <a-popconfirm title="确定领取吗?" @confirm="() => handlerCollect(record.id)">
@@ -170,6 +176,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '保养状态',
            align: 'center',
            dataIndex: 'maintenanceStatus_dictText',

 src/views/eam/repair/EamRepairOrderList.vue

@@ -61,6 +61,12 @@
               :pagination="ipagination" :loading="loading"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"
               :scroll="{x:'max-content'}">

        <!--使用部门-->
        <template slot="factoryOrgCode" slot-scope="text,record">
          {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
        </template>

        <span slot="action" slot-scope="text, record">
          <template v-if="record.repairStatus=='PENDING_REPAIR'||record.repairStatus=='UNDER_MAINTENANCE' ||record.repairStatus=='REJECTED'">
            <a-popconfirm v-if="record.claimStatus=='0' || record.claimStatus==null " title="确定提交吗?" @confirm="() => handleClaim(record.id)">
@@ -161,6 +167,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '维修状态',
            align: 'center',
            dataIndex: 'repairStatus_dictText',

 src/views/eam/repair/EamReportAccidentsRegisterList.vue

@@ -68,6 +68,11 @@
        <a-switch v-if="text" checked-children="同意" un-checked-children="不同意" :checked="Boolean(text)" disabled/>
      </template>

      <!--使用部门-->
      <template slot="factoryOrgCode" slot-scope="text,record">
        {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
      </template>

      <span slot="action" slot-scope="text, record">
          <template v-if="record.registerStatus==='PENDING_SUBMIT'">
             <a @click="handleEdit(record)">编辑</a>
@@ -162,6 +167,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '登记状态',
            align: 'center',
            dataIndex: 'registerStatus_dictText',

 src/views/eam/repair/EamReportProductHazardsList.vue

@@ -52,6 +52,11 @@
               :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange">

        <!--使用部门-->
        <template slot="factoryOrgCode" slot-scope="text,record">
          {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
        </template>

      <span slot="action" slot-scope="text, record">
          <template v-if="record.confirmStatus==='PENDING_SUBMIT'">
             <a @click="handleEdit(record)">编辑</a>
@@ -150,6 +155,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '确认状态',
            align: 'center',
            dataIndex: 'confirmStatus_dictText',

 src/views/eam/repair/EamReportRepairList.vue

@@ -89,6 +89,11 @@
          <a-switch checked-children="是" un-checked-children="否" :checked="Boolean(+text)" disabled/>
        </template>

        <!--使用部门-->
        <template slot="factoryOrgCode" slot-scope="text,record">
          {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
        </template>

        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>

@@ -184,6 +189,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '报修状态',
            align: 'center',
            dataIndex: 'reportStatus_dictText',

 src/views/eam/repair/EamReportThreeNoSpareList.vue

@@ -60,6 +60,12 @@
               :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}"
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
               @change="handleTableChange">

        <!--使用部门-->
        <template slot="factoryOrgCode" slot-scope="text,record">
          {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
        </template>

        <span slot="action" slot-scope="text, record">
          <template>
             <a v-if="record.submitStatus=='PENDING_SUBMIT'||record.submitStatus=='REJECTED'"
@@ -184,6 +190,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '状态',
            align: 'center',
            dataIndex: 'submitStatus_dictText',

 src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue

@@ -53,6 +53,11 @@
    <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
             :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange">

      <!--使用部门-->
      <template slot="factoryCode" slot-scope="text,record">
        {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
      </template>

        <span slot="action" slot-scope="text, record">
          <template v-if="record.applicationStatus=='WAIT_SUBMIT'">
          <a @click.stop="handleEdit(record)">编辑</a>
@@ -138,6 +143,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryCode' },
            fixed: 'left'
          },
          {
            title: '申请单状态',
            align: 'center',
            dataIndex: 'applicationStatus_dictText',

 src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue

@@ -40,6 +40,12 @@
    <!-- table区域-begin -->
    <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
             :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange">

      <!--使用部门-->
      <template slot="factoryOrgCode" slot-scope="text,record">
        {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
      </template>

        <span slot="action" slot-scope="text, record">
          <tamplate v-if="record.changeStatus=='WAIT_SUBMIT'">
          <a @click="handleEdit(record)">编辑</a>
@@ -123,6 +129,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '工单号',
            align: 'center',
            dataIndex: 'orderId'

 src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue

@@ -72,6 +72,11 @@
        <a-switch checked-children="是" un-checked-children="否" :checked="Boolean(+text)" disabled/>
      </template>

      <!--使用部门-->
      <template slot="factoryOrgCode" slot-scope="text,record">
        {{[record.zxfactoryOrgCode_dictText].filter(item=>item).join('/')}}
      </template>

      <span slot="action" slot-scope="text, record">
          <template v-if="record.evaluationStatus === 'WAIT_EVALUATION'">
            <a-popconfirm title="确定领取吗？" @confirm="handleReceive(record.id)">
@@ -164,6 +169,12 @@
            fixed: 'left'
          },
          {
            title: '使用部门',
            align: 'center',
            scopedSlots: { customRender: 'factoryOrgCode' },
            fixed: 'left'
          },
          {
            title: '鉴定状态',
            align: 'center',
            dataIndex: 'evaluationStatus_dictText',