（10）发货单生成后自动生成发货质检单，仓库进行检查（给仓库培训，不合格后进行不合格处理，现在后台没报检按钮

d9a58476 · 董晓奇 · 6a55618c · d9a58476 · d9a58476 · d9a58476
Commit d9a58476 authored Mar 19, 2026 by 董晓奇
5 changed files
--- a/xjrsoft-vue3/src/api/ckgl/xsck/index.ts
+++ b/xjrsoft-vue3/src/api/ckgl/xsck/index.ts
+import {
-import { MesWarehouseSaleoutPageModel, MesWarehouseSaleoutPageParams, MesWarehouseSaleoutPageResult } from './model/XsckModel';
+  MesWarehouseSaleoutPageModel,
+  MesWarehouseSaleoutPageParams,
+  MesWarehouseSaleoutPageResult,
+} from './model/XsckModel';
 import { defHttp } from '/@/utils/http/axios';
 import { ErrorMessageMode } from '/#/axios';
@@ -8,16 +11,16 @@ enum Api {
  List = '/ckgl/xsck/list',
  Info = '/ckgl/xsck/info',
  MesWarehouseSaleout = '/ckgl/xsck',
  Export = '/ckgl/xsck/export',
 }
 /**
 * @description: 查询MesWarehouseSaleout分页列表
 */
-export async function getMesWarehouseSaleoutPage(params: MesWarehouseSaleoutPageParams, mode: ErrorMessageMode = 'modal') {
+export async function getMesWarehouseSaleoutPage(
+  params: MesWarehouseSaleoutPageParams,
+  mode: ErrorMessageMode = 'modal',
+) {
  return defHttp.get<MesWarehouseSaleoutPageResult>(
    {
      url: Api.Page,
@@ -47,7 +50,10 @@ export async function getMesWarehouseSaleout(id: String, mode: ErrorMessageMode 
 /**
 * @description: 新增MesWarehouseSaleout
 */
-export async function addMesWarehouseSaleout(mesWarehouseSaleout: Recordable, mode: ErrorMessageMode = 'modal') {
+export async function addMesWarehouseSaleout(
+  mesWarehouseSaleout: Recordable,
+  mode: ErrorMessageMode = 'modal',
+) {
  return defHttp.post<boolean>(
    {
      url: Api.MesWarehouseSaleout,
@@ -62,7 +68,10 @@ export async function addMesWarehouseSaleout(mesWarehouseSaleout: Recordable, mo
 /**
 * @description: 更新MesWarehouseSaleout
 */
-export async function updateMesWarehouseSaleout(mesWarehouseSaleout: Recordable, mode: ErrorMessageMode = 'modal') {
+export async function updateMesWarehouseSaleout(
+  mesWarehouseSaleout: Recordable,
+  mode: ErrorMessageMode = 'modal',
+) {
  return defHttp.put<boolean>(
    {
      url: Api.MesWarehouseSaleout,
@@ -89,15 +98,10 @@ export async function deleteMesWarehouseSaleout(ids: string[], mode: ErrorMessag
  );
 }
 /**
 * @description: 导出MesWarehouseSaleout
 */
-export async function exportMesWarehouseSaleout(
+export async function exportMesWarehouseSaleout(params?: object, mode: ErrorMessageMode = 'modal') {
-  params?: object, 
-  mode: ErrorMessageMode = 'modal'
-) {
  return defHttp.download(
    {
      url: Api.Export,
@@ -110,5 +114,3 @@ export async function exportMesWarehouseSaleout(
    },
  );
 }
--- a/xjrsoft-vue3/src/views/ckgl/xsck/components/Form.vue
+++ b/xjrsoft-vue3/src/views/ckgl/xsck/components/Form.vue
 <template>
  <div class="pt-4">
    <SimpleForm
      ref="systemFormRef"
      :formProps="data.formDataProps"
      :formModel="state.formModel"
-      :isWorkFlow="props.fromPage!=FromPageType.MENU"
+      :isWorkFlow="props.fromPage != FromPageType.MENU"
      :isCamelCase="true"
      @model-change="handleChange"
    />
@@ -15,13 +14,22 @@
  import { reactive, ref, onMounted, nextTick, watch } from 'vue';
  import { formProps, formEventConfigs } from './config';
  import SimpleForm from '/@/components/SimpleForm/src/SimpleForm.vue';
-  import { addMesWarehouseSaleout, getMesWarehouseSaleout, updateMesWarehouseSaleout } from '/@/api/ckgl/xsck';
+  import {
+    addMesWarehouseSaleout,
+    getMesWarehouseSaleout,
+    updateMesWarehouseSaleout,
+  } from '/@/api/ckgl/xsck';
  import { cloneDeep, isString } from 'lodash-es';
  import { FormDataProps } from '/@/components/Designer/src/types';
  import { usePermission } from '/@/hooks/web/usePermission';
  import CustomButtonModal from '/@/components/Form/src/components/CustomButtonModal.vue';
  import { FromPageType } from '/@/enums/workflowEnum';
-  import { createFormEvent, getFormDataEvent, loadFormEvent, submitFormEvent,} from '/@/hooks/web/useFormEvent';
+  import {
+    createFormEvent,
+    getFormDataEvent,
+    loadFormEvent,
+    submitFormEvent,
+  } from '/@/hooks/web/useFormEvent';
  import { changeWorkFlowForm, changeSchemaDisabled } from '/@/hooks/web/useWorkFlowForm';
  import { WorkFlowFormParams } from '/@/model/workflow/bpmnConfig';
  import { useRouter } from 'vue-router';
@@ -29,7 +37,7 @@
  const { filterFormSchemaAuth } = usePermission();
  const RowKey = 'id';
-  const emits = defineEmits(['changeUploadComponentIds','loadingCompleted', 'update:value']);
+  const emits = defineEmits(['changeUploadComponentIds', 'loadingCompleted', 'update:value']);
  const props = defineProps({
    fromPage: {
      type: Number,
@@ -42,7 +50,7 @@
  });
  const state = reactive({
    formModel: {},
-    formInfo:{formId:'',formName:''}
+    formInfo: { formId: '', formName: '' },
  });
  const { currentRoute } = useRouter();
  watch(
@@ -59,17 +67,35 @@
    try {
      if (props.fromPage == FromPageType.MENU) {
        setMenuPermission();
-        if(currentRoute.value.meta){
+        if (currentRoute.value.meta) {
-          state.formInfo.formName = currentRoute.value.meta.title&&isString(currentRoute.value.meta.title)?currentRoute.value.meta.title:'';
+          state.formInfo.formName =
-          state.formInfo.formId = currentRoute.value.meta.formId&&isString(currentRoute.value.meta.formId)?currentRoute.value.meta.formId:'';
+            currentRoute.value.meta.title && isString(currentRoute.value.meta.title)
+              ? currentRoute.value.meta.title
+              : '';
+          state.formInfo.formId =
+            currentRoute.value.meta.formId && isString(currentRoute.value.meta.formId)
+              ? currentRoute.value.meta.formId
+              : '';
        }
-        await createFormEvent(formEventConfigs, state.formModel,
+        await createFormEvent(
+          formEventConfigs,
+          state.formModel,
          systemFormRef.value,
-          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：初始化表单
+          formProps.schemas,
+          true,
+          state.formInfo.formName,
+          state.formInfo.formId,
+        ); //表单事件：初始化表单
        await nextTick();
-        await loadFormEvent(formEventConfigs, state.formModel,
+        await loadFormEvent(
+          formEventConfigs,
+          state.formModel,
          systemFormRef.value,
-          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+          formProps.schemas,
+          true,
+          state.formInfo.formName,
+          state.formInfo.formId,
+        ); //表单事件：加载表单
      } else if (props.fromPage == FromPageType.FLOW) {
        emits('loadingCompleted'); //告诉系统表单已经加载完毕
        // loadingCompleted后 工作流页面直接利用Ref调用setWorkFlowForm方法
@@ -78,15 +104,28 @@
      } else if (props.fromPage == FromPageType.DESKTOP) {
        // 桌面设计 表单事件需要执行
        emits('loadingCompleted'); //告诉系统表单已经加载完毕
-        await createFormEvent(formEventConfigs, state.formModel,
+        await createFormEvent(
+          formEventConfigs,
+          state.formModel,
          systemFormRef.value,
-          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：初始化表单
+          formProps.schemas,
-        await loadFormEvent(formEventConfigs, state.formModel,
+          true,
+          state.formInfo.formName,
+          state.formInfo.formId,
+        ); //表单事件：初始化表单
+        await loadFormEvent(
+          formEventConfigs,
+          state.formModel,
          systemFormRef.value,
-          formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+          formProps.schemas,
+          true,
+          state.formInfo.formName,
+          state.formInfo.formId,
+        ); //表单事件：加载表单
      }
    } catch (error) {}
  });
  // 根据菜单页面权限，设置表单属性（必填，禁用，显示）
  function setMenuPermission() {
    data.formDataProps.schemas = filterFormSchemaAuth(data.formDataProps.schemas!);
@@ -107,19 +146,25 @@
    }
    return values;
  }
  // 根据行唯一ID查询行数据，并设置表单数据   【编辑】
  async function setFormDataFromId(rowId) {
    try {
      const record = await getMesWarehouseSaleout(rowId);
      setFieldsValue(record);
      state.formModel = record;
-      await getFormDataEvent(formEventConfigs, state.formModel,
+      await getFormDataEvent(
+        formEventConfigs,
+        state.formModel,
        systemFormRef.value,
-        formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：获取表单数据
+        formProps.schemas,
-    } catch (error) {
+        true,
+        state.formInfo.formName,
-    }
+        state.formInfo.formId,
+      ); //表单事件：获取表单数据
+    } catch (error) {}
  }
  // 辅助返回表单数据
  async function getFieldsValue() {
    let values = [];
@@ -135,45 +180,64 @@
    }
    return values;
  }
  // 辅助设置表单数据
  function setFieldsValue(record) {
    systemFormRef.value.setFieldsValue(record);
  }
  // 重置表单数据
  async function resetFields() {
    await systemFormRef.value.resetFields();
  }
  //  设置表单数据全部为Disabled  【查看】
-  async function setDisabledForm( ) {
+  async function setDisabledForm() {
    data.formDataProps.schemas = changeSchemaDisabled(cloneDeep(data.formDataProps.schemas));
  }
  // 获取行键值
  function getRowKey() {
    return RowKey;
  }
  // 更新api表单数据
  async function update({ values, rowId }) {
    try {
      values[RowKey] = rowId;
      state.formModel = values;
      let saveVal = await updateMesWarehouseSaleout(values);
-      await submitFormEvent(formEventConfigs, state.formModel,
+      await submitFormEvent(
+        formEventConfigs,
+        state.formModel,
        systemFormRef.value,
-        formProps.schemas, true,  state.formInfo.formName,state.formInfo.formId); //表单事件：提交表单
+        formProps.schemas,
+        true,
+        state.formInfo.formName,
+        state.formInfo.formId,
+      ); //表单事件：提交表单
      return saveVal;
    } catch (error) {}
  }
  // 新增api表单数据
  async function add(values) {
    try {
      state.formModel = values;
      let saveVal = await addMesWarehouseSaleout(values);
-      await submitFormEvent(formEventConfigs, state.formModel,
+      await submitFormEvent(
+        formEventConfigs,
+        state.formModel,
        systemFormRef.value,
-        formProps.schemas, true,  state.formInfo.formName,state.formInfo.formId); //表单事件：提交表单
+        formProps.schemas,
+        true,
+        state.formInfo.formName,
+        state.formInfo.formId,
+      ); //表单事件：提交表单
      return saveVal;
    } catch (error) {}
  }
  // 根据工作流页面权限，设置表单属性（必填，禁用，显示）
  async function setWorkFlowForm(obj: WorkFlowFormParams) {
    try {
@@ -189,16 +253,30 @@
      state.formModel = formModels;
      setFieldsValue(formModels);
    } catch (error) {}
-    await createFormEvent(formEventConfigs, state.formModel,
+    await createFormEvent(
+      formEventConfigs,
+      state.formModel,
      systemFormRef.value,
-      formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：初始化表单
+      formProps.schemas,
-    await loadFormEvent(formEventConfigs, state.formModel,
+      true,
+      state.formInfo.formName,
+      state.formInfo.formId,
+    ); //表单事件：初始化表单
+    await loadFormEvent(
+      formEventConfigs,
+      state.formModel,
      systemFormRef.value,
-      formProps.schemas, true, state.formInfo.formName,state.formInfo.formId); //表单事件：加载表单
+      formProps.schemas,
+      true,
+      state.formInfo.formName,
+      state.formInfo.formId,
+    ); //表单事件：加载表单
  }
  function handleChange(val) {
    emits('update:value', val);
  }
  async function sendMessageForAllIframe() {
    try {
      if (systemFormRef.value && systemFormRef.value.sendMessageForAllIframe) {
@@ -206,6 +284,7 @@
      }
    } catch (error) {}
  }
  defineExpose({
    setFieldsValue,
    resetFields,
@@ -218,8 +297,6 @@
    setWorkFlowForm,
    getRowKey,
    getFieldsValue,
-    sendMessageForAllIframe
+    sendMessageForAllIframe,
  });
 </script>
\ No newline at end of file
--- a/xjrsoft-vue3/src/views/ckgl/xsck/components/XsckModal.vue
+++ b/xjrsoft-vue3/src/views/ckgl/xsck/components/XsckModal.vue
 <template>
  <BasicModal
    :height="1080"
-     v-bind="$attrs" @register="registerModal" :title="getTitle"
+    v-bind="$attrs"
-      @ok="handleSubmit" @cancel="handleClose"  >
+    @register="registerModal"
+    :title="getTitle"
+    @ok="handleSubmit"
+    @cancel="handleClose"
+  >
    <ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" />
-      <template #footer v-if=" !state.isView">
+    <template #footer v-if="!state.isView">
      <template v-for="(item, index) in sortBy(formButtons, 'index')" :key="item.key">
        <template v-if="item.isShow">
          <CustomButtonModal v-if="item.type == CustomButtonModalType.Modal" :info="item" />
@@ -23,7 +24,6 @@
      </template>
    </template>
  </BasicModal>
 </template>
 <script lang="ts" setup>
  import { ref, computed, reactive, provide, Ref } from 'vue';
@@ -33,7 +33,7 @@
  import CustomButtonModal from '/@/components/Form/src/components/CustomButtonModal.vue';
  import { useMessage } from '/@/hooks/web/useMessage';
  import { useI18n } from '/@/hooks/web/useI18n';
-  import { formProps ,formButtons } from './config';
+  import { formProps, formButtons } from './config';
  import ModalForm from './Form.vue';
  import { FromPageType } from '/@/enums/workflowEnum';
@@ -44,7 +44,7 @@
  const { notification } = useMessage();
  const formRef = ref();
-  const isCopy = ref<boolean>(false)
+  const isCopy = ref<boolean>(false);
  const state = reactive({
    formModel: {},
    isUpdate: true,
@@ -58,10 +58,11 @@
    await handleInner(data);
  });
-  const getTitle = computed(() => (state.isView ? '查看' : state.isUpdate ? '编辑' : isCopy.value ? '复制数据' : '新增'));
+  const getTitle = computed(() =>
+    state.isView ? '查看' : state.isUpdate ? '编辑' : isCopy.value ? '复制数据' : '新增',
+  );
-  async function handleInner(data){
+  async function handleInner(data) {
    state.isUpdate = !!data?.isUpdate;
    state.isView = !!data?.isView;
    isCopy.value = !!data?.isCopy;
@@ -73,7 +74,8 @@
      showOkBtn: false,
      canFullscreen: true,
      width: 1980,
-      footer: state.isView ? null : undefined,defaultFullscreen:true,
+      footer: state.isView ? null : undefined,
+      defaultFullscreen: true,
    });
    if (state.isUpdate || state.isView || isCopy.value) {
@@ -85,10 +87,9 @@
      await formRef.value.setFormDataFromId(state.rowId);
    } else {
      formRef.value.resetFields();
    }
  }
  async function saveModal() {
    let saveSuccess = false;
    try {
@@ -140,15 +141,14 @@
        emit('success');
      }
    } finally {
      setModalProps({ confirmLoading: false });
    }
  }
  function customClick(item) {
    if (item.key == 'confirm') {
      handleSubmit();
-    } else if (item.key == 'cancel' && props.formType !== 'normal') {
+    } else if (item.key == 'cancel') {
      handleClose();
      closeModal();
    } else if (item.key == 'reset') {
@@ -157,10 +157,8 @@
      executeCurFormEvent(item.event, state.formModel, true);
    }
  }
  function handleClose() {
    formRef.value.resetFields();
  }
 </script>
\ No newline at end of file
--- a/xjrsoft-vue3/src/views/ckgl/xsck/components/config.ts
+++ b/xjrsoft-vue3/src/views/ckgl/xsck/components/config.ts
@@ -329,6 +329,21 @@ export const columns: BasicColumn[] = [
    styleConfig: undefined,
    listStyle: '',
  },
+  {
+    resizable: true,
+    dataIndex: 'p30',
+    title: '推质检状态',
+    componentType: 'select',
+    fixed: false,
+    sorter: true,
+    styleConfig: undefined,
+    listStyle: '', // 保持空字符串，避免进入 listStyle 分支
+    customRender: ({ text }) => {
+      const map = { 0: '未推送', 1: '已推送' };
+      return map[text] !== undefined ? map[text] : text;
+    },
+  },
 ];
 //表头合并配置
 export const headerMergingData = [];

--- a/xjrsoft-vue3/src/views/ckgl/xsck/index.vue
+++ b/xjrsoft-vue3/src/views/ckgl/xsck/index.vue