Merge remote-tracking branch 'origin/master'

src/views/module_cmms/repairMy/RepairMyList.vue

@@ -104,23 +104,21 @@
           </a-button>
         </template>
 
+        <span slot="priority" slot-scope="text, record">
+          <a-tag v-if="record.priority === '0'">{{ text }}</a-tag>
+          <a-tag v-if="record.priority === '1'" color="orange">{{ text }}</a-tag>
+          <a-tag v-if="record.priority === '2'" color="red">{{ text }}</a-tag>
+        </span>
+        <span slot="status" slot-scope="text, record">
+          <a-tag v-if="record.status === '0'" color="orange">{{ text }}</a-tag>
+          <a-tag v-if="record.status === '1' || record.priority === '2'" color="blue">{{ text }}</a-tag>
+          <a-tag v-if="record.status === '3'">{{ text }}</a-tag>
+        </span>
+        
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
+          <a @click="handleFeedback(record)">维修反馈</a>
           <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          <a @click="handleDetail(record)">详情</a>
         </span>
 
       </a-table>
@@ -159,22 +157,10 @@
             }
           },
           {
-            title:'创建者',
-            align:"center",
-            dataIndex: 'createBy'
-          },
-          {
-            title:'创建时间',
-            align:"center",
-            dataIndex: 'createTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'备注',
+            title:'优先级',
             align:"center",
-            dataIndex: 'remark'
+            dataIndex: 'priority_dictText',
+            scopedSlots: { customRender: 'priority' }
           },
           {
             title:'维修工单编号',
@@ -187,25 +173,15 @@
             dataIndex: 'repairname'
           },
           {
-            title:'设备ID',
-            align:"center",
-            dataIndex: 'equipmentid'
-          },
-          {
-            title:'设备编号',
-            align:"center",
-            dataIndex: 'equipmentcode'
-          },
-          {
             title:'设备名称',
             align:"center",
             dataIndex: 'equipmentname'
           },
-          {
-            title:'优先级：0普通，1紧急，2特急',
-            align:"center",
-            dataIndex: 'priority'
-          },
+          // {
+          //   title:'设备编号',
+          //   align:"center",
+          //   dataIndex: 'equipmentcode'
+          // },
           {
             title:'故障日期',
             align:"center",
@@ -220,11 +196,6 @@
             dataIndex: 'faultdesc'
           },
           {
-            title:'待办人',
-            align:"center",
-            dataIndex: 'repairuser'
-          },
-          {
             title:'维修时间',
             align:"center",
             dataIndex: 'repairdate',
@@ -238,14 +209,14 @@
             dataIndex: 'feedback'
           },
           {
-            title:'维修结果',
+            title:'维修结果？',
             align:"center",
             dataIndex: 'result'
           },
           {
-            title:'状态：0待处理，1维修检查，2设备维修，3维修结束',
+            title:'工单状态',
             align:"center",
-            dataIndex: 'status'
+            dataIndex: 'repairstatus_dictText'
           },
           {
             title:'关联ID：巡检、点检、保养的ID',
@@ -253,9 +224,30 @@
             dataIndex: 'relid'
           },
           {
-            title:'维修工单状态: 0正常、1冻结、2拒绝',
+            title:'录入人',
             align:"center",
-            dataIndex: 'repairstatus'
+            dataIndex: 'createBy'
+          },
+          // {
+          //   title:'创建时间',
+          //   align:"center",
+          //   dataIndex: 'createTime',
+          //   customRender:function (text) {
+          //     return !text?"":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
+          // {
+          //   title:'备注',
+          //   align:"center",
+          //   dataIndex: 'remark'
+          // },
+          {
+            title:'维修状态',
+            align:"center",
+            fixed:"right",
+            width:80,
+            dataIndex: 'status_dictText',
+            scopedSlots: { customRender: 'status' }
           },
           {
             title: '操作',
@@ -267,11 +259,8 @@
           }
         ],
         url: {
-          list: "/cmmsRepairMy/cmmsRepairMy/list",
-          delete: "/cmmsRepairMy/cmmsRepairMy/delete",
-          deleteBatch: "/cmmsRepairMy/cmmsRepairMy/deleteBatch",
-          exportXlsUrl: "/cmmsRepairMy/cmmsRepairMy/exportXls",
-          importExcelUrl: "cmmsRepairMy/cmmsRepairMy/importExcel",
+          list: "/cmmsRepair/cmmsRepair/listMy",
+          // exportXlsUrl: "/cmmsRepairMy/cmmsRepairMy/exportXls",
           
         },
         dictOptions:{},
@@ -287,6 +276,11 @@
       },
     },
     methods: {
+      handleFeedback(record){
+        this.$refs.modalForm.title = "维修反馈";
+        this.$refs.modalForm.modalType = "feedback";
+        this.$refs.modalForm.feedback(record);
+      },
       initDictConfig(){
       },
       getSuperFieldList(){

src/views/module_cmms/repairMy/modules/RepairMyForm.vue

@@ -3,80 +3,60 @@
     <j-form-container :disabled="formDisabled">
       <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="remark">
-              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="维修工单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repaircode">
-              <a-input v-model="model.repaircode" placeholder="请输入维修工单编号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="工单名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairname">
-              <a-input v-model="model.repairname" placeholder="请输入工单名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
-              <a-input v-model="model.equipmentid" placeholder="请输入设备ID"  ></a-input>
+              <a-input v-model="model.repaircode" placeholder="请输入维修工单编号" disabled></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentcode">
-              <a-input v-model="model.equipmentcode" placeholder="请输入设备编号"  ></a-input>
+          <a-col :span="12">
+            <a-form-model-item label="维修工单名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairname">
+              <a-input v-model="model.repairname" placeholder="请输入工单名称" disabled></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentname">
-              <a-input v-model="model.equipmentname" placeholder="请输入设备名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="优先级：0普通，1紧急，2特急" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="priority">
-              <a-input v-model="model.priority" placeholder="请输入优先级：0普通，1紧急，2特急"  ></a-input>
+              <a-input v-model="model.equipmentname" placeholder="请输入设备名称" disabled></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="故障日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="faultdate">
-              <j-date placeholder="请选择故障日期" v-model="model.faultdate"  style="width: 100%" />
+              <j-date placeholder="请选择故障日期" v-model="model.faultdate"  style="width: 100%" disabled/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="故障描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="faultdesc">
-              <a-input v-model="model.faultdesc" placeholder="请输入故障描述"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="待办人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairuser">
-              <a-input v-model="model.repairuser" placeholder="请输入待办人"  ></a-input>
+              <a-input v-model="model.faultdesc" placeholder="请输入故障描述" disabled></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="维修时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairdate">
-              <j-date placeholder="请选择维修时间" v-model="model.repairdate"  style="width: 100%" />
+          <!-- <a-col :span="24">
+            <a-form-model-item label="优先级：0普通，1紧急，2特急" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="priority">
+              <a-input v-model="model.priority" placeholder="请输入优先级：0普通，1紧急，2特急"  ></a-input>
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-model-item label="维修反馈" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="feedback">
               <a-input v-model="model.feedback" placeholder="请输入维修反馈"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="维修结果" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="result">
-              <a-input v-model="model.result" placeholder="请输入维修结果"  ></a-input>
+            <a-form-model-item label="维修时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairdate">
+              <j-date placeholder="请选择维修时间" v-model="model.repairdate"  style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="状态：0待处理，1维修检查，2设备维修，3维修结束" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <a-input v-model="model.status" placeholder="请输入状态：0待处理，1维修检查，2设备维修，3维修结束"  ></a-input>
+            <a-form-model-item label="是否挂单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
+              <a-switch :checked="model.status === '2' ? true : false" checked-children="是" un-checked-children="否" @change="changeStatus"/>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="维修工单状态: 0正常、1冻结、2拒绝" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairstatus">
               <a-input v-model="model.repairstatus" placeholder="请输入维修工单状态: 0正常、1冻结、2拒绝"  ></a-input>
             </a-form-model-item>
+          </a-col> -->
+          <a-col :span="24">
+            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
+              <a-input v-model="model.remark" placeholder="请输入备注"></a-input>
+            </a-form-model-item>
           </a-col>
         </a-row>
       </a-form-model>
@@ -86,7 +66,7 @@
 
 <script>
 
-  import { httpAction, getAction } from '@/api/manage'
+  import { putAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
@@ -115,12 +95,6 @@
         },
         confirmLoading: false,
         validatorRules: {
-           repairname: [
-              { required: true, message: '请输入工单名称!'},
-           ],
-           faultdate: [
-              { required: true, message: '请输入故障日期!'},
-           ],
            faultdesc: [
               { required: true, message: '请输入故障描述!'},
            ],
@@ -138,8 +112,7 @@
            ],
         },
         url: {
-          add: "/cmmsRepairMy/cmmsRepairMy/add",
-          edit: "/cmmsRepairMy/cmmsRepairMy/edit",
+          feedback: "/cmmsRepair/cmmsRepair/repair",
           queryById: "/cmmsRepairMy/cmmsRepairMy/queryById"
         }
       }
@@ -154,29 +127,29 @@
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
+      // add () {
+      //   this.edit(this.modelDefault);
+      // },
+      // edit (record) {
+      //   this.model = Object.assign({}, record);
+      //   this.visible = true;
+      // },
+      feedback(record){
         this.model = Object.assign({}, record);
+        console.log(this.model)
         this.visible = true;
       },
+      changeStatus(checked){
+        console.log(checked)
+        this.model.status = checked ? '2' : '3'
+      },
       submitForm () {
         const that = this;
         // 触发表单验证
         this.$refs.form.validate(valid => {
           if (valid) {
             that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
+            putAction(this.url.feedback, this.model).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
                 that.$emit('ok');
@@ -187,7 +160,6 @@
               that.confirmLoading = false;
             })
           }
-         
         })
       },
     }

src/views/module_cmms/repairMy/modules/RepairMyModal.vue

@@ -29,16 +29,22 @@
       }
     },
     methods: {
-      add () {
+      // add () {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.add();
+      //   })
+      // },
+      // edit (record) {
+      //   this.visible=true
+      //   this.$nextTick(()=>{
+      //     this.$refs.realForm.edit(record);
+      //   })
+      // },
+      feedback(record){
         this.visible=true
         this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
+          this.$refs.realForm.feedback(record);
         })
       },
       close () {