修改

“linengliang”

2023-12-13 fd6e935f391501358357f3e6bc1957764510b8bc

 src/views/eam/MalfunctionRepair.vue

@@ -8,11 +8,24 @@
      <a-form
        layout="inline"
        @keyup.enter.native="searchQuery"
      >
      > <a-row :gutter="24" style="margin-bottom: 1%;">
          <a-col
            :md="24"
            :sm="6"
          >
          <a-form-item label="统一编号群">
              <a-textarea
                placeholder="请输入所有统一编码,须用“,”隔开,否则可能查询出错误信息"
                v-model="queryParam.nums"
                :auto-size="{ minRows: 2, maxRows:2 }"
              ></a-textarea>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col
            :md="6"
            :sm="8"
            :sm="6"
          >
            <a-form-item label="单据号">
              <a-input
@@ -23,23 +36,148 @@
          </a-col>
          <a-col
            :md="6"
            :sm="8"
            :sm="6"
          >
            <a-form-item label="统一编码">
            <a-form-item label="统一编号">
              <a-input
                placeholder="请输入统一编码"
                placeholder="请输入统一编号"
                v-model="queryParam.equipmentNum"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="8"
            :sm="6"
          >
            <span
              style="float: left;overflow: hidden;"
              class="table-page-search-submitButtons"
            >
            <a-form-item label="设备名称">
              <a-input
                placeholder="请输入设备名称"
                v-model="queryParam.equipmentName"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="6"
          >
            <a-form-item label="设备型号">
              <a-input
                placeholder="请输入设备型号"
                v-model="queryParam.model"
              ></a-input>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col
            :md="6"
            :sm="6"
          >
            <a-form-item label="设备规格">
              <a-input
                placeholder="请输入设备规格"
                v-model="queryParam.specification"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="6"
          >
            <a-form-item label="使用部门">
              <a-tree-select
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择使用部门"
                tree-default-expand-all
                v-model="queryParam.useId"
              />
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="6"
          >
            <a-form-item label="故障时间">
              <a-range-picker
                style="width: 100%;"
                format="YYYY-MM-DD HH:mm:ss"
                v-model="faultTime"
                @change="timeChange"
              />
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="6"
          >
            <a-form-item label="报修人">
              <a-input
                placeholder="请输入报修人"
                v-model="queryParam.errUda2"
              ></a-input>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col
            :md="6"
            :sm="6"
          >
            <a-form-item label="单据状态">
              <j-dict-select-tag
                allow-clear
                placeholder="请选择单据状态"
                :triggerChange="true"
                dictCode="equipment_report_repair_status"
                v-model="queryParam.status"
              />
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="6"
          >
            <a-form-item label="是否停机维修">
              <j-dict-select-tag
                allow-clear
                placeholder="请选择是否停机维修"
                :triggerChange="true"
                dictCode="is_stop"
                v-model="queryParam.isStop"
              />
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="6"
          >
            <a-form-item label="是否加工零件">
              <j-dict-select-tag
                allow-clear
                placeholder="请选择是否在加工零件"
                :triggerChange="true"
                dictCode="is_product"
                v-model="queryParam.errUda1"
              />
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="6"
          >
            <a-form-item label="制单人">
              <a-input
                placeholder="请输入制单人"
                v-model="queryParam.createBy"
              ></a-input>
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </div>
    <div class="table-operator">
              <a-button
                type="primary"
                @click="searchQuery"
@@ -51,16 +189,11 @@
                icon="reload"
                style="margin-left: 8px"
              >重置</a-button>
            </span>
          </a-col>
        </a-row>
      </a-form>
    </div>
    <div class="table-operator">
      <a-button
        @click="handleAdd"
        type="primary"
        icon="plus"
        v-has="'report:add&edit'"
      >新增</a-button>
    </div>

@@ -83,7 +216,12 @@
          slot="action"
          slot-scope="text, record"
        >
          <a-popconfirm
          <a
            :disabled=" record.status !== '4'"
            @click="handleAccept(record)"
            v-has="'report:accept'"
          >验收</a>
          <!-- <a-popconfirm
            v-if="record.status == '1' || record.status == '4'"
            title="确认提交吗?"
            @confirm="() =>handleCommit(record, 'commit')"
@@ -139,9 +277,9 @@
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
          </a-dropdown> -->
        </span>
        <span slot="faultDescription" slot-scope="text">
        <span slot="jell" slot-scope="text">
            <j-ellipsis :value="text" :length="10" />
        </span>

@@ -175,6 +313,10 @@
      @ok='approvalModalFormOk'
      @cancel='approvalModalFormOk'
    ></approvel-modal>
    <accept-model
    ref="acceptModel"
    @ok="modalFormOk"
    ></accept-model>
  </a-card>
</template>
  
@@ -188,6 +330,8 @@
import FaultDescriptionList from './modules/malfunctionRepair/FaultDescriptionList'
import ApprovelModal from './modules/malfunctionRepair/ApprovelModal'
import JEllipsis from '@/components/jeecg/JEllipsis'
import moment from 'moment'
import AcceptModel from './modules/malfunctionRepair/AcceptModel'

export default {
  name: 'MalfunctionRepairList',
@@ -196,10 +340,13 @@
    MalfunctionRepairModal,
    FaultDescriptionList,
    ApprovelModal,
    JEllipsis 
    JEllipsis,
    AcceptModel,
  },
  data() {
    return {
      treeData:[],
      faultTime:[],
      description: '故障报修',
      queryParam: { delflag: 0 },
      selectedRowKeys: [],
@@ -226,7 +373,7 @@
          dataIndex: 'num'
        },
        {
          title: '统一编码',
          title: '统一编号',
          align: "center",
          dataIndex: 'equipmentNum'
        },
@@ -270,11 +417,11 @@
        //   dataIndex: 'photo',
        //   scopedSlots: { customRender: 'imgSlot' }
        // },
        // {
        //   title: '故障原因',
        //   align: "center",
        //   dataIndex: 'faultReason'
        // },
        {
          title: '报修人',
          align: "center",
          dataIndex: 'errUda2'
        },
        {
          title: '故障时间',
          align: "center",
@@ -291,28 +438,31 @@
          dataIndex: 'errUda1_dictText',
        },
        {
          title: '创建人',
          title: '制单人',
          align: "center",
          dataIndex: 'createBy'
        },
        {
          title: '创建时间',
          title: '验收意见',
          align: "center",
          dataIndex: 'createTime',
          dataIndex: 'errUda5',
          scopedSlots: { 
            customRender: 'jell' 
          }
        },
        {
          title: '备注',
          align: "center",
          dataIndex: 'remark'
        },
        // {
        //   title: '操作',
        //   dataIndex: 'action',
        //   align: "center",
        //   fixed: "right",
        //   width: 200,
        //   scopedSlots: { customRender: 'action' }
        // }
        {
          title: '操作',
          dataIndex: 'action',
          align: "center",
          fixed: "right",
          width: 200,
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        list: "/eam/equipmentReportRepair/getReportRepairList",
@@ -321,6 +471,7 @@
        exportXlsUrl: "/eam/equipmentReportRepair/exportXls",
        importExcelUrl: "eam/equipmentReportRepair/importExcel",
        edit: "/eam/equipmentReportRepair/edit",
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
      },
      /* 分页参数 */
      ipagination: {
@@ -337,7 +488,7 @@
    }
  },
  created() {

       this.initOptions();
  },
  computed: {
    importExcelUrl: function () {
@@ -481,9 +632,26 @@
      this.queryParam = {}
      this.loadData(1)
      this.onClearSelected()
      this.faultTime = []
      this.$refs.FaultDescriptionList.faultId = '-1'
    },

    initOptions() {
      getAction(this.url.loadOptions).then(res => {
        if (res.success) {
          this.treeData = res.result
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    timeChange(){
      this.queryParam.faultStartTime = moment(this.faultTime[0]).format("YYYY-MM-DD HH:mm:ss")
      this.queryParam.faultEndTime = moment(this.faultTime[1]).format("YYYY-MM-DD HH:mm:ss")
    },
    handleAccept(record){
      this.$refs.acceptModel.title="验收"
      this.$refs.acceptModel.edit(record)
    }
  }
}
</script>