暂存

src/views/process/unRead/index.vue

@@ -224,7 +224,6 @@ export default {
             selection.forEach((a) => {
               sitem.id.push(a.id);
             });
-
             await this.set_status(title, type, sitem);
           } else {
             await this.set_status(title, type, {});

src/views/purchaseIn/purchaseOrder/columns.js

@@ -170,6 +170,7 @@ const columns = [
   },
 ]
 const statusOptions = [
+  { value: "0", label: "待与供应商确认" },
   { value: "1", label: "待发货" },
   { value: "2", label: "部分发货" },
   { value: "3", label: "发货完成" },

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -80,6 +80,18 @@
                       ).label || '--'
                     "
                   ></el-tag>
+                  <el-tooltip
+                    class="fr"
+                    v-if="powers.some((item) => item == '007')"
+                    effect="dark"
+                    content="已于供应商确认"
+                    placement="top"
+                  >
+                    <i
+                      class="el-icon-video-play tb-icon"
+                      @click="statusConfirm()"
+                    ></i>
+                  </el-tooltip>
                 </template>
                 <template slot="order_type">
                   <el-tag
@@ -135,7 +147,11 @@
                 :iscgd="true"
               />
             </el-collapse-item>
-            <el-collapse-item title="入库单" name="3">
+            <el-collapse-item
+              title="入库单"
+              name="3"
+              v-if="sitem&&sitem.status !== '0'"
+            >
               <order-in-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -147,6 +163,7 @@
             <el-collapse-item
               title="工差单"
               name="4"
+              v-if="sitem&&sitem.status !== '0' && sitem.status !== '1'"
             >
               <work-diff-table
                 :newTime="newTime"
@@ -258,60 +275,35 @@ export default {
       }
       this.loading = false;
     },
-    async statusConfirm(status, message) {
-      await this.$confirm(`确定要${message}？`, {
+    async statusConfirm() {
+      await this.$confirm(`确定已与供应商确认？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(async () => {
-          if (status === "-1") {
-            await this.deleteById(message);
+          let model = {
+            cgdNo: this.sitem.cgdNo,
+            status: "1",
+          };
+          const res = await asyncRequest.status(model);
+          this.loading = false;
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "提交成功！",
+              message: "",
+            });
+            await this.initData();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
           } else {
-            await this.setStatus(status, message);
+            this.$message.warning(res.message);
           }
         })
         .catch(() => {
           console.log("取消");
         });
     },
-
-    async deleteById(message) {
-      const res = await asyncRequest.delete({ id: this.queryId });
-      if (res && res.code === 0) {
-        this.$notify.success({
-          title: message + "成功！",
-          message: "",
-        });
-
-        this.routeGoto("check", {});
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
-
-    async setStatus(status, message, remark) {
-      let model = {
-        cgdNo: this.sitem.cgdNo,
-        remark: remark || "",
-        status: status,
-      };
-      const res = await asyncRequest.status(model);
-      this.loading = false;
-      if (res && res.code === 0) {
-        this.$notify.success({
-          title: message + "成功！",
-          message: "",
-        });
-        await this.initData();
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
   },
 };
 </script>

src/views/sellOut/sellAfterApply/detail.vue

@@ -22,9 +22,10 @@
                     :type="sitem.status == '0' ? 'warning' : ''"
                     v-text="
                       (
-                        statusOptions.find(
-                          (item) => item.value == sitem.status
-                        ) || {}
+                        (sitem.is_receive === '0'
+                          ? status1Options
+                          : status2Options
+                        ).find((item) => item.value == sitem.status) || {}
                       ).label || '--'
                     "
                   ></el-tag>
@@ -78,7 +79,7 @@
             <el-collapse-item title="商品信息" name="2">
               <show-goods-data-table
                 :newTime="newTime"
-                v-if="newTime !== ''"
+                v-if="newTime !== ''&&sitem"
                 :type="sitem.order_type"
                 :skucode="sitem.skuCode"
                 :spucode="sitem.good_code"
@@ -101,6 +102,7 @@
               title="采购审核"
               name="4"
               v-if="
+                sitem &&
                 sitem.order_type !== '1' &&
                 (status == '2' ||
                   status == '3' ||
@@ -119,7 +121,9 @@
               title="设置退货仓库"
               name="4"
               v-if="
-                sitem.order_type !== '1' && sitem.is_receive==='1'&&
+                sitem &&
+                sitem.order_type !== '1' &&
+                sitem.is_receive === '1' &&
                 ((status == '3' && powers.some((item) => item == '083')) ||
                   status == '4' ||
                   status == '5')
@@ -135,7 +139,7 @@
             <el-collapse-item
               title="用户退货"
               name="4"
-              v-if="sitem.order_type !== '1' && status == '4'"
+              v-if="sitem&&sitem.order_type !== '1' && status == '4'"
             >
               用户退货
             </el-collapse-item>
@@ -221,14 +225,26 @@ export default {
       sitem: null,
       newTime: "",
       loading: false,
-      statusOptions: [
-        { value: "1", label: "待业务审核" },
-        { value: "2", label: "待采购审核" },
-        { value: "3", label: "待设置仓库" },
-        { value: "4", label: "待客户退货" },
-        { value: "5", label: "售后已完成" },
-        { value: "6", label: "业务已驳回" },
-        { value: "7", label: "采购已驳回" },
+      // 收到货状态
+      status1Options: [
+        { id: "1", label: "待业务审核" },
+        { id: "2", label: "待采购审核" },
+        { id: "3", label: "待设置仓库" },
+        { id: "4", label: "待客户退货" },
+        { id: "5", label: "售后已完成" },
+        { id: "6", label: "业务已驳回" },
+        { id: "7", label: "采购已驳回" },
+        { id: "8", label: "申请已取消" },
+      ],
+      // 未收到货状态
+      statu2Options: [
+        { id: "1", label: "待业务审核" },
+        { id: "2", label: "待采购审核" },
+        { id: "3", label: "待同意退货" },
+        { id: "5", label: "售后已完成" },
+        { id: "6", label: "业务已驳回" },
+        { id: "7", label: "采购已驳回" },
+        { id: "8", label: "申请已取消" },
       ],
       orderCode: "",
       return_code: "",

src/views/sellOut/sellAfterApply/index.vue

@@ -160,9 +160,9 @@
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
+            :type="''"
             v-text="
-              (statusOptions.find((item) => item.id == scope.row.status) || {})
+              ((scope.row.is_receive==='0'?status1Options:status2Options).find((item) => item.id == scope.row.status) || {})
                 .label || '--'
             "
           ></el-tag>
@@ -258,8 +258,8 @@ export default {
         { id: "3", label: "供应商承担" },
       ],
       sitem: null,
-      // 状态
-      statusOptions: [
+      // 收到货状态
+      status1Options: [
         { id: "1", label: "待业务审核" },
         { id: "2", label: "待采购审核" },
         { id: "3", label: "待设置仓库" },
@@ -267,6 +267,17 @@ export default {
         { id: "5", label: "售后已完成" },
         { id: "6", label: "业务已驳回" },
         { id: "7", label: "采购已驳回" },
+        { id: "8", label: "申请已取消" },
+      ],
+       // 未收到货状态
+      status2Options: [
+        { id: "1", label: "待业务审核" },
+        { id: "2", label: "待采购审核" },
+        { id: "3", label: "待同意退货" },
+        { id: "5", label: "售后已完成" },
+        { id: "6", label: "业务已驳回" },
+        { id: "7", label: "采购已驳回" },
+        { id: "8", label: "申请已取消" },
       ],
       statusList: statusList,
       loading: false,