问题项修改

“linengliang”

2024-03-12 ddd7e6f6c57c2f39305e94a74650e28bbf31f9e7

问题项修改

 src/views/eam/EquipmentListOfAll.vue

@@ -248,6 +248,22 @@
              ></j-date>
            </a-form-model-item>
          </a-col>
          <!-- 按维修班组检索 -->
          <a-col :span="6">
            <a-form-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择维修班组"
                :triggerChange="true"
                dictCode="mom_base_team,name,id,del_flag!='1'"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </div>

 src/views/eam/EquipmentListOfCrane.vue

@@ -215,6 +215,21 @@
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择维修班组"
                :triggerChange="true"
                dictCode="mom_base_team,name,id,del_flag!='1'"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </div>

 src/views/eam/EquipmentListOfEnvProEquipment.vue

@@ -230,6 +230,21 @@
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择维修班组"
                :triggerChange="true"
                dictCode="mom_base_team,name,id,del_flag!='1'"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </div>

 src/views/eam/EquipmentListOfFilesCarousel.vue

@@ -230,6 +230,21 @@
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择维修班组"
                :triggerChange="true"
                dictCode="mom_base_team,name,id,del_flag!='1'"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </div>

 src/views/eam/EquipmentListOfMetrological.vue

@@ -230,6 +230,21 @@
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择维修班组"
                :triggerChange="true"
                dictCode="mom_base_team,name,id,del_flag!='1'"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </div>

 src/views/eam/EquipmentListOfPressureVessel.vue

@@ -230,6 +230,21 @@
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择维修班组"
                :triggerChange="true"
                dictCode="mom_base_team,name,id,del_flag!='1'"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </div>

 src/views/eam/EquipmentListOfProduct.vue

@@ -230,6 +230,21 @@
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择维修班组"
                :triggerChange="true"
                dictCode="mom_base_team,name,id,del_flag!='1'"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </div>

 src/views/eam/EquipmentListOfRide.vue

@@ -230,6 +230,21 @@
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择维修班组"
                :triggerChange="true"
                dictCode="mom_base_team,name,id,del_flag!='1'"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </div>

 src/views/eam/EquipmentListOfTester.vue

@@ -230,6 +230,21 @@
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择维修班组"
                :triggerChange="true"
                dictCode="mom_base_team,name,id,del_flag!='1'"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </div>

 src/views/eam/EquipmentListOfTruck.vue

@@ -230,6 +230,21 @@
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择维修班组"
                :triggerChange="true"
                dictCode="mom_base_team,name,id,del_flag!='1'"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </div>

 src/views/eam/EquipmentListOfWeldingMachine.vue

@@ -230,6 +230,21 @@
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择维修班组"
                :triggerChange="true"
                dictCode="mom_base_team,name,id,del_flag!='1'"
                v-model="queryParam.teamId"
              />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </div>

 src/views/eam/FaultInfoList.vue

@@ -1,14 +1,8 @@
<template>
  <a-card
    title="设备事故登记表"
    :bordered="false"
  >
  <a-card :bordered="false">
    <!-- 查询区域 -->
    <div class="table-page-search-wrapper">
      <a-form
        layout="inline"
        @keyup.enter.native="searchQuery"
      >
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col
            :xl='6'
@@ -74,15 +68,9 @@

    <!-- table区域-begin -->
    <div>
      <div
        class="ant-alert ant-alert-info"
        style="margin-bottom: 16px;"
      >
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a
          style="margin-left: 24px"
          @click="onClearSelected"
        >清空</a>
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>

      <a-table
@@ -97,83 +85,59 @@
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        class="j-table-force-nowrap"
        @change="handleTableChange"
      >
        @change="handleTableChange">

        <template
          slot="htmlSlot"
          slot-scope="text"
        >
        <template slot="htmlSlot" slot-scope="text">
          <div v-html="text"></div>
        </template>
        <template
          slot="imgSlot"
          slot-scope="text,record"
        >
          <span
            v-if="!text"
            style="font-size: 12px;font-style: italic;"
          >无图片</span>
          <img
            v-else
            :src="getImgView(text)"
            :preview="record.id"
            height="25px"
            alt=""
            style="max-width:80px;font-size: 12px;font-style: italic;"
          />
        <template slot="imgSlot" slot-scope="text,record">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
        </template>
        <template
          slot="fileSlot"
          slot-scope="text"
        >
          <span
            v-if="!text"
            style="font-size: 12px;font-style: italic;"
          >无文件</span>
        <template slot="fileSlot" slot-scope="text">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button
            v-else
            :ghost="true"
            type="primary"
            icon="download"
            size="small"
            @click="downloadFile(text)"
          >
            @click="downloadFile(text)">
            下载
          </a-button>
        </template>

        <span
          slot="action"
          slot-scope="text, record"
        >
          <a
            @click="handleEdit(record)"
            v-if="record.isConfirm!=='yes'"
            v-has="'fault:update'"
          >录入</a>

          <a-divider type="vertical" />
          <a @click="handleDetail(record)">详情</a>
          <a-divider type="vertical" />
        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)" v-if="record.isConfirm=='no'" v-has="'fault:update'">录入</a>
          <a-divider type="vertical" v-if="record.isConfirm=='no'"/>
          <a-popconfirm
            title="确认结果后不可再录入，确认吗?"
            title="确认提交吗?"
            @confirm="() => handleSubmit(record)"
          >
          <a  v-if="record.isConfirm=='no'" v-has="'fault:update'">提交</a>
          </a-popconfirm>
          <a-divider type="vertical" v-if="record.isConfirm=='no'" />
          <a-popconfirm
            title="确认驳回吗?"
            @confirm="() => handleReject(record)"
          >
          <a v-if="record.isConfirm=='sub'" v-has="'fault:confirm'">驳回</a>
          </a-popconfirm>
          <a-divider type="vertical" v-if="record.isConfirm=='sub'" />
          <a-popconfirm
            title="确认结果并进入验收流程吗?"
            @confirm="() => handleConfirm(record)"
          >
            <a
              v-if="record.isConfirm!=='yes'"
              v-has="'fault:confirm'"
            >确认</a>
            <a v-if="record.isConfirm=='sub'" v-has="'fault:confirm'">确认</a>
          </a-popconfirm>
          <a-divider type="vertical" />
          <a @click="handleDetail(record)">详情</a>
        </span>

      </a-table>
    </div>

    <fault-info-modal
      ref="modalForm"
      @ok="modalFormOk"
    ></fault-info-modal>
    <fault-info-modal ref="modalForm" @ok="modalFormOk"></fault-info-modal>
  </a-card>
</template>

@@ -219,7 +183,7 @@
        {
          title: '生产单位',
          align: "center",
          dataIndex: 'departId'
            dataIndex: 'departId_dictText'
        },
        {
          title: '设备名称',
@@ -239,7 +203,7 @@
        {
          title: '工区',
          align: "center",
          dataIndex: 'area1'
            dataIndex: 'area1_dictText'
        },
        {
          title: '单元/工段',
@@ -479,6 +443,7 @@
      this.superFieldList = fieldList
    },
    handleConfirm(record) {
        record.isConfirm = 'yes';
      putAction(this.url.confirm, record).then(res => {
        if (res.result) {
          this.$message.success('确认成功');
@@ -488,6 +453,28 @@
        }
      })
    },
      handleSubmit(record) {
        record.isConfirm = "sub";
        putAction(this.url.confirm, record).then(res => {
          if (res.result) {
            this.$message.success('提交成功');
            this.loadData();
          } else {
            this.$message.error('提交出现异常')
          }
        })
      },
      handleReject(record) {
        record.isConfirm = "no";
        putAction(this.url.confirm, record).then(res => {
          if (res.result) {
            this.$message.success('驳回成功');
            this.loadData();
          } else {
            this.$message.error('驳回出现异常')
          }
        })
      },
  }
}
</script>

 src/views/eam/modules/equipmentNew/EquipmentModal.vue

@@ -430,30 +430,46 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="技术状态鉴定周期"
              label="验收日期"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="acceptanceCheckDate"
            >
              <a-date-picker
                :disabled="formDisabled"
                placeholder="请选择验收日期"
                style="width: 100%;"
                v-model="model.acceptanceCheckDate"
                @change="dateChange"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="技术状态检定周期"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="checkPeriod"
            >
              <j-dict-select-tag
                allow-clear
                placeholder="请选择技术状态鉴定周期 "
                placeholder="请选择技术状态检定周期 "
                :triggerChange="true"
                dictCode="check_period"
                :disabled="true"
                v-model="model.checkPeriod"
                @change="dateChange"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="下次技术鉴定时间"
              label="下次技术状态鉴定时间"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="nextTechnologyStatusQualificationTime"
            >
              <j-date
                :disabled="formDisabled"
                :disabled="true"
                style="width: 100%;"
                placeholder="请选择日期"
                class="query-group-cust"
@@ -588,22 +604,6 @@
                placeholder="请输入出厂日期"
                style="width: 100%;"
                v-model="model.leaveFactoryDate"
              />
            </a-form-model-item>
          </a-col>

          <a-col :span="6">
            <a-form-model-item
              label="验收日期"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="acceptanceCheckDate"
            >
              <a-date-picker
                :disabled="formDisabled"
                placeholder="请输入验收日期"
                style="width: 100%;"
                v-model="model.acceptanceCheckDate"
              />
            </a-form-model-item>
          </a-col>
@@ -1039,7 +1039,13 @@
        ],
        system: [
          { required: true, message: '请输入系统!' },
        ]
        ],
        acceptanceCheckDate: [
          { required: true, message: '请选择验收日期!' },
        ],
        checkPeriod: [
          { required: true, message: '请选择技术状态检定周期!' },
        ],
      },
      url: {
        add: "/eam/equipment/add",
@@ -1283,6 +1289,19 @@
        })
      }
    },
    //计算下次技术状态鉴定时间，下次技术状态鉴定时间=验收日期+技术状态检定周期
    dateChange() {
      var acceptanceCheckDate = this.model.acceptanceCheckDate;
      var checkPeriod = this.model.checkPeriod;
      if (acceptanceCheckDate !== null && acceptanceCheckDate !== '' && checkPeriod !== null && checkPeriod !== '') {
        var nextTechnologyStatusQualificationTime = moment(acceptanceCheckDate).add(checkPeriod, 'days').format('YYYY-MM-DD');
        this.model.nextTechnologyStatusQualificationTime = nextTechnologyStatusQualificationTime;
        this.model = Object.assign({}, this.model);
      }else{
        this.model.nextTechnologyStatusQualificationTime = '';
        this.model = Object.assign({}, this.model);
      }
    },
    categoryChange(value) {
      getAction(this.url.getCategoryFlag, { id: value }).then(res => {
        if (res.result.equipmentCategoryUda1 === 'weldingMachine') {

 src/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue

@@ -22,10 +22,10 @@
                :sm="8"
              >
                <a-form-item label="单据号">
                  <j-input
                  <a-input
                    placeholder="请输入单据号检索"
                    v-model="queryParam.num"
                  ></j-input>
                  ></a-input>
                </a-form-item>
              </a-col>

@@ -34,10 +34,21 @@
                :sm="8"
              >
                <a-form-item label="设备名称">
                  <j-input
                  <a-input
                    placeholder="请输入设备名称检索"
                    v-model="queryParam.equipmentName"
                  ></j-input>
                  ></a-input>
                </a-form-item>
              </a-col>
              <a-col
                :md="6"
                :sm="8"
              >
                <a-form-item label="统一编码">
                  <a-input
                    placeholder="请输入统一编码检索"
                    v-model="queryParam.equipmentNum"
                  ></a-input>
                </a-form-item>
              </a-col>
              <a-col