src/views/eam/DailyInspectionOrderList.vue
@@ -64,6 +64,7 @@ @click="handleAdd" type="primary" icon="plus" v-has="'dailyInspectionOrder:add'" >新增</a-button> <!-- <a-button type="primary" @@ -130,6 +131,7 @@ <a-popconfirm title="确定下发工单吗?" @confirm="() => handleOrderIssue(record)" v-has="'dailyInspectionOrder:issue'" > <a v-if="record.status == '1'">下发</a> </a-popconfirm> @@ -140,6 +142,7 @@ <a-popconfirm title="确定撤回工单吗?" @confirm="() => handleOrderReset(record)" v-has="'dailyInspectionOrder:issue'" > <a v-if="record.status == '2'">撤回</a> </a-popconfirm> @@ -150,6 +153,7 @@ <a-popconfirm title="确定恢复工单吗?" @confirm="() => handleOrderRecover(record)" v-has="'dailyInspectionOrder:recover'" > <a v-if="record.status == '7'">恢复</a> </a-popconfirm> @@ -160,6 +164,7 @@ <a-popconfirm title="确定作废工单吗?" @confirm="() => handleOrderCancel(record)" v-has="'dailyInspectionOrder:recover'" > <a v-if="record.status == '2'">作废</a> </a-popconfirm> @@ -170,20 +175,24 @@ <a-popconfirm title="确定领取工单吗?" @confirm="() => handleOrderGet(record)" v-has="'dailyInspectionOrder: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="'dailyInspectionOrder:assign'" >派工</a> <a v-if="record.status == '2'&& record.assignMode == '3' && record.inspectionUserName != null " @click="handleAssignOrder(record)" v-has="'dailyInspectionOrder:assign'" >改派</a> <a v-if="record.status == '3'" @click="handleAssignOrder(record)" v-has="'dailyInspectionOrder:assign'" >改派</a> <a-divider v-if="record.status == '2'" @@ -196,6 +205,7 @@ <a v-if="record.status === '3' || record.status === '4' " @click="handleOrderExe(record)" v-has="'dailyInspectionOrder:exe'" >执行</a> <a-divider v-if="record.status === '3' || record.status === '4' " @@ -204,6 +214,7 @@ <a v-if="record.status === '1'" @click="handleEdit(record)" v-has="'dailyInspectionOrder:edit'" >编辑</a> <a-divider v-if="record.status === '1'" @@ -219,6 +230,7 @@ <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-has="'dailyInspectionOrder:delete'" > <a v-if="record.status === '1'">删除</a> </a-popconfirm> src/views/eam/DailyInspectionStandardList.vue
@@ -66,6 +66,7 @@ @click='handleAdd' type='primary' icon='plus' v-has="'dailyInspectionStandard:add'" >新增</a-button> <a-button type="primary" @@ -137,22 +138,26 @@ <a v-if="record.versionStatus == '2'" @click="handleRevise(record)" v-has="'dailyInspectionStandard:revise'" >升版</a> <a-divider type="vertical" /> <a v-if="record.versionStatus == '1'" @click="handleTakeEffect(record)" v-has="'dailyInspectionStandard:takeEffect'" >生效</a> <a-divider type="vertical" /> <a v-if="record.versionStatus == '1'" @click="handleEdit(record)" v-has="'dailyInspectionStandard:edit'" >编辑</a> <a-divider type="vertical" /> <a-popconfirm v-if="record.versionStatus == '1'" title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-has="'dailyInspectionStandard:delete'" > <a>删除</a> </a-popconfirm> src/views/eam/DailyMaintenanceOrderList.vue
@@ -64,6 +64,7 @@ @click="handleAdd" type="primary" icon="plus" v-has="'dailyMaintenanceOrder:add'" >新增</a-button> <!-- <a-button v-if="selectedRowKeys.length > 0" @@ -223,6 +224,7 @@ <a-popconfirm title="确定下发工单吗?" @confirm="() => handleOrderIssue(record)" v-has="'dailyMaintenanceOrder:issue'" > <a v-if="record.status == '1'">下发</a> </a-popconfirm> @@ -233,6 +235,7 @@ <a-popconfirm title="确定撤回工单吗?" @confirm="() => handleOrderReset(record)" v-has="'dailyMaintenanceOrder:issue'" > <a v-if="record.status == '2'">撤回</a> </a-popconfirm> @@ -243,6 +246,7 @@ <a-popconfirm title="确定恢复工单吗?" @confirm="() => handleOrderRecover(record)" v-has="'dailyMaintenanceOrder:recover'" > <a v-if="record.status == '7'">恢复</a> </a-popconfirm> @@ -253,6 +257,7 @@ <a-popconfirm title="确定作废工单吗?" @confirm="() => handleOrderCancel(record)" v-has="'dailyMaintenanceOrder:recover'" > <a v-if="record.status == '2'">作废</a> </a-popconfirm> @@ -263,16 +268,19 @@ <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'" @@ -289,6 +297,7 @@ <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' " @@ -297,6 +306,7 @@ <a v-if="record.status === '1'" @click="handleEdit(record)" v-has="'dailyMaintenanceOrder:edit'" >编辑</a> <a-divider v-if="record.status === '1'" @@ -312,6 +322,7 @@ <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-has="'dailyMaintenanceOrder:delete'" > <a v-if="record.status === '1'">删除</a> </a-popconfirm> src/views/eam/DailyMaintenanceStandardList.vue
@@ -89,6 +89,7 @@ @click='handleAdd' type='primary' icon='plus' v-has="'dailyMaintenanceStandard:add'" >新增</a-button> <a-button type='primary' @@ -160,21 +161,25 @@ <a v-if="record.versionStatus == '2'" @click="handleRevise(record)" v-has="'dailyMaintenanceStandard:revise'" >升版</a> <a v-if="record.versionStatus == '1'" @click="handleTakeEffect(record)" v-has="'dailyMaintenanceStandard:takeEffect'" >生效</a> <a-divider type="vertical" /> <a v-if="record.versionStatus == '1'" @click="handleEdit(record)" v-has="'dailyMaintenanceStandard:edit'" >编辑</a> <a-divider type="vertical" /> <a-popconfirm v-if="record.versionStatus == '1'" title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-has="'dailyMaintenanceStandard:delete'" > <a>删除</a> </a-popconfirm> src/views/eam/InspectionCycleList.vue
@@ -69,6 +69,7 @@ @click="handleAdd" type="primary" icon="plus" v-has="'inspectionCycle:add'" >新增</a-button> <a-button @@ -139,22 +140,26 @@ <a v-if="record.versionStatus == '2'" @click="handleRevise(record)" v-has="'inspectionCycle:revise'" >升版</a> <a-divider type="vertical" /> <a v-if="record.versionStatus == '1'" @click="handleTakeEffect(record)" v-has="'inspectionCycle:takeEffect'" >生效</a> <a-divider type="vertical" /> <a v-if="record.versionStatus == '1'" @click="handleEdit(record)" v-has="'inspectionCycle:edit'" >编辑</a> <a-divider type="vertical" /> <a-popconfirm v-if="record.versionStatus == '1'" title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-has="'inspectionCycle:delete'" > <a>删除</a> </a-popconfirm> src/views/eam/MaintenanceCycleList.vue
@@ -70,6 +70,7 @@ @click="handleAdd" type="primary" icon="plus" v-has="'maintenanceCycle:add'" >新增</a-button> <a-button type="primary" @@ -128,22 +129,26 @@ <a v-if="record.versionStatus == '2'" @click="handleRevise(record)" v-has="'maintenanceCycle:revise'" >升版</a> <a-divider type="vertical" /> <a v-if="record.versionStatus == '1'" @click="handleTakeEffect(record)" v-has="'maintenanceCycle:takeEffect'" >生效</a> <a-divider type="vertical" /> <a v-if="record.versionStatus == '1'" @click="handleEdit(record)" v-has="'maintenanceCycle:edit'" >编辑</a> <a-divider type="vertical" /> <a-popconfirm v-if="record.versionStatus == '1'" title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-has="'maintenanceCycle:delete'" > <a>删除</a> </a-popconfirm> src/views/eam/SpecialtyMaintenanceOrderList.vue
@@ -64,13 +64,14 @@ @click="handleAdd" type="primary" icon="plus" v-has="'specialtyMaintenanceOrder:add'" >新增</a-button> <a-button <!-- <a-button v-if="selectedRowKeys.length > 0" type="primary" @click="batchAssign" style="margin-left: 8px" >工单派工</a-button> >工单派工</a-button> --> <!-- <a-button type="primary" icon="download" @@ -135,7 +136,10 @@ title="确定下发工单吗?" @confirm="() => handleOrderIssue(record)" > <a v-if="record.status == '1'">下发</a> <a v-has="'specialtyMaintenanceOrder:issue'" v-if="record.status == '1'" >下发</a> </a-popconfirm> <a-divider v-if="record.status == '1'" @@ -145,7 +149,10 @@ title="确定撤回工单吗?" @confirm="() => handleOrderReset(record)" > <a v-if="record.status == '2'">撤回</a> <a v-has="'specialtyMaintenanceOrder:issue'" v-if="record.status == '2'" >撤回</a> </a-popconfirm> <a-divider v-if="record.status == '2'" @@ -155,7 +162,10 @@ title="确定恢复工单吗?" @confirm="() => handleOrderRecover(record)" > <a v-if="record.status == '7'">恢复</a> <a v-has="'specialtyMaintenanceOrder:recover'" v-if="record.status == '7'" >恢复</a> </a-popconfirm> <a-divider v-if="record.status == '7'" @@ -165,7 +175,10 @@ title="确定作废工单吗?" @confirm="() => handleOrderCancel(record)" > <a v-if="record.status == '2'">作废</a> <a v-has="'specialtyMaintenanceOrder:recover'" v-if="record.status == '2'" >作废</a> </a-popconfirm> <a-divider v-if="record.status == '2'" @@ -175,19 +188,25 @@ title="确定领取工单吗?" @confirm="() => handleOrderGet(record)" > <a v-if="record.status == '2' && record.assignMode == '1'">领取</a> <a v-has="'specialtyMaintenanceOrder:get'" 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="'specialtyMaintenanceOrder:assign'" >派工</a> <a v-if="record.status == '2'&& record.assignMode == '3' && record.inspectionUserName != null " @click="handleAssignOrder(record)" v-has="'specialtyMaintenanceOrder:assign'" >改派</a> <a v-if="record.status == '3'" @click="handleAssignOrder(record)" v-has="'specialtyMaintenanceOrder:assign'" >改派</a> <a-divider v-if="record.status == '2'" @@ -200,6 +219,7 @@ <a v-if="record.status === '3' || record.status === '4' " @click="handleOrderExe(record)" v-has="'specialtyMaintenanceOrder:exe'" >执行</a> <a-divider v-if="record.status === '3' || record.status === '4' " @@ -208,6 +228,7 @@ <a v-if="record.status === '1'" @click="handleEdit(record)" v-has="'specialtyMaintenanceOrder:edit'" >编辑</a> <a-divider v-if="record.status === '1'" @@ -224,7 +245,10 @@ title="确定删除吗?" @confirm="() => handleDelete(record.id)" > <a v-if="record.status === '1'">删除</a> <a v-has="'specialtyMaintenanceOrder:delete'" v-if="record.status === '1'" >删除</a> </a-popconfirm> </a-menu-item> </a-menu> @@ -444,13 +468,13 @@ methods: { batchAssign() { this.$refs.InspectionOrderAssignModal.visible = true this.$refs.InspectionOrderAssignModal.title = '工单派工' this.$refs.InspectionOrderAssignModal.selectionRows this.$refs.InspectionOrderAssignModal.handleShow() this.$bus.$emit('selectionRows', this.selectionRows); }, // batchAssign() { // this.$refs.InspectionOrderAssignModal.visible = true // this.$refs.InspectionOrderAssignModal.title = '工单派工' // this.$refs.InspectionOrderAssignModal.selectionRows // this.$refs.InspectionOrderAssignModal.handleShow() // this.$bus.$emit('selectionRows', this.selectionRows); // }, onSelectChange(selectionRows) { this.selectionRows = selectionRows; }, src/views/eam/SpecialtyMaintenancePlanList.vue
@@ -67,6 +67,7 @@ @click='handleAdd' type='primary' icon='plus' v-has="'specialtyMaintenancePlan:add'" >新增</a-button> </div> @@ -123,7 +124,10 @@ slot='action' slot-scope='text, record' > <a @click='handleEdit(record)'>编辑</a> <a v-has="'specialtyMaintenancePlan:edit'" @click='handleEdit(record)' >编辑</a> <a-divider type='vertical' /> <a-dropdown> @@ -134,7 +138,7 @@ title='确定删除吗?' @confirm='() => handleDelete(record.id)' > <a>删除</a> <a v-has="'specialtyMaintenancePlan:delete'">删除</a> </a-popconfirm> </a-menu-item> <a-menu-item v-if="record.status == 0"> @@ -142,7 +146,7 @@ title="确定启用吗?" @confirm="() => handleActive(record.id)" > <a>启用</a> <a v-has="'specialtyMaintenancePlan:active'">启用</a> </a-popconfirm> </a-menu-item> <a-menu-item v-if="record.status == 1"> @@ -150,7 +154,7 @@ title="确定禁用吗?" @confirm="() => handleActive(record.id)" > <a>停用</a> <a v-has="'specialtyMaintenancePlan:active'">停用</a> </a-popconfirm> </a-menu-item> </a-menu> src/views/eam/SpecialtyMaintenanceStandardList.vue
@@ -73,18 +73,19 @@ @click='handleAdd' type='primary' icon='plus' v-has="'specialtyMaintenanceStandard:add'" >新增</a-button> <a-button type='primary' @click='searchQuery' icon='search' >查询</a-button> <a-button type='primary' @click='searchReset' icon='reload' style='margin-left: 8px' >重置</a-button> type='primary' @click='searchQuery' icon='search' >查询</a-button> <a-button type='primary' @click='searchReset' icon='reload' style='margin-left: 8px' >重置</a-button> </div> <!-- table区域-begin --> @@ -115,29 +116,33 @@ @change='handleTableChange' > <span <span slot="action" slot-scope="text, record" > <a v-if="record.versionStatus == '2'" @click="handleRevise(record)" v-has="'specialtyMaintenanceStandard:revise'" >升版</a> <a-divider type="vertical" /> <a v-if="record.versionStatus == '1'" @click="handleTakeEffect(record)" v-has="'specialtyMaintenanceStandard:takeEffect'" >生效</a> <a-divider type="vertical" /> <a v-if="record.versionStatus == '1'" @click="handleEdit(record)" v-has="'specialtyMaintenanceStandard:edit'" >编辑</a> <a-divider type="vertical" /> <a-popconfirm v-if="record.versionStatus == '1'" title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-has="'specialtyMaintenanceStandard:delete'" > <a>删除</a> </a-popconfirm> @@ -155,9 +160,10 @@ class="table-operator" style="margin:-16px" > <specialty-maintenance-standard-detail :addDisableStatus="addDisableStatus" :maintenanceStandardId='maintenanceStandardId' /> <specialty-maintenance-standard-detail :addDisableStatus="addDisableStatus" :maintenanceStandardId='maintenanceStandardId' /> </div> </a-tab-pane> <a-tab-pane @@ -168,9 +174,10 @@ class="table-operator" style="margin:-16px" > <maintenance-standard-planning-material :addDisableStatus="addDisableStatus" :maintenanceStandardId='maintenanceStandardId' /> <maintenance-standard-planning-material :addDisableStatus="addDisableStatus" :maintenanceStandardId='maintenanceStandardId' /> </div> </a-tab-pane> <a-tab-pane @@ -182,8 +189,9 @@ style="margin:-16px" > <maintenance-standard-safety-requirement :addDisableStatus="addDisableStatus" :maintenanceStandardId='maintenanceStandardId' /> :addDisableStatus="addDisableStatus" :maintenanceStandardId='maintenanceStandardId' /> </div> </a-tab-pane> <a-tab-pane @@ -194,9 +202,10 @@ class="table-operator" style="margin:-16px" > <maintenance-standard-work-instruction :addDisableStatus="addDisableStatus" :maintenanceStandardId='maintenanceStandardId' /> <maintenance-standard-work-instruction :addDisableStatus="addDisableStatus" :maintenanceStandardId='maintenanceStandardId' /> </div> </a-tab-pane> @@ -337,7 +346,7 @@ total: 0 }, maintenanceStandardId: '-1', addDisableStatus:true, addDisableStatus: true, queryParam: { type: 'specialty' } } }, @@ -364,7 +373,7 @@ onSelectChange(selectedRowKeys, selectionRows) { if (selectedRowKeys.length == 1) { this.maintenanceStandardId = selectionRows[0]['id'] this.addDisableStatus = selectionRows[0].versionStatus!='1' this.addDisableStatus = selectionRows[0].versionStatus != '1' console.log(this.addDisableStatus) } else { this.maintenanceStandardId = '-1' src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -17,18 +17,21 @@ @click="handleSW" :disabled=SWbuttonDistable type="primary" v-has="'dailyInspectionOrder:SW'" >开工</a-button> <a-button :style="{marginRight: '8px'}" @click="handleReport" :disabled="buttonDistable" type="primary" v-has="'dailyInspectionOrder:report'" >报工</a-button> <a-button :style="{marginRight: '8px'}" @click="handleReset" :disabled="revocationDistable" type="primary" v-has="'dailyInspectionOrder:reset'" >撤销</a-button> </a-row> </div> @@ -262,11 +265,13 @@ @click="handleTS" :disabled="buttonDistable" type="primary" v-has="'dailyInspectionOrder:TS'" >暂存</a-button> <a-button @click="handleOk" :disabled="buttonDistable" type="primary" v-has="'dailyInspectionOrder:save'" >保存</a-button> </a-row> </div> @@ -393,14 +398,12 @@ dataIndex: 'abnormalDesc', scopedSlots: { customRender: 'abnormalDesc' }, }, { title: '异常拍照', align: 'center', dataIndex: 'abnormalPhoto', scopedSlots: { customRender: 'abnormalPhoto' }, // dataIndex: 'action', // scopedSlots: { customRender: 'action' }, }, // { // title: '异常拍照', // align: 'center', // dataIndex: 'abnormalPhoto', // scopedSlots: { customRender: 'abnormalPhoto' }, // }, { title: '*异常处置', align: 'center', src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
@@ -325,6 +325,7 @@ @click="handleOk()" type="primary" :loading="confirmLoading" :disabled="disableSubmit || confirmLoading" >确定</a-button> </template> src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue
@@ -45,8 +45,12 @@ <a-popconfirm title="确认锁料吗?" @confirm="() => handleLock(record)" dailyMaintenanceOrder:actualMaterialLock > <a v-if="record.isLock=='no'&&dailyMaintenanceOrderStatus=='4'">锁料</a> <a v-has="'dailyMaintenanceOrder:actualMaterialLock'" v-if="record.isLock=='no'&&dailyMaintenanceOrderStatus=='4'" >锁料</a> </a-popconfirm> <a-divider v-if="record.isLock=='no'" @@ -56,13 +60,19 @@ title="解锁后会自动释放库存,确认解锁吗?" @confirm="() => handleUnLock(record)" > <a v-if="record.isLock=='yes'&&dailyMaintenanceOrderStatus=='4'">解锁</a> <a v-has="'dailyMaintenanceOrder:actualMaterialLock'" v-if="record.isLock=='yes'&&dailyMaintenanceOrderStatus=='4'" >解锁</a> </a-popconfirm> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" > <a v-if="record.isLock=='no'&&dailyMaintenanceOrderStatus=='4'">删除</a> <a v-has="'dailyMaintenanceOrder:actualMaterialDelete'" v-if="record.isLock=='no'&&dailyMaintenanceOrderStatus=='4'" >删除</a> </a-popconfirm> </span> </a-table> @@ -72,6 +82,7 @@ icon="plus" @click="addMaterial" :disabled="dailyMaintenanceOrderStatus!='4'" v-has="'dailyMaintenanceOrder:actualMaterialAdd'" >添加实际用料</a-button> <div :style="{width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}"> <a-row :style="{textAlign:'right'}"> src/views/eam/modules/dailyMaintenanceOrder/ActualWorkHoursEditTable.vue
@@ -41,7 +41,10 @@ slot='action' slot-scope='text, record,index' > <a @click="handleDeleteFake(index)">删除</a> <a v-has="'dailyMaintenanceOrder:actualWorkHoursDelete'" @click="handleDeleteFake(index)" >删除</a> </span> </a-table> <a-button @@ -65,11 +68,13 @@ type="primary" :style="{marginRight: '8px'}" :disabled="dailyMaintenanceOrderStatus!='4'" v-has="'dailyMaintenanceOrder:actualWorkHoursTS'" >暂存</a-button> <a-button @click="handleOk(0)" type="primary" :disabled="dailyMaintenanceOrderStatus!='4'" v-has="'dailyMaintenanceOrder:actualWorkHoursSave'" >保存</a-button> </a-row> <!-- :disabled="false" --> src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -17,18 +17,21 @@ @click="handleSW" :disabled=SWbuttonDistable type="primary" v-has="'dailyMaintenanceOrder:SW'" >开工</a-button> <a-button :style="{marginRight: '8px'}" @click="handleReport" :disabled="buttonDistable" type="primary" v-has="'dailyMaintenanceOrder:report'" >报工</a-button> <a-button :style="{marginRight: '8px'}" @click="handleReset" :disabled="revocationDistable" type="primary" v-has="'dailyMaintenanceOrder:reset'" >撤销</a-button> </a-row> </div> src/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardPlanningMaterial.vue
@@ -18,6 +18,7 @@ type="primary" icon="plus" v-if="dailyMaintenanceStandardSelectionRows.length == 1 && dailyMaintenanceStandardSelectionRows[0].versionStatus == '1' " v-has="'dailyMaintenanceStandard:planMaterialAdd'" >新增</a-button> <div> src/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardSafetyRequirement.vue
@@ -18,6 +18,7 @@ type="primary" icon="plus" v-if="dailyMaintenanceStandardSelectionRows.length == 1 && dailyMaintenanceStandardSelectionRows[0].versionStatus == '1' " v-has="'dailyMaintenanceStandard:safetyRequirementAdd'" >新增</a-button> <div> src/views/eam/modules/dailyMaintenanceStandard/MaintenanceStandardWorkInstruction.vue
@@ -18,6 +18,7 @@ type="primary" icon="plus" v-if="dailyMaintenanceStandardSelectionRows.length == 1 && dailyMaintenanceStandardSelectionRows[0].versionStatus == '1' " v-has="'dailyMaintenanceStandard:workInstructionAdd'" >新增</a-button> <div> src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue
@@ -42,18 +42,36 @@ slot='action' slot-scope='text, record' > <a-popconfirm title="确认锁料吗?" @confirm="() => handleLock(record)"> <a v-if="record.isLock=='no'&&specialyMaintenanceOrderStatus=='4'">锁料</a> <a-popconfirm title="确认锁料吗?" @confirm="() => handleLock(record)" > <a v-has="'specialtyMaintenanceOrder:actualMaterialLock'" v-if="record.isLock=='no'&&specialyMaintenanceOrderStatus=='4'" >锁料</a> </a-popconfirm> <a-divider v-if="record.isLock=='no'" type="vertical" /> <a-popconfirm title="解锁后会自动释放库存,确认解锁吗?" @confirm="() => handleUnLock(record)"> <a v-if="record.isLock=='yes'&&specialyMaintenanceOrderStatus=='4'">解锁</a> v-if="record.isLock=='no'" type="vertical" /> <a-popconfirm title="解锁后会自动释放库存,确认解锁吗?" @confirm="() => handleUnLock(record)" > <a v-has="'specialtyMaintenanceOrder:actualMaterialLock'" v-if="record.isLock=='yes'&&specialyMaintenanceOrderStatus=='4'" >解锁</a> </a-popconfirm> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a v-if="record.isLock=='no'&&specialyMaintenanceOrderStatus=='4'">删除</a> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" > <a v-has="'specialtyMaintenanceOrder:actualMaterialDelete'" v-if="record.isLock=='no'&&specialyMaintenanceOrderStatus=='4'" >删除</a> </a-popconfirm> </span> </a-table> @@ -63,6 +81,7 @@ icon="plus" @click="addMaterial" :disabled="specialyMaintenanceOrderStatus!='4'" v-has="'specialtyMaintenanceOrder:actualMaterialAdd'" >添加实际用料</a-button> <div :style="{width: '100%',border: '1px solid #e9e9e9',padding: '10px 16px',background: '#fff',}"> <a-row :style="{textAlign:'right'}"> @@ -91,8 +110,7 @@ @sendMaterialRecord="sendMaterialRecord" > </actual-material-select> <j-select-spare-part-modal ref='JSelectSparePartModal'></j-select-spare-part-modal> <j-select-spare-part-modal ref='JSelectSparePartModal'></j-select-spare-part-modal> </a-card> </template> <script> @@ -175,7 +193,7 @@ loading: false, dataSource: [], columns: [ { { title: '领料出库单', dataIndex: 'num', align: "center", @@ -244,9 +262,9 @@ list: "/eam/maintenanceOrderActualMaterial/getMaintenanceOrderActualMaterialList", confirmMaterial: "/eam/maintenanceOrderActualMaterial/add", delete: "/eam/maintenanceOrderActualMaterial/delete", addInit:"/eam/maintenanceOrderActualMaterial/addInit", lock:"/eam/maintenanceOrderActualMaterial/lock", unLock:"/eam/maintenanceOrderActualMaterial/unLock" addInit: "/eam/maintenanceOrderActualMaterial/addInit", lock: "/eam/maintenanceOrderActualMaterial/lock", unLock: "/eam/maintenanceOrderActualMaterial/unLock" }, changeIndex: 0 } @@ -347,7 +365,7 @@ const target = temp[index] let availableQuantity = target['availableQuantity'] if (target) { if (value!=undefined&& value!=null&& value!=''&&availableQuantity < value) { if (value != undefined && value != null && value != '' && availableQuantity < value) { this.$message.error('使用数量不能大于可用数量!') } else { } @@ -378,48 +396,48 @@ this.dataSource = []; this.ipagination.current = 1 }, getUuiD(randomLength){ getUuiD(randomLength) { return Number( Math.random() .toString() .substr(2, randomLength) + Date.now() ).toString(36) }, handleLock(record){ handleLock(record) { let that = this; if(record.quantity==null||record.quantity==undefined||record.quantity==''){ if (record.quantity == null || record.quantity == undefined || record.quantity == '') { this.$message.error('请先填写数量!'); return false } if(record.availableQuantity<record.quantity){ if (record.availableQuantity < record.quantity) { this.$message.error('使用数量不能大于可用数量!'); return false; } this.confirmLoading = true; postAction(this.url.lock,record).then(res=>{ if(res.success){ this.$message.success("库存锁定成功!") }else{ this.$message.error(res.message) postAction(this.url.lock, record).then(res => { if (res.success) { this.$message.success("库存锁定成功!") } else { this.$message.error(res.message) } }).finally(res=>{ that.confirmLoading = false that.loadData(); }).finally(res => { that.confirmLoading = false that.loadData(); }) }, handleUnLock(record){ handleUnLock(record) { let that = this; this.confirmLoading = true; postAction(this.url.unLock,record).then(res=>{ if(res.success){ this.$message.success("库存解锁成功!") }else{ this.$message.error(res.message) postAction(this.url.unLock, record).then(res => { if (res.success) { this.$message.success("库存解锁成功!") } else { this.$message.error(res.message) } }).finally(res=>{ that.confirmLoading = false that.loadData(); }).finally(res => { that.confirmLoading = false that.loadData(); }) }, loadData(arg) { @@ -459,44 +477,44 @@ let newActualMaterials = []; this.$bus.$on('selectionRows', (data) => { for (let i = 0; i < data.length; i++) { var actualMaterial = var actualMaterial = { id: this.getUuiD(16), num: data[i].num, outboundOrderDetailId:data[i].id, sparePartId:data[i].sparePartId, outboundOrderDetailId: data[i].id, sparePartId: data[i].sparePartId, sparePartNum: data[i].spareNum, sparePartName: data[i].spareName, specification: data[i].specification, model:data[i].model, constructorName:data[i].constructorName, constructorId:data[i].constructorId, mainUnitName:data[i].mainUnitName, mainUnitId:data[i].mainUnitId, mainQuantity:data[i].mainQuantity, useQuantity:data[i].useQuantity, availableQuantity:data[i].availableQuantity, maintenanceOrderId:this.specialyMaintenanceOrderId, equipmentId :this.equipmentId, isLock:'no' model: data[i].model, constructorName: data[i].constructorName, constructorId: data[i].constructorId, mainUnitName: data[i].mainUnitName, mainUnitId: data[i].mainUnitId, mainQuantity: data[i].mainQuantity, useQuantity: data[i].useQuantity, availableQuantity: data[i].availableQuantity, maintenanceOrderId: this.specialyMaintenanceOrderId, equipmentId: this.equipmentId, isLock: 'no' } newActualMaterials.push(actualMaterial); } let that = this let obj = obj = postAction(this.url.addInit, newActualMaterials) obj.then((res) => { if (res.success) { that.$message.success(res.message) that.$emit('ok') } else { that.$message.warning(res.message) } }).finally(res=>{ that.loadData(); newActualMaterials = [] }) let that = this let obj = obj = postAction(this.url.addInit, newActualMaterials) obj.then((res) => { if (res.success) { that.$message.success(res.message) that.$emit('ok') } else { that.$message.warning(res.message) } }).finally(res => { that.loadData(); newActualMaterials = [] }) }) }, src/views/eam/modules/specialtyMaintenanceOrder/ActualWorkHoursEditTable.vue
@@ -42,7 +42,10 @@ slot='action' slot-scope='text, record,index' > <a @click="handleDelete(index)">删除</a> <a v-has="'specialtyMaintenanceOrder:actualWorkHoursDelete'" @click="handleDelete(index)" >删除</a> </span> </a-table> <a-button @@ -66,11 +69,13 @@ type="primary" :style="{marginRight: '8px'}" :disabled="specialyMaintenanceOrderStatus!='4'" v-has="'specialtyMaintenanceOrder:actualWorkHoursTS'" >暂存</a-button> <a-button @click="handleOk(0)" type="primary" :disabled="specialyMaintenanceOrderStatus!='4'" v-has="'specialtyMaintenanceOrder:actualWorkHoursSave'" >保存</a-button> </a-row> <!-- :disabled="false" --> src/views/eam/modules/specialtyMaintenanceOrder/SpecialyMaintenanceOrderExeDrawer.vue
@@ -17,18 +17,21 @@ @click="handleSW" :disabled=SWbuttonDistable type="primary" v-has="'specialtyMaintenanceOrder:SW'" >开工</a-button> <a-button :style="{marginRight: '8px'}" @click="handleReport" :disabled="buttonDistable" type="primary" v-has="'specialtyMaintenanceOrder:report'" >报工</a-button> <a-button :style="{marginRight: '8px'}" @click="handleReset" :disabled="revocationDistable" type="primary" v-has="'specialtyMaintenanceOrder:reset'" >撤销</a-button> </a-row> </div> @@ -233,10 +236,23 @@ :scroll="{ x: 'calc(1200px + 50%)', y: 900 }" > <!-- :scroll="{x:true}" --> <template slot="imgSlot" slot-scope="text,record"> <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> </template> <template slot="imgSlot" slot-scope="text,record" > <span v-if="!text" style="font-size: 12px;font-style: italic;" >无图片</span> <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;" /> </template> </a-table> </div> @@ -420,7 +436,7 @@ customRender: function (t, r, index) { return parseInt(index) + 1 }, width:60, width: 60, }, { title: '部位', @@ -638,11 +654,11 @@ //报工 handleReport() { var actualMaterials = this.$refs.actualMaterialTabel.dataSource; for(var i = 0;i<actualMaterials.length;i++){ if(actualMaterials[i].isLock=='no'){ this.$message.warn("实际用料第"+(i+1)+"行尚未锁料,请锁料后再进行报工"); return false; } for (var i = 0; i < actualMaterials.length; i++) { if (actualMaterials[i].isLock == 'no') { this.$message.warn("实际用料第" + (i + 1) + "行尚未锁料,请锁料后再进行报工"); return false; } } const that = this; that.confirmLoading = true; src/views/eam/modules/specialtyMaintenanceStandard/MaintenanceStandardPlanningMaterial.vue
@@ -19,6 +19,7 @@ icon="plus" v-if="specialtyMaintenanceStandardSelectionRows.length == 1 " :disabled="addDisableStatus" v-has="'specialtyMaintenanceStandard:planMaterialAdd'" >新增</a-button> <div> @@ -41,6 +42,7 @@ <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-has="'specialtyMaintenanceStandard:planMaterialDelete'" > <a v-if="!addDisableStatus">删除</a> </a-popconfirm> @@ -74,10 +76,10 @@ default: '-1', required: false }, addDisableStatus:{ type:Boolean, required:false, default:true, addDisableStatus: { type: Boolean, required: false, default: true, } }, mounted() { src/views/eam/modules/specialtyMaintenanceStandard/MaintenanceStandardSafetyRequirement.vue
@@ -19,6 +19,7 @@ icon="plus" v-if="specialtyMaintenanceStandardSelectionRows.length == 1 " :disabled="addDisableStatus" v-has="'specialtyMaintenanceStandard:safetyRequirementAdd'" >新增</a-button> <div> @@ -42,7 +43,10 @@ title="确定删除吗?" @confirm="() => handleDelete(record.id)" > <a v-if="!addDisableStatus">删除</a> <a v-has="'specialtyMaintenanceStandard:safetyRequirementDelete'" v-if="!addDisableStatus" >删除</a> </a-popconfirm> </span> </a-table> @@ -73,10 +77,10 @@ default: '-1', required: false }, addDisableStatus:{ type:Boolean, required:false, default:true, addDisableStatus: { type: Boolean, required: false, default: true, } }, mounted() { src/views/eam/modules/specialtyMaintenanceStandard/MaintenanceStandardWorkInstruction.vue
@@ -19,6 +19,7 @@ icon="plus" v-if="specialtyMaintenanceStandardSelectionRows.length == 1 " :disabled="addDisableStatus" v-has="'specialtyMaintenanceStandard:workInstructionAdd'" >新增</a-button> <div> @@ -97,7 +98,7 @@ @confirm="() => handleDelete(record.id)" v-if="!addDisableStatus" > <a>删除</a> <a v-has="'specialtyMaintenanceStandard:workInstructionDelete'">删除</a> </a-popconfirm> </span> @@ -144,10 +145,10 @@ default: '-1', required: false }, addDisableStatus:{ type:Boolean, required:false, default:true, addDisableStatus: { type: Boolean, required: false, default: true, } }, mounted() {