src/views/standingBook/columns.js

@@ -54,30 +54,30 @@ const schTahead = [
     t1:"方便统一修改、留存",
     minWidth:155,
   },
-  {
-    prop: "outCode",
-    label: "发货申请单",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
-  {
-    prop: "returnCode",
-    label: "售后申请单",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
-  {
-    prop: "thNo",
-    label: "售后退货单",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
-  {
-    prop: "returnGoodCode",
-    label: "退货单",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
+  // {
+  //   prop: "outCode",
+  //   label: "发货申请单",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
+  // {
+  //   prop: "returnCode",
+  //   label: "售后申请单",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
+  // {
+  //   prop: "thNo",
+  //   label: "售后退货单",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
+  // {
+  //   prop: "returnGoodCode",
+  //   label: "退货单",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
   {
     prop: "cgdNo",
     label: "采购单",
@@ -85,18 +85,18 @@ const schTahead = [
     minWidth:155,
   },
 
-  {
-    prop: "wsm_in_code",
-    label: "采购入库单",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
-  {
-    prop: "cgdReturnCode",
-    label: "采购退货单",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
+  // {
+  //   prop: "wsm_in_code",
+  //   label: "采购入库单",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
+  // {
+  //   prop: "cgdReturnCode",
+  //   label: "采购退货单",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
   {
     prop: "spuCode",
     label: "成本商品",
@@ -176,37 +176,37 @@ const columns = [
     t1:"方便统一修改、留存",
     minWidth:155,
   },
-  {
-    prop: "outCode",
-    label: "发货申请单编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
-  {
-    prop: "returnCode",
-    label: "售后申请单编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
-  {
-    prop: "thNo",
-    label: "售后退货单编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
+  // {
+  //   prop: "outCode",
+  //   label: "发货申请单编号",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
+  // {
+  //   prop: "returnCode",
+  //   label: "售后申请单编号",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
+  // {
+  //   prop: "thNo",
+  //   label: "售后退货单编号",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
   
-  {
-    prop: "returnGoodCode",
-    label: "退货单编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
-  {
-    prop: "sale_diff_id",
-    label: "工差单id",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
+  // {
+  //   prop: "returnGoodCode",
+  //   label: "退货单编号",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
+  // {
+  //   prop: "sale_diff_id",
+  //   label: "工差单id",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
   {
     prop: "cgdNo",
     label: "采购单编号",
@@ -214,29 +214,29 @@ const columns = [
     minWidth:155,
   },
 
-  {
-    prop: "wsm_in_code",
-    label: "采购入库单编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
-  {
-    prop: "cgdReturnCode",
-    label: "采购退货单编号",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
-  {
-    prop: "cgd_diff_id",
-    label: "采购工差单id",
-    t1:"方便统一修改、留存",
-    minWidth:155,
-  },
+  // {
+  //   prop: "wsm_in_code",
+  //   label: "采购入库单编号",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
+  // {
+  //   prop: "cgdReturnCode",
+  //   label: "采购退货单编号",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
+  // {
+  //   prop: "cgd_diff_id",
+  //   label: "采购工差单id",
+  //   t1:"方便统一修改、留存",
+  //   minWidth:155,
+  // },
   {
     prop: "spuCode",
     label: "成本商品编码",
     t1:"方便统一修改、留存",
-    minWidth:155,
+    minWidth:165,
   },
   {
     prop: "skuCode",

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

@@ -123,4 +123,131 @@ const statusOptions = [
   },
 ];
 
-export { columns, statusOptions, }
+const listColumns = [
+  // {
+  //   type: "selection",
+  //   fixed: "left",
+  //   _noset_: true
+  // },
+  {
+    prop: "outCode",
+    label: "发货申请单编号",
+    width: "156"
+  },
+
+  {
+    prop: "orderCode",
+    label: "订单编号",
+    width: "156"
+  },
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    width: "156"
+  },
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
+  },
+
+  {
+    prop: "apply_name",
+    label: "申请人",
+    width: "70px",
+  },
+  // {
+  //   prop: "orderCode",
+  //   label: "销售订单编号",
+  //   width: "160"
+  // },
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "120px",
+  },
+
+  {
+    prop: "send_num",
+    label: "出库总数",
+  },
+  {
+    prop: "good_class",
+    label: "商品分类",
+    width: "150"
+  },
+  {
+    prop: "good_code",
+    label: "商品编码",
+    width: "140"
+  },
+  {
+    prop: "good_name",
+    label: "商品名称",
+    width: "150"
+  },
+  // {
+  //   prop: "supplierNo",
+  //   label: "供应商编码",
+  //   width: "160"
+  // },
+
+
+  {
+    prop: "customer_code",
+    label: "客户编码",
+    width: "150"
+  },
+  {
+    prop: "companyName",
+    label: "客户名称",
+    width: "200"
+  },
+  // {
+  //   prop: "contactor",
+  //   label: "联系人",
+  // },
+  // {
+  //   prop: "mobile",
+  //   label: "联系电话",
+  //   width: "100"
+  // },
+  {
+    prop: "post_name",
+    label: "物流公司",
+  },
+  {
+    prop: "post_code",
+    label: "物流单号",
+  },
+  {
+    prop: "post_fee",
+    label: "物流费用",
+  },
+  {
+    prop: "sendtime",
+    label: "发货时间",
+    width: "140"
+  },
+  {
+    prop: "send_num",
+    label: "发货数量",
+  },
+  {
+    prop: "addtime",
+    label: "添加时间",
+    width: 150,
+  },
+  {
+    prop: "",
+    label: "操作",
+    fixed: "right",
+    _noset_: true,
+    _slot_: "operation",
+    width: 50,
+  },
+]
+
+
+export { columns, statusOptions, listColumns}

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

@@ -1,6 +1,7 @@
 <template>
   <div>
-    <detailDatatable
+    <el-dialog title="详情" :visible.sync="dialogTableVisible" width="1280px">
+<detailDatatable
       :newTime="newTime"
       v-if="newTime !== ''"
       :sitem="sitem"
@@ -40,11 +41,62 @@
         }}</span>
       </template>
     </detailDatatable>
+</el-dialog>
+    
+
+
+    <ex-table
+        v-loading="loading"
+        
+        :table="table"
+        :data="tableData"
+        :columns="listColumns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @selection="selection_change"
+      >
+
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (listStatusOptions.find((item) => item.id == scope.row.status) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+      
+        <template #operation="{ scope }">
+          <el-tooltip
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="dilog(scope.row.outCode)"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
   </div>
 </template>
 
 <script>
-import { columns, statusOptions } from "./columns";
+import { columns,listColumns } from "./columns";
 // import { cg_order_type_options } from "@/assets/js/statusList";
 
 //————————————————
@@ -78,6 +130,48 @@ export default {
   props: ["queryId"],
   data() {
     return {
+      listColumns,
+      loading: true,
+      dialogTableVisible:false,
+      parmValue: {
+        order_type: "",
+        orderCode: "",
+        apply_name: "", //申请人名称
+        cgdNo: "",
+        start: "",
+        end: "",
+        // supplierNo: "",
+        companyNo: "",
+        good_code: "",
+        good_name: "",
+        outCode: "",
+        status: "",
+        company_name: "", //申请人部门
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      },
+      listStatusOptions: [
+        { id: "0", label: "待发货" },
+        { id: "1", label: "待库管发货" },
+        { id: "2", label: "已发货待收货" },
+        { id: "3", label: "已收货" },
+        { id: "4", label: "已全部退货" },
+      ],
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+       
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      
       // cg_order_type_options,
       // statusOptions,
       // cost_detailArr: [],
@@ -197,17 +291,19 @@ export default {
     };
   },
   mounted() {
-    this.initData();
+    this.searchList()
+    
   },
   methods: {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
-     async initData(e) {
+     async initData(outCode) {
       this.returnCode = "";
       this.returnCode_type = "";
       let model = {
-        outCode: this.queryId,
+        // outCode: this.queryId,
+        outCode: outCode,
       };
       const res = await asyncRequest.detail(model);
       if (res && res.code === 0 && res.data) {
@@ -248,6 +344,41 @@ export default {
         this.$message.warning(res.message);
       }
     },
+
+
+    async searchList() {
+      //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
+      this.parmValue.orderCode = this.queryId;
+
+
+      this.loading = true;
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+
+      const res = await asyncRequest.list(model);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+        this.tableData.forEach((v) => {
+          v.good_class = "";
+          if (v.can && v.can.length > 0) {
+            v.can.forEach((x, i) => {
+              v.good_class += i === 0 ? x.name : "/" + x.name;
+            });
+          }
+        });
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+
+    dilog(outCode){
+      this.dialogTableVisible = true;
+      this.initData(outCode);
+    }
   },
 };
 </script>

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

@@ -100,7 +100,113 @@ const columns = [
 
 
 ]
+const listColumns = [
+  {
+    prop: "returnCode",
+    label: "售后申请单",
+    width: "160"
+  },
+  {
+    prop: "orderCode",
+    label: "订单编号",
+    width: "160"
+  },
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
+  },
+  {
+    prop: "apply_name",
+    label: "申请人",
+  },
+  // {
+  //   prop: "orderCode",
+  //   label: "销售订单编号",
+  //   width:"160"
+  // },
+  {
+    prop: "outCode",
+    label: "发货申请单编号",
+    width: "160"
+  },
+  {
+    prop: "total_num",
+    label: "出库总数",
+  },
+  {
+    prop: "good_code",
+    label: "商品编码",
+    width: "140"
+  },
+  {
+    prop: "good_name",
+    label: "商品名称",
+    width: "150"
+  },
+  // {
+  //     prop:"error_num",
+  //     label:"异常数量",
+  // },
+  // {
+  //     prop:"error_msg",
+  //     label:"异常原因",
+  // },
+  // {
+  //     prop:"except_code",
+  //     label:"期望意愿",
+  //   _slot_: "except_code",
+  //   width:100,
+
+  // },
+
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "120px",
+  },
+  {
+    prop: "addtime",
+    label: "添加时间",
+    width: 150,
+  },
+
 
+  // {
+  //   prop:"post_company",
+  //   label:"快递名称",
+  // },
+  // {
+  //   prop:"post_fee",
+  //   label:"物流费",
+  // },
+  // {
+  //   prop:"post_own",
+  //   label:"费用承担方",
+  //   width:"100",
+  //   _slot_: "post_own",
+
+  // },
+  // {
+  //   prop:"customer_code",
+  //   label:"客户编码",
+  //   width:"150"
+  // },
+  {
+    prop: "customer_name",
+    label: "客户名称",
+    width: "200"
+  },
+  {
+    prop: "",
+    label: "操作",
+    fixed: "right",
+    _noset_: true,
+    _slot_: "operation",
+    width: 50,
+  },
+]
 const statusOptions = [
   { value: "1", label: "待采购反馈" },
   { value: "2", label: "已生成采购单" },
@@ -110,4 +216,4 @@ const statusOptions = [
   },
 ];
 
-export { columns, statusOptions, }
+export { columns, statusOptions, listColumns}

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

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <el-dialog title="详情" :visible.sync="dialogTableVisible" width="1280px">
     <detailDatatable
       :newTime="newTime"
       v-if="sitem"
@@ -63,11 +64,84 @@
         />
       </template>
     </detailDatatable>
+    </el-dialog>
+    <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="listColumns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="''"
+            v-text="
+              ((scope.row.is_receive==='0'?status2Options:status1Options).find((item) => item.id == scope.row.status) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+        <!-- 费用承担方 -->
+        <template #post_own="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (
+                post_ownOptions.find((item) => item.id == scope.row.post_own) ||
+                {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+        <!-- 期望意愿 -->
+        <template #except_code="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (
+                except_codeOptions.find(
+                  (item) => item.id == scope.row.except_code
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+        <template #operation="{ scope }">
+          <el-tooltip
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="
+                dilog(scope.row.returnCode )
+              "
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
   </div>
 </template>
 
 <script>
-import { columns, statusOptions } from "./columns";
+import { columns, statusOptions ,listColumns} from "./columns";
 // import { cg_order_type_options } from "@/assets/js/statusList";
 
 //————————————————
@@ -100,7 +174,51 @@ export default {
   props: ["queryId"],
   data() {
     return {
+      loading: true,
+      dialogTableVisible:false,
+      parmValue: {
+        good_code: "", //商品编码
+        orderCode: "",
+        outCode: "",
+        except_code: "", //期望意愿
+        serviceValue: "", //处理状态
+        start: "",
+        end: "",
+        order_type: "", 
+        customer_code: "", //客户公司code
+        returnCode: "", //售后单号
+        apply_name: "", //申请人名称
+        good_name: "", //商品名称
+        except_code: "", //期望意愿
+        company_name:"", //申请人部门
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      },
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      // 表格 - 列参数
+      listColumns,
       // cg_order_type_options,
+      except_codeOptions: [
+        { id: "1", label: "退货" },
+        { id: "2", label: "换货" },
+        { id: "3", label: "改变售价" },
+      ],
+      post_ownOptions: [
+        { id: "1", label: "客户承担" },
+        { id: "2", label: "公司承担" },
+        { id: "3", label: "供应商承担" },
+      ],
       xs_order_type_options,
       activeTabs: "1",
       expect_options: [],
@@ -162,15 +280,18 @@ export default {
     };
   },
   mounted() {
-    this.initData();
+    // this.initData();
+    this.searchList();
   },
   methods: {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
-    async initData() {
+    async initData(code) {
       let model = {
-        returnCode: this.queryId,
+        // returnCode: this.queryId,
+        returnCode: code,
+
       };
       const res = await asyncRequest.detail(model);
       if (res && res.code === 0 && res.data) {
@@ -193,6 +314,28 @@ export default {
         this.$message.warning(res.message);
       }
     },
+
+    async searchList() {
+    //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
+      this.parmValue.orderCode = this.queryId;
+      this.loading = true;
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+      const res = await asyncRequest.list(model);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+    dilog(returnCode){
+      this.dialogTableVisible = true;
+      this.initData(returnCode);
+    }
   },
 };
 </script>

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

@@ -68,6 +68,119 @@ const columns = [
   },
 
  
+]
+
+const listColumens = [
+  {
+    prop: "thNo",
+    label: "售后退货单编号",
+    minWidth: "160px"
+  },
+  // {
+  //   prop: "returnCode",
+  //   label: "售后申请单编号",
+  //   minWidth: "160"
+
+  // },
+  // {
+  //   prop: "outCode",
+  //   label: "发货申请单编号",
+  //   minWidth: "160"
+  // },
+ 
+  {
+    prop: "orderCode",
+    label: "销售订单编号",
+    minWidth: "160"
+  },
+  {
+    prop: "good_code",
+    label: "商品属性编号",
+    minWidth: "150"
+  },
+  {
+    prop: "good_name",
+    label: "商品名称",
+    minWidth: "150"
+  },
+
+ 
+ 
+  {
+    prop: "customer_code",
+    label: "客户编号",
+    minWidth: "140"
+
+  },
+  // {
+  //   prop: "customer_name",
+  //   label: "客户名称",
+  //   minWidth: "140"
+
+  // },
+  
+  {
+    prop: "return_num",
+    label: "退货数量",
+  },
+  {
+    prop: "normal_num",
+    label: "正常数量",
+  },
+  // {
+  //   prop: "received_num",
+  //   label: "收货数量",
+  // },
+  // {
+  //   prop: "contactor",
+  //   label: "收货人",
+  // },
+  // {
+  //   prop: "mobile",
+  //   label: "联系电话",
+  // },
+  // {
+  //   prop: "addr",
+  //   label: "收货人地址",
+  // },
+  // {地址code}
+  {
+    prop: "post_fee",
+    label: "邮费",
+  },
+
+  {
+    prop: "post_company",
+    label: "物流公司",
+  },
+  {
+    prop: "post_code",
+    label: "快递单号",
+    minWidth: "120"
+  },
+ 
+ 
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    minWidth: "90px",
+  },
+  {
+    prop: "addtime",
+    label: "申请时间",
+    sortable: true,
+    minWidth: 150
+  },
+  {
+    prop: "",
+    minWidth: 50,
+    label: "操作",
+    fixed: "right",
+    _noset_: true,
+    _slot_: "operation",
+  },
+
 ]
 const statusOptions = [
   { value: "0", label: "取消" },
@@ -77,4 +190,4 @@ const statusOptions = [
         { value: "4", label: "退货已完成" },
 ];
 
-export { columns, statusOptions, }
+export { columns, statusOptions,listColumens }

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    
+     <el-dialog title="详情" :visible.sync="dialogTableVisible" width="1280px">
   <detailDatatable
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -21,11 +21,58 @@
                   ></el-tag>
                 </template>
               </detailDatatable>
+     </el-dialog>
+
+
+     <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="listColumens"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusList.find((item) => item.value == scope.row.status) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+        <template #operation="{ scope }">
+          <el-tooltip
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="dilog(scope.row.thNo )"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
   </div>
 </template>
 
 <script>
-import {columns, statusOptions,} from "./columns";
+import {columns, statusOptions,listColumens} from "./columns";
 // import { cg_order_type_options } from "@/assets/js/statusList";
 
 //————————————————
@@ -59,6 +106,47 @@ export default {
   props:["queryId"],
   data() {
     return {
+      loading: true,
+      dialogTableVisible:false,
+      parmValue: {
+        order_type: "", 
+        order_code: "", //销售订单编号
+        thNo: "", //退货编号
+        out_code: "", //销售出库编号
+        return_code: "", //售后申请编号
+        post_compay: "", //物流公司
+        post_code: "", //物流单号
+        start: "", //
+        end: "", //
+        status: "", //状态节点
+        customer_code: "", //退货客户编号
+        supplierName:'',
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      },
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        // _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      // 表格 - 列参数
+      listColumens,
+      statusList: [
+        { value: "0", label: "待申请" },
+        { value: "1", label: "待验收" },
+        { value: "2", label: "待验收审核" },
+        { value: "3", label: "待业务审核" },
+        { value: "4", label: "完成退货" },
+      ],
       // cg_order_type_options,
       orderCode: "",
       statusOptions,
@@ -73,16 +161,16 @@ export default {
     };
   },
   mounted(){
-    this.initData()
+    this.searchList()
   },
   methods:{
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
-    async initData() {
+    async initData(code) {
       this.newTime = "";
       let model = {
-        thNo: this.queryId,
+        thNo: code,
       };
       const res = await asyncRequest.detail(model);
       if (res && res.code === 0 && res.data) {
@@ -103,6 +191,30 @@ export default {
         this.$message.warning(res.message);
       }
     },
+
+    async searchList() {
+//通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
+      this.parmValue.order_code = this.queryId;
+      this.loading = true;
+
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+      model.post_compay = model.post_compay.toString();
+      const res = await asyncRequest.list(model);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+    dilog(thNo){
+      this.dialogTableVisible = true;
+      this.initData(thNo);
+    }
   }
 };
 </script>

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

@@ -1,3 +1,80 @@
+const listColumens = [
+  // {
+  //   prop: "orderCode",
+  //   label: "采购订单编号",
+  //   width:"160"
+  // },
+  {
+    prop: "returnCode",
+    label: "退货单编号",
+    width: "160"
+  },
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "120px",
+  },
+  {
+    prop: "good_code",
+    label: "商品属性编码",
+    width: "160"
+  },
+  {
+    prop: "good_name",
+    label: "商品名称",
+    'min-width': "180"
+  },
+  {
+    prop: "num",
+    label: "退货数量",
+    width: "110"
+  },
+  {
+    prop: "total_num",
+    label: "订单总数",
+    width: "110"
+  },
+  // {
+  //   prop: "error_msg",
+  //   label: "退货原因",
+  //   width: "160"
+  // },
+
+
+
+
+  // {
+  //   prop: "return_total",
+  //   label: "退货总金额",
+  //   width: "120"
+  // },
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
+  },
+  {
+    prop: "apply_name",
+    label: "申请人",
+    width: "70"
+  },
+  {
+    prop: "addtime",
+    label: "申请时间",
+    sortable: true,
+    width: 150
+  },
+  {
+    prop: "",
+    width: 50,
+    label: "操作",
+    fixed: "right",
+    _noset_: true,
+    _slot_: "operation",
+  },
+
+]
 const columns =  [
   {
     prop: "returnCode",
@@ -103,4 +180,4 @@ const statusOptions = [
         { value: "7", label: "专员审批不通过" },
 ];
 
-export { columns, statusOptions, }
+export { columns, statusOptions,listColumens }

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

@@ -1,122 +1,160 @@
 <template>
   <div>
-    <detailDatatable
-      style="margin: 0; padding: 0"
-      :sitem="sitem"
-      v-if="sitem"
-      :columns="columns"
+    <el-dialog title="详情" :visible.sync="dialogTableVisible" width="1280px">
+      <detailDatatable
+        style="margin: 0; padding: 0"
+        :sitem="sitem"
+        v-if="sitem"
+        :columns="columns"
+      >
+        <template slot="status">
+          <el-tag
+            :size="'mini'"
+            v-text="
+              (statusOptions.find((item) => item.value == sitem.status) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+        <template slot="order_type">
+          <el-tag
+            :size="'mini'"
+            v-text="
+              (
+                xs_order_type_options.find(
+                  (item) => item.id == sitem.order_type
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template slot="supplierName">
+          <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="companyName">
+          <span>{{ sitem.customer_name }}</span>
+          <el-popover placement="top" width="300" trigger="hover">
+            <ul>
+              <li>
+                <span>购买方公司编号：</span
+                ><span>{{ sitem.customer_code }}</span>
+              </li>
+            </ul>
+            <i class="el-icon-warning-outline fr" slot="reference"></i>
+          </el-popover>
+        </template>
+        <template slot="is_active">
+          <span v-if="sitem.order_type === '1' || sitem.order_type === '2'"
+            ><span
+              >{{ sitem.is_activity === "1" ? "参与活动" : "不参与活动" }}/{{
+                sitem.good_type
+              }}</span
+            ></span
+          >
+          <span v-else>--</span>
+        </template>
+        <template slot="send_type">
+          <el-tag :size="'mini'">{{
+            sitem.send_type === "1"
+              ? "直接发货"
+              : sitem.send_type === "2"
+              ? "延迟发货"
+              : "--"
+          }}</el-tag>
+        </template>
+        <template slot="addrinfo">
+          <div
+            v-if="sitem && sitem.addrinfo && sitem.addrinfo.length > 0"
+            style="padding: 2px 8px 0 0"
+          >
+            <el-table
+              :data="sitem.addrinfo"
+              border
+              :size="'mini'"
+              row-key="key"
+              max-height="300px"
+            >
+              <el-table-column
+                label="收货人-联系电话-地址"
+                min-width="300"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  {{ scope.row.contactor }}-{{ scope.row.mobile }}-{{
+                    scope.row.addr_info
+                  }}{{ scope.row.addr }}
+                </template></el-table-column
+              >
+              <el-table-column
+                label="收货总数量"
+                prop="receipt_quantity"
+                width="100"
+              />
+
+              <el-table-column label="退货数量" prop="return_num" width="100">
+              </el-table-column>
+              <el-table-column label="未发货数量" prop="wsend_num" width="90" />
+              <el-table-column label="已发货数量" prop="send_num" width="90" />
+            </el-table>
+          </div>
+          <span v-else>--</span>
+        </template>
+      </detailDatatable>
+    </el-dialog>
+
+    <ex-table
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="listColumens"
+      :page="pageInfo"
+      :size="size"
+      @page-curr-change="handlePageChange"
+      @page-size-change="handleSizeChange"
+      @screen-reset="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @screen-submit="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
     >
-      <template slot="status">
+      <template #status="{ scope }">
         <el-tag
-          :size="'mini'"
+          :size="tablebtnSize"
+          :type="scope.row.status == '0' ? 'warning' : ''"
           v-text="
-            (statusOptions.find((item) => item.value == sitem.status) || {})
+            (listStatusOptions.find((item) => item.id == scope.row.status) || {})
               .label || '--'
           "
         ></el-tag>
       </template>
-      <template slot="order_type">
-        <el-tag
-          :size="'mini'"
-          v-text="
-            (
-              xs_order_type_options.find(
-                (item) => item.id == sitem.order_type
-              ) || {}
-            ).label || '--'
-          "
-        ></el-tag>
-      </template>
-
-      <template slot="supplierName">
-        <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="companyName">
-        <span>{{ sitem.customer_name }}</span>
-        <el-popover placement="top" width="300" trigger="hover">
-          <ul>
-            <li>
-              <span>购买方公司编号：</span
-              ><span>{{ sitem.customer_code }}</span>
-            </li>
-          </ul>
-          <i class="el-icon-warning-outline fr" slot="reference"></i>
-        </el-popover>
-      </template>
-      <template slot="is_active">
-        <span
-          v-if="
-            sitem.order_type === '1' ||
-            sitem.order_type === '2'
-          "
-          ><span
-            >{{ sitem.is_activity === "1" ? "参与活动" : "不参与活动" }}/{{
-              sitem.good_type
-            }}</span
-          ></span
-        >
-        <span v-else>--</span>
+      <template #operation="{ scope }">
+        <el-tooltip effect="dark" content="详情" placement="top">
+          <i
+            class="el-icon-view tb-icon"
+            @click="dilog(scope.row.returnCode)"
+          ></i>
+        </el-tooltip>
       </template>
-      <template slot="send_type">
-        <el-tag :size="'mini'">{{
-          sitem.send_type === "1"
-            ? "直接发货"
-            : sitem.send_type === "2"
-            ? "延迟发货"
-            : "--"
-        }}</el-tag>
-      </template>
-      <template slot="addrinfo">
-        <div
-          v-if="sitem && sitem.addrinfo && sitem.addrinfo.length > 0"
-          style="padding: 2px 8px 0 0"
-        >
-          <el-table
-            :data="sitem.addrinfo"
-            border
-            :size="'mini'"
-            row-key="key"
-            max-height="300px"
-          >
-            <el-table-column
-              label="收货人-联系电话-地址"
-              min-width="300"
-              show-overflow-tooltip
-            >
-              <template slot-scope="scope">
-                {{ scope.row.contactor }}-{{ scope.row.mobile }}-{{
-                  scope.row.addr_info
-                }}{{ scope.row.addr }}
-              </template></el-table-column
-            >
-            <el-table-column
-              label="收货总数量"
-              prop="receipt_quantity"
-              width="100"
-            />
-
-            <el-table-column label="退货数量" prop="return_num" width="100">
-            </el-table-column>
-            <el-table-column label="未发货数量" prop="wsend_num" width="90" />
-            <el-table-column label="已发货数量" prop="send_num" width="90" />
-          </el-table>
-        </div>
-        <span v-else>--</span>
-      </template>
-    </detailDatatable>
+    </ex-table>
   </div>
 </template>
 
 <script>
-import { columns, statusOptions } from "./columns";
+import { columns, statusOptions, listColumens } from "./columns";
 // import { cg_order_type_options } from "@/assets/js/statusList";
 import { xs_order_type_options } from "@/assets/js/statusList";
 
@@ -128,8 +166,8 @@ import { mapGetters } from "vuex";
 import detailDatatable from "../detail-data-table";
 
 export default {
-  components:{
-    detailDatatable
+  components: {
+    detailDatatable,
   },
   mixins: [mixinPage, resToken],
   computed: {
@@ -149,6 +187,44 @@ export default {
   props: ["queryId"],
   data() {
     return {
+       listStatusOptions: [
+        { id: "1", label: "待业务审批" },
+        { id: "2", label: "待专员审批" },
+        { id: "3", label: "待主管审批" },
+        { id: "4", label: "退货完成" },
+        { id: "5", label: "业务驳回" },
+        { id: "6", label: "采购驳回" },
+        { id: "7", label: "专员审批不通过" },
+      ],
+      parmValue: {
+        returnCode: "", //销售退货code
+        orderCode: "", //销售订单code
+        company_name: "",
+        apply_name: "", //申请人
+        start: "",
+        end: "",
+        status: "", //节点状态
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        order_type: "",
+      },
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      loading: true,
+      dialogTableVisible: false,
+      listColumens,
+
       xs_order_type_options,
       statusOptions,
       is_stock: "",
@@ -164,15 +240,16 @@ export default {
     };
   },
   mounted() {
-    this.initData();
+    // this.searchList();
   },
   methods: {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
-    async initData() {
+    async initData(returnCode) {
       const { code, data, message } = await asyncRequest.detail({
-        returnCode: this.queryId,
+        // returnCode: this.queryId,
+        returnCode
       });
       if (code === 0) {
         const { is_stock, status } = data;
@@ -186,6 +263,31 @@ export default {
         this.$message.warning(message);
       }
     },
+
+    async searchList() {
+      //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
+      this.parmValue.orderCode = this.queryId;
+      this.loading = true;
+
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+
+      const res = await asyncRequest.list(model);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+
+    dilog(returnCode){
+      this.dialogTableVisible = true;
+      this.initData(returnCode);
+    }
   },
 };
 </script>

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

@@ -56,6 +56,74 @@ const columns = [
     span: 18
   },
 ]
+const listColumns = [
 
+  {
+    prop: "orderCode",
+    label: "订单编号",
+    fixed: "left",
+    width: "152px",
+  },
+  {
+    prop: "diff_weight",
+    label: "工差总重量",
+    width: "125px",
+  },
+  {
+    prop: "diff_price",
+    label: "工差总金额",
+    width: "125px",
+  },
+  {
+    prop: "gold_price",
+    label: "金价",
+    width: "125px",
+  },
+  {
+    prop: "status",
+    _slot_:"status",
+    label: "状态",
+    width: "125px",
+  },
+  {
+    prop: "good_code",
+    label: "商品编号",
+    "width": "160px",
+  },
+  {
+    prop: "good_name",
+    label: "商品名称",
+    "min-width": "160px",
+  },
+  {
+    prop: "class_cat",
+    label: "商品分类",
+    "width": "160px",
+  },
+  // {
+  //   prop: "is_act",
+  //   label: "是否接受工差",
+  //   "width": "150px",
+  // },
+  // {
+  //   prop: "customer_remark",
+  //   label: "客户意愿",
+  //   "width": "150px",
+  // },
+
+  {
+    prop: "addtime",
+    label: "创建时间",
+    width: "140px",
+  },
+  {
+    prop: "",
+    label: "操作",
+    fixed: "right",
+    _noset_: true,
+    width: "50px",
+    _slot_: "operation",
+  },
+]
 
-export { columns, }
+export { columns,listColumns }

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

@@ -1,62 +1,103 @@
 <template>
   <div>
-    <detailDatatable
-      style="margin: 0; padding: 0"
-      v-if="sitem"
-      :newTime="newTime"
-      :sitem="sitem"
-      :columns="columns"
+    <el-dialog title="详情" :visible.sync="dialogTableVisible" width="1280px">
+      <detailDatatable
+        style="margin: 0; padding: 0"
+        v-if="sitem"
+        :newTime="newTime"
+        :sitem="sitem"
+        :columns="columns"
+      >
+        <template slot="status">
+          <el-tag
+            :size="'mini'"
+            v-text="
+              (statusOptions.find((item) => item.value == sitem.status) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+        <template slot="order_type">
+          <el-tag
+            :size="'mini'"
+            v-text="
+              (
+                xs_order_type_options.find(
+                  (item) => item.id == sitem.order_type
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+        <template slot="is_act">
+          <el-tag
+            :size="'mini'"
+            v-text="
+              (is_act_options.find((item) => item.value == sitem.is_act) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+        <template slot="customer_remark">
+          <el-tag
+            :size="'mini'"
+            v-if="sitem.is_act === '1'"
+            v-text="
+              (
+                customer_remark_options.find(
+                  (item) => item.value == sitem.customer_remark
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+          <el-tag :size="'mini'" v-else v-text="'--'"></el-tag>
+        </template>
+      </detailDatatable>
+    </el-dialog>
+
+    <ex-table
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="listColumns"
+      :page="pageInfo"
+      :size="size"
+      @page-curr-change="handlePageChange"
+      @page-size-change="handleSizeChange"
+      @screen-reset="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @screen-submit="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
     >
-      <template slot="status">
+      <template #status="{ scope }">
         <el-tag
-          :size="'mini'"
-          v-text="
-            (statusOptions.find((item) => item.value == sitem.status) || {})
-              .label || '--'
-          "
-        ></el-tag>
-      </template>
-      <template slot="order_type">
-        <el-tag
-          :size="'mini'"
+          :size="tablebtnSize"
+          :type="scope.row.status == '0' ? 'warning' : ''"
           v-text="
             (
-              xs_order_type_options.find(
-                (item) => item.id == sitem.order_type
-              ) || {}
+              listStatusOptions.find((item) => item.id == scope.row.status) ||
+              {}
             ).label || '--'
           "
         ></el-tag>
       </template>
-      <template slot="is_act">
-        <el-tag
-          :size="'mini'"
-          v-text="
-            (is_act_options.find((item) => item.value == sitem.is_act) || {})
-              .label || '--'
-          "
-        ></el-tag>
-      </template>
-      <template slot="customer_remark">
-        <el-tag
-          :size="'mini'"
-          v-if="sitem.is_act === '1'"
-          v-text="
-            (
-              customer_remark_options.find(
-                (item) => item.value == sitem.customer_remark
-              ) || {}
-            ).label || '--'
-          "
-        ></el-tag>
-        <el-tag :size="'mini'" v-else v-text="'--'"></el-tag>
+      <template #operation="{ scope }">
+        <el-tooltip effect="dark" content="详情" placement="top">
+          <i class="el-icon-view tb-icon" @click="dilog(scope.row.id)"></i>
+        </el-tooltip>
       </template>
-    </detailDatatable>
+    </ex-table>
   </div>
 </template>
 
 <script>
-import { columns } from "./columns";
+import { columns, listColumns } from "./columns";
 // import { cg_order_type_options } from "@/assets/js/statusList";
 import { xs_order_type_options } from "@/assets/js/statusList";
 
@@ -69,8 +110,8 @@ import detailDatatable from "../detail-data-table";
 
 export default {
   mixins: [mixinPage, resToken],
-  components:{
-    detailDatatable
+  components: {
+    detailDatatable,
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size", "private_field"]),
@@ -89,6 +130,34 @@ export default {
   props: ["queryId"],
   data() {
     return {
+      parmValue: {
+        zxNo: "", // 竞价单编码
+        khNo: "", // 客户编码
+        cpName: "", //商品名称
+        status: "", //竞价类型
+        salesman: "", //申请人
+        start: "",
+        end: "",
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      },
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        // _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      listColumns,
+      loading: true,
+      dialogTableVisible: false,
+
       xs_order_type_options,
       // statusOptions,
       activeTabs: "1",
@@ -97,6 +166,10 @@ export default {
         { value: "1", label: "待业务部门审核" },
         { value: "2", label: "审批已完成" },
       ],
+      listStatusOptions: [
+        { id: "1", label: "待业务部门审核" },
+        { id: "2", label: "工差单审核完成" },
+      ],
       xs_order_type_options,
       customer_remark_options: [
         {
@@ -129,14 +202,14 @@ export default {
     };
   },
   mounted() {
-    this.initData();
+    this.searchList();
   },
   methods: {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
-    async initData() {
-      const res = await asyncRequest.detail({ id: this.queryId });
+    async initData(id) {
+      const res = await asyncRequest.detail({ id });
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
         const { can, status } = res.data;
@@ -154,6 +227,40 @@ export default {
         this.$message.warning(res.message);
       }
     },
+
+    async searchList() {
+      //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
+      this.parmValue.orderCode = this.queryId;
+      this.loading = true;
+
+      const res = await asyncRequest.list(this.parmValue);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.tableData.map((v) => {
+          v.sale_price = this.setNum(v.sale_price);
+          v.sale_fee = this.setNum(v.sale_fee);
+          v.class_cat = "";
+          if (v.can && v.can.length > 0) {
+            v.can.forEach((x, i) => {
+              v.class_cat += i === 0 ? x.name : "/" + x.name;
+            });
+          }
+          return v;
+        });
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+
+    dilog(id){
+      this.dialogTableVisible = true;
+      this.initData(id);
+    }
   },
 };
 </script>

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

@@ -37,7 +37,8 @@
       </template>
 
       <template slot="coop_state">
-        <span
+        <span>{{sitem.coop_state}}</span>
+        <!-- <span
           v-text="
             (
               coop_stateoptions.find(
@@ -45,11 +46,13 @@
               ) || {}
             ).label || '--'
           "
-        ></span>
+        ></span> -->
       </template>
 
       <template slot="source">
-        <span
+        <span>{{sitem.source}}</span>
+
+        <!-- <span
           v-text="
             (
               sourceoptions.find(
@@ -57,10 +60,12 @@
               ) || {}
             ).label || '--'
           "
-        ></span>
+        ></span> -->
       </template>
       <template slot="type">
-        <span
+        <span>{{sitem.type}}</span>
+
+        <!-- <span
           v-text="
             (
               typeoptions.find(
@@ -68,10 +73,12 @@
               ) || {}
             ).label || '--'
           "
-        ></span>
+        ></span> -->
       </template>
       <template slot="category">
-        <span
+        <span>{{sitem.category}}</span>
+
+        <!-- <span
           v-text="
             (
               categoryoptions.find(
@@ -79,10 +86,11 @@
               ) || {}
             ).label || '--'
           "
-        ></span>
+        ></span> -->
       </template>
       <template slot="delivery_way">
-        <span
+        <span>{{sitem.delivery_way}}</span>
+        <!-- <span
           v-text="
             (
               delivery_wayoptions.find(
@@ -90,10 +98,11 @@
               ) || {}
             ).label || '--'
           "
-        ></span>
+        ></span> -->
       </template>
       <template slot="supplier_type">
-        <span
+        <span>{{sitem.supplier_type}}</span>
+        <!-- <span
           v-text="
             (
               supplier_typeoptions.find(
@@ -101,10 +110,11 @@
               ) || {}
             ).label || '--'
           "
-        ></span>
+        ></span> -->
       </template>
       <template slot="level">
-        <span
+        <span>{{sitem.level}}</span>
+        <!-- <span
           v-text="
             (
               leveloptions.find(
@@ -112,10 +122,11 @@
               ) || {}
             ).label || '--'
           "
-        ></span>
+        ></span> -->
       </template>
       <template slot="pay_type">
-        <span
+        <span>{{sitem.pay_type}}</span>
+        <!-- <span
           v-text="
             (
               pay_typeoptions.find(
@@ -123,7 +134,7 @@
               ) || {}
             ).label || '--'
           "
-        ></span>
+        ></span> -->
       </template>
 
       <template slot="supplier_img">
@@ -131,17 +142,20 @@
               :src="sitem.supplier_img"
               class="avatar hover fl"
               v-viewer
-              style="width:50px; height:50px"
+              style=" height:23px; display:block;"
             />
       </template>
        <template slot="prove_img">
+       
         <img
             v-for="img in sitem.prove_img"
+            v-if="img != ''"
+
             :key="img"
               :src="img"
               class="avatar hover fl"
               v-viewer
-              style="width:50px; height:50px"
+             style=" height:23px; display:block;"
             />
       </template>
     </detailDatatable>

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

@@ -17,31 +17,24 @@ const columns = [
   {
     prop: "inv_legaler",
     label: "法人",
-    span: 6
+    span: 4
   },
 
 
   {
     prop: "inv_time",
     label: "成立日期",
-    span: 6
+    span: 5
   },
   {
     prop: "contactor",
     label: "联系人",
-    span: 6
+    span: 4
   },
   {
     prop: "companytype",
     label: "公司类型",
-    span: 6
-  },
-
-
-  {
-    prop: "inv_scope",
-    label: "营业范围",
-    span: 18
+    span: 5
   },
   {
     prop: "license_img",
@@ -50,6 +43,14 @@ const columns = [
     _slot_:"license_img"
   },
 
+
+  {
+    prop: "inv_scope",
+    label: "营业范围",
+    span: 24
+  },
+  
+
   {
     prop: "inv_bank",
     label: "银行名称",

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

@@ -9,7 +9,7 @@
     >
       <template slot="license_img">
         <img :src="sitem.license_img" alt="" class="hover" v-viewer
-              style="width:50px; height:50px">
+              style=" height:23px; display:block;">
       </template>
      
     </detailDatatable>

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

@@ -91,6 +91,185 @@ const columns = [
     span: 6
   },
 ]
+const listColumns = [
+
+  {
+    prop: "wsm_in_code",
+    label: "入库单编号",
+    width: "155"
+  },
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    width: "155px",
+  },
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "110px",
+  },
+  // {
+  //   prop: "bkcode",
+  //   label: "备库单编号",
+  //   width: "155px",
+  // },
+  // {
+  //   prop: "supplierNo",
+  //   label: "采购供应商编号",
+  //   width: "145px",
+  // },
+  // {
+  //   prop: "supplier_name",
+  //   label: "采购供应商名称",
+  //   width: "155px",
+  // },
+
+  {
+    prop: "spuCode",
+    label: "商品成本编号",
+    width: "145px",
+  },
+  {
+    prop: "good_name",
+    label: "商品名称",
+    _slot_: "good_name",
+    'min-width': "145px",
+  },
+  {
+    prop: "brand_name",
+    label: "品牌",
+    'width': "95px",
+  },
+ 
+  {
+    prop: "send_num",
+    label: "发货数量",
+    width: "80px",
+  },
+  // {
+  //   prop: "post_company",
+  //   label: "物流公司",
+  //   width: "140px",
+  // },
+  // {
+  //   prop: "post_code",
+  //   label: "物流单号",
+  //   width: "140px",
+  // },
+  {
+    prop: "post_fee",
+    label: "物流费用",
+    width: "100px",
+  },
+
+  {
+    prop: "order_type",
+    label: "备货单",
+    _slot_: "order_type",
+    width: "130px",
+  },
+  // {
+  //   prop: "wsm_num",
+  //   label: "入库数量",
+  //   width: "80px",
+  // },
+  // {
+  //   prop: "error_num",
+  //   label: "异常数量",
+  //   width: "80px",
+  // },
+  // {
+  //   prop: "check_name",
+  //   label: "验货人",
+  //   width: "60px",
+  // },
+  // 
+  // {
+  //   prop: "cgder",
+  //   label: "采购员",
+  //   width: "60px",
+  // },
+  // {
+  //   prop: "good_price",
+  //   label: "单价",
+  //   width: "110px",
+  // },
+  // {
+  //   prop: "good_num",
+  //   label: "数量",
+  //   width: "110px",
+  // },
+  // {
+  //   prop: "total_fee",
+  //   label: "总货款",
+  //   width: "120px",
+  // },
+  // {
+  //   prop: "send_num",
+  //   label: "已发货数量",
+  //   width: "110px",
+  // },
+  // {
+  //   prop: "wsend_num",
+  //   label: "未发货数量",
+  //   width: "105px",
+  // },
+
+  // {
+  //   prop: "lasttime",
+  //   label: "预计最晚入库时间",
+  //   width: "145px",
+  // },
+  {
+    prop: "wsm_supplierNo",
+    label: "仓库公司编号",
+    width: "145px",
+  },
+  {
+    prop: "wsm_supplier",
+    label: "仓库公司名称",
+    width: "155px",
+  },
+  {
+    prop: "wsm_code",
+    label: "仓库编号",
+    width: "172px",
+  },
+  {
+    prop: "wsm_name",
+    label: "仓库名称",
+    width: "80px",
+  },
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
+  },
+  {
+    prop: "apply_name",
+    label: "申请人",
+    width: "60px",
+  },
+  {
+    prop: "sendtime",
+    label: "发货时间",
+    width: "145px",
+  },
+  // {
+  //   prop: "addtime",
+  //   label: "创建时间",
+  //   width: "145px",
+  // },
+  {
+    prop: "",
+    label: "操作",
+    fixed: "right",
+    _noset_: true,
+    width: "50px",
+    _slot_: "operation",
+  },
+]
 const statusOptions =  [
   {
     value: "0",
@@ -122,4 +301,4 @@ const statusOptions =  [
   },
 ];
 
-export { columns, statusOptions, }
+export { columns, statusOptions,listColumns }

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

@@ -1,91 +1,164 @@
 <template>
   <div>
-    <detailDatatable
-      :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
+    <el-dialog title="详情" :visible.sync="dialogTableVisible" width="1280px">
+      <detailDatatable
+        :newTime="newTime"
+        v-if="newTime !== '' && sitem"
+        :sitem="sitem"
+        :columns="columns"
       >
-      <template slot="good_price">
-        <span
-          v-if="
-            newTime !== '' &&
-            private_field &&
-            private_field.length > 0 &&
-            private_field.some((item) => item == '1')
-          "
-          >{{ sitem.good_price }}</span
+        <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
         >
-        <span v-else>******</span>
-      </template>
-    </detailDatatable>
+        <template slot="good_price">
+          <span
+            v-if="
+              newTime !== '' &&
+              private_field &&
+              private_field.length > 0 &&
+              private_field.some((item) => item == '1')
+            "
+            >{{ sitem.good_price }}</span
+          >
+          <span v-else>******</span>
+        </template>
+      </detailDatatable>
+    </el-dialog>
+
+    <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="listColumns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+
+        <template #good_name="{ scope }">
+          <span>{{ scope.row.good_name }}</span>
+          <span v-for="(si, sii) in scope.row.speclist" :key="si + sii"
+            >{{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{
+              si.spec_value
+            }}]</span
+          >
+        </template>
+        <template #order_type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                cg_order_type_options.find(
+                  (item) => item.id == scope.row.order_type
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (
+                statusOptions.find((item) => item.value == scope.row.status) ||
+                {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template #operation="{ scope }">
+          <el-tooltip
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="dilog(scope.row.wsm_in_code)"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
   </div>
 </template>
 
 <script>
-import { columns, statusOptions } from "./columns";
+import { columns, statusOptions, listColumns } 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";
+import asyncRequestDetail from "@/apis/service/purchaseIn/purchaseOrder";
+import asyncRequest from "@/apis/service/purchaseIn/wsmInOrder";
+
 import { mapGetters } from "vuex";
 import detailDatatable from "../detail-data-table";
 
@@ -105,12 +178,53 @@ export default {
       }
     },
   },
-  components:{
-    detailDatatable
+  components: {
+    detailDatatable,
   },
   props: ["queryId"],
   data() {
     return {
+      parmValue: {
+        order_type: "",
+        // bk_code: "", // 备库编码
+        wsm_in_code: "", // 入库单号
+        cgdNo: "", // 采购单编码
+        apply_name: "", // 申请人
+        good_name: "", // 产品名称
+        good_type_code: "", // 产品属性编号
+
+        status: "", //状态
+
+        wsm_code: "", //入货仓库编码
+        start: "", //新建起始时间
+        end: "", // 新建结束时间
+        last_start: "", //最后入库时间开始
+        last_end: "", //最后入库时间结束
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        supplierNo: "",
+        company_name: "", //部门
+        wsm_supplierNo: "",
+      },
+      tableData: [],
+       // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        // _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      loading: true,
+      dialogTableVisible:false,
+      listColumns,
+
+
+
       cg_order_type_options,
       statusOptions,
       status: "",
@@ -123,14 +237,15 @@ export default {
     };
   },
   mounted() {
-    this.initData();
+    this.searchList();
   },
   methods: {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
-    async initData() {
-      const res = await asyncRequest.orderininfo({ wsm_in_code: this.queryId });
+    async initData(code) {
+      
+      const res = await asyncRequestDetail.orderininfo({ wsm_in_code: code});
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
         const { status, can, wsm_in_code } = this.sitem;
@@ -149,6 +264,47 @@ export default {
       }
     },
 
+
+     async searchList() {
+      //通过采购编号去查询所有列表、当采购编号为空时，所有涉及字段不展示
+      this.parmValue.cgdNo = this.queryId;
+      this.loading = true;
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+
+      let _model = {
+        cgdNo: model.cgdNo,
+        wsm_in_code: model.wsm_in_code,
+        start: model.start,
+        end: model.end,
+        order_type: model.order_type,
+        good_type_code: model.good_type_code,
+        apply_name: model.apply_name,
+        wsm_code: model.wsm_code,
+        good_name: model.good_name,
+        supplie: "",
+        supplierNo: model.wsm_supplierNo,
+        status: model.status,
+        page: model.page,
+        size: model.size,
+        company_name: model.company_name,
+      };
+      const res = await asyncRequest.list(_model);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+
+     dilog(code){
+      this.dialogTableVisible = true;
+      this.initData(code);
+    }
   },
 };
 </script>

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

@@ -79,6 +79,97 @@ const columns = [
     span: 24,
   },
 ]
+const listColumns = [
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    width: "160"
+  },
+  {
+    prop: "returnCode",
+    label: "退货单编号",
+    width: "160"
+  },
+  // {确认单编号}
+  // {order_type类型}
+  // {
+  //   prop: "apply_name",
+  //   label: "申请人"
+  // },
+  // {
+  //   prop: "status",
+  //   label: "状态",
+  //   _slot_: "status",
+  //   width: "120px",
+  // },
+  {
+    prop: "order_type",
+    label: "退货来源",
+    // 1备库 2竞价
+    _slot_: "order_type",
+    width: "80px"
+  },
+  {
+    prop: "spuCode",
+    label: "商品编号",
+    width: "160px"
+  },
+  {
+    prop: "good_class",
+    label: "商品分类",
+    width: "130",
+  },
+  {
+    prop: "good_name",
+    label: "商品名称",
+    width: "150"
+  },
+  {
+    prop: "return_num",
+    label: "退货数量",
+  },
+  {
+    prop: "return_fee",
+    label: "退货总金额",
+    width: "100"
+  },
+  // {
+  //   prop: "post_company",
+  //   label: "物流公司",
+  // },
+  // {
+  //   prop: "post_code",
+  //   label: "物流编号",
+  // },
+  // {
+  //   prop: "post_fee",
+  //   label: "物流费",
+  //   width: "120"
+  // },
+
+  // {
+  //   prop: "remark",
+  //   label: "备注"
+  // },
+  // {
+  //   prop: "wsm_supplier",
+  //   label: "供应商"
+  // },
+  // {
+  //   prop: "wsm_supplierNo",
+  //   label: "供应商编码"
+  // },
+
+  {
+    prop: "",
+    label: "操作",
+    fixed: "right",
+    width: "50px",
+    _noset_: true,
+    _slot_: "operation",
+  },
+
+]
 const statusOptions = [
   // { value: "0", label: "取消" },
   // { value: "1", label: "待业务审核" },
@@ -86,4 +177,4 @@ const statusOptions = [
   { value: "1", label: "采购退货成功" },
 ];
 
-export { columns, statusOptions, }
+export { columns, statusOptions, listColumns}

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

@@ -1,58 +1,102 @@
 <template>
   <div>
-    <detailDatatable
-      :newTime="newTime"
-      v-if="newTime !== '' && sitem"
-      :sitem="sitem"
-      :columns="columns"
+    <el-dialog title="详情" :visible.sync="dialogTableVisible" width="1280px">
+      <detailDatatable
+        :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>
+        <template slot="good_price">
+          <span
+            v-if="
+              newTime !== '' &&
+              private_field &&
+              private_field.length > 0 &&
+              private_field.some((item) => item == '1')
+            "
+            >{{ sitem.good_price }}</span
+          >
+          <span v-else>******</span>
+        </template>
+
+        <template slot="return_price">
+          <span
+            v-if="
+              newTime !== '' &&
+              private_field &&
+              private_field.length > 0 &&
+              private_field.some((item) => item == '1')
+            "
+            >{{ sitem.return_price }}</span
+          >
+          <span v-else>******</span>
+        </template>
+      </detailDatatable>
+    </el-dialog>
+
+    <ex-table
+      v-loading="loading"
+      :table="table"
+      :data="tableData"
+      :columns="listColumns"
+      :page="pageInfo"
+      :size="size"
+      @page-curr-change="handlePageChange"
+      @page-size-change="handleSizeChange"
+      @screen-reset="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
+      @screen-submit="
+        pageInfo.curr = 1;
+        parmValue.page = 1;
+        searchList();
+      "
     >
-      <template slot="status">
-        <el-tag
-          :size="'mini'"
-          :type="sitem.status == '0' ? 'warning' : ''"
+      <template #order_type="{ scope }">
+        <p
           v-text="
-            (statusOptions.find((item) => item.value == sitem.status) || {})
-              .label || '--'
+            (
+              cg_order_type_options.find(
+                (item) => item.id == scope.row.order_type
+              ) || {}
+            ).label || '--'
           "
-        ></el-tag>
+        ></p>
       </template>
-      <template slot="good_price">
-        <span
-          v-if="
-            newTime !== '' &&
-            private_field &&
-            private_field.length > 0 &&
-            private_field.some((item) => item == '1')
-          "
-          >{{ sitem.good_price }}</span
-        >
-        <span v-else>******</span>
+      <template #operation="{ scope }">
+        <el-tooltip effect="dark" content="详情" placement="top">
+          <i
+            class="el-icon-view tb-icon"
+            @click="dilog(scope.row.returnCode)"
+          ></i>
+        </el-tooltip>
       </template>
-
-      <template slot="return_price">
-        <span
-          v-if="
-            newTime !== '' &&
-            private_field &&
-            private_field.length > 0 &&
-            private_field.some((item) => item == '1')
-          "
-          >{{ sitem.return_price }}</span
-        >
-        <span v-else>******</span>
-      </template>
-    </detailDatatable>
+    </ex-table>
   </div>
 </template>
 
 <script>
-import { columns, statusOptions } from "./columns";
+import { columns, statusOptions, listColumns } 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";
+
 import { mapGetters } from "vuex";
 import detailDatatable from "../detail-data-table";
 
@@ -78,6 +122,34 @@ export default {
   props: ["queryId"],
   data() {
     return {
+      listColumns,
+      loading: true,
+      dialogTableVisible: false,
+      parmValue: {
+        cgdNo: "", //采购单编号
+        returnCode: "", //退货单编号
+        good_type_code: "", //商品属性编号
+        good_name: "", //商品名称
+        status: "", //节点状态
+        status: "", //节点状态
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      },
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        // _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+
       cg_order_type_options,
       statusOptions,
       status: "",
@@ -91,15 +163,15 @@ export default {
     };
   },
   mounted() {
-    this.initData();
+    this.searchList();
   },
   methods: {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
-    async initData() {
+    async initData(returnCode) {
       this.loading = true;
-      const res = await asyncRequest.detail({ returnCode: this.queryId });
+      const res = await asyncRequest.detail({ returnCode: returnCode });
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
         const { can, status, bk_code } = this.sitem;
@@ -120,6 +192,36 @@ export default {
       }
       this.loading = false;
     },
+
+    async searchList() {
+      //通过采购编号去查询所有列表、当采购编号为空时，所有涉及字段不展示
+      this.parmValue.cgdNo = this.queryId;
+      this.loading = true;
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+      const res = await asyncRequest.list(model);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+        this.tableData.forEach((v) => {
+          v.good_class = "";
+          if (v.can && v.can.length > 0) {
+            v.can.forEach((x, i) => {
+              v.good_class += i === 0 ? x.name : "/" + x.name;
+            });
+          }
+        });
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+    dilog(returnCode) {
+      this.dialogTableVisible = true;
+      this.initData(returnCode);
+    },
   },
 };
 </script>

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

@@ -66,10 +66,73 @@ const columns = [
 
 
 
+]
+const listColumns = [
+  {
+    prop: "cgdNo",
+    label: "采购单编号",
+    width: "160px",
+  },
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "120px",
+  },
+  {
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "100px",
+  },
+  {
+    prop: "apply_name",
+    label: "申请人",
+    width: "65px",
+  },
+  {
+    prop: "good_code",
+    label: "商品编码",
+    width: "150px",
+  },
+  {
+    prop: "good_name",
+    label: "商品名称",
+  },
+  // {
+  //   prop: "class_cat",
+  //   label: "商品分类",
+  // },
+
+  {
+    prop: "good_weight",
+    label: "商品总重量(g)",
+    width: "110px",
+  },
+  {
+    prop: "diff_weight",
+    label: "工差总重量(g)",
+    width: "110px",
+  },
+
+ 
+  {
+    prop: "addtime",
+    label: "创建时间",
+    width: "140px",
+    sortable: true,
+  },
+  {
+    prop: "",
+    label: "操作",
+    fixed: "right",
+    _noset_: true,
+    width: "52px",
+    _slot_: "operation",
+  },
 ]
 const statusOptions = [
   { id: "1", label: "待业务部门审核" },
         { id: "2", label: "工差单审核完成" },
 ];
 
-export { columns, statusOptions, }
+export { columns, statusOptions,listColumns }

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     
-
+<el-dialog title="详情" :visible.sync="dialogTableVisible" width="1280px">
     <detailDatatable
       :newTime="newTime"
       v-if="newTime !== '' && sitem"
@@ -80,11 +80,57 @@
         <span v-else>******</span>
       </template>
     </detailDatatable>
+</el-dialog>
+
+    <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="listColumns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusOptions.find((item) => item.id == scope.row.status) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+        <template #operation="{ scope }">
+          <el-tooltip
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              
+               @click="dilog(scope.row.id  )"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
   </div>
 </template>
 
 <script>
-import { columns, statusOptions } from "./columns";
+import { columns, statusOptions ,listColumns} from "./columns";
 import { cg_order_type_options } from "@/assets/js/statusList";
 
 //————————————————
@@ -117,6 +163,40 @@ export default {
   props: ["queryId"],
   data() {
     return {
+
+      parmValue: {
+        name: "", // 业务员名字
+        username: "", // 账号
+        apply_name: "", //申请人
+        cgdNo: "", //采购单编号
+        status: "", //工差单状态
+        start: "", //
+        end: "",
+        company_name:"", //部门
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      },
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        // _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      loading: true,
+      dialogTableVisible:false,
+      listColumns,
+
+
+
+
       cg_order_type_options,
       statusOptions,
       status: "",
@@ -149,15 +229,15 @@ export default {
     };
   },
   mounted() {
-    this.initData();
+    this.searchList();
   },
   methods: {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
-    async initData() {
+    async initData(id) {
       this.loading = true;
-      const res = await asyncRequest.detail({ id: this.queryId });
+      const res = await asyncRequest.detail({ id});
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
 
@@ -181,6 +261,37 @@ export default {
       this.loading = false;
     },
 
+    async searchList() {
+        //通过采购编号去查询所有列表、当采购编号为空时，所有涉及字段不展示
+      this.parmValue.cgdNo = this.queryId;
+      this.loading = true;
+      const res = await asyncRequest.list(this.parmValue);
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.tableData.forEach((v) => {
+          v.class_cat = "";
+          if (v.can && v.can.length > 0) {
+            v.class_cat = "";
+            v.can.forEach((x, i) => {
+              v.class_cat += i === 0 ? x.name : "/" + x.name;
+            });
+          }
+        });
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+
+    dilog(id){
+      this.dialogTableVisible = true;
+      this.initData(id);
+    }
+
   },
 };
 </script>

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

@@ -109,15 +109,18 @@ const columns = [
     label: "工艺说明",
     span: 12
   },
+  
   {
     prop: "use_desc",
     label: "产品用途",
     span: 12
   },
   {
-    prop: "remark",
-    label: "商品备注",
-    span: 24
+    prop: "specinfo",
+    label: "规格",
+    _slot_: "specinfo",
+
+    span: 12
   },
   {
     prop: "config",
@@ -151,21 +154,22 @@ const columns = [
     _slot_:"gold_price",
     span: 6
   },
-  {
-    prop: "good_img",
-    label: "商品图片",
-    _slot_: "good_img",
+  
 
+  
+  {
+    prop: "remark",
+    label: "商品备注",
     span: 12
   },
-
   {
-    prop: "specinfo",
-    label: "规格",
-    _slot_: "specinfo",
+    prop: "good_img",
+    label: "商品图片",
+    _slot_: "good_img",
 
     span: 12
   },
+  
 
   
 

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

@@ -83,7 +83,7 @@
           <img
             v-if="sitem.good_img"
             :src="sitem.good_img"
-            style="width: 120px; height: 120px"
+            style="height: 23px;display:block"
             v-viewer
             class="hover"
           />
@@ -97,7 +97,7 @@
               :size="'mini'"
               border
               style="width: 90%; margin:auto;"
-              height="120px"
+              height="130px"
             >
               <el-table-column prop="spec_name" label="规格类型" />
               <el-table-column prop="spec_value_name" label="规格值" />

src/views/standingBook/detail.vue

@@ -28,35 +28,37 @@
               <detail2 :queryId="tableData.cgdNo"> </detail2>
             </el-collapse-item>
           </div>
-
-          <div id="detail3" v-if="tableData.wsm_in_code">
+          <!-- //通过采购单编号去查询所有列表、当采购单编号为空时，所有涉及字段不展示 -->
+          <div id="detail3" v-if="tableData.cgdNo">
             <el-collapse-item
               title="采购：入库单"
               name="3"
               v-if="newTime !== ''"
             >
-              <detail3 :queryId="tableData.wsm_in_code"> </detail3>
+              <detail3 :queryId="tableData.cgdNo"> </detail3>
             </el-collapse-item>
           </div>
 
-          <div id="detail4" v-if="tableData.cgdReturnCode">
+          <!-- //通过采购单编号去查询所有列表、当采购单编号为空时，所有涉及字段不展示 -->
+          <div id="detail4" v-if="tableData.cgdNo">
             <el-collapse-item
               title="采购：退货单"
               name="4"
               v-if="newTime !== ''"
             >
-              <detail4 :queryId="tableData.cgdReturnCode"> </detail4>
+              <detail4 :queryId="tableData.cgdNo"> </detail4>
             </el-collapse-item>
           </div>
 
   
-          <div id="detail5" v-if="tableData.cgd_diff_id">
+          <!-- //通过采购单编号去查询所有列表、当采购单编号为空时，所有涉及字段不展示 -->
+          <div id="detail5" v-if="tableData.cgdNo">
             <el-collapse-item
               title="采购：工差单"
               name="5"
               v-if="newTime !== ''"
             >
-              <detail5 :queryId="tableData.cgd_diff_id"> </detail5>
+              <detail5 :queryId="tableData.cgdNo"> </detail5>
             </el-collapse-item>
           </div>
 
@@ -106,52 +108,57 @@
               <detail10 :queryId="tableData.sale_id"> </detail10>
             </el-collapse-item>
           </div>
-
-          <div id="detail11"  v-if="tableData.outCode">
+      
+          <!-- //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示 -->
+          <div id="detail11"  v-if="tableData.orderCode">
             <el-collapse-item
               title="销售：发货申请单"
               name="11"
               v-if="newTime !== ''"
             >
-              <detail11 :queryId="tableData.outCode"> </detail11>
+              <detail11 :queryId="tableData.orderCode"> </detail11>
             </el-collapse-item>
           </div>
-          <div id="detail12" v-if="tableData.returnCode">
+          <!-- //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示 -->
+          <div id="detail12" v-if="tableData.orderCode">
             <el-collapse-item
               title="销售：售后申请单"
               name="12"
               v-if="newTime !== ''"
             >
-              <detail12 :queryId="tableData.returnCode"> </detail12>
+              <detail12 :queryId="tableData.orderCode"> </detail12>
             </el-collapse-item>
           </div>
-          <div id="detail13" v-if="tableData.thNo">
+          <!-- //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示 -->
+          <div id="detail13" v-if="tableData.orderCode">
             <el-collapse-item
               title="销售：售后退货单"
               name="13"
               v-if="newTime !== ''"
             >
-              <detail13 :queryId="tableData.thNo"> </detail13>
+              <detail13 :queryId="tableData.orderCode"> </detail13>
             </el-collapse-item>
           </div>
-          <div id="detail14"  v-if="tableData.returnGoodCode">
+          <!-- //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示 -->
+          <div id="detail14"  v-if="tableData.orderCode">
             <el-collapse-item
               title="销售：退货单"
               name="14"
               v-if="newTime !== ''"
             >
-              <detail14 :queryId="tableData.returnGoodCode"> </detail14>
+              <detail14 :queryId="tableData.orderCode"> </detail14>
             </el-collapse-item>
           </div>
 
-    
-          <div id="detail15" v-if="tableData.sale_diff_id">
+
+          <!-- //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示 -->
+          <div id="detail15" v-if="tableData.orderCode">
             <el-collapse-item
               title="销售：工差单"
               name="15"
               v-if="newTime !== ''"
             >
-              <detail15 :queryId="tableData.sale_diff_id"> </detail15>
+              <detail15 :queryId="tableData.orderCode"> </detail15>
             </el-collapse-item>
           </div>
 
@@ -326,6 +333,9 @@ export default {
       let arr = [];
       let flag = true;
       let {
+        //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
+        orderCode,
+
         spuCode,
         skuCode,
         order_type,
@@ -353,13 +363,16 @@ export default {
       (cgdNo ?? "") != ""
         ? arr.push({ tar: "#detail2", title: "采购：采购单" })
         : (flag = false);
-      (wsm_in_code ?? "") != ""
+      //通过采购单编号去查询所有列表、当采购单编号为空时，所有涉及字段不展示
+      (cgdNo ?? "") != ""
         ? arr.push({ tar: "#detail3", title: "采购：入库单" })
         : (flag = false);
-      (cgdReturnCode ?? "") != ""
+      //通过采购单编号去查询所有列表、当采购单编号为空时，所有涉及字段不展示
+      (cgdNo ?? "") != ""
         ? arr.push({ tar: "#detail4", title: "采购：退货单" })
         : (flag = false);
-      (cgd_diff_id ?? "") != ""
+      //通过采购单编号去查询所有列表、当采购单编号为空时，所有涉及字段不展示
+      (cgdNo ?? "") != ""
         ? arr.push({ tar: "#detail5", title: "采购：工差单" })
         : (flag = false);
       (projectNo ?? "") != ""
@@ -377,19 +390,24 @@ export default {
       (sale_id ?? "") != ""
         ? arr.push({ tar: "#detail10", title: "销售：销售订单" })
         : (flag = false);
-      (outCode ?? "") != ""
+      //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
+      (orderCode ?? "") != ""
         ? arr.push({ tar: "#detail11", title: "销售：发货申请单" })
         : (flag = false);
-      (returnCode ?? "") != ""
+      //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
+      (orderCode ?? "") != ""
         ? arr.push({ tar: "#detail12", title: "销售：售后申请单" })
         : (flag = false);
-      (thNo ?? "") != ""
+      //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
+      (orderCode ?? "") != ""
         ? arr.push({ tar: "#detail13", title: "销售：售后退货单" })
         : (flag = false);
-      (returnGoodCode ?? "") != ""
+      //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
+      (orderCode ?? "") != ""
         ? arr.push({ tar: "#detail14", title: "销售：退货单" })
         : (flag = false);
-      (sale_diff_id ?? "") != ""
+      //通过订单编号去查询所有列表、当订单编号为空时，所有涉及字段不展示
+      (orderCode ?? "") != ""
         ? arr.push({ tar: "#detail15", title: "销售：工差单" })
         : (flag = false);
       (supplierNo ?? "") != ""

src/views/standingBook/index.vue

@@ -223,6 +223,12 @@ export default {
         this.dialogFormVisible = false;
         return;
       }
+
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
       this.searchList();
       this.dialogFormVisible = false;
     },
@@ -285,18 +291,28 @@ export default {
         // is_export:0,//是否导出0/1
         page: 1, // 页码
         size: 15, // 每页显示条数
-        xiugai1: "",
-        xiugai2: "",
-        xiugai3: "",
-        xiugai4: "",
-        xiugai5: "",
-        xiugai6: "",
-        xiugai7: "",
-        xiugai8: "",
-        xiugai9: "",
-        xiugai10: "",
-        xiugai11: "",
-        xiugai12: "",
+        start_date: "",
+        end_date: "",
+
+        standBookNo: "",
+        projectNo: "",
+        infoNo: "",
+        bargainNo: "",
+        bk_code: "",
+        orderCode: "",
+        outCode: "",
+        returnCode: "",
+        thNo: "",
+        returnGoodCode: "",
+        cgdNo: "",
+        wsm_in_code: "",
+        cgdReturnCode: "",
+        spuCode: "",
+        skuCode: "",
+        order_type: "",
+        supplierNo: "",
+        companyNo: "",
+        customer_code: "",
       };
       // 表格 - 分页
       this.pageInfo = {
@@ -319,18 +335,28 @@ export default {
         // is_export:0,//是否导出0/1
         page: 1, // 页码
         size: 15, // 每页显示条数
-        xiugai1: "",
-        xiugai2: "",
-        xiugai3: "",
-        xiugai4: "",
-        xiugai5: "",
-        xiugai6: "",
-        xiugai7: "",
-        xiugai8: "",
-        xiugai9: "",
-        xiugai10: "",
-        xiugai11: "",
-        xiugai12: "",
+        start_date: "",
+        end_date: "",
+
+        standBookNo: "",
+        projectNo: "",
+        infoNo: "",
+        bargainNo: "",
+        bk_code: "",
+        orderCode: "",
+        outCode: "",
+        returnCode: "",
+        thNo: "",
+        returnGoodCode: "",
+        cgdNo: "",
+        wsm_in_code: "",
+        cgdReturnCode: "",
+        spuCode: "",
+        skuCode: "",
+        order_type: "",
+        supplierNo: "",
+        companyNo: "",
+        customer_code: "",
       };
     },
   },