Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/sale/sale-form.vue

@@ -92,7 +92,7 @@
         <div class="row wrap" style="margin-top:20px;">
           <div class="col-12">任务图片</div>
         </div>
-        <div class="row wrap" style="margin-top:20px;">
+        <div class="row wrap" style="margin:20px 0;">
           <div class="row col-12">
             <div class="sale_ImgDiv" v-for="(sItem,sIndex) in objOption.TaskImageList" :key="sIndex">
               <img :src="sItem" />

src/components/sale/saleRight-form.vue

@@ -36,6 +36,15 @@
     height: 55px;
   }
 
+  .saleRightTable thead {
+    background-color: #eeeeef;
+    height: 40px;
+  }
+
+  .saleRightTable td {
+    padding: 0 5px;
+  }
+
 </style>
 <template>
   <q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeperForm">
@@ -83,16 +92,106 @@
             </span>
           </div>
         </div>
-        <div class="row wrap" style="margin-top:20px;">
-          <div class="classFirst">
-            <span class="role_Line"></span>任务图片
+        <template v-if="objOption.TaskImageList.length>0">
+          <div class="row wrap" style="margin-top:20px;">
+            <div class="classFirst">
+              <span class="role_Line"></span>任务图片
+            </div>
+          </div>
+          <div class="row wrap" style="margin-top:20px;">
+            <div class="row col-12">
+              <div class="sale_ImgDiv" v-for="(sItem,sIndex) in objOption.TaskImageList" :key="sIndex">
+                <img :src="sItem" />
+              </div>
+            </div>
+          </div>
+        </template>
+        <template v-if="objOption.TaskKudoImgList.length>0">
+          <div class="row wrap" style="margin-top:20px;">
+            <div class="classFirst">
+              <span class="role_Line"></span>奖品图片
+            </div>
+          </div>
+          <div class="row wrap" style="margin-top:20px;">
+            <div class="row col-12">
+              <div class="sale_ImgDiv" v-for="(sItem,sIndex) in objOption.TaskKudoImgList" :key="sIndex">
+                <img :src="sItem" />
+              </div>
+            </div>
+          </div>
+        </template>
+        <div class="row wrap" style="margin-top:20px;" v-if="objOption.DetailsList.length>0">
+          <div class="row col-12">
+            <table class="saleRightTable" style="border-collapse:collapse;">
+              <thead>
+                <tr>
+                  <td style="width:150px">
+                    任务类型
+                  </td>
+                  <td style="width:400px">
+                    任务条件
+                  </td>
+                  <td style="width:100px">
+                    完成类型
+                  </td>
+                  <td style="width:100px">
+                    完成值
+                  </td>
+                </tr>
+              </thead>
+              <tbody v-for="(sItem, sIndex) in objOption.DetailsList" :key="sIndex">
+                <tr>
+                  <td style="height:30px">
+                    {{sItem.TaskTypeName}}
+                  </td>
+                  <td>
+                    <template v-if="sItem.TargetList">
+                      <template v-if="sItem.TargetList.length==1">
+                        {{sItem.TargetList[0].TargetName}}
+                      </template>
+                      <template v-if="sItem.TargetList.length>1">
+                        {{sItem.TargetList[0].TargetName}}
+                        <span class="otherTask">
+                          {{sItem.TargetList.length}}
+                          <q-popup-proxy>
+                            <q-banner>
+                              <div style="width:100%;max-height:400px;overflow:auto;">
+                                <table class="saleTaskTable" style="border-collapse:collapse;">
+                                  <tr>
+                                    <th>任务条件</th>
+                                  </tr>
+                                  <tr v-for="(dItem,dIndex) in sItem.TargetList" :key="dIndex"
+                                    style="border-bottom:1px dashed #d1d1d1;">
+                                    <td>{{dItem.TargetName}}</td>
+                                  </tr>
+                                </table>
+                              </div>
+                            </q-banner>
+                          </q-popup-proxy>
+                        </span>
+                      </template>
+                      <template v-if="sItem.TargetList.length==0">
+                        无
+                      </template>
+                    </template>
+                  </td>
+                  <td>
+                    {{sItem.TaskFinishType==1?'人数':'成交金额'}}
+                  </td>
+                  <td>
+                    {{sItem.TaskFinishValue}}
+                  </td>
+                </tr>
+              </tbody>
+            </table>
           </div>
         </div>
-        <div class="row wrap" style="margin-top:20px;">
+        <div class="row wrap" style="margin-top:20px;" v-if="objOption.TaskDesc">
           <div class="row col-12">
-            <div class="sale_ImgDiv" v-for="(sItem,sIndex) in objOption.TaskImageList" :key="sIndex">
-              <img :src="sItem" />
-            </div>
+            <span class="backInfo_Title">任务描述：</span>
+            <span class="backOtherInfo" v-if="objOption.TaskDesc">
+              {{ objOption.TaskDesc }}
+            </span>
           </div>
         </div>
       </div>

src/pages/sale/saleTask.vue

@@ -93,7 +93,7 @@
               @click="EditTask(props.row)" />
             <q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="删除"
               @click="RemoveTask(props.row.Id)" />
-            <q-btn flat size="xs" icon="delete" color="negative" style="font-weight:400" label="详情"
+            <q-btn flat size="xs" icon="iconfont icon-view" style="font-weight:400" label="详情"
               @click="iShowEdit(props.row)" />
           </q-td>
         </template>