Merge branch 'dev' into sit

src/views/goodStore/goodsOffline/detail.vue

@@ -76,7 +76,7 @@ export default {
       //数据
       list:{},
       parmValue:{
-        code:this.$route.query.id
+        id:this.$route.query.id
       },
       activeName: '1',
       newTime: "",  

src/views/goodStore/goodsOffline/index.vue

@@ -82,7 +82,7 @@
         >
           <i
             class="el-icon-view tb-icon"
-            @click="getRouter('goodsOfflineDetail', scope.row.spuCode)"
+            @click="getRouter('goodsOfflineDetail', scope.row.id)"
           ></i>
         </el-tooltip>
     

src/views/process/columns.js

@@ -65,7 +65,7 @@ const routerList = [
     name: "商品下线流程",
     type: "GOL",
     toRouter: "/goodStore/goodsOfflineDetail",
-    to: "code",
+    to: "id",
   },
   {
     name: "活动流程",

src/views/reportQuery/test/components/detail2/columns.js

@@ -0,0 +1,101 @@
+const columns = [
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    span: 6
+  },
+  {
+    prop: "status",
+    label: "采购单状态",
+    _slot_: "status",
+    span: 6
+  },
+  {
+    prop: "order_type",
+    label: "采购单来源",
+    _slot_: "order_type",
+    span: 6
+  },
+  {
+    prop: "lasttime",
+    label: "要求入库时间",
+    span: 6
+  },
+ 
+  {
+    prop: "supplier_name",
+    label: "销售方公司",
+    _slot_: "supplier_name",
+  },
+  {
+    prop: "company",
+    label: "购买方公司",
+    _slot_: "company",
+  },
+
+  {
+    prop: "wsm",
+    label: "仓库信息",
+    _slot_: "wsm",
+  },
+ 
+ 
+ 
+  {
+    prop: "total_fee",
+    label: "采购总成本",
+    span: 6
+  },
+  {
+    prop: "good_price",
+    label: "采购单价",
+    span: 6
+  },
+  {
+    prop: "good_num",
+    label: "采购总数量",
+    span: 6
+  },
+  {
+    prop: "send_num",
+    label: "已发货数量",
+    span: 6
+  },
+  {
+    prop: "wsend_num",
+    label: "未发货数量",
+    span: 6
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
+  {
+    prop: "gold_price",
+    label: "当前实时金价",
+    _slot_: "gold_price",
+    span: 12
+  },
+  {
+    prop: "customer",
+    label: "订单客户名称",
+    _slot_: "customer",
+    span: 12
+  },
+  {
+    prop: "addr_info",
+    label: "收货信息",
+    _slot_: "addr_info",
+    span: 24
+  },
+]
+const statusOptions = [
+  { value: "0", label: "待与供应商确认" },
+  { value: "1", label: "待入库" },
+  { value: "2", label: "部分入库" },
+  { value: "3", label: "入库完成" },
+  { value: "4", label: "已取消订单" },
+];
+
+export { columns, statusOptions, }

src/views/reportQuery/test/components/detail2.vue → src/views/reportQuery/test/components/detail2/main.vue

@@ -1,8 +1,9 @@
 <template>
   <div>
+    
     <show-data-table
       :newTime="newTime"
-      v-if="newTime !== ''"
+      v-if="newTime !== '' && sitem"
       :sitem="sitem"
       :columns="columns"
     >
@@ -160,11 +161,82 @@
 </template>
 
 <script>
+import {columns, statusOptions,} from "./columns";
+import { cg_order_type_options } from "@/assets/js/statusList";
+
+//————————————————
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
+
+
 export default {
-  props: ["newTime", "sitem", "columns"],
+  mixins: [mixinPage, resToken],
+  props:["queryId"],
   data() {
-    return {};
+    return {
+      cg_order_type_options,
+      statusOptions,
+      cost_detailArr: [],
+
+      //——————————————————————
+      columns,
+      newTime: "",
+      sitem:null,
+      loading:false,
+    };
+  },
+  mounted(){
+    this.initData()
   },
+  methods:{
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async initData() {
+      this.loading = true;
+      const res = await asyncRequest.detail({ cgdNo: this.queryId });
+      if (res && res.code === 0 && res.data) {
+        this.sitem = res.data;
+        console.log("11111111111111111", this.sitem);
+        this.goldPrice();
+        const { status, can, cgdNo } = this.sitem;
+        this.status = status;
+        if (can && can.length > 0) {
+          this.sitem.class_cat = "";
+          can.forEach((x, i) => {
+            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
+        }
+        this.getNewTime();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+      this.loading = false;
+    },
+    async goldPrice() {
+      // console.log(this.sitem.order_type,"11111111111111111111111")
+      // if(this.sitem.order_type){}
+      // return;
+      let res = {};
+      let { order_type } = this.sitem;
+      console.log( order_type == "6")
+      if (order_type == "1" || order_type == "2" || order_type == "5"|| order_type == "6") {
+        res = await asyncRequest.cost_detail({ spuCode: this.sitem.spuCode });
+      } else {
+        res = await asyncRequest.cove_detail({ spuCode: this.sitem.spuCode });
+      }
+      if (res && res.code === 0 && res.data) {
+        this.cost_detailArr = res.data;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
+  }
 };
 </script>
 

src/views/reportQuery/test/components/detail3 - 副本 (3)/columns.js

@@ -0,0 +1,101 @@
+const columns = [
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    span: 6
+  },
+  {
+    prop: "status",
+    label: "采购单状态",
+    _slot_: "status",
+    span: 6
+  },
+  {
+    prop: "order_type",
+    label: "采购单来源",
+    _slot_: "order_type",
+    span: 6
+  },
+  {
+    prop: "lasttime",
+    label: "要求入库时间",
+    span: 6
+  },
+ 
+  {
+    prop: "supplier_name",
+    label: "销售方公司",
+    _slot_: "supplier_name",
+  },
+  {
+    prop: "company",
+    label: "购买方公司",
+    _slot_: "company",
+  },
+
+  {
+    prop: "wsm",
+    label: "仓库信息",
+    _slot_: "wsm",
+  },
+ 
+ 
+ 
+  {
+    prop: "total_fee",
+    label: "采购总成本",
+    span: 6
+  },
+  {
+    prop: "good_price",
+    label: "采购单价",
+    span: 6
+  },
+  {
+    prop: "good_num",
+    label: "采购总数量",
+    span: 6
+  },
+  {
+    prop: "send_num",
+    label: "已发货数量",
+    span: 6
+  },
+  {
+    prop: "wsend_num",
+    label: "未发货数量",
+    span: 6
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
+  {
+    prop: "gold_price",
+    label: "当前实时金价",
+    _slot_: "gold_price",
+    span: 12
+  },
+  {
+    prop: "customer",
+    label: "订单客户名称",
+    _slot_: "customer",
+    span: 12
+  },
+  {
+    prop: "addr_info",
+    label: "收货信息",
+    _slot_: "addr_info",
+    span: 24
+  },
+]
+const statusOptions = [
+  { value: "0", label: "待与供应商确认" },
+  { value: "1", label: "待入库" },
+  { value: "2", label: "部分入库" },
+  { value: "3", label: "入库完成" },
+  { value: "4", label: "已取消订单" },
+];
+
+export { columns, statusOptions, }

src/views/reportQuery/test/components/detail3 - 副本 (3)/main.vue

@@ -0,0 +1,244 @@
+<template>
+  <div>
+    
+    <show-data-table
+      :newTime="newTime"
+      v-if="newTime !== '' && sitem"
+      :sitem="sitem"
+      :columns="columns"
+    >
+      <template slot="supplier_name">
+        <span>{{ sitem.supplier_name }}</span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>销售方公司编号：</span><span>{{ sitem.supplierNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+      <template slot="company">
+        <span>{{ sitem.company }}</span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>购买方公司编号：</span><span>{{ sitem.companyNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+
+      <template slot="status">
+        <el-tag
+          :size="'mini'"
+          :type="sitem.status == '0' ? 'warning' : ''"
+          v-text="
+            (statusOptions.find((item) => item.value == sitem.status) || {})
+              .label || '--'
+          "
+        ></el-tag>
+      </template>
+      <template slot="order_type">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (
+              cg_order_type_options.find(
+                (item) => item.id == 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>
+        <el-popover
+          placement="top"
+          width="300"
+          v-if="sitem.order_type !== '1'"
+          trigger="hover"
+        >
+          <ul>
+            <li>
+              <span>订单编号：</span><span>{{ sitem.orderCode }}</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">
+          <ul>
+            <li>
+              <span>仓库公司编号：</span><span>{{ sitem.wsm_supplierNo }}</span>
+            </li>
+            <li>
+              <span>仓库名称编号：</span><span>{{ sitem.wsm_code }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+
+      <template slot="gold_price">
+        <div
+          v-if="
+            sitem.status == '0' &&
+            sitem.can[0].id == '6' &&
+            cost_detailArr.is_gold_price == '1'
+          "
+        >
+          {{ sitem.gold_price }}
+        </div>
+        <div v-else>----</div>
+      </template>
+      <template slot="customer">
+        <span>{{ sitem.customer.companyName }}</span>
+        <el-popover
+          placement="top"
+          width="300"
+          trigger="hover"
+          v-if="sitem.order_type != 1"
+        >
+          <ul>
+            <li>
+              <span>客户编号：</span><span>{{ sitem.customer.companyNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+
+      <template slot="addr_info">
+        <el-table
+          :data="sitem.addr_info"
+          :size="'mini'"
+          border
+          stripe
+          style="width: 100%"
+        >
+          <el-table-column
+            prop="contactor"
+            label="收货人"
+            show-overflow-tooltip
+          >
+          </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>
+    </show-data-table>
+  </div>
+</template>
+
+<script>
+import {columns, statusOptions,} from "./columns";
+import { cg_order_type_options } from "@/assets/js/statusList";
+
+//————————————————
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
+
+
+export default {
+  mixins: [mixinPage, resToken],
+  props:["queryId"],
+  data() {
+    return {
+      cg_order_type_options,
+      statusOptions,
+      cost_detailArr: [],
+
+      //——————————————————————
+      columns,
+      newTime: "",
+      sitem:null,
+      loading:false,
+    };
+  },
+  mounted(){
+    this.initData()
+  },
+  methods:{
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async initData() {
+      this.loading = true;
+      const res = await asyncRequest.detail({ cgdNo: this.queryId });
+      if (res && res.code === 0 && res.data) {
+        this.sitem = res.data;
+        console.log("11111111111111111", this.sitem);
+        this.goldPrice();
+        const { status, can, cgdNo } = this.sitem;
+        this.status = status;
+        if (can && can.length > 0) {
+          this.sitem.class_cat = "";
+          can.forEach((x, i) => {
+            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
+        }
+        this.getNewTime();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+      this.loading = false;
+    },
+    async goldPrice() {
+      // console.log(this.sitem.order_type,"11111111111111111111111")
+      // if(this.sitem.order_type){}
+      // return;
+      let res = {};
+      let { order_type } = this.sitem;
+      console.log( order_type == "6")
+      if (order_type == "1" || order_type == "2" || order_type == "5"|| order_type == "6") {
+        res = await asyncRequest.cost_detail({ spuCode: this.sitem.spuCode });
+      } else {
+        res = await asyncRequest.cove_detail({ spuCode: this.sitem.spuCode });
+      }
+      if (res && res.code === 0 && res.data) {
+        this.cost_detailArr = res.data;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
+  }
+};
+</script>
+
+<style>
+</style>

src/views/reportQuery/test/components/detail3 - 副本 (4)/columns.js

@@ -0,0 +1,101 @@
+const columns = [
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    span: 6
+  },
+  {
+    prop: "status",
+    label: "采购单状态",
+    _slot_: "status",
+    span: 6
+  },
+  {
+    prop: "order_type",
+    label: "采购单来源",
+    _slot_: "order_type",
+    span: 6
+  },
+  {
+    prop: "lasttime",
+    label: "要求入库时间",
+    span: 6
+  },
+ 
+  {
+    prop: "supplier_name",
+    label: "销售方公司",
+    _slot_: "supplier_name",
+  },
+  {
+    prop: "company",
+    label: "购买方公司",
+    _slot_: "company",
+  },
+
+  {
+    prop: "wsm",
+    label: "仓库信息",
+    _slot_: "wsm",
+  },
+ 
+ 
+ 
+  {
+    prop: "total_fee",
+    label: "采购总成本",
+    span: 6
+  },
+  {
+    prop: "good_price",
+    label: "采购单价",
+    span: 6
+  },
+  {
+    prop: "good_num",
+    label: "采购总数量",
+    span: 6
+  },
+  {
+    prop: "send_num",
+    label: "已发货数量",
+    span: 6
+  },
+  {
+    prop: "wsend_num",
+    label: "未发货数量",
+    span: 6
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
+  {
+    prop: "gold_price",
+    label: "当前实时金价",
+    _slot_: "gold_price",
+    span: 12
+  },
+  {
+    prop: "customer",
+    label: "订单客户名称",
+    _slot_: "customer",
+    span: 12
+  },
+  {
+    prop: "addr_info",
+    label: "收货信息",
+    _slot_: "addr_info",
+    span: 24
+  },
+]
+const statusOptions = [
+  { value: "0", label: "待与供应商确认" },
+  { value: "1", label: "待入库" },
+  { value: "2", label: "部分入库" },
+  { value: "3", label: "入库完成" },
+  { value: "4", label: "已取消订单" },
+];
+
+export { columns, statusOptions, }

src/views/reportQuery/test/components/detail3 - 副本 (4)/main.vue

@@ -0,0 +1,244 @@
+<template>
+  <div>
+    
+    <show-data-table
+      :newTime="newTime"
+      v-if="newTime !== '' && sitem"
+      :sitem="sitem"
+      :columns="columns"
+    >
+      <template slot="supplier_name">
+        <span>{{ sitem.supplier_name }}</span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>销售方公司编号：</span><span>{{ sitem.supplierNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+      <template slot="company">
+        <span>{{ sitem.company }}</span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>购买方公司编号：</span><span>{{ sitem.companyNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+
+      <template slot="status">
+        <el-tag
+          :size="'mini'"
+          :type="sitem.status == '0' ? 'warning' : ''"
+          v-text="
+            (statusOptions.find((item) => item.value == sitem.status) || {})
+              .label || '--'
+          "
+        ></el-tag>
+      </template>
+      <template slot="order_type">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (
+              cg_order_type_options.find(
+                (item) => item.id == 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>
+        <el-popover
+          placement="top"
+          width="300"
+          v-if="sitem.order_type !== '1'"
+          trigger="hover"
+        >
+          <ul>
+            <li>
+              <span>订单编号：</span><span>{{ sitem.orderCode }}</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">
+          <ul>
+            <li>
+              <span>仓库公司编号：</span><span>{{ sitem.wsm_supplierNo }}</span>
+            </li>
+            <li>
+              <span>仓库名称编号：</span><span>{{ sitem.wsm_code }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+
+      <template slot="gold_price">
+        <div
+          v-if="
+            sitem.status == '0' &&
+            sitem.can[0].id == '6' &&
+            cost_detailArr.is_gold_price == '1'
+          "
+        >
+          {{ sitem.gold_price }}
+        </div>
+        <div v-else>----</div>
+      </template>
+      <template slot="customer">
+        <span>{{ sitem.customer.companyName }}</span>
+        <el-popover
+          placement="top"
+          width="300"
+          trigger="hover"
+          v-if="sitem.order_type != 1"
+        >
+          <ul>
+            <li>
+              <span>客户编号：</span><span>{{ sitem.customer.companyNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+
+      <template slot="addr_info">
+        <el-table
+          :data="sitem.addr_info"
+          :size="'mini'"
+          border
+          stripe
+          style="width: 100%"
+        >
+          <el-table-column
+            prop="contactor"
+            label="收货人"
+            show-overflow-tooltip
+          >
+          </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>
+    </show-data-table>
+  </div>
+</template>
+
+<script>
+import {columns, statusOptions,} from "./columns";
+import { cg_order_type_options } from "@/assets/js/statusList";
+
+//————————————————
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
+
+
+export default {
+  mixins: [mixinPage, resToken],
+  props:["queryId"],
+  data() {
+    return {
+      cg_order_type_options,
+      statusOptions,
+      cost_detailArr: [],
+
+      //——————————————————————
+      columns,
+      newTime: "",
+      sitem:null,
+      loading:false,
+    };
+  },
+  mounted(){
+    this.initData()
+  },
+  methods:{
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async initData() {
+      this.loading = true;
+      const res = await asyncRequest.detail({ cgdNo: this.queryId });
+      if (res && res.code === 0 && res.data) {
+        this.sitem = res.data;
+        console.log("11111111111111111", this.sitem);
+        this.goldPrice();
+        const { status, can, cgdNo } = this.sitem;
+        this.status = status;
+        if (can && can.length > 0) {
+          this.sitem.class_cat = "";
+          can.forEach((x, i) => {
+            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
+        }
+        this.getNewTime();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+      this.loading = false;
+    },
+    async goldPrice() {
+      // console.log(this.sitem.order_type,"11111111111111111111111")
+      // if(this.sitem.order_type){}
+      // return;
+      let res = {};
+      let { order_type } = this.sitem;
+      console.log( order_type == "6")
+      if (order_type == "1" || order_type == "2" || order_type == "5"|| order_type == "6") {
+        res = await asyncRequest.cost_detail({ spuCode: this.sitem.spuCode });
+      } else {
+        res = await asyncRequest.cove_detail({ spuCode: this.sitem.spuCode });
+      }
+      if (res && res.code === 0 && res.data) {
+        this.cost_detailArr = res.data;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
+  }
+};
+</script>
+
+<style>
+</style>

src/views/reportQuery/test/components/detail3 - 副本 (5)/columns.js

@@ -0,0 +1,101 @@
+const columns = [
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    span: 6
+  },
+  {
+    prop: "status",
+    label: "采购单状态",
+    _slot_: "status",
+    span: 6
+  },
+  {
+    prop: "order_type",
+    label: "采购单来源",
+    _slot_: "order_type",
+    span: 6
+  },
+  {
+    prop: "lasttime",
+    label: "要求入库时间",
+    span: 6
+  },
+ 
+  {
+    prop: "supplier_name",
+    label: "销售方公司",
+    _slot_: "supplier_name",
+  },
+  {
+    prop: "company",
+    label: "购买方公司",
+    _slot_: "company",
+  },
+
+  {
+    prop: "wsm",
+    label: "仓库信息",
+    _slot_: "wsm",
+  },
+ 
+ 
+ 
+  {
+    prop: "total_fee",
+    label: "采购总成本",
+    span: 6
+  },
+  {
+    prop: "good_price",
+    label: "采购单价",
+    span: 6
+  },
+  {
+    prop: "good_num",
+    label: "采购总数量",
+    span: 6
+  },
+  {
+    prop: "send_num",
+    label: "已发货数量",
+    span: 6
+  },
+  {
+    prop: "wsend_num",
+    label: "未发货数量",
+    span: 6
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
+  {
+    prop: "gold_price",
+    label: "当前实时金价",
+    _slot_: "gold_price",
+    span: 12
+  },
+  {
+    prop: "customer",
+    label: "订单客户名称",
+    _slot_: "customer",
+    span: 12
+  },
+  {
+    prop: "addr_info",
+    label: "收货信息",
+    _slot_: "addr_info",
+    span: 24
+  },
+]
+const statusOptions = [
+  { value: "0", label: "待与供应商确认" },
+  { value: "1", label: "待入库" },
+  { value: "2", label: "部分入库" },
+  { value: "3", label: "入库完成" },
+  { value: "4", label: "已取消订单" },
+];
+
+export { columns, statusOptions, }

src/views/reportQuery/test/components/detail3 - 副本 (5)/main.vue

@@ -0,0 +1,244 @@
+<template>
+  <div>
+    
+    <show-data-table
+      :newTime="newTime"
+      v-if="newTime !== '' && sitem"
+      :sitem="sitem"
+      :columns="columns"
+    >
+      <template slot="supplier_name">
+        <span>{{ sitem.supplier_name }}</span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>销售方公司编号：</span><span>{{ sitem.supplierNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+      <template slot="company">
+        <span>{{ sitem.company }}</span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>购买方公司编号：</span><span>{{ sitem.companyNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+
+      <template slot="status">
+        <el-tag
+          :size="'mini'"
+          :type="sitem.status == '0' ? 'warning' : ''"
+          v-text="
+            (statusOptions.find((item) => item.value == sitem.status) || {})
+              .label || '--'
+          "
+        ></el-tag>
+      </template>
+      <template slot="order_type">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (
+              cg_order_type_options.find(
+                (item) => item.id == 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>
+        <el-popover
+          placement="top"
+          width="300"
+          v-if="sitem.order_type !== '1'"
+          trigger="hover"
+        >
+          <ul>
+            <li>
+              <span>订单编号：</span><span>{{ sitem.orderCode }}</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">
+          <ul>
+            <li>
+              <span>仓库公司编号：</span><span>{{ sitem.wsm_supplierNo }}</span>
+            </li>
+            <li>
+              <span>仓库名称编号：</span><span>{{ sitem.wsm_code }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+
+      <template slot="gold_price">
+        <div
+          v-if="
+            sitem.status == '0' &&
+            sitem.can[0].id == '6' &&
+            cost_detailArr.is_gold_price == '1'
+          "
+        >
+          {{ sitem.gold_price }}
+        </div>
+        <div v-else>----</div>
+      </template>
+      <template slot="customer">
+        <span>{{ sitem.customer.companyName }}</span>
+        <el-popover
+          placement="top"
+          width="300"
+          trigger="hover"
+          v-if="sitem.order_type != 1"
+        >
+          <ul>
+            <li>
+              <span>客户编号：</span><span>{{ sitem.customer.companyNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+
+      <template slot="addr_info">
+        <el-table
+          :data="sitem.addr_info"
+          :size="'mini'"
+          border
+          stripe
+          style="width: 100%"
+        >
+          <el-table-column
+            prop="contactor"
+            label="收货人"
+            show-overflow-tooltip
+          >
+          </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>
+    </show-data-table>
+  </div>
+</template>
+
+<script>
+import {columns, statusOptions,} from "./columns";
+import { cg_order_type_options } from "@/assets/js/statusList";
+
+//————————————————
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
+
+
+export default {
+  mixins: [mixinPage, resToken],
+  props:["queryId"],
+  data() {
+    return {
+      cg_order_type_options,
+      statusOptions,
+      cost_detailArr: [],
+
+      //——————————————————————
+      columns,
+      newTime: "",
+      sitem:null,
+      loading:false,
+    };
+  },
+  mounted(){
+    this.initData()
+  },
+  methods:{
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async initData() {
+      this.loading = true;
+      const res = await asyncRequest.detail({ cgdNo: this.queryId });
+      if (res && res.code === 0 && res.data) {
+        this.sitem = res.data;
+        console.log("11111111111111111", this.sitem);
+        this.goldPrice();
+        const { status, can, cgdNo } = this.sitem;
+        this.status = status;
+        if (can && can.length > 0) {
+          this.sitem.class_cat = "";
+          can.forEach((x, i) => {
+            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
+        }
+        this.getNewTime();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+      this.loading = false;
+    },
+    async goldPrice() {
+      // console.log(this.sitem.order_type,"11111111111111111111111")
+      // if(this.sitem.order_type){}
+      // return;
+      let res = {};
+      let { order_type } = this.sitem;
+      console.log( order_type == "6")
+      if (order_type == "1" || order_type == "2" || order_type == "5"|| order_type == "6") {
+        res = await asyncRequest.cost_detail({ spuCode: this.sitem.spuCode });
+      } else {
+        res = await asyncRequest.cove_detail({ spuCode: this.sitem.spuCode });
+      }
+      if (res && res.code === 0 && res.data) {
+        this.cost_detailArr = res.data;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
+  }
+};
+</script>
+
+<style>
+</style>

src/views/reportQuery/test/components/detail3 - 副本 (6)/columns.js

@@ -0,0 +1,101 @@
+const columns = [
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    span: 6
+  },
+  {
+    prop: "status",
+    label: "采购单状态",
+    _slot_: "status",
+    span: 6
+  },
+  {
+    prop: "order_type",
+    label: "采购单来源",
+    _slot_: "order_type",
+    span: 6
+  },
+  {
+    prop: "lasttime",
+    label: "要求入库时间",
+    span: 6
+  },
+ 
+  {
+    prop: "supplier_name",
+    label: "销售方公司",
+    _slot_: "supplier_name",
+  },
+  {
+    prop: "company",
+    label: "购买方公司",
+    _slot_: "company",
+  },
+
+  {
+    prop: "wsm",
+    label: "仓库信息",
+    _slot_: "wsm",
+  },
+ 
+ 
+ 
+  {
+    prop: "total_fee",
+    label: "采购总成本",
+    span: 6
+  },
+  {
+    prop: "good_price",
+    label: "采购单价",
+    span: 6
+  },
+  {
+    prop: "good_num",
+    label: "采购总数量",
+    span: 6
+  },
+  {
+    prop: "send_num",
+    label: "已发货数量",
+    span: 6
+  },
+  {
+    prop: "wsend_num",
+    label: "未发货数量",
+    span: 6
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
+  {
+    prop: "gold_price",
+    label: "当前实时金价",
+    _slot_: "gold_price",
+    span: 12
+  },
+  {
+    prop: "customer",
+    label: "订单客户名称",
+    _slot_: "customer",
+    span: 12
+  },
+  {
+    prop: "addr_info",
+    label: "收货信息",
+    _slot_: "addr_info",
+    span: 24
+  },
+]
+const statusOptions = [
+  { value: "0", label: "待与供应商确认" },
+  { value: "1", label: "待入库" },
+  { value: "2", label: "部分入库" },
+  { value: "3", label: "入库完成" },
+  { value: "4", label: "已取消订单" },
+];
+
+export { columns, statusOptions, }

src/views/reportQuery/test/components/detail3 - 副本 (6)/main.vue

@@ -0,0 +1,244 @@
+<template>
+  <div>
+    
+    <show-data-table
+      :newTime="newTime"
+      v-if="newTime !== '' && sitem"
+      :sitem="sitem"
+      :columns="columns"
+    >
+      <template slot="supplier_name">
+        <span>{{ sitem.supplier_name }}</span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>销售方公司编号：</span><span>{{ sitem.supplierNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+      <template slot="company">
+        <span>{{ sitem.company }}</span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>购买方公司编号：</span><span>{{ sitem.companyNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+
+      <template slot="status">
+        <el-tag
+          :size="'mini'"
+          :type="sitem.status == '0' ? 'warning' : ''"
+          v-text="
+            (statusOptions.find((item) => item.value == sitem.status) || {})
+              .label || '--'
+          "
+        ></el-tag>
+      </template>
+      <template slot="order_type">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (
+              cg_order_type_options.find(
+                (item) => item.id == 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>
+        <el-popover
+          placement="top"
+          width="300"
+          v-if="sitem.order_type !== '1'"
+          trigger="hover"
+        >
+          <ul>
+            <li>
+              <span>订单编号：</span><span>{{ sitem.orderCode }}</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">
+          <ul>
+            <li>
+              <span>仓库公司编号：</span><span>{{ sitem.wsm_supplierNo }}</span>
+            </li>
+            <li>
+              <span>仓库名称编号：</span><span>{{ sitem.wsm_code }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+
+      <template slot="gold_price">
+        <div
+          v-if="
+            sitem.status == '0' &&
+            sitem.can[0].id == '6' &&
+            cost_detailArr.is_gold_price == '1'
+          "
+        >
+          {{ sitem.gold_price }}
+        </div>
+        <div v-else>----</div>
+      </template>
+      <template slot="customer">
+        <span>{{ sitem.customer.companyName }}</span>
+        <el-popover
+          placement="top"
+          width="300"
+          trigger="hover"
+          v-if="sitem.order_type != 1"
+        >
+          <ul>
+            <li>
+              <span>客户编号：</span><span>{{ sitem.customer.companyNo }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+
+      <template slot="addr_info">
+        <el-table
+          :data="sitem.addr_info"
+          :size="'mini'"
+          border
+          stripe
+          style="width: 100%"
+        >
+          <el-table-column
+            prop="contactor"
+            label="收货人"
+            show-overflow-tooltip
+          >
+          </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>
+    </show-data-table>
+  </div>
+</template>
+
+<script>
+import {columns, statusOptions,} from "./columns";
+import { cg_order_type_options } from "@/assets/js/statusList";
+
+//————————————————
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
+
+
+export default {
+  mixins: [mixinPage, resToken],
+  props:["queryId"],
+  data() {
+    return {
+      cg_order_type_options,
+      statusOptions,
+      cost_detailArr: [],
+
+      //——————————————————————
+      columns,
+      newTime: "",
+      sitem:null,
+      loading:false,
+    };
+  },
+  mounted(){
+    this.initData()
+  },
+  methods:{
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async initData() {
+      this.loading = true;
+      const res = await asyncRequest.detail({ cgdNo: this.queryId });
+      if (res && res.code === 0 && res.data) {
+        this.sitem = res.data;
+        console.log("11111111111111111", this.sitem);
+        this.goldPrice();
+        const { status, can, cgdNo } = this.sitem;
+        this.status = status;
+        if (can && can.length > 0) {
+          this.sitem.class_cat = "";
+          can.forEach((x, i) => {
+            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
+        }
+        this.getNewTime();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+      this.loading = false;
+    },
+    async goldPrice() {
+      // console.log(this.sitem.order_type,"11111111111111111111111")
+      // if(this.sitem.order_type){}
+      // return;
+      let res = {};
+      let { order_type } = this.sitem;
+      console.log( order_type == "6")
+      if (order_type == "1" || order_type == "2" || order_type == "5"|| order_type == "6") {
+        res = await asyncRequest.cost_detail({ spuCode: this.sitem.spuCode });
+      } else {
+        res = await asyncRequest.cove_detail({ spuCode: this.sitem.spuCode });
+      }
+      if (res && res.code === 0 && res.data) {
+        this.cost_detailArr = res.data;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
+  }
+};
+</script>
+
+<style>
+</style>

src/views/reportQuery/test/components/detail3/columns.js

@@ -0,0 +1,123 @@
+const columns = [
+  {
+    prop: "wsm_in_code",
+    label: "入库单编号",
+    span: 6
+  },
+  {
+    prop: "status",
+    label: "入库单状态",
+    _slot_: "status",
+    span: 6
+  },
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    span: 6
+  },
+
+  {
+    prop: "order_type",
+    label: "采购单来源",
+    _slot_: "order_type",
+    span: 6
+  },
+  {
+    prop: "company",
+    label: "购买方公司",
+    _slot_: "company",
+  },
+  {
+    prop: "wsm",
+    label: "仓库信息",
+    _slot_: "wsm",
+  },
+  {
+    prop: "post_fee",
+    label: "快递费用",
+    span: 4
+  },
+  {
+    prop: "good_price",
+    label: "采购单价",
+    span: 4
+  },
+  {
+    prop: "good_num",
+    label: "采购总数",
+    span: 4
+  },
+
+  {
+    prop: "send_num",
+    label: "入库数量",
+    span: 4
+  },
+  {
+    prop: "sendtype",
+    label: "发货方式",
+    _slot_: "sendtype",
+    span: 4
+  },
+  {
+    prop: "apply_name",
+    label: "发货人",
+    span: 4
+  },
+  {
+    prop: "post_company",
+    label: "快递公司",
+    span: 6
+  },
+  {
+    prop: "post_code",
+    label: "快递编号",
+    span: 6
+  },
+
+
+  {
+    prop: "sendtime",
+    label: "发货时间",
+    span: 6
+  },
+
+
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
+]
+const statusOptions =  [
+  {
+    value: "0",
+    label: "待发货",
+  },
+  {
+    value: "1",
+    label: "待验货", //029
+  },
+  {
+    value: "2",
+    label: "待审核",
+  },
+  {
+    value: "3",
+    label: "待入库",
+  },
+  {
+    value: "4",
+    label: "入库完成",
+  },
+  {
+    value: "5", //30  || 32
+    label: "退货待物流",
+  },
+  {
+    value: "6",
+    label: "退货完成",
+  },
+];
+
+export { columns, statusOptions, }

src/views/reportQuery/test/components/detail3/main.vue

@@ -0,0 +1,126 @@
+<template>
+  <div>
+    <show-data-table
+      :newTime="newTime"
+      v-if="newTime !== '' && sitem"
+      :sitem="sitem"
+      :columns="columns"
+    >
+      <template slot="company">
+        <span>{{ sitem.company }}</span>
+        <el-popover placement="top" width="300" trigger="hover">
+          <ul>
+            <li>
+              <span>购买方公司编号：</span><span>{{ sitem.companyNo }}</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">
+          <ul>
+            <li>
+              <span>仓库公司编号：</span><span>{{ sitem.wsm_supplierNo }}</span>
+            </li>
+            <li>
+              <span>仓库名称编号：</span><span>{{ sitem.wsm_code }}</span>
+            </li>
+          </ul>
+          <i class="el-icon-warning-outline fr" slot="reference"></i>
+        </el-popover>
+      </template>
+      <template slot="status">
+        <el-tag
+          :size="'mini'"
+          :type="sitem.status == '0' ? 'warning' : ''"
+          v-text="
+            (statusOptions.find((item) => item.value == sitem.status) || {})
+              .label || '--'
+          "
+        ></el-tag>
+      </template>
+      <template slot="order_type">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (
+              cg_order_type_options.find(
+                (item) => item.id == sitem.order_type
+              ) || {}
+            ).label || '--'
+          "
+        ></el-tag>
+      </template>
+      <template slot="sendtype">
+        <span>{{
+          sitem.sendtype == "1"
+            ? "公司自提"
+            : sitem.sendtype === "2"
+            ? "供应商包邮"
+            : "--"
+        }}</span></template
+      >
+    </show-data-table>
+  </div>
+</template>
+
+<script>
+import { columns, statusOptions } from "./columns";
+import { cg_order_type_options } from "@/assets/js/statusList";
+
+//————————————————
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
+
+export default {
+  mixins: [mixinPage, resToken],
+  props: ["queryId"],
+  data() {
+    return {
+      cg_order_type_options,
+      statusOptions,
+      status: "",
+
+      //——————————————————————
+      columns,
+      newTime: "",
+      sitem: null,
+      loading: false,
+    };
+  },
+  mounted() {
+    this.initData();
+  },
+  methods: {
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async initData() {
+      const res = await asyncRequest.orderininfo({ wsm_in_code: this.queryId });
+      if (res && res.code === 0 && res.data) {
+        this.sitem = res.data;
+        const { status, can, wsm_in_code } = this.sitem;
+        this.status = status;
+        if (can && can.length > 0) {
+          this.sitem.class_cat = "";
+          can.forEach((x, i) => {
+            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
+        }
+        this.getNewTime();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
+
+  },
+};
+</script>
+
+<style>
+</style>

src/views/reportQuery/test/components/detail4/columns.js

@@ -0,0 +1,87 @@
+const columns = [
+  {
+    prop: "returnCode",
+    label: "采购退货单编号",
+    span: 6
+  },
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    span: 6
+  },
+  {
+    prop: "apply_name",
+    label: "申请人",
+    span: 6
+  },
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    span: 6
+  },
+
+  {
+    prop: "good_num",
+    label: "总采购数量",
+    span: 6
+  },
+  {
+    prop: "return_num",
+    label: "退货退货数量",
+    span: 6
+  },
+  {
+    prop: "good_price",
+    label: "采购单价",
+    span: 6
+  },
+  {
+    prop: "return_price",
+    label: "退货总金额",
+    span: 6
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
+  {
+    prop: "post_company",
+    label: "物流公司",
+    span: 6
+  },
+  {
+    prop: "post_code",
+    label: "物流编号",
+    span: 12,
+  },
+  {
+    prop: "return_contactor",
+    label: "退货联系人",
+    span: 6
+  },
+  {
+    prop: "return_mobile",
+    label: "退货联系电话",
+    span: 6
+  },
+  {
+    prop: "return_addr",
+    label: "退货地址",
+    span: 12,
+  },
+  {
+    prop: "error_remark",
+    label: "退货备注",
+    span: 24,
+  },
+]
+const statusOptions = [
+  // { value: "0", label: "取消" },
+  // { value: "1", label: "待业务审核" },
+  // { value: "2", label: "通知财务部门" },
+  { value: "1", label: "采购退货成功" },
+];
+
+export { columns, statusOptions, }

src/views/reportQuery/test/components/detail4/main.vue

@@ -0,0 +1,92 @@
+<template>
+  <div>
+    
+
+
+    <show-data-table
+                :newTime="newTime"
+      v-if="newTime !== '' && sitem"
+      :sitem="sitem"
+      :columns="columns"
+              >
+                <template slot="status">
+                  <el-tag
+                    :size="'mini'"
+                    :type="sitem.status == '0' ? 'warning' : ''"
+                    v-text="
+                      (
+                        statusOptions.find(
+                          (item) => item.value == sitem.status
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template>
+              </show-data-table>
+  </div>
+</template>
+
+<script>
+import {columns, statusOptions,} from "./columns";
+import { cg_order_type_options } from "@/assets/js/statusList";
+
+//————————————————
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseReturn";
+
+
+export default {
+  mixins: [mixinPage, resToken],
+  props:["queryId"],
+  data() {
+    return {
+      cg_order_type_options,
+      statusOptions,
+      status:"",
+      orderCode: "",
+
+      //——————————————————————
+      columns,
+      newTime: "",
+      sitem:null,
+      loading:false,
+    };
+  },
+  mounted(){
+    this.initData()
+  },
+  methods:{
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async initData() {
+      this.loading = true;
+      const res = await asyncRequest.detail({ returnCode: this.queryId });
+      if (res && res.code === 0 && res.data) {
+        this.sitem = res.data;
+        const { can, status, bk_code } = this.sitem;
+        this.status = status;
+        this.orderCode = bk_code;
+        if (can && can.length > 0) {
+          this.sitem.class_cat = "";
+          can.forEach((x, i) => {
+            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
+        }
+        this.getNewTime();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.sitem = {};
+        this.status = 0;
+      }
+      this.loading = false;
+    },
+
+  }
+};
+</script>
+
+<style>
+</style>

src/views/reportQuery/test/components/detail5/columns.js

@@ -0,0 +1,73 @@
+const columns = [
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    span: 6
+  },
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    span: 6
+  },
+  {
+    prop: "apply_name",
+    label: "申请人",
+    span: 6
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
+  {
+    prop: "order_type",
+    label: "采购单类型",
+    _slot_: "order_type",
+    span: 6
+  },
+  {
+    prop: "diff_weight",
+    label: "重量工差",
+    span: 6
+  },
+  {
+    prop: "diff_price",
+    label: "金额差价",
+    span: 6
+  },
+  {
+    prop: "gold_price",
+    label: "实时金价",
+    span: 6
+  },
+  {
+    prop: "diff_is_act",
+    label: "客户反馈",
+    _slot_: "diff_is_act",
+    span: 6
+  },
+  {
+    prop: "diff_customer_remark",
+    label: "客户意愿",
+    _slot_: "diff_customer_remark",
+    span: 6
+  },
+  {
+    prop: "diff_remark",
+    label: "业务审核备注",
+    span: 12
+  },
+
+
+
+
+
+
+]
+const statusOptions = [
+  { id: "1", label: "待业务部门审核" },
+        { id: "2", label: "工差单审核完成" },
+];
+
+export { columns, statusOptions, }

src/views/reportQuery/test/components/detail5/main.vue

@@ -0,0 +1,150 @@
+<template>
+  <div>
+    
+
+    <show-data-table
+      :newTime="newTime"
+      v-if="newTime !== '' && sitem"
+      :sitem="sitem"
+      :columns="columns"
+    >
+      <template slot="status">
+        <el-tag
+          :size="'mini'"
+          :type="sitem.status == '0' ? 'warning' : ''"
+          v-text="
+            (statusOptions.find((item) => item.id === sitem.status) || {})
+              .label || '--'
+          "
+        ></el-tag>
+      </template>
+      <template slot="order_type">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (
+              cg_order_type_options.find(
+                (item) => item.id === sitem.order_type
+              ) || {}
+            ).label || '--'
+          "
+        ></el-tag>
+      </template>
+      <template slot="diff_is_act">
+        <el-tag
+          :size="'mini'"
+          v-text="
+            (
+              is_act_options.find((item) => item.value === sitem.diff_is_act) ||
+              {}
+            ).label || '--'
+          "
+        ></el-tag>
+      </template>
+      <template slot="diff_customer_remark">
+        <el-tag
+          :size="'mini'"
+          v-if="sitem.diff_is_act === '1'"
+          v-text="
+            (
+              customer_remark_options.find(
+                (item) => item.value === sitem.diff_customer_remark
+              ) || {}
+            ).label || '--'
+          "
+        ></el-tag>
+        <el-tag :size="'mini'" v-else v-text="'--'"></el-tag>
+      </template>
+    </show-data-table>
+  </div>
+</template>
+
+<script>
+import { columns, statusOptions } from "./columns";
+import { cg_order_type_options } from "@/assets/js/statusList";
+
+//————————————————
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/purchaseIn/purchaseDiffOrder";
+
+export default {
+  mixins: [mixinPage, resToken],
+  props: ["queryId"],
+  data() {
+    return {
+      cg_order_type_options,
+      statusOptions,
+      status: "",
+      orderCode:"",
+      customer_remark_options: [
+        {
+          value: "1",
+          label: "竞价订单减工差",
+        },
+        {
+          value: "2",
+          label: "竞价订单不减工差",
+        },
+      ],
+      is_act_options: [
+        {
+          value: "1",
+          label: "接受工差",
+        },
+        {
+          value: "2",
+          label: "不接受工差-退回重做",
+        },
+      ],
+      //——————————————————————
+      columns,
+      newTime: "",
+      sitem: null,
+      loading: false,
+    };
+  },
+  mounted() {
+    this.initData();
+  },
+  methods: {
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+    async initData() {
+      this.loading = true;
+      const res = await asyncRequest.detail({ id: this.queryId });
+      if (res && res.code === 0 && res.data) {
+        this.sitem = res.data;
+
+        const { can, status, cgdNo } = this.sitem;
+        this.status = status;
+        this.orderCode = cgdNo;
+        if (can && can.length > 0) {
+          this.sitem.class_cat = "";
+          can.forEach((x, i) => {
+            this.sitem.class_cat += i === 0 ? x.name : "/" + x.name;
+          });
+        }
+
+        this.getNewTime();
+        // if (this.order_type === "2") {
+        //   this.order_type = res.data.cgdNo;
+        //   this.statusOptions.unshift({ value: "0", label: "竞价单" });
+        // }
+        // this.order_type === "1" ? "CGGCD" : "ZXGCD";
+        // this.order_type = res.data.order_type;
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+      this.loading = false;
+    },
+
+  },
+};
+</script>
+
+<style>
+</style>

src/views/reportQuery/test/detail.vue

@@ -29,16 +29,25 @@
               >
               </editPrice>
             </el-collapse-item> -->
-            <el-collapse-item title="采购单信息" name="2">
-              <!-- <detail2
-                :newTime="newTime"
-                :sitem="本条数据"
-                :columns="cgd_detail2"
-              >
-              </detail2> -->
+            <el-collapse-item title="采购单信息" name="2" v-if="newTime!==''">
+              <detail2 queryId="CG2206230923441071">
+              </detail2>
+            </el-collapse-item>
+
+            <el-collapse-item title="采购入库单信息" name="3" v-if="newTime!==''">
+              <detail3 queryId="CF2206231840116680">
+              </detail3>
             </el-collapse-item>
             
-          </el-collapse>
+            <el-collapse-item title="采购退货单信息" name="4" v-if="newTime!==''">
+              <detail4 queryId="CR2206021737423153">
+              </detail4>
+            </el-collapse-item>
+            <el-collapse-item title="采购工差单信息" name="5" v-if="newTime!==''">
+              <detail5 queryId="2">
+              </detail5>
+            </el-collapse-item>
+        </el-collapse>
   
     </div>
 
@@ -46,17 +55,23 @@
 </template>
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
-import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/reportQuery/saleReport";
-import { cgd_detail2 } from "./columns";
+
+import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
-import detail2 from "./components/detail2.vue"
+import detail2 from "./components/detail2/main.vue"
+import detail3 from "./components/detail3/main.vue"
+import detail4 from "./components/detail4/main.vue"
+import detail5 from "./components/detail5/main.vue"
 
 export default {
   name: "test",
   mixins: [mixinPage, resToken],
   components: {
     detail2,
+    detail3,
+    detail4,
+    detail5,
   },
 
   computed: {
@@ -76,12 +91,7 @@ export default {
   data() {
     return {
       newTime: "",
-      activeNames: ["1"],
-
-
-
-      cgd_detail2,
-      // row:this.$router.query.row
+      activeNames: ["2"],
     };
   },
   mounted() {