fix:增加通用工艺路线

src/components/CommonTable/configs/tableConfig.ts

@@ -635,4 +635,120 @@ export const tableConfig = {
       },
     ],
   },
+
+  ROUTE_COMMON:{
+    url: "/api/v1/op/route/common",
+    column: [
+      {
+        label: "工艺编号",
+        prop: "processRouteCode",
+        search: true,
+        width: 150,
+        addDisplay: true,
+        editDisabled: true,
+        overHidden: true,
+        rules: [
+          {
+            required: true,
+            message: "工艺路线名称不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      {
+        label: "工艺名称",
+        prop: "processRouteName",
+        width: 150,
+        search: true,
+        overHidden: true,
+        rules: [
+          {
+            required: true,
+            message: "工艺路线名称不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      {
+        label: "工艺类型",
+        prop: "processRouteType",
+        minWidth: 120,
+        search: true,
+        overHidden: true,
+        rules: [
+          {
+            required: true,
+            message: "工艺路线类型不能为空",
+            trigger: "change",
+          },
+        ],
+        type: "select",
+        dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.routing_type,
+        props: {
+          label: "dictLabel",
+          value: "dictValue",
+        },
+      },
+      {
+        label: "启用状态",
+        prop: "enabled",
+        addDisplay: false,
+        // editDisplay: false,
+        slot: true,
+        width: 100,
+        type: "radio",
+        dicData: [
+          {
+            label: "未启用",
+            value: 1,
+          },
+          {
+            label: "启用",
+            value: 0,
+          },
+        ],
+        value: 0,
+      },
+      // 只有绑定了工序才可以复制。
+      {
+        label: "是否可复制",
+        prop: "usable2",
+        slot: true,
+        width: 100,
+        search: false,
+        filterable: true,
+        hide: true,
+        addDisplay: false,
+        editDisplay: false,
+        type: "radio",
+        dicData: [
+          {
+            label: "否",
+            value: 0,
+          },
+          {
+            label: "是",
+            value: 1,
+          },
+        ],
+        value: 0,
+      },
+      {
+        label: "创建人",
+        prop: "creator",
+        addDisplay: false,
+        editDisplay: false,
+        overHidden: true,
+      },
+      {
+        label: "创建时间",
+        prop: "created",
+        addDisplay: false,
+        editDisplay: false,
+        width: 150,
+        overHidden: true,
+      },
+      ]
+  },
+
 };

src/views/base/craftManagement/route/bindConfig.ts

@@ -164,10 +164,10 @@ export const formOption = {
       span: 24,
       type: "textarea",
     },
-    {
+    /*{
       label: "tbom文件",
       prop: "tbomUrl",
       span: 24,
-    },
+    },*/
   ],
 };

src/views/base/craftManagement/route/bindProcess.vue

@@ -88,12 +88,12 @@
             v-model="currentProcess"
             style="padding: 10px; background-color: white"
           >
-            <template #tbomUrl>
+            <!--<template #tbomUrl>
               <FilesUpload
                 v-model:src="currentProcess.tbomUrl"
                 :show-tip="false"
               />
-            </template>
+            </template>-->
           </avue-form>
           <div class="editProcces">
             <el-button type="primary" :icon="Grid" @click="editProComponent"

src/views/base/craftManagement/route/components/processComponent.vue

@@ -29,7 +29,7 @@
               :key="index"
               :command="com"
             >
-              {{ com.compentName }}</el-dropdown-item
+              <div v-if="route.query.prodtCode!=''||(route.query.prodtCode==''&&com.compentName!='物料采集')">{{ com.compentName }}</div></el-dropdown-item
             >
           </el-dropdown-menu>
         </template>
@@ -104,8 +104,8 @@ const loadTopList = () => {
     isChanged.value = false;
   });
 };
-
 onMounted(async () => {
+  console.info(route.query.prodtCode);
   await loadTopList();
 });
 

src/views/base/craftManagement/route/index.vue

@@ -58,6 +58,12 @@
       tableType="MARTERIAL"
       @selected-sure="onSelectedFinish"
     />
+    <CommonTable
+      ref="commonRef"
+      tableTitle="选择通用工艺"
+      tableType="ROUTE_COMMON"
+      @selected-sure="onCommonFinish"
+    />
     <ExcelUpload ref="uploadRef" @finished="uploadFinished" />
     <el-dialog
       v-model="centerDialogVisible"
@@ -146,6 +152,7 @@ const importExcelData = () => {
 
 // 选择产品相关
 const ctableRef = ref(null);
+const commonRef=ref(null);
 
 const onSelectedFinish = (selectedValue) => {
   // search.value.prodtName = selectedValue.materialName;
@@ -153,11 +160,22 @@ const onSelectedFinish = (selectedValue) => {
   form.value.prodtCode = selectedValue.materialCode;
   form.value.prodtModel = selectedValue.spec;
 };
+const onCommonFinish = (selectedValue)=>{
+  form.value.commonRouteId = selectedValue.id;
+  form.value.commonRouteName = selectedValue.processRouteName;
+  form.value.commonRouteCode = selectedValue.processRouteCode;
+}
 const startChooseProduct = () => {
   if (ctableRef.value) {
     ctableRef.value.startSelect();
   }
 };
+
+const startChooseRoute = () => {
+  if (ctableRef.value) {
+    commonRef.value.startSelect();
+  }
+};
 // 已经绑定了工序的可以复制，跟后端HT商量只传id即可。
 const copyRow = (row) => {
   if (row.usable == 0) {
@@ -249,6 +267,47 @@ option.value = Object.assign(option.value, {
       },
     },
     {
+      label: "通用工艺id",
+      prop: "commonRouteId",
+      addDisplay: false,
+      editDisplay: false,
+      hide:true,
+      width: 150,
+      overHidden: true,
+    },
+    {
+      label: "通用工艺名字",
+      prop: "commonRouteName",
+      editDisplay: false,
+      width: 150,
+      rules: [
+        {
+          required: true,
+          message: "通用工艺名字不能为空",
+          trigger: "blur",
+        },
+      ],
+      overHidden: true,
+      click:() => {
+        startChooseRoute();
+      },
+    },
+    {
+      label: "通用工艺编码",
+      prop: "commonRouteCode",
+      disabled:true,
+      editDisplay: false,
+      width: 150,
+      overHidden: true,
+      rules: [
+        {
+          required: true,
+          message: "通用工艺编码不能为空",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
       label: "产品名称",
       prop: "prodtName",
       overHidden: true,
@@ -367,6 +426,7 @@ option.value = Object.assign(option.value, {
       width: 150,
       overHidden: true,
     },
+
   ],
 });
 </script>

src/views/base/craftManagement/routeCommon/index.vue

@@ -0,0 +1,324 @@
+<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 #usable="{ row }">
+        <el-tag v-if="row.usable == '1'" type="success">已绑定</el-tag>
+        <el-tag v-else type="info">未绑定</el-tag>
+      </template>-->
+
+      <!-- :disabled="row.usable == '1' ? false : true" -->
+      <template #menu-right="{}">
+        <el-dropdown split-button
+          >导入
+          <template #dropdown>
+            <el-dropdown-menu>
+              <el-dropdown-item
+                @click="downloadTemplate('/api/v1/op/route/template')"
+              >
+                <i-ep-download />下载模板
+              </el-dropdown-item>
+              <el-dropdown-item @click="importExcelData">
+                <i-ep-top />导入数据
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
+      </template>
+      <template #menu="{ row }">
+        <!--<el-button
+          link
+          icon="el-icon-copy-document"
+          :disabled="false"
+          @click="copyRow(row)"
+          >复制</el-button
+        >-->
+        <el-button link icon="el-icon-copy-document" @click="bindProcess(row)"
+          >绑定</el-button
+        >
+      </template>
+    </avue-crud>
+    <CommonTable
+      ref="ctableRef"
+      tableTitle="添加产品"
+      tableType="ROUTE_COMMON"
+      @selected-sure="onSelectedFinish"
+    />
+    <ExcelUpload ref="uploadRef" @finished="uploadFinished" />
+    <el-dialog
+      v-model="centerDialogVisible"
+      title="重命名"
+      width="500"
+      align-center
+    >
+      <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">
+          <el-button @click="centerDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="renameRoute()"> 确定 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script setup>
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import ButtonPermKeys from "@/common/configs/buttonPermission";
+import dictDataUtil from "@/common/configs/dictDataUtil";
+import { useDictionaryStore } from "@/store";
+import { copyRoute } from "@/api/craft/route/index";
+
+// 数据字典相关
+const { dicts } = useDictionaryStore();
+
+const testDebunce = () => {
+  console.log("执行了事件");
+};
+
+// 传入一个url，后面不带/
+const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
+  useCrud({
+    src: "/api/v1/op/route",
+  });
+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,
+// });
+let centerDialogVisible = ref(false);
+const crudRef = ref(null); //crudRef.value 获取avue-crud对象
+const tmpForm = ref({});
+
+onMounted(() => {
+  // console.log("crudRef", crudRef)
+  search.value.routeType="common";
+  dataList();
+});
+
+/**
+ * 上传excel相关
+ */
+const uploadRef = ref(null);
+const uploadFinished = () => {
+  // 上传完成后的刷新操作
+  page.currentPage = 1;
+  search.value.routeType="common";
+  dataList();
+};
+const importExcelData = () => {
+  if (uploadRef.value) {
+    uploadRef.value.show("/api/v1/op/route/import");
+  }
+};
+
+// 选择产品相关
+const ctableRef = ref(null);
+
+const onSelectedFinish = (selectedValue) => {
+  // search.value.prodtName = selectedValue.materialName;
+  form.value.prodtName = selectedValue.materialName;
+  form.value.prodtCode = selectedValue.materialCode;
+  form.value.prodtModel = selectedValue.spec;
+};
+const startChooseProduct = () => {
+  if (ctableRef.value) {
+    ctableRef.value.startSelect();
+  }
+};
+// 已经绑定了工序的可以复制，跟后端HT商量只传id即可。
+const copyRow = (row) => {
+  if (row.usable == 0) {
+    ElMessage.error("该路线未被绑定!");
+    return;
+  }
+  form.value = Object.assign(form.value, row);
+  form.value.processRouteVersion = "";
+  crudRef.value.rowAdd();
+};
+
+const renameRoute = () => {
+  tmpForm.value.id;
+  tmpForm.value.processRouteCode;
+  tmpForm.value.processRouteName;
+  copyRoute(tmpForm.value).then(() => {
+    tmpForm.value.id = undefined;
+    tmpForm.value.processRouteCode = undefined;
+    tmpForm.value.processRouteName = undefined;
+    page.currentPage = 1;
+    dataList();
+  });
+  centerDialogVisible.value = false;
+};
+
+const router = useRouter();
+// 绑定工序
+const bindProcess = (row) => {
+  router.push({
+    path: `/base/craftManagement/bindProcess/${row.id}`,
+    query: { prodtCode: row.prodtCode,routeId: row.id},
+  });
+};
+
+// 设置表格列或者其他自定义的option
+option.value = Object.assign(option.value, {
+  selection: true,
+  labelWidth: 110,
+  searchLabelWidth: 110,
+  column: [
+    {
+      label: "工艺路线编号",
+      prop: "processRouteCode",
+      search: true,
+      width: 150,
+      addDisplay: true,
+      editDisabled: true,
+      overHidden: true,
+      rules: [
+        {
+          required: true,
+          message: "工艺路线名称不能为空",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "工艺路线名称",
+      prop: "processRouteName",
+      width: 150,
+      search: true,
+      overHidden: true,
+      rules: [
+        {
+          required: true,
+          message: "工艺路线名称不能为空",
+          trigger: "blur",
+        },
+      ],
+    },
+    {
+      label: "工艺路线类型",
+      prop: "processRouteType",
+      minWidth: 120,
+      search: true,
+      overHidden: true,
+      rules: [
+        {
+          required: true,
+          message: "工艺路线类型不能为空",
+          trigger: "change",
+        },
+      ],
+      type: "select",
+      dicUrl: dictDataUtil.request_url + dictDataUtil.TYPE_CODE.routing_type,
+      props: {
+        label: "dictLabel",
+        value: "dictValue",
+      },
+    },
+    // 在产品那边绑定了工艺路线才是已绑定
+    {
+      label: "启用状态",
+      prop: "enabled",
+      addDisplay: false,
+      // editDisplay: false,
+      slot: true,
+      width: 100,
+      type: "radio",
+      dicData: [
+        {
+          label: "未启用",
+          value: 1,
+        },
+        {
+          label: "启用",
+          value: 0,
+        },
+      ],
+      value: 0,
+    },
+    // 只有绑定了工序才可以复制。
+    {
+      label: "是否可复制",
+      prop: "usable2",
+      slot: true,
+      width: 100,
+      search: false,
+      filterable: true,
+      hide: true,
+      addDisplay: false,
+      editDisplay: false,
+      type: "radio",
+      dicData: [
+        {
+          label: "否",
+          value: 0,
+        },
+        {
+          label: "是",
+          value: 1,
+        },
+      ],
+      value: 0,
+    },
+    {
+      label: "创建人",
+      prop: "creator",
+      addDisplay: false,
+      editDisplay: false,
+      overHidden: true,
+    },
+    {
+      label: "创建时间",
+      prop: "created",
+      addDisplay: false,
+      editDisplay: false,
+      width: 150,
+      overHidden: true,
+    },
+    {
+      label: "工艺路线类型",
+      prop: "routeType",
+      width: 150,
+      hide: true,
+      display: false,
+      value:"common",
+
+    },
+  ],
+});
+</script>