3.24功能新增

pengwei

2025-03-24 f90fbbc76d23340e4568dd4dadbab5f7f02a030f

 ÏîÄ¿´úÂë/client/src/views/tts/CraftCenter/Craftcenter.vue

@@ -34,11 +34,13 @@
              <span>此为任务作用中电气的的详情步骤工艺。</span>
              <div style="display: flex; margin-top: 0.81rem">
                <span style="margin-right: 1.25rem"
                  >步骤：{{ electric ? electric[0].maxNodal : "0" }}</span
                  >步骤：{{
                    electric.length != 0 ? electric[0].maxNodal : "0"
                  }}</span
                >
                <span
                  >套筒数量：{{
                    electric ? electric[0].sumTorqueSum : "0"
                    electric != 0 ? electric[0].sumTorqueSum : "0"
                  }}</span
                >
              </div>
@@ -104,11 +106,13 @@
              <span>此为任务作用中机械的的详情步骤工艺。</span>
              <div style="display: flex; margin-top: 0.81rem">
                <span style="margin-right: 1.25rem"
                  >步骤：{{ mechanical ? mechanical[0].maxNodal : "0" }}</span
                  >步骤：{{
                    mechanical != 0 ? mechanical[0].maxNodal : "0"
                  }}</span
                >
                <span
                  >套筒数量：{{
                    mechanical ? mechanical[0].sumTorqueSum : "0"
                    mechanical.length != 0 ? mechanical[0].sumTorqueSum : "0"
                  }}</span
                >
              </div>
@@ -174,10 +178,14 @@
              <span>此为任务作用中地沟的的详情步骤工艺。</span>
              <div style="display: flex; margin-top: 0.81rem">
                <span style="margin-right: 1.25rem"
                  >步骤：{{ trench ? trench[0].maxNodal : "0" }}</span
                  >步骤：{{
                    trench.length != 0 ? trench[0].maxNodal : "0"
                  }}</span
                >
                <span
                  >套筒数量：{{ trench ? trench[0].sumTorqueSum : "0" }}</span
                  >套筒数量：{{
                    trench.length != 0 ? trench[0].sumTorqueSum : "0"
                  }}</span
                >
              </div>
            </div>
@@ -234,6 +242,7 @@
          </el-icon>
        </div>
      </template>

      <div>
        <div class="head">
          <div class="serch">
@@ -304,6 +313,7 @@
          >
        </div>
        <el-table
          empty-text="暂无数据"
          style="margin-top: 1.13rem"
          :data="gridData"
          height="430"
@@ -383,70 +393,72 @@
          </h4>
        </div>
      </template>
      <el-form
        :model="form"
        label-width="auto"
        label-position="top"
        :rules="rules"
        ref="ruleFormRef"
      >
        <el-row :gutter="10">
          <el-col :span="8"
            ><el-form-item prop="nodal">
              <template #label>
                <span style="font-size: 0.88rem; color: black">序号</span>
              </template>
              <el-input
                size="small"
                v-model.number="form.nodal"
                placeholder="请输入"
                style="height: 2rem"
              /> </el-form-item
          ></el-col>
      <el-scrollbar height="44rem">
        <el-form
          :model="form"
          label-width="auto"
          label-position="top"
          :rules="rules"
          ref="ruleFormRef"
        >
          <el-row :gutter="10">
            <el-col :span="8"
              ><el-form-item prop="nodal">
                <template #label>
                  <span style="font-size: 0.88rem; color: black">序号</span>
                </template>
                <el-input
                  size="small"
                  v-model.number="form.nodal"
                  placeholder="请输入"
                  style="height: 2rem"
                /> </el-form-item
            ></el-col>

          <el-col :span="8"
            ><el-form-item prop="setpNum">
              <template #label>
                <span style="font-size: 0.88rem; color: black">排序</span>
              </template>
              <el-input
                size="small"
                v-model.number="form.setpNum"
                placeholder="请输入"
                style="height: 2rem"
              /> </el-form-item
          ></el-col>
          <el-col :span="8"
            ><el-form-item prop="DeviceCode">
              <template #label>
                <span style="font-size: 0.88rem; color: black">物料</span>
              </template>
              <el-input
                v-model="form.material"
                style="height: 2rem"
                placeholder="请输入"
              /> </el-form-item
          ></el-col>
        </el-row>
        <el-row :gutter="10">
          <el-col
            ><el-form-item prop="craftsStep">
              <template #label>
                <span style="font-size: 0.88rem; color: black"
                  >工艺顶点/步骤</span
                >
              </template>
              <el-input
                size="small"
                v-model="form.craftsStep"
                placeholder="请输入"
                style="height: 2rem"
              /> </el-form-item
          ></el-col>
        </el-row>
            <el-col :span="8"
              ><el-form-item prop="setpNum">
                <template #label>
                  <span style="font-size: 0.88rem; color: black">排序</span>
                </template>
                <el-input
                  size="small"
                  v-model.number="form.setpNum"
                  placeholder="请输入"
                  style="height: 2rem"
                /> </el-form-item
            ></el-col>
            <el-col :span="8"
              ><el-form-item prop="DeviceCode">
                <template #label>
                  <span style="font-size: 0.88rem; color: black">物料</span>
                </template>
                <el-input
                  v-model="form.material"
                  style="height: 2rem"
                  placeholder="请输入"
                /> </el-form-item
            ></el-col>
          </el-row>

        <el-row :gutter="10">
          <!-- <el-col :span="8"
          <el-row :gutter="10">
            <el-col
              ><el-form-item prop="craftsStep">
                <template #label>
                  <span style="font-size: 0.88rem; color: black"
                    >工艺顶点/步骤</span
                  >
                </template>
                <el-input
                  size="small"
                  v-model="form.craftsStep"
                  placeholder="请输入"
                  style="height: 2rem"
                /> </el-form-item
            ></el-col>
          </el-row>

          <el-row :gutter="10">
            <!-- <el-col :span="8"
            ><el-form-item prop="isinvolved">
              <template #label>
                <span style="font-size: 0.88rem; color: black">是否涉及</span>
@@ -465,32 +477,105 @@
                />
              </el-select> </el-form-item
          ></el-col> -->
          <el-col :span="16"
            ><el-form-item prop="tools">
              <template #label>
                <div style="display: flex; align-items: center">
                  <span style="font-size: 0.88rem; color: black">工具</span>
                </div>
              </template>
              <el-select
                v-model="tools"
                placeholder="请选择"
                multiple
                filterable
                :remote-method="GJremoteMethod"
                :loading="GJloading"
                size="small"
                value-key="id"
              >
                <el-option
                  v-for="item in GJoptions"
                  :key="item.id"
                  :label="item.toolName"
                  :value="item"
                /> </el-select></el-form-item
          ></el-col>
        </el-row>
        <!-- <el-row>
            <el-col :span="8"
              ><el-form-item prop="tools">
                <template #label>
                  <div style="display: flex; align-items: center">
                    <span style="font-size: 0.88rem; color: black">工具</span>
                  </div>
                </template>
                <el-select
                  style="height: 2rem"
                  v-model="tools"
                  placeholder="请选择"
                  multiple
                  filterable
                  :remote-method="GJremoteMethod"
                  :loading="GJloading"
                  size="small"
                  value-key="id"
                >
                  <el-option
                    v-for="item in GJoptions"
                    :key="item.id"
                    :label="item.toolName"
                    :value="item"
                  /> </el-select></el-form-item
            ></el-col>

            <el-col :span="4"
              ><el-form-item prop="tools">
                <template #label>
                  <div style="display: flex; align-items: center">
                    <span style="font-size: 0.88rem; color: black"
                      >第一次扭力的值</span
                    >
                  </div>
                </template>
                <el-input
                  size="small"
                  v-model="form.torqueOne"
                  placeholder="请输入"
                  style="height: 2rem"
                >
                  <template #suffix>
                    <span style="font-size: 0.88rem; color: black">N*m</span>
                  </template>
                </el-input>
              </el-form-item></el-col
            >

            <el-col :span="4"
              ><el-form-item prop="tools">
                <template #label>
                  <div style="display: flex; align-items: center">
                    <span style="font-size: 0.88rem; color: black">数量</span>
                  </div>
                </template>
                <el-input
                  size="small"
                  v-model="form.torqueOneQuantity"
                  placeholder="请输入"
                  style="height: 2rem" /></el-form-item
            ></el-col>

            <el-col :span="4"
              ><el-form-item prop="tools">
                <template #label>
                  <div style="display: flex; align-items: center">
                    <span style="font-size: 0.88rem; color: black"
                      >第二次扭力的值</span
                    >
                  </div>
                </template>
                <el-input
                  size="small"
                  v-model="form.torqueTwo"
                  placeholder="请输入"
                  style="height: 2rem"
                >
                  <template #suffix>
                    <span style="font-size: 0.88rem; color: black">N*m</span>
                  </template>
                </el-input></el-form-item
              ></el-col
            >

            <el-col :span="4"
              ><el-form-item prop="tools">
                <template #label>
                  <div style="display: flex; align-items: center">
                    <span style="font-size: 0.88rem; color: black">数量</span>
                  </div>
                </template>
                <el-input
                  size="small"
                  v-model="form.torqueTwoQuantity"
                  placeholder="请输入"
                  style="height: 2rem" /></el-form-item
            ></el-col>
          </el-row>
          <!-- <el-row>
          <el-form-item prop="Unit">
            <template #label
              ><span style="font-size: 0.88rem; color: black"
@@ -539,68 +624,72 @@
            </el-upload>
          </el-form-item>
        </el-row> -->
        <el-row>
          <h4
            style="
              color: rgba(16, 16, 16, 1);
              font-size: 1.13rem;
              font-weight: bold;
            "
          >
            å·¥è‰ºå†…容
          </h4>
        </el-row>
        <el-row>
          <el-col>
            <el-form-item prop="craftContent">
              <template #label>
                <span style="font-size: 0.88rem; color: black">内容描述</span>
              </template>
              <el-input
                type="textarea"
                :rows="3"
                v-model="form.craftContent"
                placeholder="请输入"
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-form-item prop="checkList">
            <template #label>
              <div style="display: flex; align-items: center">
                <span style="font-size: 0.88rem; color: black">选择套筒</span>
              </div>
            </template>
            <div
          <el-row>
            <h4
              style="
                display: flex;
                justify-content: space-between;
                width: 32.5rem;
                height: 25rem;
                color: rgba(16, 16, 16, 1);
                font-size: 1.13rem;
                font-weight: bold;
              "
            >
              <div style="width: 50%; height: 100%; background: #f5f5f5">
                <div
                  style="
                    padding: 0.88rem 0.88rem 0 0.88rem;
                    box-sizing: border-box;
                  "
                >
                  <el-input
              å·¥è‰ºå†…容
            </h4>
          </el-row>
          <el-row>
            <el-col>
              <el-form-item prop="craftContent">
                <template #label>
                  <span style="font-size: 0.88rem; color: black">内容描述</span>
                </template>
                <el-input
                  type="textarea"
                  :rows="3"
                  v-model="form.craftContent"
                  placeholder="请输入"
                />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-form-item prop="checkList">
              <template #label>
                <div style="display: flex; align-items: center">
                  <span style="font-size: 0.88rem; color: black">选择套筒</span>
                </div>
              </template>
              <div
                style="
                  display: flex;
                  justify-content: space-between;
                  width: 32.5rem;
                  height: 25rem;
                "
              >
                <div style="width: 50%; height: 100%; background: #f5f5f5">
                  <div
                    style="
                      padding: 0.88rem 0.88rem 0 0.88rem;
                      box-sizing: border-box;
                    "
                  >
                    <!-- <el-input
                    placeholder="搜索"
                    style="height: 2rem; background: #f5f5f5; border: none"
                    :prefix-icon="Search"
                    v-model="value"
                  ></el-input>
                  <div
                    style="height: 1.25rem; display: flex; align-items: center"
                  >
                    <span
                      style="color: rgba(28, 31, 35, 0.8); font-size: 0.75rem"
                      >共{{ checkList.length }}项</span
                  ></el-input> -->
                    <div
                      style="
                        height: 1.25rem;
                        display: flex;
                        align-items: center;
                      "
                    >
                    <!-- <span
                      <span
                        style="color: rgba(28, 31, 35, 0.8); font-size: 0.75rem"
                        >共{{ checkList.length }}项</span
                      >
                      <!-- <span
                      @click="handleCheckAllChange"
                      style="
                        color: rgba(28, 31, 35, 0.8);
@@ -610,77 +699,79 @@
                      "
                      >全选</span
                    > -->
                    </div>
                  </div>
                </div>
                <el-scrollbar height="20rem" style="padding-left: 0.88rem">
                  <el-checkbox-group
                    :indeterminate="isIndeterminate"
                    @change="checkChange"
                    v-model="checkboxId"
                    style="display: flex; flex-direction: column"
                  >
                    <el-checkbox
                      :max="2"
                      v-for="item in sleeveData"
                      :key="item.id"
                      :label="item.articleName"
                      :value="item.id"
                    />
                  </el-checkbox-group>
                </el-scrollbar>
              </div>
              <div style="width: 50%; height: 100%">
                <div
                  style="padding: 0.88rem 0 0 0.88rem; box-sizing: border-box"
                >
                  <span style="color: rgb(167, 171, 176); font-size: 0.88rem"
                    >已选{{ checkList.length }}项</span
                  >
                  <span
                    @click="clear"
                    style="
                      color: rgb(65, 70, 76);
                      font-size: 0.88rem;
                      margin-left: 1rem;
                      cursor: pointer;
                    "
                    >清空</span
                  >
                </div>
                <el-scrollbar
                  height="calc(25rem - 44.15px)"
                  style="padding-left: 0.88rem"
                >
                  <p
                    style="
                      display: flex;
                      justify-content: space-between;
                      margin: 0.5rem 0;
                    "
                    v-for="item in checkList"
                    :key="item.id"
                    class="scrollbar-demo-item"
                  >
                    <span>
                      {{ item.articleName }}
                    </span>
                    <span>
                      <el-input-number
                        size="small"
                        style="width: 7rem"
                        v-model="item.num"
                        :min="1"
                        :max="100"
                        @change="handleChange"
                  <el-scrollbar height="20rem" style="padding-left: 0.88rem">
                    <el-checkbox-group
                      :indeterminate="isIndeterminate"
                      @change="checkChange"
                      v-model="checkboxId"
                      style="display: flex; flex-direction: column"
                    >
                      <el-checkbox
                        :max="2"
                        v-for="item in sleeveData"
                        :key="item.id"
                        :label="item.articleName"
                        :value="item.id"
                      />
                    </span>
                  </p>
                </el-scrollbar>
                    </el-checkbox-group>
                  </el-scrollbar>
                </div>
                <div style="width: 50%; height: 100%">
                  <div
                    style="padding: 0.88rem 0 0 0.88rem; box-sizing: border-box"
                  >
                    <span style="color: rgb(167, 171, 176); font-size: 0.88rem"
                      >已选{{ checkList.length }}项</span
                    >
                    <span
                      @click="clear"
                      style="
                        color: rgb(65, 70, 76);
                        font-size: 0.88rem;
                        margin-left: 1rem;
                        cursor: pointer;
                      "
                      >清空</span
                    >
                  </div>
                  <el-scrollbar
                    height="calc(25rem - 44.15px)"
                    style="padding-left: 0.88rem"
                  >
                    <p
                      style="
                        display: flex;
                        justify-content: space-between;
                        margin: 0.5rem 0;
                      "
                      v-for="item in checkList"
                      :key="item ? item.id : ''"
                      class="scrollbar-demo-item"
                    >
                      <span>
                        {{ item ? item.articleName : "" }}
                      </span>
                      <span>
                        <el-input-number
                          size="small"
                          style="width: 7rem"
                          v-model="item.num"
                          :min="1"
                          :max="100"
                          @change="handleChange"
                        />
                      </span>
                    </p>
                  </el-scrollbar>
                </div>
              </div>
            </div>
          </el-form-item>
        </el-row>
      </el-form>
            </el-form-item>
          </el-row>
        </el-form>
      </el-scrollbar>

      <template #footer>
        <div class="dialog-footer" style="text-align: center">
          <el-button @click="craftdialogVisible = false" style="height: 2rem"
@@ -699,7 +790,7 @@
  </div>
</template>
<script setup>
import { ref, reactive, onMounted, toRef } from "vue";
import { ref, reactive, onMounted, toRef, computed } from "vue";
import { Search } from "@element-plus/icons-vue";
import {
  GetSleeveandStep,
@@ -729,11 +820,11 @@
//选择的套筒数据
const checkList = ref([]);
//电气数量
const electric = ref(null);
const electric = ref([]);
//机械数量
const mechanical = ref(null);
const mechanical = ref([]);
//地沟
const trench = ref(null);
const trench = ref([]);
//新增工艺/编辑工艺
const type = ref("新增");
//获取数据
@@ -860,14 +951,15 @@

//编辑工艺
const Editcraft = (row) => {
  console.log(row);

  let data = Object.assign({}, row);
  type.value = "编辑";
  detailsDialogVisible.value = false;
  craftdialogVisible.value = true;
  form.value = data;
  tools.value = row.tools ? row.tools.split(",") : "";
  tools.value = data.tools ? data.tools.split(",") : "";
  console.log("tools", tools.value);

  checkboxId.value = [Number(row.articleOneid), Number(row.articleTowid)];
  ArticleInfom({
    page: 1,
    rows: 100,
@@ -887,7 +979,26 @@
    ],
  }).then((res) => {
    sleeveData.value = res.rows;
    checkList.value = res.rows.map((item) => {
      if (Number(row.articleOneid) == item.id) {
        return {
          ...item,
          num: row.articleOne,
        };
      } else if (item.id == row.articleTowid) {
        return {
          ...item,
          num: row.articleTwo,
        };
      } else {
        return {};
      }
    });
    checkList.value = checkList.value.filter((item) => {
      return Object.keys(item).length > 0;
    });
  });

  GetTool({
    page: 1,
    rows: 100,
@@ -920,42 +1031,16 @@
};
//保存
const addprocess = async (formEl) => {
  console.log(checkboxId.value);
  userName.value = JSON.parse(localStorage.getItem("user")).userName;
  let string = "";
  // if (tools.value.length == 0) {
  //   ElMessage({
  //     message: "请选择工具",
  //     type: "warning",
  //   });
  //   return;
  // }
  if (tools.value.length > 0) {
    if (type.value == "编辑") {
      string = tools.value
        ? tools.value
            .map((item) => {
              return item;
            })
            .join(",")
        : "";
      return;
    }
    string = tools.value
      ? tools.value
          .map((item) => {
            return item.toolName;
          })
          .join(",")
      : "";
      .map((item) => {
        return typeof item == "string" ? item : item.toolName;
      })
      .join(",");
  }

  // if (checkList.value.length == 0) {
  //   ElMessage({
  //     message: "请选择套筒",
  //     type: "warning",
  //   });
  //   return;
  // }
  if (form.value.nodal == 0) {
    ElMessage({
      message: "序号最小为1",
@@ -963,22 +1048,33 @@
    });
    return;
  }
  console.log(checkList.value);

  form.value.aritcleoneid =
    checkList.value.length != 0 ? checkList.value[0].id : "";
  form.value.articleone =
    checkList.value.length != 0 ? checkList.value[0].num : "";
  form.value.aritcletowid =
    checkList.value.length != 0 ? checkList.value[1].id : "";
    checkList.value.length != 0 && checkList.value.length > 1
      ? checkList.value[1].id
      : "";
  form.value.articletwo =
    checkList.value.length != 0 ? checkList.value[1].num : "";
    checkList.value.length != 0 && checkList.value.length > 1
      ? checkList.value[1].num
      : "";
  form.value.creater = userName.value;
  form.value.tools = string;
  form.value.craftstype = title.value;
  form.value.torqueOneQuantity = tools.value.length;
  form.value.id = form.value.craftID ? form.value.craftID : 0;
  console.log(form.value);

  form.value.torqueSum = computed(() => {
    if (form.value.torqueOne > 1 && form.value.torqueTwo > 1) {
      return 2;
    } else if (form.value.torqueOne > 1 || form.value.torqueTwo > 1) {
      return 1;
    } else {
      return 0;
    }
  });
  if (!formEl) return;
  await formEl.validate((valid, fields) => {
    if (valid) {
@@ -1108,6 +1204,8 @@
    }
  );
  tools.value = [];
  checkList.value = [];
  checkboxId.value = [];
};
//导出方法
const printExcel = () => {