Merge remote-tracking branch 'origin/master'

zhaowei

2 天以前 9520029a84be8df133a539968f05f20bf8041750

Merge remote-tracking branch 'origin/master'

 src/views/eam/equipment/EamEquipmentLedger.vue

@@ -65,16 +65,16 @@

    <!-- 操作按钮区域 -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('设备台账')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
      <a-button v-has="'eam:equipment:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button v-has="'eam:equipment:export'" type="primary" icon="download" @click="handleExportXls('设备台账')">导出</a-button>
      <a-upload v-has="'eam:equipment:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
                @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
      <a-button type="primary" icon="download" @click="handleTemplateXlsDownload">导入模板下载</a-button>
      <a-button v-has="'eam:equipment:download'" type="primary" icon="download" @click="handleTemplateXlsDownload">导入模板下载</a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="2" @click="batchDel">
          <a-menu-item v-has="'eam:equipment:batchdel'" key="2" @click="batchDel">
            <a-icon type="delete"/>
            删除
          </a-menu-item>
@@ -131,21 +131,21 @@
        </template>

        <span slot="action" slot-scope="text, record">
          <a @click.stop="handleEdit(record)">编辑</a>
          <a v-has="'eam:equipment:edit'" key="2" @click.stop="handleEdit(record)">编辑</a>

          <a-divider type="vertical"/>
          <a-divider v-has="'eam:equipment:edit'" type="vertical"/>

          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a href="javascript:;" @click="handleOpenResumeDrawer(record)">履历</a>
                <a v-has="'eam:equipment:resume'" href="javascript:;" @click="handleOpenResumeDrawer(record)">履历</a>
              </a-menu-item>
              <a-menu-item>
                <a href="javascript:;" @click="handleDetail(record)">详情</a>
              </a-menu-item>
              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                <a-popconfirm v-has="'eam:equipment:del'" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>

 src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue

@@ -38,19 +38,19 @@

    <!-- 操作按钮区域 -->
    <div class="table-operator" v-if="isDisplayOperation">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button @click="handleBatchAdd" type="primary" icon="plus">批量新增</a-button>
      <a-button v-has="'secondMaintenanceOrder:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button v-has="'secondMaintenanceOrder:batchAdd'" @click="handleBatchAdd" type="primary" icon="plus">批量新增</a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="handlerBatchAbolish">
          <a-menu-item v-has="'secondMaintenanceOrder:batchAbolish'" key="1" @click="handlerBatchAbolish">
            <a-icon type="delete"/>
            作废
          </a-menu-item>
          <a-menu-item key="2" @click="handlerBatchCollect">
          <a-menu-item v-has="'secondMaintenanceOrder:batchCollect'" key="2" @click="handlerBatchCollect">
            <a-icon type="form"/>
            领取
          </a-menu-item>
          <a-menu-item key="3" @click="handlerBatchRestore">
          <a-menu-item v-has="'secondMaintenanceOrder:batchRestore'" key="3" @click="handlerBatchRestore">
            <a-icon type="reload"/>
            还原
          </a-menu-item>
@@ -75,21 +75,21 @@
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange">
        <span slot="action" slot-scope="text, record">
          <template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE'">
            <a @click="handleEdit(record)">编辑</a>
            <a v-has="'secondMaintenanceOrder:edit'" @click="handleEdit(record)">编辑</a>

            <a-divider type="vertical"/>
            <a-divider v-has="'secondMaintenanceOrder:edit'" type="vertical"/>

            <a-popconfirm title="确定领取吗?" @confirm="() => handlerCollect(record.id)">
            <a-popconfirm v-has="'secondMaintenanceOrder:collect'" title="确定领取吗?" @confirm="() => handlerCollect(record.id)">
              <a>领取</a>
            </a-popconfirm>

            <a-divider type="vertical"/>
            <a-divider v-has="'secondMaintenanceOrder:collect'" type="vertical"/>

            <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a-popconfirm title="确定作废吗?" @confirm="() => handleAbolish(record.id)">
                <a-popconfirm v-has="'secondMaintenanceOrder:abolish'" title="确定作废吗?" @confirm="() => handlerAbolish(record.id)">
                  <a>作废</a>
                </a-popconfirm>
              </a-menu-item>
@@ -104,15 +104,14 @@
            <a @click="handleDetail(record)">详情</a>


            <a-divider v-if="record.maintenanceStatus === 'ABOLISH'" type="vertical"/>
            <a-divider v-has="'secondMaintenanceOrder:restore'" v-if="record.maintenanceStatus === 'ABOLISH'" type="vertical"/>

            <a-popconfirm v-if="record.maintenanceStatus === 'ABOLISH'" title="确定还原吗?"
                          @confirm="() => handlerRestore(record.id)">
            <a-popconfirm v-has="'secondMaintenanceOrder:restore'"  v-if="record.maintenanceStatus === 'ABOLISH'" title="确定还原吗?" @confirm="() => handlerRestore(record.id)">
              <a>还原</a>
            </a-popconfirm>

            <a-divider type="vertical" v-if="record.maintenanceStatus === 'COMPLETE'"/>
            <a v-if="record.maintenanceStatus === 'COMPLETE'" @click="handlePrint(record)">打印</a>
<!--            <a-divider v-has="'secondMaintenanceOrder:print'" type="vertical" v-if="record.maintenanceStatus === 'COMPLETE'"/>-->
<!--            <a v-has="'secondMaintenanceOrder:print'" v-if="record.maintenanceStatus === 'COMPLETE'" @click="handlePrint(record)">打印</a>-->
          </template>
        </span>
      </a-table>

 src/views/eam/repair/EamRepairOrderList.vue

@@ -28,6 +28,7 @@
              <a-button @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
            </span>
          </a-col>

        </a-row>
      </a-form>
    </div>

 src/views/eam/repair/EamReportAccidentsRegisterList.vue

@@ -50,11 +50,11 @@

    <!-- 操作按钮区域 -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('设备事故登记表')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<!--      <a-button type="primary" icon="download" @click="handleExportXls('设备事故登记表')">导出</a-button>-->
<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<!--        <a-button type="primary" icon="import">导入</a-button>-->
<!--      </a-upload>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -79,12 +79,14 @@
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        class="j-table-force-nowrap"
        :scroll="{x:'max-content'}"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange">

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



          <a-divider type="vertical" />
          <a-dropdown>
@@ -119,136 +121,151 @@
    components: {
      EamReportAccidentsRegisterModal
    },
    props: {
      isDisplayOperation: {
        type: Boolean,
        default: true
      },
      propsQueryParam: {
        type: Object
      }
    },
    data () {
      return {
        description: '设备事故登记表管理页面',
        disableMixinCreated: true,
        // 表头
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            key: 'rowIndex',
            width: 60,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            },
            fixed: 'left'
          },
          {
            title: '统一编码',
            align: 'center',
            dataIndex: 'equipmentCode',
            fixed: 'left',
            scopedSlots: { customRender: 'equipmentCode' }
          },
          {
            title: '设备名称',
            align: 'center',
            dataIndex: 'equipmentName',
            fixed: 'left'
          },
          {
            title: '设备型号',
            align: 'center',
            dataIndex: 'equipmentModel',
            fixed: 'left'
          },
              {
            title: '是否有设备操作证',
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
           },
           {
            title: '删除标记',
            align:"center",
            dataIndex: 'delFlag'
           },
           {
            title: '报修ID',
            align:"center",
            dataIndex: 'reportId'
           },
           {
            title: '设备ID',
            align:"center",
            dataIndex: 'equipmentId'
           },
           {
            title: '是否有设备操作证;是 否',
            align:"center",
            dataIndex: 'operationCertificate'
           },
           {
            dataIndex: 'operationCertificate_dictText'
          },
              {
            title: '是否断电重启',
            align:"center",
            dataIndex: 'powerOffRestart'
           },
           {
            dataIndex: 'powerOffRestart_dictText'
          },
              {
            title: '是否为批次首件',
            align:"center",
            dataIndex: 'batchFirstPiece'
           },
           {
            title: '变动因素;填写是或否',
            dataIndex: 'batchFirstPiece_dictText'
          },
              {
            title: '变动因素',
            align:"center",
            dataIndex: 'variableFactors'
           },
           {
            title: '变动因素内容;刀具更换、工艺更改、加工程序更改、刀具补偿值更改、',
            dataIndex: 'variableFactors_dictText'
          },
              {
            title: '变动因素内容',
            align:"center",
            dataIndex: 'variableFactorsValue'
           },
           {
            dataIndex: 'variableFactorsValue_dictText'
          },
              {
            title: '执行程序',
            align:"center",
            dataIndex: 'executeNc'
           },
           {
          },
              {
            title: '事故现象',
            align:"center",
            dataIndex: 'accidentPhenomenon'
           },
           {
          },
              {
            title: '采取措施',
            align:"center",
            dataIndex: 'measure'
           },
           {
          },
              {
            title: '造成结果',
            align:"center",
            dataIndex: 'causingResults'
           },
           {
          },
              {
            title: '操作工',
            align:"center",
            dataIndex: 'confirmer'
           },
           {
          },
              {
            title: '操作工确认时间',
            align:"center",
            dataIndex: 'confirmTime'
           },
           {
          },
              {
            title: '区长',
            align:"center",
            dataIndex: 'district'
           },
           {
          },
              {
            title: '区长确认时间',
            align:"center",
            dataIndex: 'districtTime'
           },
           {
          },
              {
            title: '中心主任',
            align:"center",
            dataIndex: 'centerDirector'
           },
           {
          },
              {
            title: '中心主任确认时间',
            align:"center",
            dataIndex: 'centerDirectorTime'
           },
           {
          },
              {
            title: '维修开始时间',
            align:"center",
            dataIndex: 'reportStartTime'
           },
           {
          },
              {
            title: '设备状态',
            align:"center",
            dataIndex: 'equipmentStatus'
           },
           {
          },
              {
            title: '原因分析',
            align:"center",
            dataIndex: 'causeAnalysis'
           },
           {
          },
              {
            title: '检查结果',
            align:"center",
            dataIndex: 'inspectionResults'
           },
           {
          },
              {
            title: '采取措施',
            align:"center",
            dataIndex: 'takeSteps'
           },
          },
           {
            title: '建议采取措施',
            align:"center",
@@ -274,7 +291,7 @@
            align:"center",
            dataIndex: 'repairConfirmTime'
           },
           {
                {
            title: '维修组长确认',
            align:"center",
            dataIndex: 'repairGroupLeader'
@@ -354,29 +371,33 @@
            align:"center",
            dataIndex: 'technicalDirectorPartTime'
           },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
        ],
        url: {
        selectRepairOrderData: {},
        url: {
          list: "/eam/eamReportAccidentsRegister/list",
          delete: "/eam/eamReportAccidentsRegister/delete",
          deleteBatch: "/eam/eamReportAccidentsRegister/deleteBatch",
          exportXlsUrl: "eam/eamReportAccidentsRegister/exportXls",
          importExcelUrl: "eam/eamReportAccidentsRegister/importExcel",
       },
        },
    }
  },
  computed: {
    importExcelUrl: function(){
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    }
  },
    created() {
      if (!this.isDisplayOperation) this.queryParam = Object.assign({}, this.propsQueryParam)
      else {
        const operationColumn = {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          scopedSlots: { customRender: 'action' },
          width: 200,
          fixed: 'right'
        }
        this.columns = [...this.columns, operationColumn]
      }
      this.loadData(1)
    },
    methods: {
     
    }
  }
</script>

 src/views/eam/repair/EamReportProductHazardsList.vue

@@ -50,11 +50,11 @@

    <!-- 操作按钮区域 -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('产品安全隐患确认')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<!--      <a-button type="primary" icon="download" @click="handleExportXls('产品安全隐患确认')">导出</a-button>-->
<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<!--        <a-button type="primary" icon="import">导入</a-button>-->
<!--      </a-upload>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -79,7 +79,7 @@
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        class="j-table-force-nowrap"
        :scroll="{x:'max-content'}"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange">

@@ -119,89 +119,104 @@
    components: {
      EamReportProductHazardsModal
    },
    props: {
      isDisplayOperation: {
        type: Boolean,
        default: true
      },
      propsQueryParam: {
        type: Object
      }
    },
    data () {
      return {
        description: '产品安全隐患确认管理页面',
        disableMixinCreated: true,
        // 表头
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
           },
           {
            title: '报修ID',
            align:"center",
            dataIndex: 'reportId'
           },
           {
            title: '设备ID',
            align:"center",
            dataIndex: 'equipmentId'
           },
           {
            key: 'rowIndex',
            width: 60,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            },
            fixed: 'left'
          },
          {
            title: '统一编码',
            align: 'center',
            dataIndex: 'equipmentCode',
            fixed: 'left',
            scopedSlots: { customRender: 'equipmentCode' }
          },
          {
            title: '设备名称',
            align: 'center',
            dataIndex: 'equipmentName',
            fixed: 'left'
          },
          {
            title: '设备型号',
            align: 'center',
            dataIndex: 'equipmentModel',
            fixed: 'left'
          },
               {
            title: '操作工',
            align:"center",
            dataIndex: 'confirmer'
           },
           {
               {
            title: '操作工确认时间',
            align:"center",
            dataIndex: 'confirmTime'
           },
           {
               {
            title: '产品损失情况;是 否',
            align:"center",
            dataIndex: 'productLoss'
           },
           {
               {
            title: '产品损失质量影响分析',
            align:"center",
            dataIndex: 'qualityAnalysis'
           },
           {
               {
            title: '主管工艺',
            align:"center",
            dataIndex: 'technologist'
           },
           {
               {
            title: '主管工艺确认时间',
            align:"center",
            dataIndex: 'technologistTime'
           },
           {
               {
            title: '主管工艺确认意见',
            align:"center",
            dataIndex: 'technologistComment'
           },
           {
               {
            title: '部级领导',
            align:"center",
            dataIndex: 'deputyDepartment'
           },
           {
               {
            title: '部级领导确认时间',
            align:"center",
            dataIndex: 'deputyDepartmentTime'
           },
           {
               {
            title: '部级领导确认意见',
            align:"center",
            dataIndex: 'deputyDepartmentComment'
           },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
        ],
        url: {
        selectRepairOrderData: {},
            url: {
          list: "/eam/eamReportProductHazards/list",
          delete: "/eam/eamReportProductHazards/delete",
          deleteBatch: "/eam/eamReportProductHazards/deleteBatch",
@@ -210,13 +225,23 @@
       },
    }
  },
  computed: {
    importExcelUrl: function(){
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    }
  },
    created() {
      if (!this.isDisplayOperation) this.queryParam = Object.assign({}, this.propsQueryParam)
      else {
        const operationColumn = {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          scopedSlots: { customRender: 'action' },
          width: 200,
          fixed: 'right'
        }
        this.columns = [...this.columns, operationColumn]
      }
      this.loadData(1)
    },
    methods: {
     

    }
  }
</script>

 src/views/eam/repair/EamReportRepairList.vue

@@ -11,7 +11,7 @@
          </a-col>
          <a-col :xl="4" :lg="6" :md="8" :sm="12">
            <a-form-item label="报修状态">
              <j-dict-select-tag dict-code="report_repair_status" placeholder="请选择报修状态"
              <j-dict-select-tag dict-code="repair_status" placeholder="请选择报修状态"
                                 v-model="queryParam.reportStatus"/>
            </a-form-item>
          </a-col>