diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js
index be5ecbb..c11d92c 100644
--- a/src/api/eam/eam.js
+++ b/src/api/eam/eam.js
@@ -98,4 +98,7 @@ export const eamWorkPlanDelete = data => createAPI(`api/pms/eam/eamWorkPlanDelet
export const searchPlanItems = data => createAPI(`api/pms/eam/searchPlanItems`,'post',data)
export const updatePlanItems = data => createAPI(`api/pms/eam/updatePlanItems`,'post',data)
export const searchPlanItemAvailable = data => createAPI(`api/pms/eam/searchPlanItemAvailable`,'post',data)
-export const updatePlanItemAvailable = data => createAPI(`api/pms/eam/updatePlanItemAvailable`,'post',data)
+export const savePlanItemAvailable = data => createAPI(`api/pms/eam/savePlanItemAvailable`,'post',data)
+export const deletePlanItemAvailable = data => createAPI(`api/pms/eam/deletePlanItemAvailable`,'post',data)
+export const createEamWorkOrder = data => createAPI(`api/pms/eam/createEamWorkOrder`,'post',data)
+
diff --git a/src/views/modules/eam/eamPropertiesItem.vue b/src/views/modules/eam/eamPropertiesItem.vue
index 51326bc..93a22fd 100644
--- a/src/views/modules/eam/eamPropertiesItem.vue
+++ b/src/views/modules/eam/eamPropertiesItem.vue
@@ -86,10 +86,10 @@
-
+
-
+
diff --git a/src/views/modules/eam/eamPropertiesModel.vue b/src/views/modules/eam/eamPropertiesModel.vue
index 40709dd..1ab93e5 100644
--- a/src/views/modules/eam/eamPropertiesModel.vue
+++ b/src/views/modules/eam/eamPropertiesModel.vue
@@ -643,7 +643,7 @@
}
})
}else {
- (this.modalData).then(({data}) => {
+ eamPropertiesModelEdit(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.modalFlag=false
@@ -686,7 +686,7 @@
return false
}
saveModalDetails(this.detailData).then(({data}) => {
- if (data && data.code === 0) {
+ if (data && data.code == 0) {
searchModalDetails(this.detailData).then(({data}) => {
this.detailList = data.rows
})
diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue
index 3ed81fb..da34061 100644
--- a/src/views/modules/eam/eamWorkPlanForCheck.vue
+++ b/src/views/modules/eam/eamWorkPlanForCheck.vue
@@ -81,6 +81,7 @@
width="160"
label="操作">
+ 下达
修改
删除
计划项目
@@ -217,7 +218,7 @@
-
+
@@ -242,10 +243,10 @@
-
+
-
+
@@ -253,7 +254,7 @@
关闭
-
+
@@ -264,6 +265,9 @@
+
+ 新增
+
+
+
+ 修改
+ 删除
+
+
关闭
-
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
@@ -297,9 +322,9 @@
searchPlanItems,
updatePlanItems,
searchPlanItemAvailable,
- updatePlanItemAvailable,
-
-
+ savePlanItemAvailable,
+ deletePlanItemAvailable,
+ createEamWorkOrder,
} from "@/api/eam/eam.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
export default {
@@ -456,6 +481,24 @@
fixed: '',
columnWidth: 100,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 101013,
+ serialNumber: '101013TableStatus',
+ tableId: "101013Table",
+ tableName: "点检计划表",
+ columnProp: 'status',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '状态',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 70,
+ },
{
userId: this.$store.state.user.name,
functionId: 101013,
@@ -764,7 +807,7 @@
itemModalFlag:false,
itemModalDisableFlag:false,
-
+ itemFlag:'text',
chooseModalFlag:false,
chooseModalData:{
site:'',
@@ -775,6 +818,16 @@
valueTypeDb:'',
},
chooseTableData:[],
+ itemData:{
+ site:'',
+ planID:'',
+ itemNo:'',
+ valueNo:'',
+ availableValue:'',
+ itemType:'A',
+ createdBy: this.$store.state.user.name
+ },
+ itemAddModalFlag:false,
}
},
mounted () {
@@ -945,6 +998,12 @@
})
return false
}
+ if (this.modalData.planStartDate < this.dayjs().format("YYYY-MM-DD")) {
+ this.$alert('计划开始日期不能小于今天！', '错误', {
+ confirmButtonText: '确定'
+ })
+ return
+ }
if(this.modalData.flag=='1'){
eamWorkPlanSave(this.modalData).then(({data}) => {
if (data && data.code === 0) {
@@ -1087,8 +1146,122 @@
})
this.chooseModalFlag=true;
},
+ addChooseModal(){
+ this.itemFlag= this.chooseModalData.valueTypeDb=='T'?'text':'number';
+ this.itemData={
+ site:this.chooseModalData.site,
+ planID:this.chooseModalData.planID,
+ itemNo:this.chooseModalData.itemNo,
+ valueNo:0,
+ availableValue:'',
+ itemType:'A',
+ createdBy: this.$store.state.user.name
+ }
+ this.itemAddModalFlag=true;
+ },
+ updateChooseModal(row){
+ this.itemFlag= this.chooseModalData.valueTypeDb=='T'?'text':'number';
+ this.itemData={
+ site:this.chooseModalData.site,
+ planID:this.chooseModalData.planID,
+ itemNo:this.chooseModalData.itemNo,
+ valueNo:row.valueNo,
+ availableValue:row.availableValue,
+ itemType:'A',
+ createdBy: this.$store.state.user.name
+ }
+ this.itemAddModalFlag=true;
+ },
+ saveItemAvailable(){
+ if(this.itemData.availableValue==''||this.itemData.availableValue==null){
+ this.$alert("请输入可选值！",'错误', {
+ confirmButtonText: '确定'
+ })
+ return false;
+ }
+ savePlanItemAvailable(this.itemData).then(({data}) => {
+ if (data && data.code == 0) {
+ searchPlanItemAvailable(this.chooseModalData).then(({data}) => {
+ this.chooseTableData = data.rows
+ })
+ this.itemAddModalFlag=false
+ this.$message({
+ message: '操作成功',
+ type: 'success',
+ duration: 1500,
+ onClose: () => {
+ }
+ })
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
+ })
+ },
+ deleteItemAvailable(row){
+ this.$confirm(`是否删除这个可选值?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+
+ }).then(() => {
+ deletePlanItemAvailable(row).then(({data}) => {
+ if (data && data.code === 0) {
+ searchPlanItemAvailable(this.chooseModalData).then(({data}) => {
+ this.chooseTableData = data.rows
+ })
+ this.$message({
+ message: '操作成功',
+ type: 'success',
+ duration: 1500,
+ onClose: () => {
+ }
+ })
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
+ })
+ }).catch(() => {
+ })
+ },
//----------项目可选值----------------end
+
+ createOrder(row){
+ if(row.planStartDate < this.dayjs().format("YYYY-MM-DD")){
+ this.$alert('计划开始日期小于今天！请修改开始日期', '错误', {
+ confirmButtonText: '确定'
+ })
+ return false
+ }
+ this.$confirm(`是创建日期为`+row.planStartDate+`的点检工单?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+
+ }).then(() => {
+ createEamWorkOrder(row).then(({data}) => {
+ if (data && data.code ==0) {
+ this.getDataList()
+ this.$message({
+ message: '操作成功',
+ type: 'success',
+ duration: 1500,
+ onClose: () => {
+ }
+ })
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
+ })
+ }).catch(() => {
+ })
+ },
}
}