1

src/views/process/processApproval/index.vue

@@ -138,8 +138,7 @@
         <el-form :model="formShippingPackage.data" :rules="rulesShippingPackage" ref="shippingPackage">
           <div style="font-weight: 700; margin: 20px 0 10px 0">发货包装</div>
           <div style="margin-bottom: 10px">
-            <el-button type="primary" size="small" @click="clickSelectAssembly()">选择常用组合</el-button>
-            <el-button type="primary" size="small" @click="clickExpressPacking()">选择快递物流包材</el-button>
+            <el-button type="primary" size="small" @click="clickExpressPacking()">选择包材</el-button>
           </div>
           <el-table :data="formShippingPackage.data.orderPackageBomList" :row-style="{ height: '35px' }" header-row-class-name="tableHeader">
             <el-table-column label="品号" prop="code" width="160" />
@@ -206,38 +205,18 @@
         </el-form>
       </div>
       <template #footer>
-        <el-button type="primary" @click="clickSaveAssembly" v-preReClick>保存常用组合</el-button>
         <el-button @click="openShippingPackage = false">取 消</el-button>
         <el-button type="primary" @click="clickSaveShippingPackage" v-preReClick>保 存</el-button>
       </template>
     </el-dialog>
 
     <el-dialog title="选择快递包装" v-if="openExpressPacking" v-model="openExpressPacking" width="90%">
-      <SelectBOM :selectStatus="true" :expressStatus="true" @selectBOM="selectExpressPacking"></SelectBOM>
+      <SelectBOM :selectStatus="true" :bomClassifyIdList="[2, 3]" @selectBOM="selectExpressPacking"></SelectBOM>
       <template #footer>
         <el-button @click="openExpressPacking = false">关 闭</el-button>
       </template>
     </el-dialog>
 
-    <el-dialog title="保存常用组合" v-if="openAssembly" v-model="openAssembly" width="500">
-      <el-form :model="formShippingPackage.data" :rules="rulesAssembly" ref="assembly">
-        <el-form-item label="组合名称" prop="assemblyName">
-          <el-input v-model="formShippingPackage.data.assemblyName" placeholder="请输入组合名称" />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button @click="openAssembly = false">关 闭</el-button>
-        <el-button type="primary" @click="submitAssembly" v-preReClick>保 存</el-button>
-      </template>
-    </el-dialog>
-
-    <el-dialog title="选择常用组合" v-if="openSelectAssembly" v-model="openSelectAssembly" width="700">
-      <SelectAssembly @selectAssembly="selectAssembly"></SelectAssembly>
-      <template #footer>
-        <el-button @click="openSelectAssembly = false">关 闭</el-button>
-      </template>
-    </el-dialog>
-
     <el-dialog title="包装配置" v-if="openViewPackaging" v-model="openViewPackaging" width="80%">
       <div style="height: calc(100vh - 184px); overflow-y: auto; overflow-x: hidden">
         <div style="font-weight: 700; margin: 20px 0 10px 0">发货包装</div>
@@ -289,7 +268,6 @@ import Purchase from "/src/components/process/purchase";
 import Order from "/src/components/process/order";
 import refreshStore from "/src/store/modules/refresh";
 import SelectBOM from "/src/views/group/BOM/management/index";
-import SelectAssembly from "/src/components/selectAssembly/index";
 // 删除订单
 import OrderDelete from "/src/components/process/order-delete";
 import ReturnGoods from "/src/components/process/returnGoods.vue";
@@ -622,55 +600,6 @@ const handleAdhesiveSuccess = (UploadFile) => {
 const openFile = (path) => {
   window.open(path);
 };
-const openAssembly = ref(false);
-const rulesAssembly = ref({
-  assemblyName: [{ required: true, message: "请输入组合名称", trigger: "blur" }],
-});
-const clickSaveAssembly = () => {
-  if (formShippingPackage.data.orderPackageBomList && formShippingPackage.data.orderPackageBomList.length > 0) {
-    formShippingPackage.data.assemblyName = "";
-    openAssembly.value = true;
-  } else {
-    return ElMessage("请添加快递物流包材");
-  }
-};
-const submitAssembly = () => {
-  proxy.$refs.assembly.validate((valid) => {
-    if (valid) {
-      proxy
-        .post("/packagingAssembly/add", { name: formShippingPackage.data.assemblyName, packagingAssemblyBomList: formShippingPackage.data.orderPackageBomList })
-        .then(() => {
-          ElMessage({ message: "保存成功!", type: "success" });
-          openAssembly.value = false;
-        });
-    }
-  });
-};
-const openSelectAssembly = ref(false);
-const clickSelectAssembly = () => {
-  openSelectAssembly.value = true;
-};
-const selectAssembly = (item) => {
-  if (item.id) {
-    proxy.post("/packagingAssembly/getPackagingBomList", { id: item.id }).then((res) => {
-      if (res && res.length > 0) {
-        formShippingPackage.data.orderPackageBomList = res.map((resItem) => {
-          return {
-            bomSpecId: resItem.id,
-            code: resItem.code,
-            name: resItem.name,
-            internalSellingPrice: resItem.internalSellingPrice,
-            quantity: undefined,
-          };
-        });
-      }
-      ElMessage({ message: "选择完成", type: "success" });
-      openSelectAssembly.value = false;
-    });
-  } else {
-    return ElMessage("选择失败,请重新选择");
-  }
-};
 const clickSaveShippingPackage = () => {
   proxy.$refs.shippingPackage.validate((valid) => {
     if (valid) {

src/views/subsidiary/order/management/index.vue

@@ -389,12 +389,23 @@ const clickReset = () => {
   getList("", true);
 };
 const clickAddOrder = () => {
-  proxy.$router.replace({
-    path: "/addOrder",
-    query: {
-      random: proxy.random(),
-    },
-  });
+  if (proxy.useUserStore().user.userId === "1689164615204569090") {
+    proxy.$router.replace({
+      path: "/platform_manage/process/processApproval",
+      query: {
+        flowKey: "order",
+        flowName: "新建订单流程",
+        random: proxy.random(),
+      },
+    });
+  } else {
+    proxy.$router.replace({
+      path: "/addOrder",
+      query: {
+        random: proxy.random(),
+      },
+    });
+  }
 };
 const clickCode = (row) => {
   proxy.$router.replace({
@@ -421,14 +432,25 @@ const clickDelete = (row) => {
     .catch(() => {});
 };
 const clickUpdate = (row) => {
-  proxy.$router.replace({
-    path: "/addOrder",
-    query: {
-      id: row.id,
-      text: "编辑订单",
-      random: proxy.random(),
-    },
-  });
+  if (proxy.useUserStore().user.userId === "1689164615204569090") {
+    proxy.$router.replace({
+      path: "/platform_manage/process/processApproval",
+      query: {
+        flowKey: "order",
+        flowName: "新建订单流程",
+        random: proxy.random(),
+      },
+    });
+  } else {
+    proxy.$router.replace({
+      path: "/addOrder",
+      query: {
+        id: row.id,
+        text: "编辑订单",
+        random: proxy.random(),
+      },
+    });
+  }
 };
 const clickUpload = (row) => {
   proxy.$router.replace({
@@ -448,7 +470,7 @@ const judgeRoles = () => {
   let status = false;
   if (proxy.useUserStore().user.roles && proxy.useUserStore().user.roles.length > 0) {
     // let list = proxy.useUserStore().user.roles.filter((item) => ["purchasingOfficer", "sypurchasing", "bzpurchasing"].includes(item.roleKey));
-    let list = proxy.useUserStore().user.roles.filter((item) => item.roleName.includes('采购'));
+    let list = proxy.useUserStore().user.roles.filter((item) => item.roleName.includes("采购"));
     if (list && list.length > 0) {
       status = true;
     }