Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev

dy

2025-04-21 4e99fec9a0a4e36b5e465d138c16620471da2a76

Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev

 src/api/mainPlan/workOrderJobLog.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
import request from '@/utils/request'

// æŸ¥è¯¢å·¥å•åŒæ­¥æ—¥å¿—列表
export function list(query) {
  return request({
    url: '/schedule/apsWorkOrderJobLog/list',
    method: 'get',
    params: query
  })
}

// æŸ¥è¯¢å·¥å•åŒæ­¥æ—¥å¿—详细
export function get(id) {
  return request({
    url: '/schedule/apsWorkOrderJobLog/' + id,
    method: 'get'
  })
}

// æ ¹æ®æ—¥å¿—重试
export function sync(data) {
  return request({
    url: '/schedule/apsWorkOrderJobLog/sync',
    method: 'post',
    data: data
  })
}


 src/views/mainPlan/abnormalProcessAnalysis/index.vue

@@ -58,9 +58,9 @@
const { queryParams, form, rules } = toRefs(data);
const columns = ref([
  { type: 'seq', title: '序号', width: 60 },
  { title: '工序名称',  field: 'processName',  width: 200},
  { title: '异常来源',  field: 'source',  width: 200},
  { title: '异常描述',  field: 'summary',  width: 200},
  { title: '工序名称',  field: 'processName'},
  { title: '异常来源',  field: 'source'},
  { title: '异常描述',  field: 'summary'},
  { title: '创建时间',  field: 'createTime',  width: 200},
])


 src/views/mainPlan/workOrderJobLog/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,317 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
      <el-row :gutter="20">

        <el-col :span="6">
          <el-form-item label="业务类型" style="width: 100%;">
            <el-select v-model="queryParams.bizType" placeholder="请选择">
              <el-option
                  v-for="item in bizType"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value">
              </el-option>
            </el-select>
          </el-form-item>
        </el-col>

        <el-col :span="6">
          <el-form-item label="请求时间" style="width: 100%;">
            <el-date-picker
                v-model="createTimes"
                value-format="YYYY-MM-DD"
                type="daterange"
                range-separator="-"
                start-placeholder="开始日期"
                end-placeholder="结束日期"
            ></el-date-picker>
          </el-form-item>
        </el-col>

<!--        <el-col :span="6">
          <el-form-item label="请求参数" prop="requestData">
            <el-input
                v-model="queryParams.requestData"
                placeholder="请输入请求参数"
                clearable
                @keyup.enter="handleQuery"
            />
          </el-form-item>
        </el-col>-->

        <el-col :span="6">
          <el-form-item label="请求结果" prop="result">
            <el-input
                v-model="queryParams.result"
                placeholder="请输入请求结果"
                clearable
                @keyup.enter="handleQuery"
            />
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <el-form-item label="响应数据" prop="requestData">
            <el-input
                v-model="queryParams.responseData"
                placeholder="请输入响应数据"
                clearable
                @keyup.enter="handleQuery"
            />
          </el-form-item>
        </el-col>
        <el-col
            :span="24"
            style="text-align: right;">
          <el-form-item>
            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
          </el-form-item>
        </el-col>
      </el-row>
    </el-form>

    <el-row :gutter="10" class="mb8">


      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="Download"
          @click="handleExport"
          v-hasPermi="['apsWorkOrderJobLog:export']"
        >导出</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
            type="success"
            plain
            icon="Edit"
            :disabled="single"
            @click="handleUpdate"
            v-hasPermi="['apsWorkOrderJobLog:edit']"
        >查看</el-button>
      </el-col>

      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <HxlhTable
        style="width: 100%"
        :columns="columns"
        :data="LogList"
        :loading="loading"
        :height="height" >
      <template #buttons="{row}">
        <vxe-button mode="text" @click="handleUpdate(row)" v-hasPermi="['apsWorkOrderJobLog:edit']" >查看</vxe-button>
      </template>
    </HxlhTable>

    <!-- æ·»åŠ æˆ–修改工单同步日志对话框 -->
    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
      <el-form ref="ApsWorkOrderJobLogRef" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="页码" prop="pageNum">
          <el-input v-model="form.pageNum"  :disabled="true" />
        </el-form-item>
        <el-form-item label="请求数量" prop="pageCount">
          <el-input v-model="form.pageCount"   :disabled="true" />
        </el-form-item>
        <el-form-item label="请求参数" prop="requestData">
          <el-input v-model="form.requestData"   type="textarea" :rows="4" :disabled="true" />
        </el-form-item>
        <el-form-item label="保存结果" prop="result">
          <el-input v-model="form.result"  type="textarea"  :rows="4"     :disabled="true" />
        </el-form-item>
        <el-form-item label="响应数据" prop="responseData">
          <el-input v-model="form.responseData" type="textarea" :rows="4"  :disabled="true" />
        </el-form-item>
        <el-form-item label="提交时间" prop="createTime">
          <el-input v-model="form.createTime"   :disabled="true" />
        </el-form-item>
        <el-form-item label="更新时间" prop="updateTime">
          <el-input v-model="form.updateTime"    :disabled="true" />
        </el-form-item>
        <el-form-item label="同步主键" v-show="false" prop="orderId">
          <el-input v-model="form.orderId" placeholder="请输入同步主键" />
        </el-form-item>

      </el-form>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">重新同步</el-button>
          <el-button @click="cancel">取 æ¶ˆ</el-button>
        </div>
      </template>
    </el-dialog>
  </div>
</template>

<script setup name="ApsWorkOrderJobLog">
import { list, get, sync } from "@/api/mainPlan/workOrderJobLog";
import {ref} from "vue";
import HxlhTable from "@/components/HxlhTable/index.vue";

const { proxy } = getCurrentInstance();
const height = ref(document.documentElement.clientHeight - 270 + "px;")

const LogList = ref([]);
const open = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const createTimes=ref([]);

const data = reactive({
  form: {},
  queryParams: {
    pageCount: null,
    responseData: null,
    result: null,
    orderId: null,
    requestData: null
  },
  rules: {
  }
});
const columns = ref([
  { type: 'checkbox', width: 60, align:"center"},

  { title: '业务类型', field:'bizType', width: 150 },
  { title: '页码', field:'pageNum', width: 80 },
  { title: '请求数量', field:'pageCount', width: 80 },
  { title: '请求参数', field:'requestData' },
  { title: '请求时间', field:'createTime', width: 150 },
  { title: '更新时间', field:'updateTime', width: 150 },
  { title: '请求结果', field:'result', width: 150 },
  { title: '响应数据', field:'responseData' },
  { title: '操作', width: 100, fixed:"right", slots: { default: 'buttons' } }
])
const bizType = ref([
  {value:'work_order',label:' work_order'},
  {value:'work_order_process',label:' work_order_process'}

]);

const { queryParams, form, rules } = toRefs(data);

/** æŸ¥è¯¢å·¥å•åŒæ­¥æ—¥å¿—列表 */
function getList() {
  loading.value = true;
  queryParams.value.params = {};
  if (null != createTimes && '' !== createTimes) {
    queryParams.value.params["beginCreateTime"] = createTimes.value[0];
    queryParams.value.params["endCreateTime"] = createTimes.value[1];
  }
  list(queryParams.value).then(response => {
    LogList.value = response.rows;
    total.value = response.total;
    loading.value = false;
  });
}

// å–消按钮
function cancel() {
  open.value = false;
  reset();
}

// è¡¨å•é‡ç½®
function reset() {
  form.value = {
    id: null,
    pageNum: null,
    pageCount: null,
    responseData: null,
    result: null,
    orderId: null,
    requestData: null
  };
  proxy.resetForm("ApsWorkOrderJobLogRef");
}

/** æœç´¢æŒ‰é’®æ“ä½œ */
function handleQuery() {


  getList();
}

/** é‡ç½®æŒ‰é’®æ“ä½œ */
function resetQuery() {
  proxy.resetForm("queryRef");
  handleQuery();
}

// å¤šé€‰æ¡†é€‰ä¸­æ•°æ®
function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.id);
  single.value = selection.length != 1;
  multiple.value = !selection.length;
}

/** æ–°å¢žæŒ‰é’®æ“ä½œ */
function handleAdd() {
  reset();
  open.value = true;
  title.value = "添加工单同步日志";
}

/** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
function handleUpdate(row) {
  reset();
  const _id = row.id || ids.value

    get(_id).then(response => {
      form.value = response.data;
      open.value = true;
      title.value = "查看工单同步日志";
    });


}

/** æäº¤æŒ‰é’® */
function submitForm() {
  proxy.$refs["ApsWorkOrderJobLogRef"].validate(valid => {
    if (valid) {
      if (form.value.id != null) {
        debugger;
        if(form.value.bizType==="work_order"){
          sync(form.value).then(response => {
            proxy.$modal.msgSuccess("同步成功");
            open.value = false;
            getList();
          });
        }else {
          proxy.$modal.msgSuccess("暂未实现");
        }
      }
    }
  });
}
/** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
function handleExport() {
  proxy.download('log/ApsWorkOrderJobLog/export', {
    ...queryParams.value
  }, `ApsWorkOrderJobLog_${new Date().getTime()}.xlsx`)
}

/** åˆ é™¤æŒ‰é’®æ“ä½œ */
function handleDelete(row) {
  const _ids = row.id || ids.value;
  proxy.$modal.confirm('是否确认删除工单同步日志编号为"' + _ids + '"的数据项？').then(function() {
    return delApsWorkOrderJobLog(_ids);
  }).then(() => {
    getList();
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
}


getList();
</script>

 src/views/partPlan/index.vue

@@ -15,8 +15,7 @@
            ></el-date-picker>
          </el-form-item>
        </el-col>
        <el-col
          :span="6">
        <el-col   :span="6">
          <el-form-item label="计划完工日" style="width: 100%;">
            <el-date-picker
              v-model="daterangePlanEndDay"