产品查询增加行业类型

src/components/LeaderManagement/DinningDetails.vue

@@ -9,7 +9,9 @@
           <th>日期</th>            
           <th>餐厅名称</th>
           <th>计划金额</th>
-          <th>用餐信息</th>
+          <th>类别</th>
+          <th>用餐人数</th>
+          <th>单价</th>
           <th>金额</th>
           <th>币种</th>
           <th>支付方式</th>
@@ -18,7 +20,7 @@
         <tr>
           <td v-show="dataList.length==0" colspan="16" align="center">暂无数据</td>
         </tr>
-        <tbody v-for="(item,index) in dataList" :key="index">
+        <!-- <tbody v-for="(item,index) in dataList" :key="index">
         <tr>
           <td>{{item.UseTimeStr}}</td>
           <td>
@@ -52,7 +54,49 @@
           <td>{{item.Remarks}}</td>
         </tr>
         
-        </tbody>
+        </tbody> -->
+        <template v-for='(item,index) in dataList'>
+            <template v-for="(subItem,subIndex) in item.DiningSummaryList">
+                <tr v-for="(childItem,childIndex) in subItem.DiningPriceList">
+                    <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">{{item.UseTimeStr}}</td>
+                    <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
+                        {{subItem.DiningName}}
+                    </td> 
+                    <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
+                        {{childItem.TotalPrice}}
+                    </td>
+                    <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
+                        {{subItem.UseDinnerTypeStr}}
+                    </td>
+                    <td>
+                        {{peopleStrToWord(childItem.PeopleType)}}:{{childItem.PeopleNum}}
+                    </td>
+                    <td>
+                        <p>
+                        {{subItem.PayStyle === 1 ? moneyFormat(childItem.PeoplePrice) : 0}}
+                        </p>
+                    </td>
+                    <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
+                        {{diningTotalPrice(subItem, subItem.DiningPriceList)}}
+                    </td>
+                    <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
+                    <span v-if="subItem.PayStyle === 1">现付</span>
+                    <span v-else-if="subItem.PayStyle === 2">公司结算</span>
+                    <span v-else-if="subItem.PayStyle === 3">预付</span>
+                    <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
+                    <span v-else></span>
+                    </br>
+                    <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
+                    </td>
+                    <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
+                    {{urrencyTypeObj[subItem.ReimburseList.CurrencyId]}}
+                    </td> 
+                    <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
+                    {{subItem.ReimburseList.Remarks}}
+                    </td> 
+                </tr>
+            </template>
+        </template>
       </table>
     </div>
     <!-- <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
@@ -88,6 +132,14 @@ export default {
     this.financeinfo_post_GetList();
   },
   methods: {
+    peopleStrToWord(str) {
+      if (str == 1)
+        return '成人'
+      if (str == 2)
+        return '儿童'
+      if (str == 3)
+        return '小人'
+    },
     diningTotalPrice(sObj, obj) {
       let totalPrice = 0
       obj.forEach(x => {
@@ -139,7 +191,7 @@ export default {
                     this.dataList.push(item);
                 }
             });
-            // console.log("this.dataList",this.dataList);
+            console.log("this.dataList",this.dataList);
         } else {
             this.Error(res.data.message);
         }

src/components/SalesModule/productQuery.vue

@@ -160,7 +160,7 @@
   <div class="flexOne">
     <div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayer">
       <p>
-        立即报名
+        立即报名555
         <span class="fr">
           <input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmit()" />
           <input type="button" class="normalBtn" value="立即报名" @click="submitForm('addMsg')" />
@@ -181,6 +181,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            
           </el-col>
           <el-col :span="4">
             <el-form-item label="联系人" prop="ContactName" v-if='addMsg.CustomerType==3||addMsg.CustomerType==4'>
@@ -196,7 +197,9 @@
                 </el-option>
               </el-select>
             </el-form-item>
-
+            <el-form-item v-show="addMsg.GroupType==2" label="行业类别" prop="IndustryCategory">
+              <el-input v-model='addMsg.IndustryCategory'></el-input>
+            </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="出发城市" prop="DepartureCityId">
@@ -957,6 +960,7 @@
           TCID: '0',
           CustomerType: '',
           GroupType: '',
+          IndustryCategory:'',
           ContactName: '',
           ContactMobile: '',
           CustomerId: '',
@@ -1196,6 +1200,7 @@
         }
       },
       gettypechange(type){
+        
         if(type==4){
           this.HightUnitPrice = '1';
           this.addMsg.AirticketNum = 0;
@@ -1885,6 +1890,13 @@
         }
       },
       saveOrder() {
+        // 判断单团类型
+        if(this.addMsg.GroupType==2){
+          if(this.addMsg.IndustryCategory==""){
+            this.Error("请填写行业类别！")
+            return;
+          }
+        }
         //验证人数和机位数
         if ((Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) != Number(
             this.addMsg.YSeatNum) + Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum)) {