暂存

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -9,7 +9,6 @@
       style="width: 100%"
       row-key="key"
     >
-
       <el-table-column
         show-overflow-tooltip
         prop="outCode"
@@ -17,18 +16,6 @@
         width="155"
       />
 
-      <el-table-column
-        show-overflow-tooltip
-        prop="post_name"
-        label="物流公司"
-        min-width="110"
-      />
-      <el-table-column
-        show-overflow-tooltip
-        prop="post_code"
-        label="物流单号"
-        width="160"
-      />
       <el-table-column
         show-overflow-tooltip
         prop="status"
@@ -36,7 +23,7 @@
         width="80"
       >
         <template slot-scope="scope">
-          {{scope.row.status}}
+          {{ scope.row.status }}
           <el-tag
             :size="tablebtnSize"
             :type="scope.row.status == '0' ? 'warning' : ''"
@@ -56,7 +43,7 @@
       />
       <el-table-column
         show-overflow-tooltip
-        prop="contact"
+        prop="contactor"
         label="联系人"
         width="80"
       />
@@ -76,6 +63,18 @@
           {{ scope.row.addr_info }}{{ scope.row.addr }}
         </template>
       </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        prop="post_name"
+        label="物流公司"
+        min-width="110"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="post_code"
+        label="物流单号"
+        width="160"
+      />
       <el-table-column
         show-overflow-tooltip
         prop="sendtime"
@@ -86,7 +85,8 @@
         fixed="right"
         width="50"
         v-if="
-          ((status === '0'||status === '1') && powers.some((item) => item == '048')) ||
+          ((status === '0' || status === '1') &&
+            powers.some((item) => item == '048')) ||
           powers.some((item) => item == '007')
         "
       >
@@ -94,7 +94,10 @@
           <el-tooltip
             style="margin: 3px 0 0 0"
             effect="dark"
-            v-if="(status === '0'||status === '1')&& powers.some((item) => item == '048')"
+            v-if="
+              (status === '0' || status === '1') &&
+              powers.some((item) => item == '048')
+            "
             content="添加"
             placement="top"
           >

src/views/sellOut/sellOutOrder/detail.vue

@@ -70,6 +70,7 @@
               name="3"
               v-if="status === '0' && powers.some((item) => item == '080')"
             >
+            11
               <want-deliver
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -153,9 +154,11 @@ export default {
       showModel: false,
       loading: false,
       statusOptions: [
-        { value: "0", label: "待库管发货" },
-        { value: "1", label: "待客户验收" },
-        { value: "2", label: "订单出库完成" },
+        { value: "0", label: "待发货" },
+        { value: "1", label: "待库管发货" },
+        { value: "2", label: "待收货" },
+        { value: "3", label: "已收货" },
+        { value: "4", label: "已全部退货" },
       ],
       code: "",
       did: "", //详情页上的id