zhangherong
2025-04-14 41aa1d07947bb29bb5a28d4f7d775cdae60e0152
art: 周保执行页面修改
已修改2个文件
110 ■■■■■ 文件已修改
src/views/flowable/workflow/FlowTodo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/workflow/FlowTodo.vue
@@ -316,7 +316,7 @@
      },
      handleWeekMaintenance(item) {
        if (item && item.dataId) {
          this.$refs.weekMaintenanceApprovalModal.handleDetail(item.dataId)
          this.$refs.weekMaintenanceApprovalModal.handleDetail(item)
          this.$refs.weekMaintenanceApprovalModal.title = item.name
          this.$refs.weekMaintenanceApprovalModal.disableSubmit = false
        }
src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue
@@ -23,7 +23,8 @@
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设备编码">
              <maintenance-equipment-select placeholder="请输入设备编号或名称搜索" v-model="model.equipmentId"
                                            :maintenanceCategory="maintenanceCategory"
                                            @autocompleteForm="autocompleteForm" disabled></maintenance-equipment-select>
                                            @autocompleteForm="autocompleteForm"
                                            disabled></maintenance-equipment-select>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
@@ -35,7 +36,8 @@
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="maintenanceDate" label="保养日期">
              <a-date-picker placeholder="请选择计划保养日期" v-model="model.maintenanceDate" format="YYYY-MM-DD" disabled
              <a-date-picker placeholder="请选择计划保养日期" v-model="model.maintenanceDate" format="YYYY-MM-DD"
                             disabled
                             style="width: 100%" />
            </a-form-model-item>
          </a-col>
@@ -56,13 +58,20 @@
            <a-textarea placeholder="请输入备注" v-model="model.remark" disabled />
          </a-form-model-item>
        </a-row>
        <a-row :gutter="24">
          <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="remark" label="保养图片">
            <lx-upload :returnUrl="false"
                       :isMultiple="true"
                       file-type="image"
                       v-model="model.fileList" />
          </a-form-model-item>
        </a-row>
        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 保养项信息
        </a-divider>
        <a-row :gutter="24">
          <j-vxe-table
            ref="editableDetailTable"
            :rowNumber="true"
            :rowNumber="false"
            :rowSelection="true"
            :bordered="true"
            :alwaysEdit="true"
@@ -75,12 +84,18 @@
            :columns="detail.columns"
            style="margin-top: 8px;" />
        </a-row>
        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 班组长确认信息
        </a-divider>
        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 初验收信息
        </a-divider>
        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 终验收信息
        </a-divider>
        <div v-if="['WAIT_CONFIRM', 'WAIT_INITIAL_ACCEPTANCE', 'WAIT_FINAL_ACCEPTANCE', 'COMPLETE'].includes(model.maintenanceStatus)">
          <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 班组长确认信息
          </a-divider>
        </div>
        <div v-if="['WAIT_INITIAL_ACCEPTANCE', 'WAIT_FINAL_ACCEPTANCE', 'COMPLETE'].includes(model.maintenanceStatus)">
          <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 初验收信息
          </a-divider>
        </div>
        <div v-if="['WAIT_FINAL_ACCEPTANCE', 'COMPLETE'].includes(model.maintenanceStatus)">
          <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 终验收信息
          </a-divider>
        </div>
      </a-form-model>
    </a-spin>
  </j-modal>
@@ -104,10 +119,10 @@
      visible: false,
      //状态控制
      //保养中 不可编辑
      underMaintenanceDisable : false,
      confirmDisable : false,
      initialAcceptanceDisable : false,
      finalAcceptanceDisable : false,
      underMaintenanceDisable: false,
      confirmDisable: false,
      initialAcceptanceDisable: false,
      finalAcceptanceDisable: false,
      editable: false,
      model: {},
      maintenanceCategory: 'WEEK_MAINTENANCE',
@@ -129,13 +144,12 @@
        sm: { span: 21 }
      },
      confirmLoading: false,
      validatorRules: {
      },
      validatorRules: {},
      url: {
        queryById: '/eam/weekMaintenanceOrder/queryById',
        detail: '/eam/weekMaintenanceOrderDetail/queryList',
        approval : '/eam/weekMaintenanceOrder/approval',
        userSelect: '/eam/user_select/list',
        approval: '/eam/weekMaintenanceOrder/approval',
        userSelect: '/eam/user_select/list'
      },
      detail: {
        loading: false,
@@ -155,29 +169,55 @@
            title: '序号',
            key: 'itemCode',
            type: JVXETypes.normal,
            width: '10%',
            align: 'center',
            width: '5%',
            align: 'center'
          },
          {
            title: '保养项',
            key: 'itemName',
            type: JVXETypes.normal,
            width: '20%',
            align: 'center',
            width: '10%',
            align: 'center'
          },
          {
            title: '子保养项',
            key: 'subItemName',
            type: JVXETypes.normal,
            width: '25%',
            width: '10%',
            align: 'center'
          },
          {
            title: '保养要求',
            key: 'itemDemand',
            type: JVXETypes.normal,
            width: '30%',
            width: '20%',
            align: 'center'
          },
          {
            title: '保养结果',
            key: 'maintenanceResult',
            type: JVXETypes.selectSearch,
            dictCode: 'eam_inspection_result',
            width: '10%',
            align: 'center',
            validateRules: [
              { required: true, message: '保养结果不能为空!' }
            ]
          },
          {
            title: '异常描述',
            key: 'exceptionDescription',
            type: JVXETypes.textarea,
            width: '20%',
            align: 'center',
          },
          {
            title: '是否报修',
            key: 'reportFlag',
            type: JVXETypes.selectSearch,
            dictCode: 'yn',
            width: '10%',
            align: 'center'
          }
        ],
        toolbarConfig: {
@@ -192,14 +232,17 @@
  created() {
  },
  methods: {
    async handleDetail(dataId) {
      this.loading = true;
      this.visible = true;
    async handleDetail(item) {
      this.loading = true
      this.visible = true
      this.detail.dataSource = []
      let res = await getAction(this.url.queryById, {id: dataId});
      this.model = Object.assign({}, res.result);
      await this.loadDetail(dataId);
      this.loading = false;
      let param = {
        id: item.dataId
      }
      let res = await getAction(this.url.queryById, param)
      this.model = Object.assign({}, res.result, item)
      await this.loadDetail(item.dataId)
      this.loading = false
    },
    close() {
      this.$emit('close')
@@ -251,8 +294,7 @@
      if (!this.model.id) {
        this.loadStandardDetail(selectObj.id)
      }
      debugger
      this.loadMaintenanceOperatorList(this.model.equipmentId);
      this.loadMaintenanceOperatorList(this.model.equipmentId)
    },
    //标准选择变化
    loadDetail(orderId) {