123

igirl-channel-web/app/front/vues/pages/OAjdlist/OAjdlist.js

@@ -32,7 +32,6 @@
                         value: 'dbsbzc',
                         value: 'dbsbzc',
                         label: '担保申请'
                         label: '担保申请'
                     },
                     },
-
                 ],
                 ],
                 DeliveryStatus: [
                 DeliveryStatus: [
                     {
                     {
@@ -152,7 +151,7 @@
                 sfs: [
                 sfs: [
                     { field: 'totalSum', label: '订单金额' },
                     { field: 'totalSum', label: '订单金额' },
                 ],
                 ],
-                deliveryStatus:'',
+                deliveryStatus: '',
                 form: {
                 form: {
                     tmFormType: 3,
                     tmFormType: 3,
                     name: "",
                     name: "",
@@ -462,8 +461,8 @@
                     },
                     },
                 ],
                 ],
                 hidePage: true,
                 hidePage: true,
-                user_Name:"",
-                channelFrom:"",
+                user_Name: "",
+                channelFrom: "",
             }
             }
 
 
         },
         },
@@ -664,33 +663,40 @@
         handleSizeChange(){
         handleSizeChange(){
             if (this.$route.query.channelUserId != "") {
             if (this.$route.query.channelUserId != "") {
                 this.indentInfo.pageIndex = this.currentPage;
                 this.indentInfo.pageIndex = this.currentPage;
-                var obj = this.$root.copyParams(this.indentInfo, "getTmOrderListAdmin", "/action/tmOrder/springBoard", "yes", "yes");
+                var obj = this.$root.copyParams(this.indentInfo, "getTmOrderList", "/action/tmOrder/springBoard", "yes", "yes");
                 this.$root.loading = true;
                 this.$root.loading = true;
                 this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
                 this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
                     this.$root.loading = false;
                     this.$root.loading = false;
-                    console.log(d.data);
-                    if (d.status == 0 && d.data) {
-                        this.tableData = d.data;
+                    if (d.status == 0) {
+                        console.log(d.data, "12313213");
+                        console.log(this.stuff);
+                        this.tableData = d.data || [];
                         /* 没有分页参数 需要重新改*/
                         /* 没有分页参数 需要重新改*/
                         this.countPage = d.dataCount;
                         this.countPage = d.dataCount;
-                        /* 
-                        this.countPage.length > 10 ? this.hidePage = false : this.hidePage = true;
-                        console.log(this.hidePage, `xxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
-                        */
-                        d.data.map((item, index) => {
-                            if (item.submitTime) {
-                                item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
-                            } else {
-                                item.submitTime = '';
-                            }
-                            if (item.CreateDate) {
-                                item.CreateDate = new Date(item.CreateDate).toLocaleDateString('chinese', { hour12: false });
-                            } else {
-                                item.CreateDate = '';
-                            }
-                        });
+                        /**
+                         * this.countPage.length > 10 ? this.hidePage = false: this.hidePage = true;
+                        console.log(this.hidePage,`xxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
+                         * 
+                         */
+
+                        console.log(this.tableData, "cccccccccccccccccccc");
+                        if (Object.prototype.toString.call(d.data) == '[object Array]') {
+                            d.data.map((item, index) => {
+                                if (item.submitTime) {
+                                    item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
+                                } else {
+                                    item.submitTime = '';
+                                }
+                                if (item.CreateDate) {
+                                    item.CreateDate = new Date(item.CreateDate).toLocaleDateString('chinese', { hour12: false });
+                                } else {
+                                    item.CreateDate = '';
+                                }
+                            });
+                        }
+
+
                     } else {
                     } else {
-                        this.hidePage = true;
                         console.log(d, "getTmOrderList...........");
                         console.log(d, "getTmOrderList...........");
                     }
                     }
                 });
                 });
@@ -714,7 +720,7 @@
             this.indentInfo.channelServiceNo = this.channelServiceNo;
             this.indentInfo.channelServiceNo = this.channelServiceNo;
             this.indentInfo.deliveryOrderNo = this.deliveryOrderNo;
             this.indentInfo.deliveryOrderNo = this.deliveryOrderNo;
             this.indentInfo.name = this.name;
             this.indentInfo.name = this.name;
-            this.indentInfo.itemName = this.itemName;
+            this.indentInfo.itemCode = this.itemName;
             this.indentInfo.tmName = this.tmName;
             this.indentInfo.tmName = this.tmName;
             this.indentInfo.CreateDate = this.CreateDate;
             this.indentInfo.CreateDate = this.CreateDate;
             this.indentInfo.deliveryStatus = this.checkedStatus;
             this.indentInfo.deliveryStatus = this.checkedStatus;