no message

src/components/FinancialModule/addFinancialDocuments.vue

@@ -763,7 +763,7 @@
             </el-tooltip>
 
           </div>
-          <template v-if="isHandFee&&is_HandFee">
+          <template v-if="(isHandFee&&is_HandFee)||(is_HandFee&&this.GetDetail.Status==0)">
             <div>
               <p>
                 手配费：
@@ -1219,7 +1219,7 @@
       },
       //获取手配费所有配置
       GetHandFeeList() {
-        if(!this.isHandFee) return
+        if(!this.isHandFee||this.GetDetail.Status>0) return
         this.apipost(
           "handfee_post_GetHandFeeList", {
             BranchId: -1
@@ -2164,6 +2164,7 @@
             this.IsUploadPic = data.IsUploadPic;
             this.msg.IsPublic = data.IsPublic;
             this.GetDetail = data;
+            this.GetHandFeeList() //获取手配费功能权限配置
             if (this.orderObj != null && this.orderObj.OrderSource === 10) {
 
             } else {
@@ -2588,7 +2589,7 @@
         this.is_HandFee = false
         this.isHandFee = false
       }
-      this.GetHandFeeList() //获取手配费功能权限配置
+
       let userInfo = this.getLocalStorage();
       this.department = userInfo.DepartName;
       this.EmployeeId = userInfo.EmployeeId;

src/components/dmc/manager/GroundSupplier/index.vue

@@ -111,6 +111,7 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column prop="ContractEndTime" label="合同到期时间"></el-table-column>
         <el-table-column prop="" label="线路">
           <template slot-scope="scope">
             <span v-for="(x,index) in scope.row.LineInfoList">
@@ -241,7 +242,7 @@
             <el-input v-model="form.FinanceDuties" clearable></el-input>
           </el-form-item>
         </div>
-        <div class="msgbox width100">
+        <div class="msgbox">
           <el-form-item label="合同" prop="ContractUrl">
             <div class="img-box-form">
               <template v-if="form.ContractUrl">
@@ -270,6 +271,17 @@
             </div>
           </el-form-item>
         </div>
+        <div class="msgbox">
+          <el-form-item label="到期时间" prop="ContractEndTime">
+            <el-date-picker
+            v-model="form.ContractEndTime"
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择合同到期时间">
+          </el-date-picker>
+          </el-form-item>
+        </div>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="resetForm('form'),showVisible = false">取 消</el-button>
@@ -328,6 +340,7 @@
           ContractUrl: '',
           LineInfo: '',
           LineId: [],
+          ContractEndTime: ''
         },
         rules:{
           Name: [{  required: true,  message: '请输入供应商名称',  trigger: "blur"}],
@@ -341,6 +354,7 @@
           GroundingType: [{  required: true,  message: '请选择供应商类型',  trigger: "change"}],
           LineId: [{  required: true,  message: '请选择路线',  trigger: "change"}],
           ContractUrl: [{  required: true,  message: '请上传合同',  trigger: "buttom"}],
+          ContractEndTime: [{  required: true,  message: '请选择合同到期时间',  trigger: "change"}],
         },
         titleName: '新增'
       }
@@ -397,6 +411,7 @@
           //   ContractUrl: row.ContractUrl,
           //   LineInfo: row.LineInfo,
           //   LineId: row.LineInfo.split(',').map(x=>{ return Number(x) }),
+          //   ContractEndTime: ''
           // }
           this.form = JSON.parse(JSON.stringify(row))
           this.$set(this.form, 'LineId', row.LineInfo.split(',').map(x=>{ return Number(x) }))
@@ -503,6 +518,7 @@
           ContractUrl: '',
           LineInfo: '',
           LineId: [],
+          ContractEndTime: ''
         }
         this.$refs[formName].resetFields();
       },

src/components/sale/ExpectedCommission.vue

@@ -433,7 +433,7 @@
           9.单项服务每月人头数与年终人头奖励接按0.5计算</br>
           10.5月1日起小包团、落地团 需结团完结后，方参与提成定档</br>
           11.单团或小包团若产生亏损.销售与操作皆无奖励与提成</br>
-          12.单团或小包团无额外收入奖励.所有收入都计入单团核算.如客人取消增收(机票或团费等).也需与团队共同核算.核算后按公司业绩制度执行/br>
+          12.单团或小包团无额外收入奖励.所有收入都计入单团核算.如客人取消增收(机票或团费等).也需与团队共同核算.核算后按公司业绩制度执行</br>
           13.以上制度公司会因市场变动与业务实际情况採取适当因应或调整,敬请注意!!</br>
 
         </div>