From 55102d755715254c69177da34ff61e72d7ff61d0 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 1 Mar 2023 18:48:38 +0800
Subject: [PATCH] 1

---
 src/api/eam/eam.js                            |   6 +
 src/views/modules/eam/eamPropertiesModel.vue  |   2 +-
 src/views/modules/eam/eamWorkPlanForCheck.vue | 494 ++++++++++++++++--
 3 files changed, 469 insertions(+), 33 deletions(-)

diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js
index a08cb3b..be5ecbb 100644
--- a/src/api/eam/eam.js
+++ b/src/api/eam/eam.js
@@ -93,3 +93,9 @@ export const deleteModalDetails = data => createAPI(`api/pms/eam/deleteModalDeta
 export const eamWorkPlanSearch = data => createAPI(`api/pms/eam/eamWorkPlanSearch`,'post',data)
 export const eamWorkPlanSave = data => createAPI(`api/pms/eam/eamWorkPlanSave`,'post',data)
 export const eamWorkPlanEdit = data => createAPI(`api/pms/eam/eamWorkPlanEdit`,'post',data)
+export const eamWorkPlanDelete = data => createAPI(`api/pms/eam/eamWorkPlanDelete`,'post',data)
+
+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)
diff --git a/src/views/modules/eam/eamPropertiesModel.vue b/src/views/modules/eam/eamPropertiesModel.vue
index 9168a8d..40709dd 100644
--- a/src/views/modules/eam/eamPropertiesModel.vue
+++ b/src/views/modules/eam/eamPropertiesModel.vue
@@ -643,7 +643,7 @@
             }
           })
         }else {
-          eamPropertiesModelEdit(this.modalData).then(({data}) => {
+          (this.modalData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()
               this.modalFlag=false
diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue
index 85ff651..3ed81fb 100644
--- a/src/views/modules/eam/eamWorkPlanForCheck.vue
+++ b/src/views/modules/eam/eamWorkPlanForCheck.vue
@@ -78,7 +78,7 @@
       fixed="right"
       header-align="center"
       align="center"
-      width="100"
+      width="160"
       label="操作">
       <template slot-scope="scope">
         <a type="text" size="small" @click="updateModal(scope.row)">修改</a>
@@ -160,6 +160,129 @@
     </el-footer>
   </el-dialog>
 
+    <el-dialog title="点检项目清单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="830px">
+      <el-form :inline="true"  label-position="top"  @keyup.enter.native="getDataList()">
+        <el-form-item :label="'点检模板编码'">
+          <el-input v-model="detailData.codeNo"  readonly style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'点检模板名称'">
+          <el-input v-model="detailData.codeDesc"  readonly style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item  :label="' '">
+<!--          <el-button  type="primary" @click="addDetailModal()">新增</el-button>-->
+        </el-form-item>
+      </el-form>
+      <el-table
+        :height="300"
+        :data="detailList"
+        border
+        v-loading="dataListLoading"
+
+        style="width: 100%;">
+        <el-table-column
+          v-for="(item,index) in columnDetailList" :key="index"
+          :sortable="item.columnSortable"
+          :prop="item.columnProp"
+          :header-align="item.headerAlign"
+          :show-overflow-tooltip="item.showOverflowTooltip"
+          :align="item.align"
+          :fixed="item.fixed==''?false:item.fixed"
+          :min-width="item.columnWidth"
+          :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                               style="width: 100px; height: 80px"/></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="130"
+          label="操作">
+          <template slot-scope="scope">
+            <a type="text" size="small" v-if="scope.row.valueChooseFlag=='Y'" @click="chooseModal(scope.row)">可选值</a>
+            <a type="text" size="small"  @click="updateItemModal(scope.row)">编辑</a>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="detailModelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="点检项目" :close-on-click-modal="false" v-drag :visible.sync="itemModalFlag" width="430px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="点检项目编码:">
+          <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-form-item>
+        <el-form-item :label="'检测值类型'">
+          <el-select filterable v-model="itemModalData.valueTypeDb" style="width: 120px">
+            <el-option label="文本" value="T"></el-option>
+            <el-option label="数字" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="点检方法说明:">
+          <el-input v-model="itemModalData.itemRemark"  style="width: 254px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'是否值可选'">
+          <el-select filterable v-model="itemModalData.valueChooseFlag" style="width: 120px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="参照值:">
+          <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-form-item>
+        <el-form-item label="最小值:">
+          <el-input v-model="itemModalData.minValue"  style="width: 120px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="itemSaveData()">保存</el-button>
+        <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-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>
+        </el-form-item>
+        <el-form-item :label="'检测值类型'">
+          <el-select filterable v-model="chooseModalData.valueTypeDb" disabled style="width: 120px">
+            <el-option label="文本" value="T"></el-option>
+            <el-option label="数字" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :height="300"
+        :data="chooseTableData"
+        border
+        style="width: 100%">
+        <el-table-column
+          prop="availableValue"
+          header-align="center"
+          align="left"
+          min-width="200"
+          label="属性值">
+        </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>
+
     <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
 
   </div>
@@ -170,6 +293,13 @@
     eamWorkPlanSearch,
     eamWorkPlanSave,
     eamWorkPlanEdit,
+    eamWorkPlanDelete,
+    searchPlanItems,
+    updatePlanItems,
+    searchPlanItemAvailable,
+    updatePlanItemAvailable,
+
+
   } from "@/api/eam/eam.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   export default {
@@ -388,7 +518,7 @@
             tableName: "点检计划表",
             columnProp: 'planPeriod',
             headerAlign: "center",
-            align: "left",
+            align: "right",
             columnLabel: '点检周期',
             columnHidden: false,
             columnImage: false,
@@ -454,8 +584,197 @@
             columnWidth: 150,
           },
         ],
+        //项目清单
+        addDetailModalFlag:false,
+        detailData:{
+          site:'',
+          planID:'',
+          codeNo:'',
+          codeDesc:'',
+          functionType:'A',
+          itemNo:'',
+          itemDesc:'',
+          itemType:'A',
+          userId:this.$store.state.user.name
+        },
+        detailModelFlag:false,
+        detailList: [],
+        columnDetailList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101009,
+            serialNumber: '101009Table2EamPropertiesItemID',
+            tableId: "101009Table2",
+            tableName: "点检项目表",
+            columnProp: 'itemNo',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '点检项目编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 90,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101009,
+            serialNumber: '101009Table2EamPropertiesItemDesc',
+            tableId: "101009Table2",
+            tableName: "点检项目表",
+            columnProp: 'itemDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '点检项目名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 90,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101009,
+            serialNumber: '101009Table2EamPropertiesItemRemark',
+            tableId: "101009Table2",
+            tableName: "点检项目表",
+            columnProp: 'itemRemark',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '点检方法说明',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101009,
+            serialNumber: '101009Table2ValueType',
+            tableId: "101009Table2",
+            tableName: "点检项目表",
+            columnProp: 'valueType',
+            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: 101009,
+            serialNumber: '101009Table2DefaultValue',
+            tableId: "101009Table2",
+            tableName: "点检项目表",
+            columnProp: 'defaultValue',
+            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: 101009,
+            serialNumber: '101009Table2MaxValue',
+            tableId: "101009Table2",
+            tableName: "点检项目表",
+            columnProp: 'maxValue',
+            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: 101009,
+            serialNumber: '101009Table2MinValue',
+            tableId: "101009Table2",
+            tableName: "点检项目表",
+            columnProp: 'minValue',
+            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: 101009,
+            serialNumber: '101009TableValueChooseFlag',
+            tableId: "101009Table",
+            tableName: "common",
+            columnProp: 'valueChooseFlag',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '是否值可选',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70,
+          },
+        ],
 
+        itemModalData:{
+          site:'',
+          planID:'',
+          flag:'',
+          itemNo:'',
+          itemDesc:'',
+          valueTypeDb:'',
+          defaultValue:'',
+          valueChooseFlag:'',
+          createdBy:this.$store.state.user.name,
+          maxValue:'',
+          minValue:'',
+          itemRemark:'',
+          itemType:'A',
+        },
+        itemModalFlag:false,
+        itemModalDisableFlag:false,
 
+
+        chooseModalFlag:false,
+        chooseModalData:{
+          site:'',
+          planID:'',
+          itemNo: '',
+          itemDesc: '',
+          itemType:'A',
+          valueTypeDb:'',
+        },
+        chooseTableData:[],
       }
     },
     mounted () {
@@ -472,16 +791,19 @@
         this.tagNo = val
         this.$nextTick(() => {
           let strVal = ''
-          if (val === 200) {
+          if (val === 200 && this.modalDisableFlag!=true) {
             strVal = this.modalData.objectID
+            this.$refs.baseList.init(val, strVal)
           }
           if (val === 1031) {
             strVal = this.modalData.propertiesCode
+            this.$refs.baseList.init(val, strVal)
           }
           if (val === 201) {
             strVal = this.modalData.operator
+            this.$refs.baseList.init(val, strVal)
           }
-          this.$refs.baseList.init(val, strVal)
+
         })
       },
       /* 列表方法的回调 */
@@ -535,6 +857,7 @@
           planID:'',
           planDesc:'',
           objectID:'',
+          objectDesc:'',
           propertiesCode:'',
           propertiesDesc:'',
           operator:'',
@@ -556,8 +879,9 @@
           planID:row.planID,
           planDesc:row.planDesc,
           objectID:row.objectID,
+          objectDesc:row.objectID,
           propertiesCode:row.propertiesCode,
-          propertiesDesc:row.propertiesDesc,
+          propertiesDesc:row.codeDesc,
           operator:row.operator,
           planPeriod:row.planPeriod,
           status:row.status,
@@ -569,33 +893,33 @@
         this.modalDisableFlag=true;
         this.modalFlag=true;
       },
-      // 删除
-      // deletePlan (row) {
-      //   this.$confirm(`是否删除这个机修人员?`, '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonText: '取消',
-      //     type: 'warning'
-      //
-      //   }).then(() => {
-      //     eamPlanDelete(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(() => {
-      //   })
-      // },
+
+      deletePlan (row) {
+        this.$confirm(`是否删除这个点检计划?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+
+        }).then(() => {
+          eamWorkPlanDelete(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(() => {
+        })
+      },
       saveData(){
         if (this.modalData.planDesc == '' || this.modalData.planDesc == null) {
           this.$alert('请输入计划描述 ！', '错误', {
@@ -659,6 +983,112 @@
           })
         }
       },
+
+
+
+      //----------项目清单----------------start
+      //打开项目清单
+      itemModal(row){
+        this.detailData.site=row.site
+        this.detailData.planID=row.planID
+        this.detailData.codeNo=row.propertiesCode
+        this.detailData.codeDesc=row.codeDesc
+        searchPlanItems(this.detailData).then(({data}) => {
+          this.detailList = data.rows
+        })
+        this.detailModelFlag=true;
+      },
+      updateItemModal(row){
+        this.itemModalData={
+          flag:'2',
+          site:row.site,
+          planID:row.planID,
+          itemNo:row.itemNo,
+          itemDesc:row.itemDesc,
+          valueTypeDb:row.valueTypeDb,
+          defaultValue:row.defaultValue,
+          valueChooseFlag:row.valueChooseFlag,
+          createdBy:this.$store.state.user.name,
+          maxValue:row.maxValue,
+          minValue:row.minValue,
+          itemRemark:row.itemRemark,
+          itemType:'A',
+
+        };
+        this.itemModalDisableFlag=true;
+        this.itemModalFlag=true;
+      },
+      itemSaveData(){
+        if (this.itemModalData.itemNo == '' || this.itemModalData.itemNo == null) {
+          this.$alert('请输入点检项目编码！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+        if (this.itemModalData.itemDesc == '' || this.itemModalData.itemDesc == null) {
+          this.$alert('请输入点检项目名称！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+
+        if(this.itemModalData.flag=='1'){
+          // eamPropertiesItemSave(this.itemModalData).then(({data}) => {
+          //   if (data && data.code == '0') {
+          //          searchPlanItems(this.detailData).then(({data}) => {
+        //   this.detailList = data.rows
+        // })
+          //     this.itemModalFlag=false
+          //     this.$message({
+          //       message: '操作成功',
+          //       type: 'success',
+          //       duration: 1500,
+          //       onClose: () => {
+          //       }
+          //     })
+          //   } else {
+          //     this.$alert(data.msg, '错误', {
+          //       confirmButtonText: '确定'
+          //     })
+          //   }
+          // })
+        }else {
+          updatePlanItems(this.itemModalData).then(({data}) => {
+            if (data && data.code == '0') {
+              searchPlanItems(this.detailData).then(({data}) => {
+                this.detailList = data.rows
+              })
+              this.itemModalFlag=false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }
+      },
+      //----------项目清单----------------end
+      //----------项目可选值----------------start
+      chooseModal(row){
+        this.chooseModalData.site=row.site;
+        this.chooseModalData.planID=row.planID;
+        this.chooseModalData.itemNo=row.itemNo;
+        this.chooseModalData.itemDesc=row.itemDesc;
+        this.chooseModalData.valueTypeDb=row.valueTypeDb;
+        searchPlanItemAvailable(this.chooseModalData).then(({data}) => {
+          this.chooseTableData = data.rows
+        })
+        this.chooseModalFlag=true;
+      },
+
+      //----------项目可选值----------------end
     }
   }
 </script>