v1.0.1 - 测试版本

src/common/js/host.js

 let output = {
     // 开发路径
-    base: 'http://bid-server.meiqicloud.com/',
-    resources: 'http://bid-web.meiqicloud.com/',
-    agentSignIn: 'http://bid-vue.meiqicloud.com/'
+    // base: 'http://bid-server.meiqicloud.com/',
+    // resources: 'http://bid-web.meiqicloud.com/',
+    // agentSignIn: 'http://bid-vue.meiqicloud.com/'
 
     // 正式路径
-    // base: '/Api/',
-    // resources: 'http://bid-web.meiqicloud.com',
-    // agentSignIn: 'http://bid-vue.meiqicloud.com/'
+    base: '/Api/',
+    resources: 'http://bid-web.meiqicloud.com',
+    agentSignIn: 'http://bid-vue.meiqicloud.com/'
 }
 
 output.uploadFile = output.base + 'bid/common/webupload/upload'

src/view/personal/supplier-notice.js

@@ -61,16 +61,50 @@ let output = function (thisVue, id, type) {
                 
 
                 // 竞价表格
-                let funcRawData = funcResponse.package
+                let funcRawData = funcResponse.packageAll
+                funcRawData.sort(function(a, b) {
+                    let funcMainWeight = 1000
+
+                    // 计算 a 的索引权重
+                    let funcIndex = a.index.toString().split('-')
+                    let funcA = Number(funcIndex[0]) * funcMainWeight
+                    if (funcIndex[1]) {
+                        a.isChild = true
+                        funcA = funcA + Number(funcIndex[1])
+                    } else {
+                        a.isChild = false
+                    }
+
+                    // 计算 b 的索引权重
+                    funcIndex = b.index.toString().split('-')
+                    let funcB = Number(funcIndex[0]) * funcMainWeight
+                    if (funcIndex[1]) {
+                        b.isChild = true
+                        funcB = funcB + Number(funcIndex[1])
+                    } else {
+                        b.isChild = false
+                    }
+                    return funcA - funcB
+                })
+
                 for (let i = 0, len = funcRawData.length; i < len; i++) {
                     let funcItem = {
-                        'index': i + 1,                                             // 序号
+                        'index': funcRawData[i].index.toString(),                   // 序号
                         'id': funcRawData[i].biddingPackageId,                      // 标识
                         'object': funcRawData[i].name ? funcRawData[i].name : '',   // 标的
                         'budget': funcRawData[i].fixedPrice,                        // 预算金额
                         'quantity': funcRawData[i].num,                             // 标的数量
                         'requirement': funcRawData[i].requirement,                  // 竞价参数要求
-                        'isWin': funcRawData[i].selected
+                        'isChild': funcRawData[i].isChild,
+                    }
+                    if (!funcItem.isChild) {
+                        if (funcRawData[i + 1] && funcRawData[i + 1].isChild) {
+                            funcItem.haveChild = true
+                        } else {
+                            funcItem.haveChild = false
+                        }
+                    } else {
+                        funcItem.haveChild = false
                     }
                     funcPackage.push(funcItem)
                 }

src/view/public/bid-notice.vue

@@ -200,7 +200,7 @@
                         <el-table-column prop="price" label="备注" min-width="30" align="center">
                             <template slot-scope="scope">
                                 <div v-if="Boolean(scope.row.haveChild)" class="quote-table col">
-                                    <i class="el-icon-edit-outline"></i>
+                                    <!-- <i class="el-icon-edit-outline"></i> -->
                                 </div>
                                 <div v-if="!Boolean(scope.row.haveChild)" class="quote-table col">
                                     <i class="el-icon-edit-outline" @click="onQuoteNote(scope.row, scope.$index)"></i>
@@ -209,7 +209,7 @@
                         </el-table-column>
                     </el-table>
                     <span slot="footer" class="dialog-footer row con-c align-c">
-                        <el-button class="global-routine-button" @click="onQuotePrevious()">上一步</el-button>
+                        <el-button class="dialog-button-prev" @click="onQuotePrevious()">上一步</el-button>
                         <el-button v-if="tableSelection.length === 0" disable class="dialog-disable-button">提交报价</el-button>
                         <el-button v-if="tableSelection.length >= 1" class="dialog-button" @click="onQuoteSubmit()">提交报价</el-button>
                     </span>
@@ -435,14 +435,6 @@
                 }
             },
 
-            setChildHide: function (funcRow, funcIndex) {
-                if (funcRow.row.isChild) {
-                    return 'table-row-hide'
-                } else {
-                    return ''
-                }
-            },
-
             /**
              *  报名
              *  @function
@@ -636,6 +628,19 @@
             },
 
             /**
+             *  竞价 - 隐藏合同选择界面附属合同
+             *  @function
+             *  @returns
+             */
+            setChildHide: function (funcRow, funcIndex) {
+                if (funcRow.row.isChild) {
+                    return 'table-row-hide'
+                } else {
+                    return ''
+                }
+            },
+
+            /**
              *  竞价 - 填写报价窗口下一步
              *  @function
              *  @returns
@@ -735,7 +740,7 @@
                     this.tableQuote.push(funcItem)
                 }
 
-                console.log(JSON.stringify(funcSelection))
+                // console.log(JSON.stringify(funcSelection))
             },
 
             onQuoteNote: function (funcItem, funcIndex) {
@@ -801,7 +806,7 @@
                         funcChildEnd = funcChildEnd + 1
                     }
                     this.tableQuote[funcChildStart].price = Number(funcPrice) + Number(funcItem.price)
-                    console.log(JSON.stringify(this.tableQuote))
+                    // console.log(JSON.stringify(this.tableQuote))
                 }
             },
 
@@ -828,7 +833,6 @@
                     }
                 }
 
-                console.log(JSON.parse(JSON.stringify(this.tableQuote)))
                 let funcQuoteData = []
                 let funcMainContract = -1
                 for (let i = 0, l = this.tableQuote.length; i < l; i++) {
@@ -850,9 +854,6 @@
                     }
                 }
 
-                console.log(JSON.stringify(funcQuoteData))
-
-
                 let funcParam = {
                     'biddingProjectId': this.componentProject.projectId,
                     'biddingOffers': JSON.stringify(funcQuoteData)
@@ -883,6 +884,16 @@
             display: none;
         }
 
+        .dialog-button-prev {
+            width: 160px;
+            height: 52px;
+            margin: 0 40px !important;
+            border-radius: 26px;
+            border: 1px @colorBlue solid !important;
+            color: @colorBlue !important;
+            background: @colorWhite !important;
+        }
+
         .dialog-button {
             width: 160px;
             height: 52px;