Browse Source

feature:跟进记录中评价信息从现有的点击评价显示改为直接显示,任务单增加经销商信息

sunxinyuan 1 year ago
parent
commit
62adeaf811

+ 2 - 2
src/views/base/components/Follow.vue

@@ -34,13 +34,13 @@
                       <vab-icon icon="arrow-right-circle-fill" />
                       详情
                     </el-button>
-                    <el-button size="mini" @click="showComment(item)">评论({{ item.commentNumber }})</el-button>
+                    <!--                    <el-button size="mini" @click="showComment(item)">评论({{ item.commentNumber }})</el-button>-->
                   </div>
                 </div>
               </div>
             </div>
             <transition name="height">
-              <ul v-if="item.showComment" class="comments">
+              <ul class="comments">
                 <li v-for="comment in item.comments" :key="comment.id">
                   <vab-icon class="user-avatar" icon="account-circle-fill" />
                   <div class="text">

+ 2 - 2
src/views/base/partners/detail.vue

@@ -69,13 +69,13 @@
                               <vab-icon icon="arrow-right-circle-fill" />
                               详情
                             </el-button>
-                            <el-button size="mini" @click="showComment(item)">评论({{ item.commentNumber }})</el-button>
+                            <!--                            <el-button size="mini" @click="showComment(item)">评论({{ item.commentNumber }})</el-button>-->
                           </div>
                         </div>
                       </div>
                     </div>
                     <transition name="height">
-                      <ul v-if="item.showComment" class="comments">
+                      <ul class="comments">
                         <li v-for="comment in item.comments" :key="comment.id">
                           <vab-icon class="user-avatar" icon="account-circle-fill" />
                           <div class="text">

+ 2 - 2
src/views/customer/detail.vue

@@ -151,13 +151,13 @@
                               <vab-icon icon="arrow-right-circle-fill" />
                               详情
                             </el-button>
-                            <el-button size="mini" @click="showComment(item)">评论({{ item.commentNumber }})</el-button>
+                            <!--                            <el-button size="mini" @click="showComment(item)">评论({{ item.commentNumber }})</el-button>-->
                           </div>
                         </div>
                       </div>
                     </div>
                     <transition name="height">
-                      <ul v-if="item.showComment" class="comments">
+                      <ul class="comments">
                         <li v-for="comment in item.comments" :key="comment.id">
                           <vab-icon class="user-avatar" icon="account-circle-fill" />
                           <div class="text">

+ 2 - 2
src/views/customer/inviteTenders/details.vue

@@ -88,13 +88,13 @@
                               <vab-icon icon="arrow-right-circle-fill" />
                               详情
                             </el-button>
-                            <el-button size="mini" @click="showComment(item)">评论({{ item.commentNumber }})</el-button>
+                            <!--                            <el-button size="mini" @click="showComment(item)">评论({{ item.commentNumber }})</el-button>-->
                           </div>
                         </div>
                       </div>
                     </div>
                     <transition name="height">
-                      <ul v-if="item.showComment" class="comments">
+                      <ul class="comments">
                         <li v-for="comment in item.comments" :key="comment.id">
                           <vab-icon class="user-avatar" icon="account-circle-fill" />
                           <div class="text">

+ 2 - 2
src/views/proj/business/components/DetailsFollow.vue

@@ -33,13 +33,13 @@
                       <vab-icon icon="arrow-right-circle-fill" />
                       详情
                     </el-button>
-                    <el-button size="mini" @click="showComment(item)">评论({{ item.commentNumber }})</el-button>
+                    <!--                    <el-button size="mini" @click="showComment(item)">评论({{ item.commentNumber }})</el-button>-->
                   </div>
                 </div>
               </div>
             </div>
             <transition name="height">
-              <ul v-if="item.showComment" class="comments">
+              <ul class="comments">
                 <li v-for="comment in item.comments" :key="comment.id">
                   <vab-icon class="user-avatar" icon="account-circle-fill" />
                   <div class="text">

+ 8 - 1
src/views/work/deliver/components/detailWork.vue

@@ -23,6 +23,7 @@
               {{ theDeliverOrder.orderCode }}
             </el-form-item>
           </el-col>
+
           <el-col v-if="theProgress.progressType != '' && theProgress.progressType != '40'" :span="12">
             <el-form-item label="要求发货时间:" style="margin: 0px">
               {{ parseTime(theDeliverOrder.requiredDeliveryTime, '{y}-{m}-{d}') }}
@@ -33,6 +34,11 @@
               {{ parseTime(theDeliverOrder.realDeliveryTime, '{y}-{m}-{d}') }}
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="经销商:" style="margin: 0px">
+              {{ theDeliverOrder.distributorName }}
+            </el-form-item>
+          </el-col>
           <el-col v-if="theProgress.progressType != '' && theProgress.progressType != '40'" :span="12">
             <el-form-item label="收货信息:" style="margin: 0px">
               {{ theDeliverOrder.receivingInfo }}
@@ -114,6 +120,7 @@
               {{ form.auditDesc }}
             </el-form-item>
           </el-col>
+
           <el-col :span="24">
             <el-table ref="productTable" :data="products" style="width: 100%; margin-top: 10px">
               <el-table-column label="产品名称" prop="productName" />
@@ -377,7 +384,7 @@
       },
       // 保存产品信息
       async updateProduceInfo(row) {
-        const [err, res] = await to(
+        const [err] = await to(
           deliverWorkApi.updateProgressProductInfo({ id: row.id, pictures: row.pictures, desc: row.desc })
         )
         if (err) return