1

src/components/FinancialModule/HandDispensingFee/list.vue

@@ -93,10 +93,13 @@
               <th>类型</th>
               <th>{{$t('fnc.feiyongleixing')}}</th>
               <th>是否启用月结</th>
+              <th>是否启用预付冲抵</th>
               <th>总公司流程</th>
               <th>分公司流程</th>
               <th>月结总公司流程</th>
               <th>月结分公司流程</th>
+              <th>冲抵总公司流程</th>
+              <th>冲抵分公司流程</th>
               <th>操作人</th>
               <th>{{$t('system.table_operation')}}</th>
             </tr>
@@ -110,6 +113,9 @@
               <td>
                 <span style="color: red;" v-if="subItem.IsMonthly">启用</span>
               </td>
+              <td>
+                <span style="color: red;" v-if="subItem.IsAdvanceMatch">启用</span>
+              </td>
               <td>
                 {{subItem.CompanyCourseStr}}
               </td>
@@ -122,6 +128,12 @@
               <td>
                 {{subItem.BranchMonthlyCourseStr}}
               </td>
+              <td>
+                {{subItem.AdvanceCourseStr}}
+              </td>
+              <td>
+                {{subItem.BranchAdvanceCourseStr}}
+              </td>
               <td>
                 <p>{{subItem.CreateByStr}}</p>
                 <p>{{subItem.CreateDate}}</p>
@@ -310,6 +322,37 @@
                 </el-switch>
               </el-form-item>
             </el-col>
+
+            <template v-if="addMsg.IsAdvanceMatch==1">
+              <el-col :span="8">
+                <el-form-item label="冲抵流程" prop="AdvanceCourse">
+                  <el-select filterable v-model="addMsg.AdvanceCourse" placeholder="选择预付冲抵总公司流程" style="width: 100%;">
+                    <el-option v-for="item in TemplateGetList" :key="item.Id" :label="item.Name" :value="item.Id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="冲抵分流程" prop="BranchAdvanceCourse">
+                  <el-select filterable v-model="addMsg.BranchAdvanceCourse" placeholder="选择预付冲抵分公司流程"
+                    style="width: 100%;">
+                    <el-option v-for="item in TemplateGetList" :label='item.Name' :value='item.Id' :key='item.Id'>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </template>
+            <el-col v-if="addMsg.IsAdvanceMatch==1" :span="16">
+              <el-form-item label="" prop="">
+                &nbsp;
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="启用预付冲抵" prop="">
+                <el-switch v-model="addMsg.IsAdvanceMatch" active-value="1" inactive-value="0">
+                </el-switch>
+              </el-form-item>
+            </el-col>
           </el-row>
         </template>
       </el-form>
@@ -806,6 +849,9 @@
                 IsMonthly: this.addMsg.IsMonthly,
                 MonthlyCourse: this.addMsg.MonthlyCourse,
                 BranchMonthlyCourse: this.addMsg.BranchMonthlyCourse,
+                IsAdvanceMatch: this.addMsg.IsAdvanceMatch,
+                AdvanceCourse: this.addMsg.AdvanceCourse,
+                BranchAdvanceCourse: this.addMsg.BranchAdvanceCourse,
               }
               this.submitLoading = true
               this.apipost(

src/components/SalesVisa/components/OneClickDocumentPreparation.vue

@@ -187,6 +187,18 @@
           </el-tooltip>
         </template>
        </el-table-column>
+       <el-table-column label="是否冲抵" width="80">
+        <template slot-scope="scope">
+          <el-tooltip v-if="scope.row.IsAdvanceMatch" content="否/是" placement="top">
+            <el-switch
+              v-model="scope.row.OtherType"
+              active-value="3"
+              inactive-value="1">
+            </el-switch>
+          </el-tooltip>
+          <el-input v-if="scope.row.OtherType==3" style="width: 80px;" v-model="scope.row.HandFeeFrId" placeholder="预付单号"></el-input>
+        </template>
+       </el-table-column>
       </el-table>
       </div>
     <div style="margin-top: 10px;display: flex;flex-wrap: wrap;"
@@ -236,7 +248,8 @@
 
     <div slot="footer" class="dialog-footer">
       <div style="color: red;text-align: right;font-size: 13px;margin-bottom: 5px;">
-        一键制单 暂不支持  预付款冲抵， 需冲抵的单据请先手动制单
+        <!-- 一键制单 暂不支持  预付款冲抵， 需冲抵的单据请先手动制单 -->
+        * 注意使用冲抵时 需要手动填入预付款单号，如果预付款单余额不足 则无法提交
       </div>
       <el-button class="hollowFixedBtn" @click="close">{{$t('pub.cancelBtn')}}</el-button>
       <el-button class="normalBtn" type="primary" @click="submit" :loading="submitLoading">{{$t('pub.sureBtn')}}</el-button>
@@ -387,6 +400,7 @@ export default {
               CurrencyId: x.CurrencyId,
               IsPublic: x.IsPublic,
               ClientID: x.ClientID,
+              HandFeeFrId: x.HandFeeFrId
               // vorcherInos: x.vorcherInos
             }
             msg.detailList.push(obj)
@@ -410,9 +424,11 @@ export default {
           this.submitLoading = true
           this.apipost("Financial_post_SetVisaBathCreateFinance",msg, res => {
           if (res.data.resultCode === 1) {
-            this.showState = false
-            this.$emit('success')
+            this.Success(`操作成功`) ;
+            this.showState = false;
             this.close()
+          }else{
+            this.Error(res.data.message+"，请核实 是否已创建有部分单据");
           }
           this.submitLoading = false
           }, null)
@@ -498,12 +514,14 @@ export default {
                 SetUpTypeStr: x.SetUpTypeStr,
                 TemplateId: x.SetUpType,
                 IsMonthly: x.IsMonthly,
+                IsAdvanceMatch: x.IsAdvanceMatch,
                 UnitPrice: x.SetUpTypeStr=='签证费'?this.visaInfor.CostPrice:null,
                 CurrencyId: null,
                 IsPublic: null,
                 ClientType: '',
                 ClientID: null,
                 OtherType: 1,
+                HandFeeFrId : '',
                 ClientAccountList: [],
                 // vorcherInos:[],
                 loading: false