暂存

src/views/purchaseIn/purchaseOrder/components/tolerance.vue

@@ -0,0 +1,43 @@
+<template>
+  <span>
+    <el-button
+      type="primary"
+      :size="'mini'"
+      class="fr"
+      style="margin: 0 0 0 12px"
+      @click="diffAdd = true"
+      >填写总工差</el-button
+    >
+    <add-edit-model
+      :sitem="sitem"
+      :show-model="diffAdd"
+      @refresh="initData"
+      @cancel="diffAdd = false"
+    />
+  </span>
+</template>
+
+<script>
+import addEditModel from "@/views/purchaseIn/purchaseDiffOrder/addEditModel";
+
+export default {
+  components: {
+    addEditModel,
+  },
+  props: ["id", "sitem", "newTime"],
+  mixins: [resToken],
+  data() {
+    return {
+      diffAdd: false,
+    };
+  },
+  mounted: {
+    initData() {
+      console.log("34");
+    },
+  },
+};
+</script>
+
+<style  lang="scss" scoped>
+</style>

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -20,14 +20,14 @@
             sitem.noble_name
           " -->
 
-        <el-button
+        <!-- <el-button
           type="primary"
           :size="'mini'"
           class="fr"
           style="margin: 0 0 0 12px"
           @click="diffAdd = true"
           >填写总工差</el-button
-        >
+        > -->
       </div>
       <!-- <status-bar
         v-if="newTime !== ''"
@@ -164,12 +164,6 @@
           />
         </el-tab-pane>
       </el-tabs>
-      <add-edit-model
-        :sitem="sitem"
-        :show-model="diffAdd"
-        @refresh="initData"
-        @cancel="diffAdd = false"
-      />
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -183,13 +177,12 @@ import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import orderInTable from "./components/order-in-table";
 import ShowDataTableColumns from "./components/ShowDataTableColumns";
 import { order_type_options, statusOptions } from "./columns";
-import addEditModel from "@/views/purchaseIn/purchaseDiffOrder/addEditModel";
+
 export default {
   name: "purchaseOrderDetail",
   mixins: [mixinPage, resToken],
   components: {
     orderInTable,
-    addEditModel,
   },
 
   computed: {
@@ -219,7 +212,6 @@ export default {
       newTime: "",
       loading: false,
       queryId: "",
-      diffAdd: false,
       orderCode: "",
       ReturnAddModel: false, //采购单退货弹窗
     };

src/views/sellOut/sellAfterApply/detail.vue

@@ -218,7 +218,7 @@ export default {
         { value: "1", label: "待业务审核" },
         { value: "2", label: "待采购审核" },
         { value: "3", label: "待设置仓库" },
-        { value: "4", label: "待退回商品" },
+        { value: "4", label: "待客户退货" },
         { value: "5", label: "售后已完成" },
         { value: "6", label: "业务已驳回" },
         { value: "7", label: "采购已驳回" },

src/views/sellOut/sellAfterApply/index.vue

@@ -263,9 +263,10 @@ export default {
         { id: "1", label: "待业务审核" },
         { id: "2", label: "待采购审核" },
         { id: "3", label: "待设置仓库" },
-        { id: "4", label: "售后已完成" },
-        { id: "5", label: "业务已驳回" },
-        { id: "6", label: "采购已驳回" },
+        { id: "4", label: "待客户退货" },
+        { id: "5", label: "售后已完成" },
+        { id: "6", label: "业务已驳回" },
+        { id: "7", label: "采购已驳回" },
       ],
       statusList: statusList,
       loading: false,