Merge remote-tracking branch 'origin/mdc-test' into mdc-test

Lius

2023-11-13 3a8223b71d18205d40b894fd0b4c0fa1ca773e86

 src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue

@@ -19,27 +19,31 @@
              :wrapperCol="wrapperCol"
            >
              <a-input
                :disabled="disableSubmit"
                :disabled="true"
                placeholder="请输入单据号"
                v-decorator="['num', validatorRules.num]"
              />
            </a-form-item>
          </a-col>
          <a-col :span="24/2">
            <!-- <a-form-item
            <a-form-item
              label="是否停机维修"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="disableSubmit"
                :placeholder="disableSubmit?'':'请选择是否停机维修'"
                :triggerChange="true"
                dictCode="is_stop"
                v-decorator="['isStop', validatorRules.isStop]"
              />
            </a-form-item> -->
            </a-form-item>

          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24/2">
            <a-form-item
              label="设备编码"
              :labelCol="labelCol"
@@ -52,6 +56,22 @@
                @search="onSearchEquipmentList()"
                :read-only="true"
                v-decorator="['equipmentNum', validatorRules.equipmentNum]"
              />
            </a-form-item>
          </a-col>
          <a-col :span="24/2">
            <a-form-item
              label="故障时间"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-date
                :disabled="true"
                style="width: 100%"
                placeholder="请选择故障时间"
                :showTime="true"
                dateFormat="YYYY-MM-DD HH:mm:ss"
                v-decorator="['faultTime', validatorRules.faultTime]"
              />
            </a-form-item>
          </a-col>
@@ -85,36 +105,36 @@
              />
            </a-form-item>
          </a-col>
            <a-row
          hidden
          :gutter="24"
        >
          <a-col :span="12">
            <a-form-item
              label="设备Id"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-input
                :disabled="true"
                :placeholder="disableSubmit?'':'请输入设备编码/名称/型号'"
                v-decorator="['equipmentId', validatorRules.equipmentId ]"
              />
            </a-form-item>
          </a-col>
          <a-col :span="12">
            <a-form-item
              label="使用部门Id"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-input
                :disabled="true"
                :placeholder="disableSubmit?'':'请输入使用部门id'"
                v-decorator="['useDepartId', validatorRules.useDepartId ]"
              />
            </a-form-item>
          </a-col>
          <a-row
            hidden
            :gutter="24"
          >
            <a-col :span="12">
              <a-form-item
                label="设备Id"
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
              >
                <a-input
                  :disabled="true"
                  :placeholder="disableSubmit?'':'请输入设备编码/名称/型号'"
                  v-decorator="['equipmentId', validatorRules.equipmentId ]"
                />
              </a-form-item>
            </a-col>
            <a-col :span="12">
              <a-form-item
                label="使用部门Id"
                :labelCol="labelCol"
                :wrapperCol="wrapperCol"
              >
                <a-input
                  :disabled="true"
                  :placeholder="disableSubmit?'':'请输入使用部门id'"
                  v-decorator="['useDepartId', validatorRules.useDepartId ]"
                />
              </a-form-item>
            </a-col>
          </a-row>
        </a-row>
        <a-row :gutter="24">
@@ -154,7 +174,7 @@
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
        <!-- <a-row :gutter="24">
          <a-col :span="24/2">
            <a-form-item
              label="紧急程度"
@@ -170,24 +190,21 @@
                v-decorator="['urgency', validatorRules.urgency]"
              />
            </a-form-item>
          </a-col>
          <a-col :span="24/2">
          </a-col> -->
          <!-- <a-col :span="24/2" v-show="false">
            <a-form-item
              label="故障时间"
              label="故障原因"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-date
            <a-input
                :disabled="disableSubmit"
                style="width: 100%"
                placeholder="请选择故障时间"
                :showTime="true"
                dateFormat="YYYY-MM-DD HH:mm:ss"
                v-decorator="['faultTime', validatorRules.faultTime]"
                enter-button
                v-decorator="['faultReason', validatorRules.faultReason]"
              />
            </a-form-item>
          </a-col>
        </a-row>
          </a-col> -->
        <!-- </a-row> -->
        <a-row :gutter="24">
          <a-col :span="24/2">
            <a-form-item
@@ -219,25 +236,14 @@
              />
            </a-form-item>
          </a-col>
          </a-row>
          <a-row :gutter="24">
          <a-col :span="24">
        </a-row>
        <!-- <a-row :gutter="24">
          <a-col :span="24/2">
            <a-form-item
              label="故障照片"
              :labelCol="{span:3}"
              :wrapperCol="{span:21}"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <!-- <j-image-upload-self
                :isMultiple="false"
                v-decorator="['photo', {}]"
                @ok="uploadOk"
              >
              </j-image-upload-self> -->
              <!-- <j-image-upload
                :isMultiple="false"
                @ok="uploadOk"
                v-decorator="['photo', {}]"
              /> -->
              <j-image-upload
                :disabled="disableSubmit"
                :isMultiple="true"
@@ -246,7 +252,7 @@

            </a-form-item>
          </a-col>
        </a-row>
        </a-row> -->
      </a-form>
    </a-spin>

@@ -283,6 +289,8 @@
// import JImageUpload from '@/components/jeecg/JImage2Upload'
import EquipmentList from './EquipmentList'
import Vue from 'vue'
import dayjs from 'dayjs'


export default {
  name: "MalfunctionRepaireModal",
@@ -290,7 +298,8 @@
    JMultiSelectTag,
    Tooltip,
    // JImageUpload,
    EquipmentList
    EquipmentList,
    dayjs
  },
  data() {
    return {
@@ -316,11 +325,11 @@
            { required: true, message: '请输入入库单编号!' },
          ]
        },
        // isStop: {
        //   rules: [
        //     { required: true, message: '请选择是否停机!' },
        //   ]
        // },
        isStop: {
          rules: [
            { required: true, message: '请选择是否停机!' },
          ]
        },
        equipmentNum: {
          rules: [
            { required: true, message: '请选择设备!' },
@@ -331,13 +340,19 @@
            { required: true, message: '请选择故障时间!' },
          ]
        },
        faultDescription:{
          rules: [
            { required: true, message: '请描述故障!' },
            { max: 1000, min:1,message: '最多可描述1000字!' },
          ]
        },
      },
      url: {
        add: "/eam/equipmentReportRepair/add",
        edit: "/eam/equipmentReportRepair/edit",
        getSysDeparts: "/eam/equipment/getSysDeparts",
        getNum:'/eam/sysIdentity/getNumNew'
      },

      dataSource: [],
    }
  },
@@ -347,9 +362,20 @@
  },

  methods: {

    add() {
      this.edit({})
      let that = this;
      let param = {
          type: 'EquipmentReportRepair',
          length: 4
      };
      let modelDefault = {};
      getAction(this.url.getNum,param).then(res=>{
          if(res.success){
             modelDefault.num = res.result;
             modelDefault.faultTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
             that.edit(modelDefault);
          }
      })
    },
    edit(record) {
      let that = this;
@@ -358,7 +384,7 @@
      that.model = Object.assign({}, record);
      that.visible = true;
      that.$nextTick(() => {
        that.form.setFieldsValue(pick(that.model, 'num', 'isStop', 'equipmentId','equipmentNum', 'equipmentName','equipmentModel','equipmentSpecification','urgency','useDepartId','departName', 'faultDescription', 'faultTime', 'remark', "photo"));
        that.form.setFieldsValue(pick(that.model, 'num', 'isStop', 'equipmentId', 'equipmentNum', 'equipmentName', 'equipmentModel', 'equipmentSpecification', 'urgency', 'useDepartId', 'departName', 'faultDescription', 'faultTime', 'remark', "photo"));
      });
      if (record.id) {
        this.codeDisable = true;
@@ -417,7 +443,7 @@
    },
    sendEquipmentRecord(data) {
      let record = data.record;
      this.form.setFieldsValue({ equipmentName: record.name, equipmentId: record.id,equipmentNum:record.num,equipmentModel:record.model,equipmentSpecification:record.specification,useDepartId:record.useId,departName:record.useId_dictText });
      this.form.setFieldsValue({ equipmentName: record.name, equipmentId: record.id, equipmentNum: record.num, equipmentModel: record.model, equipmentSpecification: record.specification, useDepartId: record.useId, departName: record.useId_dictText });
    },

  },