123

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

@@ -16,7 +16,7 @@
                 shareholder: [],
                 shareholder: [],
                 employees: [],
                 employees: [],
                 logistics: [],
                 logistics: [],
-                attachFiles:[],
+                attachFiles: [],
             }
             }
         },
         },
     mounted: function() {
     mounted: function() {
@@ -36,8 +36,8 @@
     methods: {
     methods: {
         getFlow(){
         getFlow(){
             let obj = this.$root.copyParams({
             let obj = this.$root.copyParams({
-                "channelUserId": "15010929366",
-                "orderNo": "203915601880842"
+                "channelUserId": this.$root.channelUserId || "15010929366",
+                "orderNo": this.$route.query.channelOrderNo || "203915601880842"
             }, "getOrderDeliveryInfo", "/action/tmOrder/springBoard", 'yes', 'yes');
             }, "getOrderDeliveryInfo", "/action/tmOrder/springBoard", 'yes', 'yes');
             /*
             /*
             obj.actionBody.channelUserId = '15010929366';
             obj.actionBody.channelUserId = '15010929366';

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html

@@ -502,15 +502,7 @@
                                 </el-tooltip>
                                 </el-tooltip>
                             </template>
                             </template>
                         </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="itemName" label="公司类型">
-                            <template slot-scope="scope">
-                                <el-tooltip placement="top" :content="scope.row.tmName"
-                                    :disabled="scope.row.tmName ? false : true">
-                                    <p solt="content">{{scope.row.tmName ? scope.row.tmName : \'---\'}}
-                                    </p>
-                                </el-tooltip>
-                            </template>
-                        </el-table-column>
+                       
                         <el-table-column prop="quantity" label="件数">
                         <el-table-column prop="quantity" label="件数">
                             <template slot-scope="scope">
                             <template slot-scope="scope">
                                 <el-tooltip placement="top" :content="scope.row.quantity"
                                 <el-tooltip placement="top" :content="scope.row.quantity"

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

@@ -606,7 +606,7 @@
             this.$router.push({
             this.$router.push({
                 path: `/${this.$root.channelName}/companydetail`,
                 path: `/${this.$root.channelName}/companydetail`,
                 query: {
                 query: {
-                    deliveryOrderNo: row.deliveryOrderNo,
+                    channelOrderNo: row.channelOrderNo,
                     channelUserId: this.$route.query.channelUserId,
                     channelUserId: this.$route.query.channelUserId,
                     deliveryStatus: this.deliveryStatus,
                     deliveryStatus: this.deliveryStatus,
                     totalSum: row.totalSum,
                     totalSum: row.totalSum,