修改手配费

src/components/Hotel/HotelSupplier.vue

@@ -100,6 +100,13 @@
                                     </el-option>
                                 </el-select>
                             </el-form-item>
+                            <el-form-item label="是否有手配费">
+                              <el-switch v-model="addMsg.IsHaveShouPeiFee" :active-value="inActive" :inactive-value="notInActive">
+                              </el-switch>
+                            </el-form-item>
+                            <el-form-item v-if="addMsg.IsHaveShouPeiFee==1" label="手配费金额">
+                                <el-input type="text" class="w300" maxlength="20" @keyup.native="checkPrice(addMsg,'ShouPeiMoney')" v-model="addMsg.ShouPeiMoney"></el-input>
+                            </el-form-item>
                             <el-form-item :label="$t('hotel.table_tel')" prop="Tel">
                                 <el-input type="text" class="w300" maxlength="20" v-model="addMsg.Tel"></el-input>
                             </el-form-item>
@@ -172,6 +179,9 @@ export default {
       deleteID: "",
       typeList: "",
       TypeOne: "",
+      inActive: 1, //有手配费
+      notInActive: 0, //无手配费
+
       msg: {
         pageIndex: 1,
         pageSize: 18,
@@ -196,7 +206,11 @@ export default {
         Fax: "",
         Remark: "",
         Type: "1",
-        PayType:""
+        PayType:'',
+        //是否有手配费
+        IsHaveShouPeiFee:0,
+        //手配费金额
+        ShouPeiMoney:0
       },
       //付款方式
       PayTypeList:[{
@@ -306,7 +320,9 @@ export default {
         Fax: "",
         Remark: "",
         Type: 1,
-        PayType:""
+        PayType:'',
+        IsHaveShouPeiFee:0,
+        ShouPeiMoney:0
       }),
         (this.provinceList = "");
       this.cityList = "";

src/components/Hotel/roomReservationsDetails.vue

@@ -156,13 +156,8 @@
                   </tr>
                   <tr>
                     <td colspan="2">
-                      <p style="padding-top: 5px;">
-                        <a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
-                      </p>
-                      <el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
-                        <el-button size="small" type="danger" @click='getItem(index, subIndex)'>
-                          {{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button>
-                      </el-upload>
+                      <span v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">暂无手配费</span>
+                      <span v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">手配费:{{subItem.ShouPeiMoney}}</span>
                     </td>
                   </tr>
                 </table>
@@ -477,8 +472,6 @@
         ClickItem: {},
         offsetwidth: 0,
         parentEle: '',
-        checkedIndex: '',
-        checkedsubIndex: '',
         loading: false,
         boxHeight: 0,
         //合团的团期编号
@@ -594,25 +587,6 @@
         var day = Math.abs(parseInt(days / (1000 * 60 * 60 * 24)));
         return day;
       },
-      getItem(index, subIndex) {
-        this.checkedIndex = index
-        this.checkedsubIndex = subIndex
-      },
-      uploadFileBtnS(file) { //手配书上传
-        let that = this
-        let newArr = []
-        newArr.push(file.file)
-        let path = '/Upload/Temporary/'
-        this.$message.info('上传中...')
-        this.UploadSelfFileT(path, newArr, x => {
-          this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl = this.domainManager()
-            .ViittoFileUrl + x.data.FilePath
-          this.$message.success(x.data.Message)
-          let newlist = JSON.parse(JSON.stringify(this.list))
-          this.list = newlist
-          this.$forceUpdate()
-        })
-      },
       //添加酒店
       AddHotel(item, subIndex) {
         var subItem = JSON.parse(JSON.stringify(item.HotelOrderList[subIndex]));
@@ -743,11 +717,10 @@
                 })
               });
               this.list = list;
-
               this.$forceUpdate();
             }
           } else {
-            this.$message.error(res.data.message);
+            this.Error(res.data.message);
           }
           this.loading = false
         }, err => {})

src/components/LeaderManagement/leaderReimbursement.vue

@@ -304,6 +304,10 @@
             <td v-if="childIndex==0" :rowspan="6">
               <span>{{subItem.SupplierName}} <span v-if="subItem.SupplierPayType !== 0"
                   :style="{'color': subItem.SupplierPayType == 2 ? '#E95252': '#111111'}">{{subItem.SupplierPayType == 2 ? '签单' : '现付'}}</span></span>
+
+              <div v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">暂无手配费</div>
+              <div v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">手配费:{{subItem.ShouPeiMoney}}</div>
+
             </td>
             <td v-if="childIndex==0" :rowspan="6">
               <template v-if="subItem.DMCState==1">
@@ -895,9 +899,8 @@
                 x.CostProject = x.CostProject.toString();
               });
             }
-
           } else {
-            this.$message.error(res.data.message);
+            this.Error(res.data.message);
           }
         }, err => {})
       },