fix:投标状态更新逻辑调整、三级页样式调整

src/jfw/modules/app/src/web/staticres/jyapp/css/wxinfocontent.css

@@ -306,8 +306,7 @@ body .loading_ p span {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 18px;
-  height: 28px;
+  height: .8rem;
 }
 .toolbar .refer_stand .r-s-left{
   font-size: 14px;
@@ -327,7 +326,7 @@ body .loading_ p span {
 
 .forecast {
     position: absolute;
-    top: 20px;
+    top: 26px;
     right: -16px;
     display: flex;
     justify-content: center;
@@ -876,7 +875,7 @@ pre {
 .projectMatch {}
 
 .time_label {
-    margin: 10px 0 22px;
+    margin: 10px 0 16px;
     display: flex;
     align-items: center;
     justify-content: space-between;

src/jfw/modules/app/src/web/templates/big-member/page_client_follow_detail.html

@@ -241,8 +241,8 @@
               v-model="bidParams.bidStage"
               name="bidStage"
               readonly
-              ref="textareaRef"
               :rows="rownum"
+              autosize
               label="投标项目阶段"
               type="textarea"
               placeholder="请选择投标项目阶段"
@@ -258,14 +258,14 @@
             ></van-field>
             <div class="channel_module" v-if="showChannel">
               <div class="acc-input-group">
-                <van-field @input="doQueryAccEntName" placeholder="请输入渠道名称" v-model.trim="bidParams.channelName" name="channelName" label="渠道名称"></van-field>
+                <van-field type="textarea" autosize :rows="rownum" @input="doQueryAccEntName" placeholder="请输入渠道名称" v-model.trim="bidParams.channelName" name="channelName" label="渠道名称"></van-field>
                 <div class="popover-acc-input-group" v-show="showAccEntList">
                   <div class="popover-acc-input-group--item" v-for="(item, index) in accEntList" v-bind:key="index" @click="doSelectEnt(item)">${item.value}</div>
                 </div>
             </div>
-              <van-field placeholder="请输入联系人姓名" v-model.trim="bidParams.channelPerson" name="channelPerson" label="联系人"></van-field>
-              <van-field type="tel" placeholder="请输入联系电话" v-model.trim="bidParams.channelPhone" name="channelPhone" label="联系电话"></van-field>
-              <van-field placeholder="请输入中标单位名称" v-model.trim="bidParams.winner" name="winner" label="中标单位"></van-field>
+              <van-field type="textarea" autosize :rows="rownum" placeholder="请输入联系人姓名" v-model.trim="bidParams.channelPerson" name="channelPerson" label="联系人"></van-field>
+              <van-field maxlength="11" type="tel" placeholder="请输入联系电话" v-model.trim="bidParams.channelPhone" name="channelPhone" label="联系电话"></van-field>
+              <van-field type="textarea" autosize :rows="rownum" placeholder="请输入中标单位名称" v-model.trim="bidParams.winner" name="winner" label="中标单位"></van-field>
             </div>
             <van-button :disabled="showDisbaled" v-if="editBtnStatus.status != 1" class="submitBtn" round type="primary" native-type="submit">保存</van-button>
           </van-form>

src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_detail.html

@@ -240,8 +240,8 @@
               v-model="bidParams.bidStage"
               name="bidStage"
               readonly
-              ref="textareaRef"
               :rows="rownum"
+              autosize
               type="textarea"
               label="投标项目阶段"
               placeholder="请选择投标项目阶段"
@@ -257,14 +257,14 @@
             ></van-field>
             <div class="channel_module" v-if="showChannel">
               <div class="acc-input-group">
-                <van-field @input="doQueryAccEntName" placeholder="请输入渠道名称" v-model.trim="bidParams.channelName" name="channelName" label="渠道名称"></van-field>
+                <van-field type="textarea" autosize :rows="rownum" @input="doQueryAccEntName" placeholder="请输入渠道名称" v-model.trim="bidParams.channelName" name="channelName" label="渠道名称"></van-field>
                 <div class="popover-acc-input-group" v-show="showAccEntList">
                   <div class="popover-acc-input-group--item" v-for="(item, index) in accEntList" v-bind:key="index" @click="doSelectEnt(item)">${item.value}</div>
                 </div>
               </div>
-              <van-field placeholder="请输入联系人姓名" v-model.trim="bidParams.channelPerson" name="channelPerson" label="联系人"></van-field>
-              <van-field type="tel" placeholder="请输入联系电话" v-model.trim="bidParams.channelPhone" name="channelPhone" label="联系电话"></van-field>
-              <van-field placeholder="请输入中标单位名称" v-model.trim="bidParams.winner" name="winner" label="中标单位"></van-field>
+              <van-field type="textarea" autosize :rows="rownum" placeholder="请输入联系人姓名" v-model.trim="bidParams.channelPerson" name="channelPerson" label="联系人"></van-field>
+              <van-field maxlength="11" type="tel" placeholder="请输入联系电话" v-model.trim="bidParams.channelPhone" name="channelPhone" label="联系电话"></van-field>
+              <van-field type="textarea" autosize :rows="rownum" placeholder="请输入中标单位名称" v-model.trim="bidParams.winner" name="winner" label="中标单位"></van-field>
             </div>
             <van-button :disabled="showDisbaled" v-if="editBtnStatus.status != 1" class="submitBtn" round type="primary" native-type="submit">保存</van-button>
           </van-form>
@@ -681,15 +681,6 @@
               }
             })
           },
-          showRow: function () {
-            if (this.$refs.textareaRef) {
-              console.log(this.$refs.textareaRef)
-              const scrollHeight = this.$refs.textareaRef.$el.querySelector('textarea').scrollHeight
-              const clientHeight = this.$refs.textareaRef.$el.querySelector('textarea').clientHeight
-              console.log(scrollHeight, clientHeight)
-              this.rownum = scrollHeight / 24
-            }
-          },
           // 查看操作记录
           getActionHistory: function () {
             location.href = '/jy_mobile/project/operatingRecord?sid=' + this.sid
@@ -697,13 +688,6 @@
           // 选择是否中标
           selectBidStatus: function(data) {
             this.copyBidParams.isWin = data
-            // 带出中标单位
-            if (data === 1) {
-              const sWin = this.prodetail.projectInfo?.s_winner || ''
-              if (sWin) {
-                this.bidParams.winner = sWin
-              }
-            }
           },
           // 是否中标取消选择
           cancelSelect () {
@@ -764,14 +748,20 @@
               this.bidParams.bidType = '渠道投标'
               this.showChannel = true
             }
+            // 带出中标单位
             if (this.bidParams.isWin == 1) {
               this.bidParams.isWin = '是'
+              const sWin = this.prodetail.projectInfo?.s_winner || ''
+              if (sWin && !winner) {
+                this.bidParams.winner = sWin
+              }
             } else if (this.bidParams.isWin == 2) {
               this.bidParams.isWin = '否'
+              this.bidParams.winner = ''
             } else {
               this.bidParams.isWin = ''
+              this.bidParams.winner = ''
             }
-            this.showRow()
             this.bidTypePopupClose()
             this.BidProjectPopupClose()
             this.isBidPopupClose()
@@ -828,14 +818,15 @@
                   if (Object.keys(res.data).length > 0) {
                     _this.editBtnStatus.show = true
                     _this.editBtnStatus.status = 1
-                    const { bidStage, bidType, channelName, channelPerson, channelPhone, isWin} = res.data
+                    const { bidStage, bidType, channelName, channelPerson, channelPhone, isWin, winner} = res.data
                     let getParams = {
                       bidType: '',
                       bidStage: '',
                       isWin: '',
                       channelName: channelName,
                       channelPerson: channelPerson,
-                      channelPhone: channelPhone
+                      channelPhone: channelPhone,
+                      winner: winner
                     }
                     if (bidStage && bidStage.length > 0) {
                       _this.checkedList = bidStage
@@ -861,9 +852,6 @@
                       Object.assign(_this.copyBidParams, res.data)
                     }
                     _this.bidParams = getParams
-                    _this.$nextTick(function() {
-                      _this.showRow()
-                    })
                   }
                 }
               }

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1721,6 +1721,9 @@
                 $('.canbiao').hide();
                 $('.isCB.weicanbiao').show()
               }
+              if (!data.showStopParticipate && !data.showParticipate && !data.userName) {
+                $('.refer_stand').hide()
+              }
             } else {
               $('.refer_stand').hide()
             }

src/web/staticres/common-module/big-member/js/page_client_follow_detail.js

@@ -294,15 +294,6 @@ var vNode = {
               }
             })
           },
-      showRow: function () {
-        if (this.$refs.textareaRef) {
-          console.log(this.$refs.textareaRef)
-          const scrollHeight = this.$refs.textareaRef.$el.querySelector('textarea').scrollHeight
-          const clientHeight = this.$refs.textareaRef.$el.querySelector('textarea').clientHeight
-          console.log(scrollHeight, clientHeight)
-          this.rownum = scrollHeight / 24
-        }
-      },
       // 查看操作记录
       getActionHistory: function () {
         location.href = '/jy_mobile/project/operatingRecord?sid=' + this.sid
@@ -310,13 +301,6 @@ var vNode = {
       // 选择是否中标
       selectBidStatus: function(data) {
         this.copyBidParams.isWin = data
-            // 带出中标单位
-            if (data === 1) {
-              const sWin = this.prodetail.projectInfo?.s_winner || ''
-              if (sWin) {
-                this.bidParams.winner = sWin
-              }
-            }
       },
       // 是否中标取消选择
       cancelSelect () {
@@ -377,14 +361,20 @@ var vNode = {
           this.bidParams.bidType = '渠道投标'
           this.showChannel = true
         }
+        // 带出中标单位
         if (this.bidParams.isWin == 1) {
           this.bidParams.isWin = '是'
+          const sWin = this.prodetail.projectInfo?.s_winner || ''
+          if (sWin && !winner) {
+            this.bidParams.winner = sWin
+          }
         } else if (this.bidParams.isWin == 2) {
           this.bidParams.isWin = '否'
+          this.bidParams.winner = ''
         } else {
           this.bidParams.isWin = ''
+          this.bidParams.winner = ''
         }
-        this.showRow()
         this.bidTypePopupClose()
         this.BidProjectPopupClose()
         this.isBidPopupClose()
@@ -441,14 +431,15 @@ var vNode = {
               if (Object.keys(res.data).length > 0) {
                 _this.editBtnStatus.show = true
                 _this.editBtnStatus.status = 1
-                const { bidStage, bidType, channelName, channelPerson, channelPhone, isWin} = res.data
+                const { bidStage, bidType, channelName, channelPerson, channelPhone, isWin, winner} = res.data
                 let getParams = {
                   bidType: '',
                   bidStage: '',
                   isWin: '',
                   channelName: channelName,
                   channelPerson: channelPerson,
-                  channelPhone: channelPhone
+                  channelPhone: channelPhone,
+                  winner: winner
                 }
                 if (bidStage && bidStage.length > 0) {
                   _this.checkedList = bidStage
@@ -474,9 +465,6 @@ var vNode = {
                   Object.assign(_this.copyBidParams, res.data)
                 }
                 _this.bidParams = getParams
-                _this.$nextTick(function() {
-                  _this.showRow()
-                })
               }
             }
           }

src/web/staticres/css/wxcontentinfo.css

@@ -507,8 +507,7 @@ a.menu_list {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 18px;
-  height: 28px;
+  height: .8rem;
 }
 .toolbar .refer_stand .r-s-left{
   font-size: 14px;

src/web/templates/big-member/wx/page_client_follow_detail.html

@@ -232,6 +232,9 @@
               v-model="bidParams.bidStage"
               name="bidStage"
               readonly
+              :rows="rownum"
+              autosize
+              type="textarea"
               label="投标项目阶段"
               placeholder="请选择投标项目阶段"
             ></van-field>
@@ -246,14 +249,14 @@
             ></van-field>
             <div class="channel_module" v-if="showChannel">
               <div class="acc-input-group">
-                <van-field @input="doQueryAccEntName" placeholder="请输入渠道名称" v-model.trim="bidParams.channelName" name="channelName" label="渠道名称"></van-field>
+                <van-field type="textarea" autosize :rows="rownum" @input="doQueryAccEntName" placeholder="请输入渠道名称" v-model.trim="bidParams.channelName" name="channelName" label="渠道名称"></van-field>
                 <div class="popover-acc-input-group" v-show="showAccEntList">
                   <div class="popover-acc-input-group--item" v-for="(item, index) in accEntList" v-bind:key="index" @click="doSelectEnt(item)">${item.value}</div>
                 </div>
             </div>
-              <van-field placeholder="请输入联系人姓名" v-model.trim="bidParams.channelPerson" name="channelPerson" label="联系人"></van-field>
-              <van-field type="tel" placeholder="请输入联系电话" v-model.trim="bidParams.channelPhone" name="channelPhone" label="联系电话"></van-field>
-              <van-field placeholder="请输入中标单位名称" v-model.trim="bidParams.winner" name="winner" label="中标单位"></van-field>
+              <van-field type="textarea" autosize :rows="rownum" placeholder="请输入联系人姓名" v-model.trim="bidParams.channelPerson" name="channelPerson" label="联系人"></van-field>
+              <van-field maxlength="11" type="tel" placeholder="请输入联系电话" v-model.trim="bidParams.channelPhone" name="channelPhone" label="联系电话"></van-field>
+              <van-field type="textarea" autosize :rows="rownum" placeholder="请输入中标单位名称" v-model.trim="bidParams.winner" name="winner" label="中标单位"></van-field>
             </div>
             <van-button :disabled="showDisbaled" v-if="editBtnStatus.status != 1" class="submitBtn" round type="primary" native-type="submit">保存</van-button>
           </van-form>

src/web/templates/big-member/wx/page_pro_follow_detail.html

@@ -237,8 +237,8 @@
               v-model="bidParams.bidStage"
               name="bidStage"
               readonly
-              ref="textareaRef"
               :rows="rownum"
+              autosize
               type="textarea"
               label="投标项目阶段"
               placeholder="请选择投标项目阶段"
@@ -254,14 +254,14 @@
             ></van-field>
             <div class="channel_module" v-if="showChannel">
               <div class="acc-input-group">
-                <van-field @input="doQueryAccEntName" placeholder="请输入渠道名称" v-model.trim="bidParams.channelName" name="channelName" label="渠道名称"></van-field>
+                <van-field type="textarea" autosize :rows="rownum" @input="doQueryAccEntName" placeholder="请输入渠道名称" v-model.trim="bidParams.channelName" name="channelName" label="渠道名称"></van-field>
                 <div class="popover-acc-input-group" v-show="showAccEntList">
                   <div class="popover-acc-input-group--item" v-for="(item, index) in accEntList" v-bind:key="index" @click="doSelectEnt(item)">${item.value}</div>
                 </div>
               </div>
-              <van-field placeholder="请输入联系人姓名" v-model.trim="bidParams.channelPerson" name="channelPerson" label="联系人"></van-field>
-              <van-field type="tel" placeholder="请输入联系电话" v-model.trim="bidParams.channelPhone" name="channelPhone" label="联系电话"></van-field>
-              <van-field placeholder="请输入中标单位名称" v-model.trim="bidParams.winner" name="winner" label="中标单位"></van-field>
+              <van-field type="textarea" autosize :rows="rownum" placeholder="请输入联系人姓名" v-model.trim="bidParams.channelPerson" name="channelPerson" label="联系人"></van-field>
+              <van-field maxlength="11" type="tel" placeholder="请输入联系电话" v-model.trim="bidParams.channelPhone" name="channelPhone" label="联系电话"></van-field>
+              <van-field type="textarea" autosize :rows="rownum" placeholder="请输入中标单位名称" v-model.trim="bidParams.winner" name="winner" label="中标单位"></van-field>
             </div>
             <van-button :disabled="showDisbaled" v-if="editBtnStatus.status != 1" class="submitBtn" round type="primary" native-type="submit">保存</van-button>
           </van-form>
@@ -692,15 +692,6 @@
               }
             })
           },
-          showRow: function () {
-            if (this.$refs.textareaRef) {
-              console.log(this.$refs.textareaRef)
-              const scrollHeight = this.$refs.textareaRef.$el.querySelector('textarea').scrollHeight
-              const clientHeight = this.$refs.textareaRef.$el.querySelector('textarea').clientHeight
-              console.log(scrollHeight, clientHeight)
-              this.rownum = scrollHeight / 24
-            }
-          },
           // 是否中标取消选择
           cancelSelect () {
             this.bidParams.isWin = ''
@@ -714,13 +705,6 @@
           // 选择是否中标
           selectBidStatus: function(data) {
             this.copyBidParams.isWin = data
-            // 带出中标单位
-            if (data === 1) {
-              const sWin = this.prodetail.projectInfo?.s_winner || ''
-              if (sWin) {
-                this.bidParams.winner = sWin
-              }
-            }
           },
           saveStatus: function (str) {
             switch (str) {
@@ -775,14 +759,20 @@
               this.bidParams.bidType = '渠道投标'
               this.showChannel = true
             }
+            // 带出中标单位
             if (this.bidParams.isWin == 1) {
               this.bidParams.isWin = '是'
+              const sWin = this.prodetail.projectInfo?.s_winner || ''
+              if (sWin && !winner) {
+                this.bidParams.winner = sWin
+              }
             } else if (this.bidParams.isWin == 2) {
               this.bidParams.isWin = '否'
+              this.bidParams.winner = ''
             } else {
               this.bidParams.isWin = ''
+              this.bidParams.winner = ''
             }
-            this.showRow()
             this.bidTypePopupClose()
             this.BidProjectPopupClose()
             this.isBidPopupClose()
@@ -839,14 +829,15 @@
                   if (Object.keys(res.data).length > 0) {
                     _this.editBtnStatus.show = true
                     _this.editBtnStatus.status = 1
-                    const { bidStage, bidType, channelName, channelPerson, channelPhone, isWin} = res.data
+                    const { bidStage, bidType, channelName, channelPerson, channelPhone, isWin, winner} = res.data
                     let getParams = {
                       bidType: '',
                       bidStage: '',
                       isWin: '',
                       channelName: channelName,
                       channelPerson: channelPerson,
-                      channelPhone: channelPhone
+                      channelPhone: channelPhone,
+                      winner: winner
                     }
                     if (bidStage && bidStage.length > 0) {
                       _this.checkedList = bidStage
@@ -872,9 +863,6 @@
                       Object.assign(_this.copyBidParams, res.data)
                     }
                     _this.bidParams = getParams
-                    _this.$nextTick(function() {
-                      _this.showRow()
-                    })
                   }
                 }
               }

src/web/templates/weixin/wxinfocontent_rec.html

@@ -424,7 +424,7 @@ pre {
 	top: 2px;
 }
 .time_label {
-    margin: 10px 0 22px;
+    margin: .2rem 0 .32rem;
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -2097,6 +2097,9 @@ function openFileDown (url) {
                 $('.weicanbiao').hide();
                 $('.isCB.weicanbiao').hide()
               }
+              if (!data.showStopParticipate && !data.showParticipate && !data.userName) {
+                $('.refer_stand').hide()
+              }
             } else {
               $('.refer_stand').hide()
             }