完善

src/views/repair/application-form/modules/DetailRepair.vue

@@ -410,31 +410,25 @@ export default {
         {
           title: '分析时间',
           dataIndex: 'analyzeTime',
-          width: '200px'
+          width: '150px'
         },
         {
           title: '故障现象',
           dataIndex: 'problemDesc',
           ellipsis: true,
-          width: '200px'
+          width: '150px'
         },
         {
           title: '检查处理过程',
           dataIndex: 'checkProcess',
           ellipsis: true,
-          width: '200px'
+          width: '150px'
         },
         {
           title: '原因分析',
           dataIndex: 'reasonAnalysis',
           ellipsis: true,
-          width: '200px'
-        },
-        {
-          title: '改进措施',
-          dataIndex: 'improveMeasure',
-          ellipsis: true,
-          width: '200px'
+          width: '150px'
         },
         {
           title: '操作',

src/views/repair/application-form/modules/DetailRepairOut.vue

@@ -107,10 +107,10 @@
     <dispatch-form ref="dispatchForm" @ok="handleCancel" />
     <assign-form ref="assignForm" @ok="handleCancel" />
     <spare-pick-base-form ref="baseModal" @ok="handleOk"/>
-    <repair-project-select-Modal :type="'checkbox'" ref="repairProjectSelectModal" @selected="handleRepairProjectSelected"/>
+<!--    <repair-project-select-Modal :type="'checkbox'" ref="repairProjectSelectModal" @selected="handleRepairProjectSelected"/>-->
     <!--    <spare-part-info-select-modal :type="'checkbox'" ref="spareSelectModal" @selected="handleSpareSelected"/>-->
     <base-form-for-repair ref="baseFormForRepair" @ok="handleOk" />
-    <spare-store-select-modal ref="spareStoreSelectModal" @selected="handleSpareStoreSelected"/>
+<!--    <spare-store-select-modal ref="spareStoreSelectModal" @selected="handleSpareStoreSelected"/>-->
     <fee-base-form ref="feeForm" @ok="handleOk" />
     <fee-detail ref="feeDetail" @ok="handleOk" />
     <reason-base-form ref="reasonForm" @ok="handleOk" />

src/views/repair/repair-reason/RepairReason.vue

@@ -119,12 +119,6 @@ export default {
           ellipsis: true,
           width: '200px'
         },
-        {
-          title: '改进措施',
-          dataIndex: 'improveMeasure',
-          ellipsis: true,
-          width: '200px'
-        },
         {
           title: '操作',
           key: 'action',

src/views/repair/repair-reason/modules/BaseForm.vue

@@ -3,73 +3,200 @@
     <a-row :gutter="48" slot="extra">
       <a-col :md="48" :sm="48">
         <span class="table-page-search-submitButtons" style="float: right" >
-          <a-button v-show="currentTab!== 0" style="margin-left: 8px" @click="prev()">上一步</a-button>
-          <a-button style="margin-left: 8px" v-show="currentTab!== 3" type="primary" @click="next()">下一步</a-button>
           <a-button style="margin-left: 8px" type="primary" @click="save()">保存</a-button>
           <a-button style="margin-left: 8px" @click="handleCancel()">返回</a-button>
         </span>
       </a-col>
     </a-row>
-    <a-steps :current="currentTab" >
-      <a-step title="故障现象" />
-      <a-step title="检查处理过程" />
-      <a-step title="原因分析" />
-      <a-step title="改进措施" />
-    </a-steps>
-    <a-form-model ref="form" :model="model" :rules="rules">
-
-      <row-list :col="1">
-        <row-item v-show="currentTab=== 0">
-          <a-form-model-item required label="编号" prop="no">
+    <title-divider title="基本信息" width="90px"></title-divider>
+    <a-form :form="form">
+      <a-form-item v-show="false" >
+        <a-input v-decorator="['id']" type="hidden"/>
+        <a-input v-decorator="['repairId']" type="hidden"/>
+      </a-form-item>
+      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="编号"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol">
             <a-input
               disabled="disabled"
-              v-model="model.no"
+              v-decorator="['no']"
             />
-          </a-form-model-item>
-        </row-item>
-        <row-item v-show="currentTab=== 0">
-          <a-form-model-item required label="分析时间" prop="analyzeTime">
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="分析时间"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
             <a-date-picker
               style="width: 100%"
-              :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
-              v-model="model.analyzeTime"/>
-          </a-form-model-item>
-        </row-item>
-        <row-item v-show="currentTab=== 0">
-          <a-form-model-item required label="故障现象" prop="problemDesc">
+              v-decorator="['analyzeTime', {rules: [{required: true, message: '分析时间不能为空'}]}]"
+              :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="24" :md="24" :sm="24">
+          <a-form-item
+            label="故障现象"
+            :labelCol="BaseTool.Constant.labelCol2"
+            :wrapperCol="BaseTool.Constant.wrapperCol2">
+            <a-textarea
+              :auto-size="{ minRows: 5 }"
+              v-decorator="['problemDesc', {rules: [{required: true, message: '分析时间不能为空'}]}]"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="24" :md="24" :sm="24">
+          <a-form-item
+            :labelCol="BaseTool.Constant.labelCol2"
+            :wrapperCol="BaseTool.Constant.wrapperCol2"
+            label="检查处理过程"
+          >
+            <a-textarea
+              :auto-size="{ minRows: 5 }"
+              v-decorator="['checkProcess', {rules: [{required: true, message: '检查处理过程不能为空'}]}]"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="24" :md="24" :sm="24">
+          <a-form-item
+            :labelCol="BaseTool.Constant.labelCol2"
+            :wrapperCol="BaseTool.Constant.wrapperCol2"
+            label="原因分析">
+            <a-textarea
+              :auto-size="{ minRows: 5 }"
+              v-decorator="['reasonAnalysis', {rules: [{required: true, message: '原因分析不能为空'}]}]" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <title-divider title="改进措施" width="90px"></title-divider>
+      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="更新维修计划"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol">
+            <a-checkbox :checked="changeRepairPlan" v-model="changeRepairPlan"></a-checkbox>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="内容"
+            v-show="changeRepairPlan"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-textarea
+              :auto-size="{ minRows: 5 }"
+              v-decorator="['changeRepairPlanContent']" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="更新备件计划"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol">
+            <a-checkbox :checked="changeSparePlan" v-model="changeSparePlan"></a-checkbox>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="内容"
+            v-show="changeSparePlan"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
             <a-textarea
-              :auto-size="{ minRows: 30 }"
-              v-model="model.problemDesc"/>
-          </a-form-model-item>
-        </row-item>
-        <row-item v-show="currentTab=== 1">
-          <a-form-model-item required label="检查处理过程" prop="problemDesc">
+              :auto-size="{ minRows: 5 }"
+              v-decorator="['changeSparePlanContent']" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="人员培训"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol">
+            <a-checkbox :checked="userTeach" v-model="userTeach"></a-checkbox>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="内容"
+            v-show="userTeach"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
             <a-textarea
-              :auto-size="{ minRows: 30 }"
-              v-model="model.checkProcess"/>
-          </a-form-model-item>
-        </row-item>
-        <row-item v-show="currentTab=== 2">
-          <a-form-model-item label="原因分析" prop="reasonAnalysis">
+              :auto-size="{ minRows: 5 }"
+              v-decorator="['userTeachContent']" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="设备改造升级"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol">
+            <a-checkbox :checked="sbChange" v-model="sbChange"></a-checkbox>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="内容"
+            v-show="sbChange"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
             <a-textarea
-              :auto-size="{ minRows: 30 }"
-              v-model="model.reasonAnalysis"/>
-          </a-form-model-item>
-        </row-item>
-        <row-item v-show="currentTab=== 3">
-          <a-form-model-item label="改进措施" prop="reasonAnalysis">
+              :auto-size="{ minRows: 5 }"
+              v-decorator="['sbChangeContent']" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="其他"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol">
+            <a-checkbox :checked="otherChange" v-model="otherChange"></a-checkbox>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="内容"
+            v-show="otherChange"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
             <a-textarea
-              :auto-size="{ minRows: 30 }"
-              v-model="model.improveMeasure"/>
-          </a-form-model-item>
-        </row-item>
-      </row-list>
-    </a-form-model>
+              :auto-size="{ minRows: 5 }"
+              v-decorator="['otherChangeContent']" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
   </a-card>
 </template>
 
 <script>
 import { addRepairReason, updateRepairReason } from '@/api/repair/repair-reason'
+import pick from 'lodash.pick'
 
 export default {
   name: 'BaseRepairReason',
@@ -78,39 +205,14 @@ export default {
       confirmLoading: false,
       modalTitle: null,
       currentTab: 0,
-      model: {
-        id: '',
-        repairId: '',
-        no: '',
-        analyzeTime: null,
-        problemDesc: '',
-        checkProcess: '',
-        reasonAnalysis: '',
-        improveMeasure: ''
-      },
+      changeRepairPlan: false,
+      changeSparePlan: false,
+      userTeach: false,
+      sbChange: false,
+      otherChange: false,
       addFlag: false,
       form: this.$form.createForm(this),
-      visible: false,
-      rules: {
-        no: [
-          { required: true, message: '请输入编号', trigger: 'blur' }
-        ],
-        analyzeTime: [
-          { required: true, message: '请输入分析时间', trigger: 'blur' }
-        ],
-        problemDesc: [
-          { required: true, message: '请输入故障现象', trigger: 'blur' }
-        ],
-        checkProcess: [
-          { required: true, message: '请输入检查处理过程', trigger: 'blur' }
-        ],
-        reasonAnalysis: [
-          { message: '请输入原因分析', trigger: 'blur' }
-        ],
-        improveMeasure: [
-          { message: '请输入改进措施', trigger: 'blur' }
-        ]
-      }
+      visible: false
       // 下拉框map
     }
   },
@@ -121,21 +223,52 @@ export default {
   methods: {
     base (record, repairForm = {}) {
       this.visible = true
-      this.$refs.form.resetFields()
       this.currentTab = 0
+      const { form: { setFieldsValue } } = this
       // 如果是空标识添加
       if (this.BaseTool.Object.isBlank(record)) {
         this.addFlag = true
-        this.model.repairId = repairForm.id
-        this.model.no = repairForm.no
         this.modalTitle = '添加'
+        repairForm.repairId = repairForm.id
+        this.$nextTick(() => {
+          setFieldsValue(Object.assign(pick(repairForm, [
+            'repairId',
+            'no'
+          ])))
+        })
         return
       }
       this.addFlag = false
       record.analyzeTime = this.BaseTool.Moment(record.analyzeTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+      this.changeRepairPlan = record.changeRepairPlan
+      this.changeSparePlan = record.changeSparePlan
+      this.userTeach = record.userTeach
+      this.sbChange = record.sbChange
+      this.otherChange = record.otherChange
       this.modalTitle = '编辑'
       // 日期处理
-      this.model = record
+      this.$nextTick(() => {
+        setFieldsValue(Object.assign(pick(record, [
+          'id',
+          'repairId',
+          'no',
+          'analyzeTime',
+          'problemDesc',
+          'checkProcess',
+          'reasonAnalysis',
+          'improveMeasure',
+          'changeRepairPlan: null',
+          'changeRepairPlanContent',
+          'changeSparePlan',
+          'changeSparePlanContent',
+          'userTeach',
+          'userTeachContent',
+          'sbChange',
+          'sbChangeContent',
+          'otherChange',
+          'otherChangeContent'
+        ])))
+      })
     },
     next () {
       this.currentTab += 1
@@ -144,29 +277,35 @@ export default {
       this.currentTab -= 1
     },
     save () {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          // 日期处理
-          this.model.analyzeTime = this.BaseTool.Date.formatter(this.model.analyzeTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
-          if (this.addFlag) {
-            addRepairReason(this.model)
-              .then((res) => {
-                this.confirmLoading = false
-                this.handleCancel({})
-              }).catch(() => {
-                this.confirmLoading = false
-              })
-          } else {
-            updateRepairReason(this.model)
-              .then(() => {
-                this.handleCancel(this.model)
-              }).catch(() => {
-                this.confirmLoading = false
-              })
-          }
-        } else {
+      const { form: { validateFieldsAndScroll } } = this
+      this.confirmLoading = true
+      validateFieldsAndScroll((errors, values) => {
+        if (errors) {
           this.confirmLoading = false
-          return false
+          return
+        }
+        // 日期处理
+        values.changeRepairPlan = this.changeRepairPlan
+        values.changeSparePlan = this.changeSparePlan
+        values.userTeach = this.userTeach
+        values.sbChange = this.sbChange
+        values.otherChange = this.otherChange
+        values.analyzeTime = this.BaseTool.Date.formatter(values.analyzeTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+        if (this.addFlag) {
+          addRepairReason(values)
+            .then((res) => {
+              this.confirmLoading = false
+              this.handleCancel()
+            }).catch(() => {
+              this.confirmLoading = false
+            })
+        } else {
+          updateRepairReason(values)
+            .then(() => {
+              this.handleCancel()
+            }).catch(() => {
+              this.confirmLoading = false
+            })
         }
       })
     },

src/views/repair/repair-reason/modules/BaseFormBak.vue

@@ -0,0 +1,188 @@
+<template>
+  <a-card :bordered="false" :title="modalTitle" v-show="visible">
+    <a-row :gutter="48" slot="extra">
+      <a-col :md="48" :sm="48">
+        <span class="table-page-search-submitButtons" style="float: right" >
+          <a-button v-show="currentTab!== 0" style="margin-left: 8px" @click="prev()">上一步</a-button>
+          <a-button style="margin-left: 8px" v-show="currentTab!== 3" type="primary" @click="next()">下一步</a-button>
+          <a-button style="margin-left: 8px" type="primary" @click="save()">保存</a-button>
+          <a-button style="margin-left: 8px" @click="handleCancel()">返回</a-button>
+        </span>
+      </a-col>
+    </a-row>
+    <a-steps :current="currentTab" >
+      <a-step title="故障现象" />
+      <a-step title="检查处理过程" />
+      <a-step title="原因分析" />
+      <a-step title="改进措施" />
+    </a-steps>
+    <a-form-model ref="form" :model="model" :rules="rules">
+
+      <row-list :col="1">
+        <row-item v-show="currentTab=== 0">
+          <a-form-model-item required label="编号" prop="no">
+            <a-input
+              disabled="disabled"
+              v-model="model.no"
+            />
+          </a-form-model-item>
+        </row-item>
+        <row-item v-show="currentTab=== 0">
+          <a-form-model-item required label="分析时间" prop="analyzeTime">
+            <a-date-picker
+              style="width: 100%"
+              :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
+              v-model="model.analyzeTime"/>
+          </a-form-model-item>
+        </row-item>
+        <row-item v-show="currentTab=== 0">
+          <a-form-model-item required label="故障现象" prop="problemDesc">
+            <a-textarea
+              :auto-size="{ minRows: 5 }"
+              v-model="model.problemDesc"/>
+          </a-form-model-item>
+        </row-item>
+        <row-item v-show="currentTab=== 1">
+          <a-form-model-item required label="检查处理过程" prop="problemDesc">
+            <a-textarea
+              :auto-size="{ minRows: 5 }"
+              v-model="model.checkProcess"/>
+          </a-form-model-item>
+        </row-item>
+        <row-item v-show="currentTab=== 2">
+          <a-form-model-item label="原因分析" prop="reasonAnalysis">
+            <a-textarea
+              :auto-size="{ minRows: 5 }"
+              v-model="model.reasonAnalysis"/>
+          </a-form-model-item>
+        </row-item>
+        <row-item v-show="currentTab=== 3">
+          <a-form-model-item label="改进措施" prop="reasonAnalysis">
+            <a-textarea
+              :auto-size="{ minRows: 5 }"
+              v-model="model.improveMeasure"/>
+          </a-form-model-item>
+        </row-item>
+      </row-list>
+    </a-form-model>
+  </a-card>
+</template>
+
+<script>
+import { addRepairReason, updateRepairReason } from '@/api/repair/repair-reason'
+
+export default {
+  name: 'BaseRepairReason',
+  data () {
+    return {
+      confirmLoading: false,
+      modalTitle: null,
+      currentTab: 0,
+      model: {
+        id: '',
+        repairId: '',
+        no: '',
+        analyzeTime: null,
+        problemDesc: '',
+        checkProcess: '',
+        reasonAnalysis: '',
+        improveMeasure: ''
+      },
+      addFlag: false,
+      form: this.$form.createForm(this),
+      visible: false,
+      rules: {
+        no: [
+          { required: true, message: '请输入编号', trigger: 'blur' }
+        ],
+        analyzeTime: [
+          { required: true, message: '请输入分析时间', trigger: 'blur' }
+        ],
+        problemDesc: [
+          { required: true, message: '请输入故障现象', trigger: 'blur' }
+        ],
+        checkProcess: [
+          { required: true, message: '请输入检查处理过程', trigger: 'blur' }
+        ],
+        reasonAnalysis: [
+          { message: '请输入原因分析', trigger: 'blur' }
+        ],
+        improveMeasure: [
+          { message: '请输入改进措施', trigger: 'blur' }
+        ]
+      }
+      // 下拉框map
+    }
+  },
+  props: {},
+  created () {
+    // 下拉框map
+  },
+  methods: {
+    base (record, repairForm = {}) {
+      this.visible = true
+      this.$refs.form.resetFields()
+      this.currentTab = 0
+      // 如果是空标识添加
+      if (this.BaseTool.Object.isBlank(record)) {
+        this.addFlag = true
+        this.model.repairId = repairForm.id
+        this.model.no = repairForm.no
+        this.modalTitle = '添加'
+        return
+      }
+      this.addFlag = false
+      record.analyzeTime = this.BaseTool.Moment(record.analyzeTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+      this.modalTitle = '编辑'
+      // 日期处理
+      this.model = record
+    },
+    next () {
+      this.currentTab += 1
+    },
+    prev () {
+      this.currentTab -= 1
+    },
+    save () {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          // 日期处理
+          this.model.analyzeTime = this.BaseTool.Date.formatter(this.model.analyzeTime, this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+          if (this.addFlag) {
+            addRepairReason(this.model)
+              .then((res) => {
+                this.confirmLoading = false
+                this.handleCancel({})
+              }).catch(() => {
+                this.confirmLoading = false
+              })
+          } else {
+            updateRepairReason(this.model)
+              .then(() => {
+                this.handleCancel(this.model)
+              }).catch(() => {
+                this.confirmLoading = false
+              })
+          }
+        } else {
+          console.log(valid)
+          this.confirmLoading = false
+          return false
+        }
+      })
+    },
+    handleCancel (values) {
+      this.visible = false
+      this.confirmLoading = false
+      this.form.resetFields()
+      this.$emit('ok', values)
+    }
+
+  }
+}
+</script>
+<style>
+  .ant-steps-item-process .ant-steps-item-icon>.ant-steps-icon {
+    color: #fff !important;
+  }
+</style>