From def88c97c86087175bfd9b9fe82e78d2cd3ef6f0 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 05 九月 2023 17:09:39 +0800
Subject: [PATCH] 保养移交单 精度检验单
---
src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue | 2
src/views/eam/modules/specialtyMaintenanceStandard/JSelectMaintenanceStandardModal.vue | 2
src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue | 3
src/views/eam/DailyMaintenanceOrderList3m.vue | 660 ++++++++++++++++++++++++++++++++++
src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderChangeModal.vue | 368 +++++++++++++++++++
src/views/eam/modules/dailyMaintenanceOrder/MaintenanceStandardPlanningMaterial.vue | 84 ++--
6 files changed, 1,074 insertions(+), 45 deletions(-)
diff --git a/src/views/eam/DailyMaintenanceOrderList3m.vue b/src/views/eam/DailyMaintenanceOrderList3m.vue
new file mode 100644
index 0000000..b326091
--- /dev/null
+++ b/src/views/eam/DailyMaintenanceOrderList3m.vue
@@ -0,0 +1,660 @@
+<template>
+ <a-card
+ :bordered="false"
+ title="涓夌骇淇濆吇宸ュ崟"
+ >
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form
+ layout="inline"
+ @keyup.enter.native="searchQuery"
+ >
+ <a-row :gutter="24">
+ <a-col
+ :md="6"
+ :sm="8"
+ >
+ <a-form-item label="涓夌骇宸ュ崟缂栫爜">
+ <a-input
+ placeholder="璇疯緭鍏ヤ笁绾у伐鍗曠紪鐮�"
+ v-model="queryParam.num"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="8"
+ >
+ <span
+ style="float: left;overflow: hidden;"
+ class="table-page-search-submitButtons"
+ >
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ type="primary"
+ @click="searchReset"
+ icon="reload"
+ style="margin-left: 8px"
+ >閲嶇疆</a-button>
+ </span>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 鏌ヨ鍖哄煙-END -->
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator">
+ <a-button
+ @click="handleAdd"
+ type="primary"
+ icon="plus"
+ v-has="'dailyMaintenanceOrder:add'"
+ >鏂板</a-button>
+ <!-- <a-button
+ v-if="selectedRowKeys.length > 0"
+ type="primary"
+ @click="batchAssign"
+ style="margin-left: 8px"
+ >宸ュ崟娲惧伐</a-button> -->
+ <!-- <a-button
+ type="primary"
+ icon="download"
+ @click="handleExportXls('mom_eam_inspection_order')"
+ >瀵煎嚭</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>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
+ </a-dropdown> -->
+ </div>
+
+ <!-- table鍖哄煙-begin -->
+ <div>
+ <!-- <div
+ class="ant-alert ant-alert-info"
+ style="margin-bottom: 16px;"
+ >
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a
+ style="margin-left: 24px"
+ @click="onClearSelected"
+ >娓呯┖</a>
+ </div> -->
+
+ <a-table
+ ref="table"
+ size="middle"
+ :scroll="{ x: 'calc(2800px + 50%)', y: 900 }"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ class="j-table-force-nowrap"
+ @change="handleTableChange"
+ :rowSelection="rowSelection"
+ :rowClassName="tableRowClass"
+ >
+
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
+ <a-popconfirm
+ title="纭畾涓嬪彂宸ュ崟鍚�?"
+ @confirm="() => handleOrderIssue(record)"
+ v-has="'dailyMaintenanceOrder:issue'"
+ >
+ <a v-if="record.status == '1'">涓嬪彂</a>
+ </a-popconfirm>
+ <a-divider
+ v-if="record.status == '1'"
+ type="vertical"
+ />
+ <a
+ v-if="record.status === '2'"
+ @click="handleOrderChange(record)"
+ >璁″垝鍙樻洿</a>
+ <a-divider
+ v-if="record.status == '2'"
+ type="vertical"
+ />
+ <a-popconfirm
+ title="纭畾鎾ゅ洖宸ュ崟鍚�?"
+ @confirm="() => handleOrderReset(record)"
+ v-has="'dailyMaintenanceOrder:issue'"
+ >
+ <a v-if="record.status == '2'">鎾ゅ洖</a>
+ </a-popconfirm>
+ <a-divider
+ v-if="record.status == '2'"
+ type="vertical"
+ />
+ <a-popconfirm
+ title="纭畾鎭㈠宸ュ崟鍚�?"
+ @confirm="() => handleOrderRecover(record)"
+ v-has="'dailyMaintenanceOrder:recover'"
+ >
+ <a v-if="record.status == '7'">鎭㈠</a>
+ </a-popconfirm>
+ <a-divider
+ v-if="record.status == '7'"
+ type="vertical"
+ />
+ <a-popconfirm
+ title="纭畾浣滃簾宸ュ崟鍚�?"
+ @confirm="() => handleOrderCancel(record)"
+ v-has="'dailyMaintenanceOrder:recover'"
+ >
+ <a v-if="record.status == '2'">浣滃簾</a>
+ </a-popconfirm>
+ <a-divider
+ v-if="record.status == '2'"
+ type="vertical"
+ />
+ <a-popconfirm
+ title="纭畾棰嗗彇宸ュ崟鍚�?"
+ @confirm="() => handleOrderGet(record)"
+ v-has="'dailyMaintenanceOrder:get'"
+ >
+ <a v-if="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
+ </a-popconfirm>
+ <a
+ v-if="record.status == '2' && record.assignMode == '2' "
+ @click="handleAssignOrder(record)"
+ v-has="'dailyMaintenanceOrder:assign'"
+ >娲惧伐</a>
+ <a
+ v-if="record.status == '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
+ @click="handleAssignOrder(record)"
+ v-has="'dailyMaintenanceOrder:assign'"
+ >鏀规淳</a>
+ <!-- <a
+ v-if="record.status == '3'"
+ @click="handleAssignOrder(record)"
+ >鏀规淳</a> -->
+ <a-divider
+ v-if="record.status == '2'"
+ type="vertical"
+ />
+ <a-divider
+ v-if="record.status === '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
+ type="vertical"
+ />
+ <a
+ v-if="record.status === '3' || record.status === '4' "
+ @click="handleOrderExe(record)"
+ v-has="'dailyMaintenanceOrder:exe'"
+ >鎵ц</a>
+ <a-divider
+ v-if="record.status === '3' || record.status === '4' "
+ type="vertical"
+ />
+ <a
+ v-if="record.status === '1'"
+ @click="handleEdit(record)"
+ v-has="'dailyMaintenanceOrder:edit'"
+ >缂栬緫</a>
+ <a-divider
+ v-if="record.status === '1'"
+ type="vertical"
+ />
+ <!-- <a
+ v-if="record.status === '5'"
+ @click="handleFinish(record)"
+ >纭</a>
+ <a-divider
+ v-if="record.status === '5'"
+ type="vertical"
+ /> -->
+ <a
+ v-if="record.status === '5'"
+ @click="handlePrecisionCheckOrder(record)"
+ >绮惧害妫�楠�</a>
+ <a-divider
+ v-if="record.status === '5'"
+ type="vertical"
+ />
+ <a-dropdown>
+ <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a @click="handleDetail(record)">璇︽儏</a>
+ </a-menu-item>
+ <a-menu-item>
+ <a-popconfirm
+ title="纭畾鍒犻櫎鍚�?"
+ @confirm="() => handleDelete(record.id)"
+ v-has="'dailyMaintenanceOrder:delete'"
+ >
+ <a v-if="record.status === '1'">鍒犻櫎</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
+
+ <span
+ slot="num"
+ slot-scope="text, record"
+ >
+ <a
+ v-if="record.status === '3' || record.status === '4' ||record.status === '5' ||record.status === '7' "
+ class="lot"
+ @click="handleOrderExe(record)"
+ >{{record.num}}</a>
+ <span v-else>{{record.num}}</span>
+ </span>
+
+ </a-table>
+ </div>
+
+ <maintenance-order-modal
+ ref="modalForm"
+ @ok="modalFormOk"
+ ></maintenance-order-modal>
+ <finish-devolution-modal
+ ref="FinishDevolutionModal"
+ @ok="modalFormOk"
+ ></finish-devolution-modal>
+ <maintenance-order-change-modal
+ ref="MaintenanceOrderChangeModal"
+ @ok="modalFormOk"
+ ></maintenance-order-change-modal>
+ <equipment-precision-check-order-modal
+ ref="EquipmentPrecisionCheckOrderModal"
+ @ok="modalFormOk"
+ ></equipment-precision-check-order-modal>
+ <maintenance-order-assign-modal
+ ref="MaintenanceOrderAssignModal"
+ @ok="modalFormOk"
+ ></maintenance-order-assign-modal>
+ <daily-maintenance-order-exe-drawer
+ ref="DailyMaintenanceOrderExeDrawer"
+ @ok="modalFormOk"
+ ></daily-maintenance-order-exe-drawer>
+ </a-card>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import MaintenanceOrderModal from './modules/dailyMaintenanceOrder/MaintenanceOrderModal'
+import FinishDevolutionModal from './modules/dailyMaintenanceOrder/FinishDevolutionModal'
+import MaintenanceOrderChangeModal from './modules/dailyMaintenanceOrder/MaintenanceOrderChangeModal'
+import EquipmentPrecisionCheckOrderModal from './modules/dailyMaintenanceOrder/EquipmentPrecisionCheckOrderModal'
+import MaintenanceOrderAssignModal from './modules/dailyMaintenanceOrder/MaintenanceOrderAssignModal'
+import DailyMaintenanceOrderExeDrawer from './modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer'
+import { getAction, postAction, requestPut } from '@/api/manage'
+
+export default {
+ name: 'DailyMaintenanceOrderList',
+ mixins: [JeecgListMixin, mixinDevice],
+ components: {
+ MaintenanceOrderModal,
+ FinishDevolutionModal,
+ MaintenanceOrderAssignModal,
+ EquipmentPrecisionCheckOrderModal,
+ DailyMaintenanceOrderExeDrawer,
+ MaintenanceOrderChangeModal
+ },
+ data() {
+ return {
+ description: '鏃ュ父淇濆吇宸ュ崟',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: "center",
+ customRender: function (t, r, index) {
+ return parseInt(index) + 1;
+ }
+ },
+ {
+ title: '鐘舵��',
+ align: "center",
+ dataIndex: 'statusName'
+ },
+ {
+ title: '淇濆吇宸ュ崟鍙�',
+ align: "center",
+ dataIndex: 'num',
+ scopedSlots: { customRender: 'num' }
+ },
+ {
+ title: '淇濆吇鍛ㄦ湡',
+ align: "center",
+ dataIndex: 'maintenanceCycleName',
+ },
+ {
+ title: '娲惧伐鏂瑰紡',
+ align: "center",
+ dataIndex: 'assignModeName'
+ },
+ {
+ title: '璁惧缂栫爜',
+ align: "center",
+ dataIndex: 'equipmentNum',
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: "center",
+ dataIndex: 'equipmentName',
+ },
+ {
+ title: '鍨嬪彿',
+ align: "center",
+ dataIndex: 'equipmentModel',
+ },
+ {
+ title: '淇濆吇鏍囧噯缂栫爜',
+ align: "center",
+ dataIndex: 'maintenanceStandardNum',
+ },
+
+ {
+ title: '浣跨敤閮ㄩ棬',
+ align: "center",
+ dataIndex: 'departName'
+ },
+ {
+ title: '璐ｄ换鐝粍',
+ align: "center",
+ dataIndex: 'teamName'
+ },
+ {
+ title: '宸ユ椂瀹氶',
+ align: "center",
+ dataIndex: 'workingHourQuota'
+ },
+ {
+ title: '璁″垝寮�濮嬫椂闂�',
+ align: "center",
+ dataIndex: 'planStartTime',
+ //width: '120px',
+ },
+ {
+ title: '璁″垝缁撴潫鏃堕棿',
+ align: "center",
+ dataIndex: 'planEndTime',
+ //width: '120px',
+ },
+ {
+ title: '瀹為檯寮�濮嬫椂闂�',
+ align: "center",
+ dataIndex: 'actualStartTime',
+ //width: '120px',
+ },
+ {
+ title: '瀹為檯缁撴潫鏃堕棿',
+ align: "center",
+ dataIndex: 'actualEndTime',
+ //width: '120px',
+ },
+ {
+ title: '瀹為檯鐢ㄦ椂',
+ align: "center",
+ dataIndex: 'actualWorkingHourQuota',
+ },
+ {
+ title: '鎵ц浜�',
+ align: "center",
+ dataIndex: 'maintenanceUserName'
+ },
+ {
+ title: '闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�',
+ align: "center",
+ dataIndex: 'description'
+ },
+ {
+ title: '鍒涘缓浜�',
+ align: "center",
+ dataIndex: 'createBy'
+ },
+ {
+ title: '鍒涘缓鏃ユ湡',
+ align: "center",
+ dataIndex: 'createTime',
+ //width: '120px',
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: "center",
+ fixed: "right",
+ width: 300,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
+ url: {
+ list: "/eam/dailyMaintenanceOrder/getDailyMaintenanceOrderList",
+ delete: "/eam/dailyMaintenanceOrder/delete",
+ deleteBatch: "/eam/dailyMaintenanceOrder/deleteBatch",
+ exportXlsUrl: "/eam/dailyMaintenanceOrder/exportXls",
+ importExcelUrl: "eam/dailyMaintenanceOrder/importExcel",
+ edit: "/eam/dailyMaintenanceOrder/editStatus",
+ orderGet: "/eam/dailyMaintenanceOrder/orderGet",
+ },
+ }
+ },
+
+ computed: {
+ importExcelUrl: function () {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+ },
+ rowSelection() {
+ return {
+ type: 'checkbox',
+ onChange: (selectedRowKeys, selectedRows) => {
+ this.selectedRowKeys = selectedRowKeys;
+ this.onSelectChange(selectedRows);
+ },
+ getCheckboxProps: record => ({
+ props: {
+ disabled: record.distable
+ },
+ }),
+ selectedRowKeys: this.selectedRowKeys,
+ };
+ },
+ },
+
+ methods: {
+
+ // batchAssign() {
+ // this.$refs.MaintenanceOrderAssignModal.visible = true
+ // this.$refs.MaintenanceOrderAssignModal.title = '宸ュ崟娲惧伐'
+ // this.$refs.MaintenanceOrderAssignModal.selectionRows
+ // this.$refs.MaintenanceOrderAssignModal.handleShow()
+ // this.$bus.$emit('selectionRows', this.selectionRows);
+ // },
+ onSelectChange(selectionRows) {
+ this.selectionRows = selectionRows;
+ },
+
+ handleOrderExe(record) {
+ this.$refs.DailyMaintenanceOrderExeDrawer.visible = true
+ this.$refs.DailyMaintenanceOrderExeDrawer.title = '鏃ュ父淇濆吇宸ュ崟鎵ц'
+ this.$refs.DailyMaintenanceOrderExeDrawer.handleShow(record)
+ if (record.status === '3') {
+ this.$refs.DailyMaintenanceOrderExeDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸�
+ this.$refs.DailyMaintenanceOrderExeDrawer.revocationDistable = true//鎾ら攢鎸夐挳
+ this.$refs.DailyMaintenanceOrderExeDrawer.SWbuttonDistable = false//寮�宸ユ寜閽�
+ } else if (record.status === '4') {
+ this.$refs.DailyMaintenanceOrderExeDrawer.buttonDistable = false
+ this.$refs.DailyMaintenanceOrderExeDrawer.revocationDistable = true
+ this.$refs.DailyMaintenanceOrderExeDrawer.SWbuttonDistable = true
+ } else if (record.status === '5') {
+ this.$refs.DailyMaintenanceOrderExeDrawer.buttonDistable = true
+ this.$refs.DailyMaintenanceOrderExeDrawer.revocationDistable = false
+ this.$refs.DailyMaintenanceOrderExeDrawer.SWbuttonDistable = true
+ } else if (record.status === '7') {
+ this.$refs.DailyMaintenanceOrderExeDrawer.buttonDistable = true
+ this.$refs.DailyMaintenanceOrderExeDrawer.revocationDistable = true
+ this.$refs.DailyMaintenanceOrderExeDrawer.SWbuttonDistable = true
+ }
+ },
+
+ handleFinish: function (record) {
+ this.$refs.FinishDevolutionModal.edit(record);
+ this.$refs.FinishDevolutionModal.title = "鐢熶骇璁惧浜岀骇淇濆吇瀹屽伐绉讳氦鍗�";
+ this.$refs.FinishDevolutionModal.disableSubmit = false;
+ },
+
+ handlePrecisionCheckOrder: function (record) {
+ this.$refs.EquipmentPrecisionCheckOrderModal.edit(record);
+ this.$refs.EquipmentPrecisionCheckOrderModal.title = "鐢熶骇璁惧绮惧害妫�楠屽崟";
+ this.$refs.EquipmentPrecisionCheckOrderModal.disableSubmit = false;
+ },
+
+ handleOrderChange: function (record) {
+
+ this.$refs.MaintenanceOrderChangeModal.edit(record);
+ this.$refs.MaintenanceOrderChangeModal.title = "鐢熶骇璁惧淇濆吇璁″垝鍙樻洿鐢宠鍗�";
+ this.$refs.MaintenanceOrderChangeModal.disableSubmit = false;
+ },
+
+
+
+ handleOrderIssue(record) {
+ const that = this;
+ requestPut(that.url.edit, { id: record.id, status: '2' }).then((res) => {
+ if (res.success) {
+ that.$message.success("宸ュ崟涓嬪彂鎴愬姛锛�")
+ that.loadData()
+ } else {
+ that.$message.warning("宸ュ崟涓嬪彂澶辫触锛�")
+ }
+ })
+ },
+ //鎾ゅ洖
+ handleOrderReset(record) {
+ const that = this;
+ requestPut(that.url.edit, { id: record.id, status: '1' }).then((res) => {
+ if (res.success) {
+ that.$message.success("宸ュ崟鎾ゅ洖鎴愬姛锛�")
+ that.loadData()
+ } else {
+ that.$message.warning("宸ュ崟鎾ゅ洖澶辫触锛�")
+ }
+ })
+ },
+ handleOrderGet(record) {
+ const that = this;
+ requestPut(that.url.orderGet, { id: record.id, status: '1' }).then((res) => {
+ if (res.success) {
+ that.$message.success("宸ュ崟棰嗗彇鎴愬姛锛�")
+ that.loadData()
+ } else {
+ that.$message.warning("宸ュ崟棰嗗彇澶辫触锛�")
+ }
+ })
+ },
+ //浣滃簾
+ handleOrderCancel(record) {
+ const that = this;
+ requestPut(that.url.edit, { id: record.id, status: '7' }).then((res) => {
+ if (res.success) {
+ that.$message.success("宸ュ崟浣滃簾鎴愬姛锛�")
+ that.loadData()
+ } else {
+ that.$message.warning("宸ュ崟浣滃簾澶辫触锛�")
+ }
+ })
+ },
+
+ //鎭㈠
+ handleOrderRecover(record) {
+ const that = this;
+ requestPut(that.url.edit, { id: record.id, status: '2' }).then((res) => {
+ if (res.success) {
+ that.$message.success("宸ュ崟鎭㈠鎴愬姛锛�")
+ that.loadData()
+ } else {
+ that.$message.warning("宸ュ崟鎭㈠澶辫触锛�")
+ }
+ })
+ },
+
+ //鏀规淳
+ handleAssignOrder: function (record) {
+ this.$refs.MaintenanceOrderAssignModal.edit(record)
+ this.$refs.MaintenanceOrderAssignModal.title = '宸ュ崟鏀规淳'
+ this.$refs.MaintenanceOrderAssignModal.disableSubmit = false
+ },
+ // modalFormOk() {
+ // alert(0)
+ // // 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
+ // this.loadData();
+ // //娓呯┖鍒楄〃閫変腑
+ // this.onClearSelected()
+ // },
+
+ //棰勮棰滆壊
+ tableRowClass(record, index) {
+ if ("1" == record.status || "2" == record.status) {
+ if (record.yellowWarningTime < record.currentDateTime && record.currentDateTime < record.redWarningTime) {
+ return 'yellow'
+ } else if (record.redWarningTime < record.currentDateTime && record.currentDateTime < record.planStartTime) {
+ return 'error'
+ } else if (record.planStartTime < record.currentDateTime) {
+ return 'frozenRowClass'
+ }
+ }
+ },
+ }
+}
+</script>
+<style >
+@import '~@assets/less/common.less';
+.frozenRowClass {
+ color: #c9c9c9;
+ font-weight: bold;
+}
+.success {
+ color: green;
+}
+.error {
+ color: red;
+ font-weight: bold;
+}
+.yellow {
+ color: yellow;
+ font-weight: bold;
+}
+.fontweight {
+ font-weight: bold;
+}
+
+.ant-table-tbody .red {
+ background-color: red !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
index a485e4e..13d9c64 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
@@ -13,7 +13,7 @@
<a-form :form="form">
<a-divider
orientation="center"
- style="font-size: large;font-style: italic;color: #66aeed;"
+ style="font-size: large;font-style: normal;font-size: 30px;color: #66aeed;"
> 鐢熶骇璁惧浜岀骇淇濆吇瀹屽伐绉讳氦鍗� </a-divider>
<a-row :gutter="24">
<a-col :span="8">
@@ -88,6 +88,7 @@
:disabled="true"
:placeholder="'璇疯緭鍏ラ棶棰樺強澶勭悊鎺柦鎻忚堪'"
v-model="model.description"
+ rows="3"
/>
</div>
<div :style="{width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}">
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderChangeModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderChangeModal.vue
new file mode 100644
index 0000000..a951268
--- /dev/null
+++ b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceOrderChangeModal.vue
@@ -0,0 +1,368 @@
+<template>
+ <a-modal
+ :width="1250"
+ :visible="visible"
+ :maskClosable="false"
+ :confirmLoading="confirmLoading"
+ @ok="handleOk"
+ @cancel="handleCancel"
+ cancelText="鍏抽棴"
+ >
+ <!-- :title="title" -->
+
+ <a-spin :spinning="confirmLoading">
+ <a-form :form="form">
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: normal;font-size: 30px;color: #66aeed;"
+ > 鐢熶骇璁惧淇濆吇璁″垝鍙樻洿鐢宠鍗� </a-divider>
+
+ <a-row :gutter="24">
+ <a-col :lg="12">
+ <a-form-item
+ label="璁惧鍚嶇О:"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ :disabled="true"
+ allow-clear
+ placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ v-decorator="['equipmentName', validatorRules.equipmentName ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item
+ label="鍨嬪彿:"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ :disabled="true"
+ allow-clear
+ placeholder="璇疯緭鍏ュ瀷鍙�"
+ v-decorator="['equipmentModel', validatorRules.equipmentModel ]"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col :lg="12">
+ <a-form-item
+ label="缁熶竴缂栧彿:"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ :disabled="true"
+ allow-clear
+ placeholder="璇疯緭鍏ョ粺涓�缂栧彿"
+ v-decorator="['equipmentNum', validatorRules.equipmentNum ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item
+ label="鍘熻鍒掓椂闂�:"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-date
+ :disabled="true"
+ v-decorator="['planStartTime', validatorRules.planStartTime ]"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ style="width: 100%"
+ :showTime="true"
+ dateFormat="YYYY-MM-DD HH:mm:ss"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :lg="12">
+ <a-form-item
+ label="鐢宠鍗曚綅:"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ placeholder="璇疯緭鍏ョ敵璇峰崟浣�"
+ v-decorator="['applyUnit', validatorRules.applyUnit ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item
+ label="鏃ユ湡:"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-date
+ v-decorator="['applyTime', validatorRules.applyTime ]"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ style="width: 100%"
+ :showTime="true"
+ dateFormat="YYYY-MM-DD"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :lg="12">
+ <a-form-item
+ label="璁″垝鍛�:"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ placeholder="璇疯緭鍏ヨ鍒掑憳"
+ v-decorator="['planUser', validatorRules.planUser ]"
+ />
+ </a-form-item>
+ </a-col>
+
+ <a-col :span="12">
+ <a-form-item
+ label="鐢宠寤朵繚鏃堕棿:"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-date
+ v-decorator="['planDelayTime', validatorRules.planDelayTime ]"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ style="width: 100%"
+ :showTime="true"
+ dateFormat="YYYY-MM-DD HH:mm:ss"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item
+ label="涓婁紶"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <!-- prop="file" -->
+ <j-upload
+ :returnUrl="false"
+ :isMultiple="false"
+ v-decorator="['annex', validatorRules.annex]"
+ ></j-upload>
+
+ <!-- v-model="model.annex" -->
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-item
+ :labelCol="{span:3}"
+ :wrapperCol="{span:21}"
+ label="寤朵繚锛堟垨鍙樻洿锛夊師鍥�:"
+ >
+ <a-textarea
+ placeholder="璇疯緭鍏ュ欢淇濓紙鎴栧彉鏇达級鍘熷洜"
+ allow-clear
+ rows="4"
+ v-decorator="['delayReason', validatorRules.delayReason]"
+ />
+ </a-form-item>
+ </a-col>
+ </a-row>
+
+ </a-form>
+ </a-spin>
+
+ <template slot="footer">
+ <a-button
+ :style="{marginRight: '8px'}"
+ @click="handleCancel"
+ >
+ 鍏抽棴
+ </a-button>
+ <a-button
+ :disabled="confirmLoading"
+ :loading="confirmLoading"
+ @click="handleOk"
+ type="primary"
+ >纭畾</a-button>
+ </template>
+
+ </a-modal>
+</template>
+
+<script>
+import pick from 'lodash.pick'
+import { getAction, postAction, requestPut } from '@/api/manage'
+import { duplicateCheck } from '@/api/api'
+
+export default {
+ name: 'MaintenanceOrderChangeModal',
+ data() {
+ return {
+ title: "鎿嶄綔",
+ visible: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 6 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 18 },
+ },
+ confirmLoading: false,
+ form: this.$form.createForm(this),
+ validatorRules: {
+ applyUnit: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ョ敵璇峰崟浣�!' },
+ ]
+ },
+ applyTime: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ョ敵璇锋棩鏈�!' },
+ ]
+ },
+ annex: {
+ rules: [
+ { required: true, message: '璇蜂笂浼犻檮浠�!' },
+ ]
+ },
+ planUser: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ヨ鍒掑憳!' },
+ ]
+ },
+ planDelayTime: {
+ rules: [
+ { required: true, message: '璇烽�夋嫨鐢宠寤朵繚鏃堕棿!' },
+ ]
+ },
+ delayReason: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ュ欢淇濆師鍥�!' },
+ ]
+ },
+ },
+ url: {
+ add: "/eam/planChangeApply/add",
+ },
+ }
+ },
+ created() {
+ },
+ methods: {
+
+ edit(record) {
+ this.form.resetFields();
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(this.model, 'equipmentNum', 'equipmentName', 'equipmentModel', 'planStartTime'));
+ this.form.setFieldsValue({ applyTime: record.currentDateTime });
+ });
+ },
+
+
+ handleOk() {
+
+ const that = this;
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ that.form.validateFields((err, values) => {
+ if (!err) {
+ this.$confirm({
+ title: '璁″垝鍙樻洿',
+ content: '鎻愮ず锛氳鍒掑彉鏇村悗灏嗗欢闀夸繚鍏昏鍒掑紑濮嬫椂闂达紝璇疯皑鎱庢搷浣滐紒',
+ okText: '纭',
+ cancelText: '鍙栨秷',
+ onOk() {
+ let formData = Object.assign(that.model, values);
+ that.confirmLoading = true;
+ // formData.annexName = that.model.annex[0].fileName;
+ // formData.annexSize = that.model.annex[0].fileSize;
+ // formData.annexPath = that.model.annex[0].filePath;
+ formData.annexName = formData.annex[0].fileName;
+ formData.annexSize = formData.annex[0].fileSize;
+ formData.annexPath = formData.annex[0].filePath;
+ postAction(that.url.add, formData).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok', new Date());
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ },
+ })
+ }
+ })
+ },
+
+ // handleOk() {
+ // const that = this;
+ // // 瑙﹀彂琛ㄥ崟楠岃瘉
+ // that.form.validateFields((err, values) => {
+ // if (!err) {
+ // let formData = Object.assign(this.model, values);
+ // that.confirmLoading = true;
+ // formData.id = "";
+ // postAction(that.url.add, formData).then((res) => {
+ // if (res.success) {
+ // that.$message.success(res.message);
+ // that.$emit('ok', new Date());
+ // } else {
+ // that.$message.warning(res.message);
+ // }
+ // }).finally(() => {
+ // that.confirmLoading = false;
+ // that.close();
+ // })
+
+ // }
+ // })
+ // },
+
+ handleCancel() {
+ this.close();
+ },
+
+ close() {
+ this.$emit('close');
+ this.visible = false;
+ },
+ }
+
+}
+</script>
+
+<style scoped>
+.ant-btn {
+ padding: 0 10px;
+ margin-left: 3px;
+}
+
+.ant-form-item-control {
+ line-height: 0px;
+}
+
+/** 涓昏〃鍗曡闂磋窛 */
+.ant-form .ant-form-item {
+ margin-bottom: 10px;
+}
+
+/** Tab椤甸潰琛岄棿璺� */
+.ant-tabs-content .ant-form-item {
+ margin-bottom: 0px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceStandardPlanningMaterial.vue b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceStandardPlanningMaterial.vue
index e38d957..b45dbef 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceStandardPlanningMaterial.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/MaintenanceStandardPlanningMaterial.vue
@@ -20,11 +20,11 @@
size="middle"
bordered
rowKey="id"
- :scroll="{x:true}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
+ :scroll="{x:true}"
@change="handleTableChange"
>
@@ -79,47 +79,47 @@
}
},
{
- title: '澶囦欢缂栧彿',
- dataIndex: 'num',
- align: "center",
- width: 300,
- },
- {
- title: '澶囦欢鍚嶇О',
- dataIndex: 'name',
- align: "center",
- width: 300,
- },
- {
- title: '澶囦欢瑙勬牸',
- dataIndex: 'specification',
- align: "center",
- width: 300,
- },
- {
- title: '澶囦欢鍨嬪彿',
- dataIndex: 'model',
- align: "center",
- width: 300,
- },
- {
- title: '鍒堕�犲晢',
- dataIndex: 'constructorName',
- align: "center",
- width: 300,
- },
- {
- title: '鏁伴噺',
- dataIndex: 'quantity',
- align: "center",
- width: 300,
- },
- {
- title: '鍗曚綅',
- dataIndex: 'unitName',
- align: "center",
- width: 300,
- },
+ title: '澶囦欢缂栧彿',
+ dataIndex: 'num',
+ align: "center",
+ // width: 300,
+ },
+ {
+ title: '澶囦欢鍚嶇О',
+ dataIndex: 'name',
+ align: "center",
+ // width: 300,
+ },
+ {
+ title: '澶囦欢瑙勬牸',
+ dataIndex: 'specification',
+ align: "center",
+ // width: 300,
+ },
+ {
+ title: '澶囦欢鍨嬪彿',
+ dataIndex: 'model',
+ align: "center",
+ // width: 300,
+ },
+ {
+ title: '鍒堕�犲晢',
+ dataIndex: 'constructorName',
+ align: "center",
+ // width: 300,
+ },
+ {
+ title: '鏁伴噺',
+ dataIndex: 'quantity',
+ align: "center",
+ // width: 300,
+ },
+ {
+ title: '鍗曚綅',
+ dataIndex: 'unitName',
+ align: "center",
+ // width: 300,
+ },
],
url: {
diff --git a/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue b/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
index 60cab8e..a0b2938 100644
--- a/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
@@ -22,7 +22,7 @@
:sm='6'
>
<a-form-item label='淇濆吇椤圭洰鍚嶇О'>
- <a-input
+ <j-input
placeholder='璇疯緭鍏ヤ繚鍏婚」鐩悕绉�'
v-model='queryParam.name'
/>
diff --git a/src/views/eam/modules/specialtyMaintenanceStandard/JSelectMaintenanceStandardModal.vue b/src/views/eam/modules/specialtyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
index eea805b..64f42bb 100644
--- a/src/views/eam/modules/specialtyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
+++ b/src/views/eam/modules/specialtyMaintenanceStandard/JSelectMaintenanceStandardModal.vue
@@ -22,7 +22,7 @@
:sm='6'
>
<a-form-item label='淇濆吇椤圭洰鍚嶇О'>
- <a-input
+ <j-input
placeholder='璇疯緭鍏ヤ繚鍏婚」鐩悕绉�'
v-model='queryParam.name'
/>
--
Gitblit v1.9.3