1

src/components/sale/sale-form.vue

@@ -180,7 +180,7 @@
                    :options="finishTypeObj" label="请选择" style="width:160px" dense emit-value map-options />
                 </td>
                 <td>
-                  <q-input filled stack-label maxlength="20" dense v-model="sItem.TaskFinishValue"
+                  <q-input filled stack-label maxlength="20" @keyup.native="checkInteger(sItem,'TaskFinishValue')" dense v-model="sItem.TaskFinishValue"
                     ref="TaskFinishValue" class="q-pr-none" label="任务完成值" />
                 </td>
                 <td>

src/pages/sale/saleTask.vue

@@ -36,13 +36,35 @@
         </template>
         <template v-slot:body-cell-TaskConditions="props">
           <q-td :props="props" style="padding-right: 0px">
-            <div v-for="(x,index) in props.value" :key="index">
-              <template v-if="x.TargetList.length>0">
-                <div class="border-bottom">
-                    <span v-for="(sItem,sIndex) in x.TargetList" :key="sIndex">
-                      {{sItem.TargetName}}<span v-if="sIndex!=x.TargetList.length-1">,</span>
-                    </span>
+            <div v-for="(x,index) in props.value" :key="index" class="border-bottom">
+              <template v-if="x.TargetList">
+                <template v-if="x.TargetList.length==1">
+                  {{x.TargetList[0].TargetName}}
+                </template>
+                <template v-if="x.TargetList.length>1">
+                  {{x.TargetList[0].TargetName}}
+                  <span class="otherTask">
+                    {{x.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="(sItem,sIndex) in x.TargetList" :key="sIndex"
+                              style="border-bottom:1px dashed #d1d1d1;">
+                              <td>{{sItem.TargetName}}</td>
+                            </tr>
+                          </table>
                         </div>
+                      </q-banner>
+                    </q-popup-proxy>
+                  </span>
+                </template>
+                <template v-if="x.TargetList.length==0">
+                  无
+                </template>
               </template>
             </div>
           </q-td>
@@ -255,30 +277,34 @@
 
 <style lang="sass">
   @import url('~assets/css/table.sass')
+
 </style>
 <style lang="scss">
   .otherTask {
     display: inline-block;
-    width: 25px;
-    height: 25px;
+    width: 22px;
+    height: 22px;
     text-align: center;
-    line-height: 23px;
     border: 1px solid #2961FE;
     border-radius: 50%;
     cursor: pointer;
     color: #2961FE;
   }
+
   .saleTaskTable {
     width: 400px;
     text-align: center;
   }
+
   .saleTaskTable tr td {
     height: 40px;
   }
+
   .saleTaskTable tr th {
     height: 40px;
     background-color: rgb(238, 238, 239);
   }
+
   .border-bottom {
     border-bottom: 1px dashed #eee;
     padding-bottom: 5px;