Merge branch 'sit' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into sit

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -175,33 +175,36 @@
                     stripe
                     style="width: 100%"
                   >
+                  <el-table-column
+                      prop="receipt_quantity"
+                      label="发货数量"
+                      show-overflow-tooltip
+                      width="150px"
+                    >
+                    </el-table-column>
                     <el-table-column
                       prop="contactor"
                       label="收货人"
                       show-overflow-tooltip
+                      width="100px"
                     >
                     </el-table-column>
                     <el-table-column
                       prop="mobile"
                       label="联系电话"
                       show-overflow-tooltip
+                      width="140px"
                     >
                     </el-table-column>
                     <el-table-column
                       prop="addr_code"
                       label="收货地址"
                       show-overflow-tooltip
-                      min-width="180px"
+                      min-width="500px"
                     >
                     </el-table-column>
 
-                    <el-table-column
-                      prop="receipt_quantity"
-                      label="发货数量"
-                      show-overflow-tooltip
-                      min-width="180px"
-                    >
-                    </el-table-column>
+                    
                   </el-table>
                 </template>
               </show-data-table>

src/views/sellOut/sellAfterApply/columns.js

@@ -1,4 +1,9 @@
 const columns = [
+  {
+    prop: "orderCode",
+    label: "订单编号",
+    width: "160"
+  },
   {
     prop: "returnCode",
     label: "售后申请单",

src/views/sellOut/sellAfterApply/index.vue

@@ -128,10 +128,10 @@
                       value="sellOutNum"
                     ></el-option>
 
-                    <!-- <el-option
+                    <el-option
                       label="销售订单编号"
                       value="sellOrderNum"
-                    ></el-option> -->
+                    ></el-option>
 
                     <el-option label="商品编号" value="goodsNum"></el-option>
                     <el-option label="商品名称" value="goodsName"></el-option>

src/views/standingBook/components/detail2/columns.js

@@ -87,12 +87,12 @@ const columns = [
     _slot_: "customer",
     span: 12
   },
-  {
-    prop: "addr_info",
-    label: "收货信息",
-    _slot_: "addr_info",
-    span: 24
-  },
+  // {
+  //   prop: "addr_info",
+  //   label: "收货信息",
+  //   _slot_: "addr_info",
+  //   span: 24
+  // },
 ]
 const statusOptions = [
   { value: "0", label: "待与供应商确认" },

src/views/standingBook/components/detail2/main.vue

@@ -125,7 +125,7 @@
         </el-popover>
       </template>
 
-      <template slot="addr_info">
+      <!-- <template slot="addr_info">
         <el-table
           :data="sitem.addr_info"
           :size="'mini'"
@@ -133,6 +133,13 @@
           stripe
           style="width: 100%"
         >
+        <el-table-column
+            prop="receipt_quantity"
+            label="发货数量"
+            show-overflow-tooltip
+            min-width="180px"
+          >
+          </el-table-column>
           <el-table-column
             prop="contactor"
             label="收货人"
@@ -141,23 +148,11 @@
           </el-table-column>
           <el-table-column prop="mobile" label="联系电话" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="addr_code"
-            label="收货地址"
-            show-overflow-tooltip
-            min-width="180px"
-          >
-          </el-table-column>
 
-          <el-table-column
-            prop="receipt_quantity"
-            label="发货数量"
-            show-overflow-tooltip
-            min-width="180px"
-          >
-          </el-table-column>
+
+          
         </el-table>
-      </template>
+      </template> -->
 
       <template slot="total_fee">
         <span