装箱出货删除功能

src/components/contractCom/contractDetailsOne.vue

@@ -7,7 +7,7 @@
       @tab-change="handleChange"
       stretch
     >
-      <el-tab-pane label="销售合同" name="first"></el-tab-pane>
+      <el-tab-pane label="样品单" name="first"></el-tab-pane>
       <el-tab-pane label="采购合同" name="second"></el-tab-pane>
       <el-tab-pane label="交易明细" name="third"></el-tab-pane>
     </el-tabs>

src/components/process/EHSD/ContractChange.vue

@@ -1711,9 +1711,9 @@ onMounted(() => {
   if (route.query && route.query.businessId && route.query.processType) {
     let businessId = route.query.businessId;
     proxy.post("/contract/detail", { id: businessId }).then((res) => {
-      if (res && res.dataJson) {
-        res = { ...res, ...JSON.parse(res.dataJson) };
-      }
+      // if (res && res.dataJson) {
+      //   res = { ...res, ...JSON.parse(res.dataJson) };
+      // }
       if (!res.fileList) {
         res.fileList = [];
       }

src/components/process/SendFunds.vue

@@ -1066,7 +1066,7 @@ const userList = ref([]);
 const formData = reactive({
   data: {
     currency: "CNY",
-    type: "2",
+    type: "4",
     paymentTime: "",
     departmentId: useUserStore().user.deptId,
     quantity: 0,

src/views/EHSD/saleContract/sampleEHSD/index.vue

@@ -147,7 +147,7 @@
     </el-dialog>
 
     <el-dialog
-      title="合同详情"
+      title="样品单详情"
       v-if="openDetailsDialog"
       v-model="openDetailsDialog"
       width="1100"

src/views/salesMange/shipmentMange/packing/index.vue

@@ -687,39 +687,39 @@ const config = computed(() => {
       // 渲染 el-button，一般用在最后一列。
       renderHTML(row) {
         return [
-          // {
-          //   attrs: {
-          //     label: "删除",
-          //     type: "primary",
-          //     text: true,
-          //     disabled: false,
-          //   },
-          //   el: "button",
-          //   click() {
-          //     ElMessageBox.confirm(
-          //       "此操作将永久作废该数据, 是否继续?",
-          //       "提示",
-          //       {
-          //         confirmButtonText: "确定",
-          //         cancelButtonText: "取消",
-          //         type: "warning",
-          //       }
-          //     ).then(() => {
-          //       // 删除
-          //       proxy
-          //         .post("/pack/delete", {
-          //           id: row.packId,
-          //         })
-          //         .then((res) => {
-          //           ElMessage({
-          //             message: "作废成功",
-          //             type: "success",
-          //           });
-          //           getList();
-          //         });
-          //     });
-          //   },
-          // },
+          {
+            attrs: {
+              label: "删除",
+              type: "primary",
+              text: true,
+              disabled: false,
+            },
+            el: "button",
+            click() {
+              ElMessageBox.confirm(
+                "此操作将永久作废该数据, 是否继续?",
+                "提示",
+                {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning",
+                }
+              ).then(() => {
+                // 删除
+                proxy
+                  .post("/pack/delete", {
+                    id: row.packId,
+                  })
+                  .then((res) => {
+                    ElMessage({
+                      message: "作废成功",
+                      type: "success",
+                    });
+                    getList();
+                  });
+              });
+            },
+          },
         ];
       },
     },