Quellcode durchsuchen

修改工艺路线的bug 禅道上面的

ooo vor 1 Jahr
Ursprung
Commit
ddfdc66956

+ 0 - 182
src/views/base/craftManagement/defectMana/index.vue

@@ -1,182 +0,0 @@
-<template>
-  <div class="mainContentBox">
-    <avue-crud
-      ref="crudRef"
-      v-model:search="search"
-      v-model="form"
-      :data="data"
-      :option="option"
-      v-model:page="page"
-      @row-save="createRow"
-      @row-update="updateRow"
-      @row-del="deleteRow"
-      @search-change="searchChange"
-      @search-reset="resetChange"
-      @size-change="dataList"
-      @current-change="dataList"
-      @selection-change="selectionChange"
-    >
-      <template #menu-left="{ size }">
-        <el-button
-          :disabled="toDeleteIds.length < 1"
-          type="danger"
-          icon="el-icon-delete"
-          :size="size"
-          @click="multipleDelete"
-          >删除</el-button
-        >
-      </template>
-      <!-- <template #menu-right="{}">
-        <el-dropdown split-button
-          >导入
-          <template #dropdown>
-            <el-dropdown-menu>
-              <el-dropdown-item
-                @click="downloadTemplate('/api/v1/plan/order/template')"
-              >
-                <i-ep-download />下载模板
-              </el-dropdown-item>
-              <el-dropdown-item @click="importExcelData">
-                <i-ep-top />导入数据
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </template>
-        </el-dropdown>
-        <el-button
-          class="ml-3"
-          @click="exportData('/api/v1/plan/order/export')"
-        >
-          <template #icon> <i-ep-download /> </template>导出
-        </el-button>
-      </template> -->
-    </avue-crud>
-    <ExcelUpload ref="uploadRef" @finished="uploadFinished" />
-  </div>
-</template>
-<script setup>
-import { ref, getCurrentInstance } from "vue";
-import { useCrud } from "@/hooks/userCrud";
-import dictDataUtil from "@/common/configs/dictDataUtil";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
-
-// 数据字典相关
-const { dicts } = useDictionaryStoreHook();
-
-// 传入一个url,后面不带/
-const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
-  useCrud({
-    src: "/api/v1/op/baseBug",
-  });
-const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
-  Methords; //增删改查
-const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
-const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
-// checkBtnPerm(ButtonPermKeys.PLAN.BTNS.order_add) :permission="permission"
-// const permission = reactive({
-//   delBtn: checkPerm(buttonPermission.PLAN.BTNS.order_del),
-//   addBtn: checkPerm(buttonPermission.PLAN.BTNS.order_add),
-//   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
-//   menu: true,
-// });
-
-const crudRef = ref(null); //crudRef.value 获取avue-crud对象
-
-onMounted(() => {
-  // console.log("crudRef", crudRef)
-  dataList();
-});
-
-/**
- * 上传excel相关
- */
-const uploadRef = ref(null);
-const uploadFinished = () => {
-  // 上传完成后的刷新操作
-  page.currentPage = 1;
-  dataList();
-};
-const importExcelData = () => {
-  if (uploadRef.value) {
-    uploadRef.value.show("/api/v1/plan/order/import");
-  }
-};
-
-// 设置表格列或者其他自定义的option
-const switchOp = [
-  {
-    label: "",
-    value: 0,
-  },
-  {
-    label: "",
-    value: 1,
-  },
-];
-option.value = Object.assign(option.value, {
-  selection: true,
-  column: [
-    {
-      label: "缺陷类型",
-      prop: "bugType",
-      minWidth: 200,
-      search: true,
-      overHidden: true,
-      rules: [
-        {
-          required: true,
-          message: "缺陷类型不能为空",
-          trigger: "change",
-        },
-      ],
-      type: "select",
-      dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.defect_mana,
-      props: {
-        label: "dictLabel",
-        value: "dictValue",
-      },
-    },
-    {
-      label: "缺陷编码",
-      prop: "bugCode",
-      span: 12,
-      search: true,
-      disabled: false,
-      overHidden: true,
-      rules: [
-        {
-          required: true,
-          message: "缺陷编码不能为空",
-          trigger: "blur",
-        },
-      ],
-    },
-    {
-      label: "缺陷名称",
-      prop: "bugName",
-      span: 12,
-      search: true,
-      rules: [
-        {
-          required: true,
-          message: "缺陷名称不能为空",
-          trigger: "blur",
-        },
-      ],
-    },
-    {
-      label: "备注",
-      prop: "remark",
-      span: 12,
-      search: true,
-      rules: [
-        {
-          required: false,
-          message: "备注不能为空",
-          trigger: "blur",
-        },
-      ],
-    },
-  ],
-});
-</script>

+ 17 - 10
src/views/base/craftManagement/route/index.vue

@@ -65,13 +65,20 @@
       width="500"
       align-center
     >
-      <el-form :model="tmpForm" label-width="auto" style="max-width: 600px">
-        <el-form-item label="工艺路线编号">
-          <el-input v-model="tmpForm.processRouteCode" />
-        </el-form-item>
-        <el-form-item label="工艺路线名称">
-          <el-input v-model="tmpForm.processRouteName" />
-        </el-form-item>
+      <el-form :model="tmpForm" label-width="auto" style="max-width: 800px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工艺路线编号">
+              <el-input v-model="tmpForm.processRouteCode" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="工艺路线名称">
+              <el-input v-model="tmpForm.processRouteName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -151,15 +158,15 @@ const startChooseProduct = () => {
     ctableRef.value.startSelect();
   }
 };
-
 // 已经绑定了工序的可以复制,跟后端HT商量只传id即可。
 const copyRow = (row) => {
   if (row.usable == 0) {
     ElMessage.error("该路线未被绑定!");
     return;
   }
-  tmpForm.value.id = row.id;
-  centerDialogVisible.value = true;
+  form.value = Object.assign(form.value, row);
+  form.value.processRouteVersion = "";
+  crudRef.value.rowAdd();
 };
 
 const renameRoute = () => {

+ 1 - 1
src/views/base/defectMana/index.vue

@@ -141,7 +141,7 @@ option.value = Object.assign(option.value, {
       prop: "bugCode",
       span: 12,
       search: true,
-      disabled: true,
+      editDisabled: true,
       rules: [
         {
           required: true,