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

# Conflicts:
#	src/components/FinancialModule/addFinancialDocuments.vue
#	src/components/FinancialModule/addReceivablesDocuments.vue

src/components/FinancialModule/addFinancialDocuments.vue

@@ -786,16 +786,16 @@
           <template v-if="!BillSonName.includes('分摊')&&!BillSonName.includes('预付')">
             <div>
               <p>
-                {{this.$route.query.Type==1?'帮代收':'帮代付'}}的公司：
+                {{this.$route.query.Type==1?'帮代收':'帮代付'}}公司：
                 <span>
                   <el-select filterable v-model='msg.HelpBranchId' class="w120 _border_b_1">
-                  <el-option  label='非代收代付' :value='-1' :key='-1'></el-option>
+                  <el-option  label='请选择' :value='-1' :key='-1'></el-option>
                   <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'
               :disabled="item.Id===msg.RB_Branch_Id"  >
             </el-option>
           </el-select>
                 </span>
-                <span style="margin-left: 20px;color: red;">*只有帮其他公司{{this.$route.query.Type==1?'代收':'代付'}}的需选择此项，非代收代付则忽略此项</span>
+                <span style="margin-left: 20px;color: red;">注：只有帮其他公司{{this.$route.query.Type==1?'代收':'代付'}}的需选择此项，如是本公司款则忽略此项</span>
               </p>
             </div>
         
@@ -1883,7 +1883,7 @@
               brandName+=item.BName;
             }
           });
-          brandName+=  (this.$route.query.Type==1?'代收':'代付')+'此笔款项，请正确选择避免驳回';
+          brandName+=  (this.$route.query.Type==1?'代收':'代付')+'此笔款项，请确认准确避免驳回';
           this.$confirm(brandName, this.$t('tips.tips'), {
               confirmButtonText: '确认提交',
               cancelButtonText: '取消提交',

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -674,16 +674,16 @@
           <template v-if="!BillSonName.includes('分摊')&&!BillSonName.includes('预付')">
             <div>
               <p>
-                代收款原公司：
+                {{this.$route.query.Type==1?'帮代收':'帮代付'}}公司：
                 <span>
                   <el-select filterable v-model='msg.HelpBranchId' class="w120 _border_b_1">
-                  <el-option  label='非代收代付' :value='-1' :key='-1'></el-option>
+                  <el-option  label='请选择' :value='-1' :key='-1'></el-option>
                   <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key='item.Id'
               :disabled="item.Id===msg.RB_Branch_Id">
             </el-option>
           </el-select>
                 </span>
-                <span style="margin-left: 20px;color: red;">*只有帮其他公司{{this.$route.query.Type==1?'代收':'代付'}}的需选择此项，非代收代付则忽略此项</span>
+                <span style="margin-left: 20px;color: red;">注：只有帮其他公司{{this.$route.query.Type==1?'代收':'代付'}}的需选择此项，如是本公司款则忽略此项</span>
               </p>
             </div>
         
@@ -1631,7 +1631,7 @@
               brandName+=item.BName;
             }
           });
-          brandName+=  (this.$route.query.Type==1?'代收':'代付')+'此笔款项，请正确选择避免驳回';
+          brandName+=  (this.$route.query.Type==1?'代收':'代付')+'此笔款项，请确认准确避免驳回';
           this.$confirm(brandName, this.$t('tips.tips'), {
               confirmButtonText: '确认提交',
               cancelButtonText: '取消提交',