Merge remote-tracking branch 'origin/master'

cuikaidong

2 天以前 1c1000a93a88b5af5eabbf410aa264b0911dbee4

 src/views/flowable/workflow/FlowCompleted.vue

@@ -7,29 +7,69 @@
  <a-card :bordered="false">
    <!-- 查询区域 -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
      <a-form
        layout="inline"
        @keyup.enter.native="searchQuery"
      >
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
          <a-col
            :xl="6"
            :lg="7"
            :md="8"
            :sm="24"
          >
            <a-form-item label="流程分类">
              <j-dict-select-tag placeholder="请选择流程分类" v-model="queryParam.category"
                                 dictCode="flow_type"></j-dict-select-tag>
              <j-dict-select-tag
                placeholder="请选择流程分类"
                v-model="queryParam.category"
                dictCode="flow_type"
              ></j-dict-select-tag>
            </a-form-item>
          </a-col>
          <a-col :xl="10" :lg="11" :md="12" :sm="24">
          <a-col
            :xl="10"
            :lg="11"
            :md="12"
            :sm="24"
          >
            <a-form-item label="操作时间">
              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"
                      class="query-group-cust"
                      v-model="queryParam.startTime"></j-date>
              <j-date
                :show-time="true"
                date-format="YYYY-MM-DD HH:mm:ss"
                placeholder="请选择开始时间"
                class="query-group-cust"
                v-model="queryParam.startTime"
              ></j-date>
              <span class="query-group-split-cust"></span>
              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"
                      class="query-group-cust"
                      v-model="queryParam.endTime"></j-date>
              <j-date
                :show-time="true"
                date-format="YYYY-MM-DD HH:mm:ss"
                placeholder="请选择结束时间"
                class="query-group-cust"
                v-model="queryParam.endTime"
              ></j-date>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
          <a-col
            :xl="6"
            :lg="7"
            :md="8"
            :sm="24"
          >
            <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
              <a-button
                type="primary"
                @click="searchQuery"
                icon="search"
              >查询</a-button>
              <a-button
                @click="searchReset"
                icon="reload"
                style="margin-left: 8px"
              >重置</a-button>
            </span>
          </a-col>
        </a-row>
@@ -51,32 +91,81 @@
        :pagination="ipagination"
        :loading="loading"
        class="j-table-force-nowrap"
        @change="handleTableChange">
        @change="handleTableChange"
      >

        <span slot="action" slot-scope="text, record">
            <a @click="handelDetial(record,text)">详情</a>
        <span
          slot="action"
          slot-scope="text, record"
        >
          <a @click="handelDetial(record,text)">详情</a>
        </span>

      </a-table>
    </div>

    <AssignFileStreamXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamXq>
    <AssignFileStreamXq
      ref="modalFormApproval"
      :selectShenpiData="selectShenpiData"
    ></AssignFileStreamXq>

    <DispatchFileXq ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq>
    <DispatchFileXq
      ref="modalFormDispatchFileXq"
      :selectShenpiData="selectDispatchFileXqData"
    ></DispatchFileXq>

    <inspection-order-handle ref="modalFormInspectionOrderXq" :selectShenpiData="selectInspectionOrderXqData" />
    <inspection-order-handle
      ref="modalFormInspectionOrderXq"
      :selectShenpiData="selectInspectionOrderXqData"
    />

    <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData" />
    <week-maintenance-approval-modal
      ref="weekMaintenanceApprovalModal"
      :selectShenpiData="selectWeekMaintenanceData"
    />

    <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectRepairOrderData" />
    <repair-order-approval-modal
      ref="repairOrderApprovalModal"
      :selectShenpiData="selectRepairOrderData"
    />

    <out-bound-order-handle ref="outBoundOrderHandle" :selectShenpiData="selectOutBoundOrderData" />
    <stocktaking-bound-handle ref="stocktakingBoundHandle" :selectShenpiData="selectStocktakingBoundOrderData"
                              @searchReset="searchReset"></stocktaking-bound-handle>
    <out-bound-order-handle
      ref="outBoundOrderHandle"
      :selectShenpiData="selectOutBoundOrderData"
    />
    <stocktaking-bound-handle
      ref="stocktakingBoundHandle"
      :selectShenpiData="selectStocktakingBoundOrderData"
      @searchReset="searchReset"
    ></stocktaking-bound-handle>

    <loss-bound-handle
      ref="lossBoundHandle"
      :selectShenpiData="selectLossBoundOrderData"
      @searchReset="searchReset"
    ></loss-bound-handle>

    <loss-bound-handle ref="lossBoundHandle" :selectShenpiData="selectLossBoundOrderData"
                       @searchReset="searchReset"></loss-bound-handle>
    <equipment-lean-out-approval-modal
      ref='equipmentLeanOutApprovalModelRef'
      @searchReset='searchReset'
    />
    <equipment-seal-up-approval-modal
      ref='equipmentSealUpApprovalModelRef'
      @searchReset='searchReset'
    />
    <equipment-transfer-approval-modal
      ref='equipmentTransferApprovalModelRef'
      @searchReset='searchReset'
    />
    <equipment-scrap-approval-modal
      ref='equipmentScrapApprovalModelRef'
      @searchReset='searchReset'
    />
    <spare-part-apply-handle
      ref='sparePartApplyModal'
      @searchReset='searchReset'
      :selectSparePartApplyData='selectSparePartApplyData'
    ></spare-part-apply-handle>
  </a-card>
</template>

@@ -94,6 +183,11 @@
import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue'
import stocktakingBoundHandle from '@views/flowable/workflow/stocktakingBound/stocktakingBoundHandle.vue'
import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue'
import EquipmentScrapApprovalModal from '@views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue'
import SparePartApplyHandle from '@views/flowable/workflow/sparePartApply/SparePartApplyHandle.vue'

export default {
  name: 'NcDeviceCharactersList',
@@ -107,7 +201,12 @@
    WeekMaintenanceApprovalModal,
    InspectionOrderHandle,
    JDictSelectTag,
    OutBoundOrderHandle
    OutBoundOrderHandle,
    EquipmentLeanOutApprovalModal,
    EquipmentSealUpApprovalModal,
    EquipmentTransferApprovalModal,
    EquipmentScrapApprovalModal,
    SparePartApplyHandle
  },
  data() {
    return {
@@ -120,7 +219,7 @@
          key: 'rowIndex',
          width: 200,
          align: 'center',
          customRender: function(t, r, index) {
          customRender: function (t, r, index) {
            return parseInt(index) + 1
          }
        },
@@ -180,13 +279,19 @@
      selectRepairOrderData: {},
      selectOutBoundOrderData: {},
      selectLossBoundOrderData: {},
      selectStocktakingBoundOrderData: {}
      selectStocktakingBoundOrderData: {},
      selectSparePartApplyData: {},
      // selectEquipmentLeanOutData: {},
      // selectEquipmentSealUpData: {},
      // selectEquipmentTransferData: {},
      // selectEquipmentScrapData: {},

    }
  },
  created() {
  },
  computed: {
    importExcelUrl: function() {
    importExcelUrl: function () {
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
    }
  },
@@ -221,6 +326,24 @@
          break
        case 'toolsLossApproval':
          this.handleToolLossApproval(item)
          break
        case 'equipment_seal_up':
          this.handleEquipmentSealUp(item)
          break
        case 'equipment_unseal':
          this.handleEquipmentUnSeal(item)
          break
        case 'equipment_lean_out':
          this.handleEquipmentLeanOut(item)
          break
        case 'equipment_transfer':
          this.handleEquipmentTransfer(item)
          break
        case 'equipment_scrap':
          this.handleEquipmentScrap(item)
          break
        case 'spare_part_apply':
          this.handleSparePartApplyApproval(item)
          break
        default:
          alert('没找到该流程')
@@ -326,7 +449,46 @@
      this.$refs.lossBoundHandle.clearTableSource()
      this.$refs.lossBoundHandle.getAllApproveData(item)

    }
    },
    handleEquipmentLeanOut(item) {
      this.$refs.equipmentLeanOutApprovalModelRef.visible = false
      this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = true
      this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
      this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
    },
    handleEquipmentSealUp(item) {
      this.$refs.equipmentSealUpApprovalModelRef.visible = true
      this.$refs.equipmentSealUpApprovalModelRef.title = item.name
      this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
      this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = true
    },
    handleEquipmentUnSeal(item) {
      this.$refs.equipmentSealUpApprovalModelRef.visible = true
      this.$refs.equipmentSealUpApprovalModelRef.title = item.name
      this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
      this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = true
    },
    handleEquipmentTransfer(item) {
      this.$refs.equipmentTransferApprovalModelRef.visible = true
      this.$refs.equipmentTransferApprovalModelRef.title = item.name
      this.$refs.equipmentTransferApprovalModelRef.handleDetail(item)
      this.$refs.equipmentTransferApprovalModelRef.disableSubmit = true
    },
    handleEquipmentScrap(item) {
      this.$refs.equipmentScrapApprovalModelRef.visible = true
      this.$refs.equipmentScrapApprovalModelRef.title = item.name
      this.$refs.equipmentScrapApprovalModelRef.handleDetail(item)
      this.$refs.equipmentScrapApprovalModelRef.disableSubmit = true
    },
    handleSparePartApplyApproval(item) {
      this.selectSparePartApplyData = Object.assign({}, item)
      item.procInstId = item.procInsId
      item.processInstanceId = item.procInsId
      this.selectSparePartApplyData.assignee_dictText = item.todoUsers_dictText
      this.$refs.sparePartApplyModal.auditVisible = false
      this.$refs.sparePartApplyModal.clearTableSource()
      this.$refs.sparePartApplyModal.getAllApproveData(item)
    },
  }
}
</script>