细节修改

“linengliang”

2023-11-18 eb231718e708442c5e8b580dd93b7fca7ce321c1

细节修改

 src/views/eam/RepairOrderList.vue

@@ -506,9 +506,6 @@
    let intervalId = setInterval(() => {
        this.loadData();
    }, 600*1000); // 1000毫秒，即1秒
    onUnmounted(() => {
      clearInterval(intervalId);
    });
  },
  data() {
    return {
@@ -631,26 +628,26 @@
            customRender: 'jell' 
          }
        },
        {
          title: '故障原因',
          align: "center",
          dataIndex: 'faultReason'
        },
        {
          title: '故障现象',
          align: "center",
          dataIndex: 'faultPhenomenon'
        },
        {
          title: '故障排除',
          align: "center",
          dataIndex: 'faultRemove'
        },
        {
          title: '预防措施',
          align: "center",
          dataIndex: 'preventiveMeasure'
        },
        // {
        //   title: '故障原因',
        //   align: "center",
        //   dataIndex: 'faultReason'
        // },
        // {
        //   title: '故障现象',
        //   align: "center",
        //   dataIndex: 'faultPhenomenon'
        // },
        // {
        //   title: '故障排除',
        //   align: "center",
        //   dataIndex: 'faultRemove'
        // },
        // {
        //   title: '预防措施',
        //   align: "center",
        //   dataIndex: 'preventiveMeasure'
        // },
        // {
        //   title: '故障照片',
        //   align: "center",

 src/views/eam/modules/repairorder/moudles/RepairOrderFaultAnalysisReport.vue

@@ -18,8 +18,8 @@
              <a-textarea
                allow-clear
                placeholder='请输入故障现象'
                v-decorator="['faultPhenomenon', validatorRules.faultPhenomenon]"
                :disabled="isEdit||repairOrder.status!=='3'"
                v-decorator="['repairOrderFaultAnalysisUda1', validatorRules.repairOrderFaultAnalysisUda1]"
                :disabled="isEdit"
              ></a-textarea>
            </a-form-item>
          </a-col>
@@ -32,7 +32,7 @@
              <a-textarea
                placeholder='请输入故障检查'
                v-decorator="['faultCause', validatorRules.faultCause]"
                :disabled="isEdit||repairOrder.status!=='3'"
                :disabled="isEdit"
              ></a-textarea>
            </a-form-item>
          </a-col>
@@ -47,7 +47,7 @@
              <a-textarea
                placeholder='请输入故障维修'
                v-decorator="['maintenanceMeasures', validatorRules.maintenanceMeasures]"
                :disabled="isEdit||repairOrder.status!=='3'"
                :disabled="isEdit"
              ></a-textarea>
            </a-form-item>
          </a-col>
@@ -60,7 +60,7 @@
              <a-textarea
                v-decorator="['suggestion', validatorRules.suggestion]"
                placeholder='请输入故障预防'
                :disabled="isEdit||repairOrder.status!=='3'"
                :disabled="isEdit"
              ></a-textarea>
            </a-form-item>
          </a-col>
@@ -68,6 +68,8 @@
      <a-button
        :style="{marginRight: '8px'}"
        @click='handleEdit2()'
        :disabled="buttonStatus"
        :loading='confirmLoading'
      >
       编辑
      </a-button>
@@ -76,6 +78,7 @@
        @click='handleOk()'
        type='primary'
        :loading='confirmLoading'
        :disabled="buttonStatus"
      >保存
      </a-button>
      </a-form>
@@ -91,24 +94,23 @@
  name: 'RepairOrderFaultAnalysisList',
  components: { },
  props: {
   repairOrderId: {
      type: String,
      default:'',
    },
    repairOrder:{
      type: Object,
      default:{},
    }
  },
  watch:{
      repairOrderId:{
      'repairOrder.id':{
        immediate: true,
        handler(val) {
          this.form.resetFields();
          if(!this.repairOrderId){
          if(this.repairOrder.id!==undefined&&this.repairOrder.status==='3'){
            this.isEdit = false;
          }else{
            this.loadData(val);
          }
          if(this.repairOrder.status!=='3'){
            this.buttonStatus = true;
          }
        }
      }
@@ -133,7 +135,7 @@
            { min: 2, max: 1000, message: '长度在 2 到 1000 个字符', trigger: 'blur' },
          ]
        },
        faultPhenomenon: {
        repairOrderFaultAnalysisUda1: {
          rules: [
            { required: true, message: '请输入故障现象!' },
          ]
@@ -159,6 +161,7 @@
        xs: { span: 24 },
        sm: { span: 16 }
      },
      buttonStatus:false
    }
  },
  methods: {
@@ -170,8 +173,8 @@
          that.confirmLoading = true;
          let formData = Object.assign(this.model, values);
          let obj;
          formData.repairOrderId = this.repairOrder.id;
          if (!this.model.id) {
            formData.repairOrderId = this.repairOrderId;
            obj = postAction(this.url.add, formData);
          } else {
            obj = requestPut(this.url.edit, formData, { id: this.model.id });
@@ -179,12 +182,12 @@
          obj.then((res) => {
            if (res.success) {
              that.$message.success(res.message);
              that.$emit('ok');
              that.isEdit = true;
            } else {
              that.$message.warning(res.message);
            }
          }).finally(() => {
             that.loadData(that.repairOrderId);
             that.loadData(that.repairOrder.id);
             that.confirmLoading = false;
          })
        }
@@ -196,11 +199,12 @@
                if(res.success){
                   if(res.result.records.length!==0){
                      that.isEdit=true;
                      that.form.setFieldsValue(pick(res.result.records[0], 'faultCause','faultPhenomenon', 'faultTypeId', 'suggestion', 'maintenanceMeasures','id'))
                      that.form.setFieldsValue(pick(res.result.records[0], 'faultCause','repairOrderFaultAnalysisUda1', 'faultTypeId', 'suggestion', 'maintenanceMeasures','id'))
                      that.model = Object.assign({}, res.result.records[0]);
                      that.isEdit=true;
                   }else if(this.repairOrder.status==='3'){
                      that.isEdit=false;
                   }else{
                    that.isEdit=false;
                      that.isEdit=true;
                   }
                }
      })

 src/views/eam/modules/repairorder/repairOrderExcuteDrawer.vue

@@ -473,7 +473,7 @@
              key="1"
              class="hightColor"
            >
              <RepairOrderFaultAnalysisList :repairOrderId="repairOrderId" :repairOrder="repairOrder"/>
              <RepairOrderFaultAnalysisList :repairOrder="repairOrder"/>
            </a-tab-pane>
            <a-tab-pane
              tab='实际工时'
@@ -512,9 +512,6 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { putAction } from '@/api/manage'
import Tooltip from 'ant-design-vue/es/tooltip'
import ActualMaterialEditTable from './moudles/ActualMaterialEditTable.vue'
import ActualWorkHoursEditTable from './moudles/ActualWorkHoursEditTable.vue'
import FaultAnalysisEditTable from './moudles/FaultAnalysisEditTable'
import RepairOrderActualMaterialList from './moudles/RepairOrderActualMaterialReport'
import RepairOrderActualWorkHoursList from './moudles/RepairOrderActualHoursReport'
import RepairOrderFaultAnalysisList from './moudles/RepairOrderFaultAnalysisReport.vue'
@@ -524,9 +521,6 @@
  mixins: [JeecgListMixin],
  components: {
    Tooltip,
    ActualMaterialEditTable,
    ActualWorkHoursEditTable,
    FaultAnalysisEditTable,
    RepairOrderActualMaterialList,
    RepairOrderActualWorkHoursList,
    RepairOrderFaultAnalysisList
@@ -638,7 +632,7 @@
                if(res.success){
                   if(res.result.records.length===0){
                      that.$message.warning("故障分析尚未填写，请填写后再报工")
                   }else if(res.result.records[0].faultPhenomenon===null||res.result.records[0].faultPhenomenon===undefined||res.result.records[0].faultPhenomenon===''){
                   }else if(res.result.records[0].repairOrderFaultAnalysisUda1===null||res.result.records[0].repairOrderFaultAnalysisUda1===undefined||res.result.records[0].repairOrderFaultAnalysisUda1===''){
                      that.$message.warning("故障现象尚未填写，请填写后再报工")
                   }else if(res.result.records[0].faultCause===null||res.result.records[0].faultCause===undefined||res.result.records[0].faultCause===''){
                      that.$message.warning("故障检查尚未填写，请填写后再报工")
@@ -665,6 +659,7 @@
            if (res.result) {
              that.$message.success('报工成功');
              that.repairOrder.status = '4'
              that.reload();
              that.$emit('loadData');
            } else {
              that.$message.error('报工出现异常')