qushaowei
2023-12-29 e5ea7094423b4d48c080c9f5d135e0e29a8a8a68
修改提交
已修改6个文件
176 ■■■■ 文件已修改
src/views/eam/MalfunctionRepair.vue 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/MalfunctionRepair.vue
@@ -8,12 +8,15 @@
      <a-form
        layout="inline"
        @keyup.enter.native="searchQuery"
      > <a-row :gutter="24" style="margin-bottom: 1%;">
      > <a-row
          :gutter="24"
          style="margin-bottom: 1%;"
        >
          <a-col
            :md="24"
            :sm="6"
          >
          <a-form-item label="统一编号群">
            <a-form-item label="统一编号群">
              <a-textarea
                placeholder="请输入所有统一编码,须用换行隔开,否则可能查询出错误信息"
                v-model="queryParam.nums"
@@ -178,24 +181,28 @@
      </a-form>
    </div>
    <div class="table-operator">
              <a-button
                type="primary"
                @click="searchQuery"
                icon="search"
              >查询</a-button>
              <a-button
                type="primary"
                @click="searchReset"
                icon="reload"
                style="margin-left: 8px"
              >重置</a-button>
      <a-button
        type="primary"
        @click="searchQuery"
        icon="search"
      >查询</a-button>
      <a-button
        type="primary"
        @click="searchReset"
        icon="reload"
        style="margin-left: 8px"
      >重置</a-button>
      <a-button
        @click="handleAdd"
        type="primary"
        icon="plus"
        v-has="'report:add&edit'"
      >新增</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('故障报修')">导出</a-button>
      <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('故障报修')"
      >导出</a-button>
    </div>
    <div>
@@ -280,8 +287,14 @@
            </a-menu>
          </a-dropdown> -->
        </span>
        <span slot="jell" slot-scope="text">
            <j-ellipsis :value="text" :length="10" />
        <span
          slot="jell"
          slot-scope="text"
        >
          <j-ellipsis
            :value="text"
            :length="10"
          />
        </span>
      </a-table>
@@ -299,7 +312,10 @@
          class="table-operator"
          style="margin-top: 0px"
        >
          <FaultDescriptionList ref="FaultDescriptionList"   @ok="modalFormOk"/>
          <FaultDescriptionList
            ref="FaultDescriptionList"
            @ok="modalFormOk"
          />
        </div>
      </a-tab-pane>
@@ -315,8 +331,8 @@
      @cancel='approvalModalFormOk'
    ></approvel-modal>
    <accept-model
    ref="acceptModel"
    @ok="modalFormOk"
      ref="acceptModel"
      @ok="modalFormOk"
    ></accept-model>
  </a-card>
</template>
@@ -346,8 +362,8 @@
  },
  data() {
    return {
      treeData:[],
      faultTime:[],
      treeData: [],
      faultTime: [],
      description: '故障报修',
      queryParam: { delflag: 0 },
      selectedRowKeys: [],
@@ -364,14 +380,38 @@
          }
        },
        {
          title: '单据号',
          align: "center",
          dataIndex: 'num'
        },
        {
          title: '状态',
          align: "center",
          dataIndex: 'statusName',
        },
        {
          title: '单据号',
          title: '类型',
          align: "center",
          dataIndex: 'num'
          dataIndex: 'type',
          customRender: (text) => {
            if (text == '1') {
              return "被动报修";
            } else if (text == '2') {
              return "主动报修";
            }
          },
        },
        {
          title: '来源',
          align: "center",
          dataIndex: 'source',
          customRender: (text) => {
            if (text == '1') {
              return "手动创建";
            } else if (text == '2') {
              return "点检报修";
            }
          },
        },
        {
          title: '统一编号',
@@ -407,8 +447,8 @@
          title: '故障描述',
          align: "center",
          dataIndex: 'faultDescription',
          scopedSlots: {
            customRender: 'faultDescription'
          scopedSlots: {
            customRender: 'faultDescription'
          }
        },
@@ -447,8 +487,8 @@
          title: '验收意见',
          align: "center",
          dataIndex: 'errUda5',
          scopedSlots: {
            customRender: 'jell'
          scopedSlots: {
            customRender: 'jell'
          }
        },
        {
@@ -489,7 +529,7 @@
    }
  },
  created() {
       this.initOptions();
    this.initOptions();
  },
  computed: {
    importExcelUrl: function () {
@@ -645,12 +685,12 @@
        }
      })
    },
    timeChange(){
    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="验收"
    handleAccept(record) {
      this.$refs.acceptModel.title = "验收"
      this.$refs.acceptModel.edit(record)
    }
  }
src/views/eam/modules/daily3MaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -385,6 +385,18 @@
        xs: { span: 24 },
        sm: { span: 18 },
      },
      /* 分页参数 */
      ipagination: {
        current: 1,
        pageSize: 99,
        pageSizeOptions: ['99'],
        showTotal: (total, range) => {
          return range[0] + "-" + range[1] + " 共" + total + "条"
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0
      },
      validatorRules: {
        // description: {
        //   rules: [
@@ -513,11 +525,11 @@
          // }
          //update-begin---author:zhangyafei    Date:20201118  for:适配不分页的数据列表------------
          this.dataSource = res.result.records || res.result;
          if (res.result.total) {
            this.ipagination.total = res.result.total;
          } else {
            this.ipagination.total = 0;
          }
          // if (res.result.total) {
          //   this.ipagination.total = res.result.total;
          // } else {
          //   this.ipagination.total = 0;
          // }
          //update-end---author:zhangyafei    Date:20201118  for:适配不分页的数据列表------------
        } else {
          this.$message.warning(res.message)
src/views/eam/modules/daily3MaintenanceOrder/MaintenanceOrder3Modal.vue
@@ -646,7 +646,7 @@
    send3MaintenanceStandardRecord(data) {
      let record = data.record;
      this.form.setFieldsValue({ equipmentId: record.equipmentId, maintenanceStandardId: record.id, equipmentNum: record.equipmentNum, maintenanceStandardNum: record.num, maintenanceCycleId: null });
      this.form.setFieldsValue({ assignMode: record.assignMode, teamId: record.teamId, teamName: record.teamName });
      this.form.setFieldsValue({ assignMode: "1", teamId: record.teamId, teamName: record.teamName });
      this.getCycleByStandardId(record.id);
      if ("3" == record.assignMode) {
        this.isHidden = false
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -336,6 +336,18 @@
        xs: { span: 24 },
        sm: { span: 18 },
      },
      /* 分页参数 */
      ipagination: {
        current: 1,
        pageSize: 99,
        pageSizeOptions: ['99'],
        showTotal: (total, range) => {
          return range[0] + "-" + range[1] + " 共" + total + "条"
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0
      },
      columns: [
        {
          title: '#',
@@ -475,11 +487,11 @@
          // }
          //update-begin---author:zhangyafei    Date:20201118  for:适配不分页的数据列表------------
          this.dataSource = res.result.records || res.result;
          if (res.result.total) {
            this.ipagination.total = res.result.total;
          } else {
            this.ipagination.total = 0;
          }
          // if (res.result.total) {
          //   this.ipagination.total = res.result.total;
          // } else {
          //   this.ipagination.total = 0;
          // }
          //update-end---author:zhangyafei    Date:20201118  for:适配不分页的数据列表------------
        } else {
          this.$message.warning(res.message)
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderModal.vue
@@ -291,10 +291,10 @@
      :scroll="{x:true}"
      :columns="columns"
      :dataSource="dataSource"
      :pagination="ipagination"
      :loading="loading"
      @change="handleTableChange"
      :pagination="false"
    >
      <!-- @change="handleTableChange" -->
      <template
        slot="photo"
        slot-scope="text,record"
@@ -633,7 +633,7 @@
      this.inspectionStandardId = record.id;
      this.form.setFieldsValue({ inspectionStandardId: record.id, inspectionStandardNum: record.num + "/" + record.version });
      this.form.setFieldsValue({ equipmentId: record.equipmentId, equipmentName: record.equipmentNum + "/" + record.equipmentName });
      this.form.setFieldsValue({ assignMode: record.assignMode, teamId: record.teamId, teamName: record.teamName });
      this.form.setFieldsValue({ assignMode: "1", teamId: record.teamId, teamName: record.teamName });
      this.form.setFieldsValue({ effectiveTime: null, inspectionCycleId: null, unit: null });
      this.getInspectionCycles(record.id)
      if ("3" == record.assignMode) {
src/views/eam/modules/dailyMaintenanceOrder/DailyMaintenanceOrderExeDrawer.vue
@@ -386,6 +386,18 @@
        xs: { span: 24 },
        sm: { span: 18 },
      },
      /* 分页参数 */
      ipagination: {
        current: 1,
        pageSize: 99,
        pageSizeOptions: ['99'],
        showTotal: (total, range) => {
          return range[0] + "-" + range[1] + " 共" + total + "条"
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0
      },
      validatorRules: {
        // description: {
        //   rules: [
@@ -520,11 +532,11 @@
          // }
          //update-begin---author:zhangyafei    Date:20201118  for:适配不分页的数据列表------------
          this.dataSource = res.result.records || res.result;
          if (res.result.total) {
            this.ipagination.total = res.result.total;
          } else {
            this.ipagination.total = 0;
          }
          // if (res.result.total) {
          //   this.ipagination.total = res.result.total;
          // } else {
          //   this.ipagination.total = 0;
          // }
          //update-end---author:zhangyafei    Date:20201118  for:适配不分页的数据列表------------
        } else {
          this.$message.warning(res.message)