工艺路线参数修改

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

@@ -102,7 +102,7 @@
             v-model="currentProcess"
             style="padding: 10px; background-color: white"
           >
-           <!-- <template #tbomUrl>
+            <!-- <template #tbomUrl>
               <FilesUpload
                 v-model:src="currentProcess.tbomUrl"
                 :show-tip="false"
@@ -192,8 +192,8 @@ const saveFlow = async () => {
       list2.value[i].nextOperationId = list2.value[i + 1]?.operationVO?.id;
     }
   }
-  if(currentProcess.value){
-    list2.value[selectIndex.value] = currentProcess.value
+  if (currentProcess.value) {
+    list2.value[selectIndex.value] = currentProcess.value;
   }
   let p = {
     processRouteId: route.params.id,
@@ -264,8 +264,8 @@ const editProComponent = async () => {
   let res = await updateProcess(currentProcess.value);
   ElMessage.success("保存成功");
   router.push({
-    path: `/base/craftManagement/processCom/${currentProcess.value.id}`,
-    query: { prodtCode: route.query.prodtCode, routeId: route.query.routeId },
+    path: `/base/craftManagement/processCom/${currentProcess.value.id}/${route.params.prodtCode}/${route.params.routeId}`,
+    // query: { prodtCode: route.query.prodtCode, routeId: route.query.routeId },
   });
 };
 
@@ -273,7 +273,7 @@ const editProComponent = async () => {
 onMounted(() => {
   loadTreeData();
   loadProcessesFlow();
-  if (route.query.usable == 1) {
+  if (route.params.usable == 1) {
     editStauts.value = false;
   } else {
     editStauts.value = true;

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

@@ -102,13 +102,13 @@ const startCreat = () => {
       bomVersion.value = data.value[0].recordVersion;
     }
 
-    if (!route.query.prodtCode) {
+    if (!route.params.prodtCode) {
       ElMessage.error("物料编号读取错误");
       return;
     }
     //根据物料编码和版本号获取对应的物料BOM
     let bomParam = {
-      materialCode: route.query.prodtCode,
+      materialCode: route.params.prodtCode,
     };
     getBomVersion(bomParam).then((res) => {
       let resListMap = [];
@@ -121,7 +121,7 @@ const startCreat = () => {
       });
       //查询参数
       let configParam = {};
-      configParam.materialCode = route.query.prodtCode;
+      configParam.materialCode = route.params.prodtCode;
       if (bomVersion.value) {
         configParam.bomVersion = bomVersion.value;
       }
@@ -154,7 +154,7 @@ const startCreat = () => {
     commonTableType.value = "ESOP";
     nextTick(() => {
       commonTableRef.value?.startSelect({
-        materialCode: route.query.prodtCode,
+        materialCode: route.params.prodtCode,
         enable: 1,
       });
       commonTableRef.value?.mergeOption({
@@ -329,7 +329,7 @@ onMounted(() => {
     column: tableConfig[props.tableType].column,
   });
   dataList();
-  getRouteMaxVersion(route.query.routeId).then(({ data }) => {
+  getRouteMaxVersion(route.params.routeId).then(({ data }) => {
     if (data) {
       bomVersion.value = data;
     }
@@ -350,7 +350,7 @@ watch(
       column: tableConfig[props.tableType].column,
     });
     dataList();
-    getRouteMaxVersion(route.query.routeId).then(({ data }) => {
+    getRouteMaxVersion(route.params.routeId).then(({ data }) => {
       if (data) {
         bomVersion.value = data;
       }

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

@@ -21,14 +21,13 @@
       </template>
       <template #menu-left="{ size }">
         <el-button
-            :disabled="toDeleteIds.length < 1"
-            type="refresh"
-            icon="el-icon-refresh"
-            :size="size"
-            @click="apsSync"
-        >APS同步</el-button
+          :disabled="toDeleteIds.length < 1"
+          type="refresh"
+          icon="el-icon-refresh"
+          :size="size"
+          @click="apsSync"
+          >APS同步</el-button
         >
-
       </template>
       <!-- :disabled="row.usable == '1' ? false : true" -->
       <template #menu-right="{}">
@@ -125,27 +124,27 @@ import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import { useDictionaryStore } from "@/store";
 import { copyRoute } from "@/api/craft/route/index";
-import {ElMessage, ElMessageBox} from "element-plus";
-import {syncAps} from "@/api/aps";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { syncAps } from "@/api/aps";
 // 数据字典相关
 const { dicts } = useDictionaryStore();
 
-const apsSync = () =>{
+const apsSync = () => {
   ElMessageBox.confirm("是否同步所选中数据？", "提示", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
   }).then(async () => {
-    let param = {type: 4,codes: toDeleteIds.value}
-    syncAps(param).then((data)=>{
+    let param = { type: 4, codes: toDeleteIds.value };
+    syncAps(param).then((data) => {
       if (data.code === "200") {
         ElMessage.success(data.msg);
       } else {
         ElMessage.error(data.msg);
       }
-    })
+    });
   });
-}
+};
 
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
@@ -234,8 +233,8 @@ const router = useRouter();
 // 绑定工序
 const bindProcess = (row) => {
   router.push({
-    path: `/base/craftManagement/bindProcess/${row.id}`,
-    query: { prodtCode: row.prodtCode, routeId: row.id, usable: row.usable },
+    path: `/base/craftManagement/bindProcess/${row.id}/${row.prodtCode}/${row.id}/${row.usable}`,
+    // query: { prodtCode: row.prodtCode, routeId: row.id, usable: row.usable },
   });
 };
 

src/views/plan/returnMaterial/index.vue

@@ -1,88 +1,104 @@
 <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"
+      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
-            type="primary"
-            icon="el-icon-plus"
-            :size="size"
-            @click="showDialog"
-        >新增</el-button>
+          type="primary"
+          icon="el-icon-plus"
+          :size="size"
+          @click="showDialog"
+          >新增</el-button
+        >
       </template>
       <template #menu="{ row, index }">
-        <el-button text
-                   type="info"
-                   v-if="row.state === 1"
-                   :icon="'el-icon-info'"
-                   @click="showDialog(2,row.returnCode)">
+        <el-button
+          text
+          type="info"
+          v-if="row.state === 1"
+          :icon="'el-icon-info'"
+          @click="showDialog(2, row.returnCode)"
+        >
           详情
         </el-button>
-        <el-button text
-                   type="primary"
-                   v-if="row.state === 0"
-                   :icon="'el-icon-info'"
-                   @click="sendToWms(row.returnCode)">
+        <el-button
+          text
+          type="primary"
+          v-if="row.state === 0"
+          :icon="'el-icon-info'"
+          @click="sendToWms(row.returnCode)"
+        >
           发送WMS
         </el-button>
-        <el-button text
-                   type="primary"
-                   v-if="row.state === 0"
-                   :icon="'el-icon-edit'"
-                   @click="showDialog(1,row.returnCode)">
+        <el-button
+          text
+          type="primary"
+          v-if="row.state === 0"
+          :icon="'el-icon-edit'"
+          @click="showDialog(1, row.returnCode)"
+        >
           编辑
         </el-button>
-        <el-button text
-                   type="danger"
-                   v-if="row.state === 0"
-                   :icon="'el-icon-del'"
-                   @click="rowDelObj(row)">
+        <el-button
+          text
+          type="danger"
+          v-if="row.state === 0"
+          :icon="'el-icon-del'"
+          @click="rowDelObj(row)"
+        >
           删除
         </el-button>
       </template>
     </avue-crud>
     <el-dialog
-        v-model="dialog.visible"
-        :title="dialog.title"
-        width="950px"
-        @close="dialog.visible = false"
+      v-model="dialog.visible"
+      :title="dialog.title"
+      width="80%"
+      @close="dialog.visible = false"
     >
       <el-input
-          v-if="dialog.type !== 2"
-          placeholder="扫码回车添加"
-          v-model="scanInput"
-          @keyup.enter="searchCode"
-          clearable>
+        v-if="dialog.type !== 2"
+        placeholder="扫码回车添加"
+        v-model="scanInput"
+        @keyup.enter="searchCode"
+        clearable
+      >
       </el-input>
-      <avue-crud :data="materialData" :option="materialOption" @selection-change="crudSelect">
+      <avue-crud
+        :data="materialData"
+        :option="materialOption"
+        @selection-change="crudSelect"
+      >
         <template #menu="{ row, index }">
-          <el-button text
-                     v-if="dialog.type !== 2"
-                     type="danger"
-                     :icon="'el-icon-del'"
-                     @click="avueRowDel(row, index)">
-           删除
+          <el-button
+            text
+            v-if="dialog.type !== 2"
+            type="danger"
+            :icon="'el-icon-del'"
+            @click="avueRowDel(row, index)"
+          >
+            删除
           </el-button>
         </template>
       </avue-crud>
       <template #footer>
         <div class="dialog-footer" v-if="dialog.type !== 2">
           <el-button type="primary" @click="handleSubmit">确 定</el-button>
-          <el-button @click="dialog.visible=false">取 消</el-button>
+          <el-button @click="dialog.visible = false">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -91,9 +107,15 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import {addReturnMaterial,scanItem,queryList,del,sendWms} from "@/api/returnMaterial";
+import {
+  addReturnMaterial,
+  scanItem,
+  queryList,
+  del,
+  sendWms,
+} from "@/api/returnMaterial";
 import { useCommonStoreHook } from "@/store";
-import {ElMessage} from "element-plus";
+import { ElMessage } from "element-plus";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 const test = () => {
   isShowTable.value = true;
@@ -112,105 +134,110 @@ const sendToWms = (returnCode) => {
     type: "warning",
     lockScroll: false,
   }).then(() => {
-    sendWms({returnCode: returnCode}).then((res)=>{
+    sendWms({ returnCode: returnCode }).then((res) => {
       ElMessage.success("操作成功");
-      dataList()
-    })
+      dataList();
+    });
   });
 };
-const showDialog = (type,returnCode) => {
-  currentCode.value = ''
-  dialog.visible = true
-  if(type){
-    dialog.type = type
+const showDialog = (type, returnCode) => {
+  currentCode.value = "";
+  dialog.visible = true;
+  if (type) {
+    dialog.type = type;
   }
-  materialData.value = []
-  if(type === 1 || type == 2){
-    currentCode.value = returnCode
-    queryList({"returnCode": returnCode}).then((res)=>{
-      if(type === 1){
-        res.data.forEach(item=>{
-          item.$cellEdit = true
-        })
-      }else{
-        res.data.forEach(item=>{
-          item.$cellEdit = false
-        })
+  materialData.value = [];
+  if (type === 1 || type == 2) {
+    currentCode.value = returnCode;
+    queryList({ returnCode: returnCode }).then((res) => {
+      if (type === 1) {
+        res.data.forEach((item) => {
+          item.$cellEdit = true;
+        });
+      } else {
+        res.data.forEach((item) => {
+          item.$cellEdit = false;
+        });
       }
-      materialData.value = res.data
-    })
+      materialData.value = res.data;
+    });
   }
 };
-const currentCode = ref()
+const currentCode = ref();
 const handleSubmit = () => {
-  if(materialData.value.length === 0 ){
+  if (materialData.value.length === 0) {
     ElMessage.error("请先扫码添加物料");
-    return
+    return;
   }
-  addReturnMaterial(materialData.value).then(()=>{
-    dialog.visible = false
+  addReturnMaterial(materialData.value).then(() => {
+    dialog.visible = false;
     dataList();
     ElMessage.success("操作成功");
-  })
+  });
 };
-const avueRowDel = (row,index) =>{
-  materialData.value.splice(index,1)
-}
-const rowDelObj = (row) =>{
+const avueRowDel = (row, index) => {
+  materialData.value.splice(index, 1);
+};
+const rowDelObj = (row) => {
   ElMessageBox.confirm("确定要删除记录吗？", "提示", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
     lockScroll: false,
   }).then(() => {
-    del({returnCode: row.returnCode}).then((res)=>{
+    del({ returnCode: row.returnCode }).then((res) => {
       ElMessage.success("操作成功");
-      dataList()
-    })
+      dataList();
+    });
   });
-}
+};
 // 传入一个url，后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
-    useCrud({
-      src: "/api/v1/ReturnDetails",
-    });
-const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } = Methords; //增删改查
+  useCrud({
+    src: "/api/v1/ReturnDetails",
+  });
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } =
+  Methords; //增删改查
 const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
 const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
-const crud = ref(null)
+const crud = ref(null);
 const crudSelect = (row) => {
-  alert(JSON.stringify(JSON.stringify(row)))
-}
-const searchCode = ()=>{
-  let params = {"code": scanInput.value}
+  alert(JSON.stringify(JSON.stringify(row)));
+};
+const searchCode = () => {
+  let params = { code: scanInput.value };
   let exists = false;
-  if(materialData.value){
-    materialData.value.forEach(item=>{
-      if(item.batchCode == scanInput.value){
+  if (materialData.value) {
+    materialData.value.forEach((item) => {
+      if (item.batchCode == scanInput.value) {
         exists = true;
       }
-    })
+    });
   }
-  if(exists){
-    scanInput.value = ''
+  if (exists) {
+    scanInput.value = "";
     return;
   }
-  scanItem(params).then((data)=>{
-    if(data.data){
+  scanItem(params).then((data) => {
+    if (data.data) {
       let obj = data.data;
-      materialData.value.push(
-          {"returnCode":currentCode.value,"materialCode": obj.materialCode,"materialName": obj.materialName,"batchCode" : scanInput.value,"num": 1,'materialModel': obj.spec,$cellEdit: true}
-      )
-      scanInput.value = ''
+      materialData.value.push({
+        returnCode: currentCode.value,
+        materialCode: obj.materialCode,
+        materialName: obj.materialName,
+        batchCode: scanInput.value,
+        num: 1,
+        materialModel: obj.spec,
+        $cellEdit: true,
+      });
+      scanInput.value = "";
     }
-  })
-}
-
-const scanInput = ref()
-const materialData = ref([
+  });
+};
 
-]);
+const scanInput = ref();
+const materialData = ref([]);
 const materialOption = ref({
   addBtn: false,
   saveBtn: false,
@@ -219,16 +246,17 @@ const materialOption = ref({
   editBtn: false,
   delBtn: false,
   column: [
-    { label: '物料编码', prop: 'materialCode', fixed: true },
-    { label: '物料名称', prop: 'materialName' },
-    { label: '物料型号', prop: 'materialModel',},
-    { label: '二维码', prop: 'batchCode' },
-    { label: '退回数量', prop: 'num' ,cell: true,
-      rules: [
-        { required: true, trigger: 'blur' }
-      ]
+    { label: "物料编码", prop: "materialCode", fixed: true },
+    { label: "物料名称", prop: "materialName" },
+    { label: "物料型号", prop: "materialModel" },
+    { label: "二维码", prop: "batchCode" },
+    {
+      label: "退回数量",
+      prop: "num",
+      cell: true,
+      rules: [{ required: true, trigger: "blur" }],
     },
-  ]
+  ],
 });
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
@@ -245,8 +273,11 @@ option.value = Object.assign(option.value, {
     },
     {
       label: "发送WMS",
-      type: 'select',
-      dicData: [{"label": "未发送","value": 0},{"label": "已发送","value": 1}],
+      type: "select",
+      dicData: [
+        { label: "未发送", value: 0 },
+        { label: "已发送", value: 1 },
+      ],
       prop: "state",
       addDisplay: false,
       editDisplay: false,