浏览代码

送检工单优化(两个版本,版本1未做完,现用版本2)

wyh 1 年之前
父节点
当前提交
fbc1647bed

+ 55 - 2
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 {
@@ -185,7 +202,8 @@
           {
             title:'送检工单状态',
             align:"center",
-            dataIndex: 'submissionGdstatus_dictText'
+            dataIndex: 'submissionGdstatus_dictText',
+            scopedSlots: { customRender: 'submissionGdstatus_dictText' }
           },
           {
             title: '操作',
@@ -202,10 +220,11 @@
           deleteBatch: "/cmmsSubmission/cmmsSubmission/deleteBatch",
           exportXlsUrl: "/cmmsSubmission/cmmsSubmission/exportXls",
           importExcelUrl: "cmmsSubmission/cmmsSubmission/importExcel",
-
+          editStatus: "/cmmsSubmission/cmmsSubmission/editSJStatus"
         },
         dictOptions:{},
         superFieldList:[],
+        model: {}
       }
     },
     created() {
@@ -233,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()
+          }
+        })
       }
     }
   }

+ 75 - 0
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>