暂存

src/views/process/oing/index.vue

@@ -134,7 +134,7 @@ export default {
     };
   },
   mounted() {
-    this.searchProList();
+    // this.searchProList();
     this.searchList();
   },
   methods: {

src/views/purchaseIn/purchaseOrder/columns.js

@@ -1,4 +1,4 @@
-export default [
+const columns = [
   // {
   //   type: "expand",
   //   _slot_: "expand",
@@ -15,16 +15,7 @@ export default [
   //   label: "备库单编号",
   //   width: "155px",
   // },
-  {
-    prop: "supplierNo",
-    label: "采购供应商编号",
-    width: "145px",
-  },
-  {
-    prop: "supplier_name",
-    label: "采购供应商名称",
-    width: "155px",
-  },
+
 
   // {
   //   prop: "wsm_supplierNo",
@@ -137,11 +128,28 @@ export default [
     _slot_: "status",
     width: "110px",
   },
+  {
+    prop: "order_type",
+    label: "采购单来源",
+    _slot_: "order_type",
+    width: "110px",
+  },
+  
   // {
   //   prop: "lasttime",
   //   label: "预计最晚入库时间",
   //   width: "145px",
   // },
+  {
+    prop: "supplierNo",
+    label: "采购供应商编号",
+    width: "145px",
+  },
+  {
+    prop: "supplier_name",
+    label: "采购供应商名称",
+    width: "155px",
+  },
   {
     prop: "cgder",
     label: "采购员",
@@ -160,4 +168,26 @@ export default [
     width: "50px",
     _slot_: "operation",
   },
-]
+]
+const statusOptions = [
+  { value: "1", label: "待发货" },
+  { value: "2", label: "部分发货" },
+  { value: "3", label: "发货完成" },
+  { value: "4", label: "已取消订单" },
+];
+const order_type_options = [
+  {
+    value: "1",
+    label: "备货单",
+  },
+  {
+    value: "2",
+    label: "线上非库存品",
+  },
+  {
+    value: "3",
+    label: "咨询采返",
+  },
+  { value: "4", label: "项目采返" },
+];
+export { columns, statusOptions, order_type_options }

src/views/purchaseIn/purchaseOrder/components/ShowDataTableColumns.js

@@ -11,8 +11,9 @@ export default [
     span: 6
   },
   {
-    prop: "cgder",
-    label: "申请人",
+    prop: "order_type",
+    label: "采购单来源",
+    _slot_: "order_type",
     span: 6
   },
   {

src/views/purchaseIn/purchaseOrder/components/columns-table.js

@@ -61,9 +61,9 @@ export default {
       width: "155",
     },
     {
-      prop: "wsm_in_code",
+      prop: "sendtype_name",
       label: "发货方式",
-      width: "155",
+      width: "90",
     },
 
     {
@@ -78,9 +78,9 @@ export default {
       width: "110",
     },
     {
-      prop: "status",
-      label: "发货状态",
-      width: "100",
+      prop: "status_name",
+      label: "入库状态",
+      width: "120",
     },
 
     {

src/views/purchaseIn/purchaseOrder/components/order-in-table.vue

@@ -112,6 +112,33 @@ export default {
         product_go: [], //出库商品
       },
       tableFormThis: config.tableFormThis,
+      statusOptions: [
+        // { value: "0", label: "取消" },
+        {
+          value: "0",
+          label: "待发货",
+        },
+        {
+          value: "1",
+          label: "待验货",
+        },
+        {
+          value: "2",
+          label: "待审核",
+        },
+        {
+          value: "3",
+          label: "待入库",
+        },
+        {
+          value: "4",
+          label: "无退货入库成功",
+        },
+        // {
+        //   value: "5",
+        //   label: "退货成功",
+        // },
+      ],
       columns: config.columns,
     };
   },
@@ -140,7 +167,22 @@ export default {
           this.$refs.tableForm.clearValidate();
           const { status, child } = this.sitem;
           this.status = status;
+
           this.tableForm.product_go = child || [];
+          this.tableForm.product_go.forEach((e) => {
+            e.sendtype_name =
+              e.sendtype === "1"
+                ? "公司自提"
+                : e.sendtype === "2"
+                ? "供应商包邮"
+                : "--";
+            e.status_name =
+              (
+                this.statusOptions.find(
+                  (item) => item.value == e.status
+                ) || {}
+              ).label || "--";
+          });
         }
       });
     },

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -6,14 +6,20 @@
     >
       <p>{{ status }}---{{ powers }}</p>
       <div class="detail-page-title">
-        <span>采购单编号：</span><span>{{ queryId }}---{{ sitem.bkcode }}</span>
+        <span>采购单编号：</span
+        ><span
+          >{{ queryId }}
+          <!-- ---{{ sitem.bkcode }} -->
+        </span>
         <el-button
           type="primary"
           :size="'mini'"
           class="fr"
           v-if="
             (status === '1' || status === '2') &&
-            powers.some((item) => item == '007')&&sitem && sitem.noble_name
+            powers.some((item) => item == '007') &&
+            sitem &&
+            sitem.noble_name
           "
           style="margin: 0 0 0 12px"
           @click="diffAdd = true"
@@ -94,8 +100,7 @@
                     </el-popover>
                   </span>
                 </template>
-             
-             
+
                 <template slot="status">
                   <el-tag
                     :size="'mini'"
@@ -109,6 +114,28 @@
                     "
                   ></el-tag>
                 </template>
+                <template slot="order_type">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        order_type_options.find(
+                          (item) => item.value == sitem.order_type
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                  <el-popover placement="top" width="300"  v-if="sitem.order_type==='1'" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>备库单编号：</span
+                        ><span>{{ sitem.bkcode }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+
                 <template slot="wsm">
                   <span>{{ sitem.wsm_supplier }}/{{ sitem.wsm_name }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
@@ -125,7 +152,6 @@
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
                   </el-popover>
                 </template>
-            
               </show-data-table>
             </el-collapse-item>
             <el-collapse-item title="商品信息" name="2">
@@ -191,6 +217,7 @@ import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import orderInTable from "./components/order-in-table";
 import ShowDataTableColumns from "./components/ShowDataTableColumns";
 import orderAddeditModel from "./components/order-addedit-model";
+import { order_type_options, statusOptions } from "./columns";
 export default {
   name: "purchaseOrderDetail",
   mixins: [mixinPage, resToken],
@@ -223,27 +250,8 @@ export default {
       finishStatus: "finish",
       activeNames: ["0", "1", "2", "3", "4", "5", "10"],
       sitem: null,
-      statusOptions: [
-        { value: "1", label: "待发货" },
-        { value: "2", label: "部分发货" },
-        { value: "3", label: "发货完成" },
-        { value: "4", label: "已取消订单" },
-      ],
-      statusList: [
-        {
-          code: "1",
-          label: "待发货",
-        },
-        {
-          code: "2",
-          label: "部分发货",
-        },
-        {
-          code: "3",
-          label: "发货完成",
-        },
-        { value: "4", label: "已取消订单" },
-      ],
+      statusOptions: statusOptions,
+      order_type_options: order_type_options,
       status: "",
       newTime: "",
       loading: false,

src/views/purchaseIn/purchaseOrder/index.vue

@@ -168,7 +168,7 @@
             </el-row>
           </div>
         </template>
-           <template #good_name="{ scope }">
+        <template #good_name="{ scope }">
           <span>{{ scope.row.good_name }}</span>
           <span v-for="(si, i) in scope.row.speclist" :key="si.spec_id + i">
             <span v-if="i !== 0">-</span>
@@ -179,15 +179,26 @@
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
             v-text="
               (
-                statusOptions.find((item) => item.code == scope.row.status) ||
+                statusOptions.find((item) => item.value == scope.row.status) ||
                 {}
               ).label || '--'
             "
           ></el-tag>
         </template>
+        <template #order_type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                order_type_options.find(
+                  (item) => item.value == scope.row.order_type
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
         <template #operation="{ scope }">
           <el-tooltip
             v-if="powers.some((item) => item == '007')"
@@ -213,7 +224,7 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 
 import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
-import columns from "./columns"; //表格列参数
+import { columns, order_type_options, statusOptions } from "./columns";
 import { mapGetters } from "vuex";
 
 export default {
@@ -246,25 +257,8 @@ export default {
       options: ["创建时间", "最晚入库时间"],
       sselect: "创建时间",
       // 状态
-      statusOptions: [
-        {
-          code: "1",
-          label: "待发货",
-        },
-        {
-          code: "2",
-          label: "部分发货",
-        },
-        {
-          code: "3",
-          label: "发货完成",
-        },
-        {
-          code: "4",
-          label: "已取消订单",
-        },
-      ],
-
+      statusOptions: statusOptions,
+      order_type_options: order_type_options,
       loading: false,
       showModel: false,
       isDetail: false,

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-addEdit-form.vue

@@ -277,7 +277,6 @@ export default {
               sendtime,
               cgdNo,
               wsm_code,
-              send_num,
               wsend_num,
               sendtype,
             } = this.sitem;
@@ -293,7 +292,7 @@ export default {
               post_fee: post_fee || "",
               post_time: sendtime || "",
               sendtype: sendtype || "1",
-              send_num: send_num || "",
+              send_num: wsend_num || "1",
               status: "1",
             };
           }

src/views/sellOut/stockApply/columns.js

@@ -15,20 +15,20 @@ export default [
           'min-width':"120",
         },
         {
-          prop: "good_type_code",
-          label: "商品属性编码",
-          width:"140",
+          prop: "spuCode",
+          label: "SPU编码",
+          width:"155",
         },
         {
           prop: "good_num",
           label: "数量",
           'min-width':"50"
         },
-        {
-          prop: "lasttime",
-          label: "最晚入库时间",
-          width:"150",
-        },
+        // {
+        //   prop: "lasttime",
+        //   label: "最晚入库时间",
+        //   width:"150",
+        // },
         {
           prop: "status",
           label: "状态",

src/views/sellOut/stockApply/detail.vue

@@ -37,8 +37,17 @@
                 v-if="newTime != ''"
               />
             </el-collapse-item>
+            <el-collapse-item name="2" title="商品详情">
+              <show-goods-data-table
+                :newTime="newTime"
+                v-if="newTime !== ''"
+                :type="sitem.order_type"
+                :skucode="sitem.skuCode"
+                :spucode="sitem.good_code"
+              />
+            </el-collapse-item>
             <el-collapse-item
-              name="2"
+              name="3"
               title="发起审核流程"
               v-if="status === '0' && powers.some((item) => item == '012')"
             >
@@ -52,7 +61,7 @@
                 </el-button>
               </div>
             </el-collapse-item>
-            <el-collapse-item name="3" title="采购反馈" v-if="status !== '0'">
+            <el-collapse-item name="4" title="采购反馈" v-if="status !== '0'">
               <purchase-back
                 :sitem="sitem"
                 :id="queryId"