1

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)
+

src/views/modules/eam/eamPropertiesItem.vue

@@ -86,10 +86,10 @@
           <el-input v-model="modalData.defaultValue"  style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="最大值:">
-          <el-input v-model="modalData.maxValue"  style="width: 120px"></el-input>
+          <el-input v-model="modalData.maxValue" type="number" style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="最小值:">
-          <el-input v-model="modalData.minValue"  style="width: 120px"></el-input>
+          <el-input v-model="modalData.minValue" type="number" style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">

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
             })

src/views/modules/eam/eamWorkPlanForCheck.vue

@@ -81,6 +81,7 @@
       width="160"
       label="操作">
       <template slot-scope="scope">
+        <a type="text" size="small" v-if="scope.row.status=='已计划'" @click="createOrder(scope.row)">下达</a>
         <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
         <a type="text" size="small" @click="deletePlan(scope.row)">删除</a>
         <a type="text" size="small" @click="itemModal(scope.row)">计划项目</a>
@@ -217,7 +218,7 @@
           <el-input v-model="itemModalData.itemNo" :disabled="itemModalDisableFlag" style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="点检项目名称:">
-          <el-input v-model="itemModalData.itemDesc"  style="width: 120px"></el-input>
+          <el-input v-model="itemModalData.itemDesc" disabled style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item :label="'检测值类型'">
           <el-select filterable v-model="itemModalData.valueTypeDb" style="width: 120px">
@@ -242,10 +243,10 @@
           <el-input v-model="itemModalData.defaultValue"  style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="最大值:">
-          <el-input v-model="itemModalData.maxValue"  style="width: 120px"></el-input>
+          <el-input v-model="itemModalData.maxValue" type="number" style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item label="最小值:">
-          <el-input v-model="itemModalData.minValue"  style="width: 120px"></el-input>
+          <el-input v-model="itemModalData.minValue"  type="number" style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
@@ -253,7 +254,7 @@
         <el-button type="primary" @click="itemModalFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
-    <el-dialog title="可选值" :close-on-click-modal="false" v-drag :visible.sync="chooseModalFlag" width="350px">
+    <el-dialog title="可选值" :close-on-click-modal="false" v-drag :visible.sync="chooseModalFlag" width="430px">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
         <el-form-item label="点检项目名称:">
           <el-input v-model="chooseModalData.itemDesc"  disabled style="width: 120px"></el-input>
@@ -264,6 +265,9 @@
             <el-option label="数字" value="N"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="' '">
+          <el-button  type="primary" @click="addChooseModal()">新增</el-button>
+        </el-form-item>
       </el-form>
       <el-table
         :height="300"
@@ -277,12 +281,33 @@
           min-width="200"
           label="属性值">
         </el-table-column>
+        <el-table-column
+          prop=""
+          header-align="center"
+          align="center"
+          min-width="100"
+          label="操作">
+          <template slot-scope="scope">
+            <a type="text" size="small" @click="updateChooseModal(scope.row)">修改</a>
+            <a type="text" size="small" @click="deleteItemAvailable(scope.row)">删除</a>
+          </template>
+        </el-table-column>
       </el-table>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
         <el-button type="primary" @click="chooseModalFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
-
+    <el-dialog title="可选值维护" :close-on-click-modal="false" v-drag :visible.sync="itemAddModalFlag" width="215px" >
+      <el-form :inline="true" label-position="top" style="margin-left: 22px;margin-top: -5px;" @submit.native.prevent>
+        <el-form-item :label="'可选值：'">
+          <el-input v-model="itemData.availableValue"  :type="itemFlag" style="width: 130px;"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveItemAvailable()">保存</el-button>
+        <el-button type="primary" @click="itemAddModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
 
   </div>
@@ -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(() => {
+        })
+      },
     }
   }
 </script>