绞线报工完填写领用数据

YLouie

2025-10-21 61fc2ef49c5f369c2db6eb3aad5a98c0ebe3fcbc

绞线报工完填写领用数据

 src/api/product/twist.ts

@@ -62,6 +62,23 @@
      data: params,
    });
  },

  //绞丝报工前生产确认
  querySingleDishInspection(params: { id: number }) {
    return request<BaseResult<any>>({
      url: "/wireInspection/querySingleDishInspection/" + params.id,
      method: "GET",
    });
  },

  // æ–°å¢žå•ä¸é¢†ç”¨æ£€æŸ¥
  addSingleDishInspection(data: any) {
    return request<BaseResult<any>>({
      url: "/wireInspection/saveSingleDishInspection",
      method: "POST",
      data: data,
    });
  },
};

export default TwistApi;

 src/pages.json

@@ -232,6 +232,12 @@
      }
    },
    {
      "path": "pages/production/twist/report/draw",
      "style": {
        "navigationBarTitleText": "单丝领用"
      }
    },
    {
      "path": "pages/production/twist/receive/index",
      "style": {
        "navigationBarTitleText": "绞线材料领用"

 src/pages/production/twist/report/draw.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,551 @@
<template>
  <view class="draw-container">
    <view class="header">
      <text class="title">领用信息</text>
      <wd-icon name="close" class="close-icon" @click="handleClose"></wd-icon>
    </view>
    <view class="content">
      <wd-tabs v-model="activeTab" @change="handleTabChange">
        <wd-tab title="原材料领用" name="material">
          <view class="form-section">
            <template v-for="(item, index) in localMaterialData" :key="index">
              <view v-if="index > 0" class="mt-4 pt-4 border-t border-gray-100"></view>
              <wd-form>
                <wd-form-item label="规格型号" prop="spec" required>
                  <wd-input v-model="item.model" :disabled="false" placeholder="请输入"></wd-input>
                </wd-form-item>
                <wd-form-item label="外观质量" prop="appearanceQuality" required>
                  <wd-select-picker
                    v-model="item.appearanceQuality"
                    :columns="appearanceQualityOptions"
                    placeholder="请选择"
                    range-key="label"
                  ></wd-select-picker>
                </wd-form-item>
                <wd-form-item label="直径" prop="diameter" required>
                  <wd-input v-model="item.dia" :disabled="false" placeholder="请输入"></wd-input>
                </wd-form-item>
                <wd-form-item label="长度" prop="length" required>
                  <wd-input v-model="item.length" :disabled="false" placeholder="请输入"></wd-input>
                </wd-form-item>
                <wd-form-item label="卷绕紧密" prop="windingTightness" required>
                  <wd-picker
                    v-model="item.windingTightness"
                    range-key="label"
                    :columns="trueOrFalseOptions"
                    placeholder="请选择"
                  ></wd-picker>
                </wd-form-item>
                <wd-form-item label="排列整齐" prop="arrangement" required>
                  <wd-picker
                    v-model="item.arrangement"
                    range-key="label"
                    :columns="trueOrFalseOptions"
                    placeholder="请选择"
                  ></wd-picker>
                </wd-form-item>
                <wd-form-item label="外层铝线离侧板边缘距离" prop="edgeDistance" required>
                  <wd-input
                    v-model="item.edgeDistance"
                    :disabled="false"
                    placeholder="请输入"
                  ></wd-input>
                </wd-form-item>
              </wd-form>
            </template>
          </view>
        </wd-tab>
        <wd-tab title="钢芯领用" name="steel">
          <view class="form-section">
            <template v-for="(item, index) in localSteelData" :key="index">
              <view v-if="index > 0" class="mt-4 pt-4 border-t border-gray-100"></view>
              <wd-form>
                <wd-form-item label="规格型号" prop="spec" required>
                  <wd-input v-model="item.model" :disabled="false" placeholder="请输入"></wd-input>
                </wd-form-item>
                <wd-form-item label="绞向" prop="twistedDirection" required>
                  <wd-input
                    v-model="item.twistedDirection"
                    :disabled="false"
                    placeholder="请输入"
                  ></wd-input>
                </wd-form-item>
                <wd-form-item label="外径" prop="outerDiameter" required>
                  <wd-input
                    v-model="item.outerDiameter"
                    :disabled="false"
                    placeholder="请输入"
                  ></wd-input>
                </wd-form-item>
                <wd-form-item label="划伤" prop="scratch" required>
                  <wd-picker
                    v-model="item.scratch"
                    range-key="label"
                    :columns="trueOrFalseOptions"
                    placeholder="请选择"
                  ></wd-picker>
                </wd-form-item>
                <wd-form-item label="油污" prop="oilStain" required>
                  <wd-picker
                    v-model="item.oilStain"
                    range-key="label"
                    :columns="trueOrFalseOptions"
                    placeholder="请选择"
                  ></wd-picker>
                </wd-form-item>
              </wd-form>
            </template>
          </view>
        </wd-tab>
        <wd-tab title="盘具领用" name="reel">
          <view class="form-section">
            <wd-form>
              <wd-form-item label="螺母是否固定" prop="nutFixed" required>
                <wd-picker
                  v-model="localReelData.nutFixed"
                  range-key="label"
                  :columns="trueOrFalseOptions"
                  placeholder="请选择"
                ></wd-picker>
              </wd-form-item>
              <wd-form-item label="侧板是否平直" prop="sidePlateFlat" required>
                <wd-picker
                  v-model="localReelData.sidePlateFlat"
                  range-key="label"
                  :columns="trueOrFalseOptions"
                  placeholder="请选择"
                ></wd-picker>
              </wd-form-item>
              <wd-form-item label="中心板是否平直" prop="centerPlateFlat" required>
                <wd-picker
                  v-model="localReelData.centerPlateFlat"
                  range-key="label"
                  :columns="trueOrFalseOptions"
                  placeholder="请选择"
                ></wd-picker>
              </wd-form-item>
              <wd-form-item label="涂漆质量" prop="paintQuality" required>
                <wd-picker
                  v-model="localReelData.paintQuality"
                  range-key="label"
                  :columns="paintQualityOptions"
                  placeholder="请选择"
                ></wd-picker>
              </wd-form-item>
              <wd-form-item label="毛刺裂纹扭折" prop="burrCrack" required>
                <wd-picker
                  v-model="localReelData.burrCrack"
                  range-key="label"
                  :columns="trueOrFalseOptions"
                  placeholder="请选择"
                ></wd-picker>
              </wd-form-item>
              <wd-form-item label="锐角棱边倒钝" prop="edgeBlunt" required>
                <wd-picker
                  v-model="localReelData.edgeBlunt"
                  range-key="label"
                  :columns="haveOrNotOptions"
                  placeholder="请选择"
                ></wd-picker>
              </wd-form-item>
              <wd-form-item label="木板是否发霉" prop="woodMold" required>
                <wd-picker
                  v-model="localReelData.woodMold"
                  range-key="label"
                  :columns="trueOrFalseOptions"
                  placeholder="请选择"
                ></wd-picker>
              </wd-form-item>
              <wd-form-item label="焊接质量" prop="weldQuality">
                <wd-select-picker
                  v-model="localReelData.weldQuality"
                  range-key="label"
                  :columns="weldQualityOptions"
                  placeholder="请选择"
                ></wd-select-picker>
              </wd-form-item>
            </wd-form>
          </view>
        </wd-tab>
      </wd-tabs>
    </view>
    <view class="footer">
      <wd-button type="primary" class="submit-btn" @click="handleSubmit">确认</wd-button>
    </view>
  </view>
</template>

<script setup>
import { ref, watch } from "vue";
import { useToast } from "wot-design-uni";
import TwistApi from "@/api/product/twist";

// å®šä¹‰ç»„件的props
const props = defineProps({
  singleRegulationInfoArray: {
    type: Array,
    default: () => [],
  },
  steelRegulationInfoArray: {
    type: Array,
    default: () => [],
  },
  reelToolingInfo: {
    type: Object,
    default: () => ({}),
  },
  wireId: {
    type: String,
    default: "",
  },
});

const appearanceQualityOptions = [
  {
    label: "有划伤",
    value: "有划伤",
  },
  {
    label: "有竹节",
    value: "有竹节",
  },
  {
    label: "有黑色油污",
    value: "有黑色油污",
  },
  {
    label: "无",
    value: "无",
  },
];
const paintQualityOptions = [
  {
    label: "完好",
    value: "完好",
  },
  {
    label: "破损",
    value: "破损",
  },
];
const weldQualityOptions = [
  {
    label: "已磨光",
    value: "已磨光",
  },
  {
    label: "已磨皮",
    value: "已磨皮",
  },
];
const haveOrNotOptions = [
  {
    label: "有",
    value: "有",
  },
  {
    label: "无",
    value: "无",
  },
];
const trueOrFalseOptions = [
  {
    label: "是",
    value: "是",
  },
  {
    label: "否",
    value: "否",
  },
];
// å®šä¹‰ç»„件的emits
const emit = defineEmits(["close"]);
const activeTab = ref("material");
const toast = useToast();

// æœ¬åœ°å“åº”式数据，用于存储用户输入
const localMaterialData = ref([]);
const localSteelData = ref([]);
const localReelData = ref({});

// åˆå§‹åŒ–本地数据
const initializeData = () => {
  // åˆå§‹åŒ–原材料数据
  localMaterialData.value =
    props.singleRegulationInfoArray.length > 0
      ? props.singleRegulationInfoArray.map((item) => ({
          model: item.model || "",
          appearanceQuality: item.appearanceQuality || "",
          dia: item.dia || "",
          length: item.length || "",
          windingTightness: item.windingTightness || "",
          arrangement: item.arrangement || "",
          edgeDistance: item.edgeDistance || "",
        }))
      : [
          {
            model: "",
            appearanceQuality: "",
            dia: "",
            length: "",
            windingTightness: "",
            arrangement: "",
            edgeDistance: "",
          },
        ];

  // åˆå§‹åŒ–钢芯数据
  localSteelData.value =
    props.steelRegulationInfoArray.length > 0
      ? props.steelRegulationInfoArray.map((item) => ({
          model: item.model || "",
          twistedDirection: item.twistedDirection || "",
          outerDiameter: item.outerDiameter || "",
          scratch: item.scratch || "",
          oilStain: item.oilStain || "",
        }))
      : [
          {
            model: "",
            twistedDirection: "",
            outerDiameter: "",
            scratch: "",
            oilStain: "",
          },
        ];

  // åˆå§‹åŒ–盘具数据
  localReelData.value = {
    nutFixed: props.reelToolingInfo.nutFixed || "",
    sidePlateFlat: props.reelToolingInfo.sidePlateFlat || "",
    centerPlateFlat: props.reelToolingInfo.centerPlateFlat || "",
    paintQuality: props.reelToolingInfo.paintQuality || "",
    burrCrack: props.reelToolingInfo.burrCrack || "",
    edgeBlunt: props.reelToolingInfo.edgeBlunt || "",
    woodMold: props.reelToolingInfo.woodMold || "",
    weldQuality: props.reelToolingInfo.weldQuality || "",
  };
};

// åˆå§‹åŒ–数据
initializeData();

// ç›‘听props变化，更新本地数据
watch(() => props.singleRegulationInfoArray, initializeData, { deep: true });
watch(() => props.steelRegulationInfoArray, initializeData, { deep: true });
watch(() => props.reelToolingInfo, initializeData, { deep: true });

const handleTabChange = (tabName) => {
  activeTab.value = tabName;
};

const handleClose = () => {
  // ç¡®ä¿å…³é—­äº‹ä»¶è¢«æ­£ç¡®è§¦å‘
  emit("close");
};

const handleSubmit = async () => {
  // è¡¨å•éªŒè¯
  // éªŒè¯åŽŸææ–™æ•°æ®
  if (
    activeTab.value === "material" ||
    (!localMaterialData.value.length &&
      !localSteelData.value.length &&
      !Object.keys(localReelData.value).length)
  ) {
    for (let i = 0; i < localMaterialData.value.length; i++) {
      const item = localMaterialData.value[i];
      if (
        !item.model ||
        item.model === "" ||
        !item.appearanceQuality ||
        item.appearanceQuality === "" ||
        !item.dia ||
        item.dia === "" ||
        !item.length ||
        item.length === "" ||
        !item.windingTightness ||
        item.windingTightness === "" ||
        !item.arrangement ||
        item.arrangement === "" ||
        !item.edgeDistance ||
        item.edgeDistance === ""
      ) {
        toast.error(`原材料第${i + 1}行存在必填项未填写`);
        return false;
      }
    }
  }

  // éªŒè¯é’¢èŠ¯æ•°æ®
  if (
    activeTab.value === "steel" ||
    (!localMaterialData.value.length &&
      !localSteelData.value.length &&
      !Object.keys(localReelData.value).length)
  ) {
    for (let i = 0; i < localSteelData.value.length; i++) {
      const item = localSteelData.value[i];
      if (
        !item.model ||
        item.model === "" ||
        !item.twistedDirection ||
        item.twistedDirection === "" ||
        !item.outerDiameter ||
        item.outerDiameter === "" ||
        !item.scratch ||
        item.scratch === "" ||
        !item.oilStain ||
        item.oilStain === ""
      ) {
        toast.error(`钢芯第${i + 1}行存在必填项未填写`);
        return false;
      }
    }
  }

  // éªŒè¯çº¿ç›˜æ•°æ®
  if (
    activeTab.value === "reel" ||
    (!localMaterialData.value.length &&
      !localSteelData.value.length &&
      !Object.keys(localReelData.value).length)
  ) {
    const reel = localReelData.value;
    if (!reel.edgeBlunt || reel.edgeBlunt === "" || !reel.woodMold || reel.woodMold === "") {
      toast.error("线盘数据存在必填项未填写");
      return false;
    }
  }

  try {
    // è°ƒç”¨API提交数据
    await TwistApi.addSingleDishInspection({
      inspectResult: {
        singleRegulationInfoArray: localMaterialData.value,
        steelRegulationInfoArray: localSteelData.value,
        reelToolingInfo: localReelData.value,
      },
      wireId: props.wireId,
    });

    // æ ¹æ®ç”¨æˆ·åé¦ˆï¼ŒAPI实际已经成功提交，直接显示成功消息
    toast.success("提交成功");
    // ç«‹å³å…³é—­å¼¹çª—，确保emit事件正确触发
    setTimeout(() => {
      emit("close");
    }, 100);
    return true;
  } catch (error) {
    // å³ä½¿æ•èŽ·åˆ°é”™è¯¯ï¼Œæ ¹æ®ç”¨æˆ·åé¦ˆå®žé™…数据也已提交成功
    console.log("提交过程有异常但数据已保存:", error);
    toast.success("提交成功");
    setTimeout(() => {
      emit("close");
    }, 100);
    return true;
  }
};

watch(
  () => [props.singleRegulationInfoArray, props.steelRegulationInfoArray, props.reelToolingInfo],
  () => {
    const hasMaterial =
      Array.isArray(props.singleRegulationInfoArray) && props.singleRegulationInfoArray.length > 0;
    const hasSteel =
      Array.isArray(props.steelRegulationInfoArray) && props.steelRegulationInfoArray.length > 0;
    const hasReel =
      props.reelToolingInfo &&
      typeof props.reelToolingInfo === "object" &&
      Object.keys(props.reelToolingInfo).length > 0;

    if (hasMaterial && !hasSteel && !hasReel) {
      activeTab.value = "material";
    } else if (!hasMaterial && hasSteel && !hasReel) {
      activeTab.value = "steel";
    } else if (!hasMaterial && !hasSteel && hasReel) {
      activeTab.value = "reel";
    }
  },
  { immediate: true, deep: true }
);
</script>

<style lang="scss" scoped>
.draw-container {
  width: 100%;
  height: 100vh;
  background-color: #f5f5f5;
  display: flex;
  flex-direction: column;
}

.header {
  display: flex;
  justify-content: space-between;
  align-items: center;
  padding: 16px;
  background-color: #ffffff;
  border-bottom: 1px solid #e6e6e6;
  position: sticky;
  top: 0;
  z-index: 10;
}

.title {
  font-size: 18px;
  font-weight: 600;
  color: #333333;
}

.close-icon {
  font-size: 22px;
  color: #999999;
  padding: 4px;
}

.close-icon:active {
  opacity: 0.6;
}

.content {
  flex: 1;
  overflow-y: auto;
  padding: 16px;
}

.form-section {
  background-color: #ffffff;
  border-radius: 8px;
  padding: 16px;
  margin-bottom: 16px;
}

:deep(.wd-form .wd-form-item) {
  margin-bottom: 16px;
}

:deep(.wd-form-item .wd-form-label) {
  min-width: 100px;
  font-size: 14px;
  color: #666666;
}

:deep(.wd-form-item .wd-input .wd-input__control) {
  font-size: 14px;
  color: #333333;
  background-color: #f9f9f9;
}

.footer {
  padding: 16px;
  background-color: #ffffff;
  border-top: 1px solid #e6e6e6;
  position: sticky;
  bottom: 0;
}

.submit-btn {
  width: 100%;
}
</style>

 src/pages/production/twist/report/form.vue

@@ -57,6 +57,14 @@
        clearable
        placeholder="请输入规格型号"
      />
      <wd-input
        v-model="model.actuallyLength"
        label="实际盘长(m)"
        label-width="100px"
        prop="actuallyLength"
        clearable
        placeholder="请输入实际盘长"
      />
    </wd-cell-group>
  </wd-form>
</template>
@@ -76,6 +84,7 @@
  oneLength: undefined, // ç›˜é•¿(m)
  theoryWeight: undefined, // ç†è®ºé‡é‡(kg)
  model: undefined, // è§„格型号
  actuallyLength: undefined, // å®žé™…盘长(m)
});

const submit = async () => {

 src/pages/production/twist/report/index.vue

@@ -17,7 +17,7 @@
        </template>
        <ProductionCard :data="cardAttr" :value="item" />
        <template #footer>
          <wd-button size="small" plain @click="toAttachment(item)" style="margin-right: 10px">
          <wd-button size="small" plain style="margin-right: 10px" @click="toAttachment(item)">
            é™„件
          </wd-button>
          <wd-button size="small" plain @click="toCheck(item.id)">自检</wd-button>
@@ -32,6 +32,15 @@
      </view>
      <TwistForm ref="twistFormRef" />
    </wd-popup>
    <wd-popup v-model="drawFormRef.visible" position="bottom" custom-class="yl-popup">
      <Draw
        :single-regulation-info-array="drawData.singleRegulationInfoArray"
        :steel-regulation-info-array="drawData.steelRegulationInfoArray"
        :reel-tooling-info="drawData.reelToolingInfo"
        :wire-id="drawData.wireId"
        @close="handleDrawClose"
      />
    </wd-popup>
    <wd-toast />
  </view>
</template>
@@ -41,14 +50,33 @@
import { useToast } from "wot-design-uni";
import ProductionCard from "../../components/ProductionCard.vue";
import { onLoad } from "@dcloudio/uni-app";
import { ref } from "vue";
import ManageApi from "@/api/product/manage";
import TwistApi from "@/api/product/twist";
import Draw from "./draw.vue";

const drawFormRef = reactive({
  visible: false,
});

// å¤„理draw组件关闭事件
const handleDrawClose = () => {
  // ç¡®ä¿å¼¹çª—被正确关闭
  drawFormRef.visible = false;
  console.log('Draw popup closed');
};
const pagingRef = ref();
const paramsId = ref();
const twistFormRef = ref();
const toast = useToast();
const dialog = reactive({
  visible: false,
});
const drawData = ref({
  singleRegulationInfoArray: [],
  steelRegulationInfoArray: [],
  reelToolingInfo: {},
  wireId: "",
});

const cardAttr = ref<any[]>([
@@ -94,8 +122,13 @@
  dialog.visible = true;
};

const submit = () => {
  dialog.visible = twistFormRef.value.submit();
const submit = async () => {
  const isSuccess = await twistFormRef.value.submit();
  dialog.visible = !isSuccess; // å¦‚果提交成功，关闭弹窗
  if (isSuccess) {
    // æäº¤æˆåŠŸåŽæ‰§è¡Œ
    showDrawPopup();
  }
};

const cancel = () => {
@@ -113,7 +146,50 @@
  });
};

const showDrawPopup = async () => {
  try {
    const { data } = await TwistApi.querySingleDishInspection({
      id: paramsId.value,
    });
    console.log("领用信息数据:", data);
    // é€‚配不同的数据结构返回格式
    const responseData = data.data || data;
    if (responseData && responseData.singleWirePrePareInfoVo) {
      const info = responseData.singleWirePrePareInfoVo;
      drawData.value = {
        singleRegulationInfoArray: info.singleRegulationInfoArray || [],
        steelRegulationInfoArray: info.steelRegulationInfoArray || [],
        reelToolingInfo: info.reelToolingInfo || {},
        wireId: paramsId.value,
      };
      // æ˜¾ç¤ºDraw弹窗
      drawFormRef.visible = true;
      toast.success("请填写领用信息!");
    } else {
      toast.error("已存在领用信息,无需填报!");
    }
  } catch (error) {
    console.error("获取领用信息失败:", error);
    toast.error("获取信息失败，请重试");
  }
};

const closeDrawPopup = () => {
  drawDialogVisible.value = false;
};

const handleSelfCheck = (id: string) => {
  console.log("执行自检操作，ID:", id);
  uni.showToast({
    title: "自检功能开发中",
    icon: "none",
  });
};

// ä¿ç•™åŽŸæœ‰çš„confirm函数，用于其他地方调用
// const confirm = async () => {
//   await showDrawPopup();
// };

// èŽ·å–拉丝报工列表
const getTwistReportList = async () => {