Merge remote-tracking branch 'origin/master'

src/views/module_cmms/submission/SubmissionList.vue

@@ -94,6 +94,19 @@
           </a-button>
         </template>
 
+        <!-- 版本1：弹框（未做if判断） -->
+        <!-- <span slot="submissionGdstatus_dictText" slot-scope="text, record">
+          <a @click="statusEdit(record)">{{ record.submissionGdstatus_dictText}}</a>
+        </span> -->
+        <!-- 版本二（加if判断） -->
+        <span slot="submissionGdstatus_dictText" slot-scope="text, record">
+          <!-- <a @click="statusEdit(record)" v-if="record.submissionGdstatus != 2">{{ record.submissionGdstatus_dictText}}</a> -->
+          <a-popconfirm  v-if="record.submissionGdstatus != 2" :title="record.submissionGdstatus == 0 ? '确定将工单状态改为“进行中”吗':'确定将工单状态改为“已完成”吗'" @confirm="() => statusEdit(record)">
+            <a>{{ record.submissionGdstatus_dictText}}</a>
+          </a-popconfirm>
+          <span v-if="record.submissionGdstatus == 2">{{ record.submissionGdstatus_dictText}}</span>
+        </span>
+
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
           <a-divider type="vertical" />
@@ -119,6 +132,7 @@
 
     <cmms-submission-modal ref="modalForm" @ok="modalFormOk"></cmms-submission-modal>
     <SubmissionEquipmentModalFK ref="modalFormFK" @ok="modalFormOk"> </SubmissionEquipmentModalFK>
+    <edit-status-modal ref="modalFormEdit" @ok="modalFormOk"></edit-status-modal>
   </a-card>
 </template>
 
@@ -127,8 +141,10 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { httpAction, getAction } from '@/api/manage'
   import CmmsSubmissionModal from './modules/SubmissionModal'
   import SubmissionEquipmentModalFK from "./modulesFK/SubmissionEquipmentModalFK.vue";
+  import EditStatusModal from './modules/editStatusModal.vue'
 
   export default {
     name: 'CmmsSubmissionList',
@@ -136,6 +152,7 @@
     components: {
       CmmsSubmissionModal,
       SubmissionEquipmentModalFK,
+        EditStatusModal,
     },
     data () {
       return {
@@ -183,6 +200,12 @@
             dataIndex: 'remark'
           },
           {
+            title:'送检工单状态',
+            align:"center",
+            dataIndex: 'submissionGdstatus_dictText',
+            scopedSlots: { customRender: 'submissionGdstatus_dictText' }
+          },
+          {
             title: '操作',
             dataIndex: 'action',
             align:"center",
@@ -197,10 +220,11 @@
           deleteBatch: "/cmmsSubmission/cmmsSubmission/deleteBatch",
           exportXlsUrl: "/cmmsSubmission/cmmsSubmission/exportXls",
           importExcelUrl: "cmmsSubmission/cmmsSubmission/importExcel",
-
+          editStatus: "/cmmsSubmission/cmmsSubmission/editSJStatus"
         },
         dictOptions:{},
         superFieldList:[],
+        model: {}
       }
     },
     created() {
@@ -228,6 +252,40 @@
         this.$refs.modalFormFK.title = "送检信息反馈";
         this.$refs.modalFormFK.disableSubmit = false;
         this.$refs.modalFormFK.fankui(record.id);
+      },
+      // 修改工单状态
+      statusEdit(record){
+        // 版本1：弹框
+        // this.$refs.modalFormEdit.title = "修改工单状态";
+        // this.$refs.modalFormEdit.disableSubmit = false;
+        // this.$refs.modalFormEdit.edit(record.id);
+        // 版本2：按钮直接进行下一步状态
+        console.log(record.submissionGdstatus)
+        let httpurl = '';
+        let method = '';
+        httpurl+=this.url.editStatus;
+        method = 'put';
+        if (record.submissionGdstatus == 0) {
+          this.model = {
+            id: record.id,
+            submissionGdstatus : "1",
+          }
+        }
+        if (record.submissionGdstatus == 1) {
+          this.model = {
+            id: record.id,
+            submissionGdstatus : "2",
+          }
+        }
+        httpAction(httpurl,this.model,method).then((res)=>{
+          if(res.success){
+            this.$message.success(res.message);
+            this.modalFormOk()
+          }else{
+            this.$message.warning(res.message);
+            this.modalFormOk()
+          }
+        })
       }
     }
   }

src/views/module_cmms/submission/modules/editStatusModal.vue

@@ -0,0 +1,75 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <j-form-container>
+        <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+            <a-row>
+            <a-col :span="24">
+                <a-form-model-item label="工单状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="submissionGdstatus">
+                <j-search-select-tag v-model="model.submissionGdstatus" dict="submission_gdstatus"  placeholder="请选择工单状态"/>
+                </a-form-model-item>
+            </a-col>
+            </a-row>
+        </a-form-model>
+    </j-form-container>
+
+  </j-modal>
+</template>
+
+<script>
+
+
+  export default {
+    name: 'SubmissionModal',
+    components: {
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false,
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+      }
+    },
+    methods: {
+      edit (record) {
+        this.visible=true
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        // this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

src/views/module_cmms/submission/modulesFK/SubmissionEquipmentFormFK.vue

@@ -30,17 +30,57 @@
     </div>
     <!-- 查询区域-END -->
 
-    <a-table
-      ref="table"
-      size="small"
-      :scroll="{x:true}"
-      bordered
-      rowKey="id"
-      :columns="columns"
-      :dataSource="sjsbdataPoint"
-      :pagination="false"
-      class="j-table-force-nowrap">
-    </a-table>
+<!--    <a-button @click="handleFK">提交反馈</a-button>-->
+    <a-form-model
+      :model="formModel"
+      :rules="formRules"
+      ref="form">
+      <a-form-item>
+        <a-table
+          size="small"
+          :scroll="{x:true}"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :dataSource="formModel.sjsbdataPoint"
+          :pagination="false"
+          class="j-table-force-nowrap">
+
+          <template slot="remark" slot-scope="text, record,index">
+            <a-form-model-item :prop="'sjsbdataPoint.'+index+'.remark'" :rules="formRules.remark" style="margin-bottom: 0px;">
+              <a-input v-model="record.remark" placeholder="请输入备注"></a-input>
+            </a-form-model-item>
+          </template>
+          <template slot="teamConfirm" slot-scope="text, record,index">
+            <a-form-model-item :prop="'sjsbdataPoint.'+index+'.teamConfirm'" :rules="formRules.teamConfirm" style="margin-bottom: 0px;">
+              <a-input v-model="record.teamConfirm" placeholder="请输入班组确认"></a-input>
+            </a-form-model-item>
+          </template>
+          <template slot="submissionReturnDate" slot-scope="text, record,index">
+            <a-form-model-item :prop="'sjsbdataPoint.'+index+'.submissionReturnDate'" :rules="formRules.submissionReturnDate" style="margin-bottom: 0px;">
+              <a-date-picker placeholder="请选择送回日期"  v-model="record.submissionReturnDate" :show-time="true" value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </template>
+          <template slot="submissionDate" slot-scope="text, record,index">
+            <a-form-model-item :prop="'sjsbdataPoint.'+index+'.submissionDate'" :rules="formRules.submissionDate" style="margin-bottom: 0px;">
+              <a-date-picker placeholder="请选择检定日期"  v-model="record.submissionDate" :show-time="true" value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </template>
+
+          <template slot="submissionStatus" slot-scope="text, record,index">
+            <a-form-model-item :prop="'sjsbdataPoint.'+index+'.submissionStatus'" :rules="formRules.submissionStatus" style="margin-bottom: 0px;">
+              <j-dict-select-tag placeholder="请选择送检状态" v-model="record.submissionStatus" dictCode="submission_status"/>
+            </a-form-model-item>
+          </template>
+          <template slot="submissionResult" slot-scope="text, record,index">
+            <a-form-model-item :prop="'sjsbdataPoint.'+index+'.submissionResult'" :rules="formRules.submissionResult" style="margin-bottom: 0px;">
+              <j-dict-select-tag placeholder="请选择检定结果" v-model="record.submissionResult" dictCode="device_verification_result"/>
+            </a-form-model-item>
+          </template>
+
+        </a-table>
+      </a-form-item>
+    </a-form-model>
   </div>
 </template>
 
@@ -64,15 +104,18 @@ export default {
       csId: '',
       //送检工单设备查询参数
       queryParam: {},
-      // 送检设备及相关数据
-      sjsbdataPoint: [],
-      model:{
+      // // 送检设备及相关数据
+      // sjsbdataPoint: [],
+      formModel: {
+        // 送检设备及相关数据
+        sjsbdataPoint: [],
       },
+      formRules:{},
       description: '送检工单设备表管理页面',
       // 表头
       columns: [
         {
-          title: '#',
+          title: '序号',
           dataIndex: '',
           key:'rowIndex',
           width:60,
@@ -81,11 +124,11 @@ export default {
             return parseInt(index)+1;
           }
         },
-        {
-          title:'送检工单id',
-          align:"center",
-          dataIndex: 'cmmsSubmissionId'
-        },
+        // {
+        //   title:'送检工单id',
+        //   align:"center",
+        //   dataIndex: 'cmmsSubmissionId'
+        // },
         {
           title:'设备',
           align:"center",
@@ -94,71 +137,113 @@ export default {
         {
           title:'检定日期',
           align:"center",
-          dataIndex: 'submissionDate'
+          dataIndex: 'submissionDate',
+          scopedSlots: { customRender: 'submissionDate' }
         },
         {
           title:'检定结果',
           align:"center",
-          dataIndex: 'submissionResult_dictText'
-        },
-        {
-          title:'有效日期',
-          align:"center",
-          dataIndex: 'submissionEffectiveDate'
+          width:90,
+          dataIndex: 'submissionResult_dictText',
+          scopedSlots: { customRender: 'submissionResult' }
         },
         {
           title:'班组确认',
           align:"center",
-          dataIndex: 'teamConfirm'
+          dataIndex: 'teamConfirm',
+          scopedSlots: { customRender: 'teamConfirm' }
         },
         {
           title:'备注',
           align:"center",
-          dataIndex: 'remark'
+          dataIndex: 'remark',
+          scopedSlots: { customRender: 'remark' }
         },
         {
           title:'送检状态',
           align:"center",
-          dataIndex: 'submissionStatus_dictText'
+          width:100,
+          dataIndex: 'submissionStatus_dictText',
+          scopedSlots: { customRender: 'submissionStatus' }
         },
         {
           title:'送回日期',
           align:"center",
-          dataIndex: 'submissionReturnDate'
+          dataIndex: 'submissionReturnDate',
+          scopedSlots: { customRender: 'submissionReturnDate' }
         },
         {
-          title: '操作',
-          dataIndex: 'action',
+          title:'有效日期',
           align:"center",
-          fixed:"right",
-          width:147,
-          scopedSlots: { customRender: 'fk' }
-        }
+          dataIndex: 'submissionEffectiveDate'
+        },
+        // {
+        //   title: '操作',
+        //   dataIndex: 'action',
+        //   align:"center",
+        //   fixed:"right",
+        //   width:147,
+        //   scopedSlots: { customRender: 'fk' }
+        // }
       ],
       url: {
         list: "/cmmsSubmissionEquipment/cmmsSubmissionEquipment/list",
-
+        fk: "/cmmsSubmissionEquipment/cmmsSubmissionEquipment/fk",
       },
     }
   },
   methods: {
+    handleFK(){
+    },
     getSJSBOptions(cmmsSubmissionId) {
       this.csId = cmmsSubmissionId
       getAction(this.url.list, {cmmsSubmissionId:cmmsSubmissionId}).then((res) => {
-        this.sjsbdataPoint = res.result.records
+        this.formModel.sjsbdataPoint = res.result.records
       })
     },
     getSJSBOptions2() {
       this.queryParam.cmmsSubmissionId = this.csId
       getAction(this.url.list, this.queryParam).then((res) => {
-        this.sjsbdataPoint = res.result.records
+        this.formModel.sjsbdataPoint = res.result.records
       })
     },
     getSJSBOptions3() {
       this.queryParam = {}
       this.queryParam.cmmsSubmissionId = this.csId
       getAction(this.url.list, this.queryParam).then((res) => {
-        this.sjsbdataPoint = res.result.records
+        this.formModel.sjsbdataPoint = res.result.records
+      })
+    },
+    submitForm () {
+      const that = this;
+      // 触发表单验证
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          that.confirmLoading = true;
+          let httpurl = '';
+          let method = '';
+          httpurl+=this.url.fk;
+          method = 'put';
+          // if(!this.model.id){
+          //   httpurl+=this.url.add;
+          //   method = 'post';
+          // }else{
+          //   httpurl+=this.url.edit;
+          //   method = 'put';
+          // }
+          console.log("this.formModel.sjsbdataPoint",this.formModel.sjsbdataPoint)
+          httpAction(httpurl,this.formModel.sjsbdataPoint,method).then((res)=>{
+            if(res.success){
+              that.$message.success(res.message);
+              that.$emit('ok');
+            }else{
+              that.$message.warning(res.message);
+            }
+          }).finally(() => {
+            that.confirmLoading = false;
+          })
+        }
+
       })
     },
   }

src/views/module_cmms/upkeepPlan/modules/UpkeepPlanForm.vue

@@ -122,7 +122,7 @@
               </a-col>
             </a-row>
           </div>
-          <div style="height: 100%;width:8%;padding-top:0.3%;">
+          <div style="height: 100%;width:8%;padding-top:0.25%;">
               <a-button type="primary" icon="search" />
           </div>
         </div>

src/views/module_tpm/equipment/EquipmentList.vue

@@ -217,6 +217,51 @@
             dataIndex: 'spaceid_dictText'
           },
           {
+            title:'周期',
+            align:"center",
+            dataIndex: 'equipmentCycle'
+          },
+          {
+            title:'周期单位',
+            align:"center",
+            dataIndex: 'cycleUnit_dictText'
+          },
+          {
+            title:'出厂编号',
+            align:"center",
+            dataIndex: 'factoryNo'
+          },
+          {
+            title:'出厂日期',
+            align:"center",
+            dataIndex: 'productDate'
+          },
+          {
+            title:'启用日期',
+            align:"center",
+            dataIndex: 'activeDate'
+          },
+          {
+            title:'责任部门',
+            align:"center",
+            dataIndex: 'responseDepartment'
+          },
+          {
+            title:'负责人',
+            align:"center",
+            dataIndex: 'responsePerson'
+          },
+          {
+            title:'领用人',
+            align:"center",
+            dataIndex: 'recipient'
+          },
+          {
+            title:'管理状态',
+            align:"center",
+            dataIndex: 'manageStatus_dictText'
+          },
+          {
             title: '操作',
             dataIndex: 'action',
             align:"center",

src/views/module_tpm/equipment/modules/EquipmentForm.vue

@@ -59,6 +59,51 @@
               </j-tree-select>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="周期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentCycle">
+              <a-input-number v-model="model.equipmentCycle" placeholder="请输入周期" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="周期单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cycleUnit">
+              <j-dict-select-tag type="list" v-model="model.cycleUnit" dictCode="cycle_unit" placeholder="请选择周期单位(0年、1月、2日)" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出厂编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryNo">
+              <a-input v-model="model.factoryNo" placeholder="请输入出厂编号"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="出厂日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productDate">
+              <j-date placeholder="请选择出厂日期"  v-model="model.productDate" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="启用日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="activeDate">
+              <j-date placeholder="请选择启用日期"  v-model="model.activeDate" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="责任部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="responseDepartment">
+              <a-input v-model="model.responseDepartment" placeholder="请输入责任部门"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="responsePerson">
+              <a-input v-model="model.responsePerson" placeholder="请输入负责人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="领用人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recipient">
+              <a-input v-model="model.recipient" placeholder="请输入领用人"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="管理状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manageStatus">
+              <j-dict-select-tag type="list" v-model="model.manageStatus" dictCode="manage_status" placeholder="请选择管理状态(0送检中、1在用、2限用、3禁用)" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>